digitalhub 0.9.0__py3-none-any.whl → 0.9.0b0__py3-none-any.whl

digitalhub/client/_base/client.py

@@ -1,11 +1,8 @@
 from __future__ import annotations
 
-import typing
 from abc import abstractmethod
 
-if typing.TYPE_CHECKING:
-    from digitalhub.client._base.api_builder import ClientApiBuilder
-    from digitalhub.client._base.key_builder import ClientKeyBuilder
+from digitalhub.client._base.api_builder import ClientApiBuilder
 
 
 class Client:
@@ -19,11 +16,26 @@ class Client:
 
     def __init__(self) -> None:
         self._api_builder: ClientApiBuilder = None
-        self._key_builder: ClientKeyBuilder = None
 
-    ##############################
-    # CRUD methods
-    ##############################
+    def build_api(self, category: str, operation: str, **kwargs) -> str:
+        """
+        Build the API for the client.
+
+        Parameters
+        ----------
+        category : str
+            API category.
+        operation : str
+            API operation.
+        **kwargs : dict
+            Additional parameters.
+
+        Returns
+        -------
+        str
+            API formatted.
+        """
+        return self._api_builder.build_api(category, operation, **kwargs)
 
     @abstractmethod
     def create_object(self, api: str, obj: dict, **kwargs) -> dict:
@@ -67,54 +79,6 @@ class Client:
         Search objects method.
         """
 
-    ##############################
-    # Build methods
-    ##############################
-
-    def build_api(self, category: str, operation: str, **kwargs) -> str:
-        """
-        Build the API for the client.
-
-        Parameters
-        ----------
-        category : str
-            API category.
-        operation : str
-            API operation.
-        **kwargs : dict
-            Additional parameters.
-
-        Returns
-        -------
-        str
-            API formatted.
-        """
-        return self._api_builder.build_api(category, operation, **kwargs)
-
-    def build_key(self, category: str, *args, **kwargs) -> str:
-        """
-        Build the key for the client.
-
-        Parameters
-        ----------
-        category : str
-            Key category.
-        *args : tuple
-            Additional arguments.
-        **kwargs : dict
-            Additional parameters.
-
-        Returns
-        -------
-        str
-            Key formatted.
-        """
-        return self._key_builder.build_key(category, *args, **kwargs)
-
-    ##############################
-    # Interface methods
-    ##############################
-
     @staticmethod
     @abstractmethod
     def is_local() -> bool:

digitalhub/client/dhcore/client.py

@@ -12,9 +12,8 @@ from requests.exceptions import HTTPError, JSONDecodeError, RequestException
 
 from digitalhub.client._base.client import Client
 from digitalhub.client.dhcore.api_builder import ClientDHCoreApiBuilder
-from digitalhub.client.dhcore.enums import AuthType, DhcoreEnvVar
+from digitalhub.client.dhcore.enums import AuthType, EnvVar
 from digitalhub.client.dhcore.env import ENV_FILE, FALLBACK_USER, LIB_VERSION, MAX_API_LEVEL, MIN_API_LEVEL
-from digitalhub.client.dhcore.key_builder import ClientDHCoreKeyBuilder
 from digitalhub.client.dhcore.models import BasicAuth, OAuth2TokenAuth
 from digitalhub.utils.exceptions import (
     BackendError,
@@ -53,9 +52,6 @@ class ClientDHCore(Client):
         # API builder
         self._api_builder = ClientDHCoreApiBuilder()
 
-        # Key builder
-        self._key_builder = ClientDHCoreKeyBuilder()
-
         # Endpoints
         self._endpoint_core: str | None = None
         self._endpoint_issuer: str | None = None
@@ -524,6 +520,7 @@ class ClientDHCore(Client):
         -------
         None
         """
+
         self._get_endpoints_from_env()
 
         if config is not None:
