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

dtlpy/__init__.py

@@ -177,6 +177,7 @@ login = client_api.login
 logout = client_api.logout
 login_token = client_api.login_token
 login_secret = client_api.login_secret
+login_api_key = client_api.login_api_key
 login_m2m = client_api.login_m2m
 add_environment = client_api.add_environment
 setenv = client_api.setenv

dtlpy/__version__.py

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

dtlpy/dlp/command_executor.py

@@ -59,6 +59,9 @@ class CommandExecutor:
         self.dl.login_token(args.token)
         self.dl.info(with_token=False)
 
+    def login_api_key(self, args):
+        self.dl.login_api_key(api_key=args.api_key)
+
     def login_secret(self, args):
         self.login_m2m(args=args)
 
@@ -587,6 +590,18 @@ class CommandExecutor:
         elif args.app == 'update':
             # TODO: I think it changed, not implemented
             logger.info('App updated successfully')
+        elif args.app == 'resume':
+            succeed = self.utils.get_apps_repo(args).resume(app_id=args.app_id)
+            if succeed is True:
+                logger.info('Resumed application successfully')
+            else:
+                logger.info('Application resume failed')
+        elif args.app == 'pause':
+            succeed = self.utils.get_apps_repo(args).pause(app_id=args.app_id)
+            if succeed is True:
+                logger.info('Paused application successfully')
+            else:
+                logger.info('Application pause failed')
         elif args.app == 'install':
             app = self.utils.get_apps_repo(args).install(
                 dpk=self.utils.get_dpks_repo(args).get(dpk_id=args.dpk_id),

dtlpy/entities/app.py

@@ -46,6 +46,7 @@ class App(entities.BaseEntity):
     routes = attr.ib(type=dict)
     custom_installation = attr.ib(type=dict)
     metadata = attr.ib(type=dict)
+    status = attr.ib(type=entities.CompositionStatus)
 
     # sdk
     _project = attr.ib(type=entities.Project, repr=False)
@@ -98,6 +99,30 @@ class App(entities.BaseEntity):
         """
         return self.apps.update(self)
 
+    def resume(self):
+        """
+        Resume the current app
+
+        :return bool whether the operation ran successfully or not
+
+        **Example**
+        .. code-block:: python
+            succeed = app.resume()
+        """
+        return self.apps.resume(self)
+
+    def pause(self):
+        """
+        Pause the current app
+
+        :return bool whether the operation ran successfully or not
+
+        **Example**
+        .. code-block:: python
+            succeed = app.pause()
+        """
+        return self.apps.pause(self)
+
     @staticmethod
     def _protected_from_json(_json, client_api, project, is_fetched=True):
         """
@@ -150,6 +175,8 @@ class App(entities.BaseEntity):
             _json['customInstallation'] = self.custom_installation
         if self.metadata is not None:
             _json['metadata'] = self.metadata
+        if self.status is not None:
+            _json['status'] = self.status
 
         return _json
 
@@ -172,7 +199,8 @@ class App(entities.BaseEntity):
             custom_installation=_json.get('customInstallation', {}),
             client_api=client_api,
             project=project,
-            metadata=_json.get('metadata', None)
+            metadata=_json.get('metadata', None),
+            status=_json.get('status', None)
         )
         app.is_fetched = is_fetched
         return app

dtlpy/entities/base_entity.py

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

dtlpy/entities/dataset.py

@@ -281,7 +281,7 @@ class Dataset(entities.BaseEntity):
     def set_repositories(self):
         reps = namedtuple('repositories',
                           field_names=['items', 'recipes', 'datasets', 'assignments', 'tasks', 'annotations',
-                                       'ontologies', 'features', 'settings'])
+                                       'ontologies', 'features', 'settings', 'schema'])
         if self._project is None:
             datasets = repositories.Datasets(client_api=self._client_api, project=self._project)
             features = repositories.Features(client_api=self._client_api, project=self._project)
@@ -299,6 +299,7 @@ class Dataset(entities.BaseEntity):
             ontologies=repositories.Ontologies(client_api=self._client_api, dataset=self),
             features=features,
             settings=repositories.Settings(client_api=self._client_api, dataset=self),
+            schema=repositories.Schema(client_api=self._client_api, dataset=self)
         )
 
     @property
@@ -346,6 +347,11 @@ class Dataset(entities.BaseEntity):
         assert isinstance(self._repositories.features, repositories.Features)
         return self._repositories.features
 
+    @property
+    def schema(self):
+        assert isinstance(self._repositories.schema, repositories.Schema)
+        return self._repositories.schema
+
     @property
     def project(self):
         if self._project is None:

dtlpy/entities/dpk.py

@@ -104,6 +104,7 @@ class PipelineNode(entities.DlEntity):
     description: str = entities.DlProperty(location=['description'], _type=str)
     configuration: dict = entities.DlProperty(location=['configuration'], _type=dict)
     scope: CustomNodeScope = entities.DlProperty(location=['scope'], _type=CustomNodeScope)
+    compute_config: str = entities.DlProperty(location=['computeConfig'], _type=str, default=None)
 
     def to_json(self) -> dict:
         return self._dict.copy()
@@ -238,6 +239,7 @@ class Dpk(entities.DlEntity):
     scope: dict = entities.DlProperty(location=['scope'], _type=str)
     context: dict = entities.DlProperty(location=['context'], _type=dict)
     metadata: dict = entities.DlProperty(location=['metadata'], _type=dict)
+    dependencies: dict = entities.DlProperty(location=['dependencies'], _type=List[dict])
 
     # defaults
     components: Components = entities.DlProperty(location=['components'], _kls='Components')
@@ -264,12 +266,12 @@ class Dpk(entities.DlEntity):
             reps = namedtuple('repositories',
                               field_names=['dpks', 'codebases', 'organizations', 'services'])
 
-            self.__repositories = reps(dpks=repositories.Dpks(client_api=self.client_api, project=self.project),
-                                       codebases=repositories.Codebases(client_api=self.client_api),
-                                       organizations=repositories.Organizations(client_api=self.client_api),
-                                       services=repositories.Services(client_api=self.client_api, project=self.project,
-                                                                      package=self),
-                                       )
+            self.__repositories = reps(
+                dpks=repositories.Dpks(client_api=self.client_api, project=self.project),
+                codebases=repositories.Codebases(client_api=self.client_api),
+                organizations=repositories.Organizations(client_api=self.client_api),
+                services=repositories.Services(client_api=self.client_api, project=self.project, package=self),
+            )
 
         return self.__repositories
 
@@ -288,6 +290,11 @@ class Dpk(entities.DlEntity):
         assert isinstance(self._repositories.dpks, repositories.Dpks)
         return self._repositories.dpks
 
+    @property
+    def services(self):
+        assert isinstance(self._repositories.services, repositories.Services)
+        return self._repositories.services
+
     ###########
     # methods #
     ###########
@@ -424,9 +431,11 @@ class Dpk(entities.DlEntity):
         :return: App entity
         :rtype: dtlpy.entities.App
         """
-        return cls(
+        res = cls(
             _dict=_json,
             client_api=client_api,
             project=project,
             is_fetched=is_fetched
         )
+
+        return res

dtlpy/entities/filters.py

@@ -456,6 +456,9 @@ class Filters:
             _json['systemSpace'] = self._system_space
         return _json
 
+    def print(self, indent=2):
+        print(json.dumps(self.prepare(), indent=indent))
+
     def sort_by(self, field, value: FiltersOrderByDirection = FiltersOrderByDirection.ASCENDING):
         """
         sort the filter
