supervisely 6.73.356__py3-none-any.whl → 6.73.358__py3-none-any.whl

supervisely/_utils.py

@@ -4,6 +4,7 @@ import asyncio
 import base64
 import copy
 import hashlib
+import inspect
 import json
 import os
 import random
@@ -533,6 +534,17 @@ def get_filename_from_headers(url):
         return None
 
 
+def get_valid_kwargs(kwargs, func, exclude=None):
+    signature = inspect.signature(func)
+    valid_kwargs = {}
+    for key, value in kwargs.items():
+        if exclude is not None and key in exclude:
+            continue
+        if key in signature.parameters:
+            valid_kwargs[key] = value
+    return valid_kwargs
+
+
 def removesuffix(string, suffix):
     """
     Returns the string without the specified suffix if the string ends with that suffix.

supervisely/api/annotation_api.py

@@ -46,6 +46,7 @@ class AnnotationInfo(NamedTuple):
     annotation: dict
     created_at: str
     updated_at: str
+    dataset_id: int = None
 
     def to_json(self) -> Dict[str, Any]:
         """
@@ -60,6 +61,7 @@ class AnnotationInfo(NamedTuple):
             ApiField.ANNOTATION: self.annotation,
             ApiField.CREATED_AT: self.created_at,
             ApiField.UPDATED_AT: self.updated_at,
+            ApiField.DATASET_ID: self.dataset_id,
         }
 
 
@@ -112,6 +114,7 @@ class AnnotationApi(ModuleApi):
             ApiField.ANNOTATION,
             ApiField.CREATED_AT,
             ApiField.UPDATED_AT,
+            ApiField.DATASET_ID,
         ]
 
     @staticmethod

supervisely/api/api.py

@@ -45,9 +45,9 @@ import supervisely.api.image_api as image_api
 import supervisely.api.import_storage_api as import_stoarge_api
 import supervisely.api.issues_api as issues_api
 import supervisely.api.labeling_job_api as labeling_job_api
+import supervisely.api.nn.neural_network_api as neural_network_api
 import supervisely.api.labeling_queue_api as labeling_queue_api
 import supervisely.api.entities_collection_api as entities_collection_api
-import supervisely.api.neural_network_api as neural_network_api
 import supervisely.api.object_class_api as object_class_api
 import supervisely.api.plugin_api as plugin_api
 import supervisely.api.pointcloud.pointcloud_api as pointcloud_api
@@ -345,7 +345,7 @@ class Api:
         self.team = team_api.TeamApi(self)
         self.workspace = workspace_api.WorkspaceApi(self)
         self.project = project_api.ProjectApi(self)
-        self.model = neural_network_api.NeuralNetworkApi(self)
+        self.nn = neural_network_api.NeuralNetworkApi(self)
         self.task = task_api.TaskApi(self)
         self.dataset = dataset_api.DatasetApi(self)
         self.image = image_api.ImageApi(self)

supervisely/api/app_api.py

@@ -7,6 +7,8 @@ from dataclasses import dataclass
 from time import sleep
 from typing import Any, Dict, List, NamedTuple, Optional, Union
 
+from typing_extensions import Literal
+
 from supervisely._utils import is_community, is_development, take_with_default
 from supervisely.api.module_api import ApiField
 from supervisely.api.task_api import TaskApi
@@ -1532,10 +1534,21 @@ class AppApi(TaskApi):
             )
         return modules[0]["id"]
 
-    def get_list_ecosystem_modules(self):
+    def get_list_ecosystem_modules(
+        self,
+        search: Optional[str] = None,
+        categories: Optional[List[str]] = None,
+        categories_operation: Literal["or", "and"] = "or",
+    ):
+        data = {}
+        if search is not None:
+            data["search"] = search
+        if categories is not None:
+            data["categories"] = categories
+            data["categoriesOperation"] = categories_operation
         modules = self.get_list_all_pages(
             method="ecosystem.list",
-            data={},
+            data=data,
             convert_json_info_cb=lambda x: x,
         )
         if len(modules) == 0:
@@ -1771,8 +1784,20 @@ class AppApi(TaskApi):
             else:
                 is_ready = True
                 break
+        if is_ready:
+            logger.info("App is ready for API calls")
+        else:
+            logger.info("App is not ready for API calls after all attempts")
         return is_ready
 
+    def find_module_id_by_app_name(self, app_name):
+        modules = self._api.app.get_list_ecosystem_modules(search=app_name)
+        if len(modules) == 0:
+            raise ValueError(f"No serving apps found for app name {app_name}")
+        if len(modules) > 1:
+            raise ValueError(f"Multiple serving apps found for app name {app_name}")
+        return modules[0]["id"]
+
 
 # info about app in team
 # {

supervisely/api/entity_annotation/tag_api.py

@@ -7,7 +7,6 @@ from supervisely.api.module_api import ApiField, ModuleApi
 from supervisely.collection.key_indexed_collection import KeyIndexedCollection
 from supervisely.task.progress import tqdm_sly
 from supervisely.video_annotation.key_id_map import KeyIdMap
-from supervisely.task.progress import tqdm_sly
 
 
 class TagApi(ModuleApi):

supervisely/api/labeling_job_api.py

@@ -88,6 +88,7 @@ class LabelingJobInfo(NamedTuple):
     include_images_with_tags: list
     exclude_images_with_tags: list
     entities: list
+    priority: int
 
 
 class LabelingJobApi(RemoveableBulkModuleApi, ModuleWithStatus):
@@ -179,7 +180,8 @@ class LabelingJobApi(RemoveableBulkModuleApi, ModuleWithStatus):
                              filter_images_by_tags=[],
                              include_images_with_tags=[],
                              exclude_images_with_tags=[],
-                             entities=None)
+                             entities=None,
+                             priority=2)
         """
         return [
             ApiField.ID,
@@ -220,6 +222,7 @@ class LabelingJobApi(RemoveableBulkModuleApi, ModuleWithStatus):
             ApiField.INCLUDE_IMAGES_WITH_TAGS,
             ApiField.EXCLUDE_IMAGES_WITH_TAGS,
             ApiField.ENTITIES,
+            ApiField.PRIORITY,
         ]
 
     @staticmethod