digitalhub 0.8.0b10__tar.gz → 0.8.0b12__tar.gz

{digitalhub-0.8.0b10 → digitalhub-0.8.0b12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: digitalhub
-Version: 0.8.0b10
+Version: 0.8.0b12
 Summary: Python SDK for Digitalhub
 Author-email: Fondazione Bruno Kessler <dslab@fbk.eu>, Matteo Martini <mmartini@fbk.eu>
 License:                               Apache License

{digitalhub-0.8.0b10 → digitalhub-0.8.0b12}/digitalhub/client/dhcore/client.py

@@ -1,5 +1,7 @@
 from __future__ import annotations
 
+import datetime
+import json
 import os
 import typing
 from urllib.parse import urlparse
@@ -83,7 +85,10 @@ class ClientDHCore(Client):
         dict
             Response object.
         """
-        kwargs["json"] = obj
+        if "headers" not in kwargs:
+            kwargs["headers"] = {}
+        kwargs["headers"]['Content-Type'] = "application/json"
+        kwargs["data"] = json.dumps(obj, default=ClientDHCore._json_serialize)
         return self._prepare_call("POST", api, **kwargs)
 
     def read_object(self, api: str, **kwargs) -> dict:
@@ -122,7 +127,10 @@ class ClientDHCore(Client):
         dict
             Response object.
         """
-        kwargs["json"] = obj
+        if "headers" not in kwargs:
+            kwargs["headers"] = {}
+        kwargs["headers"]['Content-Type'] = "application/json"
+        kwargs["data"] = json.dumps(obj, default=ClientDHCore._json_serialize)
         return self._prepare_call("PUT", api, **kwargs)
 
     def delete_object(self, api: str, **kwargs) -> dict:
@@ -165,7 +173,7 @@ class ClientDHCore(Client):
         if kwargs is None:
             kwargs = {}
 
-        if kwargs.get("params") is None:
+        if "params" not in kwargs:
             kwargs["params"] = {}
 
         start_page = 0
@@ -203,12 +211,31 @@ class ClientDHCore(Client):
         try:
             return self.list_objects(api, **kwargs)[0]
         except IndexError:
-            raise IndexError("No objects found")
+            raise BackendError("No object found.")
 
     ##############################
     # Call methods
     ##############################
 
+    @staticmethod
+    def _json_serialize(obj: dict) -> dict:
+        """
+        JSON datetime to ISO format serializer.
+
+        Parameters
+        ----------
+        obj : dict
+            The object to serialize.
+
+        Returns
+        -------
+        dict
+            The serialized object.
+        """
+        if isinstance(obj, (datetime.datetime, datetime.date)):
+            return obj.isoformat()
+        raise TypeError ("Type %s not serializable" % type(obj))
+
     def _prepare_call(self, call_type: str, api: str, **kwargs) -> dict:
         """
         Prepare a call to the DHCore API.
@@ -230,12 +257,12 @@ class ClientDHCore(Client):
         if kwargs is None:
             kwargs = {}
         url = self._endpoint_core + api
-        kwargs = self._set_auth_header(kwargs)
+        kwargs = self._set_auth(kwargs)
         return self._make_call(call_type, url, **kwargs)
 
-    def _set_auth_header(self, kwargs: dict) -> dict:
+    def _set_auth(self, kwargs: dict) -> dict:
         """
-        Set the authentication header.
+        Set the authentication type.
 
         Parameters
         ----------
@@ -245,13 +272,14 @@ class ClientDHCore(Client):
         Returns
         -------
         dict
-            Keyword arguments with the authentication header.
+            Keyword arguments with the authentication parameters.
         """
         if self._auth_type == "basic":
             kwargs["auth"] = self._user, self._password
         elif self._auth_type == "oauth2":
-            kwargs["headers"] = {"Authorization": f"Bearer {self._access_token}"}
-
+            if "headers" not in kwargs:
+                kwargs["headers"] = {}
+            kwargs["headers"]["Authorization"] = f"Bearer {self._access_token}"
         return kwargs
 
     def _make_call(self, call_type: str, url: str, refresh_token: bool = True, **kwargs) -> dict:
@@ -281,7 +309,7 @@ class ClientDHCore(Client):
         # Handle token refresh
         if response.status_code in [401] and refresh_token:
             self._get_new_access_token()
-            kwargs = self._set_auth_header(kwargs)
+            kwargs = self._set_auth(kwargs)
             return self._make_call(call_type, url, refresh_token=False, **kwargs)
 
         self._raise_for_error(response)

{digitalhub-0.8.0b10 → digitalhub-0.8.0b12}/digitalhub/client/local/client.py

@@ -470,7 +470,7 @@ class ClientLocal(Client):
                     copied = deepcopy(entity)
 
                     # Remove spec if not embedded
-                    if not copied.get("metadata", {}).get("embedded", True):
+                    if not copied.get("metadata", {}).get("embedded", False):
                         copied.pop("spec", None)
 
                     # Add to project spec

{digitalhub-0.8.0b10 → digitalhub-0.8.0b12}/digitalhub/entities/_base/runtime_entity/builder.py

@@ -93,3 +93,14 @@ class RuntimeEntityBuilder:
         """
         task_kinds = [i["kind"] for i in self.TASKS_KINDS]
         return [self.EXECUTABLE_KIND, self.RUN_KIND, *task_kinds]
+
+    def get_all_actions(self) -> list[str]:
+        """
+        Get all actions.
+
+        Returns
+        -------
+        list[str]
+            All actions.
+        """
+        return [i["action"] for i in self.TASKS_KINDS]

{digitalhub-0.8.0b10 → digitalhub-0.8.0b12}/digitalhub/entities/artifact/_base/builder.py

@@ -25,7 +25,7 @@ class ArtifactBuilder(VersionedBuilder):
         uuid: str | None = None,
         description: str | None = None,
         labels: list[str] | None = None,
-        embedded: bool = True,
+        embedded: bool = False,
         path: str | None = None,
         **kwargs,
     ) -> Artifact:

