oceanprotocol-job-details 0.2.6__py3-none-any.whl → 0.2.8__py3-none-any.whl

oceanprotocol_job_details/di.py

@@ -15,11 +15,12 @@ class Container(containers.DeclarativeContainer):
         base_dir=config.base_dir,
     )
 
-    file_loader = providers.Factory(
+    file_loader = providers.Singleton(
         FilesLoader,
         dids=config.dids,
         transformation_did=config.transformation_did,
         paths=paths,
+        logger=config.logger,
     )
 
     files = providers.Factory(

oceanprotocol_job_details/loaders/impl/ddo.py

@@ -28,5 +28,5 @@ class DDOLoader:
         ddos = []
         for path in self._ddo_paths:
             with open(path, "r") as f:
-                ddos.append(DDO.from_json(f.read()))  # type: ignore
+                ddos.append(DDO.from_json(f.read()))
         return ddos

oceanprotocol_job_details/loaders/impl/files.py

@@ -2,7 +2,8 @@ from __future__ import annotations
 
 import json
 from dataclasses import InitVar, dataclass, field
-from typing import TYPE_CHECKING, Sequence, final
+from logging import Logger
+from typing import TYPE_CHECKING, final
 
 from oceanprotocol_job_details.paths import Paths
 
@@ -23,7 +24,10 @@ class FilesLoader:
     paths: Paths
     """Path configurations of the project"""
 
-    _dids: Sequence[str] = field(init=False)
+    logger: Logger
+    """Logger to use"""
+
+    _dids: str = field(init=False)
     _transformation_did: str = field(init=False)
 
     def __post_init__(
@@ -31,11 +35,17 @@ class FilesLoader:
         dids: str | None,
         transformation_did: str | None,
     ) -> None:
-        assert dids, "Missing DIDs"
-        assert transformation_did, "Missing transformation DID"
+        def _load_dids(dids, logger):
+            if dids:
+                return json.loads(dids)
+
+            logger.info("Missing DIDS, Inferring DIDS from input DDOs")
+            return [f.parts[-1] for f in self.paths.ddos.iterdir()]
 
-        object.__setattr__(self, "_dids", json.loads(dids))
         object.__setattr__(self, "_transformation_did", transformation_did)
+        object.__setattr__(self, "_dids", _load_dids(dids, self.logger))
+
+        assert self._dids, "Missing input DIDs"
 
     def load(self) -> Files:
         from oceanprotocol_job_details.ocean import DIDPaths, Files

oceanprotocol_job_details/ocean.py

@@ -1,9 +1,9 @@
 from __future__ import annotations
 
-import logging
 import os
 from dataclasses import dataclass, field
 from functools import cached_property
+from logging import Logger, getLogger
 from pathlib import Path
 from typing import (
     Any,
@@ -24,14 +24,7 @@ from dataclasses_json import dataclass_json
 from oceanprotocol_job_details.di import Container
 from oceanprotocol_job_details.paths import Paths
 
-T = TypeVar("T")
-
-logging.basicConfig(
-    level=logging.INFO,
-    format="%(asctime)s [%(threadName)s] [%(levelname)s]  %(message)s",
-    handlers=[logging.StreamHandler()],
-)
-logger = logging.getLogger(__name__)
+InputParemetersT = TypeVar("InputParemetersT")
 
 
 @dataclass_json
@@ -234,7 +227,7 @@ class _EmptyJobDetails: ...
 @final
 @dataclass_json
 @dataclass(frozen=True)
-class JobDetails(Generic[T]):
+class JobDetails(Generic[InputParemetersT]):
     files: Files
     """The input filepaths"""
 
@@ -245,7 +238,7 @@ class JobDetails(Generic[T]):
     """Configuration paths"""
 
     # Store the type explicitly to avoid issues
-    _type: Type[T] = field(repr=False)
+    _type: Type[InputParemetersT] = field(repr=False)
 
     secret: str | None = None
     """Shh it's a secret"""
@@ -260,8 +253,8 @@ class JobDetails(Generic[T]):
                 yield (idx, file)
 
     @cached_property
-    def input_parameters(self) -> T:
-        """Read the input parameters and return them in an instance of the dataclass T"""
+    def input_parameters(self) -> InputParemetersT:
+        """Read the input parameters and return them in an instance of the dataclass InputParemetersT"""
 
         with open(self.paths.algorithm_custom_parameters, "r") as f:
             raw = f.read().strip()
@@ -281,13 +274,14 @@ class JobDetails(Generic[T]):
     @classmethod
     def load(
         cls,
-        _type: Type[T] | None = None,
+        _type: Type[InputParemetersT] | None = None,
         *,
         base_dir: str | None = None,
         dids: str | None = None,
         transformation_did: str | None = None,
         secret: str | None = None,
-    ) -> JobDetails[T]:
+        logger: Logger | None = None,
+    ) -> JobDetails[InputParemetersT]:
         """Load a JobDetails instance that holds the runtime details.
 
         Loading it will check the following:
@@ -299,7 +293,6 @@ class JobDetails(Generic[T]):
         - DIDS: The DIDs of the inputs
         - TRANSFORMATION_DID: The DID of the transformation algorithm
         - SECRET (optional): A really secret secret
-
         """
 
         if _type is None:
@@ -309,10 +302,11 @@ class JobDetails(Generic[T]):
         container.config.from_dict(
             {
                 "base_dir": base_dir or os.environ.get("BASE_DIR", None),
-                "dids": dids or os.environ.get("DIDS"),
+                "dids": dids or os.environ.get("DIDS", None),
                 "transformation_did": transformation_did
-                or os.environ.get("TRANSFORMATION_DID"),
-                "secret": secret or os.environ.get("SECRET"),
+                or os.environ.get("TRANSFORMATION_DID", None),
+                "secret": secret or os.environ.get("SECRET", None),
+                "logger": logger or getLogger(__name__),
             }
         )
 

oceanprotocol_job_details/paths.py

@@ -10,8 +10,8 @@ class Paths:
 
     _base: Path = field(init=False)
 
-    def __post_init__(self, base_dir: Path | None) -> None:
-        self._base = base_dir or Path("/data")
+    def __post_init__(self, base_dir: str | Path | None) -> None:
+        self._base = Path(base_dir) if base_dir else Path("/data")
 
     @property
     def data(self) -> Path:

{oceanprotocol_job_details-0.2.6.dist-info → oceanprotocol_job_details-0.2.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oceanprotocol-job-details
-Version: 0.2.6
+Version: 0.2.8
 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.8.dist-info/RECORD

@@ -0,0 +1,14 @@
+oceanprotocol_job_details/__init__.py,sha256=C67wv7fy5ZT5FtbGD-oQeSoLU-x6e2ts-820koFo034,55
+oceanprotocol_job_details/di.py,sha256=myDGtCh5Xq3T1WpGPf7dQ6bo961elpODaPtxdkibS2s,1212
+oceanprotocol_job_details/ocean.py,sha256=t1BP4bdIcNgzEkXuVM7g9Bg0pEz_ljctE2CQEtSPnwA,7431
+oceanprotocol_job_details/paths.py,sha256=o2IwhKO8nxIp03-NXYUhhWC7XPiMjz61AACStZRcJX0,877
+oceanprotocol_job_details/loaders/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+oceanprotocol_job_details/loaders/loader.py,sha256=HIzsVKCuGP7ghfM7ppN3ANVybvsA64wr3h8I68mqS6A,195
+oceanprotocol_job_details/loaders/impl/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+oceanprotocol_job_details/loaders/impl/ddo.py,sha256=SuPvQBc2MS-q0g8BQOfCXPAvMvhl7Vnbq9GHugAU--s,828
+oceanprotocol_job_details/loaders/impl/files.py,sha256=ZiIb-gblgIqU5HBy0mrZwooH-Qu_HSWyaJ3VtBIhJcs,1696
+oceanprotocol_job_details/loaders/impl/job_details.py,sha256=wf0xNAG4tESq57vqkdtMQ8BdiyS91j5f7FL8Gfwbjh4,770
+oceanprotocol_job_details-0.2.8.dist-info/METADATA,sha256=VeSAl-f3YHorBv1vA91FI8Fz4rhNATyiZsiTb2wGMY4,4507
+oceanprotocol_job_details-0.2.8.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+oceanprotocol_job_details-0.2.8.dist-info/licenses/LICENSE,sha256=ni3ix7P_GxK1W3VGC4fJ3o6QoCngCEpSuTJwO4nkpbw,1055
+oceanprotocol_job_details-0.2.8.dist-info/RECORD,,

{oceanprotocol_job_details-0.2.6.dist-info → oceanprotocol_job_details-0.2.8.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

oceanprotocol_job_details-0.2.6.dist-info/RECORD

@@ -1,14 +0,0 @@
-oceanprotocol_job_details/__init__.py,sha256=C67wv7fy5ZT5FtbGD-oQeSoLU-x6e2ts-820koFo034,55
-oceanprotocol_job_details/di.py,sha256=j2BvpaGpiQwt9MSiViYPFup4MnzTHm44Zq12_TQ07kY,1180
-oceanprotocol_job_details/ocean.py,sha256=uABP0JZdCpd3NrTmfXWGuG8XOEVx680-jjRDV0hHync,7373
-oceanprotocol_job_details/paths.py,sha256=N90IF8OQCBELULGPaBv9yALApa-lC2dsVKXMWLdqa14,851
-oceanprotocol_job_details/loaders/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-oceanprotocol_job_details/loaders/loader.py,sha256=HIzsVKCuGP7ghfM7ppN3ANVybvsA64wr3h8I68mqS6A,195
-oceanprotocol_job_details/loaders/impl/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-oceanprotocol_job_details/loaders/impl/ddo.py,sha256=_xl0PozuvIm0n6jU--Znk6qfw1A6OLBq3SERbDGIF74,844
-oceanprotocol_job_details/loaders/impl/files.py,sha256=oFkA_0Ma5NBgWvVEk_rhyDIDrAam_zjesh0-bxZaIU8,1443
-oceanprotocol_job_details/loaders/impl/job_details.py,sha256=wf0xNAG4tESq57vqkdtMQ8BdiyS91j5f7FL8Gfwbjh4,770
-oceanprotocol_job_details-0.2.6.dist-info/METADATA,sha256=jqQAuRh8p34G3ZIUC23-rfr8Odrw9ByyW5YP5FUyt9g,4507
-oceanprotocol_job_details-0.2.6.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-oceanprotocol_job_details-0.2.6.dist-info/licenses/LICENSE,sha256=ni3ix7P_GxK1W3VGC4fJ3o6QoCngCEpSuTJwO4nkpbw,1055
-oceanprotocol_job_details-0.2.6.dist-info/RECORD,,