aignostics 0.2.65__tar.gz → 0.2.69__tar.gz

{aignostics-0.2.65 → aignostics-0.2.69}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aignostics
-Version: 0.2.65
+Version: 0.2.69
 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.65 → aignostics-0.2.69}/examples/notebook.py

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

{aignostics-0.2.65 → aignostics-0.2.69}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "aignostics"
-version = "0.2.65"
+version = "0.2.69"
 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 = [
@@ -353,7 +353,7 @@ source = ["src/"]
 
 
 [tool.bumpversion]
-current_version = "0.2.65"
+current_version = "0.2.69"
 parse = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<patch>\\d+)"
 serialize = ["{major}.{minor}.{patch}"]
 search = "{current_version}"

{aignostics-0.2.65 → aignostics-0.2.69}/src/aignostics/application/_service.py

@@ -493,9 +493,9 @@ class Service(BaseService):
             if not source_file_path.is_file():
                 logger.warning("Source file '%s' does not exist.", row["referebce"])
                 return False
+            username = psutil.Process().username().replace("\\", "_")
             object_key = (
-                f"{psutil.Process().username()}/{upload_prefix}/"
-                f"{application_version.application_version_id}/{source_file_path.name}"
+                f"{username}/{upload_prefix}/{application_version.application_version_id}/{source_file_path.name}"
             )
             platform_bucket_url = (
                 f"{BucketService().get_bucket_protocol()}://{BucketService().get_bucket_name()}/{object_key}"

{aignostics-0.2.65 → aignostics-0.2.69}/src/aignostics/bucket/_cli.py

@@ -77,7 +77,7 @@ def upload(
 
     console.print(f"Found {files_count} files with total size of {humanize.naturalsize(total_bytes)}")
 
-    username = psutil.Process().username()
+    username = psutil.Process().username().replace("\\", "_")
     timestamp = datetime.datetime.now(tz=datetime.UTC).strftime("%Y%m%d_%H%M%S")
     base_prefix = destination_prefix.format(username=username, timestamp=timestamp)
     base_prefix = base_prefix.strip("/")

{aignostics-0.2.65 → aignostics-0.2.69}/src/aignostics/bucket/_gui.py

@@ -299,7 +299,7 @@ class PageBuilder(BasePageBuilder):
                     return
 
                 bucket_form.destination = get_user_data_directory("datasets/idc")
-                bucket_form.destination_label.set_text(f"Download to {bucket_form.destination!s}")
+                bucket_form.destination_label.set_text(f"Will download to {bucket_form.destination!s}")
                 await _update_button_states()
 
             async def _select_destination() -> None:
@@ -323,7 +323,7 @@ class PageBuilder(BasePageBuilder):
                         )
                     else:
                         bucket_form.destination = path
-                        bucket_form.destination_label.set_text(f"Download to {bucket_form.destination!s}")
+                        bucket_form.destination_label.set_text(f"Will download to {bucket_form.destination!s}")
                         bucket_form.destination_open_button.enable()
                         ui.notify(f"You chose directory {bucket_form.destination}.", type="info")
                 else:
@@ -338,29 +338,44 @@ class PageBuilder(BasePageBuilder):
                 show_in_file_manager(str(bucket_form.destination))
 
             with ui.row().classes("w-full gap-4"):
-                bucket_form.download_button = (
-                    ui.button(
-                        "Download",
-                        icon="download",
-                        on_click=_download_selected,
-                    )
-                    .mark("BUTTON_DOWNLOAD_OBJECTS")
-                    .props("color=primary")
-                    .classes("w-1/5")
-                )
-                bucket_form.download_button.disable()
-
-                with ui.button("Data", on_click=_select_data, icon="folder_special", color="purple-400").mark(
-                    "BUTTON_DOWNLOAD_DESTINATION_DATA"
-                ):
-                    ui.tooltip("Use Launchpad datasets directory")
-
-                with ui.button("Custom", on_click=_select_destination, icon="folder").mark(
-                    "BUTTON_DOWNLOAD_DESTINATION"
-                ):
-                    ui.tooltip("Select a custom directory")
+                with ui.column().classes("w-1/2"):
+                    with ui.row().classes("w-full"):
+                        bucket_form.download_button = (
+                            ui.button(
+                                "Download",
+                                icon="download",
+                                on_click=_download_selected,
+                            )
+                            .mark("BUTTON_DOWNLOAD_OBJECTS")
+                            .props("color=primary")
+                        )
+                        bucket_form.download_button.disable()
+
+                        ui.space()
+
+                        with ui.button("Data", on_click=_select_data, icon="folder_special", color="purple-400").mark(
+                            "BUTTON_DOWNLOAD_DESTINATION_DATA"
+                        ):
+                            ui.tooltip("Use Launchpad datasets directory")
+
+                        with ui.button("Custom", on_click=_select_destination, icon="folder").mark(
+                            "BUTTON_DOWNLOAD_DESTINATION"
+                        ):
+                            ui.tooltip("Select a custom directory")
+                    with ui.row(align_items="center").classes("w-full"):
+                        bucket_form.destination_label = ui.label(
+                            MESSAGE_NO_DOWNLOAD_FOLDER_SELECTED
+                            if bucket_form.destination is None
+                            else str(f"Will download to {bucket_form.destination}")
+                        )
+                        ui.space()
+                        bucket_form.destination_open_button = ui.button(
+                            icon="folder_open", on_click=_open_destination, color="secondary"
+                        )
+                        bucket_form.destination_open_button.mark("BUTTON_OPEN_DESTINATION").disable()
 
                 ui.space()
+
                 bucket_form.delete_button = (
                     ui.button(
                         "Delete",
@@ -373,18 +388,6 @@ class PageBuilder(BasePageBuilder):
                 )
                 bucket_form.delete_button.disable()
 
-            with ui.row(align_items="center").classes("w-2/5"):
-                ui.space()
-                bucket_form.destination_label = ui.label(
-                    MESSAGE_NO_DOWNLOAD_FOLDER_SELECTED
-                    if bucket_form.destination is None
-                    else str(f"Download to {bucket_form.destination}")
-                ).classes("max-w-72")
-                bucket_form.destination_open_button = ui.button(
-                    icon="folder_open", on_click=_open_destination, color="secondary"
-                )
-                bucket_form.destination_open_button.mark("BUTTON_OPEN_DESTINATION").disable()
-
             # Progress card for downloads (initially hidden)
             with ui.card().classes("w-full") as progress_card:
                 bucket_form.download_progress_card = progress_card

{aignostics-0.2.65 → aignostics-0.2.69}/src/aignostics/bucket/_service.py

@@ -4,14 +4,15 @@ import hashlib
 import re
 from collections.abc import Callable, Generator
 from pathlib import Path
-from typing import Any, cast
+from typing import TYPE_CHECKING, Any, cast
 
 import humanize
 import requests
-from botocore.client import BaseClient, Config
-from botocore.exceptions import ClientError
 from pydantic import BaseModel, computed_field
 
+if TYPE_CHECKING:
+    from botocore.client import BaseClient
+
 from aignostics.utils import UNHIDE_SENSITIVE_INFO, BaseService, Health, get_logger, get_user_data_directory
 
 from ._settings import Settings
@@ -111,7 +112,7 @@ class Service(BaseService):
             components={},
         )
 
-    def _get_s3_client(self, endpoint_url: str = ENDPOINT_URL_DEFAULT) -> BaseClient:
+    def _get_s3_client(self, endpoint_url: str = ENDPOINT_URL_DEFAULT) -> "BaseClient":
         """Get a Boto3 S3 client instance for cloud bucket on Aignostics Platform.
 
         Args:
@@ -121,6 +122,7 @@ class Service(BaseService):
             BaseClient: A Boto3 S3 client instance.
         """
         from boto3 import Session  # noqa: PLC0415
+        from botocore.client import Config  # noqa: PLC0415
 
         # https://www.kmp.tw/post/accessgcsusepythonboto3/
         session = Session(
@@ -599,6 +601,8 @@ class Service(BaseService):
         Raises:
             ValueError: If any provided regex pattern is invalid.
         """
+        from botocore.exceptions import ClientError  # noqa: PLC0415
+
         matched_objects = self.find(what, what_is_key=what_is_key, detail=False)
         object_keys_to_delete = [obj for obj in matched_objects if isinstance(obj, str)]
 

{aignostics-0.2.65 → aignostics-0.2.69}/src/aignostics/cli.py

@@ -7,14 +7,20 @@ from pathlib import Path
 import typer
 
 from .constants import MODULES_TO_INSTRUMENT, NOTEBOOK_DEFAULT
-from .utils import __is_running_in_container__, __version__, boot, console, get_logger, prepare_cli
+from .utils import (
+    __is_running_in_container__,
+    __version__,
+    boot,
+    console,
+    get_logger,
+    prepare_cli,
+)
 
 boot(MODULES_TO_INSTRUMENT)
 logger = get_logger(__name__)
 
 cli = typer.Typer(
     help="Command Line Interface (CLI) of Aignostics Python SDK providing access to Aignostics Platform.",
-    no_args_is_help=True,
 )
 
 if find_spec("nicegui") and find_spec("webview") and not __is_running_in_container__:
@@ -62,6 +68,7 @@ if find_spec("marimo"):
 
 prepare_cli(cli, f"🔬 Aignostics Python SDK v{__version__} - built with love in Berlin 🐻")
 
+
 if __name__ == "__main__":  # pragma: no cover
     try:
         cli()

{aignostics-0.2.65 → aignostics-0.2.69}/src/aignostics/gui/_frame.py

@@ -8,7 +8,6 @@ from importlib.util import find_spec
 from typing import Any
 
 from humanize import naturaldelta
-from nicegui import app, ui
 
 from aignostics.utils import __version__, open_user_data_directory
 
@@ -42,7 +41,7 @@ def frame(  # noqa: C901, PLR0915
     Yields:
         Generator[Any, Any, Any]: The context manager for the page frame.
     """
-    from nicegui import background_tasks, context, run  # noqa: PLC0415
+    from nicegui import app, background_tasks, context, run, ui  # noqa: PLC0415
 
     from aignostics.platform import Service as PlatformService  # noqa: PLC0415
     from aignostics.platform import UserInfo  # noqa: PLC0415
@@ -105,7 +104,7 @@ def frame(  # noqa: C901, PLR0915
         with contextlib.suppress(Exception):
             user_info = await run.cpu_bound(PlatformService.get_user_info, relogin=True)
             app.storage.tab["user_info"] = user_info
-        _user_info_ui.refresh()
+        ui.navigate.reload()
 
     @ui.refreshable
     def health_icon() -> None:

{aignostics-0.2.65 → aignostics-0.2.69}/src/aignostics/platform/_authentication.py

@@ -18,14 +18,13 @@ from requests_oauthlib import OAuth2Session
 from aignostics.platform._messages import AUTHENTICATION_FAILED, INVALID_REDIRECT_URI
 from aignostics.platform._settings import settings
 
+CALLBACK_PORT_RETRY_COUNT = 10
+CLAIM_ROLE = "https://aignostics-platform-samia/role"
 try:
     import sentry_sdk
 except ImportError:
     sentry_sdk = None  # type: ignore[assignment]
 
-CALLBACK_PORT_RETRY_COUNT = 10
-CLAIM_ROLE = "https://aignostics-platform-samia/role"
-
 
 class AuthenticationResult(BaseModel):
     """Represents the result of an OAuth authentication flow."""
@@ -208,7 +207,7 @@ def userinfo(token: str) -> dict[str, str]:
         RuntimeError: If fetching user information fails.
     """
     try:
-        return Users("aignostics-platform.eu.auth0.com").userinfo(access_token=token)  # type: ignore[no-any-return]
+        return Users(settings().tenant_domain).userinfo(access_token=token)  # type: ignore[no-any-return]
     except Exception as e:
         message = f"Failed to fetch user information: {e!s}"
         raise RuntimeError(message) from e

{aignostics-0.2.65 → aignostics-0.2.69}/src/aignostics/platform/_settings.py

@@ -156,6 +156,24 @@ class Settings(OpaqueSettings):
     device_url: str
     jws_json_url: str
 
+    @computed_field  # type: ignore[prop-decorator]
+    @property
+    def tenant_domain(self) -> str:
+        """Get the tenant domain from the authorization base URL.
+
+        Returns:
+            str: The domain part of the authorization base URL.
+
+        Raises:
+            ValueError: If the authorization base URL is invalid or does not contain a netloc.
+        """
+        parsed = urlparse(self.authorization_base_url)
+        if parsed.netloc:
+            return parsed.netloc
+        message = f"Invalid authorization_base_url: {self.authorization_base_url}"
+        logger.error(message)
+        raise ValueError(message)
+
     refresh_token: Annotated[
         SecretStr | None,
         PlainSerializer(

{aignostics-0.2.65 → aignostics-0.2.69}/src/aignostics/utils/_cli.py

@@ -21,7 +21,6 @@ def prepare_cli(cli: typer.Typer, epilog: str) -> None:
             cli.add_typer(_cli)
 
     cli.info.epilog = epilog
-    cli.info.no_args_is_help = True
     if not any(arg.endswith("typer") for arg in Path(sys.argv[0]).parts):
         for command in cli.registered_commands:
             command.epilog = cli.info.epilog
@@ -34,6 +33,17 @@ def prepare_cli(cli: typer.Typer, epilog: str) -> None:
     _no_args_is_help_recursively(cli)
 
 
+def no_args_is_help_workaround(ctx: typer.Context) -> None:
+    """Workaround for Typer bug, see https://github.com/fastapi/typer/pull/1240.
+
+    Raises:
+        typer.Exit: If no subcommand is invoked, prints the help message and exits.
+    """
+    if ctx.invoked_subcommand is None:
+        print(ctx.get_help())
+        raise typer.Exit
+
+
 def _add_epilog_recursively(cli: typer.Typer, epilog: str) -> None:
     """
     Add epilog to all typers in the tree.
@@ -60,9 +70,18 @@ def _no_args_is_help_recursively(cli: typer.Typer) -> None:
     Args:
         cli (typer.Typer): Typer instance
     """
+    # Apply workaround to the main CLI app itself
+    if not hasattr(cli, "no_args_callback_added"):
+        cli.callback(invoke_without_command=True)(no_args_is_help_workaround)
+        cli.no_args_callback_added = True  # type: ignore[attr-defined]
+
+    # Apply workaround to all subcommands recursively
     for group in cli.registered_groups:
         if isinstance(group, typer.models.TyperInfo):
-            group.no_args_is_help = True
             typer_instance = group.typer_instance
             if (typer_instance is not cli) and typer_instance:
+                # Add the callback workaround to each subcommand typer
+                if not hasattr(typer_instance, "no_args_callback_added"):
+                    typer_instance.callback(invoke_without_command=True)(no_args_is_help_workaround)
+                    typer_instance.no_args_callback_added = True  # type: ignore[attr-defined]
                 _no_args_is_help_recursively(typer_instance)

{aignostics-0.2.65 → aignostics-0.2.69}/src/aignostics/wsi/_gui.py

@@ -1,12 +1,15 @@
 """WSI API."""
 
-from pathlib import Path
+from __future__ import annotations
 
-from fastapi import Response
-from fastapi.responses import RedirectResponse
+from pathlib import Path
+from typing import TYPE_CHECKING
 
 from aignostics.utils import BasePageBuilder, get_logger
 
+if TYPE_CHECKING:
+    from fastapi import Response
+
 from ._service import Service
 
 logger = get_logger(__name__)
@@ -29,6 +32,9 @@ class PageBuilder(BasePageBuilder):
             Returns:
                 fastapi.Response: HTTP response containing the thumbnail or fallback image.
             """
+            from fastapi import Response  # noqa: PLC0415
+            from fastapi.responses import RedirectResponse  # noqa: PLC0415
+
             try:
                 return Response(content=Service().get_thumbnail_bytes(Path(source)), media_type="image/png")
             except ValueError:
@@ -48,6 +54,9 @@ class PageBuilder(BasePageBuilder):
             Returns:
                 fastapi.Response: HTTP response containing the converted tiff or fallback image
             """
+            from fastapi import Response  # noqa: PLC0415
+            from fastapi.responses import RedirectResponse  # noqa: PLC0415
+
             try:
                 return Response(content=Service().get_tiff_as_jpg(url), media_type="image/jpeg")
             except ValueError: