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

digitalhub/stores/s3/store.py

@@ -13,7 +13,6 @@ from digitalhub.readers.api import get_reader_by_object
 from digitalhub.stores._base.store import Store, StoreConfig
 from digitalhub.utils.exceptions import StoreError
 from digitalhub.utils.file_utils import get_file_info_from_s3, get_file_mime_type
-from digitalhub.utils.s3_utils import get_bucket_name
 
 # Type aliases
 S3Client = Type["botocore.client.S3"]
@@ -77,7 +76,7 @@ class S3Store(Store):
         str
             Destination path of the downloaded artifact.
         """
-        client, bucket = self._check_factory(root)
+        client, bucket = self._check_factory()
 
         # Build destination directory
         if dst.suffix == "":
@@ -127,18 +126,14 @@ class S3Store(Store):
                 return str(Path(dst, trees[0]))
         return str(dst)
 
-    def upload(
-        self,
-        src: str | list[str],
-        dst: str,
-    ) -> list[tuple[str, str]]:
+    def upload(self, src: str | list[str], dst: str | None = None) -> list[tuple[str, str]]:
         """
         Upload an artifact to storage.
 
         Parameters
         ----------
-        src : str | list[str]
-            Source(s).
+        src : str
+            List of sources.
         dst : str
             The destination of the artifact on storage.
 
@@ -148,11 +143,18 @@ class S3Store(Store):
             Returns the list of destination and source paths of the uploaded artifacts.
         """
         # Destination handling
-        key = self._get_key(dst)
 
-        # Source handling (files list, dir or single file)
-        src_is_list = isinstance(src, list)
-        if not src_is_list:
+        # If no destination is provided, build key from source
+        # Otherwise build key from destination
+        if dst is None:
+            raise StoreError(
+                "Destination must be provided. If source is a list of files or a directory, destination must be a partition, e.g. 's3://bucket/partition/' otherwise a destination key, e.g. 's3://bucket/key'"
+            )
+        else:
+            dst = self._get_key(dst)
+
+        # Source handling
+        if not isinstance(src, list):
             self._check_local_src(src)
             src_is_dir = Path(src).is_dir()
         else:
@@ -163,31 +165,21 @@ class S3Store(Store):
                 src = src[0]
 
         # If source is a directory, destination must be a partition
-        if (src_is_dir or src_is_list) and not dst.endswith("/"):
-            raise StoreError(
-                "If source is a list of files or a directory, "
-                "destination must be a partition, e.g. 's3://bucket/partition/'"
-            )
-
-        # S3 client
-        client, bucket = self._check_factory(dst)
+        if (src_is_dir or isinstance(src, list)) and not dst.endswith("/"):
+            raise StoreError("Destination must be a partition if the source is a directory or a list of files.")
 
         # Directory
         if src_is_dir:
-            return self._upload_dir(src, key, client, bucket)
+            return self._upload_dir(src, dst)
 
         # List of files
-        elif src_is_list:
-            return self._upload_file_list(src, key, client, bucket)
+        elif isinstance(src, list):
+            return self._upload_file_list(src, dst)
 
         # Single file
-        return self._upload_single_file(src, key, client, bucket)
+        return self._upload_single_file(src, dst)
 
-    def upload_fileobject(
-        self,
-        src: BytesIO,
-        dst: str,
-    ) -> str:
+    def upload_fileobject(self, src: BytesIO, dst: str) -> str:
         """
         Upload an BytesIO to S3 based storage.
 
@@ -196,23 +188,18 @@ class S3Store(Store):
         src : BytesIO
             The source object to be persisted.
         dst : str
-            The destination path of the artifact.
+            The destination partition for the artifact.
 
         Returns
         -------
         str
             S3 key of the uploaded artifact.
         """
-        client, bucket = self._check_factory(dst)
-        key = self._get_key(dst)
-        self._upload_fileobject(src, key, client, bucket)
-        return f"s3://{bucket}/{key}"
+        client, bucket = self._check_factory()
+        self._upload_fileobject(src, dst, client, bucket)
+        return f"s3://{bucket}/{dst}"
 
-    def get_file_info(
-        self,
-        root: str,
-        paths: list[tuple[str, str]],
-    ) -> list[dict]:
+    def get_file_info(self, paths: list[tuple[str, str]]) -> list[dict]:
         """
         Method to get file metadata.
 
@@ -226,7 +213,7 @@ class S3Store(Store):
         list[dict]
             Returns files metadata.
         """
-        client, bucket = self._check_factory(root)
+        client, bucket = self._check_factory()
 
         infos = []
         for i in paths:
@@ -277,13 +264,7 @@ class S3Store(Store):
         # Download file
         client.download_file(bucket, key, dst_pth)
 
-    def _upload_dir(
-        self,
-        src: str,
-        dst: str,
-        client: S3Client,
-        bucket: str,
-    ) -> list[tuple[str, str]]:
+    def _upload_dir(self, src: str, dst: str) -> list[tuple[str, str]]:
         """
         Upload directory to storage.
 
@@ -293,16 +274,14 @@ class S3Store(Store):
             List of sources.
         dst : str
             The destination of the artifact on storage.
-        client : S3Client
-            The S3 client object.
-        bucket : str
-            The name of the S3 bucket.
 
         Returns
         -------
         list[tuple[str, str]]
             Returns the list of destination and source paths of the uploaded artifacts.
         """
+        client, bucket = self._check_factory()
+
         # Get list of files
         src_pth = Path(src)
         files = [i for i in src_pth.rglob("*") if i.is_file()]
@@ -320,13 +299,7 @@ class S3Store(Store):
             paths.append((k, str(f.relative_to(src_pth))))
         return paths
 
-    def _upload_file_list(
-        self,
-        src: list[str],
-        dst: str,
-        client: S3Client,
-        bucket: str,
-    ) -> list[tuple[str, str]]:
+    def _upload_file_list(self, src: list[str], dst: str) -> list[tuple[str, str]]:
         """
         Upload list of files to storage.
 
@@ -336,16 +309,13 @@ class S3Store(Store):
             List of sources.
         dst : str
             The destination of the artifact on storage.
-        client : S3Client
-            The S3 client object.
-        bucket : str
-            The name of the S3 bucket.
 
         Returns
         -------
         list[tuple[str, str]]
             Returns the list of destination and source paths of the uploaded artifacts.
         """
+        client, bucket = self._check_factory()
         files = src
         keys = []
         for i in files:
@@ -360,13 +330,7 @@ class S3Store(Store):
             paths.append((k, Path(f).name))
         return paths
 
-    def _upload_single_file(
-        self,
-        src: str,
-        dst: str,
-        client: S3Client,
-        bucket: str,
-    ) -> str:
+    def _upload_single_file(self, src: str, dst: str) -> str:
         """
         Upload a single file to storage.
 
@@ -376,16 +340,14 @@ class S3Store(Store):
             List of sources.
         dst : str
             The destination of the artifact on storage.
-        client : S3Client
-            The S3 client object.
-        bucket : str
-            The name of the S3 bucket.
 
         Returns
         -------
         str
             Returns the list of destination and source paths of the uploaded artifacts.
         """
+        client, bucket = self._check_factory()
+
         if dst.endswith("/"):
             dst = f"{dst.removeprefix('/')}{Path(src).name}"
 
@@ -395,12 +357,7 @@ class S3Store(Store):
         return [(dst, name)]
 
     @staticmethod
-    def _upload_file(
-        src: str,
-        key: str,
-        client: S3Client,
-        bucket: str,
-    ) -> None:
+    def _upload_file(src: str, key: str, client: S3Client, bucket: str) -> None:
         """
         Upload a file to S3 based storage. The function checks if the
         bucket is accessible.
@@ -427,12 +384,7 @@ class S3Store(Store):
         client.upload_file(Filename=src, Bucket=bucket, Key=key, ExtraArgs=extra_args)
 
     @staticmethod
-    def _upload_fileobject(
-        fileobj: BytesIO,
-        key: str,
-        client: S3Client,
-        bucket: str,
-    ) -> None:
+    def _upload_fileobject(fileobj: BytesIO, key: str, client: S3Client, bucket: str) -> None:
         """
         Upload a fileobject to S3 based storage. The function checks if the bucket is accessible.
 
@@ -457,13 +409,7 @@ class S3Store(Store):
     # Datastore methods
     ##############################
 
-    def write_df(
-        self,
-        df: Any,
-        dst: str,
-        extension: str | None = None,
-        **kwargs,
-    ) -> str:
+    def write_df(self, df: Any, dst: str, extension: str | None = None, **kwargs) -> str:
         """
         Write a dataframe to S3 based storage. Kwargs are passed to df.to_parquet().
 
@@ -473,8 +419,6 @@ class S3Store(Store):
             The dataframe.
         dst : str
             The destination path on S3 based storage.
-        extension : str
-            The extension of the file.
         **kwargs : dict
             Keyword arguments.
 
@@ -486,13 +430,15 @@ class S3Store(Store):
         fileobj = BytesIO()
         reader = get_reader_by_object(df)
         reader.write_df(df, fileobj, extension=extension, **kwargs)
-        return self.upload_fileobject(fileobj, dst)
+
+        key = self._get_key(dst)
+        return self.upload_fileobject(fileobj, key)
 
     ##############################
     # Helper methods
     ##############################
 
-    def _get_bucket(self, root: str) -> str:
+    def _get_bucket(self) -> str:
         """
         Get the name of the S3 bucket from the URI.
 
@@ -501,7 +447,7 @@ class S3Store(Store):
         str
             The name of the S3 bucket.
         """
-        return get_bucket_name(root)
+        return str(self.config.bucket_name)
 
     def _get_client(self) -> S3Client:
         """
@@ -519,7 +465,7 @@ class S3Store(Store):
         }
         return boto3.client("s3", **cfg)
 
-    def _check_factory(self, root: str) -> tuple[S3Client, str]:
+    def _check_factory(self) -> tuple[S3Client, str]:
         """
         Check if the S3 bucket is accessible by sending a head_bucket request.
 
@@ -529,7 +475,7 @@ class S3Store(Store):
             A tuple containing the S3 client object and the name of the S3 bucket.
         """
         client = self._get_client()
-        bucket = self._get_bucket(root)
+        bucket = self._get_bucket()
         self._check_access_to_storage(client, bucket)
         return client, bucket
 

digitalhub/stores/sql/store.py

@@ -99,11 +99,7 @@ class SqlStore(Store):
         table = self._get_table_name(root)
         return self._download_table(schema, table, str(dst))
 
-    def upload(
-        self,
-        src: str | list[str],
-        dst: str,
-    ) -> list[tuple[str, str]]:
+    def upload(self, src: str | list[str], dst: str | None = None) -> list[tuple[str, str]]:
         """
         Upload an artifact to storage.
 
@@ -114,11 +110,7 @@ class SqlStore(Store):
         """
         raise StoreError("SQL store does not support upload.")
 
-    def get_file_info(
-        self,
-        root: str,
-        paths: list[tuple[str, str]],
-    ) -> list[dict]:
+    def get_file_info(self, paths: list[str]) -> list[dict]:
         """
         Get file information from SQL based storage.
 

digitalhub/utils/s3_utils.py

@@ -7,23 +7,6 @@ from urllib.parse import urlparse
 from boto3 import client as boto3_client
 
 
