supervisely 6.73.434__tar.gz → 6.73.436__tar.gz

{supervisely-6.73.434/supervisely.egg-info → supervisely-6.73.436}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: supervisely
-Version: 6.73.434
+Version: 6.73.436
 Summary: Supervisely Python SDK.
 Home-page: https://github.com/supervisely/supervisely
 Author: Supervisely

{supervisely-6.73.434 → supervisely-6.73.436}/supervisely/api/image_api.py

@@ -70,6 +70,7 @@ from supervisely.api.module_api import (
     _get_single_item,
 )
 from supervisely.imaging import image as sly_image
+from supervisely.io.env import app_categories, increment_upload_count, add_uploaded_ids_to_env
 from supervisely.io.fs import (
     OFFSETS_PKL_BATCH_SIZE,
     OFFSETS_PKL_SUFFIX,
@@ -2613,6 +2614,16 @@ class ImageApi(RemoveableBulkModuleApi):
                             info_json_copy[ApiField.EXT] = info_json[ApiField.MIME].split("/")[1]
                         # results.append(self.InfoType(*[info_json_copy[field_name] for field_name in self.info_sequence()]))
                         results.append(self._convert_json_info(info_json_copy))
+
+                    try:
+                        if "import" in app_categories():
+                            ids = [info.id for info in results[-len(batch_names) :]]
+                            if len(ids) > 0:
+                                increment_upload_count(dataset_id, len(ids))
+                                add_uploaded_ids_to_env(dataset_id, ids)
+                    except:
+                        pass
+
                     break
                 except HTTPError as e:
                     error_details = e.response.json().get("details", {})

{supervisely-6.73.434 → supervisely-6.73.436}/supervisely/api/project_api.py

@@ -47,6 +47,7 @@ from supervisely.api.module_api import (
     RemoveableModuleApi,
     UpdateableModule,
 )
+from supervisely.io.env import upload_count, uploaded_ids
 from supervisely.io.json import dump_json_file, load_json_file
 from supervisely.project.project_meta import ProjectMeta
 from supervisely.project.project_meta import ProjectMetaJsonFields as MetaJsonF
@@ -2658,5 +2659,77 @@ class ProjectApi(CloneableModuleApi, UpdateableModule, RemoveableModuleApi):
         ):
             infos.append((src_info, dst_info))
 
+        return infos
 
-        return infos
+    def add_import_history(self, id: int, task_id: int) -> None:
+        """
+        Adds import history to project info. Gets task info and adds it to project custom data.
+
+        :param id: Project ID
+        :type id: int
+        :param task_id: Task ID
+        :type task_id: int
+        :return: None
+        :rtype: :class:`NoneType`
+        :Usage example:
+         .. code-block:: python
+            import os
+            from dotenv import load_dotenv
+
+            import supervisely as sly
+
+            # Load secrets and create API object from .env file (recommended)
+            # Learn more here: https://developer.supervisely.com/getting-started/basics-of-authentication
+            load_dotenv(os.path.expanduser("~/supervisely.env"))
+            api = sly.Api.from_env()
+
+            project_id = 123
+            task_id = 456
+            api.project.add_import_history(project_id, task_id)
+        """
+
+        task_info = self._api.task.get_info_by_id(task_id)
+        module_id = task_info.get("meta", {}).get("app", {}).get("moduleId")
+        slug = None
+        if module_id is not None:
+            module_info = self._api.app.get_ecosystem_module_info(module_id)
+            slug = module_info.slug
+
+        items_count = upload_count()
+        items_count = {int(k): v for k, v in items_count.items()}
+        uploaded_images = uploaded_ids()
+        uploaded_images = {int(k): v for k, v in uploaded_images.items()}
+        total_items = sum(items_count.values()) if len(items_count) > 0 else 0
+        app = task_info.get("meta", {}).get("app")
+        app_name = app.get("name") if app else None
+        app_version = app.get("version") if app else None
+        data = {
+            "task_id": task_id,
+            "app": {"name": app_name, "version": app_version},
+            "slug": slug,
+            "status": task_info.get(ApiField.STATUS),
+            "user_id": task_info.get(ApiField.USER_ID),
+            "team_id": task_info.get(ApiField.TEAM_ID),
+            "timestamp": datetime.now().strftime("%Y-%m-%dT%H:%M:%S"),
+            "source_state": task_info.get("settings", {}).get("message", {}).get("state"),
+            "items_count": total_items,
+            "datasets": [
+                {
+                    "id": ds,
+                    "items_count": items_count[ds],
+                    "uploaded_images": uploaded_images.get(ds, []),
+                }
+                for ds in items_count.keys()
+            ],
+        }
+
+        project_info = self.get_info_by_id(id)
+
+        custom_data = project_info.custom_data or {}
+        if "import_history" not in custom_data:
+            custom_data["import_history"] = {"tasks": []}
+        if "tasks" not in custom_data["import_history"]:
+            custom_data["import_history"]["tasks"] = []
+        custom_data["import_history"]["tasks"].append(data)
+
+        self.edit_info(id, custom_data=custom_data)

