ocean-runner 0.2.21__tar.gz → 0.2.25__tar.gz

{ocean_runner-0.2.21 → ocean_runner-0.2.25}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ocean-runner
-Version: 0.2.21
+Version: 0.2.25
 Summary: A fluent API for OceanProtocol algorithms
 Project-URL: Homepage, https://github.com/AgrospAI/ocean-runner
 Project-URL: Issues, https://github.com/AgrospAI/ocean-runner/issues
@@ -18,18 +18,16 @@ Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3.10
 Requires-Dist: aiofiles>=25.1.0
-Requires-Dist: oceanprotocol-job-details>=0.2.8
+Requires-Dist: oceanprotocol-job-details>=0.3.11
 Requires-Dist: pydantic-settings>=2.12.0
 Requires-Dist: pydantic>=2.12.5
 Requires-Dist: pytest>=8.4.2
-Requires-Dist: types-aiofiles>=25.1.0.20251011
 Description-Content-Type: text/markdown
 
 # ocean-runner
 
 Ocean Runner is a package that eases algorithm creation in the scope of OceanProtocol.
 
-
 ## Installation
 
 ```bash
@@ -50,7 +48,7 @@ algorithm = Algorithm()
 
 
 @algorithm.run
-def run():
+def run(_: Algorithm):
     return random.randint()
 
 
@@ -77,14 +75,14 @@ algorithm = Algorithm(
     Config(
         custom_input: ... # dataclass
         # Custom algorithm parameters dataclass.
-        
+
         logger: ... # type: logging.Logger
         # Custom logger to use.
 
         source_paths: ... # type: Iterable[Path]
         # Source paths to include in the PATH
-        
-        environment: ... 
+
+        environment: ...
         # type: ocean_runner.Environment. Mock of environment variables.
     )
 )
@@ -93,12 +91,12 @@ algorithm = Algorithm(
 ```python
 import logging
 
+from pydantic import BaseModel
 from ocean_runner import Algorithm, Config
 
 
-@dataclass
-class CustomInput:
-    foobar: string 
+class CustomInput(BaseModel):
+    foobar: string
 
 
 logger = logging.getLogger(__name__)
