refactor: move evaluate_markers fn creation to the builder

Author: aignas

python/private/pypi/BUILD.bazel

@@ -172,6 +172,7 @@ bzl_library(
     srcs = ["hub_builder.bzl"],
     visibility = ["//:__subpackages__"],
     deps = [
+        ":evaluate_markers_bzl",
         ":pep508_env_bzl",
         ":pep508_evaluate_bzl",
         ":python_tag_bzl",

python/private/pypi/extension.bzl

@@ -24,7 +24,7 @@ load("//python/private:normalize_name.bzl", "normalize_name")
 load("//python/private:repo_utils.bzl", "repo_utils")
 load("//python/private:version.bzl", "version")
 load(":attrs.bzl", "use_isolated")
-load(":evaluate_markers.bzl", "evaluate_markers_py", EVALUATE_MARKERS_SRCS = "SRCS", evaluate_markers_star = "evaluate_markers")
+load(":evaluate_markers.bzl", EVALUATE_MARKERS_SRCS = "SRCS")
 load(":hub_builder.bzl", "hub_builder")
 load(":hub_repository.bzl", "hub_repository", "whl_config_settings_to_json")
 load(":parse_requirements.bzl", "parse_requirements")
@@ -72,8 +72,7 @@ def _create_whl_repos(
         pip_attr,
         whl_overrides,
         hub,
-        minor_mapping = MINOR_MAPPING,
-        evaluate_markers = None):
+        minor_mapping = MINOR_MAPPING):
     """create all of the whl repositories
 
     Args:
@@ -83,7 +82,6 @@ def _create_whl_repos(
         hub: TODO.
         minor_mapping: {type}`dict[str, str]` The dictionary needed to resolve the full
             python version used to parse package METADATA files.
-        evaluate_markers: the function used to evaluate the markers.
 
     Returns a {type}`struct` with the following attributes:
         whl_map: {type}`dict[str, list[struct]]` the output is keyed by the
@@ -127,44 +125,6 @@ def _create_whl_repos(
 
     platforms = hub.platforms(pip_attr.python_version)
 
-    if evaluate_markers:
-        # This is most likely unit tests
-        pass
-    elif hub.config.enable_pipstar:
-        evaluate_markers = lambda _, requirements: evaluate_markers_star(
-            requirements = requirements,
-            platforms = platforms,
-        )
-    else:
-        # NOTE @aignas 2024-08-02: , we will execute any interpreter that we find either
-        # in the PATH or if specified as a label. We will configure the env
-        # markers when evaluating the requirement lines based on the output
-        # from the `requirements_files_by_platform` which should have something
-        # similar to:
-        # {
-        #    "//:requirements.txt": ["cp311_linux_x86_64", ...]
-        # }
-        #
-        # We know the target python versions that we need to evaluate the
-        # markers for and thus we don't need to use multiple python interpreter
-        # instances to perform this manipulation. This function should be executed
-        # only once by the underlying code to minimize the overhead needed to
-        # spin up a Python interpreter.
-        evaluate_markers = lambda module_ctx, requirements: evaluate_markers_py(
-            module_ctx,
-            requirements = {
-                k: {
-                    p: platforms[p].triple
-                    for p in plats
-                }
-                for k, plats in requirements.items()
-            },
-            python_interpreter = interpreter.path,
-            python_interpreter_target = interpreter.target,
-            srcs = pip_attr._evaluate_markers_srcs,
-            logger = logger,
-        )
-
     requirements_by_platform = parse_requirements(
         module_ctx,
         requirements_by_platform = requirements_files_by_platform(
@@ -184,7 +144,7 @@ def _create_whl_repos(
         platforms = platforms,
         extra_pip_args = pip_attr.extra_pip_args,
         get_index_urls = hub.get_index_urls(pip_attr.python_version),
-        evaluate_markers = evaluate_markers,
+        evaluate_markers = hub.evaluate_markers(pip_attr),
         logger = logger,
     )
 
@@ -536,7 +496,9 @@ You cannot use both the additive_build_content and additive_build_content_file a
                     simpleapi_download_fn = simpleapi_download,
                     simpleapi_cache = simpleapi_cache,
                     minor_mapping = kwargs.get("minor_mapping", MINOR_MAPPING),
-                    available_interpreters = kwargs.pop("available_interpreters", INTERPRETER_LABELS),
+                    evaluate_markers_fn = kwargs.get("evaluate_markers", None),
+                    available_interpreters = kwargs.get("available_interpreters", INTERPRETER_LABELS),
+                    logger = repo_utils.logger(module_ctx, "pypi:hub:" + hub_name),
                 )
                 pip_hub_map[pip_attr.hub_name] = builder
             elif pip_hub_map[hub_name].module_name != mod.name:
@@ -564,7 +526,7 @@ You cannot use both the additive_build_content and additive_build_content_file a
                 hub = builder,
                 pip_attr = pip_attr,
                 whl_overrides = whl_overrides,
-                **kwargs
+                minor_mapping = kwargs.get("minor_mapping", MINOR_MAPPING),
             )
 
             extra_aliases.setdefault(hub_name, {})

python/private/pypi/hub_builder.bzl

@@ -4,6 +4,7 @@ load("//python/private:full_version.bzl", "full_version")
 load("//python/private:normalize_name.bzl", "normalize_name")
 load("//python/private:version.bzl", "version")
 load("//python/private:version_label.bzl", "version_label")
+load(":evaluate_markers.bzl", "evaluate_markers_py", evaluate_markers_star = "evaluate_markers")
 load(":pep508_env.bzl", "env")
 load(":pep508_evaluate.bzl", "evaluate")
 load(":python_tag.bzl", "python_tag")
@@ -16,6 +17,8 @@ def hub_builder(
         minor_mapping,
         available_interpreters,
         simpleapi_download_fn,
+        evaluate_markers_fn,
+        logger,
         simpleapi_cache = {}):
     """Return a hub builder instance
 
@@ -24,12 +27,14 @@ def hub_builder(
         module_name: TODO
         config: The platform configuration.
         minor_mapping: TODO
+        evaluate_markers_fn: the function used to evaluate the markers.
         available_interpreters: {type}`dict[str, Label]` The dictionary of available
             interpreters that have been registered using the `python` bzlmod extension.
             The keys are in the form `python_{snake_case_version}_host`. This is to be
             used during the `repository_rule` and must be always compatible with the host.
         simpleapi_download_fn: TODO
         simpleapi_cache: TODO
+        logger: TODO
     """
 
     # buildifier: disable=uninitialized
@@ -42,6 +47,8 @@ def hub_builder(
         exposed_packages = {},
         extra_aliases = {},
         whl_libraries = {},
+        _evaluate_markers_fn = evaluate_markers_fn,
+        _logger = logger,
         _minor_mapping = minor_mapping,
         _available_interpreters = available_interpreters,
         _simpleapi_download_fn = simpleapi_download_fn,
@@ -59,6 +66,7 @@ def hub_builder(
             normalize_name(whl_name),
             python_version in self._get_index_urls,
         ),
+        evaluate_markers = lambda *a, **k: _evaluate_markers(self, *a, **k),
     )
 
     # buildifier: enable=uninitialized
@@ -239,3 +247,44 @@ def _add_whl_library(self, *, python_version, whl, repo):
         )
     else:
         mapping[repo.config_setting] = repo_name
+
+def _evaluate_markers(self, pip_attr):
+    if self._evaluate_markers_fn:
+        return self._evaluate_markers_fn
+
+    if self.config.enable_pipstar:
+        return lambda _, requirements: evaluate_markers_star(
+            requirements = requirements,
+            platforms = self.python_versions[pip_attr.python_version],
+        )
+
+    interpreter = self.detect_interpreter(pip_attr)
+
+    # NOTE @aignas 2024-08-02: , we will execute any interpreter that we find either
+    # in the PATH or if specified as a label. We will configure the env
+    # markers when evaluating the requirement lines based on the output
+    # from the `requirements_files_by_platform` which should have something
+    # similar to:
+    # {
+    #    "//:requirements.txt": ["cp311_linux_x86_64", ...]
+    # }
+    #
+    # We know the target python versions that we need to evaluate the
+    # markers for and thus we don't need to use multiple python interpreter
+    # instances to perform this manipulation. This function should be executed
+    # only once by the underlying code to minimize the overhead needed to
+    # spin up a Python interpreter.
+    return lambda module_ctx, requirements: evaluate_markers_py(
+        module_ctx,
+        requirements = {
+            k: {
+                p: self.python_versions[pip_attr.python_version][p].triple
+                for p in plats
+            }
+            for k, plats in requirements.items()
+        },
+        python_interpreter = interpreter.path,
+        python_interpreter_target = interpreter.target,
+        srcs = pip_attr._evaluate_markers_srcs,
+        logger = self._logger,
+    )