PyPI - supervisely - Versions diffs - 6.73.270__tar.gz → 6.73.272__tar.gz - Mend

supervisely 6.73.270tar.gz → 6.73.272tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.

This version of supervisely might be problematic. Click here for more details.

Files changed (1089) hide show

{supervisely-6.73.270/supervisely.egg-info → supervisely-6.73.272}/PKG-INFO RENAMED Viewed

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

supervisely-6.73.272/supervisely/app/fastapi/index.html ADDED Viewed

@@ -0,0 +1,260 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <link id="favicon" rel="icon" type="image/x-icon" href="{{{__favicon__}}}" />
+  <link type="text/css" rel="stylesheet"
+    href="https://cdn.jsdelivr.net/gh/supervisely/js-bundle@{{{js_bundle_version}}}/sly-app-widgets-{{{js_bundle_version}}}.bundle.css" />
+  <style>
+    #app-global-loading-icon {
+      background: white;
+      border-radius: 50%;
+      width: 75px;
+      height: 75px;
+      padding: 10px;
+      margin: 10px 0;
+      position: relative;
+    }
+    @keyframes app-loading-rotation {
+      0% {
+        transform: rotate(0deg);
+      }
+      100% {
+        transform: rotate(360deg);
+      }
+    }
+    #app-global-loading-icon::after {
+      content: "";
+      box-sizing: border-box;
+      position: absolute;
+      left: 0;
+      top: 0;
+      transform: translate(-50%, -50%);
+      width: 95px;
+      height: 95px;
+      border-radius: 50%;
+      border: 3px solid transparent;
+      border-bottom-color: #fb4481;
+      animation: app-loading-rotation 1s linear infinite;
+    }
+    #app-global-loading-icon>img {
+      width: 75px;
+      border-radius: 50%;
+    }
+    .extended-app-header .app-session-header-widget>div {
+      margin-bottom: 0;
+      padding-left: 20px;
+    }
+    .app-session-header-solid {
+      background: white;
+      box-shadow: 0 5px 10px #0000000d;
+      border-bottom: 1px solid #dfe2e8;
+      position: relative;
+    }
+  </style>
+  <title>{{{app_name}}}</title>
+</head>
+<body style="background-color: #f4f7fe">
+  <center>
+    <div id="app-global-loading-icon">
+      <img src="https://app.supervise.ly/loading.gif" />
+    </div>
+  </center>
+  {% if __webpy_script__ %}
+  <script src="https://cdn.jsdelivr.net/pyodide/{{{pyodide_version}}}/full/pyodide.js"></script>
+  {% endif %}
+  <script
+    src="https://cdn.jsdelivr.net/gh/supervisely/js-bundle@{{{js_bundle_version}}}/sly-app-widgets-{{{js_bundle_version}}}.bundle.js"></script>
+  <script type="module"
+    src="https://cdn.jsdelivr.net/gh/supervisely-ecosystem/supervisely-app-frontend-js@v{{{js_frontend_version}}}/SlyApp.js"></script>
+  <script>
+    window.parent.postMessage('{ "showHeader": false }', "*");
+  </script>
+  {% for scripts in __widget_scripts__.values() %} {% if scripts is string %}
+  <script src="{{{ scripts }}}"></script>
+  {% else %} {% for scripts in scripts %}
+  <script src="{{{ scripts }}}"></script>
+  {% endfor %} {% endif %} {% endfor %}
+  <div id="sly-app">
+    <sly-app>
+      <template v-slot="{ post, state, data, session }">
+        <div
+          :style="{'padding': `${state.app_body_padding} ${state.app_body_padding} 0`, 'display': 'flex', 'flex-direction': 'row', 'place-items': 'center'}"
+          {% if __app_session_info_solid__ %} {% if __app_session_info_extra_content__ %}
+          class="app-session-header-solid extended-app-header" {% else %} class="app-session-header-solid" {% endif %}
+          {% else %} {% if __app_session_info_extra_content__ %} class="extended-app-header" {% endif %} {% endif %}>
+          <sly-app-header v-if="session" :session="session" :data="data" :state="state"></sly-app-header>
+          {% if __app_session_info_extra_content__ %}
+          {{{__app_session_info_extra_content__}}} {% endif %}
+        </div>
+        <div :style="{'padding': `0 ${state.app_body_padding} ${state.app_body_padding}`}" {% if __webpy_script__
+          %}v-loading="state.app_initializing" {% endif %}>
+          {% if __no_html_mode__ %} {% include 'no_html_main.html' %} {% else
+          %} {% include 'main.html' %} {% endif %} {% include
+          'dialog_window.html' %}
+        </div>
+      </template>
+    </sly-app>
+  </div>
+  <!-- Offline session styles fix -->
+  <script>
+    let resizeCounter = 0;
+    let resizeInterval = setInterval(() => {
+      resizeCounter += 1;
+      window.dispatchEvent(new Event("resize"));
+      if (resizeCounter > 3) {
+        clearInterval(resizeInterval);
+      }
+    }, 2000);
+    let pyodide = null;
+    let mainScriptTxt = null;
+    async function loadDependency(pyodide, url, modulePath) {
+      const pythonCode = await fetch(url).then(response => response.text());
+      const FS = pyodide.FS;
+      FS.writeFile(modulePath, pythonCode);
+    }
+    async function setupAndImportPythonPackage(url, packageName) {
+      const FS = pyodide.FS;
+      const response = await fetch(url);
+      if (!response.ok) {
+        throw new Error(`Failed to fetch TAR file: ${response.statusText}`);
+      }
+      const tarData = await response.arrayBuffer();
+      const tarPath = `${packageName}.tar`;
+      FS.writeFile(tarPath, new Uint8Array(tarData));
+      const extractTo = `./`;
+      const pythonCode = `
+import tarfile
+import sys
+import os
+tar_path = "${tarPath}"
+extract_to = "${extractTo}"
+os.makedirs(extract_to, exist_ok=True)
+with tarfile.open(tar_path, "r:") as tar_ref:
+    tar_ref.extractall(extract_to)
+`;
+      await pyodide.runPythonAsync(pythonCode);
+      console.log(`Package ${packageName} extracted to ${extractTo}`);
+    }
+    const allowedActions = new Set([
+      {% if events_subscribed %}
+    {% for event in events_subscribed %}
+    '{{{ event }}}',
+      {% endfor %}
+    {% endif %}
+    ]);
+    let unSubStoreAction = null;
+    function subToStoreAction() {
+      if (unSubStoreAction) {
+        unSubStoreAction();
+      }
+      const store = window.slyApp.store;
+      unSubStoreAction = store.subscribeAction((action) => {
+        if (!allowedActions.has(action.type)) return;
+        runPythonScript(action);
+      });
+      console.log("Subscribed to store actions");
+    }
+    async function loadMainPythonScript() {
+      pyodide = await loadPyodide();
+      await pyodide.loadPackage("micropip");
+      const micropip = pyodide.pyimport("micropip");
+      await micropip.install(["typing_extensions == 4.8"]) // needed for fastapi
+      await micropip.install(["ssl"]) // needed for fastapi
+      await micropip.install(["fastapi"]) // needed for sdk
+      {% if pyodide_requirements %}
+      {% for req in pyodide_requirements %}
+      await micropip.install(["{{{ req | safe }}}"])
+      {% endfor %}
+      {% endif %}
+      await setupAndImportPythonPackage("./sly_sdk.tar", "sly_sdk") // temporary solution
+      await setupAndImportPythonPackage("./src.tar", "src")
+      {% if src_modules %}
+      {% for module in src_modules %}
+      await loadDependency(pyodide, "./{{{ module }}}", "{{{ module }}}")
+      {% endfor %}
+      {% endif %}
+      mainScriptTxt = await fetch("./{{{ __webpy_script__ }}}").then((response) => response.text());
+      python_code = `
+from sly_sdk.webpy import WebPyApplication
+app = WebPyApplication()
+state = app.state
+if state.get("app_initializing", False) == True:
+    state["app_initializing"] = False
+    state.send_changes()
+`
+      const fn = pyodide.runPython(python_code);
+      if (typeof fn === "function") {
+        const newParams = params.map(p => pyodide.toPy(p));
+        result = fn(...newParams);
+      } else {
+        result = fn;
+      }
+      subToStoreAction();
+    }
+    let initPromise = null;
+    async function runPythonScript(...params) {
+      if (initPromise) {
+        await initPromise;
+        initPromise = null;
+      }
+      let result;
+      const timeStart = performance.now();
+      const fn = pyodide.runPython(mainScriptTxt);
+      if (typeof fn === "function") {
+        const newParams = params.map(p => pyodide.toPy(p));
+        result = fn(...newParams);
+      } else {
+        result = fn;
+      }
+      const timeEnd = performance.now();
+      console.log("Web Python script executed in", timeEnd - timeStart, "ms");
+      return result;
+    }
+    const runPythonScriptThrottled = _.throttle(runPythonScript, 50);
+    {% if __webpy_script__ %}
+    initPromise = loadMainPythonScript();
+    {% endif %}
+  </script>
+  <!-- Hot reload script -->
+  {% if HOTRELOAD %} {{{ hot_reload.script(url_for('hot-reload')) | safe }}}
+  {% endif %}
+</body>
+</html>