@@ -549,3 +552,6 @@ class SingleFilter:
             _json[self.field] = value
 
         return _json
+    
+    def print(self, indent=2):
+        print(json.dumps(self.prepare(), indent=indent))

dtlpy/entities/model.py

@@ -118,6 +118,7 @@ class Model(entities.BaseEntity):
     _repositories = attr.ib(repr=False)
     _ontology = attr.ib(repr=False, default=None)
     updated_by = attr.ib(default=None)
+    app = attr.ib(default=None)
 
     @staticmethod
     def _protected_from_json(_json, client_api, project, package, is_fetched=True):
@@ -198,7 +199,8 @@ class Model(entities.BaseEntity):
             input_type=_json.get('inputType', None),
             output_type=_json.get('outputType', None),
             module_name=_json.get('moduleName', None),
-            updated_by=_json.get('updatedBy', None)
+            updated_by=_json.get('updatedBy', None),
+            app=_json.get('app', None)
         )
         inst.is_fetched = is_fetched
         return inst
@@ -226,7 +228,8 @@ class Model(entities.BaseEntity):
                                                         attr.fields(Model).updated_at,
                                                         attr.fields(Model).input_type,
                                                         attr.fields(Model).output_type,
-                                                        attr.fields(Model).updated_by
+                                                        attr.fields(Model).updated_by,
+                                                        attr.fields(Model).app
                                                         ))
         _json['packageId'] = self.package_id
         _json['datasetId'] = self.dataset_id
@@ -248,6 +251,8 @@ class Model(entities.BaseEntity):
 
         if self.updated_by:
             _json['updatedBy'] = self.updated_by
+        if self.app:
+            _json['app'] = self.app
 
         return _json
 

dtlpy/entities/package_function.py

@@ -64,6 +64,7 @@ class PackageFunction(entities.DlEntity):
                                                                                           _kls='FunctionIO')
     inputs: typing.Union[typing.List['entities.FunctionIO'], None] = entities.DlProperty(location=['input'],
                                                                                          _kls='FunctionIO')
+    compute_config: str = entities.DlProperty(location=['computeConfig'], _type=str, default=None)
 
     def __repr__(self):
         # TODO need to move to DlEntity

dtlpy/entities/package_module.py

@@ -28,6 +28,7 @@ class PackageModule(entities.DlEntity):
                                                                              _type=list,
                                                                              default=list(),
                                                                              _kls='PackageFunction')
+    compute_config: str = entities.DlProperty(location=['computeConfig'], _type=str, default=None)
 
     def __repr__(self):
         # TODO need to move to DlEntity

dtlpy/ml/base_feature_extractor_adapter.py

@@ -0,0 +1,28 @@
+from abc import ABC
+
+from base_model_adapter import BaseModelAdapter
+from .. import entities
+
+
+class BaseFeatureExtractorAdapter(BaseModelAdapter, ABC):
+    def __int__(self, model_entity: entities.Model = None):
+        super().__init__(model_entity)
+
+    def extract_features(self, batch: list, **kwargs):
+        """ Runs inference with the model, but does not predict. Instead, extracts features for the input batch.
+
+            Virtual method - need to implement
+
+        :param batch: `list` a list containing a batch of items whose features will be extracted
+        """
+        raise NotImplementedError("Please implement 'extract_features' method in {}".format(self.__class__.__name__))
+
+    def extract_dataset_features(self, dataset: entities.Dataset, **kwargs):
+        """ Runs inference to extract features for all items in a dataset.
+
+            Virtual method - need to implement
+
+        :param dataset: `entities.Dataset` dataset entity whose items will have their features extracted
+        """
+        raise NotImplementedError("Please implement 'extract_dataset_features' method in "
+                                  "{}".format(self.__class__.__name__))

dtlpy/ml/base_model_adapter.py

@@ -157,6 +157,8 @@ class BaseModelAdapter(utilities.BaseServiceRunner):
         """
         import dtlpymetrics
         compare_types = model.output_type
+        if not filters:
+            filters = entities.Filters()
         if filters is not None and isinstance(filters, dict):
             filters = entities.Filters(custom_filter=filters)
         model = dtlpymetrics.scoring.create_model_score(model=model,
@@ -408,10 +410,13 @@ class BaseModelAdapter(utilities.BaseServiceRunner):
         self.logger.debug("Predicting dataset (name:{}, id:{}, using batch size {}".format(dataset.name,
                                                                                            dataset.id,
                                                                                            batch_size))
+        if not filters:
+            filters = entities.Filters()
         if filters is not None and isinstance(filters, dict):
             filters = entities.Filters(custom_filter=filters)
         pages = dataset.items.list(filters=filters, page_size=batch_size)
-        self.predict_items(items=list(pages.all()),
+        items = [item for item in pages.all() if item.type == 'file']
+        self.predict_items(items=items,
                            with_upload=with_upload,
                            cleanup=cleanup,
                            batch_size=batch_size,
@@ -539,6 +544,8 @@ class BaseModelAdapter(utilities.BaseServiceRunner):
         # Predicting #
         ##############
         logger.info(f"Calling prediction, dataset: {dataset.name!r} ({model.id!r}), filters: {filters}")
+        if not filters:
+            filters = entities.Filters()
         self.predict_dataset(dataset=dataset,
                              filters=filters,
                              with_upload=True)
@@ -630,18 +637,21 @@ class BaseModelAdapter(utilities.BaseServiceRunner):
         """
         for prediction in predictions:
             if prediction.type == entities.AnnotationType.SEGMENTATION:
+                color = None
                 try:
                     color = item.dataset._get_ontology().color_map.get(prediction.label, None)
                 except (exceptions.BadRequest, exceptions.NotFound):
-                    color = None
-                    logger.warning("Can't get annotation color from item's dataset, using model's dataset.")
+                    ...
                 if color is None:
-                    try:
-                        color = self.model_entity.dataset._get_ontology().color_map.get(prediction.label,
-                                                                                        (255, 255, 255))
-                    except (exceptions.BadRequest, exceptions.NotFound):
-                        logger.warning("Can't get annotation color from model's dataset, using default.")
-                        color = prediction.color
+                    if self.model_entity._dataset is not None:
+                        try:
+                            color = self.model_entity.dataset._get_ontology().color_map.get(prediction.label,
+                                                                                            (255, 255, 255))
+                        except (exceptions.BadRequest, exceptions.NotFound):
+                            ...
+                if color is None:
+                    logger.warning("Can't get annotation color from model's dataset, using default.")
+                    color = prediction.color
                 prediction.color = color
 
             prediction.item_id = item.id

dtlpy/repositories/__init__.py

@@ -50,3 +50,4 @@ from .apps import Apps
 from .dpks import Dpks
 from .messages import Messages
 from .compositions import Compositions
+from .schema import Schema

dtlpy/repositories/apps.py

@@ -253,7 +253,8 @@ class Apps:
                 error='400',
                 message='You must provide an identifier in inputs')
         if app_name is not None:
-            app_id = self.__get_by_name(app_name)
+            app = self.__get_by_name(app_name)
+            app_id = app.id
 
         success, response = self._client_api.gen_request(req_type='delete', path='/apps/{}'.format(app_id))
         if not success:
