fixup! fixup! fixup! fixup! chore: Use SAMIA run artifact file endpoint to download artifacts

Author: nahua-aignx

src/aignostics/application/_gui/_page_application_run_describe.py

@@ -339,9 +339,9 @@ async def start_download() -> None:
 
             # Activate the timer now that download is starting
             progress_timer.activate()
+            download_button.disable()
+            download_button.props(add="loading")
             try:
-                download_button.disable()
-                download_button.props(add="loading")
                 results_folder = await nicegui_run.cpu_bound(
                     Service.application_run_download_static,
                     run_id=run.run_id,
@@ -365,19 +365,24 @@ async def start_download() -> None:
                 else:
                     ui.notify("Download completed.", type="positive")
                 show_in_file_manager(str(results_folder))
-            except ValueError as e:
+            except Exception as e:
+                logger.exception(
+                    "Download failed for run {} (qupath_project={}, marimo={}, folder={})",
+                    run.run_id,
+                    current_qupath_project,
+                    current_marimo,
+                    current_folder,
+                )
                 ui.notify(f"Download failed: {e}", type="negative", multi_line=True)
+            finally:
                 progress_timer.deactivate()
                 progress_state["queue"] = None
-                return
-            progress_timer.deactivate()
-            progress_state["queue"] = None
-            download_button.props(remove="loading")
-            download_button.enable()
-            download_item_status.set_visibility(False)
-            download_item_progress.set_visibility(False)
-            download_artifact_status.set_visibility(False)
-            download_artifact_progress.set_visibility(False)
+                download_button.props(remove="loading")
+                download_button.enable()
+                download_item_status.set_visibility(False)
+                download_item_progress.set_visibility(False)
+                download_artifact_status.set_visibility(False)
+                download_artifact_progress.set_visibility(False)
 
         ui.separator()
         with ui.row(align_items="end").classes("w-full justify-end"):

src/aignostics/platform/resources/runs.py

@@ -15,7 +15,7 @@
 
 import requests
 from aignx.codegen.api.public_api import PublicApi
-from aignx.codegen.exceptions import NotFoundException, ServiceException
+from aignx.codegen.exceptions import ApiException, NotFoundException, ServiceException
 from aignx.codegen.models import (
     CustomMetadataUpdateRequest,
     ItemCreationRequest,
@@ -351,7 +351,7 @@ def download_to_folder(  # noqa: C901
     def get_artifact_download_url(self, artifact_id: str) -> str:
         """Get a presigned download URL for an artifact via the file endpoint.
 
-        Calls GET /v1/runs/{run_id}/artifacts/{artifact_id}/file with
+        Calls GET /api/v1/runs/{run_id}/artifacts/{artifact_id}/file with
         allow_redirects=False and extracts the presigned URL from the Location
         header of the 307 redirect response. Using the codegen method is not
         viable here because urllib3 follows the redirect automatically, fetching
@@ -365,19 +365,36 @@ def get_artifact_download_url(self, artifact_id: str) -> str:
 
         Raises:
             NotFoundException: If the artifact is not found (404).
-            ServiceException: On 5xx server errors (retried automatically).
+            ServiceException: On 5xx or other unexpected HTTP errors (retried automatically where transient).
             RuntimeError: If the redirect Location header is missing.
         """
-        endpoint_url = f"{self._api.api_client.configuration.host}/v1/runs/{self.run_id}/artifacts/{artifact_id}/file"
+        configuration = self._api.api_client.configuration
+        host = configuration.host.rstrip("/")
+        endpoint_url = f"{host}/api/v1/runs/{self.run_id}/artifacts/{artifact_id}/file"
+        token_provider = getattr(configuration, "token_provider", None) or get_token
+        proxy = getattr(configuration, "proxy", None)
+        ssl_ca_cert = getattr(configuration, "ssl_ca_cert", None)
+        verify_ssl = getattr(configuration, "verify_ssl", True)
+        ssl_verify: bool | str = ssl_ca_cert or verify_ssl
+        logger.trace("Resolving download URL for artifact {} via {}", artifact_id, endpoint_url)
 
         def _resolve() -> str:
-            token = get_token()
-            response = requests.get(
-                endpoint_url,
-                headers={"Authorization": f"Bearer {token}", "User-Agent": user_agent()},
-                allow_redirects=False,
-                timeout=settings().run_timeout,
-            )
+            token = token_provider()
+            try:
+                response = requests.get(
+                    endpoint_url,
+                    headers={"Authorization": f"Bearer {token}", "User-Agent": user_agent()},
+                    allow_redirects=False,
+                    timeout=settings().run_timeout,
+                    proxies={"http": proxy, "https": proxy} if proxy else None,
+                    verify=ssl_verify,
+                )
+            except requests.Timeout as e:
+                raise ServiceException(status=HTTPStatus.SERVICE_UNAVAILABLE, reason="Request timed out") from e
+            except requests.ConnectionError as e:
+                raise ServiceException(status=HTTPStatus.SERVICE_UNAVAILABLE, reason="Connection failed") from e
+            except requests.RequestException as e:
+                raise ServiceException(status=HTTPStatus.SERVICE_UNAVAILABLE, reason=f"Request failed: {e}") from e
             if response.status_code in {
                 HTTPStatus.MOVED_PERMANENTLY,
                 HTTPStatus.FOUND,
@@ -393,17 +410,20 @@ def _resolve() -> str:
                 raise NotFoundException(status=HTTPStatus.NOT_FOUND, reason="Artifact not found")
             if response.status_code >= HTTPStatus.INTERNAL_SERVER_ERROR:
                 raise ServiceException(status=response.status_code, reason=response.reason)
-            response.raise_for_status()
+            if response.status_code >= HTTPStatus.BAD_REQUEST:
+                raise ApiException(status=response.status_code, reason=response.reason)
             msg = f"Unexpected status {response.status_code} from artifact file endpoint for artifact {artifact_id}"
             raise RuntimeError(msg)
 
-        return Retrying(
+        url = Retrying(
             retry=retry_if_exception_type(exception_types=RETRYABLE_EXCEPTIONS),
             stop=stop_after_attempt(settings().run_retry_attempts),
             wait=wait_exponential_jitter(initial=settings().run_retry_wait_min, max=settings().run_retry_wait_max),
             before_sleep=_log_retry_attempt,
             reraise=True,
         )(_resolve)
+        logger.trace("Resolved download URL for artifact {}", artifact_id)
+        return url
 
     def ensure_artifacts_downloaded(
         self,
@@ -431,6 +451,13 @@ def ensure_artifacts_downloaded(
         downloaded_at_least_one_artifact = False
         for artifact in item.output_artifacts:
             if not artifact.output_artifact_id:
+                logger.warning(
+                    "Skipping artifact {} for item {}: missing output_artifact_id", artifact.name, item.external_id
+                )
+                if print_status:
+                    print(
+                        f"> Skipping artifact {artifact.name} for item {item.external_id}: missing output_artifact_id"
+                    )
                 continue
             item_dir.mkdir(exist_ok=True, parents=True)
             file_ending = mime_type_to_file_ending(get_mime_type_for_artifact(artifact))