oceanprotocol-job-details 0.3.9__py3-none-any.whl → 0.3.13__py3-none-any.whl

oceanprotocol_job_details/__init__.py

@@ -1,4 +1,5 @@
 from .helpers import create_container, load_job_details
 from .ocean import JobDetails
+from .executors import run_in_executor
 
-__all__ = [JobDetails, load_job_details, create_container]  # type: ignore
+__all__ = [JobDetails, load_job_details, create_container, run_in_executor]  # type: ignore

oceanprotocol_job_details/di.py

@@ -1,4 +1,3 @@
-from types import NoneType
 from typing import Generic, TypeVar
 from dependency_injector import containers, providers
 from pydantic import BaseModel

oceanprotocol_job_details/domain.py

@@ -1,7 +1,7 @@
 # mypy: disable-error-code=explicit-any
 from dataclasses import InitVar, dataclass, field
 from pathlib import Path
-from typing import Generator, List, Optional, Sequence, TypeAlias, TypeVar
+from typing import Generator, List, Optional, Sequence, TypeAlias
 
 from pydantic import BaseModel, ConfigDict, Field, JsonValue
 

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/ocean.py

@@ -3,13 +3,13 @@ from __future__ import annotations
 import asyncio
 from functools import cached_property
 from pathlib import Path
-from types import NoneType
 from typing import Generator, Generic, Tuple, Type, TypeVar, final
 
 import aiofiles
 from pydantic import BaseModel, ConfigDict, Secret
 
 from oceanprotocol_job_details.domain import DDO, Files, Paths
+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 asyncio.run(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.9.dist-info → oceanprotocol_job_details-0.3.13.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oceanprotocol-job-details
-Version: 0.3.9
+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
@@ -32,9 +32,7 @@ A Python package to get details from OceanProtocol jobs
 
 ```bash
 pip install oceanprotocol-job-details
-```
-
-```bash
+#or
 uv add oceanprotocol-job-details
 ```
 
@@ -74,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.9.dist-info → oceanprotocol_job_details-0.3.13.dist-info}/RECORD

@@ -1,8 +1,9 @@
-oceanprotocol_job_details/__init__.py,sha256=nJMrZsEC5F1n9WF-v5QV095Yyc8UkhFw0AzD9o7X0IE,162
-oceanprotocol_job_details/di.py,sha256=URBCcwla3pBKt4hWhRwG7s-Ib_KzoBk2-EtLzQOyAyM,1343
-oceanprotocol_job_details/domain.py,sha256=2_USbeA_7VIEYS8DVb2MW6dCZasjiqIxQaGUnNUKspY,3851
+oceanprotocol_job_details/__init__.py,sha256=sq_C8Ey4_4oHiX9cO1wne7ZsWqs86WWgHfKQ5PMwwak,218
+oceanprotocol_job_details/di.py,sha256=H4_n9NrNuRB2s9uarSkwDYzjD1i7sV8dySRfHt21QWM,1316
+oceanprotocol_job_details/domain.py,sha256=ifw-hKFAJj0Gl_wJuH-51LQx4KPsCyEVDsT10xg9uBw,3842
+oceanprotocol_job_details/executors.py,sha256=Csc1MaUf0-Ve4Wp80qIanL7reRTT2qA3W3QrSE2jQO4,556
 oceanprotocol_job_details/helpers.py,sha256=ABm3oIRwPd-4XeCOIszCbfL2wkUJqVJJ2bqy3hR4jyw,1064
-oceanprotocol_job_details/ocean.py,sha256=ocoI4OO8A5_SovXbASVucFq4W-tJr_M4C67UbS4aSF8,1473
+oceanprotocol_job_details/ocean.py,sha256=kq7tAHJ36s7piJ_WpXVaTmSAMe87tuwHDeMQB-xS0T4,1702
 oceanprotocol_job_details/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 oceanprotocol_job_details/settings.py,sha256=o_1Hn2vl5hMk7bAkdS7GjE4nKOAyHm7dScO2_o2sPuY,1345
 oceanprotocol_job_details/loaders/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -11,7 +12,7 @@ oceanprotocol_job_details/loaders/impl/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JC
 oceanprotocol_job_details/loaders/impl/ddo.py,sha256=XthrQFhmP85XSVzVjBlLePtTowGR3BAsmVp3jngiQ08,668
 oceanprotocol_job_details/loaders/impl/files.py,sha256=Y2vFBT2T9w9zrdpmf550-LQJxwtNPUGa0UU6bBzk9AU,1145
 oceanprotocol_job_details/loaders/impl/job_details.py,sha256=QwlUaG9KozkI1wX66oDTPg4TjGkvSsi8O-TctF6eWvo,724
-oceanprotocol_job_details-0.3.9.dist-info/METADATA,sha256=_6PvqdSeGHboxzX9RryS7-vnzPdnAWlozE290s0UCr4,4503
-oceanprotocol_job_details-0.3.9.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-oceanprotocol_job_details-0.3.9.dist-info/licenses/LICENSE,sha256=ni3ix7P_GxK1W3VGC4fJ3o6QoCngCEpSuTJwO4nkpbw,1055
-oceanprotocol_job_details-0.3.9.dist-info/RECORD,,
+oceanprotocol_job_details-0.3.13.dist-info/METADATA,sha256=9jFrlbS9oWNQXrHj_jY3ia16bA3HvdBeMt6nMdUguHk,4509
+oceanprotocol_job_details-0.3.13.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+oceanprotocol_job_details-0.3.13.dist-info/licenses/LICENSE,sha256=ni3ix7P_GxK1W3VGC4fJ3o6QoCngCEpSuTJwO4nkpbw,1055
+oceanprotocol_job_details-0.3.13.dist-info/RECORD,,