aignostics 0.2.72__tar.gz → 0.2.83__tar.gz

{aignostics-0.2.72 → aignostics-0.2.83}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aignostics
-Version: 0.2.72
+Version: 0.2.83
 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/
@@ -89,6 +89,7 @@ Requires-Dist: pyyaml>=6.0
 Requires-Dist: requests-oauthlib>=2.0.0
 Requires-Dist: requests>=2.32.3
 Requires-Dist: s5cmd>=0.2.0
+Requires-Dist: semver>=3.0.4
 Requires-Dist: sentry-sdk>=2.30.0
 Requires-Dist: shapely>=2.1.1
 Requires-Dist: show-in-file-manager>=1.1.5

{aignostics-0.2.72 → aignostics-0.2.83}/examples/notebook.py

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

{aignostics-0.2.72 → aignostics-0.2.83}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "aignostics"
-version = "0.2.72"
+version = "0.2.83"
 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 = [
@@ -121,6 +121,7 @@ dependencies = [
     "requests>=2.32.3",
     "requests-oauthlib>=2.0.0",
     "s5cmd>=0.2.0",
+    "semver>=3.0.4",
     "shapely>=2.1.1",
     "show-in-file-manager>=1.1.5",
     "tqdm>=4.67.1",
@@ -353,7 +354,7 @@ source = ["src/"]
 
 
 [tool.bumpversion]
-current_version = "0.2.72"
+current_version = "0.2.83"
 parse = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<patch>\\d+)"
 serialize = ["{major}.{minor}.{patch}"]
 search = "{current_version}"

{aignostics-0.2.72 → aignostics-0.2.83}/src/aignostics/application/_service.py

@@ -12,6 +12,7 @@ from typing import Any
 
 import google_crc32c
 import requests
+import semver
 from pydantic import BaseModel, computed_field
 
 from aignostics.bucket import Service as BucketService
@@ -264,21 +265,23 @@ class Service(BaseService):
         # Validate format: application_id:vX.Y.Z (where X.Y.Z is a semver)
         # This checks for proper format like "he-tme:v0.50.0" where "he-tme" is the application id
         # and "v0.50.0" is the version with proper semver format
-        if not re.match(r"^[^:]+:v\d+\.\d+\.\d+$", application_version_id):
+        match = re.match(r"^([^:]+):v(.+)$", application_version_id)
+        if not match or not semver.Version.is_valid(match.group(2)):
             if use_latest_if_no_version_given:
-                latest_version = self.application_version_latest(self.application(application_version_id))
+                application_id = match.group(1) if match else application_version_id
+                latest_version = self.application_version_latest(self.application(application_id))
                 if latest_version:
                     return latest_version
-                message = f"No valid application version found for '{application_version_id}' "
-                message += "and no latest version available."
+                message = (
+                    f"No valid application version found for '{application_version_id}'no latest version available."
+                )
                 logger.warning(message)
                 raise ValueError(message)
             message = f"Invalid application version id format: {application_version_id}. "
-            "Expected format: application_id:vX.Y.Z"
+            message += "Expected format: application_id:vX.Y.Z"
             raise ValueError(message)
 
-        application_id = application_version_id.split(":", maxsplit=1)[0]
-
+        application_id = match.group(1)
         application = self.application(application_id)
         for version in self.application_versions(application):
             if version.application_version_id == application_version_id:

{aignostics-0.2.72 → aignostics-0.2.83}/src/aignostics/platform/__init__.py

@@ -1,9 +1,13 @@
-"""
-This module provides the main client interface for interacting with Aignostics services.
+"""This module provides the low-level client interface for interacting with the API of the Aignostics Platform.
+
+The primary class in this module is the `Client` class, serving as the entry point
+for authenticated API operations. Login and token management are handled
+automatically.
+
+Further operations are encapsulated in the `Service` class, which provides methods
+for manual login, logout and getting information about the authenticated user.
 
-It offers functionality for authentication, data management, and API operations.
-The primary class in this module is the `Client` class, which serves as the entry point
-for all interactions with the Aignostics platform.
+Higher level abstractions are provided in the application module.
 """
 
 from aignx.codegen.exceptions import ApiException, NotFoundException

{aignostics-0.2.72 → aignostics-0.2.83}/src/aignostics/platform/_utils.py

@@ -26,6 +26,7 @@ from aignx.codegen.models import OutputArtifactResultReadResponse as OutputArtif
 from tqdm.auto import tqdm
 
 EIGHT_MB = 8_388_608
+SIGNED_DOWNLOAD_URL_EXPIRES_SECONDS_DEFAULT = 6 * 60 * 60  # 6 hours
 
 
 def mime_type_to_file_ending(mime_type: str) -> str:
@@ -71,7 +72,6 @@ def get_mime_type_for_artifact(artifact: OutputArtifactData | InputArtifactData
     return str(metadata.get("media_type", metadata.get("mime_type", "application/octet-stream")))
 
 
-# TODO(Andreas,Helmut): discuss
 def download_file(signed_url: str, file_path: str, verify_checksum: str) -> None:
     """Downloads a file from a signed URL and verifies its integrity.
 
@@ -102,11 +102,12 @@ def download_file(signed_url: str, file_path: str, verify_checksum: str) -> None
         raise ValueError(msg)
 
 
-def generate_signed_url(url: str) -> str:
+def generate_signed_url(url: str, expires_seconds: int = SIGNED_DOWNLOAD_URL_EXPIRES_SECONDS_DEFAULT) -> str:
     """Generates a signed URL for a Google Cloud Storage object.
 
     Args:
         url (str): The fully qualified bucket URL (e.g. gs://bucket/path/to/object).
+        expires_seconds (int): The number of seconds the signed URL should be valid for.
 
     Returns:
         str: A signed URL that can be used to download the object.
@@ -131,7 +132,10 @@ def generate_signed_url(url: str) -> str:
         msg = f"Blob does not exist: {url}"
         raise ValueError(msg)
 
-    return t.cast("str", blob.generate_signed_url(expiration=datetime.timedelta(hours=1), method="GET", version="v4"))
+    return t.cast(
+        "str",
+        blob.generate_signed_url(expiration=datetime.timedelta(seconds=expires_seconds), method="GET", version="v4"),
+    )
 
 
 def calculate_file_crc32c(file: Path) -> str:

{aignostics-0.2.72 → aignostics-0.2.83}/src/aignostics/platform/resources/applications.py

@@ -9,6 +9,7 @@ import re
 import typing as t
 from operator import itemgetter
 
+import semver
 from aignx.codegen.api.public_api import PublicApi
 from aignx.codegen.models import ApplicationReadResponse as Application
 from aignx.codegen.models import ApplicationVersionReadResponse as ApplicationVersion
@@ -22,7 +23,7 @@ class Versions:
     Provides operations to list and retrieve application versions.
     """
 
-    APPLICATION_VERSION_REGEX = re.compile(r"(?P<application_id>[^:]+):v?(?P<version>[^:]+)")
+    APPLICATION_VERSION_REGEX = re.compile(r"^(?P<application_id>[^:]+):v(?P<version>[^:].+)$")
 
     def __init__(self, api: PublicApi) -> None:
         """Initializes the Versions resource with the API platform.
@@ -51,9 +52,6 @@ class Versions:
             application_id=application_id,
         )
 
-    # TODO(Andreas,Helmut): Discuss. This is getting an application version and returning it.
-    # Can we make this a find_by_id, just getting an application_version_id as a string,
-    # and returning the application version object?
     def details(self, application_version: ApplicationVersion | str) -> ApplicationVersion:
         """Retrieves details for a specific application version.
 
@@ -71,13 +69,14 @@ class Versions:
             application_id = application_version.application_id
             version = application_version.version
         else:
-            # split by colon
-            m = Versions.APPLICATION_VERSION_REGEX.match(application_version)
-            if not m:
+            # Parse and validate the application version ID
+            match = self.APPLICATION_VERSION_REGEX.match(application_version)
+            if not match:
                 msg = f"Invalid application_version_id: {application_version}"
                 raise RuntimeError(msg)
-            application_id = m.group("application_id")
-            version = m.group("version")
+
+            application_id = match.group("application_id")
+            version = match.group("version")
 
         application_versions = self._api.list_versions_by_application_id_v1_applications_application_id_versions_get(
             application_id=application_id,
@@ -106,18 +105,17 @@ class Versions:
         if not versions:
             return []
 
-        # Extract semantic versions from the version property
+        # Extract semantic versions using proper semver parsing
         versions_with_semver = []
         for v in versions:
             try:
-                # Split into major, minor, patch components for proper comparison
-                version_parts = [int(x) for x in v.version.split(".")]
-                versions_with_semver.append((v, version_parts))
+                parsed_version = semver.Version.parse(v.version)
+                versions_with_semver.append((v, parsed_version))
             except (ValueError, AttributeError):
                 # If we can't parse the version or version attribute doesn't exist, skip it
                 continue
 
-        # Sort by semantic version (major, minor, patch)
+        # Sort by semantic version (semver objects have built-in comparison)
         if versions_with_semver:
             versions_with_semver.sort(key=itemgetter(1), reverse=True)
             # Return just the version objects, not the tuples

{aignostics-0.2.72 → aignostics-0.2.83}/src/aignostics/platform/resources/runs.py

@@ -128,13 +128,16 @@ class ApplicationRun:
             application_run_id=self.application_run_id,
         )
 
-    def download_to_folder(self, download_base: Path | str) -> None:
+    def download_to_folder(
+        self, download_base: Path | str, checksum_attribute_key: str = "checksum_base64_crc32c"
+    ) -> None:
         """Downloads all result artifacts to a folder.
 
         Monitors run progress and downloads results as they become available.
 
         Args:
             download_base (Path | str): Base directory to download results to.
+            checksum_attribute_key (str): The key used to validate the checksum of the output artifacts.
 
         Raises:
             ValueError: If the provided path is not a directory.
@@ -152,7 +155,7 @@ class ApplicationRun:
         while application_run_status == ApplicationRunStatus.RUNNING:
             for item in self.results():
                 if item.status == ItemStatus.SUCCEEDED:
-                    self.ensure_artifacts_downloaded(application_run_dir, item)
+                    self.ensure_artifacts_downloaded(application_run_dir, item, checksum_attribute_key)
             sleep(5)
             application_run_status = self.details().status
             print(self)
@@ -161,12 +164,14 @@ class ApplicationRun:
         for item in self.results():
             match item.status:
                 case ItemStatus.SUCCEEDED:
-                    self.ensure_artifacts_downloaded(application_run_dir, item)
+                    self.ensure_artifacts_downloaded(application_run_dir, item, checksum_attribute_key)
                 case ItemStatus.ERROR_SYSTEM | ItemStatus.ERROR_USER:
                     print(f"{item.reference} failed with {item.status.value}: {item.error}")
 
     @staticmethod
-    def ensure_artifacts_downloaded(base_folder: Path, item: ItemResultReadResponse) -> None:
+    def ensure_artifacts_downloaded(
+        base_folder: Path, item: ItemResultReadResponse, checksum_attribute_key: str = "checksum_base64_crc32c"
+    ) -> None:
         """Ensures all artifacts for an item are downloaded.
 
         Downloads missing or partially downloaded artifacts and verifies their integrity.
@@ -174,6 +179,7 @@ class ApplicationRun:
         Args:
             base_folder (Path): Base directory to download artifacts to.
             item (ItemResultReadResponse): The item result containing the artifacts to download.
+            checksum_attribute_key (str): The key used to validate the checksum of the output artifacts.
 
         Raises:
             ValueError: If checksums don't match.
@@ -187,7 +193,7 @@ class ApplicationRun:
                 item_dir.mkdir(exist_ok=True, parents=True)
                 file_ending = mime_type_to_file_ending(get_mime_type_for_artifact(artifact))
                 file_path = item_dir / f"{artifact.name}{file_ending}"
-                checksum = artifact.metadata["checksum_crc32c"]
+                checksum = artifact.metadata[checksum_attribute_key]
 
                 if file_path.exists():
                     file_checksum = calculate_file_crc32c(file_path)

{aignostics-0.2.72 → aignostics-0.2.83}/src/aignostics/platform/_service.py

@@ -213,20 +213,6 @@ class Service(BaseService):
             },
         )
 
-    @staticmethod
-    def logout() -> bool:
-        """Logout if authenticated.
-
-        Deletes the cached authentication token if existing.
-
-        Returns:
-            bool: True if successfully logged out, False if not logged in.
-        """
-        logger.debug("Logging out...")
-        rtn = remove_cached_token()
-        logger.debug("Logout successful: %s", rtn)
-        return rtn
-
     @staticmethod
     def login(relogin: bool = False) -> bool:
         """Login.
@@ -247,6 +233,20 @@ class Service(BaseService):
             logger.exception(message)
             return False
 
+    @staticmethod
+    def logout() -> bool:
+        """Logout if authenticated.
+
+        Deletes the cached authentication token if existing.
+
+        Returns:
+            bool: True if successfully logged out, False if not logged in.
+        """
+        logger.debug("Logging out...")
+        rtn = remove_cached_token()
+        logger.debug("Logout successful: %s", rtn)
+        return rtn
+
     @staticmethod
     def get_user_info(relogin: bool = False) -> UserInfo | None:
         """Get user information from authentication token.