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

dtlpy/__init__.py

@@ -169,6 +169,7 @@ messages = repositories.Messages(client_api=client_api)
 compositions = repositories.Compositions(client_api=client_api)
 computes = repositories.Computes(client_api=client_api)
 service_drivers = repositories.ServiceDrivers(client_api=client_api)
+collections = repositories.Collections(client_api=client_api)
 
 try:
     check_sdk.check(version=__version__, client_api=client_api)

dtlpy/__version__.py

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

dtlpy/entities/__init__.py

@@ -79,3 +79,4 @@ from .compute import ClusterProvider, ComputeType, ComputeStatus, Toleration, De
     NodePool, AuthenticationIntegration, Authentication, ComputeCluster, ComputeContext, Compute, KubernetesCompute, \
     ServiceDriver
 from .gis_item import  ItemGis, Layer
+from .collection import Collection

dtlpy/entities/annotation.py

@@ -7,6 +7,7 @@ import copy
 import attr
 import json
 import os
+import warnings
 
 from PIL import Image
 from enum import Enum
@@ -421,7 +422,7 @@ class Annotation(entities.BaseEntity):
 
     @property
     def attributes(self):
-        if self._recipe_2_attributes or self.annotation_definition.attributes == []:
+        if self._recipe_2_attributes is not None or self.annotation_definition.attributes == []:
             return self._recipe_2_attributes
         return self.annotation_definition.attributes
 
@@ -430,6 +431,11 @@ class Annotation(entities.BaseEntity):
         if isinstance(attributes, dict):
             self._recipe_2_attributes = attributes
         elif isinstance(attributes, list):
+            warnings.warn("List attributes are deprecated and will be removed in version 1.109. Use Attribute 2.0 (Dictionary) instead. "
+                "For more details, refer to the documentation: "
+                "https://developers.dataloop.ai/tutorials/data_management/upload_and_manage_annotations/chapter/#set-attributes-on-annotations",
+                DeprecationWarning,
+            )
             self.annotation_definition.attributes = attributes
         elif attributes is None:
             if self._recipe_2_attributes:
@@ -1688,6 +1694,11 @@ class FrameAnnotation(entities.BaseEntity):
         if isinstance(attributes, dict):
             self._recipe_2_attributes = attributes
         elif isinstance(attributes, list):
+            warnings.warn("List attributes are deprecated and will be removed in version 1.109. Use Attribute 2.0 (Dictionary) instead. "
+                "For more details, refer to the documentation: "
+                "https://developers.dataloop.ai/tutorials/data_management/upload_and_manage_annotations/chapter/#set-attributes-on-annotations",
+                DeprecationWarning,
+            )
             self.annotation_definition.attributes = attributes
         else:
             raise ValueError('Attributes must be a dictionary or a list')

dtlpy/entities/annotation_definitions/base_annotation_definition.py

@@ -1,5 +1,6 @@
 import logging
 import numpy as np
+import warnings
 
 logger = logging.getLogger(name='dtlpy')
 
@@ -13,8 +14,12 @@ class BaseAnnotationDefinition:
         self._right = 0
         self._annotation = None
 
-        if attributes is None:
-            attributes = list()
+        if isinstance(attributes, list) and len(attributes) > 0:
+            warnings.warn("List attributes are deprecated and will be removed in version 1.109. Use Attribute 2.0 (Dictionary) instead."
+                "For more details, refer to the documentation: "
+                "https://developers.dataloop.ai/tutorials/data_management/upload_and_manage_annotations/chapter/#set-attributes-on-annotations",
+                DeprecationWarning,
+            )
         self._attributes = attributes
 
     @property
@@ -23,8 +28,12 @@ class BaseAnnotationDefinition:
 
     @attributes.setter
     def attributes(self, v):
-        if not isinstance(v, list):
-            raise ValueError('Failed to update annotation attributes. Please use annotation.attrubeute to set the required values')
+        if isinstance(v, list):
+            warnings.warn("List attributes are deprecated and will be removed in version 1.109. Use Attribute 2.0 (Dictionary) instead. "
+                "For more details, refer to the documentation: "
+                "https://developers.dataloop.ai/tutorials/data_management/upload_and_manage_annotations/chapter/#set-attributes-on-annotations",
+                DeprecationWarning,
+            )
         self._attributes = v
     @property
     def top(self):

dtlpy/entities/collection.py

