fastprocesses 0.22.2__tar.gz → 0.22.3__tar.gz

{fastprocesses-0.22.2 → fastprocesses-0.22.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastprocesses
-Version: 0.22.2
+Version: 0.22.3
 Summary: A library to create a FastAPI-based  OGC API Processes wrapper around existing projects.
 License-File: AUTHORS.md
 Author: Stefan Schuhart
@@ -39,7 +39,7 @@ A library to create a FastAPI-based OGC API Processes wrapper around existing pr
 
 AI helped to create this code.
 
-## Version: 0.22.2
+## Version: 0.22.3
 
 ### Description
 

{fastprocesses-0.22.2 → fastprocesses-0.22.3}/README.md

@@ -4,7 +4,7 @@ A library to create a FastAPI-based OGC API Processes wrapper around existing pr
 
 AI helped to create this code.
 
-## Version: 0.22.2
+## Version: 0.22.3
 
 ### Description
 

{fastprocesses-0.22.2 → fastprocesses-0.22.3}/pyproject.toml

@@ -79,7 +79,7 @@ exclude = [
 
 [tool.poetry]
 name = "fastprocesses"
-version = "0.22.2"
+version = "0.22.3"
 description = "A library to create a FastAPI-based  OGC API Processes wrapper around existing projects."
 authors = ["Stefan Schuhart <stefan.schuhart@gv.hamburg.de>"]
 readme = "README.md"

{fastprocesses-0.22.2 → fastprocesses-0.22.3}/src/fastprocesses/core/base_process.py

@@ -470,6 +470,7 @@ class BaseParallelProcess(BaseProcess, ABC):
     @abstractmethod
     def merge_results(
         self, results: List[Dict[str, Any]],
+        exec_body: Dict[str, Any],
         job_progress_callback: JobProgressCallback | None = None,
     ) -> BaseProcessResult:
         """
@@ -479,6 +480,9 @@ class BaseParallelProcess(BaseProcess, ABC):
             results: List of partial results.  Each element is the ``dict``
                 produced by serialising the ``BaseModel`` returned from
                 ``execute_single`` (i.e. the output of ``model.model_dump()``).
+            exec_body: The original ``exec_body`` dict passed to ``execute``.
+                Gives the merge step access to the raw inputs without requiring
+                them to be smuggled through partial results.
 
         Returns:
             A ``BaseProcessResult`` instance holding the final output values.
@@ -516,7 +520,7 @@ class BaseParallelProcess(BaseProcess, ABC):
                         return await p
                     partial = asyncio.run(_await())
             raw_results.append(partial.model_dump(exclude_none=True))
-        return self.merge_results(raw_results)
+        return self.merge_results(raw_results, exec_body)
 
 
 # ---------------------------------------------------------------------------

{fastprocesses-0.22.2 → fastprocesses-0.22.3}/src/fastprocesses/core/models.py

@@ -231,10 +231,7 @@ def deserialize_json(value: Any) -> Any:
 
 class CalculationTask(BaseModel):
     inputs: Annotated[Dict[str, Any], AfterValidator(deserialize_json)]
-    outputs: (
-        Annotated[dict[str, OutputControl], AfterValidator(deserialize_json)]
-        | None
-    ) = None
+    outputs: dict[str, OutputControl] | None = None
     response: ResponseType = ResponseType.RAW
 
     def _hash_dict(self):

{fastprocesses-0.22.2 → fastprocesses-0.22.3}/src/fastprocesses/core/output_schema_resolver.py

@@ -87,10 +87,20 @@ def _default_media_type(schema: Schema) -> str | None:
             return preferred_media_type
 
     # None of the preferred types matched — return whatever the schema advertises
-    return next(
+    advertised_media_type = next(
         (media_type for media_type in candidate_media_types if media_type is not None),
         None,
     )
+    if advertised_media_type is not None:
+        return advertised_media_type
+
+    # OGC examples frequently describe JSON-native outputs (array/object/number
+    # etc.) without explicit contentMediaType/format hints. Treat these as
+    # application/json by default so resolver behavior matches spec examples.
+    if schema.oneOf is None:
+        return "application/json"
+
+    return None
 
 
 def _is_binary(schema: Schema) -> bool:

{fastprocesses-0.22.2 → fastprocesses-0.22.3}/src/fastprocesses/worker/chord_tasks.py

@@ -185,7 +185,8 @@ def finalize_parallel(
         update_job_status(
             job_id, 95, "Merging parallel results.", JobStatusCode.RUNNING
         )
-        merge_result = process.merge_results(actual_results)
+        exec_body: dict = original_input or {}
+        merge_result = process.merge_results(actual_results, exec_body)
         merged = merge_result.model_dump(mode="json")
 
         try: