chore: repackage and move model specs

application/src/main/java/it/smartcommunitylabdhub/core/models/specs/model/ModelSpec.java

@@ -2,6 +2,6 @@
 
 import it.smartcommunitylabdhub.commons.annotations.common.SpecType;
 import it.smartcommunitylabdhub.commons.models.entities.EntityName;
+
 @SpecType(kind = "model", entity = EntityName.MODEL)
-public class ModelSpec extends it.smartcommunitylabdhub.commons.models.model.ModelBaseSpec {
-}
+public class ModelSpec extends it.smartcommunitylabdhub.commons.models.model.ModelBaseSpec {}

modules/commons/src/main/java/it/smartcommunitylabdhub/commons/annotations/common/SpecType.java

@@ -1,13 +1,12 @@
 package it.smartcommunitylabdhub.commons.annotations.common;
 
+import it.smartcommunitylabdhub.commons.models.entities.EntityName;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 import org.springframework.stereotype.Indexed;
 
-import it.smartcommunitylabdhub.commons.models.entities.EntityName;
-
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)
 @Indexed

modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/model/HuggingFaceModelSpec.java → modules/runtime-model-serve/src/main/java/it/smartcommunitylabdhub/runtime/huggingface/specs/HuggingFaceModelSpec.java

@@ -1,17 +1,18 @@
-package it.smartcommunitylabdhub.commons.models.model;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import java.io.Serializable;
-import java.util.Map;
+package it.smartcommunitylabdhub.runtime.huggingface.specs;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-
 import io.swagger.v3.oas.annotations.media.Schema;
+import it.smartcommunitylabdhub.commons.annotations.common.SpecType;
+import it.smartcommunitylabdhub.commons.models.entities.EntityName;
+import it.smartcommunitylabdhub.commons.models.model.ModelSpec;
+import java.io.Serializable;
+import java.util.Map;
+import lombok.Getter;
+import lombok.Setter;
 
 @Getter
 @Setter
+@SpecType(kind = "huggingface", entity = EntityName.MODEL)
 public class HuggingFaceModelSpec extends ModelSpec {
 
     //Huggingface model id
@@ -21,7 +22,10 @@ public class HuggingFaceModelSpec extends ModelSpec {
 
     //Huggingface model revision
     @JsonProperty("model_revision")
-    @Schema(title = "fields.huggingface.modelrevision.title", description = "fields.huggingface.modelrevision.description")
+    @Schema(
+        title = "fields.huggingface.modelrevision.title",
+        description = "fields.huggingface.modelrevision.description"
+    )
     private String modelRevision;
 
     @Override

modules/runtime-model-serve/src/main/java/it/smartcommunitylabdhub/runtime/mlflow/models/Dataset.java

@@ -0,0 +1,45 @@
+package it.smartcommunitylabdhub.runtime.mlflow.models;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class Dataset {
+
+    @Schema(title = "fields.mlflow.inputdatasetname.title", description = "fields.mlflow.inputdatasetname.description")
+    private String name;
+
+    @Schema(
+        title = "fields.mlflow.inputdatasetdigest.title",
+        description = "fields.mlflow.inputdatasetdigest.description"
+    )
+    private String digest;
+
+    @Schema(
+        title = "fields.mlflow.inputdatasetprofile.title",
+        description = "fields.mlflow.inputdatasetprofile.description"
+    )
+    private String profile;
+
+    @Schema(
+        title = "fields.mlflow.inputdatasetschema.title",
+        description = "fields.mlflow.inputdatasetschema.description"
+    )
+    private String schema;
+
+    @Schema(
+        title = "fields.mlflow.inputdatasetsource.title",
+        description = "fields.mlflow.inputdatasetsource.description"
+    )
+    private String source;
+
+    @JsonProperty("source_type")
+    @Schema(
+        title = "fields.mlflow.inputdatasetsourcetype.title",
+        description = "fields.mlflow.inputdatasetsourcetype.description"
+    )
+    private String sourceType;
+}

modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/model/mlflow/Signature.java → modules/runtime-model-serve/src/main/java/it/smartcommunitylabdhub/runtime/mlflow/models/Signature.java

@@ -1,4 +1,4 @@
-package it.smartcommunitylabdhub.commons.models.model.mlflow;
+package it.smartcommunitylabdhub.runtime.mlflow.models;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Getter;
@@ -10,8 +10,10 @@ public class Signature {
 
     @Schema(title = "fields.mlflow.signatureinputs.title", description = "fields.mlflow.signatureinputs.description")
     private String inputs;
+
     @Schema(title = "fields.mlflow.signatureoutputs.title", description = "fields.mlflow.signatureoutputs.description")
     private String outputs;
+
     @Schema(title = "fields.mlflow.signatureparams.title", description = "fields.mlflow.signatureparams.description")
     private String params;
-}
+}

modules/commons/src/main/java/it/smartcommunitylabdhub/commons/models/model/MlflowModelSpec.java → modules/runtime-model-serve/src/main/java/it/smartcommunitylabdhub/runtime/mlflow/specs/MlflowModelSpec.java

@@ -1,26 +1,26 @@
-package it.smartcommunitylabdhub.commons.models.model;
-
-
-import lombok.Getter;
-import lombok.Setter;
+package it.smartcommunitylabdhub.runtime.mlflow.specs;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import it.smartcommunitylabdhub.commons.annotations.common.SpecType;
+import it.smartcommunitylabdhub.commons.models.entities.EntityName;
+import it.smartcommunitylabdhub.commons.models.model.ModelSpec;
+import it.smartcommunitylabdhub.runtime.mlflow.models.Dataset;
+import it.smartcommunitylabdhub.runtime.mlflow.models.Signature;
 import java.io.Serializable;
 import java.util.List;
 import java.util.Map;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import it.smartcommunitylabdhub.commons.models.model.mlflow.Dataset;
-import it.smartcommunitylabdhub.commons.models.model.mlflow.Signature;
+import lombok.Getter;
+import lombok.Setter;
 
 @Getter
 @Setter
+@SpecType(kind = "mlflow", entity = EntityName.MODEL)
 public class MlflowModelSpec extends ModelSpec {
 
     @Schema(title = "fields.mlflow.flavor.title", description = "fields.mlflow.flavor.description")
     private String flavor;
-    
+
     @JsonProperty("model_config")
     @Schema(title = "fields.mlflow.modelconfig.title", description = "fields.mlflow.modelconfig.description")
     private Map<String, String> modelConfig;
@@ -42,4 +42,4 @@ public void configure(Map<String, Serializable> data) {
         this.inputDatasets = spec.getInputDatasets();
         this.modelConfig = spec.getModelConfig();
     }
-}
+}

application/src/main/java/it/smartcommunitylabdhub/core/models/specs/model/SKLearnModelSpec.java → modules/runtime-model-serve/src/main/java/it/smartcommunitylabdhub/runtime/sklearn/specs/SKLearnModelSpec.java

@@ -1,9 +1,8 @@
-package it.smartcommunitylabdhub.core.models.specs.model;
-
+package it.smartcommunitylabdhub.runtime.sklearn.specs;
 
 import it.smartcommunitylabdhub.commons.annotations.common.SpecType;
 import it.smartcommunitylabdhub.commons.models.entities.EntityName;
+import it.smartcommunitylabdhub.commons.models.model.ModelSpec;
 
 @SpecType(kind = "sklearn", entity = EntityName.MODEL)
-public class SKLearnModelSpec extends it.smartcommunitylabdhub.commons.models.model.SKLearnModelSpec {
-}
+public class SKLearnModelSpec extends ModelSpec {}