dtlpy 1.104.14__py3-none-any.whl → 1.105.6__py3-none-any.whl

dtlpy/__version__.py

@@ -1 +1 @@
-version = '1.104.14'
+version = '1.105.6'

dtlpy/entities/ontology.py

@@ -766,7 +766,7 @@ class Ontology(entities.BaseEntity):
         # TODO: Add support for import from ontology entity in the Future
         if not self._use_attributes_2:
             raise ValueError("This method is only supported for attributes 2 mode!")
-        new_ontology = self.from_json(_json=ontology_json, client_api=self._client_api, recipe=self.recipe)
+        new_ontology = self.from_json(_json=ontology_json, client_api=self._client_api)
 
         # Update 'labels' and 'attributes'
         self.labels = new_ontology.labels
@@ -794,6 +794,9 @@ class Ontology(entities.BaseEntity):
                     attribute_range=attribute_range
                 )
 
+        # Get remote updated 'attributes'
+        self.metadata["attributes"] = self.ontologies.get(ontology_id=self.id).attributes
+
         # Update 'instance map' and 'color map'
         self._instance_map = new_ontology.instance_map
         self._color_map = new_ontology.color_map

dtlpy/repositories/computes.py

@@ -8,6 +8,7 @@ from typing import List, Optional, Dict
 from ..entities import ComputeCluster, ComputeContext, ComputeType, Project
 from ..entities.integration import IntegrationType
 
+
 class Computes:
 
     def __init__(self, client_api: ApiClient):
@@ -44,7 +45,8 @@ class Computes:
             type: entities.ComputeType = entities.ComputeType.KUBERNETES,
             is_global: Optional[bool] = False,
             features: Optional[Dict] = None,
-            wait=True
+            wait=True,
+            status: entities.ComputeStatus = None
     ):
         """
         Create a new compute
@@ -57,6 +59,7 @@ class Computes:
         :param is_global: Is global
         :param features: Features
         :param wait: Wait for compute creation
+        :param status: Compute status
         :return: Compute
         """
 
@@ -67,7 +70,8 @@ class Computes:
             'global': is_global,
             'features': features,
             'shared_contexts': [sc.to_json() for sc in shared_contexts],
-            'cluster': cluster.to_json()
+            'cluster': cluster.to_json(),
+            'status': status
         }
 
         # request
@@ -86,7 +90,7 @@ class Computes:
         )
 
         if wait:
-            command_id = compute.metadata.get('system', {}).get('commands', {}).get('create', {})
+            command_id = compute.metadata.get('system', {}).get('commands', {}).get('create', None)
             if command_id is not None:
                 command = self.commands.get(command_id=command_id, url='api/v1/commands/faas/{}'.format(command_id))
                 command.wait()
@@ -200,7 +204,8 @@ class Computes:
             ComputeContext([], org_id, project_id),
             [],
             cluster,
-            ComputeType.KUBERNETES)
+            ComputeType.KUBERNETES,
+            status=config['config'].get('status', None))
         return compute
 
     def create_from_config_file(self, config_file_path, org_id, project_name: Optional[str] = None):
@@ -215,6 +220,7 @@ class Computes:
         compute = self.setup_compute_cluster(config, integration, org_id, project)
         return compute
 
+
 class ServiceDrivers:
 
     def __init__(self, client_api: ApiClient):

dtlpy/repositories/integrations.py

@@ -114,6 +114,8 @@ class Integrations:
         aws-cross - {}
         gcp-cross - {}
         gcp-workload-identity-federation - {"secret": "", "content": "{}", "clientId": ""}
+        private-registry (ECR) - {"name": "", "spec": {"accessKeyId": "", "secretAccessKey": "", "account": "", "region": ""}}
+        private-registry (GAR) - {"name": "", "spec": {"password": ""}} (can use generate_gar_options to generate the options)
 
         **Prerequisites**: You must be an *owner* in the organization.
 
