digitalhub 0.8.0b15__py3-none-any.whl → 0.9.0__py3-none-any.whl

digitalhub/__init__.py

@@ -1,9 +1,11 @@
+__version__ = "0.9.0b0"
 from digitalhub.entities.artifact.crud import (
     delete_artifact,
     get_artifact,
     get_artifact_versions,
     import_artifact,
     list_artifacts,
+    load_artifact,
     log_artifact,
     new_artifact,
     update_artifact,
@@ -14,6 +16,7 @@ from digitalhub.entities.dataitem.crud import (
     get_dataitem_versions,
     import_dataitem,
     list_dataitems,
+    load_dataitem,
     log_dataitem,
     new_dataitem,
     update_dataitem,
@@ -24,6 +27,7 @@ from digitalhub.entities.function.crud import (
     get_function_versions,
     import_function,
     list_functions,
+    load_function,
     new_function,
     update_function,
 )
@@ -33,6 +37,7 @@ from digitalhub.entities.model.crud import (
     get_model_versions,
     import_model,
     list_models,
+    load_model,
     log_model,
     new_model,
     update_model,
@@ -42,27 +47,39 @@ from digitalhub.entities.project.crud import (
     get_or_create_project,
     get_project,
     import_project,
+    list_projects,
     load_project,
     new_project,
+    search_entity,
     update_project,
 )
-from digitalhub.entities.run.crud import delete_run, get_run, import_run, list_runs, new_run, update_run
+from digitalhub.entities.run.crud import delete_run, get_run, import_run, list_runs, load_run, new_run, update_run
 from digitalhub.entities.secret.crud import (
     delete_secret,
     get_secret,
     get_secret_versions,
     import_secret,
     list_secrets,
+    load_secret,
     new_secret,
     update_secret,
 )
-from digitalhub.entities.task.crud import delete_task, get_task, import_task, list_tasks, new_task, update_task
+from digitalhub.entities.task.crud import (
+    delete_task,
+    get_task,
+    import_task,
+    list_tasks,
+    load_task,
+    new_task,
+    update_task,
+)
 from digitalhub.entities.workflow.crud import (
     delete_workflow,
     get_workflow,
     get_workflow_versions,
     import_workflow,
     list_workflows,
+    load_workflow,
     new_workflow,
     update_workflow,
 )

digitalhub/client/_base/api_builder.py

@@ -0,0 +1,16 @@
+from __future__ import annotations
+
+from abc import abstractmethod
+
+
+class ClientApiBuilder:
+    """
+    This class is used to build the API for the client.
+    Depending on the client, the API is built differently.
+    """
+
+    @abstractmethod
+    def build_api(self) -> str:
+        """
+        Build the API for the client.
+        """

digitalhub/client/_base/client.py

@@ -1,7 +1,12 @@
 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
+
 
 class Client:
     """
@@ -12,6 +17,14 @@ class Client:
     listing of objects and comes into two subclasses: Local and DHCore.
     """
 
+    def __init__(self) -> None:
+        self._api_builder: ClientApiBuilder = None
+        self._key_builder: ClientKeyBuilder = None
+
+    ##############################
+    # CRUD methods
+    ##############################
+
     @abstractmethod
     def create_object(self, api: str, obj: dict, **kwargs) -> dict:
         """
@@ -48,6 +61,60 @@ class Client:
         Read first object method.
         """
 
+    @abstractmethod
+    def search_objects(self, api: str, **kwargs) -> dict:
+        """
+        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/_base/key_builder.py

@@ -0,0 +1,52 @@
+from __future__ import annotations
+
+from abc import abstractmethod
+
+from digitalhub.entities._commons.enums import ApiCategories
+
+
+class ClientKeyBuilder:
+    """
+    Class that build the key of entities.
+    """
+
+    def build_key(self, category: str, *args, **kwargs) -> str:
+        """
+        Build key.
+
+        Parameters
+        ----------
+        category : str
+            Key category.
+        *args : tuple
+            Positional arguments.
+        **kwargs : dict
+            Keyword arguments.
+
+        Returns
+        -------
+        str
+            Key.
+        """
+        if category == ApiCategories.BASE.value:
+            return self.base_entity_key(*args, **kwargs)
+        return self.context_entity_key(*args, **kwargs)
+
+    @abstractmethod
+    def base_entity_key(self, entity_id: str) -> str:
+        """
+        Build for base entity key.
+        """
+
+    @abstractmethod
+    def context_entity_key(
+        self,
+        project: str,
+        entity_type: str,
+        entity_kind: str,
+        entity_name: str,
+        entity_id: str | None = None,
+    ) -> str:
+        """
+        Build for context entity key.
+        """

digitalhub/client/api.py

@@ -8,26 +8,7 @@ if typing.TYPE_CHECKING:
     from digitalhub.client._base.client import Client
 
 
-def check_client_exists(local: bool = False) -> bool:
-    """
-    Check if client exists.
-
-    Parameters
-    ----------
-    local : bool
-        Check client existence by local.
-
-    Returns
-    -------
-    bool
-        True if client exists, False otherwise.
-    """
-    if local:
-        return client_builder._local is not None
-    return client_builder._dhcore is not None
-
-
-def build_client(local: bool = False, config: dict | None = None) -> None:
+def get_client(local: bool = False, config: dict | None = None) -> Client:
     """
     Wrapper around ClientBuilder.build.
 
@@ -43,21 +24,4 @@ def build_client(local: bool = False, config: dict | None = None) -> None:
     Client
         The client instance.
     """
-    client_builder.build(local, config)
-
-
-def get_client(local: bool = False) -> Client:
-    """
-    Wrapper around ClientBuilder.build.
-
-    Parameters
-    ----------
-    local : bool
-        Whether to create a local client or not.
-
-    Returns
-    -------
-    Client
-        The client instance.
-    """
-    return client_builder.build(local)
+    return client_builder.build(local, config)

digitalhub/client/dhcore/api_builder.py

@@ -0,0 +1,100 @@
+from __future__ import annotations
+
+from digitalhub.client._base.api_builder import ClientApiBuilder
+from digitalhub.entities._commons.enums import ApiCategories, BackendOperations
+from digitalhub.utils.exceptions import BackendError
+
+API_BASE = "/api/v1"
+API_CONTEXT = f"{API_BASE}/-"
+
+
+class ClientDHCoreApiBuilder(ClientApiBuilder):
+    """
+    This class is used to build the API for the DHCore client.
+    """
+
+    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.
+        """
+        if category == ApiCategories.BASE.value:
+            return self.build_api_base(operation, **kwargs)
+        return self.build_api_context(operation, **kwargs)
+
+    def build_api_base(self, operation: str, **kwargs) -> str:
+        """
+        Build the base API for the client.
+
+        Parameters
+        ----------
+        operation : str
+            API operation.
+        **kwargs : dict
+            Additional parameters.
+
+        Returns
+        -------
+        str
+            API formatted.
+        """
+        entity_type = kwargs["entity_type"] + "s"
+        if operation in (
+            BackendOperations.CREATE.value,
+            BackendOperations.LIST.value,
+        ):
+            return f"{API_BASE}/{entity_type}"
+        elif operation in (
+            BackendOperations.READ.value,
+            BackendOperations.UPDATE.value,
+            BackendOperations.DELETE.value,
+        ):
+            return f"{API_BASE}/{entity_type}/{kwargs['entity_name']}"
+        elif operation == BackendOperations.SHARE.value:
+            return f"{API_BASE}/{entity_type}/{kwargs['entity_name']}/share"
+        raise BackendError(f"Invalid operation '{operation}' for entity type '{entity_type}' in DHCore.")
+
+    def build_api_context(self, operation: str, **kwargs) -> str:
+        """
+        Build the context API for the client.
+        """
+        entity_type = kwargs["entity_type"] + "s"
+        project = kwargs["project"]
+        if operation in (
+            BackendOperations.CREATE.value,
+            BackendOperations.LIST.value,
+        ):
+            return f"{API_CONTEXT}/{project}/{entity_type}"
+        elif operation in (
+            BackendOperations.READ.value,
+            BackendOperations.UPDATE.value,
+            BackendOperations.DELETE.value,
+        ):
+            return f"{API_CONTEXT}/{project}/{entity_type}/{kwargs['entity_id']}"
+        elif operation == BackendOperations.LOGS.value:
+            return f"{API_CONTEXT}/{project}/{entity_type}/{kwargs['entity_id']}/logs"
+        elif operation == BackendOperations.STOP.value:
+            return f"{API_CONTEXT}/{project}/{entity_type}/{kwargs['entity_id']}/stop"
+        elif operation == BackendOperations.RESUME.value:
+            return f"{API_CONTEXT}/{project}/{entity_type}/{kwargs['entity_id']}/resume"
+        elif operation == BackendOperations.DATA.value:
+            return f"{API_CONTEXT}/{project}/{entity_type}/{kwargs['entity_id']}/data"
+        elif operation == BackendOperations.FILES.value:
+            return f"{API_CONTEXT}/{project}/{entity_type}/{kwargs['entity_id']}/files/info"
+        elif operation == BackendOperations.SEARCH.value:
+            return f"{API_CONTEXT}/{project}/solr/search/item"
+
+        raise BackendError(f"Invalid operation '{operation}' for entity type '{entity_type}' in DHCore.")

digitalhub/client/dhcore/client.py

@@ -4,14 +4,17 @@ import datetime
 import json
 import os
 import typing
-from urllib.parse import urlparse
+from warnings import warn
 
-from dotenv import load_dotenv, set_key
+from dotenv import get_key, set_key
 from requests import request
 from requests.exceptions import HTTPError, JSONDecodeError, RequestException
 
 from digitalhub.client._base.client import Client
-from digitalhub.client.dhcore.env import ENV_FILE, FALLBACK_USER, MAX_API_LEVEL, MIN_API_LEVEL
+from digitalhub.client.dhcore.api_builder import ClientDHCoreApiBuilder
+from digitalhub.client.dhcore.enums import AuthType, DhcoreEnvVar
+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,
@@ -22,6 +25,7 @@ from digitalhub.utils.exceptions import (
     MissingSpecError,
     UnauthorizedError,
 )
+from digitalhub.utils.uri_utils import has_remote_scheme
 
 if typing.TYPE_CHECKING:
     from requests import Response
@@ -46,6 +50,12 @@ class ClientDHCore(Client):
     def __init__(self, config: dict | None = None) -> None:
         super().__init__()
 
+        # 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
@@ -213,6 +223,56 @@ class ClientDHCore(Client):
         except IndexError:
             raise BackendError("No object found.")
 
+    def search_objects(self, api: str, **kwargs) -> list[dict]:
+        """
+        Search objects from DHCore.
+
+        Parameters
+        ----------
+        api : str
+            Search API.
+        **kwargs : dict
+            Keyword arguments to pass to the request.
+
+        Returns
+        -------
+        list[dict]
+            Response objects.
+        """
+        if kwargs is None:
+            kwargs = {}
+
+        if "params" not in kwargs:
+            kwargs["params"] = {}
+
+        start_page = 0
+        if "page" not in kwargs["params"]:
+            kwargs["params"]["page"] = start_page
+
+        if "size" not in kwargs["params"]:
+            kwargs["params"]["size"] = 10
+
+        # Add sorting
+        if "sort" not in kwargs["params"]:
+            kwargs["params"]["sort"] = "metadata.updated,DESC"
+
+        objects_with_highlights = []
+        while True:
+            resp = self._prepare_call("GET", api, **kwargs)
+            contents = resp["content"]
+            total_pages = resp["totalPages"]
+            if not contents or kwargs["params"]["page"] >= total_pages:
+                break
+            objects_with_highlights.extend(contents)
+            kwargs["params"]["page"] += 1
+
+        objects = []
+        for obj in objects_with_highlights:
+            obj.pop("highlights", None)
+            objects.append(obj)
+
+        return objects
+
     ##############################
     # Call methods
     ##############################
@@ -274,9 +334,9 @@ class ClientDHCore(Client):
         dict
             Keyword arguments with the authentication parameters.
         """
-        if self._auth_type == "basic":
+        if self._auth_type == AuthType.BASIC.value:
             kwargs["auth"] = self._user, self._password
-        elif self._auth_type == "oauth2":
+        elif self._auth_type == AuthType.OAUTH2.value:
             if "headers" not in kwargs:
                 kwargs["headers"] = {}
             kwargs["headers"]["Authorization"] = f"Bearer {self._access_token}"
@@ -332,6 +392,8 @@ class ClientDHCore(Client):
             core_api_level = int(response.headers["X-Api-Level"])
             if not (MIN_API_LEVEL <= core_api_level <= MAX_API_LEVEL):
                 raise BackendError("Backend API level not supported.")
+            if LIB_VERSION < core_api_level:
+                warn("Backend API level is higher than library version. You should consider updating the library.")
 
     def _raise_for_error(self, response: Response) -> None:
         """
@@ -462,9 +524,6 @@ class ClientDHCore(Client):
         -------
         None
         """
-        # Load env from file
-        self._load_env()
-
         self._get_endpoints_from_env()
 
         if config is not None:
@@ -474,13 +533,13 @@ class ClientDHCore(Client):
                 self._access_token = config.access_token
                 self._refresh_token = config.refresh_token
                 self._client_id = config.client_id
-                self._auth_type = "oauth2"
+                self._auth_type = AuthType.OAUTH2.value
 
             elif config.get("user") is not None and config.get("password") is not None:
                 config = BasicAuth(**config)
                 self._user = config.user
                 self._password = config.password
-                self._auth_type = "basic"
+                self._auth_type = AuthType.BASIC.value
 
             return
 
@@ -502,12 +561,12 @@ class ClientDHCore(Client):
         Exception
             If the endpoint of DHCore is not set in the env variables.
         """
-        core_endpt = os.getenv("DHCORE_ENDPOINT")
+        core_endpt = os.getenv(DhcoreEnvVar.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("DHCORE_ISSUER")
+        issr_endpt = os.getenv(DhcoreEnvVar.ISSUER.value)
         if issr_endpt is not None:
             self._endpoint_issuer = self._sanitize_endpoint(issr_endpt)
 
@@ -519,9 +578,8 @@ class ClientDHCore(Client):
         -------
         None
         """
-        parsed = urlparse(endpoint)
-        if parsed.scheme not in ["http", "https"]:
-            raise BackendError("Invalid endpoint scheme.")
+        if not has_remote_scheme(endpoint):
+            raise BackendError("Invalid endpoint scheme. Must start with http:// or https://.")
 
         endpoint = endpoint.strip()
         return endpoint.removesuffix("/")
@@ -534,19 +592,19 @@ class ClientDHCore(Client):
         -------
         None
         """
-        self._user = os.getenv("DHCORE_USER", FALLBACK_USER)
-        self._refresh_token = os.getenv("DHCORE_REFRESH_TOKEN")
-        self._client_id = os.getenv("DHCORE_CLIENT_ID")
+        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)
 
-        token = os.getenv("DHCORE_ACCESS_TOKEN")
+        token = os.getenv(DhcoreEnvVar.ACCESS_TOKEN.value)
         if token is not None and token != "":
-            self._auth_type = "oauth2"
+            self._auth_type = AuthType.OAUTH2.value
             self._access_token = token
             return
 
-        password = os.getenv("DHCORE_PASSWORD")
+        password = os.getenv(DhcoreEnvVar.PASSWORD.value)
         if self._user is not None and password is not None:
-            self._auth_type = "basic"
+            self._auth_type = AuthType.BASIC.value
             self._password = password
             return
 
@@ -563,11 +621,21 @@ class ClientDHCore(Client):
         url = self._get_refresh_endpoint()
 
         # Call refresh token endpoint
-        response = self._call_refresh_token_endpoint(url)
+        # Try token from env
+        refresh_token = os.getenv(DhcoreEnvVar.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)
+            response = self._call_refresh_token_endpoint(url, refresh_token)
+
+        response.raise_for_status()
+        dict_response = response.json()
 
         # Read new access token and refresh token
-        self._access_token = response["access_token"]
-        self._refresh_token = response["refresh_token"]
+        self._access_token = dict_response["access_token"]
+        self._refresh_token = dict_response["refresh_token"]
 
         # Propagate new access token to env
         self._write_env()
@@ -593,7 +661,7 @@ class ClientDHCore(Client):
         self._raise_for_error(r)
         return r.json().get("token_endpoint")
 
-    def _call_refresh_token_endpoint(self, url: str) -> dict:
+    def _call_refresh_token_endpoint(self, url: str, refresh_token: str) -> Response:
         """
         Call the refresh token endpoint.
 
@@ -601,17 +669,14 @@ class ClientDHCore(Client):
         ----------
         url : str
             Refresh token endpoint.
+        refresh_token : str
+            Refresh token.
 
         Returns
         -------
-        dict
+        Response
             Response object.
         """
-        # Get refersh token from .core file to avoid concurrency
-        # in a shared workspace
-        self._load_env()
-        refresh_token = os.getenv("DHCORE_REFRESH_TOKEN")
-
         # Send request to get new access token
         payload = {
             "grant_type": "refresh_token",
@@ -619,20 +684,7 @@ class ClientDHCore(Client):
             "refresh_token": refresh_token,
         }
         headers = {"Content-Type": "application/x-www-form-urlencoded"}
-        r = request("POST", url, data=payload, headers=headers, timeout=60)
-        self._raise_for_error(r)
-        return r.json()
-
-    @staticmethod
-    def _load_env() -> None:
-        """
-        Load the env variables from the .dhcore file.
-
-        Returns
-        -------
-        None
-        """
-        load_dotenv(dotenv_path=ENV_FILE, override=True)
+        return request("POST", url, data=payload, headers=headers, timeout=60)
 
     def _write_env(self) -> None:
         """
@@ -645,9 +697,9 @@ class ClientDHCore(Client):
         """
         keys = {}
         if self._access_token is not None:
-            keys["DHCORE_ACCESS_TOKEN"] = self._access_token
+            keys[DhcoreEnvVar.ACCESS_TOKEN.value] = self._access_token
         if self._refresh_token is not None:
-            keys["DHCORE_REFRESH_TOKEN"] = self._refresh_token
+            keys[DhcoreEnvVar.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

@@ -0,0 +1,27 @@
+from __future__ import annotations
+
+from enum import Enum
+
+
+class DhcoreEnvVar(Enum):
+    """
+    Environment variables.
+    """
+
+    ENDPOINT = "DHCORE_ENDPOINT"
+    ISSUER = "DHCORE_ISSUER"
+    USER = "DHCORE_USER"
+    PASSWORD = "DHCORE_PASSWORD"
+    CLIENT_ID = "DHCORE_CLIENT_ID"
+    ACCESS_TOKEN = "DHCORE_ACCESS_TOKEN"
+    REFRESH_TOKEN = "DHCORE_REFRESH_TOKEN"
+    WORKFLOW_IMAGE = "DHCORE_WORKFLOW_IMAGE"
+
+
+class AuthType(Enum):
+    """
+    Authentication types.
+    """
+
+    BASIC = "basic"
+    OAUTH2 = "oauth2"