Merge pull request #124 from lacmus-foundation/dev

0.5.0-preview-1
lacmus-foundation · Aug 3, 2021 · 3ebd067 · 3ebd067
2 parents 65d47aa + 9d57211
commit 3ebd067
Show file tree

Hide file tree

Showing 141 changed files with 971 additions and 2,502 deletions.
diff --git a/.github/workflows/dotnetcore.yml b/.github/workflows/dotnetcore.yml
@@ -8,7 +8,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        dotnet_version: ['2.2.108']
+        dotnet_version: ['5.0.x']
         os: [ubuntu-latest, windows-latest, macOS-latest]
 
     steps:

diff --git a/.gitignore b/.gitignore
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
diff --git a/Directory.Build.props b/Directory.Build.props
diff --git a/LICENSE b/LICENSE
diff --git a/README.md b/README.md
diff --git a/docs/main_view.png b/docs/main_view.png
diff --git a/mk-release.sh b/mk-release.sh
@@ -3,11 +3,11 @@ rm -rf ./bin/app/ && rm -rf ./src/bin/Release/
 echo "restoring packeges"
 dotnet restore
 echo -n "building for linux"
-dotnet publish --framework netcoreapp3.1 --runtime="linux-x64" -c Release -o ./bin/app/linux
+dotnet publish --framework net5.0 --runtime="linux-x64" -c Release -o ./bin/app/linux
 echo -n "building for win10"
-dotnet publish --framework netcoreapp3.1 --runtime="win10-x64" -c Release -o ./bin/app/win10
+dotnet publish --framework net5.0 --runtime="win10-x64" -c Release -o ./bin/app/win10
 echo -n "building for osx"
-dotnet publish --framework netcoreapp3.1 --runtime="osx-x64" -c Release -o ./bin/app/osx
+dotnet publish --framework net5.9 --runtime="osx-x64" -c Release -o ./bin/app/osx
 cd ./bin/app/
 zip -r -9 ./linux.zip ./linux/
 zip -r -9 ./win10.zip ./win10/

diff --git a/src/App.xaml b/src/App.xaml
@@ -8,7 +8,6 @@
         -->
         <StyleInclude Source="avares://Citrus.Avalonia/Citrus.xaml"/>
         <StyleInclude Source="avares://Avalonia.Controls.DataGrid/Themes/Default.xaml"/>
-        <StyleInclude Source="avares://ThemeEditor.Controls.ColorPicker/ColorPicker.xaml"/>
         <!--
         <StyleInclude Source="resm:Avalonia.Themes.Default.DefaultTheme.xaml?assembly=Avalonia.Themes.Default"/>
         <StyleInclude Source="resm:Avalonia.Themes.Default.Accents.BaseLight.xaml?assembly=Avalonia.Themes.Default"/>

diff --git a/src/App.xaml.cs b/src/App.xaml.cs
diff --git a/src/Assets/IsFavorite.png b/src/Assets/IsFavorite.png
diff --git a/src/Assets/IsObject.png b/src/Assets/IsObject.png
diff --git a/src/Assets/IsWatched.png b/src/Assets/IsWatched.png
diff --git a/src/Assets/avalonia-logo.ico b/src/Assets/avalonia-logo.ico
diff --git a/src/Assets/lacmus_logo.png b/src/Assets/lacmus_logo.png
diff --git a/src/Assets/lacmus_text.png b/src/Assets/lacmus_text.png
diff --git a/src/Extensions/AnnotationExtension.cs b/src/Extensions/AnnotationExtension.cs
diff --git a/src/Extensions/AppStatusInfoExtension.cs b/src/Extensions/AppStatusInfoExtension.cs
diff --git a/src/Extensions/MLModelConfigExtension.cs b/src/Extensions/MLModelConfigExtension.cs
diff --git a/src/Extensions/PhotoViewModelExtension.cs b/src/Extensions/PhotoViewModelExtension.cs
diff --git a/src/FodyWeavers.xsd b/src/FodyWeavers.xsd
diff --git a/src/Interfaces/IContent.cs b/src/Interfaces/IContent.cs
diff --git a/src/Interfaces/IContentLoader.cs b/src/Interfaces/IContentLoader.cs
diff --git a/src/Interfaces/IContentSaver.cs b/src/Interfaces/IContentSaver.cs
diff --git a/src/LacmusApp.csproj b/src/LacmusApp.csproj
@@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>netcoreapp3.1</TargetFrameworks>
+    <TargetFramework>net5.0</TargetFramework>
     <Company>Lacmus Foundation</Company>
