ocean-runner 0.2.16__py3-none-any.whl → 0.2.19__py3-none-any.whl

ocean_runner/__init__.py

@@ -1,4 +1,4 @@
 from ocean_runner.config import Config, Environment
 from ocean_runner.runner import Algorithm
 
-__all__ = [Config, Algorithm, Environment]
+__all__ = [Config, Algorithm, Environment]  # type: ignore

ocean_runner/config.py

@@ -1,55 +1,71 @@
-import os
-from dataclasses import asdict, dataclass, field
+from enum import StrEnum, auto
 from logging import Logger
 from pathlib import Path
-from typing import Iterable, TypeVar
+from typing import Generic, Sequence, TypeVar
 
-T = TypeVar("T")
+from pydantic import BaseModel, ConfigDict, Field
+from pydantic_settings import BaseSettings
+
+InputT = TypeVar("InputT")
 
 DEFAULT = "DEFAULT"
 
 
-@dataclass
-class Environment:
-    """Environment variables mock"""
+class Keys(StrEnum):
+    SECRET = auto()
+    BASE_DIR = auto()
+    TRANSFORMATION_DID = auto()
+    DIDS = auto()
 
-    base_dir: str | None = field(
-        default_factory=lambda: os.environ.get("BASE_DIR", None),
-    )
-    """Base data directory, defaults to '/data'"""
 
