procodile 0.0.9__tar.gz → 0.1.1__tar.gz

{procodile-0.0.9 → procodile-0.1.1}/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.4
 Name: procodile
-Version: 0.0.9
+Version: 0.1.1
 Summary: A light-weight processor development framework
 Project-URL: Documentation, https://eo-tools.github.io/eozilla
 Project-URL: Repository, https://github.com/eo-tools/eozilla
 Project-URL: Changelog, https://github.com/eo-tools/eozilla/blob/main/CHANGES.md
 Project-URL: Issues, https://github.com/eo-tools/eozilla/issues
-Author: Norman Fomferra (Brockmann Consult GmbH), Tejas Morbagal Harish (Brockmann Consult GmbH)
+Author-email: b-yogesh <b-yogesh@users.noreply.github.com>, forman <forman@users.noreply.github.com>, pont-us <pont-us@users.noreply.github.com>, TejasMorbagal <TejasMorbagal@users.noreply.github.com>
 License: Apache-2.0
 License-File: LICENSE
 Keywords: data processing,eo,esa,ogc
@@ -19,15 +19,15 @@ Classifier: Operating System :: Microsoft :: Windows
 Classifier: Operating System :: POSIX
 Classifier: Operating System :: Unix
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Scientific/Engineering
 Classifier: Topic :: Software Development
 Classifier: Typing :: Typed
 Requires-Python: >=3.10
-Requires-Dist: gavicore>=0.0.7
+Requires-Dist: gavicore>=0.1.1
 Requires-Dist: pydantic
 Requires-Dist: pyyaml
 Requires-Dist: typer

{procodile-0.0.9 → procodile-0.1.1}/procodile/__init__.py

@@ -1,4 +1,4 @@
-#  Copyright (c) 2025 by the Eozilla team and contributors
+#  Copyright (c) 2025-2026 by the Eozilla team and contributors
 #  Permissions are hereby granted under the terms of the Apache 2.0 License:
 #  https://opensource.org/license/apache-2-0.
 
@@ -10,7 +10,7 @@ from gavicore.util.request import ExecutionRequest
 
 from .artifacts import ArtifactRef, ArtifactStore, ExecutionContext
 from .job import Job, JobCancelledException, JobContext