@@ -129,7 +131,7 @@ class Integrations:
         .. code-block:: python
 
             project.integrations.create(integrations_type=dl.IntegrationType.S3,
-                            name='S3ntegration',
+                            name='S3Integration',
                             options={key: "Access key ID", secret: "Secret access key"})
         """
 
@@ -144,7 +146,9 @@ class Integrations:
             organization_id = self.org.id
 
         url_path = '/orgs/{}/integrations'.format(organization_id)
-        payload = {"type": integrations_type.value if isinstance(integrations_type, entities.IntegrationType) else integrations_type, 'name': name, 'options': options}
+        payload = {"type": integrations_type.value if isinstance(integrations_type,
+                                                                 entities.IntegrationType) else integrations_type,
+                   'name': name, 'options': options}
         if metadata is not None:
             payload['metadata'] = metadata
         success, response = self._client_api.gen_request(req_type='post',
@@ -300,21 +304,7 @@ class Integrations:
         available_integrations = miscellaneous.List(response.json())
         return available_integrations
 
-    def _create_private_registry_gar(self, service_account: str, location: str):
-        password = self.__create_gar_password(service_account, location)
-        return self.create(
-            integrations_type='private-registry',
-            name='gar-1',
-            metadata={"provider": "gcp"},
-            options={
-                "name": "_json_key",
-                "spec": {
-                    "password": password
-                }
-            }
-        )
-
-    def __create_gar_password(self, service_account: str, location: str) -> str:
+    def generate_gar_options(self, service_account: str, location: str) -> dict:
         """
         Generates a Google Artifact Registry JSON configuration and returns it as a base64-encoded string.
 
@@ -348,4 +338,9 @@ class Integrations:
             }
         }
 
-        return str(base64.b64encode(bytes(json.dumps(encoded_pass), 'utf-8')))[2:-1]
+        return {
+            "name": "_json_key",
+            "spec": {
+                "password": str(base64.b64encode(bytes(json.dumps(encoded_pass), 'utf-8')))[2:-1]
+            }
+        }

