dtlpy 1.95.6__py3-none-any.whl → 1.98.8__py3-none-any.whl

dtlpy/__init__.py

@@ -68,7 +68,7 @@ from .entities import (
     Ontology, Label, Task, TaskPriority, ConsensusTaskType, Assignment, Service, Package, Codebase, Model,
     PackageModule, PackageFunction,
     # annotations
-    Box, Cube, Cube3d, Point, Note, Message, Segmentation, Ellipse, Classification, Subtitle, Polyline, Pose,
+    Box, Cube, Cube3d, Point, Note, Message, Segmentation, Ellipse, Classification, Subtitle, Polyline, Pose, Gis, GisType,
     Description,
     Polygon, Text, FreeText, RefImage,
     # filters
@@ -93,7 +93,7 @@ from .entities import (
     Webhook, HttpMethod,
     ViewAnnotationOptions, AnnotationStatus, AnnotationType,
     ItemStatus, ExecutionStatus, ExportMetadata,
-    PromptItem, Prompt, PromptType,
+    PromptItem, Prompt, PromptType, ItemGis, Layer,
     ItemLink, UrlLink, LinkTypeEnum,
     Modality, ModalityTypeEnum, ModalityRefTypeEnum,
     Workload, WorkloadUnit, ItemAction,

dtlpy/__version__.py

@@ -1 +1 @@
-version = '1.95.6'
+version = '1.98.8'

dtlpy/entities/__init__.py

@@ -34,7 +34,7 @@ from .recipe import Recipe
 from .ontology import Ontology, AttributesTypes, AttributesRange
 from .annotation_definitions import Box, Cube, Cube3d, Point, Segmentation, Polygon, Ellipse, Classification, \
     Subtitle, Text, FreeText, RefImage, \
-    Polyline, Comparison, UndefinedAnnotationType, Note, Message, Description, Pose
+    Polyline, Comparison, UndefinedAnnotationType, Note, Message, Description, Pose, Gis, GisType
 from .label import Label
 from .codebase import Codebase, PackageCodebaseType, ItemCodebase, GitCodebase, FilesystemCodebase, LocalCodebase
 from .package import Package, RequirementOperator, PackageRequirement
@@ -78,3 +78,4 @@ from .prompt_item import Prompt, PromptItem, PromptType
 from .compute import ClusterProvider, ComputeType, ComputeStatus, Toleration, DeploymentResource, DeploymentResources, \
     NodePool, AuthenticationIntegration, Authentication, ComputeCluster, ComputeContext, Compute, KubernetesCompute, \
     ServiceDriver
+from .gis_item import  ItemGis, Layer

dtlpy/entities/annotation.py

@@ -43,6 +43,7 @@ class AnnotationType(str, Enum):
     SEGMENTATION = "binary"
     SUBTITLE = "subtitle"
     TEXT = "text_mark"
+    GIS = "gis"
 
 
 class ViewAnnotationOptions(str, Enum):
@@ -1796,6 +1797,8 @@ class FrameAnnotation(entities.BaseEntity):
             annotation = entities.Note.from_json(_json)
         elif _json['type'] == 'pose':
             annotation = entities.Pose.from_json(_json)
+        elif _json['type'] == 'gis':
+            annotation = entities.Gis.from_json(_json)
         else:
             annotation = entities.UndefinedAnnotationType.from_json(_json)
         return annotation

dtlpy/entities/annotation_definitions/__init__.py

@@ -17,3 +17,4 @@ from .pose import Pose
 from .text import Text
 from .free_text import FreeText
 from .ref_image import RefImage
+from .gis import Gis, GisType

dtlpy/entities/annotation_definitions/gis.py

@@ -0,0 +1,69 @@
+from . import BaseAnnotationDefinition
+
+
+class GisType:
+    """
+    State enum
+    """
+    BOX = 'box'
+    POLYGON = 'polygon'
+    POLYLINE = 'polyline'
+    POINT = 'point'
+
+
+class Gis(BaseAnnotationDefinition):
+    """
+        Box annotation object
+        Can create a box using 2 point using: "top", "left", "bottom", "right" (to form a box [(left, top), (right, bottom)])
+        For rotated box add the "angel"
+    """
+    type = "gis"
+
+    def __init__(self,
+                 annotation_type: GisType,
+                 geo,
+                 label=None,
+                 attributes=None,
+                 description=None,
+                 ):
+        """
+        Can create gis annotation using points:
+
+        :param geo: list of points
+        :param label: annotation label
+        :param attributes: a list of attributes for the annotation
+        :param description:
+
+        :return:
+        """
+        super().__init__(description=description, attributes=attributes)
+
+        if geo is None:
+            raise ValueError('geo must be provided')
+        if annotation_type is None:
+            raise ValueError('annotation_type must be provided')
+        self.label = label
+        self.annotation = None
+        self.geo = geo
+        self.annotation_type = annotation_type
+
+    def to_coordinates(self, color):
+        return {
+            "geo_type": self.annotation_type,
+            "wgs84_geo_coordinates": self.geo
+        }
+
+    @classmethod
+    def from_json(cls, _json):
+        json_coordinates = _json.get("coordinates", {}) if "coordinates" in _json else _json.get("data", {})
+        coordinates = json_coordinates.get("wgs84_geo_coordinates", None)
+        annotations_type = json_coordinates.get("geo_type", None)
+        if coordinates is None:
+            raise ValueError('can not find "coordinates" or "data" in annotation. id: {}'.format(_json["id"]))
+
+        return cls(
+            annotation_type=annotations_type,
+            geo=coordinates,
+            label=_json["label"],
+            attributes=_json.get("attributes", None)
+        )

dtlpy/entities/app.py

@@ -199,7 +199,7 @@ class App(entities.BaseEntity):
             name=_json.get('name', None),
             url=_json.get('url', None),
             created_at=_json.get('createdAt', None),
-            updated_at=_json.get('updateAt', None),
+            updated_at=_json.get('updatedAt', None),
             creator=_json.get('creator', None),
             project_id=_json.get('projectId', None),
             org_id=_json.get('orgId', None),

dtlpy/entities/filters.py

@@ -196,6 +196,8 @@ class Filters:
         """
         if method is None:
             method = self.method
+        if 'metadata.system.refs.metadata' in field and self.resource == FiltersResource.ITEM:
+            logger.warning('Filtering by metadata.system.refs.metadata may cause incorrect results. please use match operator')
 
         # create SingleFilter object and add to self.filter_list
         if method == FiltersMethod.OR:
@@ -328,7 +330,7 @@ class Filters:
                 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'],
+                                 'subtitle', 'cube', 'cube_3d', 'pose', 'text_mark', 'text', 'ref_image', 'gis'],
                          operator=FiltersOperations.IN,
                          method=FiltersMethod.AND)
 

dtlpy/entities/gis_item.py

@@ -0,0 +1,108 @@
+import json
+from typing import List
+import logging
+import os
+
+logger = logging.getLogger(name='dtlpy')
+
+
+class Layer:
+    def __init__(self, name, layer_type, url):
+        self.name = name
+        self.type = layer_type
+        self.url = url
+
+
+class ItemGis:
+    def __init__(self,
+                 name: str,
+                 data: dict = None,
+                 layer: Layer = None,
+                 optional_layers: List[Layer] = None,
+                 zoom: int = None,
+                 min_zoom: int = None,
+                 max_zoom: int = None,
+                 epsg: str = None,
+                 bounds: list = None,
+                 aoi: list = None):
+        self.name = name
+
+        self.layer = layer or Layer(name=data.get('name', None), layer_type=data.get('type', None),
+                                    url=data.get('url', None))
+        if self.layer is None:
+            raise ValueError('layer is required')
+        elif self.layer is not None and isinstance(self.layer, dict):
+            self.layer = Layer(name=self.layer.get('name', None), layer_type=self.layer.get('type', None), url=self.layer.get('url', None))
+
+
+        self.optional_layers = optional_layers or [
+            Layer(name=layer.get('name', None), layer_type=layer.get('type', None), url=layer.get('url', None)) for
+            layer in data.get('optionalLayers', [])]
+
+        if self.optional_layers is not None and isinstance(optional_layers, list):
+            new_optional_layers = []
+            for op_layer in self.optional_layers:
+                if isinstance(op_layer, dict):
+                    new_optional_layers.append(Layer(name=op_layer.get('name', None), layer_type=op_layer.get('type', None), url=op_layer.get('url', None)))
+                else:
+                    new_optional_layers.append(op_layer)
+            self.optional_layers = new_optional_layers
+
+        self.epsg = epsg or data.get('epsg', None)
+        if self.epsg is None:
+            raise ValueError('epsg is required')
+
+        self.zoom = zoom or data.get('zoom', None)
+        self.min_zoom = min_zoom or data.get('minZoom', None)
+        self.max_zoom = max_zoom or data.get('maxZoom', None)
+        self.bounds = bounds or data.get('bounds', None)
+        self.aoi = aoi or data.get('aoi', None)
+
+    def to_json(self):
+        _json = {
+            "type": "gis",
+            "shebang": "dataloop",
+            "metadata": {
+                "dltype": "gis"
+            },
+            'layer': {
+                'name': self.layer.name,
+                'type': self.layer.type,
+                'url': self.layer.url
+            },
+            "epsg": self.epsg
+        }
+        if self.optional_layers is not None:
+            _json['optionalLayers'] = [
+                {
+                    'name': layer.name,
+                    'type': layer.type,
+                    'url': layer.url
+                } for layer in self.optional_layers
+            ]
+        if self.zoom is not None:
+            _json['zoom'] = self.zoom
+        if self.min_zoom is not None:
+            _json['minZoom'] = self.min_zoom
+        if self.max_zoom is not None:
+            _json['maxZoom'] = self.max_zoom
+        if self.bounds is not None:
+            _json['bounds'] = self.bounds
+        if self.aoi is not None:
+            _json['aoi'] = self.aoi
+        return _json
+
+    @classmethod
+    def from_local_file(cls, filepath):
+        """
+        Create a new prompt item from a file
+        :param filepath: path to the file
+        :return: PromptItem object
+        """
+        if os.path.exists(filepath) is False:
+            raise FileNotFoundError(f'File does not exists: {filepath}')
+        if 'json' not in os.path.splitext(filepath)[-1]:
+            raise ValueError(f'Expected path to json item, got {os.path.splitext(filepath)[-1]}')
+        with open(filepath, 'r', encoding='utf-8') as f:
+            data = json.load(f)
+        return cls(name=os.path.basename(filepath), data=data)

dtlpy/entities/model.py

@@ -388,13 +388,12 @@ class Model(entities.BaseEntity):
 
     @property
     def id_to_label_map(self):
+        # default
         if 'id_to_label_map' not in self.configuration:
-            # default
-            if self.ontology_id == 'null' or self.ontology_id is None:
-                self.configuration['id_to_label_map'] = {int(idx): lbl for idx, lbl in enumerate(self.labels)}
-            else:
-                self.configuration['id_to_label_map'] = {int(idx): lbl.tag for idx, lbl in
-                                                         enumerate(self.ontology.labels)}
+            if not (self.dataset_id == 'null' or self.dataset_id is None):
+                self.labels = [label.tag for label in self.dataset.labels]
+            self.configuration['id_to_label_map'] = {int(idx): lbl for idx, lbl in enumerate(self.labels)}
+        # use existing
         else:
             self.configuration['id_to_label_map'] = {int(idx): lbl for idx, lbl in
                                                      self.configuration['id_to_label_map'].items()}

dtlpy/entities/pipeline.py

@@ -488,26 +488,35 @@ class Pipeline(entities.BaseEntity):
         """
         return self.pipelines.pause(pipeline=self, keep_triggers_active=keep_triggers_active)
 
-    def execute(self, execution_input=None):
+    def execute(self, execution_input=None, node_id: str = None):
         """
         execute a pipeline and return to execute
 
         :param execution_input: list of the dl.FunctionIO or dict of pipeline input - example {'item': 'item_id'}
+        :param str node_id: node id to execute
         :return: entities.PipelineExecution object
         """
-        execution = self.pipeline_executions.create(pipeline_id=self.id, execution_input=execution_input)
+        execution = self.pipeline_executions.create(
+            pipeline_id=self.id,
+            execution_input=execution_input,
+            node_id=node_id
+        )
         return execution
 
-    def execute_batch(self,
-                      filters,
-                      execution_inputs=None,
-                      wait=True):
+    def execute_batch(
+            self,
+            filters,
+            execution_inputs=None,
+            wait=True,
+            node_id: str = None
+    ):
         """
         execute a pipeline and return to execute
 
         :param execution_inputs: list of the dl.FunctionIO or dict of pipeline input - example {'item': 'item_id'}, that represent the extra inputs of the function
         :param filters: Filters entity for a filtering before execute
         :param bool wait: wait until create task finish
+        :param str node_id: node id to execute
         :return: entities.PipelineExecution object
 
         **Example**:
@@ -518,10 +527,13 @@ class Pipeline(entities.BaseEntity):
                         execution_inputs=dl.FunctionIO(type=dl.PackageInputType.STRING, value='test', name='string'),
                         filters=dl.Filters(field='dir', values='/test', context={'datasets': [dataset.id]))
         """
-        command = self.pipeline_executions.create_batch(pipeline_id=self.id,
-                                                        execution_inputs=execution_inputs,
-                                                        filters=filters,
-                                                        wait=wait)
+        command = self.pipeline_executions.create_batch(
+            pipeline_id=self.id,
+            execution_inputs=execution_inputs,
+            filters=filters,
+            wait=wait,
+            node_id=node_id
+        )
         return command
 
     def reset(self, stop_if_running: bool = False):
@@ -578,4 +590,3 @@ class Pipeline(entities.BaseEntity):
         for variable in self.variables:
             if variable.name in keys:
                 variable.value = kwargs[variable.name]
-

dtlpy/entities/service.py

@@ -567,14 +567,14 @@ class Service(entities.BaseEntity):
         """
         return self.services.update(service=self, force=force)
 
-    def delete(self):
+    def delete(self, force: bool = False):
         """
         Delete Service object
 
         :return: True
         :rtype: bool
         """
-        return self.services.delete(service_id=self.id)
+        return self.services.delete(service_id=self.id, force=force)
 
     def status(self):
         """
@@ -759,6 +759,32 @@ class Service(entities.BaseEntity):
                                                  wait=wait)
         return execution
 
+    def rerun_batch(self,
+                    filters,
+                    wait=True
+                    ):
+        """
+        rerun a executions on an existing service
+
+        **Prerequisites**: You must be in the role of an *owner* or *developer*. You must have a Filter.
+
+        :param filters: Filters entity for a filtering before rerun
+        :param bool wait: wait until create task finish
+        :return: rerun command
+        :rtype: dtlpy.entities.command.Command
+
+        **Example**:
+
+        .. code-block:: python
+
+            command = service.executions.rerun_batch(
+                        filters=dl.Filters(field='id', values=['executionId'], operator=dl.FiltersOperations.IN, resource=dl.FiltersResource.EXECUTION))
+        """
+        execution = self.executions.rerun_batch(service_id=self.id,
+                                                filters=filters,
+                                                wait=wait)
+        return execution
+
     def activate_slots(
             self,
             project_id: str = None,

dtlpy/ml/base_model_adapter.py

@@ -271,7 +271,7 @@ class BaseModelAdapter(utilities.BaseServiceRunner):
         :param bool overwrite: overwrite the data path (download again). default is False
         """
         # define paths
-        dataloop_path = os.path.join(os.path.expanduser('~'), '.dataloop')
+        dataloop_path = service_defaults.DATALOOP_PATH
         root_path = self.adapter_defaults.resolve("root_path", root_path)
         data_path = self.adapter_defaults.resolve("data_path", data_path)
         output_path = self.adapter_defaults.resolve("output_path", output_path)

dtlpy/new_instance.py

@@ -13,7 +13,7 @@ class Dtlpy:
         Ontology, Label, Task, TaskPriority, ConsensusTaskType, Assignment, Service, Package, Codebase, Model,
         PackageModule, PackageFunction,
         # annotations
-        Box, Cube, Cube3d, Point, Note, Message, Segmentation, Ellipse, Classification, Subtitle, Polyline, Pose,
+        Box, Cube, Cube3d, Point, Note, Message, Segmentation, Ellipse, Classification, Subtitle, Polyline, Pose, Gis, GisType,
         Description,
         Polygon, Text, FreeText, RefImage,
         # filters
@@ -38,7 +38,7 @@ class Dtlpy:
         Webhook, HttpMethod,
         ViewAnnotationOptions, AnnotationStatus, AnnotationType,
         ItemStatus, ExecutionStatus, ExportMetadata,
-        PromptItem, Prompt, PromptType,
+        PromptItem, Prompt, PromptType, ItemGis, Layer,
         ItemLink, UrlLink, LinkTypeEnum,
         Modality, ModalityTypeEnum, ModalityRefTypeEnum,
         Workload, WorkloadUnit, ItemAction,

dtlpy/repositories/annotations.py

@@ -4,6 +4,9 @@ import logging
 import json
 import jwt
 import os
+from PIL import Image
+from io import BytesIO
+import base64
 
 from .. import entities, exceptions, miscellaneous, _api_reference
 from ..services.api_client import ApiClient
@@ -309,7 +312,7 @@ class Annotations:
         """
         # get item's annotations
         annotations = self.list()
-        if 'text' in self.item.metadata.get('system').get('mimetype', ''):
+        if 'text' in self.item.metadata.get('system').get('mimetype', '') or 'json' in self.item.metadata.get('system').get('mimetype', ''):
             annotation_format = entities.ViewAnnotationOptions.JSON
         elif 'audio' not in self.item.metadata.get('system').get('mimetype', ''):
             # height/weight
@@ -487,12 +490,9 @@ class Annotations:
                 status = True
                 result = w_annotation
             else:
-                url_path = '/annotations/{}'.format(annotation_id)
-                if system_metadata:
-                    url_path += '?system=true'
-                suc, response = self._client_api.gen_request(req_type='put',
-                                                             path=url_path,
-                                                             json_req=json_req)
+                suc, response = self._update_annotation_req(annotation_json=json_req,
+                                                            system_metadata=system_metadata,
+                                                            annotation_id=annotation_id)
                 if suc:
                     result = entities.Annotation.from_json(_json=response.json(),
                                                            annotations=self,
@@ -507,6 +507,15 @@ class Annotations:
             result = traceback.format_exc()
         return status, result
 
+    def _update_annotation_req(self, annotation_json, system_metadata, annotation_id):
+        url_path = '/annotations/{}'.format(annotation_id)
+        if system_metadata:
+            url_path += '?system=true'
+        suc, response = self._client_api.gen_request(req_type='put',
+                                                     path=url_path,
+                                                     json_req=annotation_json)
+        return suc, response
+
     @_api_reference.add(path='/annotations/{annotationId}', method='put')
     def update(self, annotations, system_metadata=False):
         """
@@ -572,11 +581,12 @@ class Annotations:
                 last_frame = frame
         return annotation
 
-    def _create_batches_for_upload(self, annotations):
+    def _create_batches_for_upload(self, annotations, merge=False):
         """
         receives a list of annotations and split them into batches to optimize the upload
 
         :param annotations: list of all annotations
+        :param merge: bool - merge the new binary annotations with the existing annotations
         :return: batch_annotations: list of list of annotation. each batch with size self._upload_batch_size
         """
         annotation_batches = list()
@@ -601,8 +611,107 @@ class Annotations:
                 single_batch = list()
         if len(single_batch) > 0:
             annotation_batches.append(single_batch)
+        if merge and self.item:
+            annotation_batches = self._merge_new_annotations(annotation_batches)
+            annotation_batches = self._merge_to_exits_annotations(annotation_batches)
         return annotation_batches
 
+    def _merge_binary_annotations(self, data_url1, data_url2, item_width, item_height):
+        # Decode base64 data
+        img_data1 = base64.b64decode(data_url1.split(",")[1])
+        img_data2 = base64.b64decode(data_url2.split(",")[1])
+
+        # Convert binary data to images
+        img1 = Image.open(BytesIO(img_data1))
+        img2 = Image.open(BytesIO(img_data2))
+
+        # Create a new image with the target item size
+        merged_img = Image.new('RGBA', (item_width, item_height))
+
+        # Paste both images on the new canvas at their original sizes and positions
+        # Adjust positioning logic if needed (assuming top-left corner for both images here)
+        merged_img.paste(img1, (0, 0), img1)  # Use img1 as a mask to handle transparency
+        merged_img.paste(img2, (0, 0), img2)  # Overlay img2 at the same position
+
+        # Save the merged image to a buffer
+        buffer = BytesIO()
+        merged_img.save(buffer, format="PNG")
+        merged_img_data = buffer.getvalue()
+
+        # Encode the merged image back to a base64 string
+        merged_data_url = "data:image/png;base64," + base64.b64encode(merged_img_data).decode()
+
+        return merged_data_url
+
+    def _merge_new_annotations(self, annotations_batch):
+        """
+        Merge the new binary annotations with the existing annotations
+        :param annotations_batch: list of list of annotation. each batch with size self._upload_batch_size
+        :return: merged_annotations_batch: list of list of annotation. each batch with size self._upload_batch_size
+        """
+        for annotations in annotations_batch:
+            for annotation in annotations:
+                if annotation['type'] == 'binary' and not annotation.get('clean', False):
+                    to_merge = [a for a in annotations if
+                                not a.get('clean', False) and a.get("metadata", {}).get('system', {}).get('objectId',
+                                                                                                          None) ==
+                                annotation.get("metadata", {}).get('system', {}).get('objectId', None) and a['label'] ==
+                                annotation['label']]
+                    if len(to_merge) == 0:
+                        # no annotation to merge with
+                        continue
+                    for a in to_merge:
+                        if a['coordinates'] == annotation['coordinates']:
+                            continue
+                        merged_data_url = self._merge_binary_annotations(a['coordinates'], annotation['coordinates'],
+                                                                         self.item.width, self.item.height)
+                        annotation['coordinates'] = merged_data_url
+                        a['clean'] = True
+        return [[a for a in annotations if not a.get('clean', False)] for annotations in annotations_batch]
+
+    def _merge_to_exits_annotations(self, annotations_batch):
+        filters = entities.Filters(resource=entities.FiltersResource.ANNOTATION, field='type', values='binary')
+        filters.add(field='itemId', values=self.item.id, method=entities.FiltersMethod.AND)
+        exist_annotations = self.list(filters=filters).annotations or list()
+        to_delete = list()
+        for annotations in annotations_batch:
+            for ann in annotations:
+                if ann['type'] == 'binary':
+                    to_merge = [a for a in exist_annotations if
+                                a.object_id == ann.get("metadata", {}).get('system', {}).get('objectId',
+                                                                                             None) and a.label == ann[
+                                    'label']]
+                    if len(to_merge) == 0:
+                        # no annotation to merge with
+                        continue
+                    if to_merge[0].coordinates == ann['coordinates']:
+                        # same annotation
+                        continue
+                    if len(to_merge) > 1:
+                        raise exceptions.PlatformException('400', 'Multiple annotations with the same label')
+                    # merge
+                    exist_annotations.remove(to_merge[0])
+                    merged_data_url = self._merge_binary_annotations(to_merge[0].coordinates, ann['coordinates'],
+                                                                     self.item.width, self.item.height)
+                    json_ann = to_merge[0].to_json()
+                    json_ann['coordinates'] = merged_data_url
+                    suc, response = self._update_annotation_req(annotation_json=json_ann,
+                                                                system_metadata=True,
+                                                                annotation_id=to_merge[0].id)
+                    if not suc:
+                        raise exceptions.PlatformException(response)
+                    if suc:
+                        result = entities.Annotation.from_json(_json=response.json(),
+                                                               annotations=self,
+                                                               dataset=self._dataset,
+                                                               item=self._item)
+                        exist_annotations.append(result)
+                    to_delete.append(ann)
+        if len(to_delete) > 0:
+            annotations_batch = [[a for a in annotations if a not in to_delete] for annotations in annotations_batch]
+
+        return annotations_batch
+
     def _upload_single_batch(self, annotation_batch):
         try:
             suc, response = self._client_api.gen_request(req_type='post',
@@ -650,14 +759,15 @@ class Annotations:
         logger.info('Annotation/s uploaded successfully. num: {}'.format(len(uploaded_annotations)))
         return uploaded_annotations
 
-    async def _async_upload_annotations(self, annotations):
+    async def _async_upload_annotations(self, annotations, merge=False):
         """
         Async function to run from the uploader. will use asyncio to not break the async
-        :param annotations:
+        :param annotations: list of all annotations
+        :param merge: bool - merge the new binary annotations with the existing annotations
         :return:
         """
         async with self._client_api.event_loop.semaphore('annotations.upload'):
-            annotation_batch = self._create_batches_for_upload(annotations=annotations)
+            annotation_batch = self._create_batches_for_upload(annotations=annotations, merge=merge)
             output_annotations = list()
             for annotations_list in annotation_batch:
                 success, response = await self._client_api.gen_async_request(req_type='post',
@@ -679,7 +789,7 @@ class Annotations:
             return result
 
     @_api_reference.add(path='/items/{itemId}/annotations', method='post')
-    def upload(self, annotations) -> entities.AnnotationCollection:
+    def upload(self, annotations, merge=False) -> entities.AnnotationCollection:
         """
         Upload a new annotation/annotations. You must first create the annotation using the annotation *builder* method.
 
@@ -687,6 +797,7 @@ class Annotations:
 
         :param List[dtlpy.entities.annotation.Annotation] or dtlpy.entities.annotation.Annotation annotations: list or
         single annotation of type Annotation
+        :param bool merge: optional - merge the new binary annotations with the existing annotations
         :return: list of annotation objects
         :rtype: entities.AnnotationCollection
 
@@ -718,7 +829,7 @@ class Annotations:
             logger.warning('Annotation upload receives 0 annotations. Not doing anything')
             out_annotations = list()
         else:
-            annotation_batches = self._create_batches_for_upload(annotations=annotations)
+            annotation_batches = self._create_batches_for_upload(annotations=annotations, merge=merge)
             out_annotations = self._upload_annotations_batches(annotation_batches=annotation_batches)
         out_annotations = entities.AnnotationCollection.from_json(_json=out_annotations,
                                                                   item=self.item)

dtlpy/repositories/executions.py

@@ -1,6 +1,8 @@
 import threading
 import logging
 import time
+from copy import deepcopy
+
 import numpy as np
 
 from .. import exceptions, entities, repositories, miscellaneous, _api_reference
@@ -351,6 +353,58 @@ class Executions:
             command = command.wait(timeout=0)
         return command
 
+    @_api_reference.add(path='/executions/rerun', method='post')
+    def rerun_batch(self,
+                    filters,
+                    service_id: str = None,
+                    wait=True
+                    ):
+        """
+        rerun a executions on an existing service
+
+        **Prerequisites**: You must be in the role of an *owner* or *developer*. You must have a Filter.
+
+        :param filters: Filters entity for a filtering before rerun
+        :param str service_id: service id to rerun on
+        :param bool wait: wait until create task finish
+        :return: rerun command
+        :rtype: dtlpy.entities.command.Command
+
+        **Example**:
+
+        .. code-block:: python
+
+            command = service.executions.rerun_batch(
+                        filters=dl.Filters(field='id', values=['executionId'], operator=dl.FiltersOperations.IN, resource=dl.FiltersResource.EXECUTION))
+        """
+        url_path = '/executions/rerun'
+
+        if filters is None:
+            raise exceptions.PlatformException('400', 'Please provide filter')
+
+        if filters.resource != entities.FiltersResource.EXECUTION:
+            raise exceptions.PlatformException(
+                error='400',
+                message='Filters resource must to be FiltersResource.EXECUTION. Got: {!r}'.format(filters.resource))
+
+        if service_id is not None and not filters.has_field('serviceId'):
+            filters = deepcopy(filters)
+            filters.add(field='serviceId', values=service_id, method=entities.FiltersMethod.AND)
+
+        success, response = self._client_api.gen_request(req_type='post',
+                                                         path=url_path,
+                                                         json_req={'query': filters.prepare()['filter']})
+        # exception handling
+        if not success:
+            raise exceptions.PlatformException(response)
+
+        response_json = response.json()
+        command = entities.Command.from_json(_json=response_json,
+                                             client_api=self._client_api)
+        if wait:
+            command = command.wait(timeout=0)
+        return command
+
     def _list(self, filters: entities.Filters):
         """
         List service executions

dtlpy/repositories/items.py

@@ -465,6 +465,11 @@ class Items:
             raise exceptions.PlatformException('400',
                                                'Must provide update_values or system_update_values')
 
+        if item is not None and value_to_update:
+            raise exceptions.PlatformException('400',
+                                               'Cannot provide "update_values" or "system_update_values" with a specific "item" for an individual update. '
+                                               'These parameters are intended only for bulk updates using filters.')
+
         # update item
         if item is not None:
             json_req = miscellaneous.DictDiffer.diff(origin=item._platform_dict,
@@ -638,11 +643,6 @@ class Items:
                                  item_metadata={'Hellow': 'Word'}
                                  )
         """
-        # fix remote path
-        if remote_path is not None:
-            if not remote_path.startswith('/'):
-                remote_path = '/' + remote_path
-
         # initiate and use uploader
         uploader = repositories.Uploader(items_repository=self, output_entity=output_entity, no_output=no_output)
         return uploader.upload(

dtlpy/repositories/messages.py

@@ -38,13 +38,13 @@ class Messages:
 
             messages = dl.messages.list(context={project: id})
         """
-        user = self._client_api.info()['user_email']
 
+        user = self._client_api.info()['user_email']
         if not user:
             raise exceptions.PlatformException(error='400',
                                                message='No user in JWT, please login')
 
-        url = '/inbox/message/user/{}'.format(user)
+        url = '/inbox/message/user'
 
         query_params = {
             'newOnly': new_only,

dtlpy/repositories/pipeline_executions.py

@@ -194,16 +194,21 @@ class PipelineExecutions:
         return paged
 
     @_api_reference.add(path='/pipelines/{pipelineId}/execute', method='post')
-    def create(self,
-               pipeline_id: str = None,
-               execution_input=None):
+    def create(
+            self,
+            pipeline_id: str = None,
+            execution_input=None,
+            node_id: str = None
+    ):
         """
-        Execute a pipeline and return the execute.
+        Execute a pipeline.
 
         **prerequisites**: You must be an *owner* or *developer* to use this method.
 
         :param pipeline_id: pipeline id
         :param execution_input: list of the dl.FunctionIO or dict of pipeline input - example {'item': 'item_id'}
+        :param node_id: node id to start from
+
         :return: entities.PipelineExecution object
         :rtype: dtlpy.entities.pipeline_execution.PipelineExecution
 
@@ -234,6 +239,9 @@ class PipelineExecutions:
             else:
                 raise exceptions.PlatformException('400', 'Unknown input type')
 
+        if node_id is not None:
+            payload['nodeId'] = node_id
+
         success, response = self._client_api.gen_request(
             path='/pipelines/{}/execute'.format(pipeline_id),
             req_type='POST',
@@ -249,13 +257,16 @@ class PipelineExecutions:
         return execution
 
     @_api_reference.add(path='/pipelines/{pipelineId}/execute', method='post')
-    def create_batch(self,
-                     pipeline_id: str,
-                     filters,
-                     execution_inputs=None,
-                     wait=True):
+    def create_batch(
+            self,
+            pipeline_id: str,
+            filters,
+            execution_inputs=None,
+            wait=True,
+            node_id: str = None
+    ):
         """
-        Execute a pipeline and return the execute.
+        Create batch executions of a pipeline.
 
         **prerequisites**: You must be an *owner* or *developer* to use this method.
 
@@ -301,6 +312,9 @@ class PipelineExecutions:
         payload['batch']['query'] = filters.prepare()
         payload['batch']['args'] = extra_input
 
+        if node_id is not None:
+            payload['nodeId'] = node_id
+
         success, response = self._client_api.gen_request(
             path='/pipelines/{}/execute'.format(pipeline_id),
             req_type='POST',

dtlpy/repositories/services.py

@@ -1069,6 +1069,8 @@ class Services:
 
         if project_id is not None:
             payload['projectId'] = project_id
+        else:
+            payload['projectId'] = service.project_id
 
         # request
         success, response = self._client_api.gen_request(req_type='post',

dtlpy/repositories/tasks.py

@@ -642,10 +642,19 @@ class Tasks:
             if filters is None and items is None:
                 query = entities.Filters().prepare()
             elif filters is None:
-                if not isinstance(items, list):
-                    items = [items]
+                item_list = list()
+                if isinstance(items, entities.PagedEntities):
+                    for page in items:
+                        for item in page:
+                            item_list.append(item)
+                elif isinstance(items, list):
+                    item_list = items
+                elif isinstance(items, entities.Item):
+                    item_list.append(items)
+                else:
+                    raise exceptions.PlatformException('400', 'Unknown items type')
                 query = entities.Filters(field='id',
-                                         values=[item.id for item in items],
+                                         values=[item.id for item in item_list],
                                          operator=entities.FiltersOperations.IN,
                                          use_defaults=False).prepare()
             else:

dtlpy/repositories/uploader.py

@@ -133,11 +133,13 @@ class Uploader:
                                     item_metadata,
                                     export_version: str = entities.ExportVersion.V1,
                                     item_description=None):
-
+        # fix remote path
         if remote_path is None:
-            remote_path = '/'
+            remote_path = "/"
+        if not remote_path.startswith('/'):
+            remote_path = f"/{remote_path}"
         if not remote_path.endswith("/"):
-            remote_path += "/"
+            remote_path = f"{remote_path}/"
         if file_types is not None and not isinstance(file_types, list):
             msg = '"file_types" should be a list of file extension. e.g [".jpg", ".png"]'
             raise PlatformException(error="400", message=msg)
@@ -279,6 +281,12 @@ class Uploader:
             elif isinstance(upload_item_element, entities.PromptItem):
                 upload_elem = upload_element.PromptUploadElement(all_upload_elements=all_upload_elements)
 
+            elif isinstance(upload_item_element, entities.ItemGis):
+                buffer = io.BytesIO(json.dumps(upload_item_element.to_json()).encode('utf-8'))
+                buffer.name = upload_item_element.name
+                all_upload_elements['upload_item_element'] = buffer
+                upload_elem = upload_element.BinaryUploadElement(all_upload_elements=all_upload_elements)
+
             elif isinstance(upload_item_element, bytes) or \
                     isinstance(upload_item_element, io.BytesIO) or \
                     isinstance(upload_item_element, io.BufferedReader) or \
@@ -451,7 +459,7 @@ class Uploader:
         return item, response.headers.get('x-item-op', 'na')
 
     async def __upload_single_item_wrapper(self, element, pbar, reporter, mode):
-        async with self.items_repository._client_api.event_loop.semaphore('items.upload'):
+        async with self.items_repository._client_api.event_loop.semaphore('items.upload', 5):
             # assert isinstance(element, UploadElement)
             item = False
             err = None

dtlpy/services/api_client.py

@@ -74,8 +74,6 @@ class PlatformError(Exception):
         super().__init__(msg)
 
 
-
-
 class Callbacks:
     def __init__(self):
         self._callbacks = {}
@@ -1172,7 +1170,12 @@ class ApiClient:
                 def callback(bytes_read):
                     pass
 
-        timeout = aiohttp.ClientTimeout(total=2 * 60)
+        timeout = aiohttp.ClientTimeout(
+            total=None,  # Disable overall timeout
+            connect=2 * 60,  # Set connect timeout (in seconds)
+            sock_read=10 * 60,  # Set read timeout for socket read operations
+            sock_connect=2 * 60  # Set timeout for connection setup
+        )
         async with aiohttp.ClientSession(headers=headers, timeout=timeout) as session:
             try:
                 form = aiohttp.FormData({})
@@ -1634,6 +1637,30 @@ class ApiClient:
             self._send_login_event(user_type='human', login_type='refresh')
         return res
 
+    def generate_api_key(self, description: str = None, login: bool = False):
+        """
+        Generate an API key for a user
+        :param description: description for the API key
+        :param login: if True, login with the new API key
+        :return: User token
+        """
+        user_email = self.info()['user_email']
+        payload = {
+            'userId': user_email
+        }
+        if description:
+            if not isinstance(description, str):
+                raise ValueError('description should be a string')
+            payload['description'] = description
+        success, response = self.gen_request(req_type='post', path='/apiKeys', json_req=payload)
+        if not success:
+            raise exceptions.PlatformException(response)
+        if login:
+            self.login_api_key(response.json()['jwt'])
+            return True
+
+        return response.json()['jwt']
+
     def _renew_token_with_refresh_token(self):
         renewed = False
         if self.refresh_token_active is False:
@@ -1668,10 +1695,13 @@ class ApiClient:
             'refresh_token': refresh_token
         }
         logger.debug("RefreshToken: Refreshing token via {}".format(token_endpoint))
-        resp = requests.request("POST",
-                                token_endpoint,
-                                json=payload,
-                                headers={'content-type': 'application/json'})
+        resp = requests.request(
+            "POST",
+            token_endpoint,
+            json=payload,
+            headers={'content-type': 'application/json'},
+            verify=self.verify
+        )
         if not resp.ok:
             logger.debug('RefreshToken: Failed')
             self.print_bad_response(resp)

dtlpy/services/async_utils.py

@@ -33,9 +33,11 @@ class AsyncThreadEventLoop(threading.Thread):
         self.loop.run_forever()
         logger.debug('Ended event loop with bounded semaphore to {}'.format(self.n))
 
-    def semaphore(self, name):
+    def semaphore(self, name, n=None):
+        if n is None:
+            n = self.n
         if name not in self._semaphores:
-            self._semaphores[name] = asyncio.BoundedSemaphore(self.n)
+            self._semaphores[name] = asyncio.BoundedSemaphore(n)
         return self._semaphores[name]
 
     def stop(self):

{dtlpy-1.95.6.dist-info → dtlpy-1.98.8.dist-info}/METADATA

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

{dtlpy-1.95.6.dist-info → dtlpy-1.98.8.dist-info}/RECORD

@@ -1,7 +1,7 @@
-dtlpy/__init__.py,sha256=nE2SN0AD2rZ_ekF_kD7OzZbSE32H8zV5UM6t_E0LzTw,20647
-dtlpy/__version__.py,sha256=3OtkFGDOCL5-ZRo52dswwfcY5vYhh114MOzr2lJhEAA,19
+dtlpy/__init__.py,sha256=fZYNrXe_suwThe-iSg5z45dkhTqiHe7btaxjhITesXE,20677
+dtlpy/__version__.py,sha256=VyHfNvXyywstm8UJU4FD18Pn8gxwDCQgKYhzxKXGUUY,19
 dtlpy/exceptions.py,sha256=EQCKs3pwhwZhgMByQN3D3LpWpdxwcKPEEt-bIaDwURM,2871
-dtlpy/new_instance.py,sha256=ORhXmIsc8Kut2M1jekKL3dG_adRp7axK-25B4zJNqMU,10091
+dtlpy/new_instance.py,sha256=u_c6JtgqsKCr7TU24-g7_CaST9ghqamMhM4Z0Zxt50w,10121
 dtlpy/assets/__init__.py,sha256=D_hAa6NM8Zoy32sF_9b7m0b7I-BQEyBFg8-9Tg2WOeo,976
 dtlpy/assets/lock_open.png,sha256=BH9uyf5uYvgZrDpDw9qCUnT3UbkXG8XbeRmWDpWlV4M,18215
 dtlpy/assets/main.py,sha256=N1JUsx79qnXI7Hx22C8JOzHJdGHxvrXeTx5UZAxvJfE,1380
@@ -44,11 +44,11 @@ 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=R2kDC9VHOeRSTgXXqNowbf_yZwy7tbAkukvIlPZmPVE,4856
+dtlpy/entities/__init__.py,sha256=Sihb652vYCyCWSQfiYTEGQW0EJsHe7BTk6-S5DOsAb0,4908
 dtlpy/entities/analytic.py,sha256=5MpYDKPVsZ1MIy20Ju515RWed6P667j4TLxsan2gyNM,11925
-dtlpy/entities/annotation.py,sha256=yk-JQzgzXvnDLFrOkmcHQfEtsiPqZeIisv80ksNB-f8,66912
+dtlpy/entities/annotation.py,sha256=sqgnONKbNb9gmPLJBH3mYJhFWeKjoiJ8dt57Cz7C6YA,67020
 dtlpy/entities/annotation_collection.py,sha256=CEYSBHhhDkC0VJdHsBSrA6TgdKGMcKeI3tFM40UJwS8,29838
-dtlpy/entities/app.py,sha256=VA1Sex80H9ebeYbjUYUbvHoyn3a-uqMtGkSauPsn1VM,6957
+dtlpy/entities/app.py,sha256=LQ0cDuqeNtO7iihrTq8MBLrFbZiDVs6AFoAi4UQtUZY,6958
 dtlpy/entities/app_module.py,sha256=0UiAbBX1q8iEImi3nY7ySWZZHoRRwu0qUXmyXmgVAc4,3645
 dtlpy/entities/artifact.py,sha256=wtLtBuidOPbnba0ok40JyunCCIBGbAl4bP_ebK39Kk4,5711
 dtlpy/entities/assignment.py,sha256=Dc1QcfVf67GGcmDDi4ubESDuPkSgjXqdqjTBQ31faUM,14722
@@ -64,13 +64,14 @@ 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=tA-A0dS8nhMbnkHIo-INK6UuKzEPMyCdTs51K1-Vl9Y,22441
+dtlpy/entities/filters.py,sha256=_A7rLc0yuMw1eW4gSu4-hogQzXbNUheRvFxnTQWntuo,22671
+dtlpy/entities/gis_item.py,sha256=Uk-wMBxwcHsImjz4qOjP-EyZAohbRzN43kMpCaVjCXU,3982
 dtlpy/entities/integration.py,sha256=CA5F1eQCGE_4c_Kry4nWRdeyjHctNnvexcDXg_M5HLU,5734
 dtlpy/entities/item.py,sha256=G6VVcVCudqeShWigZmNIuKD4OkvTRJ05CeXFXNe3Jk8,29691
 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=LEot0PHOxPSeK9SCzAT6pofbLrbfybFYmr6v9YsiuB4,24927
+dtlpy/entities/model.py,sha256=UKtai_V8ckTNPlhzflmJNHXJvH6BH9UYOwCMWXNZueU,24822
 dtlpy/entities/node.py,sha256=yPPYDLtNMc6vZbbf4FIffY86y7tkaTvYm42Jb7k3Ofk,39617
 dtlpy/entities/ontology.py,sha256=ok4p3sLBc_SS5hs2gZr5-gbblrveM7qSIX4z67QSKeQ,31967
 dtlpy/entities/organization.py,sha256=AMkx8hNIIIjnu5pYlNjckMRuKt6H3lnOAqtEynkr7wg,9893
@@ -80,21 +81,21 @@ dtlpy/entities/package_function.py,sha256=M42Kvw9A8b6msAkv-wRNAQg_-UC2bejniCjeKD
 dtlpy/entities/package_module.py,sha256=cOkIITATkzzCQpE0sdPiBUisAz8ImlPG2YGZ0K7SypA,5151
 dtlpy/entities/package_slot.py,sha256=XBwCodQe618sQm0bmx46Npo94mEk-zUV7ZX0mDRcsD8,3946
 dtlpy/entities/paged_entities.py,sha256=6y44H3FSclQvhB1KLI4zuIs317hWOhdHUynldRrUJkE,5913
-dtlpy/entities/pipeline.py,sha256=OrRybxEa29S4sKtl7RTdf6kRgnQi90n4wlN4OsMJJLk,20671
+dtlpy/entities/pipeline.py,sha256=X9238WbMGfZcXdQVEtkw8twZwl0O4EZB4TxbTSEyPeI,20788
 dtlpy/entities/pipeline_execution.py,sha256=XCXlBAHFYVL2HajE71hK-bPxI4gTwZvg5SKri4BgyRA,9928
 dtlpy/entities/project.py,sha256=ZUx8zA3mr6N145M62R3UDPCCzO1vxfyWO6vjES-bO-g,14653
 dtlpy/entities/prompt_item.py,sha256=Kmvguz3f0sGtkKZS9OEA_-Yi4aQRCgdg1GBkaLQyyTg,19592
 dtlpy/entities/recipe.py,sha256=Q1HtYgind3bEe-vnDZWhw6H-rcIAGhkGHPRWtLIkPSE,11917
 dtlpy/entities/reflect_dict.py,sha256=2NaSAL-CO0T0FYRYFQlaSpbsoLT2Q18AqdHgQSLX5Y4,3273
 dtlpy/entities/resource_execution.py,sha256=1HuVV__U4jAUOtOkWlWImnM3Yts8qxMSAkMA9sBhArY,5033
-dtlpy/entities/service.py,sha256=ZV3HhBbafs0N_lSIWxu4CNJ39WThd7z5GAd0fCvSnFg,32462
+dtlpy/entities/service.py,sha256=3A_kcEUCbaS-Qx31rfNyThYK7OxUrzHiE6shT0Oxh60,33467
 dtlpy/entities/setting.py,sha256=uXagJHtcCR3nJYClR_AUGZjz_kx3TejPcUZ8ginHFIA,8561
 dtlpy/entities/task.py,sha256=XHiEqZYFlrDCtmw1MXsysjoBLdIzAk7coMrVk8bNIiE,19534
 dtlpy/entities/time_series.py,sha256=336jWNckjuSn0G29WJFetB7nBoFAKqs4VH9_IB4m4FE,4017
 dtlpy/entities/trigger.py,sha256=zh3wYUY2-zATh_7ous0Ck87Yojo9r9PAVQrkcESxoko,14266
 dtlpy/entities/user.py,sha256=hqEzwN6rl1oUTpKOV5eXvw9Z7dtpsiC4TAPSNBmkqcM,3865
 dtlpy/entities/webhook.py,sha256=6R06MgLxabvKySInGlSJmaf0AVmAMe3vKusWhqONRyU,3539
-dtlpy/entities/annotation_definitions/__init__.py,sha256=Y_L9JGbRoQQKkoPMCUnLotbytgYK6244WtR8sySmINQ,636
+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/box.py,sha256=kNT_Ba7QWKBiyt1uPAmYLyBfPsxvIUNLhVe9042WFnM,8622
 dtlpy/entities/annotation_definitions/classification.py,sha256=uqLAAaqNww2ZwR1e4UW22foJtDxoeZXJsv5PTvyt-tA,1559
@@ -104,6 +105,7 @@ dtlpy/entities/annotation_definitions/cube_3d.py,sha256=PTCXoyVfBo3YrCiMDqcBMuTc
 dtlpy/entities/annotation_definitions/description.py,sha256=2Gh9zF-a2EsLKf4-E3LcftAo2sZ0z-zBGMi5ZnhMY1s,919
 dtlpy/entities/annotation_definitions/ellipse.py,sha256=J9jEc3xke7XD5X_SdiSEsdDIOfxIN0KnInQ0P0J8QrI,4054
 dtlpy/entities/annotation_definitions/free_text.py,sha256=KVESLAEXoHe1StA99ri-hYCjoIiSMLCkpKbdGFm_DFg,1631
+dtlpy/entities/annotation_definitions/gis.py,sha256=D6eb5Hr5yvKvbi0Dnq4YGc6uytGuVk9Y1jHpAg5QCEg,2079
 dtlpy/entities/annotation_definitions/note.py,sha256=4jHJhC4e2peZ5LSb7DdU50XqBYR9R6ytyHG2vV2mx98,4105
 dtlpy/entities/annotation_definitions/point.py,sha256=IkrFlTAIPk8dz_Qkr65L-arLTlkIA3-cebrKcwDbhaM,3271
 dtlpy/entities/annotation_definitions/polygon.py,sha256=gI28yzvYgDj_js6bU9djAzswXwOBdc5GiauAnJa0M78,6346
@@ -146,14 +148,14 @@ 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=mcq_1ELAcJ6xzqYg_U0E3rOD-rJumgSu8YeSL9R7czc,50901
+dtlpy/ml/base_model_adapter.py,sha256=DCf9anJLrxh-kBr1WdgXtx84oqBlAue87QV_1V-260E,50881
 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/analytics.py,sha256=dQPCYTPAIuyfVI_ppR49W7_GBj0033feIm9Gd7LW1V0,2966
-dtlpy/repositories/annotations.py,sha256=E7iHo8UwDAhdulqh0lGr3fGQ-TSwZXXGsEXZA-WJ_NA,35780
+dtlpy/repositories/annotations.py,sha256=b6Y9K9Yj_EaavMMrdtDG0QfhsLpz0lYpwMecTaNPmG4,42453
 dtlpy/repositories/apps.py,sha256=J-PDCPWVtvTLmzzkABs2-8zo9hGLk_z_sNR2JB1mB0c,15752
 dtlpy/repositories/artifacts.py,sha256=Ke2ustTNw-1eQ0onLsWY7gL2aChjXPAX5p1uQ_EzMbo,19081
 dtlpy/repositories/assignments.py,sha256=1VwJZ7ctQe1iaDDDpeYDgoj2G-TCgzolVLUEqUocd2w,25506
@@ -166,36 +168,36 @@ dtlpy/repositories/datasets.py,sha256=rDpJXNyxOlJwDQB-wNkM-JIqOGH10q9nujnAl6y8_x
 dtlpy/repositories/downloader.py,sha256=pNwL7Nid8xmOyYNiv4DB_WY4RoKlxQ-U9nG2V99Gyr8,41342
 dtlpy/repositories/dpks.py,sha256=mj3QPvfzj_jZAscwIgpKUfa7fLxptc3OJQ_RrSfgYxo,17487
 dtlpy/repositories/drivers.py,sha256=fF0UuHCyBzop8pHfryex23mf0kVFAkqzNdOmwBbaWxY,10204
-dtlpy/repositories/executions.py,sha256=M84nhpFPPZq4fQeJ2m_sv6JT4NE2WDRMOXWr451J0bU,30403
+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=DqJ3g9bc4OLMm9KqI-OebXbr-zcEiohO1wGZJ1uE2Lg,37874
-dtlpy/repositories/messages.py,sha256=zYcoz8Us6j8Tb5Z7luJuvtO9xSRTuOCS7pl-ztt97Ac,3082
+dtlpy/repositories/items.py,sha256=90Z8-thLWBd49fmmnP-P6pZxhHX1k4Wv6Qfxq-Ovcz4,38092
+dtlpy/repositories/messages.py,sha256=QU0Psckg6CA_Tlw9AVxqa-Ay1fRM4n269sSIJkH9o7E,3066
 dtlpy/repositories/models.py,sha256=GdVWHJ6kOIxM01wH7RVQ3CVaR4OmGurWJdQVHZezLDM,34789
 dtlpy/repositories/nodes.py,sha256=xXJm_YA0vDUn0dVvaGeq6ORM0vI3YXvfjuylvGRtkxo,3061
 dtlpy/repositories/ontologies.py,sha256=unnMhD2isR9DVE5S8Fg6fSDf1ZZ5Xemxxufx4LEUT3w,19577
 dtlpy/repositories/organizations.py,sha256=6ijUDFbsogfRul1g_vUB5AZOb41MRmV5NhNU7WLHt3A,22825
 dtlpy/repositories/packages.py,sha256=QhkXMZkpseCt0pDropJuqoHJL0RMa5plk8AN0V3w6Nk,86807
-dtlpy/repositories/pipeline_executions.py,sha256=zQNRejj23r5q1cSp88KMoeOGUOUbbg3Yi-ER7qZfyF8,16781
+dtlpy/repositories/pipeline_executions.py,sha256=hJX2I939c-bWxveVdikZ_9LWMNCQusTRkkdEa5j3Yvo,17007
 dtlpy/repositories/pipelines.py,sha256=VDAOsGbgD1_AKdMrJl_qB3gxPs7f3pwUnPx0pT1iAWk,23977
 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
 dtlpy/repositories/schema.py,sha256=kTKDrbwm7BfQnBAK81LpAl9ChNFdyUweSLNazlJJhjk,3953
-dtlpy/repositories/services.py,sha256=8hu6CgIyGQHOOlBmZmmM-oY8i-adU_99lSN46FGvvkc,67421
+dtlpy/repositories/services.py,sha256=kG2CW4xKKO5mbFv93Km-6gxq-Zq6-6GToEtQQ0R-KWA,67489
 dtlpy/repositories/settings.py,sha256=pvqNse0ANCdU3NSLJEzHco-PZq__OIsPSPVJveB9E4I,12296
-dtlpy/repositories/tasks.py,sha256=nA3rODvS8Q361xDmPXII-VPzktzoxbAApxTkzC5wv4M,48601
+dtlpy/repositories/tasks.py,sha256=v09S2pYGkKx_vBG7SWigJeuMhp0GsefKo3Td7ImrWb0,49039
 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=4CDZRKLubanOP0ZyGwxAHTtl6GLzwAyRAIm-PLYt0ck,10140
-dtlpy/repositories/uploader.py,sha256=iOlDYWIMy_h1Rbd7Mfug1I0e93dBJ0SxqP_BOwqYQPQ,30697
+dtlpy/repositories/uploader.py,sha256=SW3mJHFgd5JgYUhwTwm63xXFQ8DB97-bIzc3Fk9BYMU,31219
 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=DBelaW5qpZoX7vQXjgLL2xTcTwUqJodZ901g0C3Panw,68331
+dtlpy/services/api_client.py,sha256=DRGSi2gTbgLh_LR0vhwWh3f-tYuJql6VKL58Ov1Iqug,69478
 dtlpy/services/api_reference.py,sha256=cW-B3eoi9Xs3AwI87_Kr6GV_E6HPoC73aETFaGz3A-0,1515
-dtlpy/services/async_utils.py,sha256=lfpkTkRUvQoMTxaRZBHbPt5e43qdvpCGDe_-KcY2Jps,2810
+dtlpy/services/async_utils.py,sha256=bVz7PLCpnldyQXMKTPahnQqAudxNW1-c71nfMjcI41Q,2858
 dtlpy/services/calls_counter.py,sha256=gr0io5rIsO5-7Cgc8neA1vK8kUtYhgFPmDQ2jXtiZZs,1036
 dtlpy/services/check_sdk.py,sha256=tnFWCzkJa8w2jLtw-guwuqpOtXGyiVU7ZCDFiUZUqzY,3593
 dtlpy/services/cookie.py,sha256=sSZR1QV4ienCcZ8lEK_Y4nZYBgAxO3kHrcBXFKGcmwQ,3694
@@ -221,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.95.6.data/scripts/dlp,sha256=-F0vSCWuSOOtgERAtsPMPyMmzitjhB7Yeftg_PDlDjw,10
-dtlpy-1.95.6.data/scripts/dlp.bat,sha256=QOvx8Dlx5dUbCTMpwbhOcAIXL1IWmgVRSboQqDhIn3A,37
-dtlpy-1.95.6.data/scripts/dlp.py,sha256=tEokRaDINISXnq8yNx_CBw1qM5uwjYiZoJOYGqWB3RU,4267
+dtlpy-1.98.8.data/scripts/dlp,sha256=-F0vSCWuSOOtgERAtsPMPyMmzitjhB7Yeftg_PDlDjw,10
+dtlpy-1.98.8.data/scripts/dlp.bat,sha256=QOvx8Dlx5dUbCTMpwbhOcAIXL1IWmgVRSboQqDhIn3A,37
+dtlpy-1.98.8.data/scripts/dlp.py,sha256=tEokRaDINISXnq8yNx_CBw1qM5uwjYiZoJOYGqWB3RU,4267
 tests/assets/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/assets/models_flow/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/assets/models_flow/failedmain.py,sha256=n8F4eu_u7JPrJ1zedbJPvv9e3lHb3ihoErqrBIcseEc,1847
-tests/assets/models_flow/main.py,sha256=87O3-JaWcC6m_kA39sqPhX70_VCBzzbLWmX2YQFilJw,1873
+tests/assets/models_flow/main.py,sha256=xotAjdHpFnIic3Wb-4f7GSg2igtuXZjvRPiYdCTawhA,2064
 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.95.6.dist-info/LICENSE,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
-dtlpy-1.95.6.dist-info/METADATA,sha256=gwEWuQCr9AOla7PZkit6MzkeFa6pW626gXqni3GPKVM,3002
-dtlpy-1.95.6.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-dtlpy-1.95.6.dist-info/entry_points.txt,sha256=C4PyKthCs_no88HU39eioO68oei64STYXC2ooGZTc4Y,43
-dtlpy-1.95.6.dist-info/top_level.txt,sha256=ZWuLmQGUOtWAdgTf4Fbx884w1o0vBYq9dEc1zLv9Mig,12
-dtlpy-1.95.6.dist-info/RECORD,,
+dtlpy-1.98.8.dist-info/LICENSE,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
+dtlpy-1.98.8.dist-info/METADATA,sha256=21j22oI6cRAaGPEiDzFoctdPwBRHrm3wGwQlrVCiB90,3002
+dtlpy-1.98.8.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+dtlpy-1.98.8.dist-info/entry_points.txt,sha256=C4PyKthCs_no88HU39eioO68oei64STYXC2ooGZTc4Y,43
+dtlpy-1.98.8.dist-info/top_level.txt,sha256=ZWuLmQGUOtWAdgTf4Fbx884w1o0vBYq9dEc1zLv9Mig,12
+dtlpy-1.98.8.dist-info/RECORD,,

tests/assets/models_flow/main.py

@@ -49,3 +49,10 @@ class ModelAdapter(dl.BaseModelAdapter):
 
     def convert_from_dtlpy(self, data_path, **kwargs):
         logger.info("convert_from_dtlpy")
+
+    def embed(self, batch, **kwargs):
+        logger.info("embed model")
+        embeddings = []
+        for item in batch:
+            embeddings.append([1,2,3,4])
+        return embeddings