dtlpy 1.107.8__py3-none-any.whl → 1.109.19__py3-none-any.whl

dtlpy/entities/dataset.py

@@ -626,8 +626,9 @@ class Dataset(entities.BaseEntity):
                              alpha=1,
                              export_version=ExportVersion.V1,
                              dataset_lock=False,
-                             lock_timeout_sec=None
-                             ):
+                             lock_timeout_sec=None,
+                             export_summary=False,
+                            ):
         """
         Download dataset by filters.
         Filtering the dataset for items and save them local
@@ -641,6 +642,7 @@ class Dataset(entities.BaseEntity):
         :param dtlpy.entities.filters.Filters annotation_filters: Filters entity to filter annotations for download
         :param bool overwrite: optional - default = False
         :param bool dataset_lock: optional - default = False
+        :param bool export_summary: optional - default = False
         :param int lock_timeout_sec: optional
         :param int thickness: optional - line thickness, if -1 annotation will be filled, default =1
         :param bool with_text: optional - add text to annotations, default = False
@@ -664,9 +666,10 @@ class Dataset(entities.BaseEntity):
                                          thickness=1,
                                          with_text=False,
                                          alpha=1,
-                                         dataset_lock=False
-                                         lock_timeout_sec=300
-                                         )
+                                         dataset_lock=False,
+                                         lock_timeout_sec=300,
+                                         export_summary=False
+                                        )
         """
 
         return self.datasets.download_annotations(
@@ -685,7 +688,8 @@ class Dataset(entities.BaseEntity):
             alpha=alpha,
             export_version=export_version,
             dataset_lock=dataset_lock,
-            lock_timeout_sec=lock_timeout_sec         
+            lock_timeout_sec=lock_timeout_sec,
+            export_summary=export_summary        
         )
 
     def export(self,
@@ -698,7 +702,8 @@ class Dataset(entities.BaseEntity):
                export_type: ExportType = ExportType.JSON,
                timeout: int = 0,
                dataset_lock: bool = False,
-               lock_timeout_sec: int = None):
+               lock_timeout_sec: int = None,
+               export_summary: bool = False):
         """
         Export dataset items and annotations.
 
@@ -713,6 +718,7 @@ class Dataset(entities.BaseEntity):
         :param bool include_feature_vectors: Include item feature vectors in the export
         :param bool include_annotations: Include item annotations in the export
         :param bool dataset_lock: Make dataset readonly during the export
+        :param bool export_summary: Download dataset export summary
         :param int lock_timeout_sec: Timeout for locking the dataset during export in seconds
         :param entities.ExportType export_type: Type of export ('json' or 'zip')
         :param int timeout: Maximum time in seconds to wait for the export to complete
@@ -739,7 +745,8 @@ class Dataset(entities.BaseEntity):
                                     export_type=export_type,
                                     timeout=timeout,
                                     dataset_lock=dataset_lock,
-                                    lock_timeout_sec=lock_timeout_sec)
+                                    lock_timeout_sec=lock_timeout_sec,
+                                    export_summary=export_summary)
 
     def upload_annotations(self,
                            local_path,
@@ -975,7 +982,8 @@ class Dataset(entities.BaseEntity):
             alpha=1,
             export_version=ExportVersion.V1,
             dataset_lock=False,
-            lock_timeout_sec=None
+            lock_timeout_sec=None,
+            export_summary=False,
     ):
         """
         Download dataset by filters.
@@ -991,6 +999,7 @@ class Dataset(entities.BaseEntity):
         :param dtlpy.entities.filters.Filters annotation_filters: Filters entity to filter annotations for download
         :param bool overwrite: optional - default = False to overwrite the existing files
         :param bool dataset_lock: optional - default = False to make dataset readonly during the download
+        :param bool export_summary: optional - default = False to get the symmary of the export
         :param int lock_timeout_sec: optional - Set lock timeout for the export
         :param bool to_items_folder: Create 'items' folder and download items to it
         :param int thickness: optional - line thickness, if -1 annotation will be filled, default =1