@@ -561,12 +558,12 @@ class ClientDHCore(Client):
         Exception
             If the endpoint of DHCore is not set in the env variables.
         """
-        core_endpt = os.getenv(DhcoreEnvVar.ENDPOINT.value)
+        core_endpt = os.getenv(EnvVar.ENDPOINT.value)
         if core_endpt is None:
             raise BackendError("Endpoint not set as environment variables.")
         self._endpoint_core = self._sanitize_endpoint(core_endpt)
 
-        issr_endpt = os.getenv(DhcoreEnvVar.ISSUER.value)
+        issr_endpt = os.getenv(EnvVar.ISSUER.value)
         if issr_endpt is not None:
             self._endpoint_issuer = self._sanitize_endpoint(issr_endpt)
 
@@ -592,17 +589,17 @@ class ClientDHCore(Client):
         -------
         None
         """
-        self._user = os.getenv(DhcoreEnvVar.USER.value, FALLBACK_USER)
-        self._refresh_token = os.getenv(DhcoreEnvVar.REFRESH_TOKEN.value)
-        self._client_id = os.getenv(DhcoreEnvVar.CLIENT_ID.value)
+        self._user = os.getenv(EnvVar.USER.value, FALLBACK_USER)
+        self._refresh_token = os.getenv(EnvVar.REFRESH_TOKEN.value)
+        self._client_id = os.getenv(EnvVar.CLIENT_ID.value)
 
-        token = os.getenv(DhcoreEnvVar.ACCESS_TOKEN.value)
+        token = os.getenv(EnvVar.ACCESS_TOKEN.value)
         if token is not None and token != "":
             self._auth_type = AuthType.OAUTH2.value
             self._access_token = token
             return
 
-        password = os.getenv(DhcoreEnvVar.PASSWORD.value)
+        password = os.getenv(EnvVar.PASSWORD.value)
         if self._user is not None and password is not None:
             self._auth_type = AuthType.BASIC.value
             self._password = password
@@ -622,12 +619,12 @@ class ClientDHCore(Client):
 
         # Call refresh token endpoint
         # Try token from env
-        refresh_token = os.getenv(DhcoreEnvVar.REFRESH_TOKEN.value)
+        refresh_token = os.getenv(EnvVar.REFRESH_TOKEN.value)
         response = self._call_refresh_token_endpoint(url, refresh_token)
 
         # Otherwise try token from file
         if response.status_code in (400, 401, 403):
-            refresh_token = get_key(ENV_FILE, DhcoreEnvVar.REFRESH_TOKEN.value)
+            refresh_token = get_key(ENV_FILE, EnvVar.REFRESH_TOKEN.value)
             response = self._call_refresh_token_endpoint(url, refresh_token)
 
         response.raise_for_status()
@@ -697,9 +694,9 @@ class ClientDHCore(Client):
         """
         keys = {}
         if self._access_token is not None:
-            keys[DhcoreEnvVar.ACCESS_TOKEN.value] = self._access_token
+            keys[EnvVar.ACCESS_TOKEN.value] = self._access_token
         if self._refresh_token is not None:
-            keys[DhcoreEnvVar.REFRESH_TOKEN.value] = self._refresh_token
+            keys[EnvVar.REFRESH_TOKEN.value] = self._refresh_token
 
         for k, v in keys.items():
             set_key(dotenv_path=ENV_FILE, key_to_set=k, value_to_set=v)

digitalhub/client/dhcore/enums.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 from enum import Enum
 
 
-class DhcoreEnvVar(Enum):
+class EnvVar(Enum):
     """
     Environment variables.
     """
@@ -15,7 +15,6 @@ class DhcoreEnvVar(Enum):
     CLIENT_ID = "DHCORE_CLIENT_ID"
     ACCESS_TOKEN = "DHCORE_ACCESS_TOKEN"
     REFRESH_TOKEN = "DHCORE_REFRESH_TOKEN"
-    WORKFLOW_IMAGE = "DHCORE_WORKFLOW_IMAGE"
 
 
 class AuthType(Enum):

digitalhub/client/dhcore/utils.py

@@ -4,7 +4,7 @@ import os
 import typing
 
 from digitalhub.client.api import get_client
-from digitalhub.client.dhcore.enums import AuthType, DhcoreEnvVar
+from digitalhub.client.dhcore.enums import AuthType, EnvVar
 
 if typing.TYPE_CHECKING:
     from digitalhub.client.dhcore.client import ClientDHCore
@@ -44,17 +44,17 @@ def set_dhcore_env(
     None
     """
     if endpoint is not None:
