feat: update run specs to exclude embedded function from schema gener…

…ation
scc-digitalhub · Sep 5, 2024 · 69982c3 · 69982c3
1 parent c5e1664
commit 69982c3
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 0 deletions.
diff --git a/...iner/src/main/java/it/smartcommunitylabdhub/runtime/container/specs/ContainerRunSpec.java b/...iner/src/main/java/it/smartcommunitylabdhub/runtime/container/specs/ContainerRunSpec.java
@@ -2,6 +2,7 @@
 
 import com.fasterxml.jackson.annotation.JsonUnwrapped;
 import it.smartcommunitylabdhub.commons.annotations.common.SpecType;
+import it.smartcommunitylabdhub.commons.jackson.annotations.JsonSchemaIgnore;
 import it.smartcommunitylabdhub.commons.models.entities.run.RunBaseSpec;
 import it.smartcommunitylabdhub.commons.models.enums.EntityName;
 import it.smartcommunitylabdhub.runtime.container.ContainerRuntime;
@@ -35,6 +36,7 @@ public class ContainerRunSpec extends RunBaseSpec {
     private ContainerBuildTaskSpec taskBuildSpec;
 
     // @JsonProperty("function_spec")
+    @JsonSchemaIgnore
     @JsonUnwrapped
     private ContainerFunctionSpec functionSpec;
 

diff --git a/modules/runtime-dbt/src/main/java/it/smartcommunitylabdhub/runtime/dbt/specs/DbtRunSpec.java b/modules/runtime-dbt/src/main/java/it/smartcommunitylabdhub/runtime/dbt/specs/DbtRunSpec.java
@@ -2,6 +2,7 @@
 
 import com.fasterxml.jackson.annotation.JsonUnwrapped;
 import it.smartcommunitylabdhub.commons.annotations.common.SpecType;
+import it.smartcommunitylabdhub.commons.jackson.annotations.JsonSchemaIgnore;
 import it.smartcommunitylabdhub.commons.models.entities.run.RunBaseSpec;
 import it.smartcommunitylabdhub.commons.models.enums.EntityName;
 import it.smartcommunitylabdhub.runtime.dbt.DbtRuntime;
@@ -29,6 +30,7 @@ public class DbtRunSpec extends RunBaseSpec {
     @JsonUnwrapped
     private DbtTransformSpec taskSpec;
 
+    @JsonSchemaIgnore
     @JsonUnwrapped
     private DbtFunctionSpec functionSpec;
 

diff --git a/modules/runtime-kfp/src/main/java/it/smartcommunitylabdhub/runtime/kfp/specs/KFPRunSpec.java b/modules/runtime-kfp/src/main/java/it/smartcommunitylabdhub/runtime/kfp/specs/KFPRunSpec.java
@@ -2,6 +2,7 @@
 
 import com.fasterxml.jackson.annotation.JsonUnwrapped;
 import it.smartcommunitylabdhub.commons.annotations.common.SpecType;
+import it.smartcommunitylabdhub.commons.jackson.annotations.JsonSchemaIgnore;
 import it.smartcommunitylabdhub.commons.models.entities.run.RunBaseSpec;
 import it.smartcommunitylabdhub.commons.models.enums.EntityName;
 import it.smartcommunitylabdhub.runtime.kfp.KFPRuntime;
@@ -27,6 +28,7 @@ public class KFPRunSpec extends RunBaseSpec {
     private Map<String, Serializable> parameters = new HashMap<>();
 
     // @JsonProperty("workflow_spec")
+    @JsonSchemaIgnore
     @JsonUnwrapped
     private KFPWorkflowSpec workflowSpec;
 

diff --git a/...untime-mlrun/src/main/java/it/smartcommunitylabdhub/runtime/mlrun/specs/MlrunRunSpec.java b/...untime-mlrun/src/main/java/it/smartcommunitylabdhub/runtime/mlrun/specs/MlrunRunSpec.java
@@ -2,6 +2,7 @@
 
 import com.fasterxml.jackson.annotation.JsonUnwrapped;
 import it.smartcommunitylabdhub.commons.annotations.common.SpecType;
+import it.smartcommunitylabdhub.commons.jackson.annotations.JsonSchemaIgnore;
 import it.smartcommunitylabdhub.commons.models.entities.run.RunBaseSpec;
 import it.smartcommunitylabdhub.commons.models.enums.EntityName;
 import it.smartcommunitylabdhub.runtime.mlrun.MlrunRuntime;
@@ -35,6 +36,7 @@ public class MlrunRunSpec extends RunBaseSpec {
     private MlrunBuildTaskSpec buildSpec;
 
     // @JsonProperty("function_spec")
+    @JsonSchemaIgnore
     @JsonUnwrapped
     private MlrunFunctionSpec functionSpec;
 

diff --git a/...main/java/it/smartcommunitylabdhub/runtime/huggingface/specs/HuggingfaceServeRunSpec.java b/...main/java/it/smartcommunitylabdhub/runtime/huggingface/specs/HuggingfaceServeRunSpec.java
@@ -2,6 +2,7 @@
 
 import com.fasterxml.jackson.annotation.JsonUnwrapped;
 import it.smartcommunitylabdhub.commons.annotations.common.SpecType;
+import it.smartcommunitylabdhub.commons.jackson.annotations.JsonSchemaIgnore;
 import it.smartcommunitylabdhub.commons.models.entities.run.RunBaseSpec;
 import it.smartcommunitylabdhub.commons.models.enums.EntityName;
 import it.smartcommunitylabdhub.runtime.huggingface.HuggingfaceServeRuntime;
@@ -17,6 +18,7 @@
 @SpecType(runtime = HuggingfaceServeRuntime.RUNTIME, kind = HuggingfaceServeRunSpec.KIND, entity = EntityName.RUN)
 public class HuggingfaceServeRunSpec extends RunBaseSpec {
 
+    @JsonSchemaIgnore
     @JsonUnwrapped
     private HuggingfaceServeFunctionSpec functionSpec;
 

diff --git a/...serve/src/main/java/it/smartcommunitylabdhub/runtime/mlflow/specs/MlflowServeRunSpec.java b/...serve/src/main/java/it/smartcommunitylabdhub/runtime/mlflow/specs/MlflowServeRunSpec.java
@@ -2,6 +2,7 @@
 
 import com.fasterxml.jackson.annotation.JsonUnwrapped;
 import it.smartcommunitylabdhub.commons.annotations.common.SpecType;
+import it.smartcommunitylabdhub.commons.jackson.annotations.JsonSchemaIgnore;
 import it.smartcommunitylabdhub.commons.models.entities.run.RunBaseSpec;
 import it.smartcommunitylabdhub.commons.models.enums.EntityName;
 import it.smartcommunitylabdhub.runtime.mlflow.MlflowServeRuntime;
@@ -19,6 +20,7 @@ public class MlflowServeRunSpec extends RunBaseSpec {
 
     public static final String KIND = MlflowServeRuntime.RUNTIME + "+run";
 
+    @JsonSchemaIgnore
     @JsonUnwrapped
     private MlflowServeFunctionSpec functionSpec;
 

diff --git a/...rve/src/main/java/it/smartcommunitylabdhub/runtime/sklearn/specs/SklearnServeRunSpec.java b/...rve/src/main/java/it/smartcommunitylabdhub/runtime/sklearn/specs/SklearnServeRunSpec.java
@@ -2,6 +2,7 @@
 
 import com.fasterxml.jackson.annotation.JsonUnwrapped;
 import it.smartcommunitylabdhub.commons.annotations.common.SpecType;
+import it.smartcommunitylabdhub.commons.jackson.annotations.JsonSchemaIgnore;
 import it.smartcommunitylabdhub.commons.models.entities.run.RunBaseSpec;
 import it.smartcommunitylabdhub.commons.models.enums.EntityName;
 import it.smartcommunitylabdhub.runtime.sklearn.SklearnServeRuntime;
@@ -17,6 +18,7 @@
 @SpecType(runtime = SklearnServeRuntime.RUNTIME, kind = SklearnServeRunSpec.KIND, entity = EntityName.RUN)
 public class SklearnServeRunSpec extends RunBaseSpec {
 
+    @JsonSchemaIgnore
     @JsonUnwrapped
     private SklearnServeFunctionSpec functionSpec;
 

diff --git a/...fertem/src/main/java/it/smartcommunitylabdhub/runtime/nefertem/specs/NefertemRunSpec.java b/...fertem/src/main/java/it/smartcommunitylabdhub/runtime/nefertem/specs/NefertemRunSpec.java
@@ -2,6 +2,7 @@
 
 import com.fasterxml.jackson.annotation.JsonUnwrapped;
 import it.smartcommunitylabdhub.commons.annotations.common.SpecType;
+import it.smartcommunitylabdhub.commons.jackson.annotations.JsonSchemaIgnore;
 import it.smartcommunitylabdhub.commons.models.entities.run.RunBaseSpec;
 import it.smartcommunitylabdhub.commons.models.enums.EntityName;
 import it.smartcommunitylabdhub.runtime.nefertem.NefertemRuntime;
@@ -38,6 +39,7 @@ public class NefertemRunSpec extends RunBaseSpec {
     @JsonUnwrapped
     private NefertemValidateTaskSpec taskValidateSpec;
 
+    @JsonSchemaIgnore
     @JsonUnwrapped
     private NefertemFunctionSpec functionSpec;
 

diff --git a/...ime-python/src/main/java/it/smartcommunitylabdhub/runtime/python/specs/PythonRunSpec.java b/...ime-python/src/main/java/it/smartcommunitylabdhub/runtime/python/specs/PythonRunSpec.java
@@ -2,6 +2,7 @@
 
 import com.fasterxml.jackson.annotation.JsonUnwrapped;
 import it.smartcommunitylabdhub.commons.annotations.common.SpecType;
+import it.smartcommunitylabdhub.commons.jackson.annotations.JsonSchemaIgnore;
 import it.smartcommunitylabdhub.commons.models.entities.run.RunBaseSpec;
 import it.smartcommunitylabdhub.commons.models.enums.EntityName;
 import it.smartcommunitylabdhub.runtime.python.PythonRuntime;
@@ -29,6 +30,7 @@ public class PythonRunSpec extends RunBaseSpec {
     @JsonUnwrapped
     private PythonBuildTaskSpec taskBuildSpec;
 
+    @JsonSchemaIgnore
     @JsonUnwrapped
     private PythonFunctionSpec functionSpec;