dtlpy 1.90.37__py3-none-any.whl → 1.90.39__py3-none-any.whl

dtlpy/__version__.py

@@ -1 +1 @@
-version = '1.90.37'
+version = '1.90.39'

dtlpy/entities/base_entity.py

@@ -1,4 +1,3 @@
-import typing_extensions
 import functools
 import logging
 import enum

dtlpy/services/api_client.py

@@ -981,7 +981,7 @@ class ApiClient:
 
         # prepare request
         if is_dataloop:
-            full_url = self.environment + path
+            full_url = self.__base_gate_url + path
             headers_req = self._build_request_headers(headers=headers)
         else:
             full_url = path
@@ -1018,7 +1018,7 @@ class ApiClient:
                                    timeout=timeout) as session:
                 try:
                     async with session._request(request=session._client.request,
-                                                url=self.environment + path,
+                                                url=self.__base_gate_url + path,
                                                 method=req_type,
                                                 json=json_req,
                                                 data=data,
@@ -1135,7 +1135,7 @@ class ApiClient:
                 form.add_field('file', AsyncUploadStream(buffer=to_upload,
                                                          callback=callback,
                                                          name=uploaded_filename))
-                url = '{}?mode={}'.format(self.environment + remote_url, mode)
+                url = '{}?mode={}'.format(self.__base_gate_url + remote_url, mode)
 
                 # use SSL context
                 ssl_context = None

{dtlpy-1.90.37.dist-info → dtlpy-1.90.39.dist-info}/METADATA

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

{dtlpy-1.90.37.dist-info → dtlpy-1.90.39.dist-info}/RECORD

@@ -1,5 +1,5 @@
 dtlpy/__init__.py,sha256=pJiyuUv6L9bWnW1vcknHAjYP-pouMCYzzexyDKxELoI,20127
-dtlpy/__version__.py,sha256=1qj3PS0_EjKdBgEzjxUCdo97julDX9MXnun0P6V3QAE,20
+dtlpy/__version__.py,sha256=BcmejWGgARVAkaNKsamesQsOmoijL9t0WK_6O0DCjuU,20
 dtlpy/exceptions.py,sha256=EQCKs3pwhwZhgMByQN3D3LpWpdxwcKPEEt-bIaDwURM,2871
 dtlpy/new_instance.py,sha256=_-F1NTJgGCCHnW68eIexwq7leLGTCHcPxodbw9mfasI,5555
 dtlpy/assets/__init__.py,sha256=D_hAa6NM8Zoy32sF_9b7m0b7I-BQEyBFg8-9Tg2WOeo,976
@@ -55,7 +55,7 @@ dtlpy/entities/app.py,sha256=7i7xDRnyN2PgJ_oUNfhkTh7CxRHaXf-uGS2eX_DjAAg,6295
 dtlpy/entities/app_module.py,sha256=0UiAbBX1q8iEImi3nY7ySWZZHoRRwu0qUXmyXmgVAc4,3645
 dtlpy/entities/artifact.py,sha256=wtLtBuidOPbnba0ok40JyunCCIBGbAl4bP_ebK39Kk4,5711
 dtlpy/entities/assignment.py,sha256=LTUxE2ZB5iZSbSeoroHe5P7Kv6E_K2b5cdY-7TZ4HFE,14346
-dtlpy/entities/base_entity.py,sha256=i8VzoXdkkJbUJD7U7U-bkbQKiUWkRwZZhl-mQT5WUsc,7578
+dtlpy/entities/base_entity.py,sha256=II40doslcKJ97wtTIwhSYCNA9Lqvb5Y9LkiYNIdqDpM,7553
 dtlpy/entities/bot.py,sha256=is3NUCnPg56HSjsHIvFcVkymValMqDV0uHRDC1Ib-ds,3819
 dtlpy/entities/codebase.py,sha256=pwRkAq2GV0wvmzshg89IAmE-0I2Wsy_-QNOu8OV8uqc,8999
 dtlpy/entities/command.py,sha256=dv7w0GfTqq4OeLUoAUElYCdOrvE2Lp9Cx-XdA9N4314,4976
@@ -194,7 +194,7 @@ dtlpy/repositories/uploader.py,sha256=PzEq4yHsxJT1lv_wYGS-gh7Wmu37TA-14ww_r-6HBr
 dtlpy/repositories/webhooks.py,sha256=IIpxOJ-7KeQp1TY9aJZz-FuycSjAoYx0TDk8z86KAK8,9033
 dtlpy/services/__init__.py,sha256=VfVJy2otIrDra6i7Sepjyez2ujiE6171ChQZp-YgxsM,904
 dtlpy/services/aihttp_retry.py,sha256=tgntZsAY0dW9v08rkjX1T5BLNDdDd8svtgn7nH8DSGU,5022
-dtlpy/services/api_client.py,sha256=u2cp3clDsR9X7Rn_pW82dxSJKWGjHpAifSBWZFGE-2Q,66115
+dtlpy/services/api_client.py,sha256=bMmLKQ0BbzLzEsEcZe-RSADjkRjTEoWJiQIQvo8h2L4,66127
 dtlpy/services/api_reference.py,sha256=cW-B3eoi9Xs3AwI87_Kr6GV_E6HPoC73aETFaGz3A-0,1515
 dtlpy/services/async_utils.py,sha256=lfpkTkRUvQoMTxaRZBHbPt5e43qdvpCGDe_-KcY2Jps,2810
 dtlpy/services/calls_counter.py,sha256=gr0io5rIsO5-7Cgc8neA1vK8kUtYhgFPmDQ2jXtiZZs,1036
@@ -222,14 +222,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.90.37.data/scripts/dlp,sha256=-F0vSCWuSOOtgERAtsPMPyMmzitjhB7Yeftg_PDlDjw,10
-dtlpy-1.90.37.data/scripts/dlp.bat,sha256=QOvx8Dlx5dUbCTMpwbhOcAIXL1IWmgVRSboQqDhIn3A,37
-dtlpy-1.90.37.data/scripts/dlp.py,sha256=tEokRaDINISXnq8yNx_CBw1qM5uwjYiZoJOYGqWB3RU,4267
+dtlpy-1.90.39.data/scripts/dlp,sha256=-F0vSCWuSOOtgERAtsPMPyMmzitjhB7Yeftg_PDlDjw,10
+dtlpy-1.90.39.data/scripts/dlp.bat,sha256=QOvx8Dlx5dUbCTMpwbhOcAIXL1IWmgVRSboQqDhIn3A,37
+dtlpy-1.90.39.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=87O3-JaWcC6m_kA39sqPhX70_VCBzzbLWmX2YQFilJw,1873
+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=V0FuAjbwiN1ddlJrCjjGSgPrU9TEQWraZkp1E7QDzdQ,13849
-dtlpy-1.90.37.dist-info/LICENSE,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
-dtlpy-1.90.37.dist-info/METADATA,sha256=spLXXrJqRARvSiL5MpaflToCFrKek87S0TudPLNfXr4,2976
-dtlpy-1.90.37.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-dtlpy-1.90.37.dist-info/entry_points.txt,sha256=C4PyKthCs_no88HU39eioO68oei64STYXC2ooGZTc4Y,43
-dtlpy-1.90.37.dist-info/top_level.txt,sha256=ZWuLmQGUOtWAdgTf4Fbx884w1o0vBYq9dEc1zLv9Mig,12
-dtlpy-1.90.37.dist-info/RECORD,,
+dtlpy-1.90.39.dist-info/LICENSE,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
+dtlpy-1.90.39.dist-info/METADATA,sha256=Lbu5Y6VhyT-lUBvB0W3mhwE9MVt1DWrRu-sBbZMY2tI,2976
+dtlpy-1.90.39.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+dtlpy-1.90.39.dist-info/entry_points.txt,sha256=C4PyKthCs_no88HU39eioO68oei64STYXC2ooGZTc4Y,43
+dtlpy-1.90.39.dist-info/top_level.txt,sha256=ZWuLmQGUOtWAdgTf4Fbx884w1o0vBYq9dEc1zLv9Mig,12
+dtlpy-1.90.39.dist-info/RECORD,,

tests/assets/models_flow/failedmain.py

@@ -0,0 +1,52 @@
+import time
+
+import dtlpy as dl
+import logging
+import os
+import random
+
+logger = logging.getLogger('dummy-adapter')
+
+
+@dl.Package.decorators.module(name='model-adapter',
+                              description='Model Adapter for Dummy Model',
+                              init_inputs={'model_entity': dl.Model})
+class ModelAdapter(dl.BaseModelAdapter):
+    """
+    Dummy Model adapter using pytorch.
+    The class bind Dataloop model and model entities with model code implementation
+    """
+
+    def __init__(self, model_entity=None):
+        super(ModelAdapter, self).__init__(model_entity=model_entity)
+
+    def load(self, local_path, **kwargs):
+        logger.info("Loaded model")
+
+    def save(self, local_path, **kwargs):
+        logger.info("Saved model")
+
+    def train(self, data_path, output_path, **kwargs):
+        logger.info("training")
+        raise Exception("Failed to train")
+
+    def predict(self, batch, **kwargs):
+        batch_annotations = list()
+
+        for img in batch:
+            collection = dl.AnnotationCollection()
+            for index in range(5):
+                collection.add(
+                    annotation_definition=dl.Box(label=self.model_entity.labels[index], top=index * 10, left=index * 10,
+                                                 bottom=index * 10 + 10, right=index * 10 + 10),
+                    model_info={'name': "test-model",
+                                'confidence': 0.5,
+                                'model_id': self.model_entity.id,
+                                'dataset_id': self.model_entity.dataset_id})
+                logger.debug("Predicted {} ({})".format(str(index), index * 0.1))
+            batch_annotations.append(collection)
+
+        return batch_annotations
+
+    def convert_from_dtlpy(self, data_path, **kwargs):
+        logger.info("convert_from_dtlpy")

tests/assets/models_flow/main.py

@@ -0,0 +1,51 @@
+import dtlpy as dl
+import logging
+import os
+import random
+
+logger = logging.getLogger('dummy-adapter')
+
+
+@dl.Package.decorators.module(name='model-adapter',
+                              description='Model Adapter for Dummy Model',
+                              init_inputs={'model_entity': dl.Model})
+class ModelAdapter(dl.BaseModelAdapter):
+    """
+    Dummy Model adapter using pytorch.
+    The class bind Dataloop model and model entities with model code implementation
+    """
+
+    def __init__(self, model_entity=None):
+        super(ModelAdapter, self).__init__(model_entity=model_entity)
+
+    def load(self, local_path, **kwargs):
+        logger.info("Loaded model")
+
+    def save(self, local_path, **kwargs):
+        logger.info("Saved model")
+
+    def train(self, data_path, output_path, **kwargs):
+        logger.info("model training")
+        print(self.model_entity.id)
+
+    def predict(self, batch, **kwargs):
+        logger.info("model prediction")
+        batch_annotations = list()
+
+        for img in batch:
+            collection = dl.AnnotationCollection()
+            for index in range(5):
+                collection.add(
+                    annotation_definition=dl.Box(label=self.model_entity.labels[index], top=index * 10, left=index * 10,
+                                                 bottom=index * 10 + 10, right=index * 10 + 10),
+                    model_info={'name': "test-model",
+                                'confidence': 0.5,
+                                'model_id': self.model_entity.id,
+                                'dataset_id': self.model_entity.dataset_id})
+                logger.debug("Predicted {} ({})".format(str(index), index * 0.1))
+            batch_annotations.append(collection)
+
+        return batch_annotations
+
+    def convert_from_dtlpy(self, data_path, **kwargs):
+        logger.info("convert_from_dtlpy")

tests/assets/models_flow/main_model.py

@@ -0,0 +1,54 @@
+import dtlpy as dl
+import logging
+import os
+import random
+
+logger = logging.getLogger('dummy-adapter')
+
+
+@dl.Package.decorators.module(name='model-adapter',
+                              description='Model Adapter for Dummy Model',
+                              init_inputs={'model_entity': dl.Model, "test": "String"})
+class ModelAdapter(dl.BaseModelAdapter):
+    """
+    Dummy Model adapter using pytorch.
+    The class bind Dataloop model and model entities with model code implementation
+    """
+
+    def __init__(self, test, model_entity=None):
+        super(ModelAdapter, self).__init__(model_entity=model_entity)
+        self.test = test
+
+    def load(self, local_path, **kwargs):
+        logger.info("Loaded model")
+
+    def save(self, local_path, **kwargs):
+        logger.info("Saved model")
+
+    def train(self, data_path, output_path, **kwargs):
+        if self.test != 'default_value':
+            raise ValueError(f"test is not set to default_value: {self.test}")
+        logger.info("model training")
+        print(self.model_entity.id)
+
+    def predict(self, batch, **kwargs):
+        logger.info("model prediction")
+        batch_annotations = list()
+
+        for img in batch:
+            collection = dl.AnnotationCollection()
+            for index in range(5):
+                collection.add(
+                    annotation_definition=dl.Box(label=self.model_entity.labels[index], top=index * 10, left=index * 10,
+                                                 bottom=index * 10 + 10, right=index * 10 + 10),
+                    model_info={'name': "test-model",
+                                'confidence': 0.5,
+                                'model_id': self.model_entity.id,
+                                'dataset_id': self.model_entity.dataset_id})
+                logger.debug("Predicted {} ({})".format(str(index), index * 0.1))
+            batch_annotations.append(collection)
+
+        return batch_annotations
+
+    def convert_from_dtlpy(self, data_path, **kwargs):
+        logger.info("convert_from_dtlpy")