oceanprotocol-job-details 0.3.11__tar.gz → 0.3.13__tar.gz

{oceanprotocol_job_details-0.3.11 → oceanprotocol_job_details-0.3.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oceanprotocol-job-details
-Version: 0.3.11
+Version: 0.3.13
 Summary: A Python package to get details from OceanProtocol jobs
 Project-URL: Homepage, https://github.com/AgrospAI/oceanprotocol-job-details
 Project-URL: Issues, https://github.com/AgrospAI/oceanprotocol-job-details/issues
@@ -72,8 +72,9 @@ class InputParameters(BaseModel):
 job_details = load_job_details({"base_dir": "...", "transformation_did": "..."}, InputParameters)
 
 # Usage
-job_details.input_parameters.foo
-job_details.input_parameters.foo.bar
+parameters = await job_details.input_parameters()
+parameters.foo
+parameters.foo.bar
 ```
 
 The values to fill the custom `InputParameters` will be parsed from the `algoCustomData.json` located next to the input data directories.

{oceanprotocol_job_details-0.3.11 → oceanprotocol_job_details-0.3.13}/README.md

@@ -46,8 +46,9 @@ class InputParameters(BaseModel):
 job_details = load_job_details({"base_dir": "...", "transformation_did": "..."}, InputParameters)
 
 # Usage
-job_details.input_parameters.foo
-job_details.input_parameters.foo.bar
+parameters = await job_details.input_parameters()
+parameters.foo
+parameters.foo.bar
 ```
 
 The values to fill the custom `InputParameters` will be parsed from the `algoCustomData.json` located next to the input data directories.

oceanprotocol_job_details-0.3.13/oceanprotocol_job_details/executors.py

@@ -0,0 +1,25 @@
+import asyncio
+import inspect
+from typing import Any, Callable, Coroutine, TypeVar
+
+T = TypeVar("T")
+
+
+async def run_in_executor(
+    obj: Callable[..., T]
+    | Callable[..., Coroutine[Any, Any, T]]
+    | Coroutine[Any, Any, T],
+    *args,
+    **kwargs,
+) -> T:
+    if inspect.iscoroutinefunction(obj):
+        return await obj(*args, **kwargs)
+
+    if inspect.iscoroutine(obj):
+        return await obj
+
+    if callable(obj):
+        loop = asyncio.get_running_loop()
+        return await loop.run_in_executor(None, obj, *args, **kwargs)
+
+    return obj

{oceanprotocol_job_details-0.3.11 → oceanprotocol_job_details-0.3.13}/oceanprotocol_job_details/ocean.py

@@ -9,7 +9,7 @@ import aiofiles
 from pydantic import BaseModel, ConfigDict, Secret
 
 from oceanprotocol_job_details.domain import DDO, Files, Paths
-from oceanprotocol_job_details.executers import run_in_executor
+from oceanprotocol_job_details.executors import run_in_executor
 
 InputParametersT = TypeVar("InputParametersT", BaseModel, None)
 
@@ -24,6 +24,8 @@ class JobDetails(BaseModel, Generic[InputParametersT]):  # type: ignore[explicit
 
     model_config = ConfigDict(arbitrary_types_allowed=True, frozen=True)
 
+    _input_parameters: InputParametersT | None = None
+
     def inputs(self) -> Generator[Tuple[int, Path], None, None]:
         yield from (
             (idx, file)
@@ -31,11 +33,13 @@ class JobDetails(BaseModel, Generic[InputParametersT]):  # type: ignore[explicit
             for file in files.input_files
         )
 
-    @cached_property
-    def input_parameters(self) -> InputParametersT | None:
-        return run_in_executor(self.ainput_parameters())
+    async def input_parameters(self) -> InputParametersT:
+        if self._input_parameters is None:
+            input_parameters = await self.ainput_parameters()
+            object.__setattr__(self, "_input_parameters", input_parameters)
+        return self._input_parameters
 
-    async def ainput_parameters(self) -> InputParametersT | None:
+    async def ainput_parameters(self) -> InputParametersT:
         if self.input_type is None:
             return None
 

{oceanprotocol_job_details-0.3.11 → oceanprotocol_job_details-0.3.13}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "oceanprotocol-job-details"
-version = "0.3.11"
+version = "0.3.13"
 description = "A Python package to get details from OceanProtocol jobs"
 authors = [
     { name = "Agrospai", email = "agrospai@udl.cat" },
@@ -27,6 +27,8 @@ Homepage = "https://github.com/AgrospAI/oceanprotocol-job-details"
 Issues = "https://github.com/AgrospAI/oceanprotocol-job-details/issues"
 
 [tool.pytest.ini_options]
+asyncio_mode = "auto"
+asyncio_default_fixture_loop_scope = "function"
 log_level = "INFO"
 pythonpath = "oceanprotocol_job_details"
 log_cli = true
@@ -51,4 +53,9 @@ warn_return_any = true
 disallow_any_explicit = true
 
 [dependency-groups]
-dev = ["mypy>=1.15.0", "pytest>=8.3.4", "types-aiofiles>=25.1.0.20251011"]
+dev = [
+    "mypy>=1.15.0",
+    "pytest>=8.3.4",
+    "pytest-asyncio>=1.3.0",
+    "types-aiofiles>=25.1.0.20251011",
+]

oceanprotocol_job_details-0.3.11/oceanprotocol_job_details/executors.py

@@ -1,13 +0,0 @@
-import asyncio
-from typing import Coroutine, TypeVar
-
-T = TypeVar("T")
-
-
-def run_in_executor(coro: Coroutine[None, None, T]) -> T:
-    try:
-        loop = asyncio.get_running_loop()
-    except RuntimeError:
-        return asyncio.run(coro)
-    else:
-        return loop.run_until_complete(coro)