@@ -0,0 +1,39 @@
+from .. import entities
+from ..services.api_client import ApiClient
+import attr
+
+@attr.s
+class Collection(entities.BaseEntity):
+    """
+    Represents a collection in the dataset.
+    """
+
+    # sdk
+    _client_api = attr.ib(type=ApiClient, repr=False)
+
+    key = attr.ib(type=str)
+    name = attr.ib(type=str)
+
+    @classmethod
+    def from_json(cls, _json, client_api, is_fetched=True):
+        """
+        Create a single Collection entity from the dataset JSON.
+
+        :param _json: A dictionary containing collection data in the format:
+                    { "metadata.system.collections.c0": {"name": "Justice League"} }
+        :param client_api: The client API instance.
+        :param is_fetched: Whether the entity was fetched from the platform.
+        :return: A single Collection entity.
+        """
+        full_key, value = next(iter(_json.items()))
+        # Strip the prefix
+        key = full_key.replace("metadata.system.collections.", "")
+        name = value.get("name")
+
+        inst = cls(
+            key=key,
+            name=name,
+            client_api=client_api,
+        )
+        inst.is_fetched = is_fetched
+        return inst

dtlpy/entities/command.py

@@ -18,6 +18,8 @@ class CommandsStatus(str, Enum):
     SUCCESS = 'success'
     FAILED = 'failed'
     TIMEOUT = 'timeout'
+    CLEANING_UP = 'cleaning-up'
+    ON_ERROR = 'on-error'
 
 
 @attr.s
@@ -135,11 +137,14 @@ class Command(entities.BaseEntity):
         :return: True if command still in progress
         :rtype: bool
         """
-        return self.status in [entities.CommandsStatus.CREATED,
-                               entities.CommandsStatus.MAKING_CHILDREN,
-                               entities.CommandsStatus.WAITING_CHILDREN,
-                               entities.CommandsStatus.FINALIZING,
-                               entities.CommandsStatus.IN_PROGRESS]
+        if self.status not in {status for status in entities.CommandsStatus}:
+            raise ValueError('status is not a valid CommandsStatus')
+        return self.status not in [entities.CommandsStatus.SUCCESS,
+                                   entities.CommandsStatus.FAILED,
+                                   entities.CommandsStatus.TIMEOUT,
+                                   entities.CommandsStatus.CANCELED,
+                                   entities.CommandsStatus.ABORTED
+                                   ]
 
     def wait(self, timeout=0, step=None, backoff_factor=1):
         """

dtlpy/entities/compute.py

@@ -230,10 +230,11 @@ class ComputeCluster:
             devops_output['config']['kubernetesVersion'],
             ClusterProvider(devops_output['config']['provider']),
             node_pools,
-   {},
-            Authentication(AuthenticationIntegration(integration.id,integration.type))
+            {},
+            Authentication(AuthenticationIntegration(integration.id, integration.type))
         )
 
+
 class ComputeContext:
     def __init__(self, labels: List[str], org: str, project: Optional[str] = None):
         self.labels = labels
@@ -376,11 +377,35 @@ class KubernetesCompute(Compute):
 
 
 class ServiceDriver:
-    def __init__(self, name: str, context: ComputeContext, compute_id: str, client_api: ApiClient):
+    def __init__(
+            self,
+            name: str,
+            context: ComputeContext,
+            compute_id: str,
+            client_api: ApiClient,
+            type: ComputeType = None,
+            created_at: str = None,
+            updated_at: str = None,
+            namespace: str = None,
+            metadata: Dict = None,
+            url: str = None,
+            archived: bool = None,
+            id: str = None,
+            is_cache_available: bool = None
+    ):
         self.name = name
         self.context = context
         self.compute_id = compute_id
         self.client_api = client_api
+        self.type = type or ComputeType.KUBERNETES
+        self.created_at = created_at
+        self.updated_at = updated_at
+        self.namespace = namespace
+        self.metadata = metadata
+        self.url = url
+        self.archived = archived
+        self.id = id
+        self.is_cache_available = is_cache_available
 
     @classmethod
     def from_json(cls, _json, client_api: ApiClient):
@@ -388,12 +413,40 @@ class ServiceDriver:
             name=_json.get('name'),
             context=ComputeContext.from_json(_json.get('context', dict())),
             compute_id=_json.get('computeId'),
-            client_api=client_api
+            client_api=client_api,
+            type=_json.get('type', None),
+            created_at=_json.get('createdAt', None),
+            updated_at=_json.get('updatedAt', None),
+            namespace=_json.get('namespace', None),
+            metadata=_json.get('metadata', None),
+            url=_json.get('url', None),
+            archived=_json.get('archived', None),
+            id=_json.get('id', None),
+            is_cache_available=_json.get('isCacheAvailable', None)
         )
 
     def to_json(self):