-    dids: str = field(
-        default_factory=lambda: os.environ.get("DIDS", None),
+class Environment(BaseSettings):
+    """Environment configuration loaded from environment variables"""
+
+    base_dir: str | Path | None = Field(
+        default_factory=lambda: Path("/data"),
+        validation_alias=Keys.BASE_DIR.value,
+        description="Base data directory, defaults to '/data'",
     )
-    """Datasets DID's, format: '["XXXX"]'"""
 
-    transformation_did: str = field(
-        default_factory=lambda: os.environ.get("TRANSFORMATION_DID", DEFAULT),
+    dids: str | list[Path] | None = Field(
+        default=None,
+        validation_alias=Keys.DIDS.value,
+        description='Datasets DID\'s, format: ["XXXX"]',
     )
-    """Transformation (algorithm) DID"""
 
-    secret: str = field(
-        default_factory=lambda: os.environ.get("SECRET", DEFAULT),
+    transformation_did: str = Field(
+        default=DEFAULT,
+        validation_alias=Keys.TRANSFORMATION_DID.value,
+        description="Transformation (algorithm) DID",
     )
-    """Super secret secret"""
 
-    dict = asdict
+    secret: str = Field(
+        default=DEFAULT,
+        validation_alias=Keys.SECRET.value,
+        description="Super secret secret",
+    )
 
 
-@dataclass
-class Config:
+class Config(BaseModel, Generic[InputT]):
     """Algorithm overall configuration"""
 
-    custom_input: T | None = None
-    """Algorithm's custom input types, must be a dataclass_json"""
+    model_config = ConfigDict(arbitrary_types_allowed=True)
 
-    logger: Logger | None = None
-    """Logger to use in the algorithm"""
+    custom_input: InputT | None = Field(
+        default=None,
+        description="Algorithm's custom input types, must be a dataclass_json",
+    )
+
+    logger: Logger | None = Field(
+        default=None,
+        description="Logger to use in the algorithm",
+    )
 
-    source_paths: Iterable[Path] = field(
-        default_factory=lambda: [Path("/algorithm/src")]
+    source_paths: Sequence[Path] = Field(
+        default_factory=lambda: [Path("/algorithm/src")],
+        description="Paths that should be included so the code executes correctly",
     )
-    """Paths that should be included so the code executes correctly"""
 
-    environment: Environment = field(default_factory=lambda: Environment())
-    """Mock of environment data"""
+    environment: Environment = Field(
+        default_factory=Environment, description="Environment configuration"
+    )

ocean_runner/runner.py

@@ -5,15 +5,21 @@ from logging import Logger
 from pathlib import Path
 from typing import Callable, Generic, TypeVar
 
-from oceanprotocol_job_details import JobDetails
+from oceanprotocol_job_details import JobDetails  # type: ignore
 
 from ocean_runner.config import Config
 
-JobDetailsT = TypeVar("JobDetailsT")
+InputT = TypeVar("InputT")
 ResultT = TypeVar("ResultT")
 
+ValidateFuncT = Callable[["Algorithm"], None]
+RunFuncT = Callable[["Algorithm"], ResultT] | None
+SaveFuncT = Callable[["Algorithm", ResultT, Path], None]
+ErrorFuncT = Callable[["Algorithm", Exception], None]
 
-def default_error_callback(_, e: Exception) -> None:
+
+def default_error_callback(algorithm: Algorithm, e: Exception) -> None:
+    algorithm.logger.exception("Error during algorithm execution")
     raise e
 
 
@@ -23,41 +29,56 @@ def default_validation(algorithm: Algorithm) -> None:
     assert algorithm.job_details.files, "Files missing"
 
 
-def default_save(*, result: ResultT, base: Path, algorithm: Algorithm) -> None:
+def default_save(algorithm: Algorithm, result: ResultT, base: Path) -> None:
     algorithm.logger.info("Saving results using default save")
     with open(base / "result.txt", "w+") as f:
         f.write(str(result))
 
 
 @dataclass
-class Algorithm(Generic[JobDetailsT, ResultT]):
+class Algorithm(Generic[InputT, ResultT]):
     """
     A configurable algorithm runner that behaves like a FastAPI app:
       - You register `validate`, `run`, and `save_results` via decorators.
       - You execute the full pipeline by calling `app()`.
     """
 
-    config: InitVar[Config | None] = None
+    config: InitVar[Config[InputT] | None] = field(default=None)
     logger: Logger = field(init=False)
-    _job_details: JobDetails[JobDetailsT] = field(init=False)
+    _job_details: JobDetails[InputT] = field(init=False)
     _result: ResultT | None = field(default=None, init=False)
 
     # Decorator-registered callbacks
-    _validate_fn: Callable[[Algorithm], None] | None = field(default=None, init=False)
-    _run_fn: Callable[[Algorithm], ResultT] | None = field(default=None, init=False)
-    _save_fn: Callable[[ResultT, Path, Algorithm], None] | None = field(
-        default=None, init=False
+    _validate_fn: ValidateFuncT = field(
+        default=default_validation,
+        init=False,
+        repr=False,
     )
-    _error_callback: Callable[[Algorithm, Exception], None] = field(
-        default=default_error_callback, init=False
+
+    _run_fn: RunFuncT = field(
+        default=None,
+        init=False,
+        repr=False,
     )
 
-    def __post_init__(self, config: Config | None) -> None:
-        config: Config = config or Config()
+    _save_fn: SaveFuncT = field(
+        default=default_save,
+        init=False,
+        repr=False,
+    )
+
+    _error_callback: ErrorFuncT = field(
+        default=default_error_callback,
+        init=False,
+        repr=False,
+    )
+
+    def __post_init__(self, config: Config[InputT] | None) -> None:
+        configuration = config or Config()
 
         # Configure logger
-        if config.logger:
-            self.logger = config.logger
+        if configuration.logger:
+            self.logger = configuration.logger
         else:
             import logging
 
@@ -66,32 +87,26 @@ class Algorithm(Generic[JobDetailsT, ResultT]):
                 format="%(asctime)s | %(levelname)-8s | %(name)s | %(message)s",
                 datefmt="%Y-%m-%d %H:%M:%S",
             )
-            self.logger = logging.getLogger("ocean_runner")
+            self.logger = logging.getLogger(__name__)
 
         # Normalize base_dir
-        if isinstance(config.environment.base_dir, str):
-            config.environment.base_dir = Path(config.environment.base_dir)
+        if isinstance(configuration.environment.base_dir, str):
+            configuration.environment.base_dir = Path(
+                configuration.environment.base_dir
+            )
 
         # Extend sys.path for custom imports
-        if config.source_paths:
+        if configuration.source_paths:
             import sys
 
-            sys.path.extend([str(path.absolute()) for path in config.source_paths])
-            self.logger.debug(f"Added [{len(config.source_paths)}] entries to PATH")
-
-        # Load job details
-        self._job_details = JobDetails.load(
-            _type=config.custom_input,
-            base_dir=config.environment.base_dir,
-            dids=config.environment.dids,
-            transformation_did=config.environment.transformation_did,
-            secret=config.environment.secret,
-        )
-
-        self.logger.info("Loaded JobDetails")
-        self.logger.debug(asdict(self.job_details))
+            sys.path.extend(
+                [str(path.absolute()) for path in configuration.source_paths]
+            )
+            self.logger.debug(
+                f"Added [{len(configuration.source_paths)}] entries to PATH"
+            )
 
-        self.config = config
+        self.configuration = configuration
 
     class Error(RuntimeError): ...
 
@@ -111,19 +126,19 @@ class Algorithm(Generic[JobDetailsT, ResultT]):
     # Decorators (FastAPI-style)
     # ---------------------------
 
-    def validate(self, fn: Callable[[], None]) -> Callable[[], None]:
+    def validate(self, fn: ValidateFuncT) -> ValidateFuncT:
         self._validate_fn = fn
         return fn
 
-    def run(self, fn: Callable[[], ResultT]) -> Callable[[], ResultT]:
+    def run(self, fn: RunFuncT) -> RunFuncT:
         self._run_fn = fn
         return fn
 
-    def save_results(self, fn: Callable[[ResultT, Path], None]) -> Callable:
+    def save_results(self, fn: SaveFuncT) -> SaveFuncT:
         self._save_fn = fn
         return fn
 
-    def on_error(self, fn: Callable[[Exception], None]) -> Callable:
+    def on_error(self, fn: ErrorFuncT) -> ErrorFuncT:
         self._error_callback = fn
         return fn
 
@@ -133,40 +148,34 @@ class Algorithm(Generic[JobDetailsT, ResultT]):
 
     def __call__(self) -> ResultT | None:
         """Executes the algorithm pipeline: validate → run → save_results."""
+        # 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,
+        )
+
+        self.logger.info("Loaded JobDetails")
+        self.logger.debug(asdict(self.job_details))
+
         try:
             # Validation step
-            if self._validate_fn:
-                self.logger.info("Running custom validation...")
-                self._validate_fn()
-            else:
-                self.logger.info("Running default validation...")
-                default_validation(self)
+            self._validate_fn(self)
 
             # Run step
             if self._run_fn:
                 self.logger.info("Running algorithm...")
-                self._result = self._run_fn()
+                self._result = self._run_fn(self)
             else:
-                self.logger.warning("No run() function defined. Skipping execution.")
+                self.logger.error("No run() function defined. Skipping execution.")
                 self._result = None
 
             # Save step
-            if self._save_fn:
-                self.logger.info("Saving results...")
-                self._save_fn(
-                    self._result,
-                    self.job_details.paths.outputs,
-                )
-            else:
-                self.logger.info("No save_results() defined. Using default.")
-                default_save(
-                    result=self._result,
-                    base=self.job_details.paths.outputs,
-                    algorithm=self,
-                )
+            self._save_fn(self, self._result, self.job_details.paths.outputs)
 
         except Exception as e:
-            self.logger.exception("Error during algorithm execution")
-            self._error_callback(e)
+            self._error_callback(self, e)
 
         return self._result

{ocean_runner-0.2.16.dist-info → ocean_runner-0.2.19.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ocean-runner
-Version: 0.2.16
+Version: 0.2.19
 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
@@ -17,7 +17,9 @@ Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3.10
-Requires-Dist: oceanprotocol-job-details>=0.2.7
+Requires-Dist: oceanprotocol-job-details>=0.2.8
+Requires-Dist: pydantic-settings>=2.12.0
+Requires-Dist: pydantic>=2.12.5
 Requires-Dist: pytest>=8.4.2
 Description-Content-Type: text/markdown
 

ocean_runner-0.2.19.dist-info/RECORD

@@ -0,0 +1,7 @@
+ocean_runner/__init__.py,sha256=hRyMrE7K0DEbNRa-iNwA2xFOM85JJvjeKIdiWvcOm4Y,154
+ocean_runner/config.py,sha256=paN2I3ISIxRO1isCIuUgNsL9dsRhEc_n6KjTH6yNZU4,1919
+ocean_runner/runner.py,sha256=VaayC8UXn2Iyl1RuUcTap9vyTyDYkvm16p3ucaRAOhQ,5527
+ocean_runner-0.2.19.dist-info/METADATA,sha256=4n10dG0cfNAPraB9qJ4WcINyzJNFAxwDQtfZufbs0sU,6635
+ocean_runner-0.2.19.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+ocean_runner-0.2.19.dist-info/licenses/LICENSE,sha256=_B25KqK4amoADWkMN150tnZFm_Fy7VvZpvIC8ZydWdI,1053
+ocean_runner-0.2.19.dist-info/RECORD,,

{ocean_runner-0.2.16.dist-info → ocean_runner-0.2.19.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.27.0
+Generator: hatchling 1.28.0
 Root-Is-Purelib: true
 Tag: py3-none-any

ocean_runner-0.2.16.dist-info/RECORD

@@ -1,7 +0,0 @@
-ocean_runner/__init__.py,sha256=awAmE6kZhuwcrD3gT7qFZArdhiuzW-EFTA6tGKhw06k,138
-ocean_runner/config.py,sha256=gyyUotPJ7n8wPPdsJZIBUT4zBlkoNbhV876JDTdPNsY,1398
-ocean_runner/runner.py,sha256=mPxnJCP-XYl0akRAI4HdAku0KlsTCrXTVPCwlQj5JoY,5721
-ocean_runner-0.2.16.dist-info/METADATA,sha256=s4MrShZfoQzbWIXZRV06Rt0S4lhqYuRjK_OG9QKJoKg,6562
-ocean_runner-0.2.16.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-ocean_runner-0.2.16.dist-info/licenses/LICENSE,sha256=_B25KqK4amoADWkMN150tnZFm_Fy7VvZpvIC8ZydWdI,1053
-ocean_runner-0.2.16.dist-info/RECORD,,