fix: return instance instead of incrementing match in Workflow validation

Author: ChristianBeilschmidt

.generation/post-process/python.py

@@ -26,6 +26,7 @@ def file_modifications() -> Generator[tuple[Path, FileModifier], None, None]:
     yield Path("models/task_status_with_id.py"), task_status_with_id_py
     yield Path("models/time_step.py"), time_step_py
     yield Path("models/vector_result_descriptor.py"), vector_result_descriptor_py
+    yield Path("models/workflow.py"), workflow_py
 
 
 def main():
@@ -37,6 +38,17 @@ def main():
     )
 
 
+def workflow_py(file_contents: list[str]) -> Generator[str, None, None]:
+    """Modify the workflow.py file."""
+    for line in file_contents:
+        dedented_line = dedent(line)
+
+        if dedented_line.startswith("match += 1"):
+            line = indent("return instance", 3 * INDENT) + "\n"
+
+        yield line
+
+
 def api_client_py(file_contents: list[str]) -> Generator[str, None, None]:
     """Modify the api_client.py file."""
     for line in file_contents:

python/diffs/python/geoengine_openapi_client/models/workflow.py.diff

@@ -0,0 +1,33 @@
+--- python/geoengine_openapi_client/models/workflow.py
++++ python/geoengine_openapi_client/models/workflow.py
+@@ -62,12 +62,12 @@
+         if not isinstance(v, TypedOperator):
+             error_messages.append(f"Error! Input type `{type(v)}` is not `TypedOperator`")
+         else:
+-            match += 1
++            return instance
+         # validate data type: LegacyTypedOperator
+         if not isinstance(v, LegacyTypedOperator):
+             error_messages.append(f"Error! Input type `{type(v)}` is not `LegacyTypedOperator`")
+         else:
+-            match += 1
++            return instance
+         if match > 1:
+             # more than 1 match
+             raise ValueError("Multiple matches found when setting `actual_instance` in Workflow with oneOf schemas: LegacyTypedOperator, TypedOperator. Details: " + ", ".join(error_messages))
+@@ -91,13 +91,13 @@
+         # deserialize data into TypedOperator
+         try:
+             instance.actual_instance = TypedOperator.from_json(json_str)
+-            match += 1
++            return instance
+         except (ValidationError, ValueError) as e:
+             error_messages.append(str(e))
+         # deserialize data into LegacyTypedOperator
+         try:
+             instance.actual_instance = LegacyTypedOperator.from_json(json_str)
+-            match += 1
++            return instance
+         except (ValidationError, ValueError) as e:
+             error_messages.append(str(e))
+ 

python/geoengine_openapi_client/models/workflow.py

@@ -62,12 +62,12 @@ def actual_instance_must_validate_oneof(cls, v):
         if not isinstance(v, TypedOperator):
             error_messages.append(f"Error! Input type `{type(v)}` is not `TypedOperator`")
         else:
-            match += 1
+            return instance
         # validate data type: LegacyTypedOperator
         if not isinstance(v, LegacyTypedOperator):
             error_messages.append(f"Error! Input type `{type(v)}` is not `LegacyTypedOperator`")
         else:
-            match += 1
+            return instance
         if match > 1:
             # more than 1 match
             raise ValueError("Multiple matches found when setting `actual_instance` in Workflow with oneOf schemas: LegacyTypedOperator, TypedOperator. Details: " + ", ".join(error_messages))
@@ -91,13 +91,13 @@ def from_json(cls, json_str: str) -> Self:
         # deserialize data into TypedOperator
         try:
             instance.actual_instance = TypedOperator.from_json(json_str)
-            match += 1
+            return instance
         except (ValidationError, ValueError) as e:
             error_messages.append(str(e))
         # deserialize data into LegacyTypedOperator
         try:
             instance.actual_instance = LegacyTypedOperator.from_json(json_str)
-            match += 1
+            return instance
         except (ValidationError, ValueError) as e:
             error_messages.append(str(e))