-        os.environ[DhcoreEnvVar.ENDPOINT.value] = endpoint
+        os.environ[EnvVar.ENDPOINT.value] = endpoint
     if user is not None:
-        os.environ[DhcoreEnvVar.USER.value] = user
+        os.environ[EnvVar.USER.value] = user
     if password is not None:
-        os.environ[DhcoreEnvVar.PASSWORD.value] = password
+        os.environ[EnvVar.PASSWORD.value] = password
     if access_token is not None:
-        os.environ[DhcoreEnvVar.ACCESS_TOKEN.value] = access_token
+        os.environ[EnvVar.ACCESS_TOKEN.value] = access_token
     if refresh_token is not None:
-        os.environ[DhcoreEnvVar.REFRESH_TOKEN.value] = refresh_token
+        os.environ[EnvVar.REFRESH_TOKEN.value] = refresh_token
     if client_id is not None:
-        os.environ[DhcoreEnvVar.CLIENT_ID.value] = client_id
+        os.environ[EnvVar.CLIENT_ID.value] = client_id
 
     update_client_from_env()
 
@@ -70,16 +70,16 @@ def update_client_from_env() -> None:
     client: ClientDHCore = get_client(local=False)
 
     # Update endpoint
-    endpoint = os.getenv(DhcoreEnvVar.ENDPOINT.value)
+    endpoint = os.getenv(EnvVar.ENDPOINT.value)
     if endpoint is not None:
         client._endpoint_core = endpoint
 
     # Update auth
 
     # If token is set, it will override the other auth options
-    access_token = os.getenv(DhcoreEnvVar.ACCESS_TOKEN.value)
-    refresh_token = os.getenv(DhcoreEnvVar.REFRESH_TOKEN.value)
-    client_id = os.getenv(DhcoreEnvVar.CLIENT_ID.value)
+    access_token = os.getenv(EnvVar.ACCESS_TOKEN.value)
+    refresh_token = os.getenv(EnvVar.REFRESH_TOKEN.value)
+    client_id = os.getenv(EnvVar.CLIENT_ID.value)
 
     if access_token is not None:
         if refresh_token is not None:
@@ -91,8 +91,8 @@ def update_client_from_env() -> None:
         return
 
     # Otherwise, if user and password are set, basic auth will be used
-    username = os.getenv(DhcoreEnvVar.USER.value)
-    password = os.getenv(DhcoreEnvVar.PASSWORD.value)
+    username = os.getenv(EnvVar.USER.value)
+    password = os.getenv(EnvVar.PASSWORD.value)
     if username is not None and password is not None:
         client._user = username
         client._password = password

digitalhub/client/local/client.py

@@ -5,7 +5,6 @@ from datetime import datetime, timezone
 
 from digitalhub.client._base.client import Client
 from digitalhub.client.local.api_builder import ClientLocalApiBuilder
-from digitalhub.client.local.key_builder import ClientLocalKeyBuilder
 from digitalhub.utils.exceptions import BackendError
 
 
@@ -25,7 +24,6 @@ class ClientLocal(Client):
     def __init__(self) -> None:
         super().__init__()
         self._api_builder = ClientLocalApiBuilder()
-        self._key_builder = ClientLocalKeyBuilder()
         self._db: dict[str, dict[str, dict]] = {}
 
     ##############################

digitalhub/entities/_base/entity/entity.py

@@ -79,7 +79,7 @@ class Entity(Base):
         Abstract export method.
         """
 
-    def add_relationship(self, relation: str, dest: str, source: str | None = None) -> None:
+    def add_relationship(self, relation: str, source: str, dest: str) -> None:
         """
         Add relationship to entity metadata.
 
@@ -87,10 +87,10 @@ class Entity(Base):
         ----------
         relation : str
             The type of relationship.
-        dest : str
-            The target entity.
         source : str
             The source entity.
+        dest : str
+            The target entity..
 
         Returns
         -------
@@ -98,9 +98,7 @@ class Entity(Base):
         """
         if self.metadata.relationships is None:
             self.metadata.relationships = []
-        obj = {"type": relation, "dest": dest}
-        if source is not None:
-            obj["source"] = source
+        obj = {"type": relation, "source": source, "dest": dest}
         self.metadata.relationships.append(obj)
 
     def to_dict(self) -> dict:

digitalhub/entities/_base/entity/metadata.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from pydantic import BaseModel, ConfigDict, Field
+from pydantic import BaseModel, Field, ConfigDict
 
 from digitalhub.entities._base._base.entity import Base
 from digitalhub.entities._commons.enums import Relationship

digitalhub/entities/_base/material/entity.py

@@ -168,7 +168,7 @@ class MaterialEntity(VersionedEntity):
         paths = store.upload(source, self.spec.path)
 
         # Update files info
-        files_info = store.get_file_info(self.spec.path, paths)
+        files_info = store.get_file_info(paths)
         self._update_files_info(files_info)
 
     ##############################

digitalhub/entities/_base/project/entity.py

@@ -40,7 +40,7 @@ class ProjectEntity(Entity):
         super().__init__(kind, metadata, spec, status, user)
         self.id = name
         self.name = name
-        self.key = processor.build_project_key(self.name, local=local)
+        self.key = f"store://{name}"
 
         self._obj_attr.extend(["id", "name"])
 

digitalhub/entities/_base/unversioned/entity.py

@@ -3,7 +3,6 @@ from __future__ import annotations
 import typing
 
 from digitalhub.entities._base.context.entity import ContextEntity
-from digitalhub.entities._operations.processor import processor
 
 if typing.TYPE_CHECKING:
     from digitalhub.entities._base.entity.metadata import Metadata
@@ -25,4 +24,4 @@ class UnversionedEntity(ContextEntity):
         super().__init__(project, kind, metadata, spec, status, user)
         self.id = uuid
         self.name = uuid
-        self.key = processor.build_context_entity_key(project, self.ENTITY_TYPE, kind, uuid)
+        self.key = f"store://{project}/{self.ENTITY_TYPE}/{kind}/{uuid}"

digitalhub/entities/_base/versioned/entity.py

@@ -3,7 +3,6 @@ from __future__ import annotations
 import typing
 
 from digitalhub.entities._base.context.entity import ContextEntity
-from digitalhub.entities._operations.processor import processor
 
 if typing.TYPE_CHECKING:
     from digitalhub.entities._base.entity.metadata import Metadata
@@ -26,4 +25,4 @@ class VersionedEntity(ContextEntity):
         super().__init__(project, kind, metadata, spec, status, user)
         self.name = name
         self.id = uuid
-        self.key = processor.build_context_entity_key(project, self.ENTITY_TYPE, kind, name, uuid)
+        self.key = f"store://{project}/{self.ENTITY_TYPE}/{kind}/{name}:{uuid}"

digitalhub/entities/_operations/processor.py

@@ -427,55 +427,6 @@ class OperationsProcessor:
             **kwargs,
         )
 
-    ##############################
-    # Base entity operations
-    ##############################
-
-    def _build_base_entity_key(
-        self,
-        client: Client,
-        entity_id: str,
-    ) -> str:
-        """
-        Build object key.
-
-        Parameters
-        ----------
-        client : Client
-            Client instance.
-        entity_id : str
-            Entity ID.
-
-        Returns
-        -------
-        str
-            Object key.
-        """
-        return client.build_key(ApiCategories.BASE.value, entity_id)
-
-    def build_project_key(
-        self,
-        entity_id: str,
-        **kwargs,
-    ) -> str:
-        """
-        Build object key.
-
-        Parameters
-        ----------
-        entity_id : str
-            Entity ID.
-        **kwargs : dict
-            Parameters to pass to entity builder.
-
-        Returns
-        -------
-        str
-            Object key.
-        """
-        client = get_client(kwargs.pop("local", False))
-        return self._build_base_entity_key(client, entity_id)
-
     def share_project_entity(
         self,
         entity_type: str,
@@ -587,10 +538,7 @@ class OperationsProcessor:
         new_obj = self._create_context_entity(context, obj.ENTITY_TYPE, obj.to_dict())
         return build_entity_from_dict(new_obj)
 
-    def log_material_entity(
-        self,
-        **kwargs,
-    ) -> MaterialEntity:
+    def log_material_entity(self, **kwargs,) -> MaterialEntity:
         """
         Create object in backend and upload file.
 