{digitalhub-0.8.0b10 → digitalhub-0.8.0b12}/digitalhub/entities/artifact/crud.py

@@ -29,7 +29,7 @@ def new_artifact(
     uuid: str | None = None,
     description: str | None = None,
     labels: list[str] | None = None,
-    embedded: bool = True,
+    embedded: bool = False,
     path: str | None = None,
     **kwargs,
 ) -> Artifact:

{digitalhub-0.8.0b10 → digitalhub-0.8.0b12}/digitalhub/entities/dataitem/_base/builder.py

@@ -25,7 +25,7 @@ class DataitemBuilder(VersionedBuilder):
         uuid: str | None = None,
         description: str | None = None,
         labels: list[str] | None = None,
-        embedded: bool = True,
+        embedded: bool = False,
         path: str | None = None,
         **kwargs,
     ) -> Dataitem:

{digitalhub-0.8.0b10 → digitalhub-0.8.0b12}/digitalhub/entities/dataitem/crud.py

@@ -35,7 +35,7 @@ def new_dataitem(
     uuid: str | None = None,
     description: str | None = None,
     labels: list[str] | None = None,
-    embedded: bool = True,
+    embedded: bool = False,
     path: str | None = None,
     **kwargs,
 ) -> Dataitem:

{digitalhub-0.8.0b10 → digitalhub-0.8.0b12}/digitalhub/entities/function/_base/builder.py

@@ -25,7 +25,7 @@ class FunctionBuilder(VersionedBuilder, RuntimeEntityBuilder):
         uuid: str | None = None,
         description: str | None = None,
         labels: list[str] | None = None,
-        embedded: bool = True,
+        embedded: bool = False,
         **kwargs,
     ) -> Function:
         """

{digitalhub-0.8.0b10 → digitalhub-0.8.0b12}/digitalhub/entities/function/crud.py

@@ -25,7 +25,7 @@ def new_function(
     uuid: str | None = None,
     description: str | None = None,
     labels: list[str] | None = None,
-    embedded: bool = True,
+    embedded: bool = False,
     **kwargs,
 ) -> Function:
     """

{digitalhub-0.8.0b10 → digitalhub-0.8.0b12}/digitalhub/entities/model/_base/builder.py

@@ -25,7 +25,7 @@ class ModelBuilder(VersionedBuilder):
         uuid: str | None = None,
         description: str | None = None,
         labels: list[str] | None = None,
-        embedded: bool = True,
+        embedded: bool = False,
         path: str | None = None,
         **kwargs,
     ) -> Model:

{digitalhub-0.8.0b10 → digitalhub-0.8.0b12}/digitalhub/entities/model/crud.py

@@ -28,7 +28,7 @@ def new_model(
     uuid: str | None = None,
     description: str | None = None,
     labels: list[str] | None = None,
-    embedded: bool = True,
+    embedded: bool = False,
     path: str | None = None,
     **kwargs,
 ) -> Model:

{digitalhub-0.8.0b10 → digitalhub-0.8.0b12}/digitalhub/entities/project/_base/entity.py

@@ -229,7 +229,8 @@ class Project(Entity):
             # Entity types are stored as a list of entities
             for idx, entity in enumerate(obj.get("spec", {}).get(entity_type, [])):
                 # Export entity if not embedded is in metadata, else do nothing
