supervisely 6.73.318__tar.gz → 6.73.320__tar.gz

{supervisely-6.73.318/supervisely.egg-info → supervisely-6.73.320}/PKG-INFO

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

{supervisely-6.73.318 → supervisely-6.73.320}/supervisely/api/task_api.py

@@ -818,14 +818,21 @@ class TaskApi(ModuleApiBase, ModuleWithStatus):
         pass
 
     def set_output_project(
-        self, task_id: int, project_id: int, project_name: Optional[str] = None
+        self,
+        task_id: int,
+        project_id: int,
+        project_name: Optional[str] = None,
+        project_preview: Optional[str] = None,
     ) -> Dict:
         """set_output_project"""
         if project_name is None:
             project = self._api.project.get_info_by_id(project_id, raise_error=True)
             project_name = project.name
+            project_preview = project.image_preview_url
 
         output = {ApiField.PROJECT: {ApiField.ID: project_id, ApiField.TITLE: project_name}}
+        if project_preview is not None:
+            output[ApiField.PROJECT][ApiField.PREVIEW] = project_preview
         resp = self._api.post(
             "tasks.output.set", {ApiField.TASK_ID: task_id, ApiField.OUTPUT: output}
         )
@@ -1159,9 +1166,7 @@ class TaskApi(ModuleApiBase, ModuleWithStatus):
             )
         self._api.post("tasks.status.update", {ApiField.ID: task_id, ApiField.STATUS: status})
 
-    def set_output_experiment(
-        self, task_id: int, experiment_info: dict, project_name: str = None
-    ) -> Dict:
+    def set_output_experiment(self, task_id: int, experiment_info: dict) -> Dict:
         """
         Sets output for the task with experiment info.
 
@@ -1216,15 +1221,7 @@ class TaskApi(ModuleApiBase, ModuleWithStatus):
                 },
             }
         """
