supervisely 6.73.436__py3-none-any.whl → 6.73.437__py3-none-any.whl

supervisely/nn/inference/predict_app/gui/gui.py

@@ -548,13 +548,21 @@ class PredictAppGui:
 
         # Input
         # Input would be newely created project
+        input_args = {}
         input_parameters = run_parameters["input"]
         input_project_id = input_parameters.get("project_id", None)
         if input_project_id is None:
             raise ValueError("Input project ID is required for prediction.")
         input_dataset_ids = input_parameters.get("dataset_ids", [])
-        if not input_dataset_ids:
+        input_image_ids = input_parameters.get("image_ids", [])
+        if not (input_dataset_ids or input_image_ids):
             raise ValueError("At least one dataset must be selected for prediction.")
+        if input_image_ids:
+            input_args["image_ids"] = input_image_ids
+        elif input_dataset_ids:
+            input_args["dataset_ids"] = input_dataset_ids
+        else:
+            input_args["project_id"] = input_project_id
 
         # Settings
         settings = run_parameters["settings"]
@@ -582,23 +590,32 @@ class PredictAppGui:
         # Always create new project
         # But the actual inference will happen inplace
         output_parameters = run_parameters["output"]
-        project_name = output_parameters["project_name"]
-        if not project_name:
-            input_project_info = self.api.project.get_info_by_id(input_project_id)
-            project_name = input_project_info.name + " [Predictions]"
-            logger.warning("Project name is empty, using auto-generated name: " + project_name)
-
-        # Copy project
-        self.set_validator_text("Copying project...", "info")
-        created_project = copy_project(
-            self.api,
-            project_name,
-            self.workspace_id,
-            input_project_id,
-            input_dataset_ids,
-            with_annotations,
-            self.output_selector.progress,
-        )
+        project_name = output_parameters.get("project_name", "")
+        upload_to_source_project = output_parameters.get("upload_to_source_project", False)
+        if upload_to_source_project:
+            output_project_id = input_project_id
+        else:
+            if not project_name:
+                input_project_info = self.api.project.get_info_by_id(input_project_id)
+                project_name = input_project_info.name + " [Predictions]"
+                logger.warning("Project name is empty, using auto-generated name: " + project_name)
+
+            # Copy project
+            self.set_validator_text("Copying project...", "info")
+            created_project = copy_project(
+                self.api,
+                project_name,
+                self.workspace_id,
+                input_project_id,
+                input_dataset_ids,
+                with_annotations,
+                self.output_selector.progress,
+            )
+            output_project_id = created_project.id
+            input_args = {
+                "project_id": output_project_id,
+            }
+
         # ------------------------ #
 
         # Run prediction
@@ -607,7 +624,7 @@ class PredictAppGui:
         self._is_running = True
         try:
             with model_api.predict_detached(
-                project_id=created_project.id,
+                **input_args,
                 tqdm=self.output_selector.progress(),
                 **kwargs,
             ) as session:
@@ -635,7 +652,7 @@ class PredictAppGui:
 
         # Set result thumbnail
         self.set_validator_text("Project successfully processed", "success")
-        self.output_selector.set_result_thumbnail(created_project.id)
+        self.output_selector.set_result_thumbnail(output_project_id)
         # ------------------------ #
         return predictions
 

supervisely/nn/inference/predict_app/predict_app.py

@@ -3,13 +3,13 @@ from typing import Dict, List, Optional
 
 from fastapi import BackgroundTasks, Request
 
+import supervisely.io.fs as sly_fs
 from supervisely._utils import logger
 from supervisely.api.api import Api
 from supervisely.app.fastapi.subapp import Application
 from supervisely.nn.inference.predict_app.gui.gui import PredictAppGui
-from supervisely.nn.model.prediction import Prediction
 from supervisely.nn.inference.predict_app.gui.utils import disable_enable
-import supervisely.io.fs as sly_fs
+from supervisely.nn.model.prediction import Prediction
 
 
 class PredictApp:
@@ -91,14 +91,16 @@ class PredictApp:
                         # "mode": "custom",
                         # "train_task_id": 123
                     },
