dtlpy 1.101.8__py3-none-any.whl → 1.103.12__py3-none-any.whl

dtlpy/__version__.py

@@ -1 +1 @@
-version = '1.101.8'
+version = '1.103.12'

dtlpy/entities/annotation.py

@@ -421,7 +421,7 @@ class Annotation(entities.BaseEntity):
 
     @property
     def attributes(self):
-        if self._recipe_2_attributes or not self.annotation_definition.attributes:
+        if self._recipe_2_attributes or self.annotation_definition.attributes == []:
             return self._recipe_2_attributes
         return self.annotation_definition.attributes
 
@@ -1095,7 +1095,7 @@ class Annotation(entities.BaseEntity):
         if annotation_definition:
             res.annotation_definition = annotation_definition
 
-        if annotation_definition and annotation_definition.attributes:
+        if annotation_definition and annotation_definition.attributes is not None:
             res.attributes = annotation_definition.attributes
 
         return res
@@ -1679,7 +1679,7 @@ class FrameAnnotation(entities.BaseEntity):
 
     @property
     def attributes(self):
-        if self._recipe_2_attributes or not self.annotation_definition.attributes:
+        if self._recipe_2_attributes or self.annotation_definition.attributes == []:
             return self._recipe_2_attributes
         return self.annotation_definition.attributes
 
@@ -1873,6 +1873,9 @@ class FrameAnnotation(entities.BaseEntity):
             'data': self.coordinates
         }
 
+        if self.annotation_definition.description is not None:
+            snapshot_dict['description'] = self.annotation_definition.description
+
         if self.annotation._recipe_2_attributes:
             snapshot_dict['namedAttributes'] = self._recipe_2_attributes
         else:

dtlpy/entities/app.py

@@ -132,7 +132,7 @@ class App(entities.BaseEntity):
         return self.apps.pause(self)
 
     @staticmethod
-    def _protected_from_json(_json, client_api, project, is_fetched=True):
+    def _protected_from_json(_json, client_api, project=None, is_fetched=True):
         """
         Same as from_json but with try-except to catch if error
 
@@ -193,7 +193,7 @@ class App(entities.BaseEntity):
         return _json
 
     @classmethod
-    def from_json(cls, _json, client_api: ApiClient, project: entities.Project, is_fetched=True):
+    def from_json(cls, _json, client_api: ApiClient, project: entities.Project=None, is_fetched=True):
         app = cls(
             id=_json.get('id', None),
             name=_json.get('name', None),

dtlpy/entities/dataset.py

@@ -287,10 +287,8 @@ class Dataset(entities.BaseEntity):
                                        'ontologies', 'features', 'settings', 'schema'])
         if self._project is None:
             datasets = repositories.Datasets(client_api=self._client_api, project=self._project)
-            features = repositories.Features(client_api=self._client_api, project=self._project)
         else:
             datasets = self._project.datasets
-            features = self._project.features
 
         return reps(
             items=repositories.Items(client_api=self._client_api, dataset=self, datasets=datasets),
@@ -300,7 +298,7 @@ class Dataset(entities.BaseEntity):
             annotations=repositories.Annotations(client_api=self._client_api, dataset=self),
             datasets=datasets,
             ontologies=repositories.Ontologies(client_api=self._client_api, dataset=self),
-            features=features,
+            features=repositories.Features(client_api=self._client_api, project=self._project, dataset=self),
             settings=repositories.Settings(client_api=self._client_api, dataset=self),
             schema=repositories.Schema(client_api=self._client_api, dataset=self)
         )

dtlpy/entities/dpk.py

@@ -31,8 +31,8 @@ DEFAULT_STOPS = {SlotType.ITEM_VIEWER: {"type": "itemViewer",
 
 
 class Slot(entities.DlEntity):
-    type = entities.DlProperty(location=['type'], _type=str)
-    configuration = entities.DlProperty(location=['configuration'], _type=dict)
+    type: str = entities.DlProperty(location=['type'], _type=str)
+    configuration: dict = entities.DlProperty(location=['configuration'], _type=dict)
 
     def to_json(self) -> dict:
         return self._dict.copy()
@@ -59,10 +59,10 @@ class Toolbar(entities.DlEntity):
 
 
 class Panel(entities.DlEntity):
-    name = entities.DlProperty(location=['name'], _type=str)
-    path = entities.DlProperty(location=['path'], _type=str, default=None)
-    min_role = entities.DlProperty(location=['minRole'], _type=list)
-    supported_slots = entities.DlProperty(location=['supportedSlots'], _type=list)
+    name: str = entities.DlProperty(location=['name'], _type=str)
+    path: str = entities.DlProperty(location=['path'], _type=str, default=None)
+    min_role: list = entities.DlProperty(location=['minRole'], _type=list)
+    supported_slots: list = entities.DlProperty(location=['supportedSlots'], _type=list)
 
     metadata = entities.DlProperty(location=['metadata'], _type=list)
     default_settings = entities.DlProperty(location=['defaultSettings'], _type=list)
@@ -233,15 +233,15 @@ class Dpk(entities.DlEntity):
     base_id: str = entities.DlProperty(location=['baseId'], _type=str)
     name: str = entities.DlProperty(location=['name'], _type=str)
     version: str = entities.DlProperty(location=['version'], _type=str)
-    attributes: list = entities.DlProperty(location=['attributes'], _type=dict)
+    attributes: dict = entities.DlProperty(location=['attributes'], _type=dict)
     created_at: str = entities.DlProperty(location=['createdAt'], _type=str)
     updated_at: str = entities.DlProperty(location=['updatedAt'], _type=str)
     creator: str = entities.DlProperty(location=['creator'], _type=str)
     display_name: str = entities.DlProperty(location=['displayName'], _type=str)
     icon: str = entities.DlProperty(location=['icon'], _type=str)
     tags: list = entities.DlProperty(location=['tags'], _type=list)
-    codebase: str = entities.DlProperty(location=['codebase'], _kls="Codebase")
-    scope: dict = entities.DlProperty(location=['scope'], _type=str)
+    codebase: Union[entities.Codebase, None] = entities.DlProperty(location=['codebase'], _kls="Codebase")
+    scope: str = entities.DlProperty(location=['scope'], _type=str)
     context: dict = entities.DlProperty(location=['context'], _type=dict)
     metadata: dict = entities.DlProperty(location=['metadata'], _type=dict)
     dependencies: dict = entities.DlProperty(location=['dependencies'], _type=List[dict])

dtlpy/entities/filters.py

@@ -497,8 +497,8 @@ class Filters:
         _json["resource"] = f'{_json["resource"]}'
         # convert the dictionary to a json string
         _json['dqlFilter'] = json.dumps({'filter': _json.pop('filter'),
-                                         'join': _json.pop('join'),
-                                         'sort': _json.get('sort')})
+                                         'join': _json.pop('join', None),
+                                         'sort': _json.get('sort', None)})
         # set the page size as the UI default
         _json['pageSize'] = 100
         _json['page'] = _json['page']

dtlpy/entities/integration.py

@@ -1,5 +1,4 @@
 from enum import Enum
-
 import logging
 import attr
 
@@ -34,6 +33,8 @@ class IntegrationType(str, Enum):
          - KEY VALUE Integration - for save secrets in the platform
        * - GCP_WORKLOAD_IDENTITY_FEDERATION
          - GCP Workload Identity Federation Integration - for GCP drivers
+       * - PRIVATE_REGISTRY
+         - PRIVATE REGISTRY Integration - for private registry drivers
     """
     S3 = "s3"
     AWS_CROSS_ACCOUNT = 'aws-cross'
@@ -42,7 +43,8 @@ class IntegrationType(str, Enum):
     GCS_CROSS = "gcp-cross"
     AZUREBLOB = "azureblob"
     KEY_VALUE = "key_value"
-    GCP_WORKLOAD_IDENTITY_FEDERATION = "gcp-workload-identity-federation"
+    GCP_WORKLOAD_IDENTITY_FEDERATION = "gcp-workload-identity-federation",
+    PRIVATE_REGISTRY = "private-registry"
 
 
 @attr.s

dtlpy/entities/model.py

@@ -119,7 +119,7 @@ class Model(entities.BaseEntity):
     app = attr.ib(default=None)
 
     @staticmethod
-    def _protected_from_json(_json, client_api, project, package, is_fetched=True):
+    def _protected_from_json(_json, client_api, project=None, package=None, is_fetched=True):
         """
         Same as from_json but with try-except to catch if error
 
@@ -143,7 +143,7 @@ class Model(entities.BaseEntity):
         return status, model
 
     @classmethod
-    def from_json(cls, _json, client_api, project, package, is_fetched=True):
+    def from_json(cls, _json, client_api, project=None, package=None, is_fetched=True):
         """
         Turn platform representation of model into a model entity
 

dtlpy/entities/ontology.py

@@ -185,7 +185,7 @@ class Ontology(entities.BaseEntity):
         self._color_map = values
 
     @staticmethod
-    def _protected_from_json(_json, client_api, recipe, dataset, project, is_fetched=True):
+    def _protected_from_json(_json, client_api, recipe=None, dataset=None, project=None, is_fetched=True):
         """
         Same as from_json but with try-except to catch if error
         :param _json: platform json
@@ -217,7 +217,7 @@ class Ontology(entities.BaseEntity):
         return True
 
     @classmethod
-    def from_json(cls, _json, client_api, recipe, dataset=None, project=None, is_fetched=True):
+    def from_json(cls, _json, client_api, recipe=None, dataset=None, project=None, is_fetched=True):
         """
         Build an Ontology entity object from a json
 

dtlpy/entities/organization.py

@@ -49,7 +49,7 @@ class Organization(entities.BaseEntity):
     logo_url = attr.ib(repr=False)
     plan = attr.ib(repr=False)
     owner = attr.ib(repr=False)
-    created_by = attr.ib(repr=False)
+    creator = attr.ib(repr=False)
 
     # api
     _client_api = attr.ib(type=ApiClient, repr=False)
@@ -67,7 +67,7 @@ class Organization(entities.BaseEntity):
 
     @property
     def createdBy(self):
-        return self.created_by
+        return self.creator
 
     @_repositories.default
     def set_repositories(self):
@@ -158,7 +158,7 @@ class Organization(entities.BaseEntity):
                    logo_url=_json.get('logoUrl', None),
                    plan=_json.get('plan', None),
                    owner=_json.get('owner', None),
-                   created_by=_json.get('createdBy', None),
+                   creator=_json.get('creator', None),
                    client_api=client_api)
         inst.is_fetched = is_fetched
         return inst
@@ -175,7 +175,7 @@ class Organization(entities.BaseEntity):
                                                               attr.fields(Organization)._repositories,
                                                               attr.fields(Organization).created_at,
                                                               attr.fields(Organization).updated_at,
-                                                              attr.fields(Organization).created_by,
+                                                              attr.fields(Organization).creator,
                                                               ))
         output_dict['members'] = self.members
         output_dict['groups'] = self.groups
@@ -188,7 +188,7 @@ class Organization(entities.BaseEntity):
         output_dict['logo_url'] = self.logo_url
         output_dict['plan'] = self.plan
         output_dict['owner'] = self.owner
-        output_dict['createdBy'] = self.created_by
+        output_dict['creator'] = self.creator
 
         return output_dict
 

dtlpy/entities/package.py

@@ -124,7 +124,7 @@ class Package(entities.DlEntity):
         self.codebase = entities.ItemCodebase(item_id=item_id)
 
     @staticmethod
-    def _protected_from_json(_json, client_api, project, is_fetched=True):
+    def _protected_from_json(_json, client_api, project=None, is_fetched=True):
         """
         Same as from_json but with try-except to catch if error
 
@@ -144,7 +144,7 @@ class Package(entities.DlEntity):
         return status, package
 
     @classmethod
-    def from_json(cls, _json, client_api, project, is_fetched=True):
+    def from_json(cls, _json, client_api, project=None, is_fetched=True):
         """
         Turn platform representation of package into a package entity
 

dtlpy/entities/pipeline.py

@@ -232,11 +232,12 @@ class Pipeline(entities.BaseEntity):
     updated_by = attr.ib(default=None)
 
     @staticmethod
-    def _protected_from_json(_json, client_api, project, is_fetched=True):
+    def _protected_from_json(_json, client_api, project=None, is_fetched=True):
         """
         Same as from_json but with try-except to catch if error
         :param _json: platform json
         :param client_api: ApiClient entity
+        :param dtlpy.entities.project.Project project: entity
         :param is_fetched: is Entity fetched from Platform
         :return:
         """
@@ -254,13 +255,13 @@ class Pipeline(entities.BaseEntity):
         return status, pipeline
 
     @classmethod
-    def from_json(cls, _json, client_api, project, is_fetched=True):
+    def from_json(cls, _json, client_api, project=None, is_fetched=True):
         """
         Turn platform representation of pipeline into a pipeline entity
 
         :param dict _json: platform representation of package
         :param dl.ApiClient client_api: ApiClient entity
-        :param dtlpy.entities.project.Project project: project entity
+        :param dtlpy.entities.project.Project project: entity
         :param bool is_fetched: is Entity fetched from Platform
         :return: Pipeline entity
         :rtype: dtlpy.entities.pipeline.Pipeline
@@ -308,7 +309,7 @@ class Pipeline(entities.BaseEntity):
         return inst
 
     @classmethod
-    def pipeline_node(self, _json):
+    def pipeline_node(cls, _json):
         node_type = _json.get('type')
         if node_type == 'task':
             return TaskNode.from_json(_json)

dtlpy/entities/pipeline_execution.py

@@ -91,7 +91,7 @@ class PipelineExecution(entities.BaseEntity):
     _repositories = attr.ib(repr=False)
 
     @staticmethod
-    def _protected_from_json(_json, client_api, pipeline, is_fetched=True):
+    def _protected_from_json(_json, client_api, pipeline=None, is_fetched=True):
         """
         Same as from_json but with try-except to catch if error
         :param _json: platform json
@@ -114,7 +114,7 @@ class PipelineExecution(entities.BaseEntity):
         return status, pipeline
 
     @classmethod
-    def from_json(cls, _json, client_api, pipeline, is_fetched=True) -> 'PipelineExecution':
+    def from_json(cls, _json, client_api, pipeline=None, is_fetched=True) -> 'PipelineExecution':
         """
         Turn platform representation of pipeline_execution into a pipeline_execution entity
 

dtlpy/entities/recipe.py

@@ -57,7 +57,7 @@ class Recipe(entities.BaseEntity):
         Build a Recipe entity object from a json
 
         :param dict _json: _json response from host
-        :param dtlpy.entities.dataset.Dataset Dataset: Dataset entity
+        :param dtlpy.entities.dataset.Dataset dataset: Dataset entity
         :param dtlpy.entities.project.Project project: project entity
         :param dl.ApiClient client_api: ApiClient entity
         :param bool is_fetched: is Entity fetched from Platform

dtlpy/entities/task.py

@@ -116,7 +116,7 @@ class Task:
         self._description['content'] = description
 
     @staticmethod
-    def _protected_from_json(_json, client_api, project, dataset):
+    def _protected_from_json(_json, client_api, project=None, dataset=None):
         """
         Same as from_json but with try-except to catch if error
 

dtlpy/entities/trigger.py

@@ -119,7 +119,7 @@ class BaseTrigger(entities.BaseEntity):
         return self.updated_at
 
     @staticmethod
-    def _protected_from_json(_json, client_api, project, service=None):
+    def _protected_from_json(_json, client_api, project=None, service=None):
         """
         Same as from_json but with try-except to catch if error
 
@@ -141,7 +141,7 @@ class BaseTrigger(entities.BaseEntity):
         return status, trigger
 
     @classmethod
-    def from_json(cls, _json, client_api, project, service=None):
+    def from_json(cls, _json, client_api, project=None, service=None):
         """
         Build a trigger entity object from a json
 
@@ -305,7 +305,7 @@ class Trigger(BaseTrigger):
         return _json
 
     @classmethod
-    def from_json(cls, _json, client_api, project, service=None):
+    def from_json(cls, _json, client_api, project=None, service=None):
         """
         Build a trigger entity object from a json
 
@@ -377,7 +377,7 @@ class CronTrigger(BaseTrigger):
         return _json
 
     @classmethod
-    def from_json(cls, _json, client_api, project, service=None):
+    def from_json(cls, _json, client_api, project=None, service=None):
         """
         Build a trigger entity object from a json
 

dtlpy/ml/base_model_adapter.py

@@ -486,9 +486,10 @@ class BaseModelAdapter(utilities.BaseServiceRunner):
         if feature_set is None:
             logger.info('Feature Set not found. creating... ')
             try:
-                self.model_entity.project.feature_sets.get(name=self.model_entity.name)
+                self.model_entity.project.feature_sets.get(feature_set_name=self.model_entity.name)
                 feature_set_name = f"{self.model_entity.name}-{''.join(random.choices(string.ascii_letters + string.digits, k=5))}"
