dtlpy 1.112.9__py3-none-any.whl → 1.113.10__py3-none-any.whl

dtlpy/__version__.py

@@ -1 +1 @@
-version = '1.112.9'
+version = '1.113.10'

dtlpy/entities/compute.py

@@ -12,6 +12,7 @@ class ClusterProvider(str, Enum):
     HPC = 'hpc'
     LOCAL = 'local'
     RANCHER_K3S = 'rancher-k3s'
+    RANCHER_RKE = 'rancher-rke'
 
 
 class ComputeType(str, Enum):
@@ -327,8 +328,8 @@ class Compute:
             self._computes = repositories.Computes(client_api=self._client_api)
         return self._computes
 
-    def delete(self):
-        return self.computes.delete(compute_id=self.id)
+    def delete(self, skip_destroy: bool = False):
+        return self.computes.delete(compute_id=self.id, skip_destroy=skip_destroy)
 
     def update(self):
         return self.computes.update(compute=self)

dtlpy/entities/model.py

@@ -101,6 +101,7 @@ class Model(entities.BaseEntity):
     scope = attr.ib()
     version = attr.ib()
     context = attr.ib()
+    status_logs = attr.ib()
 
     # name change
     package_id = attr.ib(repr=False)
@@ -199,7 +200,8 @@ class Model(entities.BaseEntity):
             output_type=_json.get('outputType', None),
             module_name=_json.get('moduleName', None),
             updated_by=_json.get('updatedBy', None),
-            app=_json.get('app', None)
+            app=_json.get('app', None),
+            status_logs=_json.get('statusLogs', []),
         )
         inst.is_fetched = is_fetched
         return inst
@@ -229,7 +231,8 @@ class Model(entities.BaseEntity):
                                                         attr.fields(Model).input_type,
                                                         attr.fields(Model).output_type,
                                                         attr.fields(Model).updated_by,
-                                                        attr.fields(Model).app
+                                                        attr.fields(Model).app,
+                                                        attr.fields(Model).status_logs
                                                         ))
         _json['packageId'] = self.package_id
         _json['datasetId'] = self.dataset_id
@@ -253,6 +256,8 @@ class Model(entities.BaseEntity):
             _json['updatedBy'] = self.updated_by
         if self.app:
             _json['app'] = self.app
+        if self.status_logs:
+            _json['statusLogs'] = self.status_logs
 
         return _json
 
@@ -295,7 +300,10 @@ class Model(entities.BaseEntity):
     def package(self):
         if self._package is None:
             try:
-                self._package = self.packages.get(package_id=self.package_id)
+                if self.app:
+                    self._package = self.dpks.get_revisions(dpk_id=self.app['dpkId'], version=self.app['dpkVersion'])
+                else:
+                    self._package = self.packages.get(package_id=self.package_id)
             except Exception as e:
                 error = e
                 try:

dtlpy/entities/paged_entities.py

@@ -141,8 +141,14 @@ class PagedEntities:
             FiltersResource.FEATURE,
         ]
 
+        prepared= req.prepare()
+        sort_spec= prepared.get("sort", {})
+        sort_dir= next(iter(sort_spec.values()), None)
+        order= sort_dir or FiltersOrderByDirection.ASCENDING
+        operator_value = (FiltersOperations.LESS_THAN if sort_dir == FiltersOrderByDirection.DESCENDING else FiltersOperations.GREATER_THAN)
+
         if enable_hybrid and not self._has_explicit_sort(req):
-            req.sort_by(field="id", value=FiltersOrderByDirection.ASCENDING)
+            req.sort_by(field="id", value=order)
 
         if enable_hybrid and self.use_id_based_paging:
             req.page = 0
@@ -150,7 +156,7 @@ class PagedEntities:
                 req.add(
                     field="id",
                     values=self.last_seen_id,
-                    operator=FiltersOperations.GREATER_THAN,
+                    operator=operator_value,
                     method=FiltersOperations.AND,
                 )
         else:
@@ -165,7 +171,7 @@ class PagedEntities:
                 req.add(
                     field="id",
                     values=after_id or self.last_seen_id,
-                    operator=FiltersOperations.GREATER_THAN,
+                    operator=operator_value,
                     method=FiltersOperations.AND,
                 )
                 self.use_id_based_paging = True