@@ -1011,7 +1020,8 @@ class Dataset(entities.BaseEntity):
                              with_text=False,
                              alpha=1,
                              dataset_lock=False,      
-                             lock_timeout_sec=300                       
+                             lock_timeout_sec=300,
+                             export_summary=False                      
                              )
         """
         return self.items.download(filters=filters,
@@ -1027,7 +1037,8 @@ class Dataset(entities.BaseEntity):
                                    alpha=alpha,
                                    export_version=export_version,
                                    dataset_lock=dataset_lock,
-                                   lock_timeout_sec=lock_timeout_sec
+                                   lock_timeout_sec=lock_timeout_sec,
+                                   export_summary=export_summary
                                    )
 
     def download_folder(
@@ -1046,7 +1057,8 @@ class Dataset(entities.BaseEntity):
             alpha=1,
             export_version=ExportVersion.V1,
             dataset_lock=False,
-            lock_timeout_sec=None
+            lock_timeout_sec=None,
+            export_summary=False,
     ):
         """
         Download dataset folder.
@@ -1062,6 +1074,7 @@ class Dataset(entities.BaseEntity):
         :param dtlpy.entities.filters.Filters annotation_filters: Filters entity to filter annotations for download
         :param bool overwrite: optional - default = False to overwrite the existing files
         :param bool dataset_lock: optional - default = False to make the dataset readonly during the download
+        :param bool export_summary: optional - default = False to get the symmary of the export
         :param bool lock_timeout_sec: optional - Set lock timeout for the export
         :param bool to_items_folder: Create 'items' folder and download items to it
         :param int thickness: optional - line thickness, if -1 annotation will be filled, default =1
@@ -1084,7 +1097,8 @@ class Dataset(entities.BaseEntity):
                              alpha=1,
                              save_locally=True,
                              dataset_lock=False
-                             lock_timeout_sec=300
+                             lock_timeout_sec=300,
+                             export_summary=False
                              )
         """
         filters = self.datasets._bulid_folder_filter(folder_path=folder_path, filters=filters)
@@ -1101,7 +1115,8 @@ class Dataset(entities.BaseEntity):
                                    alpha=alpha,
                                    export_version=export_version,
                                    dataset_lock=dataset_lock,
-                                   lock_timeout_sec=lock_timeout_sec
+                                   lock_timeout_sec=lock_timeout_sec,
+                                    export_summary=export_summary
                                    )
 
     def delete_labels(self, label_names):

dtlpy/entities/dpk.py

@@ -43,6 +43,7 @@ class Slot(entities.DlEntity):
 
 
 class Toolbar(entities.DlEntity):
+    name: str = entities.DlProperty(location=['name'], _type=str)
     display_name: str = entities.DlProperty(location=['displayName'], _type=str)
     conditions: dict = entities.DlProperty(location=['conditions'], _type=dict)
     invoke: dict = entities.DlProperty(location=['invoke'], _type=dict)

dtlpy/entities/filters.py

@@ -46,7 +46,9 @@ class FiltersResource(str, Enum):
     DRIVERS = 'drivers'
     SETTINGS = 'setting'
     RESOURCE_EXECUTION = 'resourceExecution'
-    METRICS = 'metrics'
+    METRICS = 'metrics',
+    SERVICE_DRIVER = 'serviceDrivers',
+    COMPUTE = 'compute'
 
 
 class FiltersOperations(str, Enum):
@@ -328,11 +330,10 @@ class Filters:
             # add annotations defaults
             elif self.resource == FiltersResource.ANNOTATION:
                 self._unique_fields = ['type']
-                self.add(field='type',
-                         values=['box', 'class', 'comparison', 'ellipse', 'point', 'segment', 'polyline', 'binary',
-                                 'subtitle', 'cube', 'cube_3d', 'pose', 'text_mark', 'text', 'ref_image', 'gis'],
-                         operator=FiltersOperations.IN,
-                         method=FiltersMethod.AND)
+                values = [annotation_type.value for annotation_type in entities.AnnotationType]
+                values.remove(entities.AnnotationType.NOTE.value)
+                values += ["text", "ref_image"]  # Prompt Annotation Types
+                self.add(field='type', values=values, operator=FiltersOperations.IN, method=FiltersMethod.AND)
 
     def __generate_query(self):
         filters_dict = dict()

dtlpy/entities/item.py

@@ -455,7 +455,8 @@ class Item(entities.BaseEntity):
             alpha=1,
             export_version=ExportVersion.V1,
             dataset_lock=False,
-            lock_timeout_sec=None
+            lock_timeout_sec=None,
+            export_summary=False,
     ):
         """
         Download dataset by filters.