@@ -261,3 +262,69 @@ class Apps:
 
         logger.debug(f"App deleted successfully (id: {app_id}, name: {app_name}")
         return success
+
+    def resume(self, app: entities.App = None, app_id: str = None) -> bool:
+        """
+        Activate an app entity.
+
+        Note: You are required to add either app or app_id.
+
+        :param entities.App app: the app entity
+        :param str app_id: optional - the id of the app.
+        :return whether we succeed activating the specified app.
+        :rtype bool
+
+        **Example**
+        .. code-block:: python
+            # succeed = dl.apps.resume(app)
+        """
+        if app_id is not None and app is None:
+            app = self.get(app_id=app_id)
+        if app is None:
+            raise exceptions.PlatformException(error='400', message='You must provide app or app_id')
+
+        if app and app.status == entities.CompositionStatus.INSTALLED:
+            raise exceptions.PlatformException(
+                error='400',
+                message='Application is already active'
+            )
+
+        success, response = self._client_api.gen_request(req_type='post', path='/apps/{}/activate'.format(app.id))
+        if not success:
+            raise exceptions.PlatformException(response)
+
+        logger.debug(f"App resumed successfully (id: {app.id}, name: {app.name}")
+        return success
+
+    def pause(self, app: entities.App = None, app_id: str = None) -> bool:
+        """
+        Pausing an app entity.
+
+        Note: You are required to add either app or app_id.
+
+        :param entities.App app: the app entity
+        :param str app_id: optional - the id of the app.
+        :return whether we succeed pausing the specified app.
+        :rtype bool
+
+        **Example**
+        .. code-block:: python
+            # succeed = dl.apps.pause(app)
+        """
+        if app_id is not None and app is None:
+            app = self.get(app_id=app_id)
+        if app is None:
+            raise exceptions.PlatformException(error='400', message='You must provide app or app_id')
+
+        if app and app.status == entities.CompositionStatus.UNINSTALLED:
+            raise exceptions.PlatformException(
+                error='400',
+                message='Application is already inactive'
+            )
+
+        success, response = self._client_api.gen_request(req_type='post', path='/apps/{}/deactivate'.format(app.id))
+        if not success:
+            raise exceptions.PlatformException(response)
+
+        logger.debug(f"App paused successfully (id: {app.id}, name: {app.name}")
+        return success

dtlpy/repositories/features.py

@@ -18,6 +18,8 @@ class Features:
                  item: entities.Item = None,
                  annotation: entities.Annotation = None,
                  feature_set: entities.FeatureSet = None):
+        if project is not None and project_id is None:
+            project_id = project.id
         self._project = project
         self._project_id = project_id
         self._item = item
@@ -34,6 +36,9 @@ class Features:
 
     @property
     def project(self) -> entities.Project:
+        if self._project is None and self._project_id is None and self._item is not None:
+            self._project = self._item.project
+            self._project_id = self._project.id
         if self._project is None and self._project_id is not None:
             # get from id
             self._project = repositories.Projects(client_api=self._client_api).get(project_id=self._project_id)
@@ -96,8 +101,9 @@ class Features:
             filters.add(field='featureSetId', values=self._feature_set.id)
         if self._item is not None:
             filters.add(field='entityId', values=self._item.id)
-        if self._project_id is not None:
-            filters.context = {"projects": [self._project_id]}
+        if self._project_id is None:
+            self._project_id = self.project.id
+        filters.context = {"projects": [self._project_id]}
 
         paged = entities.PagedEntities(items_repository=self,
                                        filters=filters,

dtlpy/repositories/models.py

@@ -199,7 +199,7 @@ class Models:
     def _set_model_filter(self,
                           metadata: dict,
                           train_filter: entities.Filters = None,
-                          validation_filter: entities.Filters = None, ):
+                          validation_filter: entities.Filters = None):
         if metadata is None:
             metadata = {}
         if 'system' not in metadata:
@@ -285,6 +285,7 @@ class Models:
             output_type=None,
             train_filter: entities.Filters = None,
             validation_filter: entities.Filters = None,