-                if not entity["metadata"]["embedded"]:
+                embedded = entity["metadata"].get("embedded", False)
+                if not embedded:
                     # Get entity object from backend
                     obj_dict: dict = read_entity_api_ctx(entity["key"])
 
@@ -338,7 +339,7 @@ class Project(Entity):
         uuid: str | None = None,
         description: str | None = None,
         labels: list[str] | None = None,
-        embedded: bool = True,
+        embedded: bool = False,
         path: str | None = None,
         **kwargs,
     ) -> Artifact:
@@ -629,7 +630,7 @@ class Project(Entity):
         uuid: str | None = None,
         description: str | None = None,
         labels: list[str] | None = None,
-        embedded: bool = True,
+        embedded: bool = False,
         path: str | None = None,
         **kwargs,
     ) -> Dataitem:
@@ -933,7 +934,7 @@ class Project(Entity):
         uuid: str | None = None,
         description: str | None = None,
         labels: list[str] | None = None,
-        embedded: bool = True,
+        embedded: bool = False,
         path: str | None = None,
         **kwargs,
     ) -> Model:
@@ -1225,7 +1226,7 @@ class Project(Entity):
         uuid: str | None = None,
         description: str | None = None,
         labels: list[str] | None = None,
-        embedded: bool = True,
+        embedded: bool = False,
         **kwargs,
     ) -> Function:
         """
@@ -1471,7 +1472,7 @@ class Project(Entity):
         uuid: str | None = None,
         description: str | None = None,
         labels: list[str] | None = None,
-        embedded: bool = True,
+        embedded: bool = False,
         **kwargs,
     ) -> Workflow:
         """
@@ -1716,7 +1717,7 @@ class Project(Entity):
         uuid: str | None = None,
         description: str | None = None,
         labels: list[str] | None = None,
-        embedded: bool = True,
+        embedded: bool = False,
         secret_value: str | None = None,
         **kwargs,
     ) -> Secret:

{digitalhub-0.8.0b10 → digitalhub-0.8.0b12}/digitalhub/entities/run/_base/builder.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 import typing
 
-from digitalhub.entities._base.runtime_entity.builder import RuntimeEntityBuilder
+from digitalhub.entities._base.runtime_entity.builder import RuntimeEntityBuilder, EntityError
 from digitalhub.entities._base.unversioned.builder import UnversionedBuilder
 from digitalhub.entities.utils.entity_types import EntityTypes
 
@@ -52,6 +52,9 @@ class RunBuilder(UnversionedBuilder, RuntimeEntityBuilder):
         Run
             Object instance.
         """
+        if task is None:
+            raise EntityError("Missing task in run spec")
+        self._check_kind_validity(task)
         uuid = self.build_uuid(uuid)
         metadata = self.build_metadata(
             project=project,
@@ -72,3 +75,20 @@ class RunBuilder(UnversionedBuilder, RuntimeEntityBuilder):
             spec=spec,
             status=status,
         )
+
+    def _check_kind_validity(self, task: str) -> None:
+        """
+        Check kind validity.
+
+        Parameters
+        ----------
+        task : str
+            Task string.
+
+        Returns
+        -------
+        None
+        """
+        task_kind = task.split("://")[0]
+        if task_kind not in self.get_all_kinds():
+            raise EntityError(f"Invalid run '{self.ENTITY_KIND}' for task kind '{task_kind}'")

{digitalhub-0.8.0b10 → digitalhub-0.8.0b12}/digitalhub/entities/secret/crud.py

@@ -27,7 +27,7 @@ def new_secret(
     uuid: str | None = None,
     description: str | None = None,
     labels: list[str] | None = None,
-    embedded: bool = True,
+    embedded: bool = False,
     secret_value: str | None = None,
     **kwargs,
 ) -> Secret:

{digitalhub-0.8.0b10 → digitalhub-0.8.0b12}/digitalhub/entities/task/_base/builder.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 import typing
 
-from digitalhub.entities._base.runtime_entity.builder import RuntimeEntityBuilder
+from digitalhub.entities._base.runtime_entity.builder import RuntimeEntityBuilder, EntityError
 from digitalhub.entities._base.unversioned.builder import UnversionedBuilder
 from digitalhub.entities.utils.entity_types import EntityTypes
 
@@ -49,6 +49,10 @@ class TaskBuilder(UnversionedBuilder, RuntimeEntityBuilder):
         Task
             Object instance.
         """
+        if function is None:
+            raise EntityError("function must be provided")
+
+        self._check_kind_validity(function)
         uuid = self.build_uuid(uuid)
         metadata = self.build_metadata(
             project=project,
@@ -68,3 +72,20 @@ class TaskBuilder(UnversionedBuilder, RuntimeEntityBuilder):
             spec=spec,
             status=status,
         )
