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

ocean_runner/runner.py

@@ -13,7 +13,8 @@ JobDetailsT = TypeVar("JobDetailsT")
 ResultT = TypeVar("ResultT")
 
 
-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
 
 
@@ -43,13 +44,28 @@ class Algorithm(Generic[JobDetailsT, ResultT]):
     _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)
+    _validate_fn: Callable[[Algorithm], None] | None = field(
+        default=None,
+        init=False,
+        repr=False,
+    )
+
+    _run_fn: Callable[[Algorithm], ResultT] | None = field(
+        default=None,
+        init=False,
+        repr=False,
+    )
+
     _save_fn: Callable[[ResultT, Path, Algorithm], None] | None = field(
-        default=None, init=False
+        default=None,
+        init=False,
+        repr=False,
     )
-    _error_callback: Callable[[Algorithm, Exception], None] = field(
-        default=default_error_callback, init=False
+
+    _error_callback: Callable[[Algorithm, Exception], None] | None = field(
+        default=None,
+        init=False,
+        repr=False,
     )
 
     def __post_init__(self, config: Config | None) -> None:
@@ -79,18 +95,6 @@ class Algorithm(Generic[JobDetailsT, ResultT]):
             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))
-
         self.config = config
 
     class Error(RuntimeError): ...
@@ -133,6 +137,18 @@ 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.config.custom_input,
+            base_dir=self.config.environment.base_dir,
+            dids=self.config.environment.dids,
+            transformation_did=self.config.environment.transformation_did,
+            secret=self.config.environment.secret,
+        )
+
+        self.logger.info("Loaded JobDetails")
+        self.logger.debug(asdict(self.job_details))
+
         try:
             # Validation step
             if self._validate_fn:
@@ -166,7 +182,9 @@ class Algorithm(Generic[JobDetailsT, ResultT]):
                 )
 
         except Exception as e:
-            self.logger.exception("Error during algorithm execution")
-            self._error_callback(e)
+            if self._error_callback:
+                self._error_callback(e)
+            else:
+                default_error_callback(self, e)
 
         return self._result

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ocean-runner
-Version: 0.2.16
+Version: 0.2.18
 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,7 @@ 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: pytest>=8.4.2
 Description-Content-Type: text/markdown
 

ocean_runner-0.2.18.dist-info/RECORD

@@ -0,0 +1,7 @@
+ocean_runner/__init__.py,sha256=awAmE6kZhuwcrD3gT7qFZArdhiuzW-EFTA6tGKhw06k,138
+ocean_runner/config.py,sha256=gyyUotPJ7n8wPPdsJZIBUT4zBlkoNbhV876JDTdPNsY,1398
+ocean_runner/runner.py,sha256=2j0XNk06gIlPoer_kVRtSf-noYZzhORi_7-UnPQBJxA,6005
+ocean_runner-0.2.18.dist-info/METADATA,sha256=NsZ4U_FM2scbLrsgP9BrxczPoBzItV1xs2VlttEGTAI,6562
+ocean_runner-0.2.18.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+ocean_runner-0.2.18.dist-info/licenses/LICENSE,sha256=_B25KqK4amoADWkMN150tnZFm_Fy7VvZpvIC8ZydWdI,1053
+ocean_runner-0.2.18.dist-info/RECORD,,

{ocean_runner-0.2.16.dist-info → ocean_runner-0.2.18.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,,