+            app: entities.App = None
     ) -> entities.Model:
         """
         Create a Model entity
@@ -306,6 +307,7 @@ class Models:
         :param str output_type: dl.AnnotationType - the type of annotations the model produces (class, box segment, text, etc)
         :param dtlpy.entities.filters.Filters train_filter: Filters entity or a dictionary to define the items' scope in the specified dataset_id for the model train
         :param dtlpy.entities.filters.Filters validation_filter: Filters entity or a dictionary to define the items' scope in the specified dataset_id for the model validation
+        :param dtlpy.entities.App app: App entity to connect the model to
         :return: Model Entity
 
         **Example**:
@@ -342,10 +344,12 @@ class Models:
                 raise exceptions.PlatformException('Please provide project_id')
             project_id = self._project.id
         else:
-            if project_id != self._project_id and not package.is_global:
-                logger.warning(
-                    "Note! you are specified project_id {!r} which is different from repository context: {!r}".format(
-                        project_id, self._project_id))
+            if project_id != self._project_id:
+                if (isinstance(package, entities.Package) and not package.is_global) or \
+                        (isinstance(package, entities.Dpk) and not package.scope != 'public'):
+                    logger.warning(
+                        "Note! you are specified project_id {!r} which is different from repository context: {!r}".format(
+                            project_id, self._project_id))
 
         if model_artifacts is None:
             model_artifacts = []
@@ -367,6 +371,29 @@ class Models:
             'outputType': output_type,
         }
 
+        if app is not None:
+            if not isinstance(package, entities.Dpk):
+                raise ValueError('package must be a Dpk entity')
+            if app.dpk_name != package.name or app.dpk_version != package.version:
+                raise ValueError('App and package must be the same')
+            component_name = None
+            compute_config = None
+            for model in package.components.models:
+                if model['name'] == model_name:
+                    component_name = model['name']
+                    compute_config = model.get('computeConfigs', None)
+                    break
+            if component_name is None:
+                raise ValueError('Model name not found in package')
+            payload['app'] = {
+                "id": app.id,
+                "componentName": component_name,
+                "dpkName": package.name,
+                "dpkVersion": package.version
+            }
+            if compute_config is not None:
+                payload['app']['computeConfig'] = compute_config
+
         if configuration is not None:
             payload['configuration'] = configuration
 
@@ -380,7 +407,8 @@ class Models:
             payload['status'] = status
 
         if train_filter or validation_filter:
-            metadata = self._set_model_filter(metadata={}, train_filter=train_filter,
+            metadata = self._set_model_filter(metadata={},
+                                              train_filter=train_filter,
                                               validation_filter=validation_filter)
             payload['metadata'] = metadata
 

dtlpy/repositories/recipes.py

@@ -1,5 +1,6 @@
 import logging
 import traceback
+import urllib.parse
 
 from .. import entities, miscellaneous, repositories, exceptions, _api_reference
 from ..services.api_client import ApiClient
@@ -198,9 +199,9 @@ class Recipes:
 
     def _list(self, filters: entities.Filters):
         url = filters.generate_url_query_params('/recipes')
-
+        encoded_url = urllib.parse.quote(url, safe='/:?=&')
         # request
-        success, response = self._client_api.gen_request(req_type='get', path=url)
+        success, response = self._client_api.gen_request(req_type='get', path=encoded_url)
         if not success:
             raise exceptions.PlatformException(response)
         return response.json()

dtlpy/repositories/schema.py

@@ -0,0 +1,120 @@
+from typing import List
+import logging
+
+from .. import entities, exceptions
+from ..services.api_client import ApiClient
+
+logger = logging.getLogger(name='dtlpy')
+
+
+class UnsearchablePaths:
+    """
+    Unsearchable Paths
+
+    """
+
+    def __init__(self, client_api: ApiClient, dataset: entities.Dataset = None):
+        self._client_api = client_api
+        self._dataset = dataset
+
+    @property
+    def dataset(self) -> entities.Dataset:
+        if self._dataset is None:
+            raise exceptions.PlatformException(
+                error='2001',
+                message='Cannot perform action WITHOUT Dataset entity in {} repository.'.format(
+                    self.__class__.__name__) + ' Please use dataset.schema or set a dataset')
+        assert isinstance(self._dataset, entities.Dataset)
+        return self._dataset
+
+    def __unsearchable_paths_request(self, payload):
+        """
+        Set unsearchable paths in dataset schema
+        """
+        success, response = self._client_api.gen_request(req_type='post',
+                                                         path='/datasets/{}/schema/items'.format(self.dataset.id),
+                                                         json_req=
+                                                         {
+                                                             "unsearchablePaths": payload
+                                                         })
+        if not success:
+            raise exceptions.PlatformException(response)
+
+        resp = response.json()
+        if isinstance(resp, dict):
+            command = entities.Command.from_json(_json=resp,
+                                                 client_api=self._client_api)
+
+            try:
+                command.wait()
+            except Exception as e:
+                logger.error('Command failed: {}'.format(e))
+        else:
+            logger.warning(resp)
+        return success
+
+    def add(self, paths: List[str]):
+        """
+        Add metadata paths to `unsearchablePaths` to exclude keys under these paths from indexing, making them unsearchable through the Dataset Browser UI and DQL queries.
+
+        :param paths: list of paths to create
+        :return: true if success, else raise exception
+        :rtype: bool
+
+        **Example**:
+
+        .. code-block:: python
+
+            success = dataset.schema.unsearchable_paths.add(paths=['metadata.key1', 'metadata.key2'])
+        """
+        return self.__unsearchable_paths_request(payload={"add": paths})
+
+    def remove(self, paths: List[str]):
+        """
+        Remove metadata paths from `unsearchablePaths` to index keys under these paths, making them searchable through the Dataset Browser UI and DQL queries.
+
+        :param paths: list of paths to delete
+        :return: true if success, else raise exception
+        :rtype: bool
+
+        **Example**:
+
+        .. code-block:: python
+
+            success = dataset.schema.unsearchable_paths.remove(paths=['metadata.key1', 'metadata.key2'])
+        """
+        return self.__unsearchable_paths_request(payload={"remove": paths})
+
+
+class Schema:
+    """
+    Schema Repository
+    """
+
+    def __init__(self, client_api: ApiClient, dataset: entities.Dataset):
+        self._client_api = client_api
+        self.dataset = dataset
+        self.unsearchable_paths = UnsearchablePaths(client_api=self._client_api, dataset=dataset)
+
+    ###########
+    # methods #
+    ###########
+    def get(self):
+        """
+        Get dataset schema
+
+        :return: dataset schema
+        :rtype: dict
+
+        **Example**:
+
+        .. code-block:: python
+
+            json = dataset.schema.get()
+        """
+        success, response = self._client_api.gen_request(req_type='get',
+                                                         path='/datasets/{}/schema'.format(self.dataset.id))
+        if not success:
+            raise exceptions.PlatformException(response)
+
+        return response.json()

dtlpy/repositories/services.py

@@ -450,7 +450,8 @@ class Services:
             name: str,
             action: str = 'created',
             support: str = None,
-            docs: str = None
+            docs: str = None,
+            agent_info: dict = None
     ):
         url = "/services/{}/notify".format(service_id)
         payload = {
@@ -458,6 +459,8 @@ class Services:
             'message': message,
             'notificationName': name
         }
+        if agent_info is not None:
+            payload['agentInfo'] = agent_info
 
         if support:
             payload['support'] = support

dtlpy/services/api_client.py

@@ -981,7 +981,7 @@ class ApiClient:
 
         # prepare request
         if is_dataloop:
-            full_url = self.environment + path
+            full_url = self.__base_gate_url + path
             headers_req = self._build_request_headers(headers=headers)
         else:
             full_url = path
@@ -1018,7 +1018,7 @@ class ApiClient:
                                    timeout=timeout) as session:
                 try:
                     async with session._request(request=session._client.request,
-                                                url=self.environment + path,
+                                                url=self.__base_gate_url + path,
                                                 method=req_type,
                                                 json=json_req,
                                                 data=data,
@@ -1135,7 +1135,7 @@ class ApiClient:
                 form.add_field('file', AsyncUploadStream(buffer=to_upload,
                                                          callback=callback,
                                                          name=uploaded_filename))
-                url = '{}?mode={}'.format(self.environment + remote_url, mode)
+                url = '{}?mode={}'.format(self.__base_gate_url + remote_url, mode)
 
                 # use SSL context
                 ssl_context = None
@@ -1451,6 +1451,7 @@ class ApiClient:
         :param force: force login. in case login with same user but want to get a new JWT
         :return:
         """