-from .process import Process, additional_parameters
+from .process import Process
 from .registry import ProcessRegistry
 from .workflow import (
     FromMain,
@@ -22,7 +22,6 @@ from .workflow import (
 """Processes development API."""
 
 __all__ = [
-    "additional_parameters",
     "ArtifactRef",
     "ArtifactStore",
     "__version__",

{procodile-0.0.9 → procodile-0.1.1}/procodile/artifacts.py

@@ -1,3 +1,7 @@
+#  Copyright (c) 2026 by the Eozilla team and contributors
+#  Permissions are hereby granted under the terms of the Apache 2.0 License:
+#  https://opensource.org/license/apache-2-0.
+
 from abc import ABC, abstractmethod
 from dataclasses import dataclass
 from typing import Any, Mapping, TypeAlias

{procodile-0.0.9 → procodile-0.1.1}/procodile/cli/__init__.py

@@ -1,4 +1,4 @@
-#  Copyright (c) 2025 by the Eozilla team and contributors
+#  Copyright (c) 2025-2026 by the Eozilla team and contributors
 #  Permissions are hereby granted under the terms of the Apache 2.0 License:
 #  https://opensource.org/license/apache-2-0.
 

{procodile-0.0.9 → procodile-0.1.1}/procodile/cli/cli.py

@@ -1,4 +1,4 @@
-#  Copyright (c) 2025 by the Eozilla team and contributors
+#  Copyright (c) 2025-2026 by the Eozilla team and contributors
 #  Permissions are hereby granted under the terms of the Apache 2.0 License:
 #  https://opensource.org/license/apache-2-0.
 

{procodile-0.0.9 → procodile-0.1.1}/procodile/job.py

@@ -1,4 +1,4 @@
-#  Copyright (c) 2025 by the Eozilla team and contributors
+#  Copyright (c) 2025-2026 by the Eozilla team and contributors
 #  Permissions are hereby granted under the terms of the Apache 2.0 License:
 #  https://opensource.org/license/apache-2-0.
 
@@ -17,7 +17,6 @@ from gavicore.models import (
     JobInfo,
     JobResults,
     JobStatus,
-    JobType,
     ProcessRequest,
     Schema,
     Subscriber,
@@ -195,9 +194,8 @@ class Job(JobContext):
         self.process = process
         # noinspection PyTypeChecker
         self.job_info = JobInfo(  # noqa [call-arg]
-            type=JobType.process,
-            processID=process.description.id,
             jobID=job_id,
+            processID=process.description.id,
             status=JobStatus.accepted,
             created=self._now(),
         )

{procodile-0.0.9 → procodile-0.1.1}/procodile/process.py

@@ -1,4 +1,4 @@
-#  Copyright (c) 2025 by the Eozilla team and contributors
+#  Copyright (c) 2025-2026 by the Eozilla team and contributors
 #  Permissions are hereby granted under the terms of the Apache 2.0 License:
 #  https://opensource.org/license/apache-2-0.
 
@@ -10,14 +10,13 @@ from pydantic import BaseModel, Field, ValidationError, create_model
 from pydantic.fields import FieldInfo
 
 from gavicore.models import (
-    AdditionalParameter,
-    AdditionalParameters,
     InputDescription,
     OutputDescription,
     ProcessDescription,
     Schema,
 )
-from gavicore.util.schema import create_schema_dict
+
+from .schema import model_class_to_openapi_schema_dict
 
 
 @dataclass
@@ -133,31 +132,6 @@ class Process:
         )
 
 
-def additional_parameters(
-    parameters: dict[str, Any], **metadata: Any
-) -> AdditionalParameters:
-    """
-    Helper function that creates an instance of `AdditionalParameters`
-    from the keys and values given the `parameters` dictionary.
-    The return value is used as the `additionalParameters` argument of an
-    `InputDescription` or `OutputDescription`.
-
-    Args:
-        parameters: the parameter key-value pairs.
-        metadata: Other metadata fields passed to `AdditionalParameters`.
-
-    Returns:
-        A `AdditionalParameters` instance that can be passed to an
-        `InputDescription` or `OutputDescription`.
-    """
-    return AdditionalParameters(
-        parameters=[
-            AdditionalParameter(name=k, value=[v]) for k, v in parameters.items()
-        ],
-        **metadata,
-    )
-
-
 def _parse_inputs(
     fn_name: str,
     signature: inspect.Signature,
@@ -182,16 +156,20 @@ def _parse_inputs(
         model_class = create_model("ProcessInputs", **model_field_definitions)
 
     if inputs:
-        model_class = _merge_inputs_into_model_class(
+        model_class_merged = _merge_inputs_into_model_class(
             fn_name=fn_name,
             signature=signature,
             inputs=inputs,
             model_class=model_class,
         )
+        # TODO: Work out why mypy dislikes this apparently valid assignment
+        model_class = model_class_merged  # type:ignore[misc,assignment]
 
     model_class.model_rebuild()
 
-    inputs_schema_dict: dict[str, Any] = create_schema_dict(model_class)
+    inputs_schema_dict: dict[str, Any] = model_class_to_openapi_schema_dict(
+        model_class, inline_refs=True
+    )
     required_names: list[str] = inputs_schema_dict.get("required", [])
     properties: dict[str, Any] = inputs_schema_dict.get("properties", {})
 
@@ -224,7 +202,9 @@ def _parse_outputs(
         fn_name, output_annotation, outputs
     )
     model_class = create_model("Outputs", **model_field_definitions)  # type: ignore[call-overload]
-    outputs_schema_dict = create_schema_dict(model_class)
+    outputs_schema_dict = model_class_to_openapi_schema_dict(
+        model_class, inline_refs=True
+    )
     properties = outputs_schema_dict.get("properties", {})
 
     output_descriptions: dict[str, OutputDescription] = {}
@@ -266,6 +246,12 @@ def _parse_parameters(
     return arg_parameters, job_ctx_arg
 
 
+# TODO: replace deprecated FieldInfo.merge_field_infos()
+#   used in _merge_inputs_into_model_class(). See
+#   - https://github.com/pydantic/pydantic/issues/12329
+#   - https://github.com/pydantic/pydantic/issues/12374
+
+
 def _merge_inputs_into_model_class(
     fn_name: str,
     signature: inspect.Signature,
@@ -416,6 +402,7 @@ def _merge_input_descriptions(
         additionalParameters=(
             base_description.additionalParameters or description.additionalParameters
         ),
+        **(base_description.model_extra or {}),
     )
 
 
@@ -435,6 +422,7 @@ def _merge_output_descriptions(
         additionalParameters=(
             base_description.additionalParameters or description.additionalParameters
         ),
+        **(base_description.model_extra or {}),
     )
 
 

{procodile-0.0.9 → procodile-0.1.1}/procodile/registry.py

@@ -1,4 +1,4 @@
-#  Copyright (c) 2025 by the Eozilla team and contributors
+#  Copyright (c) 2025-2026 by the Eozilla team and contributors
 #  Permissions are hereby granted under the terms of the Apache 2.0 License:
 #  https://opensource.org/license/apache-2-0.
 import functools

{procodile-0.0.9 → procodile-0.1.1}/procodile/reporter.py

@@ -1,4 +1,4 @@
-#  Copyright (c) 2025 by the Eozilla team and contributors
+#  Copyright (c) 2025-2026 by the Eozilla team and contributors
 #  Permissions are hereby granted under the terms of the Apache 2.0 License:
 #  https://opensource.org/license/apache-2-0.
 

procodile-0.1.1/procodile/schema.py

@@ -0,0 +1,159 @@
+#  Copyright (c) 2025-2026 by the Eozilla team and contributors
+#  Permissions are hereby granted under the terms of the Apache 2.0 License:
+#  https://opensource.org/license/apache-2-0.
+
+import copy
+from collections.abc import Sequence
+from typing import Any
+
+import pydantic
+
+from gavicore.util.ensure import ensure_condition
+
+
+def model_class_to_openapi_schema_dict(
+    model_class: type[pydantic.BaseModel],
+    *,
+    inline_refs: bool = False,
+    openapi_spec: str = "3.0",
+) -> dict[str, Any]:
+    """
+    Convert a Pydantic model class to an OpenAPI schema `dict` object.
+
+    Args:
+        model_class: The Pydantic model class.
+        inline_refs: Whether to inline any references (`$ref` values)
+            generated by `model_class.model_json_schema()`.
+        openapi_spec: The OpenAPI specification.
+            Currently, only `"3.0"` is supported.
+    Returns:
+        An OpenAPI schema `dict` object.
+    """
+    model_class.model_rebuild()
+    schema = model_class.model_json_schema()
+    if inline_refs:
+        schema = inline_schema_refs(schema)
+    return json_schema_to_openapi_schema(schema, openapi_spec=openapi_spec)
+
+
+def inline_schema_refs(schema: dict[str, Any] | bool) -> Any:
+    if not isinstance(schema, dict):
+        return schema
+    defs: dict[str, Any] | None = schema.get("$defs")
+    if not defs:
+        return schema
+    schema = copy.copy(schema)
+    schema.pop("$defs")
+    return _inline_schema_refs(schema, {f"#/$defs/{k}": v for k, v in defs.items()})
+
+
+def _inline_schema_refs(schema: dict[str, Any] | bool, defs: dict[str, Any]) -> Any:
+    if not isinstance(schema, dict):
+        return schema
+    if "$ref" in schema:
+        ref = schema["$ref"]
+        if ref in defs:
+            ref_schema = _inline_schema_refs(defs[ref], defs)
+            schema = copy.copy(schema)
+            schema.pop("$ref")
+            schema.update(copy.deepcopy(ref_schema))
+            return schema
+    schema = copy.copy(schema)
+    for k in ("allOf", "anyOf", "oneOf"):
+        if k in schema:
+            if isinstance(schema[k], list):
+                schema[k] = [_inline_schema_refs(s, defs) for s in schema[k]]
+    for k in ("items", "prefixItems", "additionalProperties"):
+        if k in schema:
+            if isinstance(schema[k], list):
+                schema[k] = [_inline_schema_refs(s, defs) for s in schema[k]]
+            else:
+                schema[k] = _inline_schema_refs(schema[k], defs)
+    for k in ("properties",):
+        if k in schema:
+            if isinstance(schema[k], dict):
+                schema[k] = {
+                    k: _inline_schema_refs(s, defs) for k, s in schema[k].items()
+                }
+    return schema
+
+
+def json_schema_to_openapi_schema(
+    schema: dict[str, Any], *, openapi_spec: str = "3.0"
+) -> dict[str, Any]:
+    """
+    Convert a JSON schema `dict` object into an OpenAPI schema `dict` object.
+
+    Args:
+        schema: A JSON schema `dict` object.
+        openapi_spec: The OpenAPI specification.
+            Currently, only `"3.0"` is supported.
+    Returns:
+        An OpenAPI schema `dict` object.
+    """
+    ensure_condition(openapi_spec == "3.0", "openapi_spec must be '3.0'")
+    return _json_schema_to_openapi_schema_3_0(copy.deepcopy(schema))
+
+
+def _json_schema_to_openapi_schema_3_0(schema: dict[str, Any]) -> dict[str, Any]:
+    if "type" in schema:
+        type_ = schema["type"]
+        if type_ == "null":
+            schema.pop("type")
+            schema["nullable"] = True
+    if "prefixItems" in schema:
+        # This is how pydantic encodes tuples.
+        items = schema.pop("prefixItems")
+        if isinstance(items, (list, tuple)):
+            schema["items"] = _json_tuple_to_openapi_items_3_0(items)
+    if "items" in schema:
+        items = schema.pop("items")
+        if isinstance(items, (list, tuple)):
+            schema["items"] = _json_tuple_to_openapi_items_3_0(items)
+        elif isinstance(items, dict):
+            schema["items"] = _json_schema_to_openapi_schema_3_0(items)
+    if "additionalProperties" in schema:
+        additional_properties = schema.pop("additionalProperties")
+        if isinstance(additional_properties, dict):
+            schema["additionalProperties"] = _json_schema_to_openapi_schema_3_0(
+                additional_properties
+            )
+        elif additional_properties in (True, None):
+            schema["additionalProperties"] = {}
+        elif additional_properties is False:
+            schema["additionalProperties"] = False
+    for dict_key in ("properties", "$defs"):
+        if dict_key in schema and isinstance(schema[dict_key], dict):
+            schema[dict_key] = {
+                k: _json_schema_to_openapi_schema_3_0(v)
+                for k, v in schema[dict_key].items()
+            }
+    for x_of_key in ("allOf", "anyOf", "oneOf"):
+        if x_of_key in schema:
+            schema[x_of_key] = list(
+                map(_json_schema_to_openapi_schema_3_0, schema[x_of_key])
+            )
+            if len(schema[x_of_key]) == 2:
+                x_of_copy = [s for s in schema[x_of_key] if s != {"nullable": True}]
+                if len(x_of_copy) == 1:
+                    schema.pop(x_of_key)
+                    schema.update(x_of_copy[0])
+                    schema["nullable"] = True
+    return schema
+
+
+def _json_tuple_to_openapi_items_3_0(
+    tuple_schemas: Sequence[dict[str, Any]],
+) -> dict[str, Any]:
+    """Convert a JSON schema tuple."""
+    if not tuple_schemas:
+        return {}
+    converted = [_json_schema_to_openapi_schema_3_0(v) for v in tuple_schemas]
+    c0 = converted[0]
+    if all(c == c0 for c in converted[1:]):
+        # If all items are the same schema,
+        # we can take the first.
+        return c0
+    # As there is no way to represent tuples in OpenAPI <= 3.1,
+    # we set items to oneOf of all tuple member schemas.
+    return {"oneOf": converted}

{procodile-0.0.9 → procodile-0.1.1}/procodile/workflow.py

@@ -1,4 +1,4 @@
-#  Copyright (c) 2025 by the Eozilla team and contributors
+#  Copyright (c) 2025-2026 by the Eozilla team and contributors
 #  Permissions are hereby granted under the terms of the Apache 2.0 License:
 #  https://opensource.org/license/apache-2-0.
 

{procodile-0.0.9 → procodile-0.1.1}/pyproject.toml

@@ -4,12 +4,14 @@
 
 [project]
 name = "procodile"
-version = "0.0.9"
+version = "0.1.1"
 description = "A light-weight processor development framework"
 readme = "README.md"
 authors = [
-  {name = "Norman Fomferra (Brockmann Consult GmbH)"},
-  {name = "Tejas Morbagal Harish (Brockmann Consult GmbH)"}
+  {name = "b-yogesh", email = "b-yogesh@users.noreply.github.com"},
+  {name = "forman", email = "forman@users.noreply.github.com"},
+  {name = "pont-us", email = "pont-us@users.noreply.github.com"},
+  {name = "TejasMorbagal", email = "TejasMorbagal@users.noreply.github.com"},
 ]
 keywords = [
   "eo",
@@ -24,10 +26,10 @@ classifiers = [
   "Intended Audience :: Developers",
   "License :: OSI Approved :: Apache Software License",
   "Programming Language :: Python :: 3",
-  "Programming Language :: Python :: 3.10",
   "Programming Language :: Python :: 3.11",
   "Programming Language :: Python :: 3.12",
   "Programming Language :: Python :: 3.13",
+  "Programming Language :: Python :: 3.14",
   "Topic :: Software Development",
   "Topic :: Scientific/Engineering",
   "Typing :: Typed",
@@ -42,7 +44,7 @@ dependencies = [
   "pyyaml",
   "typer",
   # local dependency
-  "gavicore>=0.0.7",
+  "gavicore >=0.1.1",
 ]
 
 [project.urls]