{supervisely-6.73.270 → supervisely-6.73.272}/supervisely/app/fastapi/subapp.py RENAMED Viewed

@@ -1,5 +1,6 @@
-import os
 import inspect
+import json
+import os
 import signal
 import sys
 from contextlib import suppress
@@ -1060,6 +1061,9 @@ class Application(metaclass=Singleton):
         return inner
+    def render(self, context: Dict[str, Any]):
+        return Jinja2Templates().render("index.html", {**context, "HOTRELOAD": False})
     def set_ready_check_function(self, func: Callable):
         self._ready_check_function = func

{supervisely-6.73.270 → supervisely-6.73.272}/supervisely/app/fastapi/templating.py RENAMED Viewed

@@ -11,10 +11,13 @@ from supervisely.app.singleton import Singleton
 from supervisely.app.widgets_context import JinjaWidgets
 # https://github.com/supervisely/js-bundle
-js_bundle_version = "2.1.96"
+js_bundle_version = "2.1.97"
 # https://github.com/supervisely-ecosystem/supervisely-app-frontend-js
-js_frontend_version = "v0.0.50"
+js_frontend_version = "v0.0.54"
+pyodide_version = "v0.25.0"
 class Jinja2Templates(_fastapi_Jinja2Templates, metaclass=Singleton):
@@ -65,3 +68,17 @@ class Jinja2Templates(_fastapi_Jinja2Templates, metaclass=Singleton):
             return super().TemplateResponse(
                 name, context_with_widgets, status_code, headers, media_type, background
             )
+    def render(self, name: str, context: dict) -> str:
+        from supervisely.app.fastapi.subapp import get_name_from_env
+        context_with_widgets = {
+            **context,
+            **JinjaWidgets().context,
+            "js_bundle_version": js_bundle_version,
+            "js_frontend_version": js_frontend_version,
+            "pyodide_version": pyodide_version,
+            "app_name": get_name_from_env(default="Supervisely App"),
+        }
+        template: jinja2.Template = self.get_template(name)
+        return template.render(context_with_widgets)

{supervisely-6.73.270 → supervisely-6.73.272}/supervisely/cli/release/release.py RENAMED Viewed

@@ -6,6 +6,7 @@ import re
 import shutil
 import string
 import subprocess
+import sys
 import tarfile
 from pathlib import Path
@@ -15,6 +16,29 @@ from giturlparse import parse
 from requests_toolbelt import MultipartEncoder, MultipartEncoderMonitor
 from tqdm import tqdm
+from supervisely.io.fs import dir_exists, list_files_recursively, remove_dir
+class cd:
+    def __init__(self, new_path=None, add_to_path=False):
+        self.new_path = new_path
+        self.add_to_path = add_to_path
+        self._should_remove_from_path = False
+    def __enter__(self):
+        self.old_path = os.getcwd()
+        if self.new_path is not None:
+            os.chdir(self.new_path)
+        if self.add_to_path and not self.new_path in sys.path:
+            sys.path.insert(0, self.new_path)
+            self._should_remove_from_path = True
+        return self
+    def __exit__(self, etype, value, traceback):
+        os.chdir(self.old_path)
+        if self._should_remove_from_path:
+            sys.path.remove(self.new_path)
 def slug_is_valid(slug):
     splitted = slug.split("/")
@@ -192,7 +216,18 @@ def archive_application(repo: git.Repo, config, slug):
     app_folder_name = re.sub("[ \/]", "-", app_folder_name)
     app_folder_name = re.sub("[\"'`,\[\]\(\)]", "", app_folder_name)
     working_dir_path = Path(repo.working_dir).absolute()
+    should_remove_dir = None
     if config.get("type", "app") == "client_side_app":
+        gui_folder_path = config["gui_folder_path"]
+        gui_folder_path = working_dir_path / gui_folder_path
+        if not dir_exists(gui_folder_path):
+            should_remove_dir = gui_folder_path
+            # if gui folder is empty, need to render it
+            with cd(str(working_dir_path), add_to_path=True):
+                exec(open("sly_sdk/render.py", "r").read(), {"__name__": "__main__"})
+                file_paths.extend(
+                    [Path(p).absolute() for p in list_files_recursively(str(gui_folder_path))]
+                )
         archive_path = archive_folder + "/archive.tar"
         write_mode = "w"
     else:
@@ -205,6 +240,9 @@ def archive_application(repo: git.Repo, config, slug):
                     path.absolute(),
                     Path(app_folder_name).joinpath(path.relative_to(working_dir_path)),
                 )
+    if should_remove_dir is not None:
+        # remove gui folder if it was rendered
+        remove_dir(should_remove_dir)
     return archive_path

{supervisely-6.73.270 → supervisely-6.73.272}/supervisely/nn/inference/inference.py RENAMED Viewed

@@ -2271,7 +2271,7 @@ class Inference:
             if not self._is_local_deploy:
                 self._task_id = sly_env.task_id() if is_production() else None
-        if isinstance(self.gui, GUI.ServingGUITemplate):
+        if isinstance(self.gui, GUI.InferenceGUI):
             self._app = Application(layout=self.get_ui())
         elif isinstance(self.gui, GUI.ServingGUI):
             self._app = Application(layout=self._app_layout)

{supervisely-6.73.270 → supervisely-6.73.272/supervisely.egg-info}/PKG-INFO RENAMED Viewed

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

supervisely-6.73.270/supervisely/app/fastapi/index.html DELETED Viewed

@@ -1,163 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link
-      id="favicon"
-      rel="icon"
-      type="image/x-icon"
-      href="{{{__favicon__}}}"
-    />
-    <link
-      type="text/css"
-      rel="stylesheet"
-      href="https://cdn.jsdelivr.net/gh/supervisely/js-bundle@{{{js_bundle_version}}}/sly-app-widgets-{{{js_bundle_version}}}.bundle.css"
-    />
-    <style>
-      #app-global-loading-icon {
-        background: white;
-        border-radius: 50%;
-        width: 75px;
-        height: 75px;
-        padding: 10px;
-        margin: 10px 0;
-        position: relative;
-      }
-      @keyframes app-loading-rotation {
-        0% {
-          transform: rotate(0deg);
-        }
-        100% {
-          transform: rotate(360deg);
-        }
-      }
-      #app-global-loading-icon::after {
-        content: "";
-        box-sizing: border-box;
-        position: absolute;
-        left: 0;
-        top: 0;
-        transform: translate(-50%, -50%);
-        width: 95px;
-        height: 95px;
-        border-radius: 50%;
-        border: 3px solid transparent;
-        border-bottom-color: #fb4481;
-        animation: app-loading-rotation 1s linear infinite;
-      }
-      #app-global-loading-icon > img {
-        width: 75px;
-        border-radius: 50%;
-      }
-      .extended-app-header .app-session-header-widget > div {
-        margin-bottom: 0;
-        padding-left: 20px;
-      }
-      .app-session-header-solid {
-        background: white;
-        box-shadow: 0 5px 10px #0000000d;
-        border-bottom: 1px solid #dfe2e8;
-        position: relative;
-      }
-    </style>
-    <title>{{{app_name}}}</title>
-  </head>
-  <body style="background-color: #f4f7fe">
-    <center>
-      <div id="app-global-loading-icon">
-        <img src="https://app.supervise.ly/loading.gif" />
-      </div>
-    </center>
-    <script src="https://cdn.jsdelivr.net/gh/supervisely/js-bundle@{{{js_bundle_version}}}/sly-app-widgets-{{{js_bundle_version}}}.bundle.js"></script>
-    <script
-      type="module"
-      src="https://cdn.jsdelivr.net/gh/supervisely-ecosystem/supervisely-app-frontend-js@v{{{js_frontend_version}}}/SlyApp.js"
-    ></script>
-    <script>
-      window.parent.postMessage('{ "showHeader": false }', "*");
-    </script>
-    {% for scripts in __widget_scripts__.values() %} {% if scripts is string %}
-    <script src="{{{ scripts }}}"></script>
-    {% else %} {% for scripts in scripts %}
-    <script src="{{{ scripts }}}"></script>
-    {% endfor %} {% endif %} {% endfor %}
-    <div id="sly-app">
-      <sly-app>
-        <template v-slot="{ post, state, data, session }">
-          <div
-            :style="{'padding': `${state.app_body_padding} ${state.app_body_padding} 0`, 'display': 'flex', 'flex-direction': 'row', 'place-items': 'center'}"
-            {%
-            if
-            __app_session_info_solid__
-            %}
-            {%
-            if
-            __app_session_info_extra_content__
-            %}
-            class="app-session-header-solid extended-app-header"
-            {%
-            else
-            %}
-            class="app-session-header-solid"
-            {%
-            endif
-            %}
-            {%
-            else
-            %}
-            {%
-            if
-            __app_session_info_extra_content__
-            %}
-            class="extended-app-header"
-            {%
-            endif
-            %}
-            {%
-            endif
-            %}
-          >
-            <sly-app-header
-              v-if="session"
-              :session="session"
-              :data="data"
-              :state="state"
-            ></sly-app-header>
-            {% if __app_session_info_extra_content__ %}
-            {{{__app_session_info_extra_content__}}} {% endif %}
-          </div>
-          <div
-            :style="{'padding': `0 ${state.app_body_padding} ${state.app_body_padding}`}"
-          >
-            {% if __no_html_mode__ %} {% include 'no_html_main.html' %} {% else
-            %} {% include 'main.html' %} {% endif %} {% include
-            'dialog_window.html' %}
-          </div>
-        </template>
-      </sly-app>
-    </div>
-    <!-- Offline session styles fix -->
-    <script>
-      let resizeCounter = 0;
-      let resizeInterval = setInterval(() => {
-        resizeCounter += 1;
-        window.dispatchEvent(new Event("resize"));
-        if (resizeCounter > 3) {
-          clearInterval(resizeInterval);
-        }
-      }, 2000);
-    </script>
-    <!-- Hot reload script -->
-    {% if HOTRELOAD %} {{{ hot_reload.script(url_for('hot-reload')) | safe }}}
-    {% endif %}
-  </body>
-</html>