@@ -608,7 +556,7 @@ class OperationsProcessor:
         context = self._get_context(kwargs["project"])
         obj = build_entity_from_params(**kwargs)
         if context.is_running:
-            obj.add_relationship(Relationship.PRODUCEDBY.value, context.get_run_ctx())
+            obj.add_relationship(Relationship.PRODUCEDBY.value, obj.key, context.get_run_ctx())
 
         new_obj: MaterialEntity = self._create_context_entity(context, obj.ENTITY_TYPE, obj.to_dict())
         new_obj = build_entity_from_dict(new_obj)
@@ -785,10 +733,6 @@ class OperationsProcessor:
         """
         if not identifier.startswith("store://"):
             entity_id = identifier
-        else:
-            splt = identifier.split(":")
-            if len(splt) == 3:
-                identifier = f"{splt[0]}:{splt[1]}"
         return self.read_context_entity(
             identifier,
             entity_type=entity_type,
@@ -1328,76 +1272,6 @@ class OperationsProcessor:
     # Context entity operations
     ##############################
 
-    def _build_context_entity_key(
-        self,
-        context: Context,
-        entity_type: str,
-        entity_kind: str,
-        entity_name: str,
-        entity_id: str | None = None,
-    ) -> str:
-        """
-        Build object key.
-
-        Parameters
-        ----------
-        context : Context
-            Context instance.
-        entity_type : str
-            Entity type.
-        entity_kind : str
-            Entity kind.
-        entity_name : str
-            Entity name.
-        entity_id : str
-            Entity ID.
-
-        Returns
-        -------
-        str
-            Object key.
-        """
-        return context.client.build_key(
-            ApiCategories.CONTEXT.value,
-            project=context.name,
-            entity_type=entity_type,
-            entity_kind=entity_kind,
-            entity_name=entity_name,
-            entity_id=entity_id,
-        )
-
-    def build_context_entity_key(
-        self,
-        project: str,
-        entity_type: str,
-        entity_kind: str,
-        entity_name: str,
-        entity_id: str | None = None,
-    ) -> str:
-        """
-        Build object key.
-
-        Parameters
-        ----------
-        project : str
-            Project name.
-        entity_type : str
-            Entity type.
-        entity_kind : str
-            Entity kind.
-        entity_name : str
-            Entity name.
-        entity_id : str
-            Entity ID.
-
-        Returns
-        -------
-        str
-            Object key.
-        """
-        context = self._get_context(project)
-        return self._build_context_entity_key(context, entity_type, entity_kind, entity_name, entity_id)
-
     def read_secret_data(
         self,
         project: str,

digitalhub/entities/function/_base/entity.py

@@ -79,11 +79,11 @@ class Function(ExecutableEntity):
         task = self._get_or_create_task(task_kind)
 
         # Run function from task
-        run = task.run(run_kind, save=False, local_execution=local_execution, **kwargs)
+        run = task.run(run_kind, local_execution, **kwargs)
 
         # Set as run's parent
-        run.add_relationship(Relationship.RUN_OF.value, self.key)
-        run.save()
+        run.add_relationship(Relationship.RUN_OF.value, run.key + ":" + run.id, self.key)
+        run.save(update=True)
 
         # If execution is done by DHCore backend, return the object
         if not local_execution:

digitalhub/entities/run/_base/spec.py

@@ -21,8 +21,6 @@ class RunSpec(Spec):
         envs: list[dict] | None = None,
         secrets: list[str] | None = None,
         profile: str | None = None,
-        runtime_class: str | None = None,
-        priority_class: str | None = None,
         **kwargs,
     ) -> None:
         self.task = task
@@ -37,8 +35,6 @@ class RunSpec(Spec):
         self.envs = envs
         self.secrets = secrets
         self.profile = profile
-        self.runtime_class = runtime_class
-        self.priority_class = priority_class
 
 
 class RunValidator(SpecValidator, K8s):

digitalhub/entities/task/_base/entity.py

@@ -4,8 +4,8 @@ import typing
 
 from digitalhub.entities._base.unversioned.entity import UnversionedEntity
 from digitalhub.entities._commons.enums import EntityTypes
-from digitalhub.entities._operations.processor import processor
-from digitalhub.factory.api import build_entity_from_params, get_entity_type_from_kind, get_executable_kind
+from digitalhub.entities.run.crud import delete_run, get_run, new_run
+from digitalhub.factory.api import get_entity_type_from_kind, get_executable_kind
 
 if typing.TYPE_CHECKING:
     from digitalhub.entities._base.entity.metadata import Metadata
@@ -42,7 +42,6 @@ class Task(UnversionedEntity):
     def run(
         self,
         run_kind: str,
-        save: bool = True,
         local_execution: bool = False,
         **kwargs,
     ) -> Run:
@@ -67,7 +66,6 @@ class Task(UnversionedEntity):
         exec_type = get_entity_type_from_kind(exec_kind)
         kwargs[exec_type] = getattr(self.spec, exec_type)
         return self.new_run(
-            save=save,
             project=self.project,
             task=self._get_task_string(),
             kind=run_kind,
@@ -90,25 +88,21 @@ class Task(UnversionedEntity):
     # CRUD Methods for Run
     ##############################
 
-    def new_run(self, save: bool = True, **kwargs) -> Run:
+    def new_run(self, **kwargs) -> Run:
         """
         Create a new run.
 
         Parameters
         ----------
