ocean-runner 0.2.23__py3-none-any.whl → 0.2.24__py3-none-any.whl

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,14 +21,14 @@ 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: list[Path] | str | None = Field(
-        default_factory=list,
+    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/runner.py

@@ -5,13 +5,14 @@ import inspect
 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 load_job_details, JobDetails  # type: ignore
+from oceanprotocol_job_details import JobDetails, load_job_details
+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")
 
@@ -110,7 +111,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): ...
 
@@ -151,15 +152,15 @@ class Algorithm(Generic[InputT, ResultT]):
     # ---------------------------
 
     async def execute(self) -> ResultT | None:
-        self._job_details = load_job_details(
-            {
-                "base_dir": self.configuration.environment.base_dir,
-                "dids": self.configuration.environment.dids or [],
-                "secret": self.configuration.environment.secret,
-                "transformation_did": self.configuration.environment.transformation_did,
-            },
-            self.configuration.custom_input,
-        )
+        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(self.job_details.model_dump())

{ocean_runner-0.2.23.dist-info → ocean_runner-0.2.24.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ocean-runner
-Version: 0.2.23
+Version: 0.2.24
 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,7 +18,7 @@ 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.3.4
+Requires-Dist: oceanprotocol-job-details>=0.3.9
 Requires-Dist: pydantic-settings>=2.12.0
 Requires-Dist: pydantic>=2.12.5
 Requires-Dist: pytest>=8.4.2
@@ -28,7 +28,6 @@ Description-Content-Type: text/markdown
 
 Ocean Runner is a package that eases algorithm creation in the scope of OceanProtocol.
 
-
 ## Installation
 
 ```bash
@@ -49,7 +48,7 @@ algorithm = Algorithm()
 
 
 @algorithm.run
-def run():
+def run(_: Algorithm):
     return random.randint()
 
 
@@ -76,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.
     )
 )
@@ -92,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__)
@@ -107,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")],
@@ -163,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.
@@ -206,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.
     """
 
@@ -222,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.24.dist-info/RECORD

@@ -0,0 +1,8 @@
+ocean_runner/__init__.py,sha256=hRyMrE7K0DEbNRa-iNwA2xFOM85JJvjeKIdiWvcOm4Y,154
+ocean_runner/config.py,sha256=VfDNyYjO6PpM2tmtiCdCiY4oGT1JMB_zl5hZjLeT0Vg,1928
+ocean_runner/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+ocean_runner/runner.py,sha256=bmWzQqZci3NSUclCwGuzfYfWOuXgKCUT0u3D3HljBMo,6235
+ocean_runner-0.2.24.dist-info/METADATA,sha256=axJvnOryvmL_Y6UuN1aEOpGSJ0pR_DOOMGRfcScPRec,6755
+ocean_runner-0.2.24.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+ocean_runner-0.2.24.dist-info/licenses/LICENSE,sha256=_B25KqK4amoADWkMN150tnZFm_Fy7VvZpvIC8ZydWdI,1053
+ocean_runner-0.2.24.dist-info/RECORD,,

ocean_runner-0.2.23.dist-info/RECORD

@@ -1,8 +0,0 @@
-ocean_runner/__init__.py,sha256=hRyMrE7K0DEbNRa-iNwA2xFOM85JJvjeKIdiWvcOm4Y,154
-ocean_runner/config.py,sha256=_P8MbKGzL36p8LO_m6nj3cPB0h6L2YL8satxUNXXnUI,1927
-ocean_runner/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ocean_runner/runner.py,sha256=0-McElMM_dzubLUbRdeDaE0WY_dNj0IN_5cGen4-4bM,6242
-ocean_runner-0.2.23.dist-info/METADATA,sha256=HkaOEgMvm98GQT9VsGMSN6FwTNzzMnocGpZyKu4HgSs,6667
-ocean_runner-0.2.23.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-ocean_runner-0.2.23.dist-info/licenses/LICENSE,sha256=_B25KqK4amoADWkMN150tnZFm_Fy7VvZpvIC8ZydWdI,1053
-ocean_runner-0.2.23.dist-info/RECORD,,