-    <AssemblyVersion>0.4.3.0</AssemblyVersion>
-    <FileVersion>0.4.3.0</FileVersion>
+    <AssemblyVersion>0.5.0.1</AssemblyVersion>
+    <FileVersion>0.5.0.1</FileVersion>
   </PropertyGroup>
   <ItemGroup>
     <Compile Update="**\*.xaml.cs">
@@ -28,7 +28,8 @@
     <PackageReference Include="Avalonia.ReactiveUI" Version="0.9.12" />
     <PackageReference Include="Avalonia.Skia.Linux.Natives" Version="1.68.0.2" />
     <PackageReference Include="Citrus.Avalonia" Version="1.2.6" />
-    <PackageReference Include="Docker.DotNet" Version="3.125.2" />
+    <PackageReference Include="Flurl" Version="3.0.2" />
+    <PackageReference Include="LacmusPlugin" Version="2.0.2" />
     <PackageReference Include="Material.Avalonia" Version="0.9.0" />
     <PackageReference Include="MessageBox.Avalonia" Version="0.9.6.1" />
     <PackageReference Include="MetadataExtractor" Version="2.4.3" />
@@ -41,6 +42,5 @@
     <PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
     <PackageReference Include="Serilog.Sinks.File" Version="4.1.0" />
     <PackageReference Include="System.Diagnostics.PerformanceCounter" Version="4.7.0" />
-    <PackageReference Include="ThemeEditor.Controls.ColorPicker" Version="0.9.4" />
   </ItemGroup>
 </Project>
diff --git a/src/Managers/ApplicationStatusManager.cs b/src/Managers/ApplicationStatusManager.cs
diff --git a/src/Managers/ThemeManager.cs b/src/Managers/ThemeManager.cs
diff --git a/src/Models/Annotation.cs b/src/Models/Annotation.cs
diff --git a/src/Models/AppConfig.cs b/src/Models/AppConfig.cs
@@ -2,28 +2,48 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Threading.Tasks;
-using Avalonia.Media;
 using LacmusApp.Managers;
-using LacmusApp.Models.Docker;
-using LacmusApp.Models.ML;
-using LacmusApp.Services;
-using LacmusApp.Services.Files;
+using LacmusApp.Models.Plugins;
+using LacmusApp.Services.Plugin;
+using LacmusPlugin.Enums;
 using Newtonsoft.Json;
+using Octokit;
 using Serilog;