-        save : bool
-            Flag to indicate save.
         **kwargs : dict
-            Keyword arguments to build run. See new_run().
+            Keyword arguments.
 
         Returns
         -------
         Run
             Run object.
         """
-        if save:
-            return processor.create_context_entity(**kwargs)
-        return build_entity_from_params(**kwargs)
+        return new_run(**kwargs)
 
     def get_run(self, entity_key: str) -> Run:
         """
@@ -124,9 +118,9 @@ class Task(UnversionedEntity):
         Run
             Run object.
         """
-        return processor.read_context_entity(entity_key)
+        return get_run(entity_key)
 
-    def delete_run(self, entity_key: str) -> dict:
+    def delete_run(self, entity_key: str) -> None:
         """
         Delete run.
 
@@ -137,7 +131,6 @@ class Task(UnversionedEntity):
 
         Returns
         -------
-        dict
-            Response from backend.
+        None
         """
-        return processor.delete_context_entity(entity_key)
+        delete_run(entity_key)

digitalhub/entities/task/_base/models.py

@@ -210,12 +210,6 @@ class K8s(BaseModel):
     profile: str = None
     """Profile template."""
 
-    runtime_class: str = None
-    """Runtime class name."""
-
-    priority_class: str = None
-    """Priority class."""
-
 
 class CorePort(BaseModel):
     """