{supervisely-6.73.434 → supervisely-6.73.436}/supervisely/api/task_api.py

@@ -24,6 +24,7 @@ from supervisely.api.module_api import (
     WaitingTimeExceeded,
 )
 from supervisely.collection.str_enum import StrEnum
+from supervisely.io.env import app_categories
 from supervisely.io.fs import (
     ensure_base_path,
     get_file_hash,
@@ -652,6 +653,8 @@ class TaskApi(ModuleApiBase, ModuleWithStatus):
         project_preview: Optional[str] = None,
     ) -> Dict:
         """set_output_project"""
+        if "import" in app_categories():
+            self._api.project.add_import_history(project_id, task_id)
         if project_name is None:
             project = self._api.project.get_info_by_id(project_id, raise_error=True)
             project_name = project.name

{supervisely-6.73.434 → supervisely-6.73.436}/supervisely/app/widgets/select_dataset/select_dataset.py

@@ -138,6 +138,12 @@ class SelectDataset(Widget):
 
     def set_project_id(self, id: int):
         self._project_id = id
+        if self._compact is True:
+            DataJson()[self.widget_id]["projectId"] = self._project_id
+            DataJson().send_changes()
+        else:
+            StateJson()[self.widget_id]["projectId"] = self._project_id
+            StateJson().send_changes()
         self._project_selector.set_project_id(self._project_id)
 
     def set_select_all_datasets(self, is_checked: bool):

{supervisely-6.73.434 → supervisely-6.73.436}/supervisely/io/env.py

@@ -1,4 +1,5 @@
 # coding: utf-8
+import json
 import os
 from typing import Callable, List, Literal, Optional, Union
 
@@ -686,3 +687,87 @@ def configure_minimum_instance_version() -> None:
     latest_version = get_latest_instance_version_from_json()
     if latest_version:
         os.environ["MINIMUM_INSTANCE_VERSION_FOR_SDK"] = latest_version
+
+def app_categories(raise_not_found: Optional[bool] = False) -> list:
+    """Returns a list of app categories from environment variable using following keys:
+        - APP_CATEGORIES
+    :param raise_not_found: if True, raises KeyError if app category is not found in environment variables
+    :type raise_not_found: Optional[bool]
+    :return: app categories
+    :rtype: list
+    """
+    return _parse_from_env(
+        name="app_category",
+        keys=["APP_CATEGORIES"],
+        postprocess_fn=lambda x: json.loads(x),
+        default=[],
+        raise_not_found=raise_not_found,
+    )
+
+
+def upload_count(raise_not_found: Optional[bool] = False) -> dict:
+    """Returns a dictionary of upload counts from environment variable using following
+        - UPLOAD_COUNT
+    :param raise_not_found: if True, raises KeyError if upload count is not found in environment variables
+    :type raise_not_found: Optional[bool]
+    :return: upload count
+    :rtype: dict
+    """
+    return _parse_from_env(
+        name="upload_count",
+        keys=["UPLOAD_COUNT"],
+        postprocess_fn=lambda x: json.loads(x),
+        default={},
+        raise_not_found=raise_not_found,
+    )
+
+
+def uploaded_ids(raise_not_found: Optional[bool] = False) -> dict:
+    """Returns a dictionary with dataset IDs as keys and lists of uploaded IDs as values from environment variable using following
+        - UPLOADED_IDS
+    :param raise_not_found: if True, raises KeyError if uploaded IDs is not found in environment variables
+    :type raise_not_found: Optional[bool]
+    :return: uploaded IDs
+    :rtype: dict
+    """
+    return _parse_from_env(
+        name="uploaded_ids",
+        keys=["UPLOADED_IDS"],
+        postprocess_fn=lambda x: json.loads(x),
+        default={},
+        raise_not_found=raise_not_found,
+    )
+
+
+def increment_upload_count(dataset_id: int, count: int = 1) -> None:
+    """Increments the upload count for the given dataset id by the specified count.
+
+    :param dataset_id: The dataset id to increment the upload count for.
+    :type dataset_id: int
+    :param count: The amount to increment the upload count by. Defaults to 1.
+    :type count: int
+    """
+    upload_info = upload_count()
+    upload_info[str(dataset_id)] = upload_info.get(str(dataset_id), 0) + count
+    os.environ["UPLOAD_COUNT"] = json.dumps(upload_info)
+
+
+def add_uploaded_ids_to_env(dataset_id: int, ids: List[int]) -> None:
+    """Adds the list of uploaded IDs to the environment variable for the given dataset ID.
+
+    :param dataset_id: The dataset ID to associate the uploaded IDs with.
+    :type dataset_id: int
+    :param ids: The list of uploaded IDs to add.
+    :type ids: List[int]
+    """
+    uploaded = uploaded_ids()
+    if str(dataset_id) not in uploaded:
+        uploaded[str(dataset_id)] = []
+    existing_ids = set(uploaded[str(dataset_id)])
+    if set(ids).intersection(existing_ids):
+        for _id in ids:
+            if _id not in existing_ids:
+                uploaded[str(dataset_id)].append(_id)
+    else:
+        uploaded[str(dataset_id)].extend(ids)
+    os.environ["UPLOADED_IDS"] = json.dumps(uploaded)