-                logger.warning(f"Feature set with the model name already exists. Creating new feature set with name {feature_set_name}")
+                logger.warning(
+                    f"Feature set with the model name already exists. Creating new feature set with name {feature_set_name}")
             except exceptions.NotFound:
                 feature_set_name = self.model_entity.name
             feature_set = self.model_entity.project.feature_sets.create(name=feature_set_name,
@@ -518,7 +519,7 @@ class BaseModelAdapter(utilities.BaseServiceRunner):
                 self.logger.debug(
                     "Uploading items' feature vectors for model {!r}.".format(self.model_entity.name))
                 try:
-                    _ = list(pool.map(partial(self._upload_model_features,
+                    list(pool.map(partial(self._upload_model_features,
                                               feature_set.id,
                                               self.model_entity.project_id),
                                       batch_items,
@@ -762,14 +763,13 @@ class BaseModelAdapter(utilities.BaseServiceRunner):
     @staticmethod
     def _upload_model_features(feature_set_id, project_id, item: entities.Item, vector):
         try:
-            feature = item.features.create(value=vector,
-                                           project_id=project_id,
-                                           feature_set_id=feature_set_id,
-                                           entity=item)
-            return feature
+            if vector is not None:
+                item.features.create(value=vector,
+                                     project_id=project_id,
+                                     feature_set_id=feature_set_id,
+                                     entity=item)
         except Exception as e:
             logger.error(f'Failed to upload feature vector of length {len(vector)} to item {item.id}, Error: {e}')
-            return []
 
     def _upload_model_annotations(self, item: entities.Item, predictions, clean_annotations):
         """

dtlpy/repositories/dpks.py

@@ -196,8 +196,13 @@ class Dpks:
             dpk = dpk_v.items[0]
         return dpk
 
-    def publish(self, dpk: entities.Dpk = None, ignore_max_file_size: bool = False,
-                manifest_filepath='dataloop.json') -> entities.Dpk:
+    def publish(
+            self,
+            dpk: entities.Dpk = None,
+            ignore_max_file_size: bool = False,
+            manifest_filepath='dataloop.json',
+            local_path: str = None
+    ) -> entities.Dpk:
         """
         Upload a dpk entity to the dataloop platform.
 
@@ -207,6 +212,7 @@ class Dpks:
                                         during the packaging of the codebase.
         :param str manifest_filepath: Optional. Path to the manifest file. Can be absolute or relative.
                                     Defaults to 'dataloop.json'
+        :param str local_path: Optional. The path where the dpk files are located.
 
         :return the published dpk
         :rtype dl.entities.Dpk
@@ -241,8 +247,13 @@ class Dpks:
         if self.project and self.project.id != dpk.context['project']:
             logger.warning("the project id that provide different from the dpk project id")
 
+        if local_path is None:
+            if manifest_filepath=='dataloop.json':
+                local_path = os.getcwd()
+            else:
+                local_path = os.path.dirname(manifest_filepath)
         if dpk.codebase is None:
-            dpk.codebase = self.project.codebases.pack(directory=os.getcwd(),
+            dpk.codebase = self.project.codebases.pack(directory=local_path,
                                                        name=dpk.display_name,
                                                        extension='dpk',
                                                        ignore_directories=['artifacts'],

dtlpy/repositories/features.py

@@ -17,9 +17,11 @@ class Features:
                  project_id: str = None,
                  item: entities.Item = None,
                  annotation: entities.Annotation = None,
-                 feature_set: entities.FeatureSet = None):
+                 feature_set: entities.FeatureSet = None,
+                 dataset: entities.Dataset = None):
         if project is not None and project_id is None:
             project_id = project.id
+        self._dataset = dataset
         self._project = project
         self._project_id = project_id
         self._item = item
@@ -50,7 +52,7 @@ class Features:
         if self._project is None:
             raise exceptions.PlatformException(
                 error='2001',
-                message='Cannot perform action WITHOUT Project entity in Datasets repository.'
+                message='Cannot perform action WITHOUT Project entity in Features repository.'
                         ' Please checkout or set a project')
         assert isinstance(self._project, entities.Project)
         return self._project
@@ -60,8 +62,8 @@ class Features:
     ###########
     def _list(self, filters: entities.Filters):
         """
-        Get dataset items list This is a browsing endpoint, for any given path item count will be returned,
-        user is expected to perform another request then for every folder item to actually get the its item list.
+        Get dataset feature vectors list. This is a browsing endpoint, for any given path feature count will be returned,
+        user is expected to perform another request then for every folder item to actually get the item list.
 
         :param dtlpy.entities.filters.Filters filters: Filters entity or a dictionary containing filters parameters
         :return: json response
@@ -104,6 +106,8 @@ class Features:
             filters.add(field='featureSetId', values=self._feature_set.id)
         if self._item is not None:
             filters.add(field='entityId', values=self._item.id)
+        if self._dataset is not None:
+            filters.add(field='datasetId', values=self._dataset.id)
         if self._project_id is None:
             self._project_id = self.project.id
         filters.context = {"projects": [self._project_id]}
@@ -169,7 +173,7 @@ class Features:
         if feature_set_id is None:
             if self._feature_set is None:
                 raise ValueError(
-                    'Missing feature_set_id. Must insert the variable or create from context - feature_set.features.create()')
+                    'Missing feature_set_id. Must insert the variable or create from context, e.g. feature_set.features.create()')
             feature_set_id = self._feature_set.id
 
         payload = {'project': project_id,

dtlpy/repositories/integrations.py

@@ -1,7 +1,8 @@
 """
 Integrations Repository
 """
-
+import base64
+import json
 import logging
 from .. import entities, exceptions, miscellaneous, _api_reference
 from ..services.api_client import ApiClient
@@ -298,3 +299,53 @@ 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:
+        """
+        Generates a Google Artifact Registry JSON configuration and returns it as a base64-encoded string.
+
+        Parameters:
+            location (str): The region where the repository will be created (e.g., 'us-central1').
+            service_account (str): The service_account parameter represents the Google Cloud service account credentials
+                                    in the form of a JSON key file. This JSON contains the private key and other metadata
+                                    required for authenticating with Google Artifact Registry. It is used to generate a Kubernetes secret
+                                    that stores the credentials for pulling container images from the registry.
+                                    The JSON key must include fields such as client_email, private_key, and project_id,
+                                    and it is typically downloaded from the Google Cloud Console when creating the service account
+
+        Returns:
+            str: A base64-encoded string representation of the repository JSON configuration.
+        """
+        if not service_account:
+            raise ValueError('Missing Service Account')
+        if not location:
+            raise ValueError('Missing Location')
+        user_name = "_json_key"
+        cred = f"{user_name}:{service_account}"
+        auth = str(base64.b64encode(bytes(cred, 'utf-8')))[2:-1]
+
+        encoded_pass = {
+            "auths": {
+                f"{location}": {
+                    "username": user_name,
+                    "password": service_account,
+                    "auth": auth
+                }
+            }
+        }
+
+        return str(base64.b64encode(bytes(json.dumps(encoded_pass), 'utf-8')))[2:-1]

dtlpy/repositories/items.py

@@ -610,7 +610,9 @@ class Items:
             output_entity=entities.Item,
             no_output: bool = False,
             export_version: str = entities.ExportVersion.V1,
-            item_description: str = None
+            item_description: str = None,
+            raise_on_error: bool = False,
+            return_as_list: bool = False
     ):
         """
         Upload local file to dataset.
@@ -630,6 +632,9 @@ class Items:
         :param bool no_output: do not return the items after upload
         :param str export_version:  exported items will have original extension in filename, `V1` - no original extension in filenames
         :param str item_description: add a string description to the uploaded item
+        :param bool raise_on_error: raise an exception if an error occurs
+        :param bool return_as_list: return a list of items instead of a generator
+        
         :return: Output (generator/single item)
         :rtype: generator or single item
 
@@ -657,7 +662,9 @@ class Items:
             # metadata to upload with items
             item_metadata=item_metadata,
             export_version=export_version,
-            item_description=item_description
+            item_description=item_description,
+            raise_on_error=raise_on_error,
+            return_as_list=return_as_list
         )
 
     @property

dtlpy/repositories/pipelines.py

@@ -376,24 +376,18 @@ class Pipelines:
 
             pipeline = project.pipelines.update(pipeline='pipeline_entity')
         """
-        if pipeline.status == entities.CompositionStatus.INSTALLED and not pipeline.variables_changed():
-            raise exceptions.PlatformException(
-                error='400',
-                message='Cannot update pipeline while it is installed'
-            )
         # payload
         payload = pipeline.to_json()
 
         # update settings
         if pipeline.settings_changed():
-            self.update_settings(pipeline=pipeline, settings=pipeline.settings)
+            new_pipeline = self.update_settings(pipeline=pipeline, settings=pipeline.settings)
+            payload['settings'] = new_pipeline.to_json().get('settings', payload.get('settings'))
 
         # update variables
         if pipeline.variables_changed():
             new_pipeline = self.__update_variables(pipeline=pipeline)
-            if new_pipeline.status == entities.CompositionStatus.INSTALLED:
-                logger.warning('Pipeline is installed, updating pipeline variables only')
-                return new_pipeline
+            payload['variables'] = new_pipeline.to_json().get('variables', payload.get('variables'))
 
         success, response = self._client_api.gen_request(
             req_type='patch',

dtlpy/repositories/uploader.py

@@ -59,7 +59,9 @@ class Uploader:
             overwrite=False,
             item_metadata=None,
             export_version: str = entities.ExportVersion.V1,
-            item_description=None
+            item_description=None,
+            raise_on_error=False,
+            return_as_list=False
     ):
         """
         Upload local file to dataset.
@@ -67,7 +69,7 @@ class Uploader:
         If `*` at the end of local_path (e.g. '/images/*') items will be uploaded without head directory
 
         :param local_path: local file or folder to upload
-        :param local_annotations_path: path to dataloop format annotations json files.
+        :param local_annotations_path: path to Dataloop format annotations json files.
         :param remote_path: remote path to save.
         :param remote_name: remote base name to save.
         :param file_types: list of file type to upload. e.g ['.jpg', '.png']. default is all
@@ -75,6 +77,8 @@ class Uploader:
         :param item_metadata: upload the items with the metadata dictionary
         :param str export_version:  exported items will have original extension in filename, `V1` - no original extension in filenames
         :param str item_description: add a string description to the uploaded item
+        :param bool raise_on_error: raise an exception if an error occurs
+        :param bool return_as_list: always return a list of items 
 
         :return: Output (list)
         """
@@ -114,13 +118,21 @@ class Uploader:
             if log_filepath is not None:
                 logger.warning("Errors in {n_error} files. See {log_filepath} for full log".format(
                     n_error=errors_count, log_filepath=log_filepath))
-
-        # TODO 2.0 always return a list
+            if raise_on_error is True:
+                raise PlatformException(error="400",
+                                        message=f"Errors in {errors_count} files. See above trace for more information")
+        
+        if return_as_list is True:
+            # return list of items
+            return list(self.reporter.output)
         if len(status_list) == 1:
+            # if there is only one item, return it
             try:
                 return next(self.reporter.output)
             except StopIteration:
+                # if there is no items, return None
                 return None
+        # if there are multiple items, return the generator
         return self.reporter.output
 
     def _build_elements_from_inputs(self,

{dtlpy-1.101.8.dist-info → dtlpy-1.103.12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dtlpy
-Version: 1.101.8
+Version: 1.103.12
 Summary: SDK and CLI for Dataloop platform
 Home-page: https://github.com/dataloop-ai/dtlpy
 Author: Dataloop Team
@@ -26,7 +26,7 @@ Requires-Dist: requests-toolbelt (>=1.0.0)
 Requires-Dist: requests (>=2.25.0)
 Requires-Dist: numpy (>=1.16.2)
 Requires-Dist: pandas (>=0.24.2)
-Requires-Dist: tabulate (==0.8.9)
+Requires-Dist: tabulate (>=0.8.9)
 Requires-Dist: Pillow (>=7.2)
 Requires-Dist: PyJWT (>=2.4)
 Requires-Dist: jinja2 (>=2.11.3)

{dtlpy-1.101.8.dist-info → dtlpy-1.103.12.dist-info}/RECORD

@@ -1,5 +1,5 @@
 dtlpy/__init__.py,sha256=1Zngp5ftTgWb3r-sc8z98TYpEs6fOB_7snFhsXYQLVg,20899
-dtlpy/__version__.py,sha256=Ozzlk4O9Dg2923lh6fsAFvrBcMuihy5L2HWDivhCqaA,20
+dtlpy/__version__.py,sha256=E-gqd4JZ0KTONMWd2TCpHjlUW8UxCInRGQnUkSrQeBY,21
 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
@@ -46,9 +46,9 @@ dtlpy/dlp/dlp.py,sha256=YjNBjeCDTXJ7tj8qdiGZ8lFb8DtPZl-FvViyjxt9xF8,4278
 dtlpy/dlp/parser.py,sha256=p-TFaiAU2c3QkI97TXzL2LDR3Eq0hGDFrTc9J2jWLh4,30551
 dtlpy/entities/__init__.py,sha256=Sihb652vYCyCWSQfiYTEGQW0EJsHe7BTk6-S5DOsAb0,4908
 dtlpy/entities/analytic.py,sha256=5MpYDKPVsZ1MIy20Ju515RWed6P667j4TLxsan2gyNM,11925
-dtlpy/entities/annotation.py,sha256=sqgnONKbNb9gmPLJBH3mYJhFWeKjoiJ8dt57Cz7C6YA,67020
+dtlpy/entities/annotation.py,sha256=QdxPwKyupQ_omqpxtL8qizUcZkFlLfcbuMhiBY3mYTk,67182
 dtlpy/entities/annotation_collection.py,sha256=CEYSBHhhDkC0VJdHsBSrA6TgdKGMcKeI3tFM40UJwS8,29838
-dtlpy/entities/app.py,sha256=LQ0cDuqeNtO7iihrTq8MBLrFbZiDVs6AFoAi4UQtUZY,6958
+dtlpy/entities/app.py,sha256=dVd87-mP22NWvec5nqA5VjZ8Qk3aJlgUcloIAAOAPUw,6968
 dtlpy/entities/app_module.py,sha256=0UiAbBX1q8iEImi3nY7ySWZZHoRRwu0qUXmyXmgVAc4,3645
 dtlpy/entities/artifact.py,sha256=wtLtBuidOPbnba0ok40JyunCCIBGbAl4bP_ebK39Kk4,5711
 dtlpy/entities/assignment.py,sha256=Dc1QcfVf67GGcmDDi4ubESDuPkSgjXqdqjTBQ31faUM,14722
@@ -57,42 +57,42 @@ dtlpy/entities/bot.py,sha256=is3NUCnPg56HSjsHIvFcVkymValMqDV0uHRDC1Ib-ds,3819
 dtlpy/entities/codebase.py,sha256=pwRkAq2GV0wvmzshg89IAmE-0I2Wsy_-QNOu8OV8uqc,8999
 dtlpy/entities/command.py,sha256=ARu8ttk-C7_Ice7chRyTtyOtakBTF09FC04mEk73SO8,5010
 dtlpy/entities/compute.py,sha256=4FEpahPFFGHxye_fLh_p_kP6iEQ3QJK7S5hAdd6Afos,12744
-dtlpy/entities/dataset.py,sha256=4_jSlAtj-vlI4egN_tg5ac_R9tS4wyK9j0-Vpf5icmY,50456
+dtlpy/entities/dataset.py,sha256=In9cOfc5COX9I532TDza9V5VmTOXMsA9TKgcfLPArpE,50392
 dtlpy/entities/directory_tree.py,sha256=Rni6pLSWytR6yeUPgEdCCRfTg_cqLOdUc9uCqz9KT-Q,1186
-dtlpy/entities/dpk.py,sha256=Hqct4NbYzX7dcPxvc2QLD0QQxmGbxurwabqrHI3k6X4,17798
+dtlpy/entities/dpk.py,sha256=FJVhQKk2fj1cO_4rcE_bIF6QmIQZQWUkBnwTNQNMrfE,17857
 dtlpy/entities/driver.py,sha256=O_QdK1EaLjQyQkmvKsmkNgmvmMb1mPjKnJGxK43KrOA,7197
 dtlpy/entities/execution.py,sha256=WBiAws-6wZnQQ3y9wyvOeexA3OjxfaRdwDu5dSFYL1g,13420
 dtlpy/entities/feature.py,sha256=9fFjD0W57anOVSAVU55ypxN_WTCsWTG03Wkc3cAAj78,3732
 dtlpy/entities/feature_set.py,sha256=niw4MkmrDbD_LWQu1X30uE6U4DCzmFhPTaYeZ6VZDB0,4443
-dtlpy/entities/filters.py,sha256=_A7rLc0yuMw1eW4gSu4-hogQzXbNUheRvFxnTQWntuo,22671
+dtlpy/entities/filters.py,sha256=PUmgor77m3CWeUgvCdWMg3Bt5SxHXPVBbN5VmD_dglQ,22683
 dtlpy/entities/gis_item.py,sha256=Uk-wMBxwcHsImjz4qOjP-EyZAohbRzN43kMpCaVjCXU,3982
-dtlpy/entities/integration.py,sha256=CA5F1eQCGE_4c_Kry4nWRdeyjHctNnvexcDXg_M5HLU,5734
+dtlpy/entities/integration.py,sha256=Kdy1j6-cJLW8qNmnqCmdg36phi843YDrlMqcMyMfvYk,5875
 dtlpy/entities/item.py,sha256=UnAZ7yLaTu2vkbD2sxysJQNn-ceC9zS3Uf304OvcC4E,31746
 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=EeJsCePIddavvMVhyNGt6ZIsyteucQoI0cY6byPOi9Y,26878
+dtlpy/entities/model.py,sha256=YwjIi3MxAZoyartTvqx_qhtDKQe6zVsQuwZbYLygMxU,26898
 dtlpy/entities/node.py,sha256=yPPYDLtNMc6vZbbf4FIffY86y7tkaTvYm42Jb7k3Ofk,39617
-dtlpy/entities/ontology.py,sha256=ok4p3sLBc_SS5hs2gZr5-gbblrveM7qSIX4z67QSKeQ,31967
-dtlpy/entities/organization.py,sha256=AMkx8hNIIIjnu5pYlNjckMRuKt6H3lnOAqtEynkr7wg,9893
-dtlpy/entities/package.py,sha256=EA5cB3nFBlsbxVK-QroZILjol2bYSVGqCby-mOyJJjQ,26353
+dtlpy/entities/ontology.py,sha256=N5bsnNUfWNN49WV8lGQL8QRxbKfCZyV-rDyTlGByUrw,31987
+dtlpy/entities/organization.py,sha256=Zm-tTHV82PvYyTNetRRXqvmvzBCbXEwS-gAENf7Zny4,9874
+dtlpy/entities/package.py,sha256=QSDePHlp4ik19aUE3dAUC7edh0oUUVjzSmMG867avc4,26363
 dtlpy/entities/package_defaults.py,sha256=wTD7Z7rGYjVy8AcUxTFEnkOkviiJaLVZYvduiUBKNZo,211
 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=grNjt2FYg4gKBlVRDkztI1BPOI4JoGeyjvmOW3BnB3k,5927
-dtlpy/entities/pipeline.py,sha256=X9238WbMGfZcXdQVEtkw8twZwl0O4EZB4TxbTSEyPeI,20788
-dtlpy/entities/pipeline_execution.py,sha256=XCXlBAHFYVL2HajE71hK-bPxI4gTwZvg5SKri4BgyRA,9928
+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
 dtlpy/entities/prompt_item.py,sha256=d4rqP961PYlJvJJDRXZPI7Z6NdwRXlx_Q0_N0xtZ_B8,19276
-dtlpy/entities/recipe.py,sha256=Q1HtYgind3bEe-vnDZWhw6H-rcIAGhkGHPRWtLIkPSE,11917
+dtlpy/entities/recipe.py,sha256=SX0T7gw-_9Cs2FZyC_htIxQd7CwDwb2zA3SqB37vymM,11917
 dtlpy/entities/reflect_dict.py,sha256=2NaSAL-CO0T0FYRYFQlaSpbsoLT2Q18AqdHgQSLX5Y4,3273
 dtlpy/entities/resource_execution.py,sha256=1HuVV__U4jAUOtOkWlWImnM3Yts8qxMSAkMA9sBhArY,5033
 dtlpy/entities/service.py,sha256=NI4lFC6FqLw4aEGarr2rMptxe3omVfC39C9VAnYYEJA,33733
 dtlpy/entities/setting.py,sha256=uXagJHtcCR3nJYClR_AUGZjz_kx3TejPcUZ8ginHFIA,8561
-dtlpy/entities/task.py,sha256=XHiEqZYFlrDCtmw1MXsysjoBLdIzAk7coMrVk8bNIiE,19534
+dtlpy/entities/task.py,sha256=SL1-6p4jruELkWI-5VXBMn7Imj1xJVaOfAFDa7inH64,19544
 dtlpy/entities/time_series.py,sha256=336jWNckjuSn0G29WJFetB7nBoFAKqs4VH9_IB4m4FE,4017
-dtlpy/entities/trigger.py,sha256=zh3wYUY2-zATh_7ous0Ck87Yojo9r9PAVQrkcESxoko,14266
+dtlpy/entities/trigger.py,sha256=Spf5G3n1PsD3mDntwbAsc-DpEGDlqKgU9ec0Q0HinsQ,14286
 dtlpy/entities/user.py,sha256=hqEzwN6rl1oUTpKOV5eXvw9Z7dtpsiC4TAPSNBmkqcM,3865
 dtlpy/entities/webhook.py,sha256=6R06MgLxabvKySInGlSJmaf0AVmAMe3vKusWhqONRyU,3539
 dtlpy/entities/annotation_definitions/__init__.py,sha256=qZ77hGmCQopPSpiDHYhNWbNKC7nrn10NWNlim9dINmg,666
@@ -148,7 +148,7 @@ dtlpy/miscellaneous/list_print.py,sha256=leEg3RodgYfH5t_0JG8VuM8NiesR8sJLK_mRStt
 dtlpy/miscellaneous/zipping.py,sha256=GMdPhAeHQXeMS5ClaiKWMJWVYQLBLAaJUWxvdYrL4Ro,5337
 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=y7txv5JdTpVCZY6IvYXiQRSz4k3YXhHFEKoDTkcVHz0,50610
+dtlpy/ml/base_model_adapter.py,sha256=QG6-WOH24NBlAGDHBg9t2gzsnRXjujCBeirlTPUiiGo,50601
 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
@@ -166,13 +166,13 @@ dtlpy/repositories/compositions.py,sha256=H417BvlQAiWr5NH2eANFke6CfEO5o7DSvapYpf
 dtlpy/repositories/computes.py,sha256=EtfE_3JhTdNlSYDPkKXBFkq-DBl4sgQqIm50ajvFdWM,9976
 dtlpy/repositories/datasets.py,sha256=SpG86uToq-E5nVHMwHgWx6VwwwkgfYo8x5vZ0WA3Ouw,56546
 dtlpy/repositories/downloader.py,sha256=rtgGj6jAfXxHZ1oihFoOkK4MUtapFpVMdREKzXKLnu0,44113
-dtlpy/repositories/dpks.py,sha256=mj3QPvfzj_jZAscwIgpKUfa7fLxptc3OJQ_RrSfgYxo,17487
+dtlpy/repositories/dpks.py,sha256=dglvaiSFBvEithhlQ0RAXwzTxoZaICONs-owx3e2nfU,17848
 dtlpy/repositories/drivers.py,sha256=fF0UuHCyBzop8pHfryex23mf0kVFAkqzNdOmwBbaWxY,10204
 dtlpy/repositories/executions.py,sha256=4UoU6bnB3kl5cMuF1eJvDecfZCaB06gKWxPfv6_g1_k,32598
 dtlpy/repositories/feature_sets.py,sha256=UowMDAl_CRefRB5oZzubnsjU_OFgiPPdQXn8q2j4Kuw,9666
-dtlpy/repositories/features.py,sha256=7xA2ihEuNgZD7HBQMMGLWpsS2V_3PgieKW2YAk1OeUU,9712
-dtlpy/repositories/integrations.py,sha256=Wi-CpT2PH36GFu3znWP5Uf2CmkqWBUYyOdwvatGD_eM,11798
-dtlpy/repositories/items.py,sha256=90Z8-thLWBd49fmmnP-P6pZxhHX1k4Wv6Qfxq-Ovcz4,38092
+dtlpy/repositories/features.py,sha256=A_RqTJxzjTh-Wbm0uXaoTNyHSfCLbeiH38iB11p2ifY,9915
+dtlpy/repositories/integrations.py,sha256=dBTgvT8WgzNx3f7RuXxk1Or3jwj8XaBXfAVCSYUw-hI,14122
+dtlpy/repositories/items.py,sha256=9_gCSV1GuVcya8NZg-79owktpuEpC1cUOtgUB-7aK94,38427
 dtlpy/repositories/messages.py,sha256=QU0Psckg6CA_Tlw9AVxqa-Ay1fRM4n269sSIJkH9o7E,3066
 dtlpy/repositories/models.py,sha256=IekNMcnuKVaAVTJf2AJv6YvX5qCd9kkSl4ETPMWP4Zc,38213
 dtlpy/repositories/nodes.py,sha256=xXJm_YA0vDUn0dVvaGeq6ORM0vI3YXvfjuylvGRtkxo,3061
@@ -180,7 +180,7 @@ dtlpy/repositories/ontologies.py,sha256=unnMhD2isR9DVE5S8Fg6fSDf1ZZ5Xemxxufx4LEU
 dtlpy/repositories/organizations.py,sha256=6ijUDFbsogfRul1g_vUB5AZOb41MRmV5NhNU7WLHt3A,22825
 dtlpy/repositories/packages.py,sha256=QhkXMZkpseCt0pDropJuqoHJL0RMa5plk8AN0V3w6Nk,86807
 dtlpy/repositories/pipeline_executions.py,sha256=hJX2I939c-bWxveVdikZ_9LWMNCQusTRkkdEa5j3Yvo,17007
-dtlpy/repositories/pipelines.py,sha256=VDAOsGbgD1_AKdMrJl_qB3gxPs7f3pwUnPx0pT1iAWk,23977
+dtlpy/repositories/pipelines.py,sha256=Mbe1x-7iX2kec6_f83Ji1xiNktz2jy1dRCvBMJTn7Po,23722
 dtlpy/repositories/projects.py,sha256=tZyFLqVs-8ggTIi5echlX7XdGOJGW4LzKuXke7jkRnw,22140
 dtlpy/repositories/recipes.py,sha256=ZZDhHn9g28C99bsf0nFaIpVYn6f6Jisz9upkHEkeaYY,15843
 dtlpy/repositories/resource_executions.py,sha256=PyzsbdJxz6jf17Gx13GZmqdu6tZo3TTVv-DypnJ_sY0,5374
@@ -191,7 +191,7 @@ dtlpy/repositories/tasks.py,sha256=v09S2pYGkKx_vBG7SWigJeuMhp0GsefKo3Td7ImrWb0,4
 dtlpy/repositories/times_series.py,sha256=m-bKFEgiZ13yQNelDjBfeXMUy_HgsPD_JAHj1GVx9fU,11420
 dtlpy/repositories/triggers.py,sha256=izdNyCN1gDc5uo7AXntso0HSMTDIzGFUp-dSEz8cn_U,21990
 dtlpy/repositories/upload_element.py,sha256=R2KWIXmkp_dMAIr81tu3Y_VRfldj0ju8__V28ombkcg,10677
-dtlpy/repositories/uploader.py,sha256=9tbXPuBmRJN95Ifcrr-UDT-6tiKqpTiRMnuS8qcjTag,31319
+dtlpy/repositories/uploader.py,sha256=5qQbsg701HrL8x0wWCRLPBP_dztqXEb31QfeZnh0SQk,31988
 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
@@ -223,19 +223,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.101.8.data/scripts/dlp,sha256=-F0vSCWuSOOtgERAtsPMPyMmzitjhB7Yeftg_PDlDjw,10
-dtlpy-1.101.8.data/scripts/dlp.bat,sha256=QOvx8Dlx5dUbCTMpwbhOcAIXL1IWmgVRSboQqDhIn3A,37
-dtlpy-1.101.8.data/scripts/dlp.py,sha256=tEokRaDINISXnq8yNx_CBw1qM5uwjYiZoJOYGqWB3RU,4267
+dtlpy-1.103.12.data/scripts/dlp,sha256=-F0vSCWuSOOtgERAtsPMPyMmzitjhB7Yeftg_PDlDjw,10
+dtlpy-1.103.12.data/scripts/dlp.bat,sha256=QOvx8Dlx5dUbCTMpwbhOcAIXL1IWmgVRSboQqDhIn3A,37
+dtlpy-1.103.12.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=xotAjdHpFnIic3Wb-4f7GSg2igtuXZjvRPiYdCTawhA,2064
+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=V23cUx_p4VpNk9kc2I0BDZJHO_xcJBFJq8m3JlYCooc,16736
-dtlpy-1.101.8.dist-info/LICENSE,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
-dtlpy-1.101.8.dist-info/METADATA,sha256=EtBmjxKIz7pBOOh-ZOrI_IiLcUhSICMf7oyCNXDKIDI,3019
-dtlpy-1.101.8.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-dtlpy-1.101.8.dist-info/entry_points.txt,sha256=C4PyKthCs_no88HU39eioO68oei64STYXC2ooGZTc4Y,43
-dtlpy-1.101.8.dist-info/top_level.txt,sha256=ZWuLmQGUOtWAdgTf4Fbx884w1o0vBYq9dEc1zLv9Mig,12
-dtlpy-1.101.8.dist-info/RECORD,,
+tests/features/environment.py,sha256=oAO7H7j7Y7czW0t25Gv1KwI2-ofqhZVkbCw9LbZCp4Y,17506
+dtlpy-1.103.12.dist-info/LICENSE,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
+dtlpy-1.103.12.dist-info/METADATA,sha256=sz-9jRSMf85hTPy6sH1i5vjEgkISude0fUmwR5BxSGA,3020
+dtlpy-1.103.12.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+dtlpy-1.103.12.dist-info/entry_points.txt,sha256=C4PyKthCs_no88HU39eioO68oei64STYXC2ooGZTc4Y,43
+dtlpy-1.103.12.dist-info/top_level.txt,sha256=ZWuLmQGUOtWAdgTf4Fbx884w1o0vBYq9dEc1zLv9Mig,12
+dtlpy-1.103.12.dist-info/RECORD,,

tests/assets/models_flow/main.py

@@ -1,3 +1,5 @@
+import time
+
 import dtlpy as dl
 import logging
 import os
@@ -26,10 +28,12 @@ class ModelAdapter(dl.BaseModelAdapter):
 
     def train(self, data_path, output_path, **kwargs):
         logger.info("model training")
+        time.sleep(60)
         print(self.model_entity.id)
 
     def predict(self, batch, **kwargs):
         logger.info("model prediction")
+        time.sleep(30)
         batch_annotations = list()
 
         for img in batch:

tests/features/environment.py

@@ -13,6 +13,7 @@ from behave.formatter.base import StreamOpener
 import sys
 
 import dtlpy as dl
+import shutil
 
 try:
     # for local import
@@ -276,6 +277,11 @@ def after_tag(context, tag):
             use_fixture(reset_setenv, context)
         except Exception:
             logging.exception('Failed to reset env')
+    elif tag == 'restore_json_file':
+        try:
+            use_fixture(restore_json_file, context)
+        except Exception:
+            logging.exception('Failed to restore json file')
     elif tag == 'frozen_dataset':
         pass
     elif 'testrail-C' in tag:
@@ -381,7 +387,8 @@ def delete_pipeline(context):
     while context.to_delete_pipelines_ids:
         pipeline_id = context.to_delete_pipelines_ids.pop(0)
         try:
-            filters = context.dl.Filters(resource=context.dl.FiltersResource.EXECUTION, field='latestStatus.status', values=['created', 'in-progress'], operator='in')
+            filters = context.dl.Filters(resource=context.dl.FiltersResource.EXECUTION, field='latestStatus.status',
+                                         values=['created', 'in-progress'], operator='in')
             filters.add(field='pipeline.id', values=pipeline_id)
             executions = context.dl.executions.list(filters=filters)
             for execution in executions.items:
@@ -494,4 +501,15 @@ def models_delete(context):
         except:
             all_deleted = False
             logging.exception('Failed deleting model: {}'.format(model.id))
-    assert all_deleted
+    assert all_deleted
+
+
+def restore_json_file(context):
+    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
+    if os.path.exists(context.backup_path):
+        shutil.copy(context.backup_path, context.original_path)
+        os.remove(context.backup_path)  # Clean up the backup
+    else:
+        raise FileNotFoundError(f"Backup file not found for {context.original_path}")