dtlpy/ml/base_model_adapter.py

@@ -693,8 +693,6 @@ class BaseModelAdapter(utilities.BaseServiceRunner):
             if output_path is not None:
                 self.save_to_model(local_path=output_path, replace=True)
             logger.info('Execution failed. Setting model.status to failed')
-            model.status = 'failed'
-            model.update()
             raise
         return model
 

dtlpy/repositories/computes.py

@@ -10,6 +10,7 @@ from typing import List, Optional, Dict
 from ..entities import ComputeCluster, ComputeContext, ComputeType
 from ..entities.integration import IntegrationType
 import logging
+from urllib.parse import urlparse, urlencode, parse_qs, urlunparse
 
 logger = logging.getLogger(name='dtlpy')
 
@@ -209,17 +210,25 @@ class Computes:
 
         return compute
 
-    def delete(self, compute_id: str):
+    def delete(self, compute_id: str, skip_destroy: bool = False
+):
         """
         Delete a compute
 
         :param compute_id: compute ID
+        :param skip_destroy: bool
         """
-
+        url_path = self._base_url + '/{}'.format(compute_id)
+        params_to_add = {"skipDestroy": "true" if skip_destroy else "false" }
+        parsed_url = urlparse(url_path)
+        query_dict = parse_qs(parsed_url.query)
+        query_dict.update(params_to_add)
+        new_query = urlencode(query_dict, doseq=True)
+        url_path = urlunparse(parsed_url._replace(query=new_query))
         # request
         success, response = self._client_api.gen_request(
             req_type='delete',
-            path=self._base_url + '/{}'.format(compute_id)
+            path=url_path
         )
 
         if not success:

{dtlpy-1.112.9.dist-info → dtlpy-1.113.10.dist-info}/METADATA

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

{dtlpy-1.112.9.dist-info → dtlpy-1.113.10.dist-info}/RECORD

@@ -1,5 +1,5 @@
 dtlpy/__init__.py,sha256=-5fpi-yAwFdluh8QZ-sWXwNDCD97Q5BCgIs7pUDl04o,20444
-dtlpy/__version__.py,sha256=XIkrZL_C-sKZYUlGAHoBjRZoQrldqJ58ORqW_bv34Rg,20
+dtlpy/__version__.py,sha256=AHVPkR4bml10NDAI863smQZmEgiJXZehmC3rrJ_8d9I,21
 dtlpy/exceptions.py,sha256=EQCKs3pwhwZhgMByQN3D3LpWpdxwcKPEEt-bIaDwURM,2871
 dtlpy/new_instance.py,sha256=tUCzBGaSpm9GTjRuwOkFgo3A8vopUQ-baltdJss3XlI,9964
 dtlpy/assets/__init__.py,sha256=D_hAa6NM8Zoy32sF_9b7m0b7I-BQEyBFg8-9Tg2WOeo,976
@@ -56,7 +56,7 @@ dtlpy/entities/bot.py,sha256=is3NUCnPg56HSjsHIvFcVkymValMqDV0uHRDC1Ib-ds,3819
 dtlpy/entities/codebase.py,sha256=pwRkAq2GV0wvmzshg89IAmE-0I2Wsy_-QNOu8OV8uqc,8999
 dtlpy/entities/collection.py,sha256=FPPPfIxOsBG1ujORPJVq8uXyF8vhIqC6N4EiI9SJzl0,1160
 dtlpy/entities/command.py,sha256=5RMQYjOGLRF8JZd7QFAPyE8utsp4eZzLApI2dEAbaqo,5301
-dtlpy/entities/compute.py,sha256=U974uaXGCfr-TSHqPmyLeJWbwbO-3K082hS1Scapv8M,14497
+dtlpy/entities/compute.py,sha256=OdlCagVR-rh5IeHsUq1EtBq001_kFMwInCJdZNHh8G0,14584
 dtlpy/entities/dataset.py,sha256=GEvBOly1M8uU--apQZ-G-78DJZzFk178LmMhEANyi0A,53838
 dtlpy/entities/directory_tree.py,sha256=Rni6pLSWytR6yeUPgEdCCRfTg_cqLOdUc9uCqz9KT-Q,1186
 dtlpy/entities/dpk.py,sha256=XrK8X8p4Ag6LMjDrDpMstY-h_yTll_sMmKTZT6bLbWE,17923
