1.【开发端】&【agent】增加脚本包框架

2.【标注端】尝试修复跳过后再标注时生成两个LabeledUltrasoundFile的问题

AIPlatform.Protocol/Entities/TrainScriptPackage.cs

@@ -5,11 +5,13 @@ namespace AIPlatform.Protocol.Entities
     public enum TrainScriptPackageFramework
     {
         Tensorflow = 0,
-        PyTorch,
-        CNTK
+        vinno_torch,
+        CNTK,
+        vinno_torch_plus,
+        vinno_torch_premium,
     }
 
-    public class TrainScriptPackage:Entity
+    public class TrainScriptPackage : Entity
     {
         /// <summary>
         /// Gets or sets the name of the package.

aipagnt/AgentConfig.cs

@@ -77,12 +77,18 @@ namespace aipagnt
                             case "tensorflow":
                                 PythonEnvs.Add(TrainScriptPackageFramework.Tensorflow, name);
                                 break;
-                            case "pytorch":
-                                PythonEnvs.Add(TrainScriptPackageFramework.PyTorch, name);
+                            case "vinno_torch":
+                                PythonEnvs.Add(TrainScriptPackageFramework.vinno_torch, name);
                                 break;
                             case "cntk":
                                 PythonEnvs.Add(TrainScriptPackageFramework.CNTK, name);
                                 break;
+                            case "vinno_torch_plus":
+                                PythonEnvs.Add(TrainScriptPackageFramework.vinno_torch_plus, name);
+                                break;
+                            case "vinno_torch_premium":
+                                PythonEnvs.Add(TrainScriptPackageFramework.vinno_torch_premium, name);
+                                break;
                         }
                     }
                 }

aipagnt/Config.xml

@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <PythonEnvs>
-	<PythonEnv env="PyTorch" name="pytorch"/>
+	<PythonEnv env="vinno_torch" name="vinno_torch"/>
+	<PythonEnv env="vinno_torch_plus" name="vinno_torch_plus"/>
+	<PythonEnv env="vinno_torch_premium" name="vinno_torch_premium"/>
 	<PythonEnv env="CNTK" name="cntk"/>
 	<PythonEnv env="Tensorflow" name="tensorflow"/>
 </PythonEnvs>

aipdev/CreateScriptPackageWindow.xaml.cs

@@ -1,4 +1,5 @@
-using System.Windows;
+using System;
+using System.Windows;
 using AIPlatform.Protocol.Entities;
 
 namespace aipdev
@@ -22,9 +23,10 @@ namespace aipdev
         {
             InitializeComponent();
             PackageName.Focus();
-            PackageFramework.Items.Add(TrainScriptPackageFramework.Tensorflow);
-            PackageFramework.Items.Add(TrainScriptPackageFramework.PyTorch);
-            PackageFramework.Items.Add(TrainScriptPackageFramework.CNTK);
+            foreach (TrainScriptPackageFramework type in Enum.GetValues(typeof(TrainScriptPackageFramework)))
+            {
+                PackageFramework.Items.Add(type);
+            }
             PackageFramework.SelectedIndex = 1;
         }
 
@@ -32,11 +34,11 @@ namespace aipdev
         {
             if (string.IsNullOrWhiteSpace(PackageName.Text) || string.IsNullOrEmpty(PackageName.Text))
             {
-                MessageBox.Show(Application.Current.MainWindow, "请输入脚本包名","错误",MessageBoxButton.OK, MessageBoxImage.Error);
+                MessageBox.Show(Application.Current.MainWindow, "请输入脚本包名", "错误", MessageBoxButton.OK, MessageBoxImage.Error);
                 return;
             }
             NewPackageName = PackageName.Text.Trim();
-            NewPackageFramework = (TrainScriptPackageFramework) PackageFramework.SelectedItem;
+            NewPackageFramework = (TrainScriptPackageFramework)PackageFramework.SelectedItem;
             Close();
         }
 

aiplabeler/MainWindow.xaml.cs

@@ -1190,7 +1190,7 @@ namespace aiplabeler
                         var width = (int)ImageView.ImageGrid.ActualWidth;
                         var height = (int)ImageView.ImageGrid.ActualHeight;
                         var labeledImageData = new byte[0];
-                        var result2 = await LabelerManager.Shared.CommitLabeledImageAsync(_currentCase.ImageCaseId, _currentCase.LabelCaseId, _caseImage.Id, content, labelType, labeledImageData, ImageDataFormat.Jpg, width, height, _isRelabel, _isSupportedSkipFrame);
+                        var result2 = await LabelerManager.Shared.CommitLabeledImageAsync(_currentCase.ImageCaseId, _currentCase.LabelCaseId, _caseImage.Id, content, labelType, labeledImageData, ImageDataFormat.Jpg, width, height, _isRelabel, isSkipped);
                         if (!result2)
                         {
                             MessageBox.Show(this, $"提交失败，请重试", "错误", MessageBoxButton.OK, MessageBoxImage.Error);