Improve alternative index handling.

micropip/_commands/install.py

@@ -11,7 +11,7 @@ async def install(
     pre: bool = False,
     index_urls: list[str] | str | None = None,
     *,
-    verbose: bool | int = False,
+    verbose: bool | int | None = None,
 ) -> None:
     if index_urls is None:
         index_urls = package_index.INDEX_URLS[:]

micropip/install.py

@@ -19,7 +19,7 @@ async def install(
     pre: bool = False,
     index_urls: list[str] | str | None = None,
     *,
-    verbose: bool | int = False,
+    verbose: bool | int | None = None,
 ) -> None:
     """Install the given package and all of its dependencies.
 

micropip/logging.py

@@ -87,17 +87,15 @@ def _set_formatter_once() -> None:
     _logger.addHandler(ch)
 
 
-def setup_logging(verbosity: int | bool) -> logging.Logger:
+def setup_logging(verbosity: int | bool | None) -> logging.Logger:
     _set_formatter_once()
-
-    if verbosity >= 2:
-        level_number = logging.DEBUG
-    elif verbosity == 1:  # True == 1
-        level_number = logging.INFO
-    else:
-        level_number = logging.WARNING
-
     assert _logger
-    _logger.setLevel(level_number)
-
+    if verbosity is not None:
+        if verbosity >= 2:
+            level_number = logging.DEBUG
+        elif verbosity == 1:  # True == 1
+            level_number = logging.INFO
+        else:
+            level_number = logging.WARNING
+        _logger.setLevel(level_number)
     return _logger

micropip/package_index.py

@@ -1,4 +1,5 @@
 import json
+import logging
 import string
 import sys
 from collections import defaultdict
@@ -20,6 +21,8 @@
 
 _formatter = string.Formatter()
 
+logger = logging.getLogger("micropip")
+
 
 @dataclass
 class ProjectInfo:
@@ -83,6 +86,7 @@ def from_simple_html_api(data: str, pkgname: str) -> "ProjectInfo":
 
         https://peps.python.org/pep-0503
         """
+        logger.debug("Parsing simple_html_api for package: %r", pkgname)
         project_detail = from_project_details_html(data, pkgname)
         name, releases = ProjectInfo._parse_pep691_response(project_detail)  # type: ignore[arg-type]
         return ProjectInfo._compatible_only(name, releases)
