Regenerate pydantic models with schema-salad-plus-pydantic 0.1.3

Fixes mypy errors in discriminator functions and load_document code.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: jmchilton

dev-requirements.txt

@@ -1,6 +1,6 @@
 # Optional dependencies
 schema-salad[pycodegen]
-schema-salad-plus-pydantic
+schema-salad-plus-pydantic>=0.1.3
 # Needs to validate v1.2
 cwltool>=3.0.20200807132242
 

gxformat2/schema/gxformat2.py

@@ -370,6 +370,6 @@ def load_document(path: str | Path) -> GalaxyWorkflow | list[GalaxyWorkflow]:
     return _load_single(data)
 
 
-def _load_single(data: dict[str, Any]) -> GalaxyWorkflow | list[GalaxyWorkflow]:
+def _load_single(data: dict[str, Any]) -> GalaxyWorkflow:
     """Load a single document dict."""
     return GalaxyWorkflow.model_validate(data)

gxformat2/schema/gxformat2_strict.py

@@ -370,6 +370,6 @@ def load_document(path: str | Path) -> GalaxyWorkflow | list[GalaxyWorkflow]:
     return _load_single(data)
 
 
-def _load_single(data: dict[str, Any]) -> GalaxyWorkflow | list[GalaxyWorkflow]:
+def _load_single(data: dict[str, Any]) -> GalaxyWorkflow:
     """Load a single document dict."""
     return GalaxyWorkflow.model_validate(data)

gxformat2/schema/native.py

@@ -55,20 +55,20 @@ class NativeStepType(str, Enum):
 
 
 def _discriminate_creator(v: Any) -> str:
-    disc_map = {"Person": "NativeCreatorPerson", "Organization": "NativeCreatorOrganization"}
+    disc_map: dict[str, str] = {"Person": "NativeCreatorPerson", "Organization": "NativeCreatorOrganization"}
     if isinstance(v, dict):
-        disc_val = v.get("class")
+        disc_val: str = str(v.get("class", ""))
     else:
-        disc_val = getattr(v, "class", None)
+        disc_val = str(getattr(v, "class", ""))
     return disc_map.get(disc_val, disc_val)
 
 
 def _discriminate_comments(v: Any) -> str:
-    disc_map = {"text": "NativeTextComment", "markdown": "NativeMarkdownComment", "frame": "NativeFrameComment", "freehand": "NativeFreehandComment"}
+    disc_map: dict[str, str] = {"text": "NativeTextComment", "markdown": "NativeMarkdownComment", "frame": "NativeFrameComment", "freehand": "NativeFreehandComment"}
     if isinstance(v, dict):
-        disc_val = v.get("type")
+        disc_val: str = str(v.get("type", ""))
     else:
-        disc_val = getattr(v, "type", None)
+        disc_val = str(getattr(v, "type", ""))
     return disc_map.get(disc_val, disc_val)
 
 
@@ -452,6 +452,6 @@ def load_document(path: str | Path) -> NativeGalaxyWorkflow | list[NativeGalaxyW
     return _load_single(data)
 
 
-def _load_single(data: dict[str, Any]) -> NativeGalaxyWorkflow | list[NativeGalaxyWorkflow]:
+def _load_single(data: dict[str, Any]) -> NativeGalaxyWorkflow:
     """Load a single document dict."""
     return NativeGalaxyWorkflow.model_validate(data)

gxformat2/schema/native_strict.py

@@ -55,20 +55,20 @@ class NativeStepType(str, Enum):
 
 
 def _discriminate_creator(v: Any) -> str:
-    disc_map = {"Person": "NativeCreatorPerson", "Organization": "NativeCreatorOrganization"}
+    disc_map: dict[str, str] = {"Person": "NativeCreatorPerson", "Organization": "NativeCreatorOrganization"}
     if isinstance(v, dict):
-        disc_val = v.get("class")
+        disc_val: str = str(v.get("class", ""))
     else:
-        disc_val = getattr(v, "class", None)
+        disc_val = str(getattr(v, "class", ""))
     return disc_map.get(disc_val, disc_val)
 
 
 def _discriminate_comments(v: Any) -> str:
-    disc_map = {"text": "NativeTextComment", "markdown": "NativeMarkdownComment", "frame": "NativeFrameComment", "freehand": "NativeFreehandComment"}
+    disc_map: dict[str, str] = {"text": "NativeTextComment", "markdown": "NativeMarkdownComment", "frame": "NativeFrameComment", "freehand": "NativeFreehandComment"}
     if isinstance(v, dict):
-        disc_val = v.get("type")
+        disc_val: str = str(v.get("type", ""))
     else:
-        disc_val = getattr(v, "type", None)
+        disc_val = str(getattr(v, "type", ""))
     return disc_map.get(disc_val, disc_val)
 
 
@@ -452,6 +452,6 @@ def load_document(path: str | Path) -> NativeGalaxyWorkflow | list[NativeGalaxyW
     return _load_single(data)
 
 
-def _load_single(data: dict[str, Any]) -> NativeGalaxyWorkflow | list[NativeGalaxyWorkflow]:
+def _load_single(data: dict[str, Any]) -> NativeGalaxyWorkflow:
     """Load a single document dict."""
     return NativeGalaxyWorkflow.model_validate(data)

pyproject.toml

@@ -64,7 +64,7 @@ test = [
 ]
 dev = [
     "schema-salad[pycodegen]",
-    "schema-salad-plus-pydantic",
+    "schema-salad-plus-pydantic>=0.1.3",
     "cwltool>=3.0.20200807132242",
 ]