digitalhub 0.8.0b13__py3-none-any.whl → 0.8.0b15__py3-none-any.whl

digitalhub/context/api.py

@@ -3,6 +3,7 @@ from __future__ import annotations
 import typing
 
 from digitalhub.context.builder import context_builder
+from digitalhub.utils.exceptions import ContextError
 
 if typing.TYPE_CHECKING:
     from digitalhub.context.context import Context
@@ -24,8 +25,7 @@ def check_context(project: str) -> None:
         True if the project is in the context, False otherwise.
     """
     if project not in context_builder._instances:
-        msg = f"Context missing. Set context by creating or importing a project named '{project}'."
-        raise RuntimeError(msg)
+        raise ContextError
 
 
 def set_context(project: Project) -> None:

digitalhub/entities/_base/crud.py

@@ -2,15 +2,19 @@ from __future__ import annotations
 
 import typing
 
+from digitalhub.client.api import build_client, get_client
 from digitalhub.context.api import check_context
 from digitalhub.entities._base.api_utils import (
     delete_entity_api_ctx,
     list_entity_api_ctx,
+    read_entity_api_base,
     read_entity_api_ctx,
     read_entity_api_ctx_versions,
 )
+from digitalhub.entities.utils.entity_types import EntityTypes
+from digitalhub.entities.utils.utils import parse_entity_key
 from digitalhub.factory.api import build_entity_from_dict, build_entity_from_params
-from digitalhub.utils.exceptions import EntityAlreadyExistsError, EntityError
+from digitalhub.utils.exceptions import ContextError, EntityAlreadyExistsError, EntityError, EntityNotExistsError
 from digitalhub.utils.io_utils import read_yaml
 
 if typing.TYPE_CHECKING:
@@ -21,6 +25,58 @@ if typing.TYPE_CHECKING:
     from digitalhub.entities._base.versioned.entity import VersionedEntity
 
 
+def _check_context(project: str) -> None:
+    """
+    Check if the given project is in the context.
+    Otherwise try to get the project from remote.
+
+    Parameters
+    ----------
+    project : str
+        Project name.
+
+    Returns
+    -------
+    None
+    """
+    try:
+        check_context(project)
+    except ContextError:
+        try:
+            build_client()
+            client = get_client()
+            obj = read_entity_api_base(client, EntityTypes.PROJECT.value, project)
+            build_entity_from_dict(obj)
+        except EntityNotExistsError:
+            raise ContextError(f"Project '{project}' not found.")
+
+
+def _check_project_from_identifier(identifier: str, project: str | None = None) -> None:
+    """
+    Check if the given project is in the context.
+    Otherwise try to get the project from remote.
+
+    Parameters
+    ----------
+    identifier : str
+        Entity key (store://...) or entity name.
+    project : str
+        Project name.
+
+    Returns
+    -------
+    None
+    """
+    if not identifier.startswith("store://"):
+        if project is None:
+            raise EntityError("Specify project if you do not specify entity key.")
+
+    else:
+        project, _, _, _, _ = parse_entity_key(identifier)
+
+    _check_context(project)
+
+
 def new_context_entity(**kwargs) -> ContextEntity:
     """
     Create a new object.
@@ -45,7 +101,7 @@ def new_context_entity(**kwargs) -> ContextEntity:
     ContextEntity
         Object instance.
     """
-    check_context(kwargs["project"])
+    _check_context(kwargs["project"])
     obj = build_entity_from_params(**kwargs)
     obj.save()
     return obj
@@ -79,6 +135,7 @@ def get_versioned_entity(
     VersionedEntity
         Object instance.
     """
+    _check_project_from_identifier(identifier, project)
     obj = read_entity_api_ctx(
         identifier,
         entity_type=entity_type,
@@ -116,8 +173,8 @@ def get_unversioned_entity(
     UnversionedEntity
         Object instance.
     """
-    if not identifier.startswith("store://") and project is None:
-        raise EntityError("Specify entity key or entity ID combined with project")
+    _check_project_from_identifier(identifier, project)
+
     obj = read_entity_api_ctx(
         identifier,
         entity_type=entity_type,
@@ -191,6 +248,7 @@ def get_context_entity_versions(
     list[ContextEntity]
         List of object instances.
     """
+    _check_project_from_identifier(identifier, project)
     obj = read_entity_api_ctx_versions(
         identifier,
         entity_type=entity_type,
@@ -225,6 +283,7 @@ def get_material_entity_versions(
     list[MaterialEntity]
         List of object instances.
     """
+    _check_project_from_identifier(identifier, project)
     objs = read_entity_api_ctx_versions(
         identifier,
         entity_type=entity_type,
@@ -257,6 +316,7 @@ def list_context_entities(project: str, entity_type: str, **kwargs) -> list[Cont
     list[ContextEntity]
         List of object instances.
     """
+    _check_context(project)
     objs = list_entity_api_ctx(
         project=project,
         entity_type=entity_type,
@@ -287,6 +347,7 @@ def list_material_entities(
     list[MaterialEntity]
         List of object instances.
     """
+    _check_context(project)
     objs = list_entity_api_ctx(
         project=project,
         entity_type=entity_type,
@@ -316,7 +377,7 @@ def import_context_entity(file: str) -> ContextEntity:
     """
     dict_obj: dict = read_yaml(file)
 
-    check_context(dict_obj["project"])
+    _check_context(dict_obj["project"])
 
     obj = build_entity_from_dict(dict_obj)
     try:
@@ -348,7 +409,7 @@ def import_executable_entity(file: str) -> ExecutableEntity:
         exec_dict = dict_obj
         tsk_dicts = []
 
-    check_context(exec_dict["project"])
+    _check_context(exec_dict["project"])
 
     obj: ExecutableEntity = build_entity_from_dict(exec_dict)
 
@@ -395,6 +456,7 @@ def delete_entity(
     dict
         Response from backend.
     """
+    _check_project_from_identifier(identifier, project)
     return delete_entity_api_ctx(
         identifier=identifier,
         entity_type=entity_type,

digitalhub/entities/project/_base/entity.py

@@ -192,6 +192,7 @@ class Project(Entity):
             filename = f"{self.kind}_{self.name}.yml"
         pth = Path(self.spec.context) / filename
         pth.parent.mkdir(parents=True, exist_ok=True)
+
         obj = self._export_not_embedded(obj)
         write_yaml(pth, obj)
         return str(pth)
@@ -229,8 +230,7 @@ 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
-                embedded = entity["metadata"].get("embedded", False)
-                if not embedded:
+                if not self._is_embedded(entity):
                     # Get entity object from backend
                     obj_dict: dict = read_entity_api_ctx(entity["key"])
 
@@ -266,7 +266,7 @@ class Project(Entity):
                 embedded = self._is_embedded(entity)
                 ref = entity["metadata"].get("ref")
 
-                # Import entity if not embedded
+                # Import entity if not embedded and there is a ref
                 if not embedded and ref is not None:
                     # Import entity from local ref
                     if map_uri_scheme(ref) == "local":
@@ -274,9 +274,11 @@ class Project(Entity):
                             # Artifacts, Dataitems and Models
                             if entity_type in entity_types[:3]:
                                 import_context_entity(ref)
+
                             # Functions and Workflows
                             elif entity_type in entity_types[3:]:
                                 import_executable_entity(ref)
+
                         except FileNotFoundError:
                             msg = f"File not found: {ref}."
                             raise EntityError(msg)
@@ -328,7 +330,7 @@ class Project(Entity):
             f"{EntityTypes.WORKFLOW.value}s",
         ]
 
-    def run(self, workflow: str | None = "main", **kwargs) -> Run:
+    def run(self, workflow: str | None = None, **kwargs) -> Run:
         """
         Run workflow project.
 
@@ -345,15 +347,18 @@ class Project(Entity):
             Run instance.
         """
         self.refresh()
+
+        workflow = workflow if workflow is not None else "main"
+
         for i in self.spec.workflows:
-            if i["name"] == workflow or i["key"] == workflow:
-                workflow = build_entity_from_dict(i)
+            if workflow in [i["name"], i["key"]]:
+                entity = self.get_workflow(i["key"])
                 break
         else:
             msg = f"Workflow {workflow} not found."
             raise EntityError(msg)
 
-        return workflow.run(**kwargs)
+        return entity.run(**kwargs)
 
     ##############################
     #  Artifacts

digitalhub/utils/exceptions.py

@@ -59,3 +59,9 @@ class EntityError(Exception):
     """
     Raised when incontered errors on entities.
     """
+
+
+class ContextError(Exception):
+    """
+    Raised when context errors.
+    """

digitalhub/utils/io_utils.py

@@ -62,7 +62,7 @@ class NoDatesSafeLoader(yaml.SafeLoader):
         -------
         None
         """
-        if not "yaml_implicit_resolvers" in cls.__dict__:
+        if "yaml_implicit_resolvers" not in cls.__dict__:
             cls.yaml_implicit_resolvers = cls.yaml_implicit_resolvers.copy()
 
         for first_letter, mappings in cls.yaml_implicit_resolvers.items():

{digitalhub-0.8.0b13.dist-info → digitalhub-0.8.0b15.dist-info}/METADATA

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

{digitalhub-0.8.0b13.dist-info → digitalhub-0.8.0b15.dist-info}/RECORD

@@ -12,7 +12,7 @@ digitalhub/client/dhcore/utils.py,sha256=TaLjA3LT6heKpPclmufZx-kZKZNOe4OzS_Jtpj2
 digitalhub/client/local/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 digitalhub/client/local/client.py,sha256=VBJJVEqbFFb_fzFogoo1kVyifezt0L7d489UTZxV0x8,16780
 digitalhub/context/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-digitalhub/context/api.py,sha256=cZzS_1Kz-wW5iFMtEt3x9dD1PncnAsNnPoIfmoOQ5-g,1781
+digitalhub/context/api.py,sha256=-76HPxc7ird13HJoOl_-Z_q2l2g8Yv3rcsXjHphn2to,1729
 digitalhub/context/builder.py,sha256=qpw8T-xho80Njf9wNPTooKkwjWuMT30BeKoQUDWm_yc,2132
 digitalhub/context/context.py,sha256=hDZEW4riMjR5-v2zWiirt-Z5puxdc7d_Da6vFhyuRF4,3338
 digitalhub/datastores/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -32,7 +32,7 @@ digitalhub/entities/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSu
 digitalhub/entities/builders.py,sha256=wKNC3ly-IUrF9uaSXWQ5cMzEj7JikM467uXIOdgko2c,1951
 digitalhub/entities/_base/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 digitalhub/entities/_base/api_utils.py,sha256=cxnQ8Bi1QtHi8pQi-CM8P1zOOuFZbhRf7dWOrrXPX1I,13346
-digitalhub/entities/_base/crud.py,sha256=OThKNECVYRHUuaqR5cvBY9Tb6gooIFd_wFSDfAoSl-g,9148
+digitalhub/entities/_base/crud.py,sha256=m5A7Fya2DmfGdBis54U5SA--6BVc6WQ3SUhg4nXjaws,10852
 digitalhub/entities/_base/_base/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 digitalhub/entities/_base/_base/entity.py,sha256=DLJHhviHVKCo26jCEYg7iXwkfS9mDBQrHxBtHF_yE-0,2180
 digitalhub/entities/_base/context/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -139,7 +139,7 @@ digitalhub/entities/project/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMp
 digitalhub/entities/project/crud.py,sha256=P2IhKR2-YNmiNy0rpu0PG-LKD9nJGKsAahxvhsovmJA,8971
 digitalhub/entities/project/_base/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 digitalhub/entities/project/_base/builder.py,sha256=Fx_p8M75SkE_ssVBvKGu45wwqwqAZ5N6l6UZZj9LSNc,3612
-digitalhub/entities/project/_base/entity.py,sha256=nkPrYyn18xrglWT9WZICJ9SyLmmaupMJOL7ce4qeNKY,53532
+digitalhub/entities/project/_base/entity.py,sha256=CA3MqkwJlvnoI0shUIqsf-SsOoTZUA4Z41wnn0jbT5c,53552
 digitalhub/entities/project/_base/spec.py,sha256=zRJKFztK7z79LU4spxX7Rykv_1sK6kV9F9Qg95HBc6s,1346
 digitalhub/entities/project/_base/status.py,sha256=w1Hj_yFwr_5X7ZH7SmtZRto4qUdCWb010viFfvbqX48,168
 digitalhub/entities/run/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -207,11 +207,11 @@ digitalhub/stores/sql/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3h
 digitalhub/stores/sql/store.py,sha256=NdELCkP2Rl5ewiRuI4J9eRvTiBzVmpF0cMowZ1NME_8,8654
 digitalhub/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 digitalhub/utils/data_utils.py,sha256=2eETyxml610Ij7uyDnNc3YiELl2WFLIkj3FL4y6EPk8,2733
-digitalhub/utils/exceptions.py,sha256=MjLhgaGSAe0oJXoR-dnEtAh02RYDj3wZ1ZS1SLFUD4A,964
+digitalhub/utils/exceptions.py,sha256=4jiWXyt4wNtFGRbcEm17hc7EQmwE8D0RhaeNW1z3EtA,1045
 digitalhub/utils/file_utils.py,sha256=Qe71D2b6mOil_Y0Hy2QCJbnIaQOyXvhjFRbJoZXhsGQ,4006
 digitalhub/utils/generic_utils.py,sha256=YHWCCF77JFqgm4TNr3_U2GbX4SjEQjUmxA6i9PkRqG8,3527
 digitalhub/utils/git_utils.py,sha256=aFYL1cpfY-2VnlW7eHmjjjlTLECc5UUUfjb_IQPOY5k,3244
-digitalhub/utils/io_utils.py,sha256=Yg24Lt_0aAUaj4Yv5-1iy7VIA0umLxQGW6lkDRWcjrE,2997
+digitalhub/utils/io_utils.py,sha256=7pe0LwLPblx9Lx5_lugALZ84_eHGDifJ0RchK5fU1io,2997
 digitalhub/utils/logger.py,sha256=ml3ne6D8wuRdNZ4F6ywmvWotSxjmZWnmKgNiuHb4R5M,437
 digitalhub/utils/s3_utils.py,sha256=oXLzp4K7o45IwK0XOMt4OElDyB09fKRic5WTNA82WUA,1113
 digitalhub/utils/uri_utils.py,sha256=wArWRQ3ygGUNHexGKP3YM-aBE7TyGxhPvfEc7R4T4p4,1144
@@ -224,8 +224,8 @@ test/local/CRUD/test_artifacts.py,sha256=Y3J_C7SDRSsQd2SGIZjPIOvyTL92B1sTFrUONG3
 test/local/CRUD/test_dataitems.py,sha256=LQqTzI59uwTGy4zoq8jL0yWVe2W9vXlatkgDU9aB6xg,2968
 test/local/CRUD/test_models.py,sha256=msosbZuRwIMbZtmi3ZaOva4TjQ4lrzkNu9AguIFhrSo,2929
 test/local/imports/test_imports.py,sha256=W-YugO0rpJwvtWp57MXaXfEmE-f5iWuCiLY-n0ZU4z8,1271
-digitalhub-0.8.0b13.dist-info/LICENSE.txt,sha256=_yVOtnbW7Ss28mp058UEEc1X4Rgj8-kQBP_kj8_Sc88,11585
-digitalhub-0.8.0b13.dist-info/METADATA,sha256=nGqQ6XVBy4IemsnJhaksOtDXpUrHOzcikQJW3TRkhoI,15289
-digitalhub-0.8.0b13.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
-digitalhub-0.8.0b13.dist-info/top_level.txt,sha256=ae9pDfCF27ZoaVAxuBKONMP0lm5P-N_I-e-no1WlvD8,16
-digitalhub-0.8.0b13.dist-info/RECORD,,
+digitalhub-0.8.0b15.dist-info/LICENSE.txt,sha256=_yVOtnbW7Ss28mp058UEEc1X4Rgj8-kQBP_kj8_Sc88,11585
+digitalhub-0.8.0b15.dist-info/METADATA,sha256=nv71Q9Q1Ni-cZ3_fVQ4_T1q29zC0nvaOaViNCL19Xes,15289
+digitalhub-0.8.0b15.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
+digitalhub-0.8.0b15.dist-info/top_level.txt,sha256=ae9pDfCF27ZoaVAxuBKONMP0lm5P-N_I-e-no1WlvD8,16
+digitalhub-0.8.0b15.dist-info/RECORD,,