+
+    def _check_kind_validity(self, function: str) -> None:
+        """
+        Check kind validity.
+
+        Parameters
+        ----------
+        function : str
+            Function string.
+
+        Returns
+        -------
+        None
+        """
+        function_kind = function.split("://")[0]
+        if self.EXECUTABLE_KIND != function_kind:
+            raise EntityError(f"Invalid task '{self.ENTITY_KIND}' for function kind '{function_kind}'")

{digitalhub-0.8.0b10 → digitalhub-0.8.0b12}/digitalhub/entities/workflow/_base/builder.py

@@ -25,7 +25,7 @@ class WorkflowBuilder(VersionedBuilder, RuntimeEntityBuilder):
         uuid: str | None = None,
         description: str | None = None,
         labels: list[str] | None = None,
-        embedded: bool = True,
+        embedded: bool = False,
         **kwargs,
     ) -> Workflow:
         """

{digitalhub-0.8.0b10 → digitalhub-0.8.0b12}/digitalhub/entities/workflow/crud.py

@@ -26,7 +26,7 @@ def new_workflow(
     uuid: str | None = None,
     description: str | None = None,
     labels: list[str] | None = None,
-    embedded: bool = True,
+    embedded: bool = False,
     **kwargs,
 ) -> Workflow:
     """

{digitalhub-0.8.0b10 → digitalhub-0.8.0b12}/digitalhub/utils/io_utils.py

@@ -37,6 +37,42 @@ def write_yaml(filepath: str | Path, obj: dict | list[dict]) -> None:
 ##############################
 
 
+
+class NoDatesSafeLoader(yaml.SafeLoader):
+    """
+    Loader implementation to exclude implicit resolvers.
+
+    Taken from https://stackoverflow.com/a/37958106
+    """
+
+    @classmethod
+    def remove_implicit_resolver(cls, tag_to_remove: str) -> None:
+        """
+        Remove implicit resolvers for a particular tag
+        Takes care not to modify resolvers in super classes.
+        We want to load datetimes as strings, not dates, because we
+        go on to serialise as json which doesn't have the advanced types
+        of yaml, and leads to incompatibilities down the track.
+
+        Parameters
+        ----------
+        tag_to_remove : str
+            The tag to remove
+
+        Returns
+        -------
+        None
+        """
+        if not 'yaml_implicit_resolvers' in cls.__dict__:
+            cls.yaml_implicit_resolvers = cls.yaml_implicit_resolvers.copy()
+
+        for first_letter, mappings in cls.yaml_implicit_resolvers.items():
+            cls.yaml_implicit_resolvers[first_letter] = [(tag, regexp)
+                                                         for tag, regexp in mappings
+                                                         if tag != tag_to_remove]
+
+NoDatesSafeLoader.remove_implicit_resolver('tag:yaml.org,2002:timestamp')
+
 def read_yaml(filepath: str | Path) -> dict | list[dict]:
     """
     Read a yaml file and return a dict or a list of dict.
@@ -53,12 +89,12 @@ def read_yaml(filepath: str | Path) -> dict | list[dict]:
     """
     try:
         with open(filepath, "r", encoding="utf-8") as in_file:
-            data = yaml.load(in_file, Loader=yaml.SafeLoader)
+            data = yaml.load(in_file, Loader=NoDatesSafeLoader)
 
     # If yaml contains multiple documents
     except yaml.composer.ComposerError:
         with open(filepath, "r", encoding="utf-8") as in_file:
-            data = list(yaml.load_all(in_file, Loader=yaml.SafeLoader))
+            data = list(yaml.load_all(in_file, Loader=NoDatesSafeLoader))
     return data
 
 

{digitalhub-0.8.0b10 → digitalhub-0.8.0b12}/digitalhub.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: digitalhub
-Version: 0.8.0b10
+Version: 0.8.0b12
 Summary: Python SDK for Digitalhub
 Author-email: Fondazione Bruno Kessler <dslab@fbk.eu>, Matteo Martini <mmartini@fbk.eu>
 License:                               Apache License

{digitalhub-0.8.0b10 → digitalhub-0.8.0b12}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "digitalhub"
-version = "0.8.0b10"
+version = "0.8.0b12"
 description = "Python SDK for Digitalhub"
 readme = "README.md"
 authors = [
@@ -77,7 +77,7 @@ line-length = 120
 convention = "numpy"
 
 [tool.bumpver]
-current_version = "0.8.0b10"
+current_version = "0.8.0b12"
 version_pattern = "MAJOR.MINOR.PATCH[PYTAGNUM]"
 commit_message  = "Bump version {old_version} -> {new_version}"
 commit          = false