@@ -108,7 +106,7 @@ algorithm = Algorithm(
     Config(
         custom_input: CustomInput,
         """
-        Load the Algorithm's Custom Input into a CustomInput dataclass instance.
+        Load the Algorithm's Custom Input into a CustomInput instance.
         """
 
         source_paths: [Path("/algorithm/src")],
@@ -164,34 +162,32 @@ algorithm = Algorithm()
 
 
 @algorithm.on_error
-def error_callback(ex: Exception):
+def error_callback(algorithm: Algorithm, ex: Exception):
     algorithm.logger.exception(ex)
     raise algorithm.Error() from ex
 
 
 @algorithm.validate
-def val():
+def val(algorithm: Algorithm):
     assert algorithm.job_details.files, "Empty input dir"
 
 
 @algorithm.run
-def run() -> pd.DataFrame:
-    _, filename = next(algorithm.job_details.next_path())
+def run(algorithm: Algorithm) -> pd.DataFrame:
+    _, filename = next(algorithm.job_details.inputs())
     return pd.read_csv(filename).describe(include="all")
 
 
 @algorithm.save_results
-def save(results: pd.DataFrame, path: Path):
-    algorithm.logger.info(f"Descriptive statistics: {results}")
-    results.to_csv(path / "results.csv")
+def save(algorithm: Algorithm, result: pd.DataFrame, base: Path):
+    algorithm.logger.info(f"Descriptive statistics: {result}")
+    result.to_csv(base / "result.csv")
 
 
 if __name__ == "__main__":
     algorithm()
 ```
 
-
-
 ### Default implementations
 
 As seen in the minimal example, all methods implemented in `Algorithm` have a default implementation which will be commented here.
@@ -207,7 +203,7 @@ As seen in the minimal example, all methods implemented in `Algorithm` have a de
 
 .run()
 
-    """ 
+    """
     Has NO default implementation, must pass a callback that returns a result of any type.
     """
 
@@ -223,7 +219,8 @@ As seen in the minimal example, all methods implemented in `Algorithm` have a de
 To load the OceanProtocol JobDetails instance, the program will read some environment variables, they can be mocked passing an instance of `Environment` through the configuration of the algorithm.
 
 Environment variables:
+
 - `DIDS` (optional) Input dataset(s) DID's, must have format: `["abc..90"]`. Defaults to reading them automatically from the `DDO` data directory.
 - `TRANSFORMATION_DID` (optional, default="DEFAULT"): Algorithm DID, must have format: `abc..90`.
-- `SECRET` (optional, default="DEFAULT"): Algorithm secret. 
+- `SECRET` (optional, default="DEFAULT"): Algorithm secret.
 - `BASE_DIR` (optional, default="/data"): Base path to the OceanProtocol data directories.

{ocean_runner-0.2.21 → ocean_runner-0.2.25}/README.md

@@ -2,7 +2,6 @@
 
 Ocean Runner is a package that eases algorithm creation in the scope of OceanProtocol.
 
-
 ## Installation
 
 ```bash
@@ -23,7 +22,7 @@ algorithm = Algorithm()
 
 
 @algorithm.run
-def run():
+def run(_: Algorithm):
     return random.randint()
 
 
@@ -50,14 +49,14 @@ algorithm = Algorithm(
     Config(
         custom_input: ... # dataclass
         # Custom algorithm parameters dataclass.
-        
+
         logger: ... # type: logging.Logger
         # Custom logger to use.
 
         source_paths: ... # type: Iterable[Path]
         # Source paths to include in the PATH
-        
-        environment: ... 
+
+        environment: ...
         # type: ocean_runner.Environment. Mock of environment variables.
     )
 )
@@ -66,12 +65,12 @@ algorithm = Algorithm(
 ```python
 import logging
 
+from pydantic import BaseModel
 from ocean_runner import Algorithm, Config
 
 
-@dataclass
-class CustomInput:
-    foobar: string 
+class CustomInput(BaseModel):
+    foobar: string
 
 
 logger = logging.getLogger(__name__)
@@ -81,7 +80,7 @@ algorithm = Algorithm(
     Config(
         custom_input: CustomInput,
         """
-        Load the Algorithm's Custom Input into a CustomInput dataclass instance.
+        Load the Algorithm's Custom Input into a CustomInput instance.
         """
 
         source_paths: [Path("/algorithm/src")],
@@ -137,34 +136,32 @@ algorithm = Algorithm()
 
 
 @algorithm.on_error
-def error_callback(ex: Exception):
+def error_callback(algorithm: Algorithm, ex: Exception):
     algorithm.logger.exception(ex)
     raise algorithm.Error() from ex
 
 
 @algorithm.validate
-def val():
+def val(algorithm: Algorithm):
     assert algorithm.job_details.files, "Empty input dir"
 
 
 @algorithm.run
-def run() -> pd.DataFrame:
-    _, filename = next(algorithm.job_details.next_path())
+def run(algorithm: Algorithm) -> pd.DataFrame:
+    _, filename = next(algorithm.job_details.inputs())
     return pd.read_csv(filename).describe(include="all")
 
 
 @algorithm.save_results
-def save(results: pd.DataFrame, path: Path):
-    algorithm.logger.info(f"Descriptive statistics: {results}")
-    results.to_csv(path / "results.csv")
+def save(algorithm: Algorithm, result: pd.DataFrame, base: Path):
+    algorithm.logger.info(f"Descriptive statistics: {result}")
+    result.to_csv(base / "result.csv")
 
 
 if __name__ == "__main__":
     algorithm()
 ```
 
-
-
 ### Default implementations
 
 As seen in the minimal example, all methods implemented in `Algorithm` have a default implementation which will be commented here.
@@ -180,7 +177,7 @@ As seen in the minimal example, all methods implemented in `Algorithm` have a de
 
 .run()
 
-    """ 
+    """
     Has NO default implementation, must pass a callback that returns a result of any type.
     """
 
@@ -196,7 +193,8 @@ As seen in the minimal example, all methods implemented in `Algorithm` have a de
 To load the OceanProtocol JobDetails instance, the program will read some environment variables, they can be mocked passing an instance of `Environment` through the configuration of the algorithm.
 
 Environment variables:
+
 - `DIDS` (optional) Input dataset(s) DID's, must have format: `["abc..90"]`. Defaults to reading them automatically from the `DDO` data directory.
 - `TRANSFORMATION_DID` (optional, default="DEFAULT"): Algorithm DID, must have format: `abc..90`.
-- `SECRET` (optional, default="DEFAULT"): Algorithm secret. 
+- `SECRET` (optional, default="DEFAULT"): Algorithm secret.
 - `BASE_DIR` (optional, default="/data"): Base path to the OceanProtocol data directories.

{ocean_runner-0.2.21 → ocean_runner-0.2.25}/ocean_runner/config.py

@@ -1,12 +1,12 @@
 from enum import StrEnum, auto
 from logging import Logger
 from pathlib import Path
-from typing import Generic, Sequence, TypeVar
+from typing import Generic, Sequence, Type, TypeVar
 
 from pydantic import BaseModel, ConfigDict, Field
 from pydantic_settings import BaseSettings
 
-InputT = TypeVar("InputT")
+InputT = TypeVar("InputT", BaseModel, None)
 
 DEFAULT = "DEFAULT"
 
@@ -21,13 +21,13 @@ class Keys(StrEnum):
 class Environment(BaseSettings):
     """Environment configuration loaded from environment variables"""
 
-    base_dir: str | Path | None = Field(
+    base_dir: str | Path = Field(
         default_factory=lambda: Path("/data"),
         validation_alias=Keys.BASE_DIR.value,
         description="Base data directory, defaults to '/data'",
     )
 
-    dids: str | list[Path] | None = Field(
+    dids: str | None = Field(
         default=None,
         validation_alias=Keys.DIDS.value,
         description='Datasets DID\'s, format: ["XXXX"]',
@@ -51,7 +51,7 @@ class Config(BaseModel, Generic[InputT]):
 
     model_config = ConfigDict(arbitrary_types_allowed=True)
 
-    custom_input: InputT | None = Field(
+    custom_input: Type[InputT] | None = Field(
         default=None,
         description="Algorithm's custom input types, must be a dataclass_json",
     )

{ocean_runner-0.2.21 → ocean_runner-0.2.25}/ocean_runner/runner.py

@@ -1,17 +1,16 @@
 from __future__ import annotations
 
-import asyncio
-import inspect
-from dataclasses import InitVar, asdict, dataclass, field
+from dataclasses import InitVar, dataclass, field
 from logging import Logger
 from pathlib import Path
-from typing import Awaitable, Callable, Generic, TypeAlias, TypeVar
+from typing import Awaitable, Callable, Dict, Generic, TypeAlias, TypeVar
 
-from oceanprotocol_job_details import JobDetails  # type: ignore
+from oceanprotocol_job_details import JobDetails, load_job_details, run_in_executor
+from pydantic import BaseModel, JsonValue
 
 from ocean_runner.config import Config
 
-InputT = TypeVar("InputT")
+InputT = TypeVar("InputT", BaseModel, None)
 ResultT = TypeVar("ResultT")
 T = TypeVar("T")
 
@@ -42,19 +41,6 @@ async def default_save(algorithm: Algorithm, result: ResultT, base: Path) -> Non
         await f.write(str(result))
 
 
-async def execute(
-    function: Callable[..., T | Awaitable[T]],
-    *args,
-    **kwargs,
-) -> T:
-    result = function(*args, **kwargs)
-
-    if inspect.isawaitable(result):
-        return await result
-
-    return result
-
-
 @dataclass(slots=True)
 class Functions(Generic[InputT, ResultT]):
     validate: ValidateFuncT = field(default=default_validation, init=False)
@@ -114,7 +100,7 @@ class Algorithm(Generic[InputT, ResultT]):
                 f"Added [{len(configuration.source_paths)}] entries to PATH"
             )
 
-        self.configuration = configuration
+        self.configuration: Config[InputT] = configuration
 
     class Error(RuntimeError): ...
 
@@ -154,41 +140,43 @@ class Algorithm(Generic[InputT, ResultT]):
     # Execution Pipeline
     # ---------------------------
 
-    async def execute(self) -> ResultT | None:
-        # Load job details
-        self._job_details = JobDetails.load(
-            _type=self.configuration.custom_input,
-            base_dir=self.configuration.environment.base_dir,
-            dids=self.configuration.environment.dids,
-            transformation_did=self.configuration.environment.transformation_did,
-            secret=self.configuration.environment.secret,
-        )
+    def execute(self) -> ResultT | None:
+        env = self.configuration.environment
+        config: Dict[str, JsonValue] = {
+            "base_dir": str(env.base_dir),
+            "dids": env.dids,
+            "secret": env.secret,
+            "transformation_did": env.transformation_did,
+        }
+
+        self._job_details = load_job_details(config, self.configuration.custom_input)
 
         self.logger.info("Loaded JobDetails")
-        self.logger.debug(asdict(self.job_details))
+        self.logger.debug(self.job_details.model_dump())
 
         try:
-            await execute(self._functions.validate, self)
+            run_in_executor(self._functions.validate(self))
 
             if self._functions.run:
                 self.logger.info("Running algorithm...")
-                self._result = await execute(self._functions.run, self)
+                self._result = run_in_executor(self._functions.run(self))
             else:
                 self.logger.error("No run() function defined. Skipping execution.")
                 self._result = None
 
-            await execute(
-                self._functions.save,
-                algorithm=self,
-                result=self._result,
-                base=self.job_details.paths.outputs,
+            run_in_executor(
+                self._functions.save(
+                    algorithm=self,
+                    result=self._result,
+                    base=self.job_details.paths.outputs,
+                ),
             )
 
         except Exception as e:
-            await execute(self._functions.error, self, e)
+            run_in_executor(self._functions.error(self, e))
 
         return self._result
 
     def __call__(self) -> ResultT | None:
         """Executes the algorithm pipeline: validate → run → save_results."""
-        return asyncio.run(self.execute())
+        return self.execute()

{ocean_runner-0.2.21 → ocean_runner-0.2.25}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "ocean-runner"
-version = "0.2.21"
+version = "0.2.25"
 description = "A fluent API for OceanProtocol algorithms"
 authors = [
     { name = "AgrospAI", email = "agrospai@udl.cat" },
@@ -16,11 +16,10 @@ classifiers = [
 ]
 dependencies = [
     "aiofiles>=25.1.0",
-    "oceanprotocol-job-details>=0.2.8",
+    "oceanprotocol-job-details>=0.3.11",
     "pydantic>=2.12.5",
     "pydantic-settings>=2.12.0",
     "pytest>=8.4.2",
-    "types-aiofiles>=25.1.0.20251011",
 ]
 
 [project.urls]
@@ -37,15 +36,16 @@ requires = ["hatchling"]
 build-backend = "hatchling.build"
 
 [dependency-groups]
-dev = [
-    "mypy>=1.19.1",
-]
+dev = ["mypy>=1.19.1", "types-aiofiles>=25.1.0.20251011"]
 
 [tool.hatch.build.targets.sdist]
 include = ["ocean_runner"]
 
 [tool.hatch.build.targets.wheel]
-include = ["ocean_runner"]
+packages = ["ocean_runner"]
+
+[tool.hatch.build.targets.wheel.package-data]
+ocean_runner = ["py.typed"]
 
 [tool.mypy]
 plugins = ['pydantic.mypy']