Some more fixes for install order precedence

Author: agriyakhetarpal

packages/pyodide-kernel/py/piplite/piplite/cli.py

@@ -129,8 +129,17 @@ async def get_transformed_code(argv: list[str]) -> typing.Optional[str]:
 
 
 async def get_action_kwargs(argv: list[str]) -> tuple[typing.Optional[str], dict]:
-    """Get the arguments to `piplite` subcommands from CLI-like tokens."""
+    """Get the arguments to `piplite` subcommands from CLI-like tokens.
 
+    This function handles both command-line arguments and requirements files,
+    ensuring that index URLs from either source are properly captured and used.
+
+    The precedence order is:
+    1. Command line --index-url flag
+    2. Index URL specified in requirements file
+    3. Default system index
+
+    """
     parser = _get_parser()
 
     try:
@@ -152,7 +161,7 @@ async def get_action_kwargs(argv: list[str]) -> tuple[typing.Optional[str], dict
             context = RequirementsContext()
 
             # If CLI index URL is provided, it should override within-file-level
-            # index URL for all requirements.
+            # index URL for all requirements and take precedence.
             if args.index_url:
                 context.index_url = args.index_url
 
@@ -170,21 +179,17 @@ async def get_action_kwargs(argv: list[str]) -> tuple[typing.Optional[str], dict
             all_requirements.extend(context.requirements)
 
         if all_requirements:
-            by_index = {}
-            file_index_url = None
+            kwargs["requirements"] = []
+            active_index_url = None
 
             for req, idx in all_requirements:
-                if idx:
-                    file_index_url = idx
-                by_index.setdefault(file_index_url, []).append(req)
+                if idx is not None:
+                    active_index_url = idx
+                kwargs["requirements"].append(req)
 
-            # Build final kwargs. We set the index URL if one was found
-            # (either passed to the CLI or passed within the requirements file)
-            kwargs["requirements"] = []
-            for idx, reqs in by_index.items():
-                if idx:
-                    kwargs["index_urls"] = idx
-                kwargs["requirements"].extend(reqs)
+            # Set the final index URL, if we found one
+            if active_index_url is not None:
+                kwargs["index_urls"] = active_index_url
 
         if args.pre:
             kwargs["pre"] = True

packages/pyodide-kernel/py/piplite/piplite/piplite.py

@@ -129,8 +129,15 @@ async def _install(
     *,
     verbose: bool | int = False,
 ):
-    """Invoke micropip.install with a patch to get data from local indexes"""
+    """Invoke micropip.install with a patch to get data from local indexes.
 
+    This function handles the installation of Python packages, respecting index URLs
+    from various sources (CLI, requirements files, or defaults) while maintaining
+    precedence order provided for indices.
+
+    Arguments maintain the same semantics as micropip.install, but with additional
+    handling of index URLs and installation defaults.
+    """
     try:
         install_args = _PIPLITE_DEFAULT_INSTALL_ARGS.copy()
 
@@ -140,13 +147,18 @@ async def _install(
             "deps": deps,
             "credentials": credentials,
             "pre": pre,
-            "index_urls": index_urls,
             "verbose": verbose,
         }
+
+        if index_urls is not None:
+            provided_args["index_urls"] = index_urls
+
         install_args.update({k: v for k, v in provided_args.items() if v is not None})
 
         if verbose:
             logger.info(f"Installing with arguments: {install_args}")
+            if install_args.get("index_urls"):
+                logger.info(f"Using index URL: {install_args['index_urls']}")
 
         with patch("micropip.package_index.query_package", _query_package):
             return await micropip.install(**install_args)