aignostics 0.2.30__tar.gz → 0.2.31__tar.gz

{aignostics-0.2.30 → aignostics-0.2.31}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aignostics
-Version: 0.2.30
+Version: 0.2.31
 Summary: 🔬 Python SDK providing access to the Aignostics Platform. Includes Aignostics Launchpad (Desktop Application), Aignostics CLI (Command-Line Interface), example notebooks, and Aignostics Client Library.
 Project-URL: Homepage, https://aignostics.readthedocs.io/en/latest/
 Project-URL: Documentation, https://aignostics.readthedocs.io/en/latest/

{aignostics-0.2.30 → aignostics-0.2.31}/examples/notebook.py

@@ -2,7 +2,7 @@
 # requires-python = ">=3.13"
 # dependencies = [
 #     "marimo",
-#     "aignostics==0.2.30",
+#     "aignostics==0.2.31",
 # ]
 # ///
 

{aignostics-0.2.30 → aignostics-0.2.31}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "aignostics"
-version = "0.2.30"
+version = "0.2.31"
 description = "🔬 Python SDK providing access to the Aignostics Platform. Includes Aignostics Launchpad (Desktop Application), Aignostics CLI (Command-Line Interface), example notebooks, and Aignostics Client Library."
 readme = "README.md"
 authors = [
@@ -355,7 +355,7 @@ source = ["src/"]
 
 
 [tool.bumpversion]
-current_version = "0.2.30"
+current_version = "0.2.31"
 parse = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<patch>\\d+)"
 serialize = ["{major}.{minor}.{patch}"]
 search = "{current_version}"

{aignostics-0.2.30 → aignostics-0.2.31}/src/aignostics/application/_gui/_page_application_describe.py

@@ -596,7 +596,7 @@ async def _page_application_describe(application_id: str) -> None:  # noqa: C901
             global upload_message_queue  # noqa: PLW0602
             if submit_form.metadata is None:
                 return
-            if not upload_message_queue.empty():
+            while not upload_message_queue.empty():
                 message = upload_message_queue.get()
                 if message and isinstance(message, dict) and "reference" in message:
                     for row in submit_form.metadata:

{aignostics-0.2.30 → aignostics-0.2.31}/src/aignostics/application/_gui/_page_application_run_describe.py

@@ -162,7 +162,7 @@ async def _page_application_run_describe(application_run_id: str) -> None:  # no
 
             def update_download_progress() -> None:
                 """Update the progress indicator with values from the queue."""
-                if not progress_queue.empty():
+                while not progress_queue.empty():
                     progress = progress_queue.get()
                     download_item_status.set_text(
                         progress.status

{aignostics-0.2.30 → aignostics-0.2.31}/src/aignostics/dataset/_gui.py

@@ -258,7 +258,7 @@ class PageBuilder(BasePageBuilder):
                 if download_form.download_progress is None:
                     return
 
-                if download_message_queue and not download_message_queue.empty():
+                while download_message_queue and not download_message_queue.empty():
                     new_value = download_message_queue.get()
                     download_form.download_progress.set_value(new_value)
 

{aignostics-0.2.30 → aignostics-0.2.31}/src/aignostics/qupath/_cli.py

@@ -140,13 +140,25 @@ def launch(
             help="Path to image. Must be part of QuPath project",
         ),
     ] = None,
+    script: Annotated[
+        Path | None,
+        typer.Option(
+            help="Path to QuPath script to run on launch. Must be part of QuPath project.",
+            exists=True,
+            file_okay=True,
+            dir_okay=False,
+            writable=False,
+            readable=True,
+            resolve_path=True,
+        ),
+    ] = None,
 ) -> None:
     """Launch QuPath application."""
     try:
         if not Service().is_qupath_installed():
             console.print("QuPath is not installed. Use 'uvx aignostics qupath install' to install it.")
             sys.exit(2)
-        pid = Service().launch_qupath(project=project, image=image)
+        pid = Service().launch_qupath(project=project, image=image, script=script)
         if not pid:
             console.print("QuPath could not be launched.", style="error")
             sys.exit(1)
@@ -163,14 +175,11 @@ def launch(
 @cli.command()
 def info() -> None:
     """Get info about QuPath installation."""
+    if not Service().is_qupath_installed():
+        console.print("QuPath is not installed. Use 'uvx aignostics qupath install' to install it.", style="warning")
+        sys.exit(2)
     try:
-        info = Service().get_qupath_info()
-        if not info:
-            console.print(
-                "QuPath is not installed. Use 'uvx aignostics qupath install' to install it.", style="warning"
-            )
-            sys.exit(2)
-        console.print_json(data=info)
+        console.print_json(data=Service().info())
     except Exception as e:
         message = f"Failed to get QuPath info: {e!s}."
         logger.exception(message)
@@ -193,11 +202,11 @@ def defaults() -> None:
 @cli.command()
 def uninstall(
     version: Annotated[
-        str,
+        str | None,
         typer.Option(
-            help="Version of QuPath to install. Do not change this unless you know what you are doing.",
+            help="Version of QuPath to install. If not specified, all versions will be uninstalled.",
         ),
-    ] = QUPATH_VERSION,
+    ] = None,
     path: Annotated[
         Path,
         typer.Option(

{aignostics-0.2.30 → aignostics-0.2.31}/src/aignostics/qupath/_gui.py

@@ -30,7 +30,7 @@ class PageBuilder(BasePageBuilder):
             async def install_qupath() -> None:
                 def update_install_progress() -> None:
                     """Update the progress indicator with values from the queue."""
-                    if not progress_queue.empty():
+                    while not progress_queue.empty():
                         progress: InstallProgress = progress_queue.get()
                         if progress.status is InstallProgressState.DOWNLOADING:
                             if progress.archive_path and progress.archive_size:
@@ -101,7 +101,8 @@ class PageBuilder(BasePageBuilder):
 
                 launch_button.props(remove="loading")
 
-            installed_path = Service().find_qupath()
+            version = Service().get_version()
+            expected_version = Service().get_expected_version()
 
             ui.markdown(
                 """
@@ -111,12 +112,18 @@ class PageBuilder(BasePageBuilder):
             with ui.row().classes("w-full justify-start"):
                 with ui.column().classes("w-2/5"):
                     with ui.card().classes("w-full"):
-                        if installed_path:
-                            install_info = ui.label(
-                                "QuPath is installed and ready to execute. "
-                                "Go to a completed application result and click the QuPath button, "
-                                "or open directly from here."
-                            )
+                        if version:
+                            if version.version == expected_version:
+                                install_info = ui.label(
+                                    f"QuPath {expected_version} is installed and ready to execute. "
+                                    "Go to a completed application result and click the QuPath button, "
+                                    "or open directly from here."
+                                )
+                            else:
+                                install_info = ui.label(
+                                    f"QuPath {version.version} is installed, but version {expected_version} "
+                                    "is expected. Please update to the latest version by reinstalling."
+                                )
                         else:
                             install_info = ui.label(
                                 "Install QuPath to enable visualizing your Whole Slide Image and application results "
@@ -133,11 +140,11 @@ class PageBuilder(BasePageBuilder):
                                 on_click=launch_qupath,
                                 icon="visibility",
                             ).mark("BUTTON_QUPATH_LAUNCH")
-                            if not installed_path:
+                            if not version:
                                 launch_button.disable()
                             ui.space()
                             install_button = ui.button(
-                                "Install" if not installed_path else "Reinstall",
+                                "Install" if not version else "Reinstall",
                                 on_click=install_qupath,
                                 icon="install_desktop",
                             ).mark("BUTTON_QUPATH_INSTALL")
@@ -146,7 +153,7 @@ class PageBuilder(BasePageBuilder):
                                 on_click=uninstall_qupath,
                                 icon="extension_off",
                             ).mark("BUTTON_QUPATH_INSTALL")
-                            if not installed_path:
+                            if not version:
                                 uninstall_button.disable()
 
                     ui.markdown(
@@ -174,9 +181,13 @@ class PageBuilder(BasePageBuilder):
                 ui.space()
                 with ui.column().classes("w-2/5"), ui.row().classes("w-1/2 justify-center content-center"):
                     ui.space()
-                    animation = (
-                        "/qupath_assets/microscope.lottie" if installed_path else "/qupath_assets/download.lottie"
-                    )
+                    if version:
+                        if version.version == expected_version:
+                            animation = "/qupath_assets/microscope.lottie"
+                        else:
+                            animation = "/qupath_assets/update.lottie"
+                    else:
+                        animation = "/qupath_assets/download.lottie"
                     ui.html(
                         f"<dotlottie-player "
                         f'src="{animation}" '