oceanprotocol-job-details 0.1.2__py3-none-any.whl → 0.1.4__py3-none-any.whl

oceanprotocol_job_details/config.py

@@ -9,22 +9,22 @@ logger = getLogger(__name__)
 class Config:
     """Configuration class for the Ocean Protocol Job Details"""
 
-    path_data: str = "/data"
+    path_data: Path = Path("/data")
     """The path to the data directory"""
 
-    path_inputs: str = path_data + "/inputs"
+    path_inputs: Path = path_data / "inputs"
     """The path to the inputs directory"""
 
-    path_ddos: str = path_data + "/ddos"
+    path_ddos: Path = path_data / "ddos"
     """The path to the DDOs directory"""
 
-    path_outputs: str = path_data + "/outputs"
+    path_outputs: Path = path_data / "outputs"
     """The path to the outputs directory"""
 
-    path_logs: str = path_data + "/logs"
+    path_logs: Path = path_data / "logs"
     """The path to the logs directory"""
 
-    path_algorithm_custom_parameters: str = path_inputs + "/algoCustomData.json"
+    path_algorithm_custom_parameters: Path = path_inputs / "algoCustomData.json"
     """The path to the algorithm's custom parameters file"""
 
 
@@ -43,11 +43,12 @@ def update_config_from(base: Path) -> None:
     base.mkdir(parents=True, exist_ok=True)
 
     for field in fields(config):
-        default_value = field.default
-        if default_value is None or not isinstance(default_value, Path):
-            raise ValueError(f"Field {field.name} has no default value")
+        current_value = getattr(config, field.name)
+        if not isinstance(current_value, Path):
+            raise ValueError(f"Field {field.name} is n|ot a Path")
 
-        object.__setattr__(config, field.name, str(base / default_value))
+        rel_path = Path(current_value).relative_to("/data")
+        object.__setattr__(config, field.name, base / rel_path)
 
 
 __all__ = ["config"]

oceanprotocol_job_details/ocean.py

@@ -2,6 +2,8 @@ from dataclasses import dataclass, field
 from functools import cached_property
 from typing import Any, Generic, Optional, Type, TypeVar, final
 
+import orjson
+
 from dataclasses_json import config as dc_config
 from dataclasses_json import dataclass_json
 
@@ -155,6 +157,20 @@ class DDO:
     purgatory: Purgatory
 
 
+def _normalize_json(value):
+    if isinstance(value, str):
+        try:
+            decoded = orjson.loads(value)
+            return _normalize_json(decoded)  # recurse if nested again
+        except orjson.JSONDecodeError:
+            return value
+    elif isinstance(value, dict):
+        return {k: _normalize_json(v) for k, v in value.items()}
+    elif isinstance(value, list):
+        return [_normalize_json(v) for v in value]
+    return value
+
+
 @final
 @dataclass_json
 @dataclass(frozen=True)
@@ -180,4 +196,16 @@ class JobDetails(Generic[T]):
         """Read the input parameters and return them in an instance of the dataclass T"""
 
         with open(config.path_algorithm_custom_parameters, "r") as f:
-            return dataclass_json(self._type).from_json(f.read())  # type: ignore
+            raw = f.read().strip()
+            if not raw:
+                raise ValueError(
+                    f"Custom parameters file {config.path_algorithm_custom_parameters} is empty"
+                )
+            try:
+                parsed = _normalize_json(orjson.loads(raw))
+                return dataclass_json(self._type).from_dict(parsed)  # type: ignore
+            except Exception as e:
+                raise ValueError(
+                    f"Failed to parse input paramers into {self._type.__name__}: {e}\n"
+                    f"Raw content: {raw}"
+                ) from e

{oceanprotocol_job_details-0.1.2.dist-info → oceanprotocol_job_details-0.1.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oceanprotocol-job-details
-Version: 0.1.2
+Version: 0.1.4
 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

{oceanprotocol_job_details-0.1.2.dist-info → oceanprotocol_job_details-0.1.4.dist-info}/RECORD

@@ -1,7 +1,7 @@
 oceanprotocol_job_details/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-oceanprotocol_job_details/config.py,sha256=lE9H8rRSF5RCJtMHMTAYf8CUYMyf9GPq0kiB2cT8-gE,1429
+oceanprotocol_job_details/config.py,sha256=e-V1ybwr-LzuceyhZalmPOTzpgTbuUxlwjbLu7EJMvc,1469
 oceanprotocol_job_details/job_details.py,sha256=98Uvx3jes1f75onYxT-65EOOOwcxdw32slAa3n1MqUc,1477
-oceanprotocol_job_details/ocean.py,sha256=zSy6DnMxUH8_geH_cZc6DEXQ0d_m_-J0120AvFPVPdA,3527
+oceanprotocol_job_details/ocean.py,sha256=N27O-qzE6NMYaTIe2O_ZNKdQGuFKtfPELy2-_IdEZls,4505
 oceanprotocol_job_details/utils.py,sha256=btgys1g4AKSADsde_JRofPVmI0VbR_jf85DIYhuMhgs,940
 oceanprotocol_job_details/loaders/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 oceanprotocol_job_details/loaders/loader.py,sha256=HIzsVKCuGP7ghfM7ppN3ANVybvsA64wr3h8I68mqS6A,195
@@ -9,7 +9,7 @@ oceanprotocol_job_details/loaders/impl/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JC
 oceanprotocol_job_details/loaders/impl/ddo.py,sha256=LcKoDuGnZw8JW68Q5P9gWGYeZqszC97HxnkzOuorHBA,707
 oceanprotocol_job_details/loaders/impl/files.py,sha256=hft3Y61D6eHpa9ZQ5i2C5tnCv9IZaTudOZaOIQUbkxo,2002
 oceanprotocol_job_details/loaders/impl/job_details.py,sha256=ERKQm1oH3jW8ebb8l4glL-Wm-9rV8mBfFalVvo0UomU,802
-oceanprotocol_job_details-0.1.2.dist-info/METADATA,sha256=qc5j3uozzNc6NNaIqRd4gGPPo_uFNHUoayCEmq3CeRM,3141
-oceanprotocol_job_details-0.1.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-oceanprotocol_job_details-0.1.2.dist-info/licenses/LICENSE,sha256=ni3ix7P_GxK1W3VGC4fJ3o6QoCngCEpSuTJwO4nkpbw,1055
-oceanprotocol_job_details-0.1.2.dist-info/RECORD,,
+oceanprotocol_job_details-0.1.4.dist-info/METADATA,sha256=mfNcO-GwsN59tmuWhGBUfc43bghmY46GqSp1Kk1QyY0,3141
+oceanprotocol_job_details-0.1.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+oceanprotocol_job_details-0.1.4.dist-info/licenses/LICENSE,sha256=ni3ix7P_GxK1W3VGC4fJ3o6QoCngCEpSuTJwO4nkpbw,1055
+oceanprotocol_job_details-0.1.4.dist-info/RECORD,,