@@ -71,7 +71,7 @@ dtlpy/entities/item.py,sha256=WCIPHUmubIe0wva-YMm-LPQdn2S3_-Q151x49C9NEw8,34591
 dtlpy/entities/label.py,sha256=ycDYavIgKhz806plIX-64c07_TeHpDa-V7LnfFVe4Rg,3869
 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/model.py,sha256=j7mLY38Tl2jTLfdHFOqcctb655u7drWkGc8l2CWtbyE,27321
 dtlpy/entities/node.py,sha256=RiCqG659Pb1PZNMewR-F7eNbU5tt713fiZY9xW6-Pes,39199
 dtlpy/entities/ontology.py,sha256=924g9c2ZTfr69fWd_ejrVU0C-MAUR8UAhhz6GY-IQME,32100
 dtlpy/entities/organization.py,sha256=Zm-tTHV82PvYyTNetRRXqvmvzBCbXEwS-gAENf7Zny4,9874
@@ -80,7 +80,7 @@ dtlpy/entities/package_defaults.py,sha256=wTD7Z7rGYjVy8AcUxTFEnkOkviiJaLVZYvduiU
 dtlpy/entities/package_function.py,sha256=M42Kvw9A8b6msAkv-wRNAQg_-UC2bejniCjeKDugudc,6314
 dtlpy/entities/package_module.py,sha256=cOkIITATkzzCQpE0sdPiBUisAz8ImlPG2YGZ0K7SypA,5151
 dtlpy/entities/package_slot.py,sha256=XBwCodQe618sQm0bmx46Npo94mEk-zUV7ZX0mDRcsD8,3946
-dtlpy/entities/paged_entities.py,sha256=ffw0CbLcOTNDYLQA9gqmjSaTZLRYP_tMnSfa_BmGIyk,8145
+dtlpy/entities/paged_entities.py,sha256=AZNHyN5dhaZvtiYCkZsKZfJkmYHonWDBvM560zuC-TE,8419
 dtlpy/entities/pipeline.py,sha256=JtWGoCUhVszOVkBNK43fbTt446fkND4wH-Y-fN_llww,20851
 dtlpy/entities/pipeline_execution.py,sha256=EQhW4W_G1bIPShYbJSAT--1WNQuvxVQbcQ_MCHIX0KI,9938
 dtlpy/entities/project.py,sha256=ZUx8zA3mr6N145M62R3UDPCCzO1vxfyWO6vjES-bO-g,14653
@@ -149,7 +149,7 @@ dtlpy/miscellaneous/list_print.py,sha256=fBGTMXFUwDG8DD4W6HyR8BTGtbTckLf4W09quNR
 dtlpy/miscellaneous/zipping.py,sha256=JplTc8UDFvO8WaD5vKuumVLN0lU_-GtHoE0doWKtmKg,5383
 dtlpy/ml/__init__.py,sha256=vPkyXpc9kcWWZ_PxyPEOsjKBJdEbowLkZr8FZIb_OBM,799
 dtlpy/ml/base_feature_extractor_adapter.py,sha256=iiEGYAx0Rdn4K46H_FlKrAv3ebTXHSxNVAmio0BxhaI,1178
-dtlpy/ml/base_model_adapter.py,sha256=E7OktF1WbquvgyZixvPkyq7QW0ID3VF9tevXlwpmnuY,51216
+dtlpy/ml/base_model_adapter.py,sha256=Sdrg68BLwHocvk74QUYatUgA6iv8Xhql8muX2PoF2z8,51153
 dtlpy/ml/metrics.py,sha256=BG2E-1Mvjv2e2No9mIJKVmvzqBvLqytKcw3hA7wVUNc,20037
 dtlpy/ml/predictions_utils.py,sha256=He_84U14oS2Ss7T_-Zj5GDiBZwS-GjMPURUh7u7DjF8,12484
 dtlpy/ml/summary_writer.py,sha256=dehDi8zmGC1sAGyy_3cpSWGXoGQSiQd7bL_Thoo8yIs,2784
