move code back

Author: aignas

python/private/pypi/simpleapi_download.bzl

@@ -23,80 +23,13 @@ load("//python/private:normalize_name.bzl", "normalize_name")
 load("//python/private:text_util.bzl", "render")
 load(":parse_simpleapi_html.bzl", "parse_simpleapi_html")
 
-def _read_simpleapi(ctx, url, attr, cache, **download_kwargs):
-    """Read SimpleAPI.
-
-    Args:
-        ctx: The module_ctx or repository_ctx.
-        url: str, the url parameter that can be passed to ctx.download.
-        attr: The attribute that contains necessary info for downloading. The
-          following attributes must be present:
-           * envsubst: The envsubst values for performing substitutions in the URL.
-           * netrc: The netrc parameter for ctx.download, see http_file for docs.
-           * auth_patterns: The auth_patterns parameter for ctx.download, see
-               http_file for docs.
-        cache: A dict for storing the results.
-        **download_kwargs: Any extra params to ctx.download.
-            Note that output and auth will be passed for you.
-
-    Returns:
-        A similar object to what `download` would return except that in result.out
-        will be the parsed simple api contents.
-    """
-    # NOTE @aignas 2024-03-31: some of the simple APIs use relative URLs for
-    # the whl location and we cannot handle multiple URLs at once by passing
-    # them to ctx.download if we want to correctly handle the relative URLs.
-    # TODO: Add a test that env subbed index urls do not leak into the lock file.
-
-    real_url = envsubst(
-        url,
-        attr.envsubst,
-        ctx.getenv if hasattr(ctx, "getenv") else ctx.os.environ.get,
-    )
-
-    cache_key = real_url
-    if cache_key in cache:
-        return struct(success = True, output = cache[cache_key])
-
-    output_str = envsubst(
-        url,
-        attr.envsubst,
-        # Use env names in the subst values - this will be unique over
-        # the lifetime of the execution of this function and we also use
-        # `~` as the separator to ensure that we don't get clashes.
-        {e: "~{}~".format(e) for e in attr.envsubst}.get,
-    )
-
-    # Transform the URL into a valid filename
-    for char in [".", ":", "/", "\\", "-"]:
-        output_str = output_str.replace(char, "_")
-
-    output = ctx.path(output_str.strip("_").lower() + ".html")
-
-    # NOTE: this may have block = True or block = False in the download_kwargs
-    download = ctx.download(
-        url = [real_url],
-        output = output,
-        auth = get_auth(ctx, [real_url], ctx_attr = attr),
-        allow_fail = True,
-        **download_kwargs
-    )
-
-    if download_kwargs.get("block") == False:
-        # Simulate the same API as ctx.download has
-        return struct(
-            wait = lambda: _read_index_result(ctx, download.wait(), output, real_url, cache, cache_key),
-        )
-
-    return _read_index_result(ctx, download, output, real_url, cache, cache_key)
-
 def simpleapi_download(
         ctx,
         *,
         attr,
         cache,
         parallel_download = True,
-        read_simpleapi = _read_simpleapi,
+        read_simpleapi = None,
         _fail = fail):
     """Download Simple API HTML.
 
@@ -144,6 +77,7 @@ def simpleapi_download(
     # to replicate how `pip` would handle this case.
     contents = {}
     index_urls = [attr.index_url] + attr.extra_index_urls
+    read_simpleapi = read_simpleapi or _read_simpleapi
 
     found_on_index = {}
     warn_overrides = False
@@ -210,6 +144,73 @@ def simpleapi_download(
 
     return contents
 
+def _read_simpleapi(ctx, url, attr, cache, **download_kwargs):
+    """Read SimpleAPI.
+
+    Args:
+        ctx: The module_ctx or repository_ctx.
+        url: str, the url parameter that can be passed to ctx.download.
+        attr: The attribute that contains necessary info for downloading. The
+          following attributes must be present:
+           * envsubst: The envsubst values for performing substitutions in the URL.
+           * netrc: The netrc parameter for ctx.download, see http_file for docs.
+           * auth_patterns: The auth_patterns parameter for ctx.download, see
+               http_file for docs.
+        cache: A dict for storing the results.
+        **download_kwargs: Any extra params to ctx.download.
+            Note that output and auth will be passed for you.
+
+    Returns:
+        A similar object to what `download` would return except that in result.out
+        will be the parsed simple api contents.
+    """
+    # NOTE @aignas 2024-03-31: some of the simple APIs use relative URLs for
+    # the whl location and we cannot handle multiple URLs at once by passing
+    # them to ctx.download if we want to correctly handle the relative URLs.
+    # TODO: Add a test that env subbed index urls do not leak into the lock file.
+
+    real_url = envsubst(
+        url,
+        attr.envsubst,
+        ctx.getenv if hasattr(ctx, "getenv") else ctx.os.environ.get,
+    )
+
+    cache_key = real_url
+    if cache_key in cache:
+        return struct(success = True, output = cache[cache_key])
+
+    output_str = envsubst(
+        url,
+        attr.envsubst,
+        # Use env names in the subst values - this will be unique over
+        # the lifetime of the execution of this function and we also use
+        # `~` as the separator to ensure that we don't get clashes.
+        {e: "~{}~".format(e) for e in attr.envsubst}.get,
+    )
+
+    # Transform the URL into a valid filename
+    for char in [".", ":", "/", "\\", "-"]:
+        output_str = output_str.replace(char, "_")
+
+    output = ctx.path(output_str.strip("_").lower() + ".html")
+
+    # NOTE: this may have block = True or block = False in the download_kwargs
+    download = ctx.download(
+        url = [real_url],
+        output = output,
+        auth = get_auth(ctx, [real_url], ctx_attr = attr),
+        allow_fail = True,
+        **download_kwargs
+    )
+
+    if download_kwargs.get("block") == False:
+        # Simulate the same API as ctx.download has
+        return struct(
+            wait = lambda: _read_index_result(ctx, download.wait(), output, real_url, cache, cache_key),
+        )
+
+    return _read_index_result(ctx, download, output, real_url, cache, cache_key)
+
 def _read_index_result(ctx, result, output, url, cache, cache_key):
     if not result.success:
         return struct(success = False)