{dtlpy-1.104.14.dist-info → dtlpy-1.105.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dtlpy
-Version: 1.104.14
+Version: 1.105.6
 Summary: SDK and CLI for Dataloop platform
 Home-page: https://github.com/dataloop-ai/dtlpy
 Author: Dataloop Team

{dtlpy-1.104.14.dist-info → dtlpy-1.105.6.dist-info}/RECORD

@@ -1,5 +1,5 @@
 dtlpy/__init__.py,sha256=GjtFPFltVerHF1m6ePaVp5oUWcg7yavd3aNhknTip9U,20961
-dtlpy/__version__.py,sha256=8icSzD7njprR8T5cT8Ln6LVjJOYZ676Khcka9zFX7q0,21
+dtlpy/__version__.py,sha256=RkZdRrLtjnqMBrfIPP4HgsEaxdXnqqxv1qVlCI1mifo,20
 dtlpy/exceptions.py,sha256=EQCKs3pwhwZhgMByQN3D3LpWpdxwcKPEEt-bIaDwURM,2871
 dtlpy/new_instance.py,sha256=u_c6JtgqsKCr7TU24-g7_CaST9ghqamMhM4Z0Zxt50w,10121
 dtlpy/assets/__init__.py,sha256=D_hAa6NM8Zoy32sF_9b7m0b7I-BQEyBFg8-9Tg2WOeo,976
@@ -73,7 +73,7 @@ dtlpy/entities/links.py,sha256=FAmEwHtsrqKet3c0UHH9u_gHgG6_OwF1-rl4xK7guME,2516
 dtlpy/entities/message.py,sha256=ApJuaKEqxATpXjNYUjGdYPu3ibQzEMo8-LtJ_4xAcPI,5865
 dtlpy/entities/model.py,sha256=YwjIi3MxAZoyartTvqx_qhtDKQe6zVsQuwZbYLygMxU,26898
 dtlpy/entities/node.py,sha256=yPPYDLtNMc6vZbbf4FIffY86y7tkaTvYm42Jb7k3Ofk,39617
-dtlpy/entities/ontology.py,sha256=N5bsnNUfWNN49WV8lGQL8QRxbKfCZyV-rDyTlGByUrw,31987
+dtlpy/entities/ontology.py,sha256=924g9c2ZTfr69fWd_ejrVU0C-MAUR8UAhhz6GY-IQME,32100
 dtlpy/entities/organization.py,sha256=Zm-tTHV82PvYyTNetRRXqvmvzBCbXEwS-gAENf7Zny4,9874
 dtlpy/entities/package.py,sha256=QSDePHlp4ik19aUE3dAUC7edh0oUUVjzSmMG867avc4,26363
 dtlpy/entities/package_defaults.py,sha256=wTD7Z7rGYjVy8AcUxTFEnkOkviiJaLVZYvduiUBKNZo,211
@@ -164,7 +164,7 @@ dtlpy/repositories/codebases.py,sha256=pvcZxdrq0-zWysVbdXjUOhnfcF6hJD8v5VclNZ-zh
 dtlpy/repositories/collections.py,sha256=C_BPMg128Sl9AG3U4PxgI_2aaehQ2NuehMmzoTaXbPQ,11459
 dtlpy/repositories/commands.py,sha256=i6gQgOmRDG8ixqKU7672H3CvGt8VLT3ihDVfri1eWWc,5610
 dtlpy/repositories/compositions.py,sha256=H417BvlQAiWr5NH2eANFke6CfEO5o7DSvapYpf7v5Hk,2150
-dtlpy/repositories/computes.py,sha256=EtfE_3JhTdNlSYDPkKXBFkq-DBl4sgQqIm50ajvFdWM,9976
+dtlpy/repositories/computes.py,sha256=l0-FS3_8WEGG5tbtIR3ltsZc6MyHVkiYajHTCaeUugk,10156
 dtlpy/repositories/datasets.py,sha256=SpG86uToq-E5nVHMwHgWx6VwwwkgfYo8x5vZ0WA3Ouw,56546
 dtlpy/repositories/downloader.py,sha256=CiT8KIjJ8l52Ng003f2_bmolIpe64fi8A_GGEl39M1Y,44254
 dtlpy/repositories/dpks.py,sha256=dglvaiSFBvEithhlQ0RAXwzTxoZaICONs-owx3e2nfU,17848
@@ -172,7 +172,7 @@ dtlpy/repositories/drivers.py,sha256=fF0UuHCyBzop8pHfryex23mf0kVFAkqzNdOmwBbaWxY
 dtlpy/repositories/executions.py,sha256=4UoU6bnB3kl5cMuF1eJvDecfZCaB06gKWxPfv6_g1_k,32598
 dtlpy/repositories/feature_sets.py,sha256=UowMDAl_CRefRB5oZzubnsjU_OFgiPPdQXn8q2j4Kuw,9666
 dtlpy/repositories/features.py,sha256=A_RqTJxzjTh-Wbm0uXaoTNyHSfCLbeiH38iB11p2ifY,9915
-dtlpy/repositories/integrations.py,sha256=dBTgvT8WgzNx3f7RuXxk1Or3jwj8XaBXfAVCSYUw-hI,14122
+dtlpy/repositories/integrations.py,sha256=sWij_MbxeAlCs3uDRGGKPX__T-h_mVppe4bErkCGIyM,14102
 dtlpy/repositories/items.py,sha256=AF8h7-Yje1p16nXyofNLiC92bRVZtZjtHRPvHwbW62w,38423
 dtlpy/repositories/messages.py,sha256=QU0Psckg6CA_Tlw9AVxqa-Ay1fRM4n269sSIJkH9o7E,3066
 dtlpy/repositories/models.py,sha256=IekNMcnuKVaAVTJf2AJv6YvX5qCd9kkSl4ETPMWP4Zc,38213
@@ -224,19 +224,19 @@ dtlpy/utilities/reports/report.py,sha256=3nEsNnIWmdPEsd21nN8vMMgaZVcPKn9iawKTTeO
 dtlpy/utilities/videos/__init__.py,sha256=SV3w51vfPuGBxaMeNemx6qEMHw_C4lLpWNGXMvdsKSY,734
 dtlpy/utilities/videos/video_player.py,sha256=LCxg0EZ_DeuwcT7U_r7MRC6Q19s0xdFb7x5Gk39PRms,24072
 dtlpy/utilities/videos/videos.py,sha256=Dj916B4TQRIhI7HZVevl3foFrCsPp0eeWwvGbgX3-_A,21875
-dtlpy-1.104.14.data/scripts/dlp,sha256=-F0vSCWuSOOtgERAtsPMPyMmzitjhB7Yeftg_PDlDjw,10
-dtlpy-1.104.14.data/scripts/dlp.bat,sha256=QOvx8Dlx5dUbCTMpwbhOcAIXL1IWmgVRSboQqDhIn3A,37
-dtlpy-1.104.14.data/scripts/dlp.py,sha256=tEokRaDINISXnq8yNx_CBw1qM5uwjYiZoJOYGqWB3RU,4267
+dtlpy-1.105.6.data/scripts/dlp,sha256=-F0vSCWuSOOtgERAtsPMPyMmzitjhB7Yeftg_PDlDjw,10
+dtlpy-1.105.6.data/scripts/dlp.bat,sha256=QOvx8Dlx5dUbCTMpwbhOcAIXL1IWmgVRSboQqDhIn3A,37
+dtlpy-1.105.6.data/scripts/dlp.py,sha256=tEokRaDINISXnq8yNx_CBw1qM5uwjYiZoJOYGqWB3RU,4267
 tests/assets/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/assets/models_flow/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/assets/models_flow/failedmain.py,sha256=n8F4eu_u7JPrJ1zedbJPvv9e3lHb3ihoErqrBIcseEc,1847
 tests/assets/models_flow/main.py,sha256=vnDKyVZaae2RFpvwS22Hzi6Dt2LJerH4yQrmKtaT8_g,2123
 tests/assets/models_flow/main_model.py,sha256=Hl_tv7Q6KaRL3yLkpUoLMRqu5-ab1QsUYPL6RPEoamw,2042
 tests/features/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tests/features/environment.py,sha256=oAO7H7j7Y7czW0t25Gv1KwI2-ofqhZVkbCw9LbZCp4Y,17506
-dtlpy-1.104.14.dist-info/LICENSE,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
-dtlpy-1.104.14.dist-info/METADATA,sha256=mi9gvTj2NQ8iLtxyNWolKjx2irfR01Yl49eZ6xQpNeM,3020
-dtlpy-1.104.14.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-dtlpy-1.104.14.dist-info/entry_points.txt,sha256=C4PyKthCs_no88HU39eioO68oei64STYXC2ooGZTc4Y,43
-dtlpy-1.104.14.dist-info/top_level.txt,sha256=ZWuLmQGUOtWAdgTf4Fbx884w1o0vBYq9dEc1zLv9Mig,12
-dtlpy-1.104.14.dist-info/RECORD,,
+tests/features/environment.py,sha256=TMeUzSZkksHqbxNBDLk-LYBMD4G5dMo4ZLZXPwQImVE,18751
+dtlpy-1.105.6.dist-info/LICENSE,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
+dtlpy-1.105.6.dist-info/METADATA,sha256=cB65EU8nW0Ju7hoUi4qtuoZ37dQcofrvBcf1rs0D-ww,3019
+dtlpy-1.105.6.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+dtlpy-1.105.6.dist-info/entry_points.txt,sha256=C4PyKthCs_no88HU39eioO68oei64STYXC2ooGZTc4Y,43
+dtlpy-1.105.6.dist-info/top_level.txt,sha256=ZWuLmQGUOtWAdgTf4Fbx884w1o0vBYq9dEc1zLv9Mig,12
+dtlpy-1.105.6.dist-info/RECORD,,

tests/features/environment.py

@@ -282,6 +282,11 @@ def after_tag(context, tag):
             use_fixture(restore_json_file, context)
         except Exception:
             logging.exception('Failed to restore json file')
+    elif tag == 'compute_serviceDriver.delete':
+        try:
+            use_fixture(delete_compute_servicedriver, context)
+        except Exception:
+            logging.exception('Failed to delete service')
     elif tag == 'frozen_dataset':
         pass
     elif 'testrail-C' in tag:
@@ -504,7 +509,36 @@ def models_delete(context):
     assert all_deleted
 
 
+def delete_compute_servicedriver(context):
+    if not hasattr(context, 'to_delete_computes_ids') and not hasattr(context, 'to_delete_service_drivers_ids'):
+        return
+
+    all_deleted = True
+    for service_driver_id in context.to_delete_service_drivers_ids:
+        try:
+            context.dl.service_drivers.delete(service_driver_id=service_driver_id)
+        except context.dl.exceptions.NotFound:
+            pass
+        except:
+            all_deleted = False
+            logging.exception('Failed deleting serviceDriver: {}'.format(service_driver_id))
+    assert all_deleted
+
+    all_deleted = True
+    for compute_id in context.to_delete_computes_ids:
+        try:
+            context.dl.computes.delete(compute_id=compute_id)
+        except context.dl.exceptions.NotFound:
+            pass
+        except:
+            all_deleted = False
+            logging.exception('Failed deleting compute: {}'.format(compute_id))
+    assert all_deleted
+
+
 def restore_json_file(context):
+    if not hasattr(context.feature, 'dataloop_feature_project'):
+        return
     if not hasattr(context, 'backup_path') or not hasattr(context, 'original_path'):
         assert False, 'Please make sure to set the original_path and backup_path in the context'
         # Restore the file from the backup