+using Language = LacmusApp.Services.Language;
+using OperatingSystem = LacmusPlugin.OperatingSystem;
+using Version = LacmusPlugin.Version;
 
 namespace LacmusApp.Models
 {
     [JsonObject]
     public class AppConfig
     {
         private string _borderColor = "#FFFF0000";
-        private MLModelConfig _mlModelConfig = new MLModelConfig();
-        private string[] _repositories = 
+        private PluginRepository _repository = new("lacmus", "http://176.99.131.182:80");
+
+        private string _configDir =
+            Path.Join(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "lacmus");
+        private string _pluginDir = 
+            Path.Join(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "lacmus", "plugins");
+
+        private PluginInfo _pluginInfo = new()
         {
-            "gosha20777/lacmus",
-            "gosha20777/lacmus-kseniia"
+            Author = "gosha20777",
+            Company = "Lacmus Foundation",
+            Description = "Resnet50+deepFPN neural network",
+            Name = "Lacmus Retinanet",
+            Tag = "LacmusRetinanetPlugin.Cpu",
+            Url = "https://github.com/lacmus-foundation/lacmus",
+            Version = new(api: 2, major: 1, minor: 0),
+            InferenceType = InferenceType.Cpu,
+            OperatingSystems = new HashSet<OperatingSystem>()
+            {
+                OperatingSystem.LinuxAmd64,
+                OperatingSystem.WindowsAmd64,
+                OperatingSystem.OsxAmd64
+            }
         };
-
+        
         public Language Language { get; set; } = Language.English;
 
         public string BorderColor
@@ -41,28 +61,24 @@ public string BorderColor
         } 
         public ThemeManager.Theme Theme { get; set; }
 
-        public string[]  Repositories
+        public PluginRepository Repository
         {
-            get => _repositories;
-            set
-            {
-                if(value == null || value.Length < 1)
-                {
-                    throw new Exception($"invalid Repositories: {_repositories}");
-                }
-                _repositories = value;
-            }
-        } 
+            get => _repository;
+            set => _repository = value;
+        }
+
+        public string PluginDir
+        {
+            get => _pluginDir;
+            set => _pluginDir = value;
+        }
 
-        public MLModelConfig MlModelConfig
+        public PluginInfo PluginInfo
         {
-            get => _mlModelConfig;
-            set
-            {
-                _mlModelConfig = value ?? throw new Exception($"MlModelConfig is null");
-            }
+            get => _pluginInfo;
+            set => _pluginInfo = value;
         }
-        
+
         public async Task Save(string path)
         {
             try
@@ -73,6 +89,7 @@ public async Task Save(string path)
                     Directory.CreateDirectory(dir);
                 await File.WriteAllTextAsync(path, str);
                 Log.Debug($"Config saved to {path}.");
+                Log.Debug(_pluginInfo.Tag);
             }
             catch (Exception e)
             {
@@ -82,8 +99,7 @@ public async Task Save(string path)
 
         public async Task Save()
         {
-            var confDir = Path.Join(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "lacmus");
-            var configPath = Path.Join(confDir,"appConfig.json");
+            var configPath = Path.Join(_configDir,"appConfig-v2.json");
             await Save(configPath);
         }
 
@@ -107,20 +123,11 @@ public static AppConfig DeepCopy(AppConfig config)
             //deep copy ml config
             var newConfig = new AppConfig();
             newConfig.Language = config.Language;
-            newConfig.Repositories = new List<string>(config.Repositories).ToArray();
+            newConfig.Repository = config.Repository;
             newConfig.BorderColor = config.BorderColor;
-            newConfig.MlModelConfig = new MLModelConfig();
-            newConfig.MlModelConfig.Accaunt = new DockerAccaunt();
-            newConfig.MlModelConfig.Accaunt.Email = config.MlModelConfig.Accaunt.Email;
-            newConfig.MlModelConfig.Accaunt.Password = config.MlModelConfig.Accaunt.Password;
-            newConfig.MlModelConfig.Accaunt.Username = config.MlModelConfig.Accaunt.Username;
-            newConfig.MlModelConfig.Image = new DockerImage();
-            newConfig.MlModelConfig.Image.Name = config.MlModelConfig.Image.Name;
-            newConfig.MlModelConfig.Image.Tag = config.MlModelConfig.Image.Tag;
-            newConfig.MlModelConfig.Type = config.MlModelConfig.Type;
-            newConfig.MlModelConfig.Url = config.MlModelConfig.Url;
-            newConfig.MlModelConfig.ApiVersion = config.MlModelConfig.ApiVersion;
-            newConfig.MlModelConfig.ModelVersion = config.MlModelConfig.ModelVersion;
+            newConfig.Theme = config.Theme;
+            newConfig.PluginDir = config.PluginDir;
+            newConfig.PluginInfo = config.PluginInfo;
             return newConfig;
         }
     }

diff --git a/src/Models/AppStatusInfo.cs b/src/Models/AppStatusInfo.cs