digitalhub 0.10.0b5__py3-none-any.whl → 0.10.0b7__py3-none-any.whl

digitalhub/entities/run/crud.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 import typing
 
 from digitalhub.entities._commons.enums import EntityTypes
-from digitalhub.entities._operations.processor import processor
+from digitalhub.entities._processors.context import context_processor
 from digitalhub.utils.exceptions import EntityError
 
 if typing.TYPE_CHECKING:
@@ -53,7 +53,7 @@ def new_run(
     >>>               kind="python+run",
     >>>               task="task-string")
     """
-    return processor.create_context_entity(
+    return context_processor.create_context_entity(
         project=project,
         kind=kind,
         uuid=uuid,
@@ -95,7 +95,7 @@ def get_run(
     >>> obj = get_run("my-run-id"
     >>>               project="my-project")
     """
-    return processor.read_unversioned_entity(
+    return context_processor.read_unversioned_entity(
         identifier,
         entity_type=ENTITY_TYPE,
         project=project,
@@ -124,7 +124,7 @@ def list_runs(project: str, **kwargs) -> list[Run]:
     >>> objs = list_runs(project="my-project")
     """
     # TODO more examples: search by function, latest for task and function
-    return processor.list_context_entities(
+    return context_processor.list_context_entities(
         project=project,
         entity_type=ENTITY_TYPE,
         **kwargs,
@@ -149,7 +149,7 @@ def import_run(file: str) -> Run:
     -------
     >>> obj = import_run("my-run.yaml")
     """
-    return processor.import_context_entity(file)
+    return context_processor.import_context_entity(file)
 
 
 def load_run(file: str) -> Run:
@@ -170,7 +170,7 @@ def load_run(file: str) -> Run:
     --------
     >>> obj = load_run("my-run.yaml")
     """
-    return processor.load_context_entity(file)
+    return context_processor.load_context_entity(file)
 
 
 def update_run(entity: Run) -> Run:
@@ -191,7 +191,7 @@ def update_run(entity: Run) -> Run:
     --------
     >>> obj = update_run(obj)
     """
-    return processor.update_context_entity(
+    return context_processor.update_context_entity(
         project=entity.project,
         entity_type=entity.ENTITY_TYPE,
         entity_id=entity.id,
@@ -228,7 +228,7 @@ def delete_run(
     """
     if not identifier.startswith("store://") and project is None:
         raise EntityError("Specify entity key or entity ID combined with project")
-    return processor.delete_context_entity(
+    return context_processor.delete_context_entity(
         identifier=identifier,
         entity_type=ENTITY_TYPE,
         project=project,

digitalhub/entities/secret/_base/entity.py

@@ -4,7 +4,7 @@ import typing
 
 from digitalhub.entities._base.versioned.entity import VersionedEntity
 from digitalhub.entities._commons.enums import EntityTypes
-from digitalhub.entities._operations.processor import processor
+from digitalhub.entities._processors.context import context_processor
 
 if typing.TYPE_CHECKING:
     from digitalhub.entities._base.entity.metadata import Metadata
@@ -52,7 +52,7 @@ class Secret(VersionedEntity):
         None
         """
         obj = {self.name: value}
-        processor.update_secret_data(self.project, self.ENTITY_TYPE, obj)
+        context_processor.update_secret_data(self.project, self.ENTITY_TYPE, obj)
 
     def read_secret_value(self) -> dict:
         """
@@ -64,5 +64,5 @@ class Secret(VersionedEntity):
             Value of the secret.
         """
         params = {"keys": self.name}
-        data = processor.read_secret_data(self.project, self.ENTITY_TYPE, params=params)
+        data = context_processor.read_secret_data(self.project, self.ENTITY_TYPE, params=params)
         return data[self.name]

digitalhub/entities/secret/crud.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 import typing
 
 from digitalhub.entities._commons.enums import EntityTypes
-from digitalhub.entities._operations.processor import processor
+from digitalhub.entities._processors.context import context_processor
 from digitalhub.utils.exceptions import EntityNotExistsError
 
 if typing.TYPE_CHECKING:
@@ -58,7 +58,7 @@ def new_secret(
     """
     if secret_value is None:
         raise ValueError("secret_value must be provided.")
-    obj: Secret = processor.create_context_entity(
+    obj: Secret = context_processor.create_context_entity(
         project=project,
         name=name,
         kind="secret",
@@ -116,7 +116,7 @@ def get_secret(
                 return secret
         else:
             raise EntityNotExistsError(f"Secret {identifier} not found.")
-    return processor.read_context_entity(
+    return context_processor.read_context_entity(
         identifier,
         entity_type=ENTITY_TYPE,
         project=project,
@@ -156,7 +156,7 @@ def get_secret_versions(
     >>> objs = get_secret_versions("my-secret-name",
     >>>                            project="my-project")
     """
-    return processor.read_context_entity_versions(
+    return context_processor.read_context_entity_versions(
         identifier,
         entity_type=ENTITY_TYPE,
         project=project,
@@ -184,7 +184,7 @@ def list_secrets(project: str, **kwargs) -> list[Secret]:
     --------
     >>> objs = list_secrets(project="my-project")
     """
-    return processor.list_context_entities(
+    return context_processor.list_context_entities(
         project=project,
         entity_type=ENTITY_TYPE,
         **kwargs,
@@ -209,7 +209,7 @@ def import_secret(file: str) -> Secret:
     --------
     >>> obj = import_secret("my-secret.yaml")
     """
-    return processor.import_context_entity(file)
+    return context_processor.import_context_entity(file)
 
 
 def load_secret(file: str) -> Secret:
@@ -230,7 +230,7 @@ def load_secret(file: str) -> Secret:
     --------
     >>> obj = load_secret("my-secret.yaml")
     """
-    return processor.load_context_entity(file)
+    return context_processor.load_context_entity(file)
 
 
 def update_secret(entity: Secret) -> Secret:
@@ -251,7 +251,7 @@ def update_secret(entity: Secret) -> Secret:
     --------
     >>> obj = update_secret(obj)
     """
-    return processor.update_context_entity(
+    return context_processor.update_context_entity(
         project=entity.project,
         entity_type=entity.ENTITY_TYPE,
         entity_id=entity.id,
@@ -297,7 +297,7 @@ def delete_secret(
     >>>                     project="my-project",
     >>>                     delete_all_versions=True)
     """
-    return processor.delete_context_entity(
+    return context_processor.delete_context_entity(
         identifier=identifier,
         entity_type=ENTITY_TYPE,
         project=project,

digitalhub/entities/task/_base/entity.py

@@ -4,7 +4,7 @@ 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.entities._processors.context import context_processor
 from digitalhub.factory.api import build_entity_from_params, get_entity_type_from_kind, get_executable_kind
 
 if typing.TYPE_CHECKING:
@@ -107,7 +107,7 @@ class Task(UnversionedEntity):
             Run object.
         """
         if save:
-            return processor.create_context_entity(**kwargs)
+            return context_processor.create_context_entity(**kwargs)
         return build_entity_from_params(**kwargs)
 
     def get_run(self, entity_key: str) -> Run:
@@ -124,7 +124,7 @@ class Task(UnversionedEntity):
         Run
             Run object.
         """
-        return processor.read_context_entity(entity_key)
+        return context_processor.read_context_entity(entity_key)
 
     def delete_run(self, entity_key: str) -> dict:
         """
@@ -140,4 +140,4 @@ class Task(UnversionedEntity):
         dict
             Response from backend.
         """
-        return processor.delete_context_entity(entity_key)
+        return context_processor.delete_context_entity(entity_key)

digitalhub/entities/task/_base/models.py

@@ -236,3 +236,13 @@ class CoreServiceType(Enum):
     CLUSTER_IP = "ClusterIP"
     NODE_PORT = "NodePort"
     LOAD_BALANCER = "LoadBalancer"
+
+
+class CorePullPolicy(Enum):
+    """
+    CorePullPolicy enum.
+    """
+
+    ALWAYS = "Always"
+    IF_NOT_PRESENT = "IfNotPresent"
+    NEVER = "Never"

digitalhub/entities/task/crud.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 import typing
 
 from digitalhub.entities._commons.enums import EntityTypes
-from digitalhub.entities._operations.processor import processor
+from digitalhub.entities._processors.context import context_processor
 from digitalhub.utils.exceptions import EntityError
 
 if typing.TYPE_CHECKING:
@@ -53,7 +53,7 @@ def new_task(
     >>>                kind="python+job",
     >>>                function="function-string")
     """
-    return processor.create_context_entity(
+    return context_processor.create_context_entity(
         project=project,
         kind=kind,
         uuid=uuid,
@@ -95,7 +95,7 @@ def get_task(
     >>> obj = get_task("my-task-id"
     >>>               project="my-project")
     """
-    return processor.read_unversioned_entity(
+    return context_processor.read_unversioned_entity(
         identifier,
         entity_type=ENTITY_TYPE,
         project=project,
@@ -123,7 +123,7 @@ def list_tasks(project: str, **kwargs) -> list[Task]:
     --------
     >>> objs = list_tasks(project="my-project")
     """
-    return processor.list_context_entities(
+    return context_processor.list_context_entities(
         project=project,
         entity_type=ENTITY_TYPE,
         **kwargs,
@@ -148,7 +148,7 @@ def import_task(file: str) -> Task:
     -------
     >>> obj = import_task("my-task.yaml")
     """
-    return processor.import_context_entity(file)
+    return context_processor.import_context_entity(file)
 
 
 def load_task(file: str) -> Task:
@@ -169,7 +169,7 @@ def load_task(file: str) -> Task:
     --------
     >>> obj = load_task("my-task.yaml")
     """
-    return processor.load_context_entity(file)
+    return context_processor.load_context_entity(file)
 
 
 def update_task(entity: Task) -> Task:
@@ -190,7 +190,7 @@ def update_task(entity: Task) -> Task:
     --------
     >>> obj = update_task(obj)
     """
-    return processor.update_context_entity(
+    return context_processor.update_context_entity(
         project=entity.project,
         entity_type=entity.ENTITY_TYPE,
         entity_id=entity.id,
@@ -241,7 +241,7 @@ def delete_task(
     """
     if not identifier.startswith("store://"):
         raise EntityError("Task has no name. Use key instead.")
-    return processor.delete_context_entity(
+    return context_processor.delete_context_entity(
         identifier=identifier,
         entity_type=ENTITY_TYPE,
         project=project,

digitalhub/entities/workflow/crud.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 import typing
 
 from digitalhub.entities._commons.enums import EntityTypes
-from digitalhub.entities._operations.processor import processor
+from digitalhub.entities._processors.context import context_processor
 
 if typing.TYPE_CHECKING:
     from digitalhub.entities.workflow._base.entity import Workflow
@@ -55,7 +55,7 @@ def new_workflow(
     >>>                    code_src="pipeline.py",
     >>>                    handler="pipeline-handler")
     """
-    return processor.create_context_entity(
+    return context_processor.create_context_entity(
         project=project,
         name=name,
         kind=kind,
@@ -102,7 +102,7 @@ def get_workflow(
     >>>                    project="my-project",
     >>>                    entity_id="my-workflow-id")
     """
-    return processor.read_context_entity(
+    return context_processor.read_context_entity(
         identifier,
         entity_type=ENTITY_TYPE,
         project=project,
@@ -142,7 +142,7 @@ def get_workflow_versions(
     >>> obj = get_workflow_versions("my-workflow-name"
     >>>                             project="my-project")
     """
-    return processor.read_context_entity_versions(
+    return context_processor.read_context_entity_versions(
         identifier,
         entity_type=ENTITY_TYPE,
         project=project,
@@ -170,7 +170,7 @@ def list_workflows(project: str, **kwargs) -> list[Workflow]:
     --------
     >>> objs = list_workflows(project="my-project")
     """
-    return processor.list_context_entities(
+    return context_processor.list_context_entities(
         project=project,
         entity_type=ENTITY_TYPE,
         **kwargs,
@@ -195,7 +195,7 @@ def import_workflow(file: str) -> Workflow:
     --------
     >>> obj = import_workflow("my-workflow.yaml")
     """
-    return processor.import_executable_entity(file)
+    return context_processor.import_executable_entity(file)
 
 
 def load_workflow(file: str) -> Workflow:
@@ -216,7 +216,7 @@ def load_workflow(file: str) -> Workflow:
     --------
     >>> obj = load_workflow("my-workflow.yaml")
     """
-    return processor.load_executable_entity(file)
+    return context_processor.load_executable_entity(file)
 
 
 def update_workflow(entity: Workflow) -> Workflow:
@@ -237,7 +237,7 @@ def update_workflow(entity: Workflow) -> Workflow:
     --------
     >>> obj = update_workflow(obj)
     """
-    return processor.update_context_entity(
+    return context_processor.update_context_entity(
         project=entity.project,
         entity_type=entity.ENTITY_TYPE,
         entity_id=entity.id,
@@ -286,7 +286,7 @@ def delete_workflow(
     >>>                       project="my-project",
     >>>                       delete_all_versions=True)
     """
-    return processor.delete_context_entity(
+    return context_processor.delete_context_entity(
         identifier=identifier,
         entity_type=ENTITY_TYPE,
         project=project,

digitalhub/stores/s3/enums.py

@@ -8,10 +8,10 @@ class S3StoreEnv(Enum):
     S3Store environment
     """
 
-    ENDPOINT_URL = "DHCORE_S3_ENDPOINT_URL"
-    ACCESS_KEY_ID = "DHCORE_AWS_ACCESS_KEY_ID"
-    SECRET_ACCESS_KEY = "DHCORE_AWS_SECRET_ACCESS_KEY"
-    SESSION_TOKEN = "DHCORE_AWS_SESSION_TOKEN"
-    BUCKET_NAME = "DHCORE_S3_BUCKET"
-    REGION = "DHCORE_S3_REGION"
-    SIGNATURE_VERSION = "DHCORE_S3_SIGNATURE_VERSION"
+    ENDPOINT_URL = "S3_ENDPOINT_URL"
+    ACCESS_KEY_ID = "AWS_ACCESS_KEY_ID"
+    SECRET_ACCESS_KEY = "AWS_SECRET_ACCESS_KEY"
+    SESSION_TOKEN = "AWS_SESSION_TOKEN"
+    BUCKET_NAME = "S3_BUCKET"
+    REGION = "S3_REGION"
+    SIGNATURE_VERSION = "S3_SIGNATURE_VERSION"

digitalhub/stores/sql/enums.py

@@ -8,9 +8,9 @@ class SqlStoreEnv(Enum):
     SqlStore environment
     """
 
-    HOST = "DHCORE_DB_HOST"
-    PORT = "DHCORE_DB_PORT"
-    USERNAME = "DHCORE_DB_USERNAME"
-    PASSWORD = "DHCORE_DB_PASSWORD"
-    DATABASE = "DHCORE_DB_DATABASE"
-    PG_SCHEMA = "DHCORE_DB_SCHEMA"
+    HOST = "DB_HOST"
+    PORT = "DB_PORT"
+    USERNAME = "DB_USERNAME"
+    PASSWORD = "DB_PASSWORD"
+    DATABASE = "DB_DATABASE"
+    PG_SCHEMA = "DB_SCHEMA"

digitalhub/utils/git_utils.py

@@ -3,6 +3,7 @@ from __future__ import annotations
 import os
 import shutil
 import warnings
+from enum import Enum
 from pathlib import Path
 from urllib.parse import urlparse
 
@@ -13,6 +14,16 @@ except ImportError as e:
         warnings.warn("git is not installed. Please install git and try again.", RuntimeWarning)
 
 
+class GitCredentialsType(Enum):
+    """
+    Supported git credentials types.
+    """
+
+    USERNAME = "GIT_USERNAME"
+    PASSWORD = "GIT_PASSWORD"
+    TOKEN = "GIT_TOKEN"
+
+
 def clone_repository(path: Path, url: str) -> None:
     """
     Clone git repository.
@@ -90,12 +101,8 @@ def get_git_username_password_from_token(token: str) -> tuple[str, str]:
     """
     # Mutued from mlrun
     if token.startswith("github_pat_") or token.startswith("glpat"):
-        username = "oauth2"
-        password = token
-    else:
-        username = token
-        password = "x-oauth-basic"
-    return username, password
+        return "oauth2", token
+    return token, "x-oauth-basic"
 
 
 def add_credentials_git_remote_url(url: str) -> str:
@@ -115,9 +122,9 @@ def add_credentials_git_remote_url(url: str) -> str:
     url_obj = urlparse(url)
 
     # Get credentials from environment variables
-    username = os.getenv("GIT_USERNAME")
-    password = os.getenv("GIT_PASSWORD")
-    token = os.getenv("GIT_TOKEN")
+    username = os.getenv(GitCredentialsType.USERNAME.value)
+    password = os.getenv(GitCredentialsType.PASSWORD.value)
+    token = os.getenv(GitCredentialsType.TOKEN.value)
 
     # Get credentials from token. Override username and password
     if token is not None:

{digitalhub-0.10.0b5.dist-info → digitalhub-0.10.0b7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: digitalhub
-Version: 0.10.0b5
+Version: 0.10.0b7
 Summary: Python SDK for Digitalhub
 Project-URL: Homepage, https://github.com/scc-digitalhub/digitalhub-sdk
 Author-email: Fondazione Bruno Kessler <dslab@fbk.eu>, Matteo Martini <mmartini@fbk.eu>
@@ -244,16 +244,13 @@ Requires-Dist: jsonschema; extra == 'dev'
 Requires-Dist: pytest; extra == 'dev'
 Requires-Dist: pytest-cov; extra == 'dev'
 Provides-Extra: full
-Requires-Dist: fsspec; extra == 'full'
 Requires-Dist: mlflow; extra == 'full'
 Requires-Dist: pandas; extra == 'full'
-Requires-Dist: s3fs; extra == 'full'
 Provides-Extra: mlflow
 Requires-Dist: mlflow; extra == 'mlflow'
 Provides-Extra: pandas
 Requires-Dist: fsspec; extra == 'pandas'
 Requires-Dist: pandas; extra == 'pandas'
-Requires-Dist: s3fs; extra == 'pandas'
 Description-Content-Type: text/markdown
 
 # Digitalhub Library