-        project_id = experiment_info.get("project_id")
-        if project_id is None:
-            raise ValueError("Key 'project_id' is required in experiment_info")
-        if project_name is None:
-            project = self._api.project.get_info_by_id(project_id, raise_error=True)
-            project_name = project.name
-
         output = {
-            ApiField.PROJECT: {ApiField.ID: project_id, ApiField.TITLE: project_name},
             ApiField.EXPERIMENT: {ApiField.DATA: {**experiment_info}},
         }
         resp = self._api.post(

{supervisely-6.73.318 → supervisely-6.73.320}/supervisely/app/fastapi/subapp.py

@@ -27,6 +27,7 @@ from fastapi import (
 )
 from fastapi.exception_handlers import http_exception_handler
 from fastapi.responses import JSONResponse
+from fastapi.routing import APIRouter
 from fastapi.staticfiles import StaticFiles
 
 import supervisely.io.env as sly_env
@@ -47,7 +48,7 @@ from supervisely.app.singleton import Singleton
 from supervisely.app.widgets_context import JinjaWidgets
 from supervisely.geometry.bitmap import Bitmap
 from supervisely.io.fs import dir_exists, mkdir
-from supervisely.sly_logger import logger
+from supervisely.sly_logger import create_formatter, logger
 
 # from supervisely.app.fastapi.request import Request
 
@@ -56,7 +57,9 @@ if TYPE_CHECKING:
 
 import logging
 
-uvicorn_logger = logging.getLogger("uvicorn.access")
+SUPERVISELY_SERVER_PATH_PREFIX = sly_env.supervisely_server_path_prefix()
+if SUPERVISELY_SERVER_PATH_PREFIX and not SUPERVISELY_SERVER_PATH_PREFIX.startswith("/"):
+    SUPERVISELY_SERVER_PATH_PREFIX = f"/{SUPERVISELY_SERVER_PATH_PREFIX}"
 
 
 class ReadyzFilter(logging.Filter):
@@ -67,8 +70,24 @@ class ReadyzFilter(logging.Filter):
         return True
 
 
-# Apply the filter
-uvicorn_logger.addFilter(ReadyzFilter())
+def _init_uvicorn_logger():
+    uvicorn_logger = logging.getLogger("uvicorn.access")
+    for handler in uvicorn_logger.handlers:
+        handler.setFormatter(create_formatter())
+    uvicorn_logger.addFilter(ReadyzFilter())
+
+
+_init_uvicorn_logger()
+
+
+class PrefixRouter(APIRouter):
+    def add_api_route(self, path, *args, **kwargs):
+        allowed_paths = ["/livez", "/is_alive", "/is_running", "/readyz", "/is_ready"]
+        if path in allowed_paths:
+            super().add_api_route(path, *args, **kwargs)
+        if SUPERVISELY_SERVER_PATH_PREFIX:
+            path = SUPERVISELY_SERVER_PATH_PREFIX + path
+        super().add_api_route(path, *args, **kwargs)
 
 
 class Event:
@@ -864,6 +883,7 @@ def _init(
 class _MainServer(metaclass=Singleton):
     def __init__(self):
         self._server = FastAPI()
+        self._server.router = PrefixRouter()
 
     def get_server(self) -> FastAPI:
         return self._server

{supervisely-6.73.318 → supervisely-6.73.320}/supervisely/io/env.py

@@ -554,3 +554,19 @@ def semaphore_size() -> int:
         postprocess_fn=lambda x: int(x),
         raise_not_found=False,
     )
+
+
+def supervisely_server_path_prefix() -> str:
+    """Returns routes prefix from environment variable using following
+        - SUPERVISELY_SERVER_PATH_PREFIX
+
+    :return: routes prefix
+    :rtype: str
+    """
+    return _parse_from_env(
+        name="supervisely_server_path_prefix",
+        keys=["SUPERVISELY_SERVER_PATH_PREFIX"],
+        postprocess_fn=lambda x: x,
+        default="",
+        raise_not_found=False,
+    )

{supervisely-6.73.318 → supervisely-6.73.320}/supervisely/nn/inference/inference.py

@@ -2935,7 +2935,7 @@ class Inference:
         parser = argparse.ArgumentParser(description="Run Inference Serving")
 
         # Positional args
-        parser.add_argument("mode", choices=["deploy", "predict"], help="Mode of operation")
+        parser.add_argument("mode", nargs="?", type=str, help="Mode of operation: 'deploy' or 'predict'")
         parser.add_argument("input", nargs="?", type=str, help="Local path to input data")
 
         # Deploy args
@@ -3018,6 +3018,11 @@ class Inference:
 
         # Parse arguments
         args, _ = parser.parse_known_args()
+        if args.mode is None:
+            return None, False
+        elif args.mode not in ["predict", "deploy"]:
+            return None, False
+
         if args.model is None:
             if len(self.pretrained_models) == 0:
                 raise ValueError("No pretrained models found.")

{supervisely-6.73.318 → supervisely-6.73.320}/supervisely/nn/training/train_app.py

@@ -1546,6 +1546,7 @@ class TrainApp:
 
         # Do not include this fields to uploaded file:
         experiment_info["primary_metric"] = primary_metric_name
+        experiment_info["project_preview"] = self.project_info.image_preview_url
         return experiment_info
 
     def _generate_hyperparameters(self, remote_dir: str, experiment_info: Dict) -> None:
@@ -1759,7 +1760,7 @@ class TrainApp:
         # self.gui.training_logs.tensorboard_button.disable()
 
         # Set artifacts to GUI
-        self._api.task.set_output_experiment(self.task_id, experiment_info, self.project_name)
+        self._api.task.set_output_experiment(self.task_id, experiment_info)
         set_directory(remote_dir)
         self.gui.training_artifacts.artifacts_thumbnail.set(file_info)
         self.gui.training_artifacts.artifacts_thumbnail.show()
@@ -1806,8 +1807,9 @@ class TrainApp:
                 self.gui.training_artifacts.trt_instruction.show()
 
             # Show the inference demo widget if overview or any demo is available
-            if self.gui.training_artifacts.overview_demo_exists(demo_path) or any(
+            if hasattr(self.gui.training_artifacts, "inference_demo_field") and any(
                 [
+                    self.gui.training_artifacts.overview_demo_exists(demo_path),
                     self.gui.training_artifacts.pytorch_demo_exists(demo_path),
                     self.gui.training_artifacts.onnx_demo_exists(demo_path),
                     self.gui.training_artifacts.trt_demo_exists(demo_path),
@@ -1863,13 +1865,19 @@ class TrainApp:
         :return: Evaluation report, report ID and evaluation metrics.
         :rtype: tuple
         """
-        lnk_file_info, report, report_id, eval_metrics = None, None, None, {}
+        lnk_file_info, report, report_id, eval_metrics, primary_metric_name = (
+            None,
+            None,
+            None,
+            {},
+            None,
+        )
         if self._inference_class is None:
             logger.warning(
                 "Inference class is not registered, model benchmark disabled. "
                 "Use 'register_inference_class' method to register inference class."
             )
-            return lnk_file_info, report, report_id, eval_metrics
+            return lnk_file_info, report, report_id, eval_metrics, primary_metric_name
 
         # Can't get task type from session. requires before session init
         supported_task_types = [
@@ -1883,7 +1891,7 @@ class TrainApp:
                 f"Task type: '{task_type}' is not supported for Model Benchmark. "
                 f"Supported tasks: {', '.join(task_type)}"
             )
-            return lnk_file_info, report, report_id, eval_metrics
+            return lnk_file_info, report, report_id, eval_metrics, primary_metric_name
 
         logger.info("Running Model Benchmark evaluation")
         try:
@@ -2051,7 +2059,7 @@ class TrainApp:
                 if diff_project_info:
                     self._api.project.remove(diff_project_info.id)
             except Exception as e2:
-                return lnk_file_info, report, report_id, eval_metrics
+                return lnk_file_info, report, report_id, eval_metrics, primary_metric_name
         return lnk_file_info, report, report_id, eval_metrics, primary_metric_name
 
     # ----------------------------------------- #

{supervisely-6.73.318 → supervisely-6.73.320}/supervisely/sly_logger.py

@@ -1,17 +1,18 @@
 # coding: utf-8
 
-import logging
-import types
 import datetime
+import logging
 import os
+import types
 from collections import namedtuple
 from enum import Enum
-#import simplejson
-from pythonjsonlogger import jsonlogger
 
+# import simplejson
+from pythonjsonlogger import jsonlogger
 
 ###############################################################################
 
+
 class ServiceType(Enum):
     AGENT = 1
     TASK = 2
@@ -47,20 +48,23 @@ class EventType(Enum):
 
 
 # level name: level, default exc_info, description
-LogLevelSpec = namedtuple('LogLevelSpec', [
-    'int',
-    'add_exc_info',
-    'descr',
-])
+LogLevelSpec = namedtuple(
+    "LogLevelSpec",
+    [
+        "int",
+        "add_exc_info",
+        "descr",
+    ],
+)
 
 
 LOGGING_LEVELS = {
-    'FATAL': LogLevelSpec(50, True, 'Critical error'),
-    'ERROR': LogLevelSpec(40, True, 'Error'),   # may be shown to end user
-    'WARN': LogLevelSpec(30, False, 'Warning'),   # may be shown to end user
-    'INFO': LogLevelSpec(20, False, 'Info'),   # may be shown to end user
-    'DEBUG': LogLevelSpec(10, False, 'Debug'),
-    'TRACE': LogLevelSpec(5, False, 'Trace'),
+    "FATAL": LogLevelSpec(50, True, "Critical error"),
+    "ERROR": LogLevelSpec(40, True, "Error"),  # may be shown to end user
+    "WARN": LogLevelSpec(30, False, "Warning"),  # may be shown to end user
+    "INFO": LogLevelSpec(20, False, "Info"),  # may be shown to end user
+    "DEBUG": LogLevelSpec(10, False, "Debug"),
+    "TRACE": LogLevelSpec(5, False, "Trace"),
 }
 
 
@@ -69,12 +73,9 @@ def _set_logging_levels(levels, the_logger):
         logging.addLevelName(lvl, lvl_name.upper())  # two mappings
 
         def construct_logger_member(lvl_val, default_exc_info):
-            return lambda self, msg, *args, exc_info=default_exc_info, **kwargs: \
-                self.log(lvl_val,
-                         str(msg),
-                         *args,
-                         exc_info=exc_info,
-                         **kwargs)
+            return lambda self, msg, *args, exc_info=default_exc_info, **kwargs: self.log(
+                lvl_val, str(msg), *args, exc_info=exc_info, **kwargs
+            )
 
         func = construct_logger_member(lvl, def_exc_info)
         bound_method = types.MethodType(func, the_logger)
@@ -86,16 +87,16 @@ def _set_logging_levels(levels, the_logger):
 
 def _get_default_logging_fields():
     supported_keys = [
-        'asctime',
+        "asctime",
         # 'created',
         # 'filename',
         # 'funcName',
-        'levelname',
+        "levelname",
         # 'levelno',
         # 'lineno',
         # 'module',
         # 'msecs',
-        'message',
+        "message",
         # 'name',
         # 'pathname',
         # 'process',
@@ -104,10 +105,10 @@ def _get_default_logging_fields():
         # 'thread',
         # 'threadName'
     ]
-    return ' '.join(['%({0:s})'.format(k) for k in supported_keys])
+    return " ".join(["%({0:s})".format(k) for k in supported_keys])
 
 
-#def dumps_ignore_nan(obj, *args, **kwargs):
+# def dumps_ignore_nan(obj, *args, **kwargs):
 #    return  simplejson.dumps(obj, ignore_nan=True, *args, **kwargs)
 
 
@@ -115,21 +116,21 @@ class CustomJsonFormatter(jsonlogger.JsonFormatter):
     additional_fields = {}
 
     def __init__(self, format_string):
-        super().__init__(format_string)#, json_serializer=dumps_ignore_nan)
+        super().__init__(format_string)  # , json_serializer=dumps_ignore_nan)
 
     def process_log_record(self, log_record):
-        log_record['timestamp'] = log_record.pop('asctime', None)
+        log_record["timestamp"] = log_record.pop("asctime", None)
 
-        levelname = log_record.pop('levelname', None)
+        levelname = log_record.pop("levelname", None)
         if levelname is not None:
-            log_record['level'] = levelname.lower()
+            log_record["level"] = levelname.lower()
 
-        e_info = log_record.pop('exc_info', None)
+        e_info = log_record.pop("exc_info", None)
         if e_info is not None:
-            if e_info == 'NoneType: None':  # python logger is not ok here
+            if e_info == "NoneType: None":  # python logger is not ok here
                 pass
             else:
-                log_record['stack'] = e_info.split('\n')
+                log_record["stack"] = e_info.split("\n")
 
         return jsonlogger.JsonFormatter.process_log_record(self, log_record)
 
@@ -142,8 +143,8 @@ class CustomJsonFormatter(jsonlogger.JsonFormatter):
 
     def formatTime(self, record, datefmt=None):
         ct = datetime.datetime.fromtimestamp(record.created)
-        t = ct.strftime('%Y-%m-%dT%H:%M:%S')
-        s = '%s.%03dZ' % (t, record.msecs)
+        t = ct.strftime("%Y-%m-%dT%H:%M:%S")
+        s = "%s.%03dZ" % (t, record.msecs)
         return s
 
 
@@ -164,16 +165,20 @@ def _construct_logger(the_logger, loglevel_text):
 ###############################################################################
 
 
+def create_formatter(logger_fmt_string=None):
+    if logger_fmt_string is None:
+        logger_fmt_string = _get_default_logging_fields()
+    return CustomJsonFormatter(logger_fmt_string)
+
+
 def add_logger_handler(the_logger, log_handler):  # default format
-    logger_fmt_string = _get_default_logging_fields()
-    formatter = CustomJsonFormatter(logger_fmt_string)
+    formatter = create_formatter()
     log_handler.setFormatter(formatter)
     the_logger.addHandler(log_handler)
 
 
 def add_default_logging_into_file(the_logger, log_dir):
-    fname = 'log_{}.txt'.format(
-        datetime.datetime.now().strftime("%Y-%m-%d_%H:%M:%S"))
+    fname = "log_{}.txt".format(datetime.datetime.now().strftime("%Y-%m-%d_%H:%M:%S"))
     ofpath = os.path.join(log_dir, fname)
 
     log_handler_file = logging.FileHandler(filename=ofpath)
@@ -191,27 +196,26 @@ def change_formatters_default_values(the_logger, field_name, value):
 
 
 def _get_loglevel_env():
-    loglevel = os.getenv('LOG_LEVEL', None)
+    loglevel = os.getenv("LOG_LEVEL", None)
     if loglevel is None:
-        loglevel = os.getenv('LOGLEVEL', 'INFO')
+        loglevel = os.getenv("LOGLEVEL", "INFO")
     return loglevel.upper()
 
 
 def set_global_logger():
     loglevel = _get_loglevel_env()  # use the env to set loglevel
-    the_logger = logging.getLogger('logger')  # optional logger name
+    the_logger = logging.getLogger("logger")  # optional logger name
     _construct_logger(the_logger, loglevel)
     return the_logger
 
 
 def get_task_logger(task_id, loglevel=None):
     if loglevel is None:
-        loglevel = _get_loglevel_env() # use the env to set loglevel
-    logger_name = 'task_{}'.format(task_id)
+        loglevel = _get_loglevel_env()  # use the env to set loglevel
+    logger_name = "task_{}".format(task_id)
     the_logger = logging.getLogger(logger_name)  # optional logger name
     _construct_logger(the_logger, loglevel)
     return the_logger
 
 
 logger = set_global_logger()
-

{supervisely-6.73.318 → supervisely-6.73.320/supervisely.egg-info}/PKG-INFO

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