{supervisely-6.73.434 → supervisely-6.73.436}/supervisely/nn/training/gui/gui.py

@@ -254,6 +254,7 @@ class TrainGUI:
         self.app_options = app_options
         self.collapsable = self.app_options.get("collapsable", False)
         self.need_convert_shapes = False
+        self._start_training = False
 
         self.team_id = sly_env.team_id(raise_not_found=False)
         self.workspace_id = sly_env.workspace_id(raise_not_found=False)
@@ -844,6 +845,7 @@ class TrainGUI:
                     },
                 },
                 "experiment_name": "My Experiment",
+                "start_training": False,
             }
         """
         if isinstance(app_state, str):
@@ -888,6 +890,8 @@ class TrainGUI:
 
         if validate_steps:
             logger.info(f"All steps have been validated successfully")
+
+        self._start_training = app_state.get("start_training", False)
         # ------------------------------------------------------------------ #
 
     def _init_input(

{supervisely-6.73.434 → supervisely-6.73.436}/supervisely/nn/training/train_app.py

@@ -305,6 +305,12 @@ class TrainApp:
 
     # Properties
     # General
+    @property
+    def auto_start(self) -> bool:
+        """
+        If True, the training will start automatically after the GUI is loaded and train server is started.
+        """
+        return self.gui._start_training
     # ----------------------------------------- #
 
     # Input Data
@@ -2047,13 +2053,16 @@ class TrainApp:
             try:
                 output_file_info = self._generate_experiment_report(experiment_info, model_meta)
                 experiment_info["has_report"] = True
+                experiment_info["experiment_report_id"] = output_file_info.id
             except Exception as e:
                 logger.error(f"Error generating experiment report: {e}")
                 output_file_info = session_link_file_info
                 experiment_info["has_report"] = False
+                experiment_info["experiment_report_id"] = None
         else:  # link to artifacts directory
             output_file_info = session_link_file_info
             experiment_info["has_report"] = False
+            experiment_info["experiment_report_id"] = None
         return output_file_info, experiment_info
 
     def _get_train_val_splits_for_app_state(self) -> Dict:
@@ -2789,6 +2798,12 @@ class TrainApp:
         train_logger.add_on_step_finished_callback(step_callback)
 
     # ----------------------------------------- #
+    def start_in_thread(self):
+        def auto_train():
+            import threading
+            threading.Thread(target=self._wrapped_start_training, daemon=True).start()
+        self._server.add_event_handler("startup", auto_train)
+
     def _wrapped_start_training(self):
         """
         Wrapper function to wrap the training process.

{supervisely-6.73.434 → supervisely-6.73.436/supervisely.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: supervisely
-Version: 6.73.434
+Version: 6.73.436
 Summary: Supervisely Python SDK.
 Home-page: https://github.com/supervisely/supervisely
 Author: Supervisely