oceanprotocol-job-details 0.2.2__tar.gz → 0.2.3__tar.gz

{oceanprotocol_job_details-0.2.2 → oceanprotocol_job_details-0.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oceanprotocol-job-details
-Version: 0.2.2
+Version: 0.2.3
 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.2.2 → oceanprotocol_job_details-0.2.3}/oceanprotocol_job_details/di.py

@@ -10,7 +10,10 @@ class Container(containers.DeclarativeContainer):
 
     config = providers.Configuration()
 
-    paths = providers.Singleton(Paths)
+    paths = providers.Singleton(
+        Paths,
+        base_dir=config.base_dirs,
+    )
 
     file_loader = providers.Factory(
         FilesLoader,

{oceanprotocol_job_details-0.2.2 → oceanprotocol_job_details-0.2.3}/oceanprotocol_job_details/ocean.py

@@ -267,6 +267,8 @@ class JobDetails(Generic[T]):
     def load(
         cls,
         _type: Type[T] | None = None,
+        *,
+        base_dir: str | None = None,
         dids: str | None = None,
         transformation_did: str | None = None,
         secret: str | None = None,
@@ -278,6 +280,7 @@ class JobDetails(Generic[T]):
         1. That the ocean protocol contains the needed data based on the passed environment variables.
 
         Those needed environment variables are:
+        - BASE_DIR: Base directory to read the data from, parent of the ddos, inputs, outputs and logs directories.
         - DIDS: The DIDs of the inputs
         - TRANSFORMATION_DID: The DID of the transformation algorithm
         - SECRET (optional): A really secret secret
@@ -290,6 +293,7 @@ class JobDetails(Generic[T]):
         container = Container()
         container.config.from_dict(
             {
+                "base_dir": base_dir or os.environ.get("BASE_DIR", None),
                 "dids": dids or os.environ.get("DIDS"),
                 "transformation_did": transformation_did
                 or os.environ.get("TRANSFORMATION_DID"),

oceanprotocol_job_details-0.2.3/oceanprotocol_job_details/paths.py

@@ -0,0 +1,38 @@
+from dataclasses import InitVar, dataclass, field
+from pathlib import Path
+
+
+@dataclass
+class Paths:
+    """Configuration class for the Ocean Protocol Job Details"""
+
+    base_dir: InitVar[Path | None]
+
+    _base: Path = field(init=False)
+
+    def __post_init__(self, base_dir: Path | None) -> None:
+        self._base = base_dir or Path("/data")
+
+    @property
+    def data(self) -> Path:
+        return self._base
+
+    @property
+    def inputs(self) -> Path:
+        return self.data / "inputs"
+
+    @property
+    def ddos(self) -> Path:
+        return self.data / "ddos"
+
+    @property
+    def outputs(self) -> Path:
+        return self.data / "outputs"
+
+    @property
+    def logs(self) -> Path:
+        return self.data / "logs"
+
+    @property
+    def algorithm_custom_parameters(self) -> Path:
+        return self.inputs / "algoCustomData.json"

{oceanprotocol_job_details-0.2.2 → oceanprotocol_job_details-0.2.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "oceanprotocol-job-details"
-version = "0.2.2"
+version = "0.2.3"
 description = "A Python package to get details from OceanProtocol jobs"
 authors = [
     { name = "Christian López García", email = "christian.lopez@udl.cat" },

oceanprotocol_job_details-0.2.2/oceanprotocol_job_details/paths.py

@@ -1,28 +0,0 @@
-from dataclasses import dataclass
-from logging import getLogger
-from pathlib import Path
-
-logger = getLogger(__name__)
-
-
-@dataclass
-class Paths:
-    """Configuration class for the Ocean Protocol Job Details"""
-
-    data: Path = Path("/data")
-    """The path to the data directory"""
-
-    inputs: Path = data / "inputs"
-    """The path to the inputs directory"""
-
-    ddos: Path = data / "ddos"
-    """The path to the DDOs directory"""
-
-    outputs: Path = data / "outputs"
-    """The path to the outputs directory"""
-
-    logs: Path = data / "logs"
-    """The path to the logs directory"""
-
-    algorithm_custom_parameters: Path = inputs / "algoCustomData.json"
-    """The path to the algorithm's custom parameters file"""