@@ -123,6 +127,7 @@ def _parse_pep691_response(
 
             releases[version].append(file)
 
+        logger.debug("Parsing pep691: %r, %r", name, releases)
         return name, releases
 
     @classmethod
@@ -215,19 +220,57 @@ def _contain_placeholder(url: str, placeholder: str = "package_name") -> bool:
     return placeholder in fields
 
 
+class UnsupportedParserContentTypeError(BaseException):
+    """
+    Specific Error when trying to parse an PyPI Index.
+
+
+    .. note:
+
+        This used to be a ValueError, but cannot be a subclass of it, otherwise
+        we cannot determine whether we fail to parse the index, or just did not
+        found the wheels
+
+    """
+
+    pass
+
+
 def _select_parser(content_type: str, pkgname: str) -> Callable[[str], ProjectInfo]:
     """
     Select the function to parse the response based on the content type.
     """
+    # This is not proper parsing of the content type, but to do so would require using
+    # either an external dependency like request, cgi (deprecated as of Python 3.13).
+    # we'll just drop all the parameters after the first ; as we want just the content-type:
+    # https://www.ietf.org/rfc/rfc2045.html#page-10
+    raw_content_type = content_type
+    if ";" in content_type:
+        content_type = content_type.split(";")[0].strip()
+
     match content_type:
         case "application/vnd.pypi.simple.v1+json":
+            logger.debug("Found parser for content type : %r", content_type)
             return ProjectInfo.from_simple_json_api
         case "application/json":
+            logger.debug("Found parser for content type : %r", content_type)
             return ProjectInfo.from_json_api
         case "application/vnd.pypi.simple.v1+html" | "text/html":
+            logger.debug("Found parser for content type : %r", content_type)
             return partial(ProjectInfo.from_simple_html_api, pkgname=pkgname)
         case _:
-            raise ValueError(f"Unsupported content type: {content_type}")
+            logger.debug("Unsupported parser content type : %r", content_type)
+            raise UnsupportedParserContentTypeError(
+                f"Unsupported content type: {raw_content_type}"
+            )
+
+
+class IndexMetadataFetchError(BaseException):
+    pass
+
+
+class IndexMetadataParseError(BaseException):
+    pass
 
 
 async def query_package(
@@ -264,6 +307,7 @@ async def query_package(
     )
 
     if index_urls is None:
+        logger.debug("No index url provided, falling back to %r", INDEX_URLS)
         index_urls = INDEX_URLS
     elif isinstance(index_urls, str):
         index_urls = [index_urls]
@@ -273,17 +317,26 @@ async def query_package(
             url = url.format(package_name=name)
         else:
             url = f"{url}/{name}/"
+        logger.debug("Searching index url %r", url)
 
         try:
             metadata, headers = await fetch_string_and_headers(url, _fetch_kwargs)
-        except OSError:
+        except OSError as e:
+            # Pypi does not currently set cors on 404, we we can't know
+            # whether this is a real OS error or a 404
+            logger.debug("Error fetching %r, skipping. Error was %r", url, e)
             continue
 
         content_type = headers.get("content-type", "").lower()
         parser = _select_parser(content_type, name)
-        return parser(metadata)
+        try:
+            return parser(metadata)
+        except ValueError as e:
+            raise IndexMetadataParseError(
+                f"Error parsing Index page for URL: {url} "
+            ) from e
     else:
-        raise ValueError(
+        raise IndexMetadataFetchError(
             f"Can't fetch metadata for '{name}'. "
             "Please make sure you have entered a correct package name "
             "and correctly specified index_urls (if you changed them)."

micropip/transaction.py

@@ -14,7 +14,7 @@
 from ._utils import best_compatible_tag_index, check_compatible
 from .constants import FAQ_URLS
 from .package import PackageMetadata
-from .package_index import ProjectInfo
+from .package_index import IndexMetadataFetchError, ProjectInfo
 from .wheelinfo import WheelInfo
 
 logger = logging.getLogger("micropip")
@@ -35,7 +35,7 @@ class Transaction:
     pyodide_packages: list[PackageMetadata] = field(default_factory=list)
     failed: list[Requirement] = field(default_factory=list)
 
-    verbose: bool | int = False
+    verbose: bool | int | None = None
 
     def __post_init__(self):
         # If index_urls is None, pyodide-lock.json have to be searched first.
@@ -152,12 +152,17 @@ def eval_marker(e: dict[str, str]) -> bool:
             else:
                 try:
                     await self._add_requirement_from_package_index(req)
-                except ValueError:
+                except (WheelNotFoundError, IndexMetadataFetchError):
                     # If the requirement is not found in package index,
                     # we still have a chance to find it from pyodide lockfile.
-                    if not self._add_requirement_from_pyodide_lock(req):
+                    if self._add_requirement_from_pyodide_lock(req):
+                        logger.debug(
+                            "No wheel found for %r in index, falling back to pyodide lock file.",
+                            req,
+                        )
+                    else:
                         raise
-        except ValueError:
+        except (WheelNotFoundError, IndexMetadataFetchError):
             self.failed.append(req)
             if not self.keep_going:
                 raise
@@ -238,6 +243,10 @@ async def add_wheel(
         self.wheels.append(wheel)
 
 
+class WheelNotFoundError(BaseException):
+    pass
+
+
 def find_wheel(metadata: ProjectInfo, req: Requirement) -> WheelInfo:
     """Parse metadata to find the latest version of pure python wheel.
     Parameters
@@ -278,7 +287,7 @@ def find_wheel(metadata: ProjectInfo, req: Requirement) -> WheelInfo:
         if best_wheel is not None:
             return wheel
 
-    raise ValueError(
+    raise WheelNotFoundError(
         f"Can't find a pure Python 3 wheel for '{req}'.\n"
         f"See: {FAQ_URLS['cant_find_wheel']}\n"
         "You can use `await micropip.install(..., keep_going=True)` "