-                    "items": {
+                    "input": {
                         "project_id": 123,
                         # "dataset_ids": [...],
                         # "video_id": 123
                     },
-                    "inference_settings": {
-                        "confidence_threshold": 0.5
-                    },
+                    "settings": {
+                        "inference_settings": {
+                            "confidence_threshold": 0.5
+                        },
+                    }
                     "output": {
                         "mode": "create",
                         "project_name": "Predictions",
@@ -153,7 +155,7 @@ class PredictApp:
                     "inference_settings": {
                         "conf": 0.6,
                     },
-                    "item": {
+                    "input": {
                         # "project_id": ...,
                         # "dataset_ids": [...],
                         "image_ids": [1148679, 1148675],
@@ -162,17 +164,7 @@ class PredictApp:
                 }
             """
             state = request.state.state
-            run_parameters = {
-                "item": state["item"],
-            }
-            if "inference_settings" in state:
-                run_parameters["inference_settings"] = state["inference_settings"]
-            if "output" in state:
-                run_parameters["output"] = state["output"]
-            else:
-                run_parameters["output"] = {"mode": None}
-
-            predictions = self.run(run_parameters)
+            predictions = self.run(state)
             return [prediction.to_json() for prediction in predictions]
 
         @server.post("/run")

{supervisely-6.73.436.dist-info → supervisely-6.73.437.dist-info}/METADATA

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

{supervisely-6.73.436.dist-info → supervisely-6.73.437.dist-info}/RECORD

@@ -931,10 +931,10 @@ supervisely/nn/inference/object_detection_3d/object_detection_3d.py,sha256=GmBz7
 supervisely/nn/inference/pose_estimation/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 supervisely/nn/inference/pose_estimation/pose_estimation.py,sha256=oI-zWO7zY0-tHwGhSFmno3eSwE5I0BDKRDrZBoU9jPY,6452
 supervisely/nn/inference/predict_app/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-supervisely/nn/inference/predict_app/predict_app.py,sha256=AIEKqAzU0g2Nksw7r7_bwcbOXOwh1V2Xp7rLLntYNSY,6621
+supervisely/nn/inference/predict_app/predict_app.py,sha256=iI_uxCzRpxY-XSXRUzwn261PQEIoQvCZFyRq0jtOv5w,6298
 supervisely/nn/inference/predict_app/gui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 supervisely/nn/inference/predict_app/gui/classes_selector.py,sha256=V6fmsEnn8-FwoS7c9Bpms1jR_hqWDnGNIBU6s2a-XnQ,2916
-supervisely/nn/inference/predict_app/gui/gui.py,sha256=RquvLtlWQ9OWB0fOJx6DAoiHCRdmPLMKUld3-VkOoh4,28096
+supervisely/nn/inference/predict_app/gui/gui.py,sha256=lLdRQA1iyZApbOPxL6lgFBiwcgm80OkMA-Etu2FoFSk,28831
 supervisely/nn/inference/predict_app/gui/input_selector.py,sha256=Jh-eSU-cnqHtbcBfSjBCfZrq5nfQlPi7bOAzqqo26xc,6187
 supervisely/nn/inference/predict_app/gui/model_selector.py,sha256=sGKzxaPwbTzP7_463sWeJe7qEfxntZHK6hYQPm6smFU,2453
 supervisely/nn/inference/predict_app/gui/output_selector.py,sha256=lDX6q8Liw8wsbOae9DphOIEH1yKj5u2EwMqf0yO1mgY,4885
@@ -1127,9 +1127,9 @@ supervisely/worker_proto/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZ
 supervisely/worker_proto/worker_api_pb2.py,sha256=VQfi5JRBHs2pFCK1snec3JECgGnua3Xjqw_-b3aFxuM,59142
 supervisely/worker_proto/worker_api_pb2_grpc.py,sha256=3BwQXOaP9qpdi0Dt9EKG--Lm8KGN0C5AgmUfRv77_Jk,28940
 supervisely_lib/__init__.py,sha256=7-3QnN8Zf0wj8NCr2oJmqoQWMKKPKTECvjH9pd2S5vY,159
-supervisely-6.73.436.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-supervisely-6.73.436.dist-info/METADATA,sha256=gOzWnbgJZtUwif9iy9Sy7pRg76KXC8dkqOSGciSk_p4,35433
-supervisely-6.73.436.dist-info/WHEEL,sha256=iAkIy5fosb7FzIOwONchHf19Qu7_1wCWyFNR5gu9nU0,91
-supervisely-6.73.436.dist-info/entry_points.txt,sha256=U96-5Hxrp2ApRjnCoUiUhWMqijqh8zLR03sEhWtAcms,102
-supervisely-6.73.436.dist-info/top_level.txt,sha256=kcFVwb7SXtfqZifrZaSE3owHExX4gcNYe7Q2uoby084,28
-supervisely-6.73.436.dist-info/RECORD,,
+supervisely-6.73.437.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+supervisely-6.73.437.dist-info/METADATA,sha256=XBgqkLz3078y1s0fpxtmLbxX8MUVdFj_zR6fvjs-FsA,35433
+supervisely-6.73.437.dist-info/WHEEL,sha256=iAkIy5fosb7FzIOwONchHf19Qu7_1wCWyFNR5gu9nU0,91
+supervisely-6.73.437.dist-info/entry_points.txt,sha256=U96-5Hxrp2ApRjnCoUiUhWMqijqh8zLR03sEhWtAcms,102
+supervisely-6.73.437.dist-info/top_level.txt,sha256=kcFVwb7SXtfqZifrZaSE3owHExX4gcNYe7Q2uoby084,28
+supervisely-6.73.437.dist-info/RECORD,,