+        logger.warning('dl.login_secret is deprecated. Please use dl.login_m2m instead.')
         return login_secret(api_client=self,
                             email=email,
                             password=password,
@@ -1486,6 +1487,14 @@ class ApiClient:
         """
         self.token = token  # this will also set the refresh_token to None
 
+    def login_api_key(self, api_key):
+        """
+        Login using API key
+        :param api_key: a valid API key
+        :return:
+        """
+        self.token = api_key
+
     @property
     def login_domain(self):
         if self._login_domain is None:

dtlpy/services/logins.py

@@ -1,4 +1,5 @@
 from urllib.parse import urlsplit, urlunsplit
+import base64
 import requests
 import logging
 import json
@@ -89,6 +90,51 @@ def logout(api_client):
     return True
 
 
+def login_html():
+    try:
+        location = os.path.dirname(os.path.realpath(__file__))
+    except NameError:
+        location = './dtlpy/services'
+    filename = os.path.join(location, '..', 'assets', 'lock_open.png')
+
+    if os.path.isfile(filename):
+
+        with open(filename, 'rb') as f:
+            image = f.read()
+
+        html = (
+            "        <!doctype html>\n"
+            "        <html>\n"
+            "        <head>\n"
+            "            <style>\n"
+            "                body {{\n"
+            "                    background-color: #F7F7F9 !important;\n"
+            "                    display: flex;\n"
+            "                    justify-content: center;\n"
+            "                    align-items: center;\n"
+            "                    height: 100vh;\n"
+            "                    width: 100vw;\n"
+            "                    margin: 0;\n"
+            "                }}\n"
+            "                img {{\n"
+            "                    display: block;\n"
+            "                    max-width: 100%;\n"
+            "                    max-height: 100%;\n"
+            "                    margin: auto;\n"
+            "                }}\n"
+            "            </style>\n"
+            "        </head>\n"
+            "        <body>\n"
+            "            <img src='data:image/png;base64,{image}'>\n"
+            "        </body>\n"
+            "        </html>\n"
+        ).format(image=base64.b64encode(image).decode())
+    else:
+        html = "<!doctype html><html><body>Logged in successfully</body></html>"
+
+    return html.encode('utf-8')
+
+
 def login(api_client, auth0_url=None, audience=None, client_id=None, login_domain=None, callback_port=None):
     import webbrowser
     from http.server import BaseHTTPRequestHandler, HTTPServer
@@ -111,24 +157,9 @@ def login(api_client, auth0_url=None, audience=None, client_id=None, login_domai
                 parsed_path = urlparse(self.path)
                 query = parse_qs(parsed_path.query)
                 self.send_response(200)
-
-                # get display image
-                try:
-                    # working directory when running from command line
-                    location = os.path.dirname(os.path.realpath(__file__))
-                except NameError:
-                    # working directory when running from console
-                    location = './dtlpy/services'
-                filename = os.path.join(location, '..', 'assets', 'lock_open.png')
-                if os.path.isfile(filename):
-                    with open(filename, 'rb') as f:
-                        self.send_header('Content-type', 'image/jpg')
-                        self.end_headers()
-                        self.wfile.write(f.read())
-                else:
-                    self.send_header('Content-type', 'text/html')
-                    self.end_headers()
-                    self.wfile.write(bytes("<!doctype html><html><body>Logged in successfully</body></html>", 'utf-8'))
+                self.send_header('Content-type', 'text/html')
+                self.end_headers()
+                self.wfile.write(login_html())
                 self.__class__.id_token = query['id_token'][0]
                 self.__class__.access_token = query['access_token'][0]
                 self.__class__.refresh_token = query['refresh_token'][0]

dtlpy/utilities/dataset_generators/dataset_generator.py

@@ -250,10 +250,11 @@ class DatasetGenerator:
                                                        entities.AnnotationType.BOX,
                                                        entities.AnnotationType.POLYGON]:
                                 raise ValueError('unsupported annotation type: {}'.format(annotation.type))
+                dtype = object if self.annotation_type == entities.AnnotationType.POLYGON else None
                 # reorder for output
                 item_info.update({entities.AnnotationType.BOX.value: np.asarray(box_coordinates).astype(float),
                                   entities.AnnotationType.CLASSIFICATION.value: np.asarray(classes_ids),
-                                  entities.AnnotationType.POLYGON.value: np.asarray(polygon_coordinates, dtype=object),
+                                  entities.AnnotationType.POLYGON.value: np.asarray(polygon_coordinates, dtype=dtype),
                                   'labels': labels})
                 if len(item_info[entities.AnnotationType.CLASSIFICATION.value]) == 0:
                     logger.debug('Empty annotation (nothing matched label_to_id_map) for image filename: {}'.format(

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dtlpy
-Version: 1.89.29
+Version: 1.90.39
 Summary: SDK and CLI for Dataloop platform
 Home-page: https://github.com/dataloop-ai/dtlpy
 Author: Dataloop Team
@@ -43,7 +43,7 @@ Requires-Dist: redis (>=3.5)
 Requires-Dist: inquirer
 Requires-Dist: dtlpymetrics
 
-![logo](https://mk0dataloop4fni44fjg.kinstacdn.com/wp-content/uploads/2020/03/logo.svg)  
+![logo.svg](docs%2F_static%2Flogo.svg) 
 [![Documentation Status](https://readthedocs.org/projects/dtlpy/badge/?version=latest)](https://sdk-docs.dataloop.ai/en/latest/?badge=latest)
 [![pypi](https://img.shields.io/pypi/v/dtlpy.svg)](https://pypi.org/project/dtlpy/)
 [![versions](https://img.shields.io/pypi/pyversions/dtlpy.svg)](https://github.com/dataloop-ai/dtlpy)

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

@@ -1,9 +1,9 @@
-dtlpy/__init__.py,sha256=gIb75Q3QsLd3UOvRgIFiDTV4u5HJr0M6KohWZVVlQp0,20086
-dtlpy/__version__.py,sha256=2A95rDAaSw8h3Wn5puveqxUlRGvTANhXLJ7c1jiQhsE,20
+dtlpy/__init__.py,sha256=pJiyuUv6L9bWnW1vcknHAjYP-pouMCYzzexyDKxELoI,20127
+dtlpy/__version__.py,sha256=BcmejWGgARVAkaNKsamesQsOmoijL9t0WK_6O0DCjuU,20
 dtlpy/exceptions.py,sha256=EQCKs3pwhwZhgMByQN3D3LpWpdxwcKPEEt-bIaDwURM,2871
 dtlpy/new_instance.py,sha256=_-F1NTJgGCCHnW68eIexwq7leLGTCHcPxodbw9mfasI,5555
 dtlpy/assets/__init__.py,sha256=D_hAa6NM8Zoy32sF_9b7m0b7I-BQEyBFg8-9Tg2WOeo,976
-dtlpy/assets/lock_open.png,sha256=vXHune4YF__fINPQ2l61G2zI3BeJPX_z5gkwzUNFAxs,24081
+dtlpy/assets/lock_open.png,sha256=WhGXI8pYNXF3nkbbwUV7BMY8QInXmyyZbS04JoYh3UY,18132
 dtlpy/assets/main.py,sha256=N1JUsx79qnXI7Hx22C8JOzHJdGHxvrXeTx5UZAxvJfE,1380
 dtlpy/assets/main_partial.py,sha256=d8Be4Whg9Tb2VFiT85-57_L9IvxRipQXiZ83SxFs0Ro,267
 dtlpy/assets/mock.json,sha256=aByh4XlsFQJM2pOjmd7bd9zT1LSOj5pfutZDHwt8c_8,149
@@ -42,7 +42,7 @@ dtlpy/callbacks/piper_progress_reporter.py,sha256=L9OK-n6zqBP0SFhq0lrMXuMjf4uWfy
 dtlpy/callbacks/progress_viewer.py,sha256=ZZw8ljXVP2kpndLRxOhY09dOgUN7Luop-4TUuT5nSDc,2314
 dtlpy/dlp/__init__.py,sha256=QG_BxSqeic0foFBmzIkpZEF4EvxOZamknj2f5Cb6T6Q,868
 dtlpy/dlp/cli_utilities.py,sha256=Kzr-AKbRlXLdGKY2RTUNm0U_vKHxyMOB17TQegeDMdM,16037
-dtlpy/dlp/command_executor.py,sha256=jC2i2Aro9i_DLm5bLoZTPrPbktgSd0h5kpGSkoJsEjY,31457
+dtlpy/dlp/command_executor.py,sha256=JKtRKTwrKfkXHa1VuFhPw15FuwexBPq_9ANAu2pSyXs,32113
 dtlpy/dlp/dlp,sha256=-F0vSCWuSOOtgERAtsPMPyMmzitjhB7Yeftg_PDlDjw,10
 dtlpy/dlp/dlp.bat,sha256=QOvx8Dlx5dUbCTMpwbhOcAIXL1IWmgVRSboQqDhIn3A,37
 dtlpy/dlp/dlp.py,sha256=YjNBjeCDTXJ7tj8qdiGZ8lFb8DtPZl-FvViyjxt9xF8,4278
@@ -51,35 +51,35 @@ dtlpy/entities/__init__.py,sha256=cwA3ZOsZbdiixwhH6D15sU_bwybDAB8P2mg1zThajBU,45
 dtlpy/entities/analytic.py,sha256=5eAavh_NmvSWsD7uzon2vQn08chbc-dh1nlJc0awkQI,11374
 dtlpy/entities/annotation.py,sha256=s-g39sdUFafhsbGN1Taf2DSqoKbyRtWc0TVNhPpEAwA,67515
 dtlpy/entities/annotation_collection.py,sha256=Uh7pnyhAv4epMApHRtIdWRG_ro9U6p7yNV7Lnjzdzqk,29979
-dtlpy/entities/app.py,sha256=_ILlIofYGUa6LBmNcEcPuYjQpDA5lnM6TIYL18Qzeyk,5579
+dtlpy/entities/app.py,sha256=7i7xDRnyN2PgJ_oUNfhkTh7CxRHaXf-uGS2eX_DjAAg,6295
 dtlpy/entities/app_module.py,sha256=0UiAbBX1q8iEImi3nY7ySWZZHoRRwu0qUXmyXmgVAc4,3645
 dtlpy/entities/artifact.py,sha256=wtLtBuidOPbnba0ok40JyunCCIBGbAl4bP_ebK39Kk4,5711
 dtlpy/entities/assignment.py,sha256=LTUxE2ZB5iZSbSeoroHe5P7Kv6E_K2b5cdY-7TZ4HFE,14346
-dtlpy/entities/base_entity.py,sha256=i8VzoXdkkJbUJD7U7U-bkbQKiUWkRwZZhl-mQT5WUsc,7578
+dtlpy/entities/base_entity.py,sha256=II40doslcKJ97wtTIwhSYCNA9Lqvb5Y9LkiYNIdqDpM,7553
 dtlpy/entities/bot.py,sha256=is3NUCnPg56HSjsHIvFcVkymValMqDV0uHRDC1Ib-ds,3819
 dtlpy/entities/codebase.py,sha256=pwRkAq2GV0wvmzshg89IAmE-0I2Wsy_-QNOu8OV8uqc,8999
 dtlpy/entities/command.py,sha256=dv7w0GfTqq4OeLUoAUElYCdOrvE2Lp9Cx-XdA9N4314,4976
-dtlpy/entities/dataset.py,sha256=6n_0TeH4A8Je-ZUwX1Vc2GFJO9k8HU67n_j2hHWcFi4,44831
+dtlpy/entities/dataset.py,sha256=6rqfC4YA6q75-q3Hbfv2XR4tGkajMwXEgzP-b0OQw8U,45075
 dtlpy/entities/directory_tree.py,sha256=Rni6pLSWytR6yeUPgEdCCRfTg_cqLOdUc9uCqz9KT-Q,1186
-dtlpy/entities/dpk.py,sha256=PmaZiveM7v0FynV5P7juYKy4yDdrTwBhTroB9uFpMbc,16569
+dtlpy/entities/dpk.py,sha256=zTqzFIIagaJ3jUcFFI3wAmmNzVD4q0fBt41Ts0TLxeg,16788
 dtlpy/entities/driver.py,sha256=O_QdK1EaLjQyQkmvKsmkNgmvmMb1mPjKnJGxK43KrOA,7197
 dtlpy/entities/execution.py,sha256=xZxfF3tYtf7tJ_GKzwSoEkF1zhlnWmbBzLoVXrNl8DE,12800
 dtlpy/entities/feature.py,sha256=9fFjD0W57anOVSAVU55ypxN_WTCsWTG03Wkc3cAAj78,3732
 dtlpy/entities/feature_set.py,sha256=lKbaLLklYC8dZGCDzQa8T-LSYpUygqLwlC_jhHtOfLw,4326
-dtlpy/entities/filters.py,sha256=KazfahD_Oo5Vd646RS_k9ynmmiKFhCk5rNs7tsh3E_c,18847
+dtlpy/entities/filters.py,sha256=H3_EYUNp0K8HHcddma1s308EIM0ALmXCJxmPyXA7GzU,19029
 dtlpy/entities/integration.py,sha256=Hi4PsIbrVx0LnytxI9GtPcrqRgm8Mq_BZUln1KUtxo8,5733
 dtlpy/entities/item.py,sha256=JGdBa8RDPWnVOdqRdKoz-T3o8rCOsLbKFdhs0KQDa6o,28369
 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=erPZ0EW3MOL0PA8s0Eo2YHtJdwJWxOn7ha1wNQxkBV4,24750
+dtlpy/entities/model.py,sha256=GXfQoLa06GSsymBiRTqI2FYegLwyrc5S8lWMwGWxhjw,24959
 dtlpy/entities/node.py,sha256=jpf_aQRoBxD6XEZ3xjpgTPp8Iuj6Z4mAQbK7RC0Larw,37463
 dtlpy/entities/ontology.py,sha256=hpex7wLJ2JXMFq3lxLfN49LPz4M3GJIjqD-7HL5hOEw,29265
 dtlpy/entities/organization.py,sha256=AMkx8hNIIIjnu5pYlNjckMRuKt6H3lnOAqtEynkr7wg,9893
 dtlpy/entities/package.py,sha256=EA5cB3nFBlsbxVK-QroZILjol2bYSVGqCby-mOyJJjQ,26353
 dtlpy/entities/package_defaults.py,sha256=wTD7Z7rGYjVy8AcUxTFEnkOkviiJaLVZYvduiUBKNZo,211
-dtlpy/entities/package_function.py,sha256=kQsfW-LOTAVd8oDm-F0iWLvKsFmAXSp5ZoBrXPvISRE,6067
-dtlpy/entities/package_module.py,sha256=MBaJ5j8eCERsP-s1SIO8_daTU1gEqcaDSpUBu_gUTAk,4035
+dtlpy/entities/package_function.py,sha256=Y24zVxTxN602cv63I8gIZ9J7wu9lThj8XF0xW4cHutk,6166
+dtlpy/entities/package_module.py,sha256=PpEe635I8jnPbA1YDr_5jX3a_mEk-z-mBeX8Lw3HIgY,4134
 dtlpy/entities/package_slot.py,sha256=XBwCodQe618sQm0bmx46Npo94mEk-zUV7ZX0mDRcsD8,3946
 dtlpy/entities/paged_entities.py,sha256=A6_D0CUJsN52dBG6yn-oHHzjuVDkBNejTG5r-KxWOxI,5848
 dtlpy/entities/pipeline.py,sha256=Fh3vB2SvM-yhA8wWtIv9zojaqnE2c1cjJQr5CmveBS0,20119
@@ -147,15 +147,16 @@ dtlpy/miscellaneous/json_utils.py,sha256=0P4YTlL6o_L7AUrvAeqkqA46MZZK_hDdTrdnmI5
 dtlpy/miscellaneous/list_print.py,sha256=leEg3RodgYfH5t_0JG8VuM8NiesR8sJLK_mRSttL5pY,4808
 dtlpy/miscellaneous/zipping.py,sha256=GMdPhAeHQXeMS5ClaiKWMJWVYQLBLAaJUWxvdYrL4Ro,5337
 dtlpy/ml/__init__.py,sha256=vPkyXpc9kcWWZ_PxyPEOsjKBJdEbowLkZr8FZIb_OBM,799
-dtlpy/ml/base_model_adapter.py,sha256=wlq5dBrn4EF-W2Nw3r71ayj2y926x5HZJ1ci_agdStc,39640
+dtlpy/ml/base_feature_extractor_adapter.py,sha256=iiEGYAx0Rdn4K46H_FlKrAv3ebTXHSxNVAmio0BxhaI,1178
+dtlpy/ml/base_model_adapter.py,sha256=QTcYhOZ1wiiyVAjFj5tzTl396xpAVw6hSu8Qf3SD3-8,39941
 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=RskGSdPzJwsukYEIgs_7MW_1tqVx6hTPQ2WUhQ5PA5w,1922
+dtlpy/repositories/__init__.py,sha256=_p6RafEniBXbeTAbz8efnIr4G4mCwV9x6LEkXhTRWUE,1949
 dtlpy/repositories/analytics.py,sha256=dQPCYTPAIuyfVI_ppR49W7_GBj0033feIm9Gd7LW1V0,2966
 dtlpy/repositories/annotations.py,sha256=E7iHo8UwDAhdulqh0lGr3fGQ-TSwZXXGsEXZA-WJ_NA,35780
-dtlpy/repositories/apps.py,sha256=CgWj392YLNkIiv2TPIub2fSMDqzsQ_yqK282t7fC3EY,10942
+dtlpy/repositories/apps.py,sha256=6LHvjp8LlHmta4kJo3D4a0potSodfQ59yFkNQ08t4EU,13402
 dtlpy/repositories/artifacts.py,sha256=Ke2ustTNw-1eQ0onLsWY7gL2aChjXPAX5p1uQ_EzMbo,19081
 dtlpy/repositories/assignments.py,sha256=M1vlixBdAjwStqCG1MQjHsj3dH15KT0Rb5UTDtyDpEQ,25464
 dtlpy/repositories/bots.py,sha256=q1SqH01JHloljKxknhHU09psV1vQx9lPhu3g8mBBeRg,8104
@@ -168,11 +169,11 @@ dtlpy/repositories/dpks.py,sha256=lVaVsDElhO6vfvGbrsKvzAXdY3L4qjQMRCZPWIrDq6A,15
 dtlpy/repositories/drivers.py,sha256=fF0UuHCyBzop8pHfryex23mf0kVFAkqzNdOmwBbaWxY,10204
 dtlpy/repositories/executions.py,sha256=ixfekN5quQ_tQL7kdfPOb4r3qCvNTlWIBV8hPk2ElbE,30480
 dtlpy/repositories/feature_sets.py,sha256=xSceAIwK608JSU42IPT1NrvCtnaDJ582JfLd05F3Cck,8811
-dtlpy/repositories/features.py,sha256=CiZTnHatek6pqJup1hcHryI-0waagN4273eyhirCxgM,9301
+dtlpy/repositories/features.py,sha256=X9luMRoTMbwhIEh3UTVQtd3jl6ToFUmv9s39EHuLKIc,9616
 dtlpy/repositories/integrations.py,sha256=gNQmw5ykFtBaimdxUkzCXQqefZaM8yQPnxWZkIJK7ww,11666
 dtlpy/repositories/items.py,sha256=DqJ3g9bc4OLMm9KqI-OebXbr-zcEiohO1wGZJ1uE2Lg,37874
 dtlpy/repositories/messages.py,sha256=zYcoz8Us6j8Tb5Z7luJuvtO9xSRTuOCS7pl-ztt97Ac,3082
-dtlpy/repositories/models.py,sha256=lQ5PQI0cRhHBaHb6h-B0ays3YqnJt-ng5q19fC875N4,33445
+dtlpy/repositories/models.py,sha256=7kYYE0cfw57bsv_T18QqjCBZsd6fSp99y_Vm94Ya44o,34813
 dtlpy/repositories/nodes.py,sha256=xXJm_YA0vDUn0dVvaGeq6ORM0vI3YXvfjuylvGRtkxo,3061
 dtlpy/repositories/ontologies.py,sha256=unnMhD2isR9DVE5S8Fg6fSDf1ZZ5Xemxxufx4LEUT3w,19577
 dtlpy/repositories/organizations.py,sha256=6ijUDFbsogfRul1g_vUB5AZOb41MRmV5NhNU7WLHt3A,22825
@@ -180,9 +181,10 @@ dtlpy/repositories/packages.py,sha256=FCshPoEDuKNfA3WIPqzqr_w_fJV2dFw2IvLdSuVVxv
 dtlpy/repositories/pipeline_executions.py,sha256=CYxJ_Lt5yeZI0Y0uhaolmgshu6_96QmPQUtyWrNGYFE,14421
 dtlpy/repositories/pipelines.py,sha256=VDAOsGbgD1_AKdMrJl_qB3gxPs7f3pwUnPx0pT1iAWk,23977
 dtlpy/repositories/projects.py,sha256=tZyFLqVs-8ggTIi5echlX7XdGOJGW4LzKuXke7jkRnw,22140
-dtlpy/repositories/recipes.py,sha256=kPsN6htcEzdO4JLq3cidzSnZUdx8RDVW2fvNFXdPKWk,15756
+dtlpy/repositories/recipes.py,sha256=ZZDhHn9g28C99bsf0nFaIpVYn6f6Jisz9upkHEkeaYY,15843
 dtlpy/repositories/resource_executions.py,sha256=PyzsbdJxz6jf17Gx13GZmqdu6tZo3TTVv-DypnJ_sY0,5374
-dtlpy/repositories/services.py,sha256=x89_1ClnOahMvA0siOkh3A2WQXeFtAu_rYe7xTfAnwI,66237
+dtlpy/repositories/schema.py,sha256=kTKDrbwm7BfQnBAK81LpAl9ChNFdyUweSLNazlJJhjk,3953
+dtlpy/repositories/services.py,sha256=MDXQ6vAwZNXtBfhjekFHl2vzjGSZdbk6EJ1cAOkkKHs,66355
 dtlpy/repositories/settings.py,sha256=pvqNse0ANCdU3NSLJEzHco-PZq__OIsPSPVJveB9E4I,12296
 dtlpy/repositories/tasks.py,sha256=bbk0l0EZzFFEN_TjHBqDh6GNVum3yF902gdjO0iEFhk,48076
 dtlpy/repositories/times_series.py,sha256=m-bKFEgiZ13yQNelDjBfeXMUy_HgsPD_JAHj1GVx9fU,11420
@@ -192,7 +194,7 @@ dtlpy/repositories/uploader.py,sha256=PzEq4yHsxJT1lv_wYGS-gh7Wmu37TA-14ww_r-6HBr
 dtlpy/repositories/webhooks.py,sha256=IIpxOJ-7KeQp1TY9aJZz-FuycSjAoYx0TDk8z86KAK8,9033
 dtlpy/services/__init__.py,sha256=VfVJy2otIrDra6i7Sepjyez2ujiE6171ChQZp-YgxsM,904
 dtlpy/services/aihttp_retry.py,sha256=tgntZsAY0dW9v08rkjX1T5BLNDdDd8svtgn7nH8DSGU,5022
-dtlpy/services/api_client.py,sha256=Ew3neG7P8giK3CwFXYWMJnbRAYbGFA2K_jIVavUqnB8,65848
+dtlpy/services/api_client.py,sha256=bMmLKQ0BbzLzEsEcZe-RSADjkRjTEoWJiQIQvo8h2L4,66127
 dtlpy/services/api_reference.py,sha256=cW-B3eoi9Xs3AwI87_Kr6GV_E6HPoC73aETFaGz3A-0,1515
 dtlpy/services/async_utils.py,sha256=lfpkTkRUvQoMTxaRZBHbPt5e43qdvpCGDe_-KcY2Jps,2810
 dtlpy/services/calls_counter.py,sha256=gr0io5rIsO5-7Cgc8neA1vK8kUtYhgFPmDQ2jXtiZZs,1036
@@ -200,7 +202,7 @@ dtlpy/services/check_sdk.py,sha256=tnFWCzkJa8w2jLtw-guwuqpOtXGyiVU7ZCDFiUZUqzY,3
 dtlpy/services/cookie.py,sha256=sSZR1QV4ienCcZ8lEK_Y4nZYBgAxO3kHrcBXFKGcmwQ,3694
 dtlpy/services/create_logger.py,sha256=WFQjuvCuwrZoftFaU9jQkmEcOrL1XD-NqsuBqb5_SN4,6332
 dtlpy/services/events.py,sha256=mpcu8RusLPrBcJEbWR61uFb4FiU_dQv3xoa7uM-rTcY,3686
-dtlpy/services/logins.py,sha256=sSE4kmXw9EZylgIQaUYgHH-MgtpEcjUMJpFn5X5C-lA,7906
+dtlpy/services/logins.py,sha256=YMMi_C_A97ZNtIlREE30hpBRhULAZJtORiVL6OL0oPQ,8766
 dtlpy/services/reporter.py,sha256=4zi9-bshKAPHG2XMOXS39cFZ0mhqNc3Qa9uaMN7CSZ8,9122
 dtlpy/services/service_defaults.py,sha256=a7KoqkVmn2TXmM9gN9JRaVVtcG2b8JGIieVnaZeEaao,3860
 dtlpy/utilities/__init__.py,sha256=ncQD1O5lZ7L9n9rNRBivyqNVFDZyQcmqn-X-wyQhhIs,898
@@ -209,7 +211,7 @@ dtlpy/utilities/converter.py,sha256=8mOdKiLe1ATgR1Q56-c6d716aKGRt0A3M9AelijaYN8,
 dtlpy/utilities/annotations/__init__.py,sha256=Eb72MloiwDQWe8H4NptFP1RZEEhcY2Fz_w_e34tdCiE,728
 dtlpy/utilities/annotations/annotation_converters.py,sha256=KOqLVtb88GnrvuVi5x-t5vtzVN9Am98RersBl_D44SU,10796
 dtlpy/utilities/dataset_generators/__init__.py,sha256=pA7UqhTh51gC407FyNa_WG8fUFnd__4tmEUTkNBlcLs,65
-dtlpy/utilities/dataset_generators/dataset_generator.py,sha256=-zVhDESAfy3rMTBE79JuU9S8ENYee_MVoCyWl7mouQk,31380
+dtlpy/utilities/dataset_generators/dataset_generator.py,sha256=QOuydoXL9NlYYMw2jY8Dl6y4dNcldT3kkeu0V95R0MQ,31479
 dtlpy/utilities/dataset_generators/dataset_generator_tensorflow.py,sha256=ZY97o4UAR5tM_req9O1Wh_N-U3cebSypub6kibykYP8,716
 dtlpy/utilities/dataset_generators/dataset_generator_torch.py,sha256=qPm03zVZmga_BQSyWgcodYQL25WYiiBtz8QpCsU4oYc,536
 dtlpy/utilities/local_development/__init__.py,sha256=6s1Ns7mN20J3yyIlgQbKAhPRqy7zQo-hIafLDrIj5cg,70
@@ -220,14 +222,19 @@ dtlpy/utilities/reports/report.py,sha256=3nEsNnIWmdPEsd21nN8vMMgaZVcPKn9iawKTTeO
 dtlpy/utilities/videos/__init__.py,sha256=SV3w51vfPuGBxaMeNemx6qEMHw_C4lLpWNGXMvdsKSY,734
 dtlpy/utilities/videos/video_player.py,sha256=LCxg0EZ_DeuwcT7U_r7MRC6Q19s0xdFb7x5Gk39PRms,24072
 dtlpy/utilities/videos/videos.py,sha256=Dj916B4TQRIhI7HZVevl3foFrCsPp0eeWwvGbgX3-_A,21875
-dtlpy-1.89.29.data/scripts/dlp,sha256=-F0vSCWuSOOtgERAtsPMPyMmzitjhB7Yeftg_PDlDjw,10
-dtlpy-1.89.29.data/scripts/dlp.bat,sha256=QOvx8Dlx5dUbCTMpwbhOcAIXL1IWmgVRSboQqDhIn3A,37
-dtlpy-1.89.29.data/scripts/dlp.py,sha256=tEokRaDINISXnq8yNx_CBw1qM5uwjYiZoJOYGqWB3RU,4267
+dtlpy-1.90.39.data/scripts/dlp,sha256=-F0vSCWuSOOtgERAtsPMPyMmzitjhB7Yeftg_PDlDjw,10
+dtlpy-1.90.39.data/scripts/dlp.bat,sha256=QOvx8Dlx5dUbCTMpwbhOcAIXL1IWmgVRSboQqDhIn3A,37
+dtlpy-1.90.39.data/scripts/dlp.py,sha256=tEokRaDINISXnq8yNx_CBw1qM5uwjYiZoJOYGqWB3RU,4267
+tests/assets/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+tests/assets/models_flow/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+tests/assets/models_flow/failedmain.py,sha256=n8F4eu_u7JPrJ1zedbJPvv9e3lHb3ihoErqrBIcseEc,1847
+tests/assets/models_flow/main.py,sha256=87O3-JaWcC6m_kA39sqPhX70_VCBzzbLWmX2YQFilJw,1873
+tests/assets/models_flow/main_model.py,sha256=Hl_tv7Q6KaRL3yLkpUoLMRqu5-ab1QsUYPL6RPEoamw,2042
 tests/features/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/features/environment.py,sha256=V0FuAjbwiN1ddlJrCjjGSgPrU9TEQWraZkp1E7QDzdQ,13849
-dtlpy-1.89.29.dist-info/LICENSE,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
-dtlpy-1.89.29.dist-info/METADATA,sha256=NuIo2ZEbK5luVxvtbMaZRZ39EJIiMAvs4fLWDK59y0w,3026
-dtlpy-1.89.29.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-dtlpy-1.89.29.dist-info/entry_points.txt,sha256=C4PyKthCs_no88HU39eioO68oei64STYXC2ooGZTc4Y,43
-dtlpy-1.89.29.dist-info/top_level.txt,sha256=ZWuLmQGUOtWAdgTf4Fbx884w1o0vBYq9dEc1zLv9Mig,12
-dtlpy-1.89.29.dist-info/RECORD,,
+dtlpy-1.90.39.dist-info/LICENSE,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
+dtlpy-1.90.39.dist-info/METADATA,sha256=Lbu5Y6VhyT-lUBvB0W3mhwE9MVt1DWrRu-sBbZMY2tI,2976
+dtlpy-1.90.39.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+dtlpy-1.90.39.dist-info/entry_points.txt,sha256=C4PyKthCs_no88HU39eioO68oei64STYXC2ooGZTc4Y,43
+dtlpy-1.90.39.dist-info/top_level.txt,sha256=ZWuLmQGUOtWAdgTf4Fbx884w1o0vBYq9dEc1zLv9Mig,12
+dtlpy-1.90.39.dist-info/RECORD,,

tests/assets/models_flow/failedmain.py

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

tests/assets/models_flow/main.py

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

tests/assets/models_flow/main_model.py

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