-def get_bucket_name(path: str) -> str:
-    """
-    Get bucket name from path.
-
-    Parameters
-    ----------
-    path : str
-        The source path to get the key from.
-
-    Returns
-    -------
-    str
-        The bucket name.
-    """
-    return urlparse(path).netloc
-
-
 def get_bucket_and_key(path: str) -> tuple[str, str]:
     """
     Get bucket and key from path.

{digitalhub-0.9.0.dist-info → digitalhub-0.9.0b1.dist-info}/LICENSE.txt

@@ -186,7 +186,7 @@ APPENDIX: How to apply the Apache License to your work.
    same "printed page" as the copyright notice for easier
    identification within third-party archives.
 
-Copyright 2024 DSLab, Fondazione Bruno Kessler
+Copyright [yyyy] [name of copyright owner]
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

{digitalhub-0.9.0.dist-info → digitalhub-0.9.0b1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: digitalhub
-Version: 0.9.0
+Version: 0.9.0b1
 Summary: Python SDK for Digitalhub
 Author-email: Fondazione Bruno Kessler <dslab@fbk.eu>, Matteo Martini <mmartini@fbk.eu>
 License:                               Apache License
@@ -191,7 +191,7 @@ License:                               Apache License
            same "printed page" as the copyright notice for easier
            identification within third-party archives.
         
-        Copyright 2024 DSLab, Fondazione Bruno Kessler
+        Copyright [yyyy] [name of copyright owner]
         
         Licensed under the Apache License, Version 2.0 (the "License");
         you may not use this file except in compliance with the License.

{digitalhub-0.9.0.dist-info → digitalhub-0.9.0b1.dist-info}/RECORD

@@ -4,20 +4,17 @@ digitalhub/client/api.py,sha256=JwYh4rFUaTeZ2MvUdhQiWEG1AZbrZjRYMhJHoDRnk30,586
 digitalhub/client/builder.py,sha256=83PoMCus4s4nbkoWmvcjW2hIpXbNx74sUW93wgQgbuo,1195
 digitalhub/client/_base/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 digitalhub/client/_base/api_builder.py,sha256=kB0phBqaPTLayyXyA1GbHgnbo4bBkadBtimznVB3-jc,339
-digitalhub/client/_base/client.py,sha256=Z2iVRCyEzR1-B2uUh9uGQVuCpLFOE0UL64kEXhyf2aI,2974
-digitalhub/client/_base/key_builder.py,sha256=xl3jM7z2eLP6HfPXusmZyLqsvfKHQfxfZ3SWPS7MHuk,1155
+digitalhub/client/_base/client.py,sha256=wXHfHQANnv_2AlW6yh7dnxI3i0bBASsP_gYSbc-YQHk,2063
 digitalhub/client/dhcore/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 digitalhub/client/dhcore/api_builder.py,sha256=IkRnANGG3dQmu4t1KmSnpDxGqkZDnJpBP9CcUhWZliQ,3652
-digitalhub/client/dhcore/client.py,sha256=rYNSv-UpxoksaZki19A4pCch0tHlGIId9eDuFCfdxDk,21297
+digitalhub/client/dhcore/client.py,sha256=Vl0ZRX1CHxOg9awR-liFagTMkbNLcW2B4jGfxJt0udk,21149
 digitalhub/client/dhcore/enums.py,sha256=kaVXZTTa2WmsFbcc1CKWNLOM0JtUtcjL-KpspnTOhEE,523
 digitalhub/client/dhcore/env.py,sha256=zBUNbK8G8PyMGAw_65BnX2Z_WUkrmTyQmYhLE6Jqgvk,618
-digitalhub/client/dhcore/key_builder.py,sha256=VyyHk18rs1z8FKoRXGD2glb_WCipCWoYsS50_jYQpC4,1317
 digitalhub/client/dhcore/models.py,sha256=KiTg5xR8EzI7Xa1pmYmzixabLdnqlnn5kn-IILZDGIw,900
 digitalhub/client/dhcore/utils.py,sha256=I6m26WiGMCEyPa6Yv5hk3nmqWV4jDFjYyI590f86Ebs,3136
 digitalhub/client/local/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 digitalhub/client/local/api_builder.py,sha256=WR24zuWguJqzUkD7xReO12LtvSkn020UG6LKFcKq77g,3592
-digitalhub/client/local/client.py,sha256=3DZI4UOrIJ0C03uhbvmKFpeoe2wY7IhBUHO92yzCikQ,17460
-digitalhub/client/local/key_builder.py,sha256=jO5RHMRe5bxygX3rbD7TOqBafvO6FJcEOymsnJbjyuY,1316
+digitalhub/client/local/client.py,sha256=WLpEymgxysRLDdMGm9ds4kKOqHqEXk8MmrU01NR938o,17338
 digitalhub/context/api.py,sha256=un-_HU7JC3t-eQKleVJ9cCDS8BtQFRHSrP3VDHs3gPU,1099
 digitalhub/context/builder.py,sha256=ibsjwCbll4RbNc_NplAn-8cX0J8GIXyY41KjtcvlsI4,2037
 digitalhub/context/context.py,sha256=-xn3ZHNqoifUdRF4vwmLzOkfQrEheFPDQNk2J-q47EI,1456
@@ -30,7 +27,7 @@ digitalhub/entities/_base/context/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeR
 digitalhub/entities/_base/context/entity.py,sha256=4IWC6f0YKpEBPCXrKlkkvnOqT1urQ4mbjwre4LUWxk4,3270
 digitalhub/entities/_base/entity/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 digitalhub/entities/_base/entity/builder.py,sha256=vegnR3aBLhuA371vFVQvMXX4KfpVFl-Z7h1ydt6r6Hg,4518
-digitalhub/entities/_base/entity/entity.py,sha256=BFVKE5CToh4JOdwseAGMhdpoCiD3kaGRhNA9SuRCixE,3223
+digitalhub/entities/_base/entity/entity.py,sha256=5QP7ZFZ3fjdC6dL26J4TAc_gAsz4esTYR97PIRiwk04,3162
 digitalhub/entities/_base/entity/metadata.py,sha256=_ogwoo7NOExxVPml9h1vbbAryFiAVpuEuSBQsd_VRjU,2261
 digitalhub/entities/_base/entity/spec.py,sha256=t0sPXHCb8zyWyMW_UvTfGyUkG_CUEGz427kvGhsQ8s0,1500
 digitalhub/entities/_base/entity/status.py,sha256=NHB1kLHefoMhhkt_2BFPNojbWMW_Nc8TTGFQNOiyOt0,1044
@@ -43,25 +40,25 @@ digitalhub/entities/_base/entity/_constructors/uuid.py,sha256=QzG0nsVpGU2UDD5Cjp
 digitalhub/entities/_base/executable/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 digitalhub/entities/_base/executable/entity.py,sha256=tNQmmABuY90eKWcxePPGu4iaZhDLyL9TdugKVcnnKSY,10079
 digitalhub/entities/_base/material/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-digitalhub/entities/_base/material/entity.py,sha256=Gm87nZCKUIredCEucqwZ5T_QGG6cjSuWXKzrw15w-l4,6930
+digitalhub/entities/_base/material/entity.py,sha256=J262BLNeW9yYE_W_K07tnvigSI3BJzIXrPlxqow44M0,6914
 digitalhub/entities/_base/material/spec.py,sha256=jL1OohnYhUSrdTaFF3Rkw817jIjNY0ewm1wB3tgQ_9c,436
 digitalhub/entities/_base/material/status.py,sha256=I9yxNLHvsHSRDkKcKGPxlPJrJ7grsrxHxId06wtqVXk,383
 digitalhub/entities/_base/material/utils.py,sha256=EL-p6XEYlPxQ33II2ish2sVx3hIdPcrgbSh5om7Xfls,2427
 digitalhub/entities/_base/project/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-digitalhub/entities/_base/project/entity.py,sha256=MwK80OCNKN_vxnPajJhErdLS4VQfIWydmfQrscf5OCc,10621
+digitalhub/entities/_base/project/entity.py,sha256=oASIIm1eZH9KCUrtfJDWkL_BjJf6tev0RWFu6Y63T0s,10587
 digitalhub/entities/_base/runtime_entity/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 digitalhub/entities/_base/runtime_entity/builder.py,sha256=vZBftdOrAUICoEJXbqOyozrbMxNRqqoVVxDVjKs2GnI,2414
 digitalhub/entities/_base/unversioned/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 digitalhub/entities/_base/unversioned/builder.py,sha256=ChEhRXlu1BGNmMHOMu9i9kVMu3uFtwxmgiTO4Il_5oU,1834
-digitalhub/entities/_base/unversioned/entity.py,sha256=eQ9BKtqr7-UPgS4fkNdFX2Uh-YddfYrfFmk4Y-6uj7w,862
+digitalhub/entities/_base/unversioned/entity.py,sha256=fNz1dprqbN5y7DJ0cWIibaIEPifCGlzccCJyYglQ-K0,778
 digitalhub/entities/_base/versioned/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 digitalhub/entities/_base/versioned/builder.py,sha256=0niRbqpCnHqBK0hTQxdrtUl43BbJuGXMLVbruhpUUuU,1896
-digitalhub/entities/_base/versioned/entity.py,sha256=xtvVJfmJTfCAA96va1-r7B2j7wbXlkutGMil--PWP4I,885
+digitalhub/entities/_base/versioned/entity.py,sha256=tGu1n2rQ0bRnc6SfUyH8aDp0IhuNwR42PuZSGRmYo2k,802
 digitalhub/entities/_commons/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 digitalhub/entities/_commons/enums.py,sha256=pjhbOMzAABRPbV6XNt-2Lyn2kLWIFBAwpeboCtvnz1w,1861
 digitalhub/entities/_commons/utils.py,sha256=_HL6zFSCL_2ug4LpXcxK1MJQQhWL34wj1B2q0Ie0TKU,1792
 digitalhub/entities/_operations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-digitalhub/entities/_operations/processor.py,sha256=baQA_L-NFU5uDfP4M2d3B9VLerbmjK3pFKUkZDZI2Sg,49470
+digitalhub/entities/_operations/processor.py,sha256=yi-L_mltue3WN8xM5Y-zpwUCb4x4psW5uwd1Lx7Rxo4,46663
 digitalhub/entities/artifact/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 digitalhub/entities/artifact/crud.py,sha256=y69PyoWAYOx-Pl_wnds3M0xSLNbADpdV_xG4zElJ0aI,7824
 digitalhub/entities/artifact/utils.py,sha256=NNzD2AcIJzmV_Jo_8k5ZcSp2arKcZ07CCIYKn2lvoKM,1320
@@ -103,7 +100,7 @@ digitalhub/entities/function/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NM
 digitalhub/entities/function/crud.py,sha256=1-fRWVmOXVV305p0GW0n02FEcengw7QxLxxgxsCC7eM,6592
 digitalhub/entities/function/_base/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 digitalhub/entities/function/_base/builder.py,sha256=xTVOpH3GYU-BqtzMEuI3uMtLLvF9IYfrVYMVPkkJc2g,2035
-digitalhub/entities/function/_base/entity.py,sha256=YYFxtLAZEhcWOzGlGjqRPXmGRb8wBK1KOXyVPo9ZGSw,3093
+digitalhub/entities/function/_base/entity.py,sha256=VhUQsC5EyJQpCU6FMDRqLIrlJt18g8I6AKd1ZO7320U,3100
 digitalhub/entities/function/_base/spec.py,sha256=SjCtp3JBUTPTLMY_TE8wM1HPKVl7jH_wFEqQXBj1rfo,274
 digitalhub/entities/function/_base/status.py,sha256=N-Z1hw13qV7kWFJLQPaH3rRZ2z7AvZeuWYER95lG344,170
 digitalhub/entities/model/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -162,7 +159,7 @@ digitalhub/entities/task/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZ
 digitalhub/entities/task/crud.py,sha256=_TOgqPvD4bOcfxMPJLCzPe4fz_87AP27RG5cC2941oY,5199
 digitalhub/entities/task/_base/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 digitalhub/entities/task/_base/builder.py,sha256=21WEbycCR8yaOPcLLcAITaoQ4ZmBNXJXB-Oy0VfSPrg,2358
-digitalhub/entities/task/_base/entity.py,sha256=hOTFxWgSrEs2UPrd9pDZAbdWnL_OrkHr6PwxnAkYG2A,3531
+digitalhub/entities/task/_base/entity.py,sha256=KGueJ64puhS7DAzG0_-XZSlUmVIOPOFJbtj1S8iWrpg,3179
 digitalhub/entities/task/_base/models.py,sha256=lrkQfKEqqMboiDgtqVdTdlFx4FCH_ksJ2Jku1nK6ARw,4741
 digitalhub/entities/task/_base/spec.py,sha256=2p_QmhXdTXFrkwNyXtEgzUmc4YyedjS-zsnWsvxJDjw,2412
 digitalhub/entities/task/_base/status.py,sha256=FCSSQscQ0dHEpXdc5vSrIkTXon9FNNOr0M1KVh2ZVAA,162
@@ -171,7 +168,7 @@ digitalhub/entities/workflow/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NM
 digitalhub/entities/workflow/crud.py,sha256=O_Zq30NG-cy7RU1GG88XNi8ids7vrRJAR95PTMYncGM,6517
 digitalhub/entities/workflow/_base/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 digitalhub/entities/workflow/_base/builder.py,sha256=wRgot2pbXjc-Cw549uDo1zFOGKdE7wVqxCboeNoXe-Q,2035
-digitalhub/entities/workflow/_base/entity.py,sha256=yQKsoJqWRRgYVQJ0wWvu4krx1DpRM9JL4Irb_874Kqs,2516
+digitalhub/entities/workflow/_base/entity.py,sha256=TFteC2Bpg71qrQ0ni9qnowZUYT3WQ_toEmt2BJIdUeM,2228
 digitalhub/entities/workflow/_base/spec.py,sha256=UoKOUEqKDFACQwctDWfwhro77m3kvjhLDGOhhfRvEzQ,274
 digitalhub/entities/workflow/_base/status.py,sha256=W0j0CNdu9o2vbk0awpnDrpgwf_fZpgdtct4s0BxRdyk,170
 digitalhub/factory/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -197,15 +194,15 @@ digitalhub/stores/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU
 digitalhub/stores/api.py,sha256=TwD8WXVuEPwtrmcyhP9SC0i7xkVHov5fpu94nHhZRHg,994
 digitalhub/stores/builder.py,sha256=kraGDfgV5cZ2QivXTWwbyz1FgAehgjlL9dmI6dxEc0U,5927
 digitalhub/stores/_base/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-digitalhub/stores/_base/store.py,sha256=QscqsAAgvYX9bAsoADKs0SkLahmMvvEHZ_NsBj2ri6k,5295
+digitalhub/stores/_base/store.py,sha256=Wc3bHLELO3WW7aQ5Dy9tqHh2nOx7L80cZ1tDwwpb1sQ,5255
 digitalhub/stores/local/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-digitalhub/stores/local/store.py,sha256=_-0JEnGCEcKUrLeB2xf_CDGuSeAEXcNyX6JCvSWkU3M,6766
+digitalhub/stores/local/store.py,sha256=nwOvLvM-DLSqsjlYZLLSoy2pr4pMnaunrwUSi2yNJco,6726
 digitalhub/stores/remote/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-digitalhub/stores/remote/store.py,sha256=g9u87NBfFBasHWSTn82ZRZ0QttpYpX_Y0g16xO1r-AQ,4234
+digitalhub/stores/remote/store.py,sha256=NdA63gyWVKXHlxjoOqi8Vx1jttXDU4GcU0zohV9utjk,4194
 digitalhub/stores/s3/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-digitalhub/stores/s3/store.py,sha256=CzjdMyatPps8uW4HFKz-OZcOUlVlGebUX4jxrzp48Eg,16912
+digitalhub/stores/s3/store.py,sha256=sM2hvSGxf5S6l80GpDzxyr3_v-wAYoMfV-oOiF6TOpc,16263
 digitalhub/stores/sql/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-digitalhub/stores/sql/store.py,sha256=jhulvAIacR0HAomv25PCxG3mr6BKhF-9c9k0D5ruCQ8,10482
+digitalhub/stores/sql/store.py,sha256=epL1TGvWPFjpKBGxqkrfMOEA9-fjakNVbQwSo-YhfNw,10411
 digitalhub/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 digitalhub/utils/data_utils.py,sha256=2eETyxml610Ij7uyDnNc3YiELl2WFLIkj3FL4y6EPk8,2733
 digitalhub/utils/exceptions.py,sha256=pL2C3vTCscHsjpqDqGN3OXu0bBn7NL9ENOoM2S37CyE,1139
@@ -214,7 +211,7 @@ digitalhub/utils/generic_utils.py,sha256=5flGSQ50UyzUtlnLPyIhZ6blijPGFxPITukfH-y
 digitalhub/utils/git_utils.py,sha256=aFYL1cpfY-2VnlW7eHmjjjlTLECc5UUUfjb_IQPOY5k,3244
 digitalhub/utils/io_utils.py,sha256=8jD4Rp_b7LZEpY5JSMxVUowZsnifKnbGpHT5Hijx9-g,3299
 digitalhub/utils/logger.py,sha256=ml3ne6D8wuRdNZ4F6ywmvWotSxjmZWnmKgNiuHb4R5M,437
-digitalhub/utils/s3_utils.py,sha256=kbET2FL7UXfqBMgSpky-E3wO5SMjpaLbIAFtnGe2pXU,1383
+digitalhub/utils/s3_utils.py,sha256=oXLzp4K7o45IwK0XOMt4OElDyB09fKRic5WTNA82WUA,1113
 digitalhub/utils/uri_utils.py,sha256=IUbR9PjxHr2VghxRG3iyCGpMPSLvL17JLKLZp8kXsgg,3272
 test/test_crud_functions.py,sha256=tQs_QBaPCuYVSBpbl-he5_6jr_tteCXVmohj1ZluNsA,2769
 test/test_crud_runs.py,sha256=lkssy15UPJKymgazmi5gG6RLxyTsG-tM_CpNCowD2gQ,2220
@@ -225,9 +222,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
-test/local/instances/test_validate.py,sha256=bGPKRFR_Tb5nlzzmI_ty_6UVUvYGseE2-pkNVoGWeO0,1842
-digitalhub-0.9.0.dist-info/LICENSE.txt,sha256=qmrTTXPlgU0kSRlRVbjhlyGs1IXs2QPxo_Y-Mn06J0k,11589
-digitalhub-0.9.0.dist-info/METADATA,sha256=ZqP2_g1Syi4Gjh7THCipyW_ytmZ1PKjFcRRP7ra1134,15318
-digitalhub-0.9.0.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-digitalhub-0.9.0.dist-info/top_level.txt,sha256=ae9pDfCF27ZoaVAxuBKONMP0lm5P-N_I-e-no1WlvD8,16
-digitalhub-0.9.0.dist-info/RECORD,,
+digitalhub-0.9.0b1.dist-info/LICENSE.txt,sha256=_yVOtnbW7Ss28mp058UEEc1X4Rgj8-kQBP_kj8_Sc88,11585
+digitalhub-0.9.0b1.dist-info/METADATA,sha256=US6XAu95Ktv0yNGQJxqOwkfMLyzPDPsKFS5eb8A-wvk,15316
+digitalhub-0.9.0b1.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+digitalhub-0.9.0b1.dist-info/top_level.txt,sha256=ae9pDfCF27ZoaVAxuBKONMP0lm5P-N_I-e-no1WlvD8,16
+digitalhub-0.9.0b1.dist-info/RECORD,,

digitalhub/client/_base/key_builder.py

@@ -1,52 +0,0 @@
-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/dhcore/key_builder.py

@@ -1,58 +0,0 @@
-from __future__ import annotations
-
-from digitalhub.client._base.key_builder import ClientKeyBuilder
-
-
-class ClientDHCoreKeyBuilder(ClientKeyBuilder):
-    """
-    Class that build the key of entities.
-    """
-
-    def base_entity_key(self, entity_id: str) -> str:
-        """
-        Build for base entity key.
-
-        Parameters
-        ----------
-        entity_id : str
-            Entity id.
-
-        Returns
-        -------
-        str
-            Key.
-        """
-        return f"store://{entity_id}"
-
-    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.
-
-        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
-            Key.
-        """
-        if entity_id is None:
-            return f"store://{project}/{entity_type}/{entity_kind}/{entity_name}"
-        return f"store://{project}/{entity_type}/{entity_kind}/{entity_name}:{entity_id}"