fastprocesses 0.22.2__tar.gz → 0.22.4__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastprocesses
-Version: 0.22.2
+Version: 0.22.4
 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.4
 
 ### Description
 

{fastprocesses-0.22.2 → fastprocesses-0.22.4}/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.4
 
 ### Description
 

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

@@ -79,7 +79,7 @@ exclude = [
 
 [tool.poetry]
 name = "fastprocesses"
-version = "0.22.2"
+version = "0.22.4"
 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.4}/src/fastprocesses/api/manager.py

@@ -508,7 +508,17 @@ class ProcessManager:
             # Avoids jsonable_encoder + model_dump + json.dumps — up to 4 full
             # Python-level passes through the input data — before returning 201.
             # Cache lookup is handled by the worker (see find_result_in_cache).
-            return AsyncExecutionStrategy(self).execute_raw(process_id, raw_body)
+            response = AsyncExecutionStrategy(self).execute_raw(process_id, raw_body)
+            if isinstance(response, ProcessExecResponse):
+                # Persist the original requested outputs and response mode so
+                # GET /jobs/{job_id}/results can honour per-request format
+                # preferences rather than always returning every output.
+                request_meta = {
+                    "outputs": data.model_dump(mode="json", include={"outputs"})["outputs"],
+                    "response": data.response,
+                }
+                self.job_status_cache.put(f"job_request:{response.jobID}", request_meta)
+            return response
 
         # Sync path: build CalculationTask for cache key and result retrieval.
         # Sync execution is intended for fast/small jobs where this overhead is acceptable.

{fastprocesses-0.22.2 → fastprocesses-0.22.4}/src/fastprocesses/api/router.py

@@ -383,14 +383,18 @@ def get_router(
                 process = process_manager.process_registry.get_process(process_id)
                 result_class = _get_result_class(process)
                 if result_class is not None and isinstance(result, dict):
-                    # Retrieve the original outputs + response mode from the job record.
-                    # These are stored in the CalculationTask that was submitted with the job.
-                    # For now fall back to returning all outputs in document mode when
-                    # the job record doesn't carry per-request format preferences.
+                    # Retrieve the original requested outputs and response mode
+                    # that were stored when the job was submitted.  Falls back
+                    # to {} (all outputs, document mode) for legacy job records.
+                    job_request = process_manager.job_status_cache.get(
+                        f"job_request:{job_id}"
+                    )
+                    requested_outputs = (job_request or {}).get("outputs") or {}
+                    response_mode = (job_request or {}).get("response") or "document"
                     return serialize_result(
                         result_class.model_validate(result),
-                        {},  # empty → resolve all described outputs
-                        "document",
+                        requested_outputs,
+                        response_mode,
                         process.process_description,
                     )
             return JSONResponse(content=result)

{fastprocesses-0.22.2 → fastprocesses-0.22.4}/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.4}/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.4}/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.4}/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: