Correct typing

Author: pelson

simple_repository_browser/controller.py

@@ -139,7 +139,7 @@ async def project(
         recache: bool = False,
     ) -> str | StreamingResponse:
         _ = page_section  # Handled in javascript.
-        _version = None
+        _version: Version | InvalidVersion | None = None
         if version:
             try:
                 _version = Version(version)

simple_repository_browser/crawler.py

@@ -15,7 +15,7 @@
 
 from . import fetch_projects
 from .fetch_description import PackageInfo, package_info
-from .short_release_info import ReleaseInfoModel, ShortReleaseInfo
+from .short_release_info import InvalidVersion, ReleaseInfoModel, ShortReleaseInfo
 
 
 class Crawler:
@@ -146,8 +146,8 @@ async def run_reindex_periodically(self) -> None:
     async def fetch_pkg_info(
         self,
         prj: model.ProjectDetail,
-        version: Version,
-        releases: dict[Version, ShortReleaseInfo],
+        version: Version | InvalidVersion,
+        releases: dict[Version | InvalidVersion, ShortReleaseInfo],
         force_recache: bool,
     ) -> tuple[model.File, PackageInfo]:
         key = ("pkg-info", prj.name, str(version))

simple_repository_browser/model.py

@@ -189,7 +189,7 @@ async def project_query(
     async def project_page(
         self,
         project_name: str,
-        version: Version | None,
+        version: Version | InvalidVersion | None,
         recache: bool,
     ) -> ProjectPageModel:
         canonical_name = canonicalize_name(project_name)
@@ -219,19 +219,9 @@ async def project_page(
             version = latest_version
 
         if version not in releases:
-            # Provide a more helpful error message for invalid versions
-            if isinstance(version, InvalidVersion):
-                available_versions = [f'"{vn}"' for vn in releases]
-                detail = (
-                    f'Release "{version}" not found for {project_name}. '
-                    f"Note: This version does not conform to PEP 440. "
-                    f"Available versions: {', '.join(available_versions[:10])}"
-                )
-            else:
-                detail = f'Release "{version}" not found for {project_name}.'
             raise errors.RequestError(
                 status_code=404,
-                detail=detail,
+                detail=f'Release "{version}" not found for {project_name}.',
             )
 
         release = releases[version]

simple_repository_browser/short_release_info.py

@@ -74,6 +74,7 @@ def release_infos(
             raise ValueError("No files for the release")
 
         canonical_name = canonicalize_name(project_detail.name)
+        release: Version | InvalidVersion
         for file in project_detail.files:
             version_str = None
             try:
@@ -88,6 +89,7 @@ def release_infos(
             files_grouped_by_version.setdefault(release, []).append(file)
 
         # Ensure there is a release for each version, even if there is no files for it.
+        version: Version | InvalidVersion
         for version_str in project_detail.versions or []:
             try:
                 version = Version(version_str)