@@ -165,7 +165,7 @@ dtlpy/repositories/codebases.py,sha256=pvcZxdrq0-zWysVbdXjUOhnfcF6hJD8v5VclNZ-zh
 dtlpy/repositories/collections.py,sha256=z-nkR33rq-MzkEff7DDSBlfsI_lkCDFwQZIlMaIT5rM,13514
 dtlpy/repositories/commands.py,sha256=MgXhXxbAzBa2QJM9Z5EsQZRaZ4fGBM17ALoldxi8xYA,5848
 dtlpy/repositories/compositions.py,sha256=H417BvlQAiWr5NH2eANFke6CfEO5o7DSvapYpf7v5Hk,2150
-dtlpy/repositories/computes.py,sha256=V8kVTwXc5lhxrp5e7zxTXvKcVKtg6crCqkL5zQHtKZo,14639
+dtlpy/repositories/computes.py,sha256=Q4maajELX1p2yyCSsflyZC2eVz7JBHgLsdcldnbG3JM,15125
 dtlpy/repositories/datasets.py,sha256=p0HBbTGrxAQ8h9tJsp1jRasPbwnMAtXQ4_sIef9_590,59358
 dtlpy/repositories/downloader.py,sha256=X5-vspCoTW7_QZuPdaZgOSTvM7jYU0Uf7o5PELZNY9g,45329
 dtlpy/repositories/dpks.py,sha256=dxZpGloZGH6MJG9ZFff5l3GlXw6i-52n9kxL-QiHosQ,18516
@@ -226,9 +226,9 @@ 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.112.9.data/scripts/dlp,sha256=-F0vSCWuSOOtgERAtsPMPyMmzitjhB7Yeftg_PDlDjw,10
-dtlpy-1.112.9.data/scripts/dlp.bat,sha256=QOvx8Dlx5dUbCTMpwbhOcAIXL1IWmgVRSboQqDhIn3A,37
-dtlpy-1.112.9.data/scripts/dlp.py,sha256=ZpfJvYE1_OTSorEYBphqTOutnHSb5TqOXh0y_mUCTJs,4393
+dtlpy-1.113.10.data/scripts/dlp,sha256=-F0vSCWuSOOtgERAtsPMPyMmzitjhB7Yeftg_PDlDjw,10
+dtlpy-1.113.10.data/scripts/dlp.bat,sha256=QOvx8Dlx5dUbCTMpwbhOcAIXL1IWmgVRSboQqDhIn3A,37
+dtlpy-1.113.10.data/scripts/dlp.py,sha256=ZpfJvYE1_OTSorEYBphqTOutnHSb5TqOXh0y_mUCTJs,4393
 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
@@ -236,9 +236,9 @@ tests/assets/models_flow/main.py,sha256=vnDKyVZaae2RFpvwS22Hzi6Dt2LJerH4yQrmKtaT
 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=ZZNSN8TObnNMkX0IQhSolAs_9I_V9hHFL_IZjG0jrGU,18909
-dtlpy-1.112.9.dist-info/LICENSE,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
-dtlpy-1.112.9.dist-info/METADATA,sha256=2C1bQeEFV6GqQlo05c8mbX3WL-lWjZbydg5CkrP739I,5469
-dtlpy-1.112.9.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-dtlpy-1.112.9.dist-info/entry_points.txt,sha256=C4PyKthCs_no88HU39eioO68oei64STYXC2ooGZTc4Y,43
-dtlpy-1.112.9.dist-info/top_level.txt,sha256=ZWuLmQGUOtWAdgTf4Fbx884w1o0vBYq9dEc1zLv9Mig,12
-dtlpy-1.112.9.dist-info/RECORD,,
+dtlpy-1.113.10.dist-info/LICENSE,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
+dtlpy-1.113.10.dist-info/METADATA,sha256=vyFPyK_u6Jdx3Fj5scfdLqseFuoQiqFAPk_WXSnYcl8,5470
+dtlpy-1.113.10.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+dtlpy-1.113.10.dist-info/entry_points.txt,sha256=C4PyKthCs_no88HU39eioO68oei64STYXC2ooGZTc4Y,43
+dtlpy-1.113.10.dist-info/top_level.txt,sha256=ZWuLmQGUOtWAdgTf4Fbx884w1o0vBYq9dEc1zLv9Mig,12
+dtlpy-1.113.10.dist-info/RECORD,,