-        return {
+        _json = {
             'name': self.name,
             'context': self.context.to_json(),
-            'computeId': self.compute_id
+            'computeId': self.compute_id,
+            'type': self.type,
         }
+        if self.created_at is not None:
+            _json['createdAt'] = self.namespace
+        if self.updated_at is not None:
+            _json['updatedAt'] = self.updated_at
+        if self.namespace is not None:
+            _json['namespace'] = self.namespace
+        if self.metadata is not None:
+            _json['metadata'] = self.metadata
+        if self.url is not None:
+            _json['url'] = self.url
+        if self.archived is not None:
+            _json['archived'] = self.archived
+        if self.id is not None:
+            _json['id'] = self.id
+        if self.is_cache_available is not None:
+            _json['isCacheAvailable'] = self.is_cache_available
+
+        return _json

dtlpy/entities/dataset.py

@@ -284,7 +284,7 @@ class Dataset(entities.BaseEntity):
     def set_repositories(self):
         reps = namedtuple('repositories',
                           field_names=['items', 'recipes', 'datasets', 'assignments', 'tasks', 'annotations',
-                                       'ontologies', 'features', 'settings', 'schema'])
+                                       'ontologies', 'features', 'settings', 'schema', 'collections'])
         if self._project is None:
             datasets = repositories.Datasets(client_api=self._client_api, project=self._project)
         else:
@@ -300,7 +300,8 @@ class Dataset(entities.BaseEntity):
             ontologies=repositories.Ontologies(client_api=self._client_api, dataset=self),
             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)
+            schema=repositories.Schema(client_api=self._client_api, dataset=self),
+            collections=repositories.Collections(client_api=self._client_api, dataset=self)
         )
 
     @property
@@ -348,6 +349,11 @@ class Dataset(entities.BaseEntity):
         assert isinstance(self._repositories.features, repositories.Features)
         return self._repositories.features
 
+    @property
+    def collections(self):
+        assert isinstance(self._repositories.collections, repositories.Collections)
+        return self._repositories.collections
+
     @property
     def schema(self):
         assert isinstance(self._repositories.schema, repositories.Schema)

dtlpy/entities/execution.py

@@ -63,6 +63,8 @@ class Execution(entities.BaseEntity):
     # optional
     pipeline = attr.ib(type=dict, default=None, repr=False)
     model = attr.ib(type=dict, default=None, repr=False)
+    app = attr.ib(default=None)
+    driver_id = attr.ib(default=None)
 
     ################
     # repositories #
@@ -189,6 +191,8 @@ class Execution(entities.BaseEntity):
             pipeline=_json.get('pipeline', None),
             model=_json.get('model', None),
             package_revision=_json.get('packageRevision', None),
+            app=_json.get('app', None),
+            driver_id=_json.get('driverId', None)
         )
         inst.is_fetched = is_fetched
         return inst
@@ -226,6 +230,7 @@ class Execution(entities.BaseEntity):
                 attr.fields(Execution).pipeline,
                 attr.fields(Execution).model,
                 attr.fields(Execution).package_revision,
+                attr.fields(Execution).driver_id,
             )
         )
 
@@ -247,6 +252,7 @@ class Execution(entities.BaseEntity):
         _json['feedbackQueue'] = self.feedback_queue
         _json['syncReplyTo '] = self.sync_reply_to
         _json['packageRevision'] = self.package_revision
+        _json['driverId'] = self.driver_id
 
         if self.pipeline:
             _json['pipeline'] = self.pipeline

dtlpy/entities/item.py

@@ -12,6 +12,7 @@ from .annotation import ViewAnnotationOptions, ExportVersion
 from ..services.api_client import ApiClient
 from ..services.api_client import client as client_api
 import json
+from typing import List
 import requests
 
 logger = logging.getLogger(name='dtlpy')
@@ -223,7 +224,7 @@ class Item(entities.BaseEntity):
     def set_repositories(self):
         reps = namedtuple('repositories',
                           field_names=['annotations', 'datasets', 'items', 'codebases', 'artifacts', 'modalities',
-                                       'features', 'assignments', 'tasks', 'resource_executions'])
+                                       'features', 'assignments', 'tasks', 'resource_executions', 'collections'])
         reps.__new__.__defaults__ = (None, None, None, None, None, None, None, None, None)
 
         if self._dataset is None:
@@ -270,7 +271,8 @@ class Item(entities.BaseEntity):
                 client_api=self._client_api,
                 project=self._project,
                 resource=self
-            )
+            ),
+            collections=repositories.Collections(client_api=self._client_api, item=self, dataset=self._dataset)
         )
         return r
 
@@ -313,6 +315,11 @@ class Item(entities.BaseEntity):
     def features(self):
         assert isinstance(self._repositories.features, repositories.Features)
         return self._repositories.features
+    
+    @property
+    def collections(self):
+        assert isinstance(self._repositories.collections, repositories.Collections)
+        return self._repositories.collections
 
     ##############
     # Properties #
@@ -770,6 +777,53 @@ class Item(entities.BaseEntity):
             if tags.get(subset) is True:
                 return subset
         return None
+    
+    def assign_collection(self, collections: List[str]) -> bool:
+        """
+        Assign this item to one or more collections.
+
+        :param collections: List of collection names to assign the item to.
+        :return: True if the assignment was successful, otherwise False.
+        """
+        return self.collections.assign(dataset_id=self.dataset_id, collections=collections, item_id=self.id,)
+
+    def unassign_collection(self, collections: List[str]) -> bool:
+        """
+        Unassign this item from one or more collections.
+
+        :param collections: List of collection names to unassign the item from.
+        :return: True if the unassignment was successful, otherwise False.
+        """
+        return self.collections.unassign(dataset_id=self.dataset_id, item_id=self.id, collections=collections)
+
+    def list_collections(self) -> List[dict]:
+        """
+        List all collections associated with this item.
+
+        :return: A list of dictionaries containing collection keys and their respective names.
+                Each dictionary has the structure: {"key": <collection_key>, "name": <collection_name>}.
+        """
+        collections = self.metadata.get("system", {}).get("collections", {})
+        if not isinstance(collections, dict):
+            # Ensure collections is a dictionary
+            return []
+    
+        # Retrieve collection names by their keys
+        return [
+            {"key": key, "name": self.collections.get_name_by_key(key)}
+            for key in collections.keys()
+        ]
+
+    def list_missing_collections(self) -> List[str]:
+        """
+        List all items in the dataset that are not assigned to any collection.
+
+        :return: A list of item IDs that are not part of any collection.
+        """
+        filters = entities.Filters()
+        filters.add(field='metadata.system.collections', values=None)
+        filters.add(field='datasetId', values=self._dataset.id)
+        return self._dataset.items.list(filters=filters)
 
 class ModalityTypeEnum(str, Enum):
     """

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/__init__.py

@@ -52,3 +52,4 @@ from .messages import Messages
 from .compositions import Compositions
 from .schema import Schema
 from .computes import Computes, ServiceDrivers
+from .collections import Collections

dtlpy/repositories/collections.py

@@ -0,0 +1,296 @@
+from venv import logger
+from dtlpy import entities, exceptions, repositories
+from dtlpy.entities.dataset import Dataset
+from dtlpy.entities.filters import FiltersMethod
+from dtlpy.services.api_client import ApiClient
+from typing import List
+
+class Collections:
+    def __init__(self, 
+                client_api: ApiClient,
+                item: entities.Item = None, 
+                dataset: entities.Dataset = None
+            ):
+        self._client_api = client_api
+        self._dataset = dataset
+        self._item = item
+
+    def create(self, name: str) -> entities.Collection:
+        """
+        Creates a new collection in the dataset.
+
+        :param name: The name of the new collection.
+        :return: The created collection details.
+        """
+        dataset_id = self._dataset.id
+        self.validate_max_collections()
+        self.validate_collection_name(name)
+        payload = {"name": name}
+        success, response = self._client_api.gen_request(
+            req_type="post", path=f"/datasets/{dataset_id}/items/collections", json_req=payload
+        )
+        if success:
+            collection_json = self._single_collection(data=response.json(), name=name)
+            return entities.Collection.from_json(client_api=self._client_api, _json=collection_json)
+        else:
+            raise exceptions.PlatformException(response) 
+
+    def update(self, collection_name: str, new_name: str) -> entities.Collection:
+        """
+        Updates the name of an existing collection.
+
+        :param collection_id: The ID of the collection to update.
+        :param new_name: The new name for the collection.
+        :return: The updated collection details.
+        """
+        dataset_id = self._dataset.id
+        self.validate_collection_name(new_name)
+        payload = {"name": new_name}
+        success, response = self._client_api.gen_request(
+            req_type="patch", path=f"/datasets/{dataset_id}/items/collections/{collection_name}", json_req=payload
+        )
+        if success:
+            collection_json = self._single_collection(data=response.json(), name=new_name)
+            return entities.Collection.from_json(client_api=self._client_api, _json=collection_json)
+        else:
+            raise exceptions.PlatformException(response)
+
+    def delete(self, collection_name: str) -> bool:
+        """
+        Deletes a collection from the dataset.
+
+        :param collection_name: The name of the collection to delete.
+        """
+        dataset_id = self._dataset.id
+        success, response = self._client_api.gen_request(
+            req_type="delete", path=f"/datasets/{dataset_id}/items/collections/{collection_name}"
+        )
+        if success:
+            # Wait for the split operation to complete
+            command = entities.Command.from_json(_json=response.json(),
+                                                client_api=self._client_api)
+            command.wait()
+            return True
+        else:
+            raise exceptions.PlatformException(response)
+
+    def clone(self, collection_name: str) -> dict:
+        """
+        Clones an existing collection, creating a new one with a unique name.
+
+        :param collection_name: The name of the collection to clone.
+        :return: The cloned collection details as a dictionary.
+        """
+        self.validate_max_collections()
+        collections = self.list_all_collections()
+        original_collection = next((c for c in collections if c["name"] == collection_name), None)
+
+        if not original_collection:
+            raise ValueError(f"Collection with name '{collection_name}' not found.")
+
+        source_name = original_collection["name"]
+        num = 0
+        clone_name = ""
+        while True:
+            num += 1
+            clone_name = f"{source_name}-clone-{num}"
+            if not any(c["name"] == clone_name for c in collections):  # Use c["name"] for comparison
+                break
+
+        # Create the cloned collection
+        cloned_collection = self.create(name=clone_name)
+        self.assign(dataset_id=self._dataset.id, collections=[cloned_collection.name], collection_key=original_collection['key'])
+        return cloned_collection
+
+
+    def list_all_collections(self) -> entities.Collection:
+        """
+        Retrieves all collections in the dataset.
+
+        :return: A list of collections in the dataset.
+        """
+        dataset_id = self._dataset.id
+        success, response = self._client_api.gen_request(
+            req_type="GET", path=f"/datasets/{dataset_id}/items/collections"
+        )
+        if success:
+            data = response.json()
+            return self._list_collections(data)
+        else:
+            raise exceptions.PlatformException(response)
+        
+    def validate_collection_name(self, name: str):
+        """
+        Validate that the collection name is unique.
+
+        :param name: The name of the collection to validate.
+        :raises ValueError: If a collection with the same name already exists.
+        """
+        collections = self.list_all_collections()
+        if any(c["name"] == name for c in collections): 
+            raise ValueError(f"A collection with the name '{name}' already exists.")
+
+    def validate_max_collections(self) -> None:
+        """
+        Validates that the dataset has not exceeded the maximum allowed collections.
+
+        :raises ValueError: If the dataset has 10 or more collections.
+        """
+        collections = self.list_all_collections()
+        if len(collections) >= 10:
+            raise ValueError("The dataset already has the maximum number of collections (10).")
+        
+    def list_unassigned_items(self) -> list:
+        """
+        List unassigned items in a dataset (items where all collection fields are false).
+
+        :return: List of unassigned item IDs
+        :rtype: list
+        """
+        filters = entities.Filters(method=FiltersMethod.AND)  # Use AND method for all conditions
+        collection_fields = [
+            "collections0",
+            "collections1",
+            "collections2",
+            "collections3",
+            "collections4",
+            "collections5",
+            "collections6",
+            "collections7",
+            "collections8",
+            "collections9",
+        ]
+
+        # Add each field to the filter with a value of False
+        for field in collection_fields:
+            filters.add(field=field, values=False, method=FiltersMethod.AND)
+
+        missing_ids = []
+        pages = self._dataset.items.list(filters=filters)
+        for page in pages:
+            for item in page:
+                # Items that pass filters mean all collections are false
+                missing_ids.append(item.id)
+
+        return missing_ids
+
+    def assign(
+        self, 
+        dataset_id: str, 
+        collections: List[str],
+        item_id: str = None, 
+        collection_key: str = None
+    ) -> bool:
+        """
+        Assign an item to a collection. Creates the collection if it does not exist.
+
+        :param dataset_id: ID of the dataset.
+        :param collections: List of the collections to assign the item to.
+        :param item_id: (Optional) ID of the item to assign. If not provided, all items in the dataset will be updated.
+        :param collection_key: (Optional) Key for the bulk assignment. If not provided, no specific metadata will be updated.
+        :return: True if the assignment was successful, otherwise raises an exception.
+        """
+        # Build the query structure
+        if collection_key:
+            query = {
+                "filter": {
+                    f"metadata.system.collections.{collection_key}": True
+                }
+            }
+        elif item_id:
+            query = {
+                "id": {"$eq": item_id}
+            }
+        else:
+            raise ValueError("Either collection_key or item_id must be provided.")
+
+        # Create the payload
+        payload = {
+            "query": query,
+            "collections": collections,
+        }
+
+        # Make the API request to assign the item
+        success, response = self._client_api.gen_request(
+            req_type="post",
+            path=f"/datasets/{dataset_id}/items/collections/bulk-add",
+            json_req=payload,
+        )
+
+        if success:
+            # Wait for the operation to complete
+            command = entities.Command.from_json(_json=response.json(), client_api=self._client_api)
+            command.wait()
+            return True
+        else:
+            raise exceptions.PlatformException(f"Failed to assign item to collections: {response}")
+
+        
+    def unassign(self, dataset_id: str, item_id: str, collections: List[str]) -> bool:
+        """
+        Unassign an item from a collection.
+        :param item_id: ID of the item.
+        :param collections: List of collection names to unassign.
+        """
+        payload = {
+            "query": {"id": {"$eq": item_id}},
+            "collections": collections,
+        }
+        success, response = self._client_api.gen_request(
+            req_type="post",
+            path=f"/datasets/{dataset_id}/items/collections/bulk-remove",
+            json_req=payload,
+        )
+        if success:
+            # Wait for the split operation to complete
+            command = entities.Command.from_json(_json=response.json(),
+                                                client_api=self._client_api)
+            command.wait()
+            return True
+        else:
+            raise exceptions.PlatformException(response)
+
+    def _single_collection(sef, data: dict, name: str):
+        """
+        Retrieves the key-value pair from the dictionary where the collection's name matches the given name.
+
+        :param data: A dictionary containing collection data in the format:
+                    { "metadata.system.collections.c0": {"name": "Justice League"}, ... }
+        :param name: The name of the collection to find.
+        :return: The key-value pair where the name matches, or None if not found.
+        """
+        for key, value in data.items():
+            if value.get("name") == name:
+                return {key: value}
+        return None
+    
+    def _list_collections(self, data: dict):
+        """
+        Create a list of Collection entities from the dataset JSON.
+
+        :param data: The flat JSON containing collection data in the format:
+                    { "metadata.system.collections.c0": {"name": "Justice League"}, ... }
+        :return: A list of Collection entities.
+        """
+        collections = []
+        for full_key, value in data.items():
+            if "metadata.system.collections" in full_key:
+                # Strip the prefix
+                key = full_key.replace("metadata.system.collections.", "")
+                collection_name = value.get("name")
+                collections.append({"key": key, "name": collection_name})
+        return collections
+    
+    def get_name_by_key(self, key: str) -> str:
+        """
+        Get the name of a collection by its key.
+
+        :param key: The key of the collection (e.g., 'c0', 'c1').
+        :return: The name of the collection if it exists; otherwise, an empty string.
+        """
+        # Assuming collections is a list of dictionaries
+        collections = self.list_all_collections()
+        for collection in collections:
+            if collection.get("key") == key:
+                return collection.get("name", "")
+        return ""

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/downloader.py

@@ -674,6 +674,8 @@ class Downloader:
                                                                                      stream=True,
                                                                                      dataset_id=item.dataset_id)
                     if not result:
+                        if os.path.isfile(local_filepath + '.download'):
+                            os.remove(local_filepath + '.download')
                         raise PlatformException(response)
                 else:
                     _, ext = os.path.splitext(item.metadata['system']['shebang']['linkInfo']['ref'].split('?')[0])

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/repositories/items.py

@@ -271,7 +271,7 @@ class Items:
                 filters.pop(field='hidden')
                 if is_dir:
                     filters.add(field='type', values='dir')
-                    filters.recursive = False
+                filters.recursive = False
                 filters.add(field='filename', values=filepath)
                 paged_entity = self.list(filters=filters)
                 if len(paged_entity.items) == 0:

dtlpy/services/api_client.py

@@ -45,7 +45,7 @@ threadLock = threading.Lock()
 
 
 def format_message(message):
-    if message:
+    if message and isinstance(message, str):
         return message.replace('\\n', '\n')
     return message
 
@@ -1476,7 +1476,7 @@ class ApiClient:
             msg += '[Response <{val}>]'.format(val=resp.status_code)
         if hasattr(resp, 'reason'):
             msg += '[Reason: {val}]'.format(val=resp.reason)
-        if hasattr(resp, 'text'):
+        if hasattr(resp, 'text') and isinstance(resp.text, str):
             msg += '[Text: {val}]'.format(val=format_message(resp.text))
 
         request_id = resp.headers.get('x-request-id', 'na')

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

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

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

@@ -1,5 +1,5 @@
-dtlpy/__init__.py,sha256=1Zngp5ftTgWb3r-sc8z98TYpEs6fOB_7snFhsXYQLVg,20899
-dtlpy/__version__.py,sha256=E-gqd4JZ0KTONMWd2TCpHjlUW8UxCInRGQnUkSrQeBY,21
+dtlpy/__init__.py,sha256=GjtFPFltVerHF1m6ePaVp5oUWcg7yavd3aNhknTip9U,20961
+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
@@ -13,7 +13,6 @@ dtlpy/assets/package_catalog.json,sha256=bN4aHR5shJ3_wrJioO2BesaT2g8dQrrFUWk6Zkt
 dtlpy/assets/package_gitignore,sha256=IjLaxcQldWa6q7ZUajeFEKetiBCaSX4bqEY0Ayye7sE,4405
 dtlpy/assets/project_dataset_recipe_ontology.png,sha256=PKwLXvL289IoKJukoVlSzKKLfh08AIxsUlU2s88U_20,10807
 dtlpy/assets/voc_annotation_template.xml,sha256=exQVEGh9P8UKOvU_XtGlzpHC9TIXmSifAeFSpJ_DgfY,742
-dtlpy/assets/__pycache__/__init__.cpython-310.pyc,sha256=7Kssmev_GFPccgJ5KEospGRxf3dv_V1Dtipl8604vX0,1113
 dtlpy/assets/code_server/config.yaml,sha256=-2G8_dMvr5kVKXtixwj86l_lTYRlK5LKziDNoEtwEM0,48
 dtlpy/assets/code_server/installation.sh,sha256=mOouT6A3IhU-uan8rN3abDq5tCWUu2UOX7D_fEf-U6U,838
 dtlpy/assets/code_server/launch.json,sha256=FbZg1c1kAiDVDVENcNPj6dIxVyO1LqYlCStCo73JcjA,331
@@ -44,9 +43,9 @@ dtlpy/dlp/dlp,sha256=-F0vSCWuSOOtgERAtsPMPyMmzitjhB7Yeftg_PDlDjw,10
 dtlpy/dlp/dlp.bat,sha256=QOvx8Dlx5dUbCTMpwbhOcAIXL1IWmgVRSboQqDhIn3A,37
 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/__init__.py,sha256=HQ2p5IWmBqT5oG908poiDsSsQOnESsV_Y2rHASEHdcs,4943
 dtlpy/entities/analytic.py,sha256=5MpYDKPVsZ1MIy20Ju515RWed6P667j4TLxsan2gyNM,11925
-dtlpy/entities/annotation.py,sha256=QdxPwKyupQ_omqpxtL8qizUcZkFlLfcbuMhiBY3mYTk,67182
+dtlpy/entities/annotation.py,sha256=L1g1OyyOFC60Eo5PWnp8KPNUGPqNCQjlnAvLbT96QQI,68006
 dtlpy/entities/annotation_collection.py,sha256=CEYSBHhhDkC0VJdHsBSrA6TgdKGMcKeI3tFM40UJwS8,29838
 dtlpy/entities/app.py,sha256=dVd87-mP22NWvec5nqA5VjZ8Qk3aJlgUcloIAAOAPUw,6968
 dtlpy/entities/app_module.py,sha256=0UiAbBX1q8iEImi3nY7ySWZZHoRRwu0qUXmyXmgVAc4,3645
@@ -55,25 +54,26 @@ dtlpy/entities/assignment.py,sha256=Dc1QcfVf67GGcmDDi4ubESDuPkSgjXqdqjTBQ31faUM,
 dtlpy/entities/base_entity.py,sha256=i83KrtAz6dX4t8JEiUimLI5ZRrN0VnoUWKG2Zz49N5w,6518
 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=In9cOfc5COX9I532TDza9V5VmTOXMsA9TKgcfLPArpE,50392
+dtlpy/entities/collection.py,sha256=FPPPfIxOsBG1ujORPJVq8uXyF8vhIqC6N4EiI9SJzl0,1160
+dtlpy/entities/command.py,sha256=FtfsO6kQSZqKn-Uo8n2ryGOB01Fgr-g5ewfMCtRMTfw,5247
+dtlpy/entities/compute.py,sha256=LcrFnFwIm5HQYvtmzvZ2Eh6hvdkefTByJ9YmwqED57c,14641
+dtlpy/entities/dataset.py,sha256=GedPdhsQlWQo5H9CLsTZCqnTsyV1ppJUCwG4hukGBy0,50672
 dtlpy/entities/directory_tree.py,sha256=Rni6pLSWytR6yeUPgEdCCRfTg_cqLOdUc9uCqz9KT-Q,1186
 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/execution.py,sha256=uQe535w9OcAoDiNWf96KcpFzUDEUU-DYsUalv5VziyM,13673
 dtlpy/entities/feature.py,sha256=9fFjD0W57anOVSAVU55ypxN_WTCsWTG03Wkc3cAAj78,3732
 dtlpy/entities/feature_set.py,sha256=niw4MkmrDbD_LWQu1X30uE6U4DCzmFhPTaYeZ6VZDB0,4443
 dtlpy/entities/filters.py,sha256=PUmgor77m3CWeUgvCdWMg3Bt5SxHXPVBbN5VmD_dglQ,22683
 dtlpy/entities/gis_item.py,sha256=Uk-wMBxwcHsImjz4qOjP-EyZAohbRzN43kMpCaVjCXU,3982
 dtlpy/entities/integration.py,sha256=Kdy1j6-cJLW8qNmnqCmdg36phi843YDrlMqcMyMfvYk,5875
-dtlpy/entities/item.py,sha256=UnAZ7yLaTu2vkbD2sxysJQNn-ceC9zS3Uf304OvcC4E,31746
+dtlpy/entities/item.py,sha256=n_zJYr_QlUSBVdYu6oqgXf0JfIFRW1LBcIMMpu4vP38,34074
 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/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
@@ -96,7 +96,7 @@ dtlpy/entities/trigger.py,sha256=Spf5G3n1PsD3mDntwbAsc-DpEGDlqKgU9ec0Q0HinsQ,142
 dtlpy/entities/user.py,sha256=hqEzwN6rl1oUTpKOV5eXvw9Z7dtpsiC4TAPSNBmkqcM,3865
 dtlpy/entities/webhook.py,sha256=6R06MgLxabvKySInGlSJmaf0AVmAMe3vKusWhqONRyU,3539
 dtlpy/entities/annotation_definitions/__init__.py,sha256=qZ77hGmCQopPSpiDHYhNWbNKC7nrn10NWNlim9dINmg,666
-dtlpy/entities/annotation_definitions/base_annotation_definition.py,sha256=BXlTElzhjQ4zVwwz4i2XchDzXMLKsz_P3gwyQlsFdBM,2524
+dtlpy/entities/annotation_definitions/base_annotation_definition.py,sha256=tZGMokakJ4HjWAtD1obsgh2pORD66XWcnIT6CZLVMQs,3201
 dtlpy/entities/annotation_definitions/box.py,sha256=kNT_Ba7QWKBiyt1uPAmYLyBfPsxvIUNLhVe9042WFnM,8622
 dtlpy/entities/annotation_definitions/classification.py,sha256=uqLAAaqNww2ZwR1e4UW22foJtDxoeZXJsv5PTvyt-tA,1559
 dtlpy/entities/annotation_definitions/comparison.py,sha256=cp9HZ32wm7E78tbeoqsfJL5oZ26ojig7Cjn2FJE7mbI,1806
@@ -153,7 +153,7 @@ 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
 dtlpy/ml/train_utils.py,sha256=R-BHKRfqDoLLhFyLzsRFyJ4E-8iedj9s9oZqy3IO2rg,2404
-dtlpy/repositories/__init__.py,sha256=aBWg6mayTAy6CtfSPLxyT_Uae7hQyNTILI7sRLKNEPU,1996
+dtlpy/repositories/__init__.py,sha256=b7jPmE4meKaeikO-x87HcO2lcfQg-8OzqcYZa8n6l-Q,2033
 dtlpy/repositories/analytics.py,sha256=dQPCYTPAIuyfVI_ppR49W7_GBj0033feIm9Gd7LW1V0,2966
 dtlpy/repositories/annotations.py,sha256=b6Y9K9Yj_EaavMMrdtDG0QfhsLpz0lYpwMecTaNPmG4,42453
 dtlpy/repositories/apps.py,sha256=J-PDCPWVtvTLmzzkABs2-8zo9hGLk_z_sNR2JB1mB0c,15752
@@ -161,18 +161,19 @@ dtlpy/repositories/artifacts.py,sha256=Ke2ustTNw-1eQ0onLsWY7gL2aChjXPAX5p1uQ_EzM
 dtlpy/repositories/assignments.py,sha256=1VwJZ7ctQe1iaDDDpeYDgoj2G-TCgzolVLUEqUocd2w,25506
 dtlpy/repositories/bots.py,sha256=q1SqH01JHloljKxknhHU09psV1vQx9lPhu3g8mBBeRg,8104
 dtlpy/repositories/codebases.py,sha256=pvcZxdrq0-zWysVbdXjUOhnfcF6hJD8v5VclNZ-zhGA,24668
+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=rtgGj6jAfXxHZ1oihFoOkK4MUtapFpVMdREKzXKLnu0,44113
+dtlpy/repositories/downloader.py,sha256=CiT8KIjJ8l52Ng003f2_bmolIpe64fi8A_GGEl39M1Y,44254
 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=A_RqTJxzjTh-Wbm0uXaoTNyHSfCLbeiH38iB11p2ifY,9915
-dtlpy/repositories/integrations.py,sha256=dBTgvT8WgzNx3f7RuXxk1Or3jwj8XaBXfAVCSYUw-hI,14122
-dtlpy/repositories/items.py,sha256=9_gCSV1GuVcya8NZg-79owktpuEpC1cUOtgUB-7aK94,38427
+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
 dtlpy/repositories/nodes.py,sha256=xXJm_YA0vDUn0dVvaGeq6ORM0vI3YXvfjuylvGRtkxo,3061
@@ -195,7 +196,7 @@ dtlpy/repositories/uploader.py,sha256=5qQbsg701HrL8x0wWCRLPBP_dztqXEb31QfeZnh0SQ
 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=7ctRdpLX6QvJLI-xNRXqlqfrhOiGl5EynY9nrLkuJw4,73113
+dtlpy/services/api_client.py,sha256=pz4rScAVzJ1B13qXy2N0Oa3sfKDyR8X1UeslbR-rAb0,73173
 dtlpy/services/api_reference.py,sha256=cW-B3eoi9Xs3AwI87_Kr6GV_E6HPoC73aETFaGz3A-0,1515
 dtlpy/services/async_utils.py,sha256=kaYHTPw0Lg8PeJJq8whPyzrBYkzD7offs5hsKRZXJm8,3960
 dtlpy/services/calls_counter.py,sha256=gr0io5rIsO5-7Cgc8neA1vK8kUtYhgFPmDQ2jXtiZZs,1036
@@ -223,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.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
+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.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/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