digitalhub 0.8.0b12__tar.gz → 0.8.0b13__tar.gz

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

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

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

@@ -87,7 +87,7 @@ class ClientDHCore(Client):
         """
         if "headers" not in kwargs:
             kwargs["headers"] = {}
-        kwargs["headers"]['Content-Type'] = "application/json"
+        kwargs["headers"]["Content-Type"] = "application/json"
         kwargs["data"] = json.dumps(obj, default=ClientDHCore._json_serialize)
         return self._prepare_call("POST", api, **kwargs)
 
@@ -129,7 +129,7 @@ class ClientDHCore(Client):
         """
         if "headers" not in kwargs:
             kwargs["headers"] = {}
-        kwargs["headers"]['Content-Type'] = "application/json"
+        kwargs["headers"]["Content-Type"] = "application/json"
         kwargs["data"] = json.dumps(obj, default=ClientDHCore._json_serialize)
         return self._prepare_call("PUT", api, **kwargs)
 
@@ -234,7 +234,7 @@ class ClientDHCore(Client):
         """
         if isinstance(obj, (datetime.datetime, datetime.date)):
             return obj.isoformat()
-        raise TypeError ("Type %s not serializable" % type(obj))
+        raise TypeError("Type %s not serializable" % type(obj))
 
     def _prepare_call(self, call_type: str, api: str, **kwargs) -> dict:
         """

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

@@ -244,10 +244,15 @@ class Project(Entity):
         # Return updated object
         return obj
 
-    def _import_entities(self) -> None:
+    def _import_entities(self, obj: dict) -> None:
         """
         Import project entities.
 
+        Parameters
+        ----------
+        obj : dict
+            Project object in dictionary format.
+
         Returns
         -------
         None
@@ -257,10 +262,9 @@ class Project(Entity):
         # Cycle over entity types
         for entity_type in entity_types:
             # Entity types are stored as a list of entities
-            for entity in getattr(self.spec, entity_type, []):
-                entity_metadata = entity["metadata"]
-                embedded = entity_metadata.get("embedded", False)
-                ref = entity_metadata.get("ref", None)
+            for entity in obj.get("spec", {}).get(entity_type, []):
+                embedded = self._is_embedded(entity)
+                ref = entity["metadata"].get("ref")
 
                 # Import entity if not embedded
                 if not embedded and ref is not None:
@@ -279,11 +283,34 @@ class Project(Entity):
 
                 # If entity is embedded, create it and try to save
                 elif embedded:
+                    # It's possible that embedded field in metadata is not shown
+                    if entity["metadata"].get("embedded") is None:
+                        entity["metadata"]["embedded"] = True
+
                     try:
                         build_entity_from_dict(entity).save()
                     except EntityAlreadyExistsError:
                         pass
 
+    def _is_embedded(self, entity: dict) -> bool:
+        """
+        Check if entity is embedded.
+
+        Parameters
+        ----------
+        entity : dict
+            Entity in dictionary format.
+
+        Returns
+        -------
+        bool
+            True if entity is embedded.
+        """
+        metadata_embedded = entity["metadata"].get("embedded", False)
+        no_status = entity.get("status", None) is None
+        no_spec = entity.get("spec", None) is None
+        return metadata_embedded or not (no_status and no_spec)
+
     def _get_entity_types(self) -> list[str]:
         """
         Get entity types.

{digitalhub-0.8.0b12 → digitalhub-0.8.0b13}/digitalhub/entities/project/crud.py

@@ -9,7 +9,7 @@ from digitalhub.context.api import delete_context
 from digitalhub.entities._base.api_utils import delete_entity_api_base, read_entity_api_base, update_entity_api_base
 from digitalhub.entities.utils.entity_types import EntityTypes
 from digitalhub.factory.api import build_entity_from_dict, build_entity_from_params
-from digitalhub.utils.exceptions import BackendError, EntityError
+from digitalhub.utils.exceptions import BackendError, EntityAlreadyExistsError, EntityError
 from digitalhub.utils.io_utils import read_yaml
 
 if typing.TYPE_CHECKING:
@@ -151,8 +151,13 @@ def import_project(
     obj = build_entity_from_dict(dict_obj)
     obj = _setup_project(obj, setup_kwargs)
 
+    try:
+        obj.save()
+    except EntityAlreadyExistsError:
+        pass
+
     # Import related entities
-    obj._import_entities()
+    obj._import_entities(dict_obj)
 
     return obj
 

{digitalhub-0.8.0b12 → digitalhub-0.8.0b13}/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, EntityError
+from digitalhub.entities._base.runtime_entity.builder import EntityError, RuntimeEntityBuilder
 from digitalhub.entities._base.unversioned.builder import UnversionedBuilder
 from digitalhub.entities.utils.entity_types import EntityTypes
 

{digitalhub-0.8.0b12 → digitalhub-0.8.0b13}/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, EntityError
+from digitalhub.entities._base.runtime_entity.builder import EntityError, RuntimeEntityBuilder
 from digitalhub.entities._base.unversioned.builder import UnversionedBuilder
 from digitalhub.entities.utils.entity_types import EntityTypes
 

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

@@ -37,7 +37,6 @@ def write_yaml(filepath: str | Path, obj: dict | list[dict]) -> None:
 ##############################
 
 
-
 class NoDatesSafeLoader(yaml.SafeLoader):
     """
     Loader implementation to exclude implicit resolvers.
@@ -63,15 +62,17 @@ class NoDatesSafeLoader(yaml.SafeLoader):
         -------
         None
         """
-        if not 'yaml_implicit_resolvers' in cls.__dict__:
+        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]
+            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")
 
-NoDatesSafeLoader.remove_implicit_resolver('tag:yaml.org,2002:timestamp')
 
 def read_yaml(filepath: str | Path) -> dict | list[dict]:
     """

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

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

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

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