Handle invalid versions better. Closes #29

Author: pelson

simple_repository_browser/controller.py

@@ -9,9 +9,11 @@
 import fastapi
 from fastapi.responses import StreamingResponse
 from markupsafe import Markup
-from packaging.version import InvalidVersion, Version
+from packaging.version import InvalidVersion as InvalidVersionError
+from packaging.version import Version
 
 from . import errors, model, view
+from .short_release_info import InvalidVersion
 from .static_files import HashedStaticFileHandler, StaticFilesManifest
 
 
@@ -141,10 +143,10 @@ async def project(
         if version:
             try:
                 _version = Version(version)
-            except InvalidVersion:
-                raise errors.RequestError(
-                    status_code=404, detail=f"Invalid version {version}."
-                )
+            except InvalidVersionError:
+                # Version string doesn't conform to PEP 440.
+                # Try to find it as an InvalidVersion in the releases.
+                _version = InvalidVersion(version)
 
         t = asyncio.create_task(
             self.model.project_page(project_name, _version, recache)

simple_repository_browser/model.py

@@ -14,7 +14,7 @@
 
 from . import _search, compatibility_matrix, crawler, errors, fetch_projects
 from .fetch_description import PackageInfo
-from .short_release_info import ReleaseInfoModel, ShortReleaseInfo
+from .short_release_info import InvalidVersion, ReleaseInfoModel, ShortReleaseInfo
 
 
 @dataclasses.dataclass(frozen=True)
@@ -219,9 +219,19 @@ 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=f'Release "{version}" not found for {project_name}.',
+                detail=detail,
             )
 
         release = releases[version]