@@ -470,6 +471,7 @@ class Item(entities.BaseEntity):
         :param dtlpy.entities.filters.Filters annotation_filters: Filters entity to filter annotations for download
         :param bool overwrite: optional - default = False
         :param bool dataset_lock: optional - default = False
+        :param bool export_summary: optional - default = False
         :param int lock_timeout_sec: optional
         :param bool to_items_folder: Create 'items' folder and download items to it
         :param int thickness: optional - line thickness, if -1 annotation will be filled, default =1
@@ -491,7 +493,8 @@ class Item(entities.BaseEntity):
                          alpha=1,
                          save_locally=True,
                          dataset_lock=False
-                         lock_timeout_sec=300
+                         lock_timeout_sec=300,
+                         export_summary=False
                          )
         """
         # if dir - concatenate local path and item name
@@ -527,7 +530,8 @@ class Item(entities.BaseEntity):
                                    export_version=export_version,
                                    filters=filters,
                                    dataset_lock=dataset_lock,
-                                   lock_timeout_sec=lock_timeout_sec)
+                                   lock_timeout_sec=lock_timeout_sec,
+                                   export_summary=export_summary)
 
     def delete(self):
         """
@@ -821,17 +825,6 @@ class Item(entities.BaseEntity):
             {"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)
     
     def task_scores(self, task_id: str, page_offset: int = None, page_size: int = None):
         """

dtlpy/entities/node.py

@@ -91,7 +91,6 @@ class PipelineNodeIO:
                  port_id: str = None,
                  color: tuple = None,
                  port_percentage: int = None,
-                 action: str = None,
                  default_value=None,
                  variable_name: str = None,
                  actions: list = None,
@@ -118,19 +117,8 @@ class PipelineNodeIO:
         self.default_value = default_value
         self.variable_name = variable_name
         self.description = description
-
-        if action is not None:
-            warnings.warn('action param has been deprecated in version 1.95', DeprecationWarning)
-            if actions is None:
-                actions = []
-            actions.append(action)
         self.actions = actions
 
-    @property
-    def action(self):
-        warnings.warn('action attribute has been deprecated in version 1.95', DeprecationWarning)
-        return None
-
     @staticmethod
     def from_json(_json: dict):
         return PipelineNodeIO(

dtlpy/entities/service.py

@@ -869,20 +869,11 @@ class KubernetesAutoscalerType(str, Enum):
 class KubernetesAutuscalerTypeMeta(type):
     def __getattribute__(cls, item):
         if hasattr(KubernetesAutoscalerType, item):
-            warnings.warn(
-                'KubernetesAutuscalerType is deprecated and will be removed in version 1.97.0, '
-                'use KubernetesAutoscalerType instead',
-                DeprecationWarning
-            )
             return getattr(KubernetesAutoscalerType, item)
         else:
             raise AttributeError(f"KubernetesAutuscalerType has no attribute '{item}'")
 
 
-class KubernetesAutuscalerType(metaclass=KubernetesAutuscalerTypeMeta):
-    pass
-
-
 class KubernetesAutoscaler(entities.BaseEntity):
     MIN_REPLICA_DEFAULT = 0
     MAX_REPLICA_DEFAULT = 1

dtlpy/entities/service_driver.py

@@ -0,0 +1,118 @@
+import traceback
+from typing import Dict
+from ..services.api_client import ApiClient
+from .. import repositories
+from .compute import ComputeContext, ComputeType
+
+class ServiceDriver:
+    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
+        self._service_drivers = None
+        self._client_api = client_api
+
+    @property
+    def service_drivers(self):
+        if self._service_drivers is None:
+            self._service_drivers = repositories.ServiceDrivers(client_api=self._client_api)
+        return self._service_drivers
+
+    @staticmethod
+    def _protected_from_json(_json: dict, client_api: ApiClient):
+        """
+        Same as from_json but with try-except to catch if error
+
+        :param _json: platform json
+        :param client_api: ApiClient entity
+        :return:
+        """
+        try:
+            service = ServiceDriver.from_json(_json=_json,
+                                              client_api=client_api)
+            status = True
+        except Exception:
+            service = traceback.format_exc()
+            status = False
+        return status, service
+
+    @classmethod
+    def from_json(cls, _json, client_api: ApiClient):
+        return cls(
+            name=_json.get('name'),
+            context=ComputeContext.from_json(_json.get('context', dict())),
+            compute_id=_json.get('computeId'),
+            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):
+        _json = {
+            'name': self.name,
+            'context': self.context.to_json(),
+            'computeId': self.compute_id,
+            'type': self.type,
+        }
+        if self.created_at is not None:
+            _json['createdAt'] = self.created_at
+        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
+
+    def delete(self):
+        """
+        Delete a service driver
+        """
+        return self.service_drivers.delete(service_driver_id=self.id)
+
+    def update(self):
+        """
+        Update a service driver
+        """
+        return self.service_drivers.update(service_driver=self)

dtlpy/entities/trigger.py

@@ -343,7 +343,7 @@ class Trigger(BaseTrigger):
             filters=spec.get('filter', dict()),
             project=project,
             service=service,
-            id=_json['id'],
+            id=_json.get('id', None),
             op_type=operation.get('type', None),
             spec=spec,
             pipeline_id=pipeline_id,

dtlpy/new_instance.py

@@ -22,7 +22,7 @@ class Dtlpy:
         # triggers
         TriggerResource, TriggerAction, TriggerExecutionMode, TriggerType,
         # faas
-        FunctionIO, KubernetesAutoscalerType, KubernetesAutuscalerType, KubernetesRabbitmqAutoscaler, KubernetesAutoscaler, KubernetesRuntime,
+        FunctionIO, KubernetesAutoscalerType, KubernetesRabbitmqAutoscaler, KubernetesAutoscaler, KubernetesRuntime,
         InstanceCatalog, PackageInputType, ServiceType, ServiceModeType,
         PackageSlot, SlotPostAction, SlotPostActionType, SlotDisplayScope, SlotDisplayScopeResource, UiBindingPanel,
         # roberto

dtlpy/repositories/__init__.py

@@ -51,5 +51,6 @@ from .dpks import Dpks
 from .messages import Messages
 from .compositions import Compositions
 from .schema import Schema
-from .computes import Computes, ServiceDrivers
+from .computes import Computes
+from .service_drivers import ServiceDrivers
 from .collections import Collections

dtlpy/repositories/apps.py

@@ -8,17 +8,21 @@ logger = logging.getLogger(name='dtlpy')
 
 class Apps:
 
-    def __init__(self, client_api: ApiClient, project: entities.Project = None):
+    def __init__(self, client_api: ApiClient, project: entities.Project = None, project_id: str = None):
         self._client_api = client_api
         self._project = project
+        self._project_id = project_id 
         self._commands = None
 
     @property
     def project(self) -> entities.Project:
         if self._project is None:
-            raise exceptions.PlatformException(
-                error='2001',
-                message='Missing "project". need to set a Project entity or use project.apps repository')
+            if self._project_id is None:
+                raise exceptions.PlatformException(
+                    error='2001',
+                    message='Missing "project". need to set a Project entity or use project.apps repository')
+            else:
+                self._project = repositories.Projects(client_api=self._client_api).get(project_id=self._project_id)
         assert isinstance(self._project, entities.Project)
         return self._project