feat: 优化泛型定义；添加模型测试参数获取 (jetlinks#114)

Author: goten7

jetlinks-sdk-api/src/main/java/org/jetlinks/sdk/server/ai/InternalCVTaskTarget.java

@@ -3,6 +3,7 @@
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import lombok.Setter;
 import org.hswebframework.web.i18n.LocaleUtils;
 import org.jetlinks.sdk.server.ai.cv.ComputerVisionCommand;
 import org.jetlinks.sdk.server.ai.cv.ObjectDetectionCommand;
@@ -87,6 +88,7 @@ public static  SimpleComputerVisionCommand createCommand(TaskTarget target) {
         return new SimpleComputerVisionCommand(target.getValue());
     }
 
+    @Setter
     @Getter
     @AllArgsConstructor
     @NoArgsConstructor

jetlinks-sdk-api/src/main/java/org/jetlinks/sdk/server/ai/SimpleGenericAiOutput.java

@@ -2,7 +2,6 @@
 
 import lombok.Getter;
 import lombok.Setter;
-import lombok.SneakyThrows;
 import org.apache.commons.collections4.CollectionUtils;
 import org.jetlinks.core.utils.SerializeUtils;
 import org.jetlinks.sdk.server.file.FileData;
@@ -19,7 +18,7 @@
 
 @Getter
 @Setter
-public abstract class SimpleGenericAiOutput<T extends FileData> extends GenericAiOutput<SimpleGenericAiOutput<T>> {
+public abstract class SimpleGenericAiOutput<T extends FileData, SELF extends SimpleGenericAiOutput<T, SELF>> extends GenericAiOutput<SELF> {
 
     private Integer hitValue;
 
@@ -83,7 +82,7 @@ public void writeExternal(ObjectOutput out) throws IOException {
     }
 
     @Override
-    public void readExternal(ObjectInput in) throws IOException,ClassNotFoundException {
+    public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
         hitValue = readNullable(in, () -> {
             try {
                 return in.readInt();

jetlinks-sdk-api/src/main/java/org/jetlinks/sdk/server/ai/SimpleImageGenericAiOutput.java

@@ -5,7 +5,7 @@
 import java.util.function.Supplier;
 
 
-public class SimpleImageGenericAiOutput extends SimpleGenericAiOutput<ImageData> {
+public class SimpleImageGenericAiOutput extends SimpleGenericAiOutput<ImageData, SimpleImageGenericAiOutput> {
 
     public Supplier<ImageData> newFileDataSupplier() {
         return ImageData::new;

jetlinks-sdk-api/src/main/java/org/jetlinks/sdk/server/ai/cv/ObjectDetectionResult.java

@@ -22,6 +22,7 @@
 public class ObjectDetectionResult extends AiCommandResult<ObjectDetectionResult> {
 
     public static final String IMAGES = "images";
+    public static final String OBJECTS = "objects";
 
     @Schema(title = "图像数据")
     private List<ImageData> images;
@@ -39,7 +40,7 @@ public List<? extends FileData> files() {
 
     @Override
     public Map<String, Object> schemaMap() {
-        return Collections.singletonMap("objects", objects);
+        return Collections.singletonMap(OBJECTS, objects);
     }
 
     @Override

jetlinks-sdk-api/src/main/java/org/jetlinks/sdk/server/ai/model/AiModelPortrait.java

@@ -8,7 +8,6 @@
 import org.jetlinks.core.metadata.DataType;
 import org.jetlinks.core.utils.SerializeUtils;
 
-import javax.annotation.Nullable;
 import java.io.Externalizable;
 import java.io.IOException;
 import java.io.ObjectInput;
@@ -25,6 +24,9 @@ public class AiModelPortrait implements Externalizable {
     @Schema(description = "入参及文档")
     private ConfigMetadata input;
 
+    @Schema(description = "测试入参及文档")
+    private ConfigMetadata testInput;
+
     @Deprecated
     @Schema(description = "出参")
     private DataType output;
@@ -36,6 +38,7 @@ public class AiModelPortrait implements Externalizable {
     public void writeExternal(ObjectOutput out) throws IOException {
         out.writeByte(1);
         SerializeUtils.writeObject(input, out);
+        SerializeUtils.writeObject(testInput, out);
         SerializeUtils.writeObject(output, out);
         SerializeUtils.writeKeyValue(others, out);
     }
@@ -45,6 +48,7 @@ public void readExternal(ObjectInput in) throws IOException, ClassNotFoundExcept
         byte version = in.readByte();
         if (version == 1) {
             input = (ConfigMetadata) SerializeUtils.readObject(in);
+            testInput = (ConfigMetadata) SerializeUtils.readObject(in);
             output = (DataType) SerializeUtils.readObject(in);
             others = SerializeUtils.readMap(in, Maps::newHashMapWithExpectedSize);
         }