add package to PyInfo as an experiment to make the aggregation of the builders deterministic

Author: aignas

python/private/common.bzl

@@ -378,6 +378,7 @@ def create_py_info(
         implicit_pyc_files,
         implicit_pyc_source_files,
         imports,
+        package = None,
         venv_symlinks = []):
     """Create PyInfo provider.
 
@@ -396,6 +397,7 @@ def create_py_info(
         implicit_pyc_files: {type}`depset[File]` Implicitly generated pyc files
             that a binary can choose to include.
         imports: depset of strings; the import path values to propagate.
+        package: TODO
         venv_symlinks: {type}`list[VenvSymlinkEntry]` instances for
             symlinks to create in the consuming binary's venv.
 
@@ -418,9 +420,15 @@ def create_py_info(
     py_info.merge_has_py2_only_sources(ctx.attr.srcs_version in ("PY2", "PY2ONLY"))
     py_info.merge_has_py3_only_sources(ctx.attr.srcs_version in ("PY3", "PY3ONLY"))
 
+    # First merge the third party deps
+    # TODO @aignas 2025-06-05: refactor the code
+
     for target in ctx.attr.deps:
         # PyInfo may not be present e.g. cc_library rules.
         if PyInfo in target or (BuiltinPyInfo != None and BuiltinPyInfo in target):
+            if not target[PyInfo].package:
+                continue
+
             py_info.merge(_get_py_info(target))
         else:
             # TODO(b/228692666): Remove this once non-PyInfo targets are no
@@ -433,6 +441,34 @@ def create_py_info(
     for target in ctx.attr.pyi_deps:
         # PyInfo may not be present e.g. cc_library rules.
         if PyInfo in target or (BuiltinPyInfo != None and BuiltinPyInfo in target):
+            if not target[PyInfo].package:
+                continue
+
+            py_info.merge(_get_py_info(target))
+
+    # Now proceed with the first party deps
+
+    for target in ctx.attr.deps:
+        # PyInfo may not be present e.g. cc_library rules.
+        if PyInfo in target or (BuiltinPyInfo != None and BuiltinPyInfo in target):
+            if target[PyInfo].package:
+                continue
+
+            py_info.merge(_get_py_info(target))
+        else:
+            # TODO(b/228692666): Remove this once non-PyInfo targets are no
+            # longer supported in `deps`.
+            files = target.files.to_list()
+            for f in files:
+                if f.extension == "py":
+                    py_info.transitive_sources.add(f)
+                py_info.merge_uses_shared_libraries(cc_helper.is_valid_shared_library_artifact(f))
+    for target in ctx.attr.pyi_deps:
+        # PyInfo may not be present e.g. cc_library rules.
+        if PyInfo in target or (BuiltinPyInfo != None and BuiltinPyInfo in target):
+            if target[PyInfo].package:
+                continue
+
             py_info.merge(_get_py_info(target))
 
     deps_transitive_sources = py_info.transitive_sources.build()
@@ -457,7 +493,7 @@ def create_py_info(
             if py_info.get_uses_shared_libraries():
                 break
 
-    return py_info.build(), deps_transitive_sources, py_info.build_builtin_py_info()
+    return py_info.build(package), deps_transitive_sources, py_info.build_builtin_py_info()
 
 def _get_py_info(target):
     return target[PyInfo] if PyInfo in target or BuiltinPyInfo == None else target[BuiltinPyInfo]

python/private/py_info.bzl

@@ -107,6 +107,7 @@ def _PyInfo_init(
         has_py2_only_sources = False,
         has_py3_only_sources = False,
         direct_pyc_files = depset(),
+        package = None,
         transitive_pyc_files = depset(),
         transitive_implicit_pyc_files = depset(),
         transitive_implicit_pyc_source_files = depset(),
@@ -142,6 +143,7 @@ def _PyInfo_init(
         "has_py2_only_sources": has_py2_only_sources,
         "has_py3_only_sources": has_py2_only_sources,
         "imports": imports,
+        "package": package,
         "transitive_implicit_pyc_files": transitive_implicit_pyc_files,
         "transitive_implicit_pyc_source_files": transitive_implicit_pyc_source_files,
         "transitive_original_sources": transitive_original_sources,
@@ -218,6 +220,7 @@ Python targets. These are accumulated from the transitive `deps`.
 The order of the depset is not guaranteed and may be changed in the future. It
 is recommended to use `default` order (the default).
 """,
+        "package": "TODO",
         "transitive_implicit_pyc_files": """
 :type: depset[File]
 
@@ -625,11 +628,12 @@ def _PyInfoBuilder_merge_targets(self, targets):
         self.merge_target(t)
     return self
 
-def _PyInfoBuilder_build(self):
+def _PyInfoBuilder_build(self, package = None):
     """Builds into a {obj}`PyInfo` object.
 
     Args:
         self: implicitly added.
+        package: TODO
 
     Returns:
         {type}`PyInfo`
@@ -639,6 +643,7 @@ def _PyInfoBuilder_build(self):
             direct_original_sources = self.direct_original_sources.build(),
             direct_pyc_files = self.direct_pyc_files.build(),
             direct_pyi_files = self.direct_pyi_files.build(),
+            package = package,
             transitive_implicit_pyc_files = self.transitive_implicit_pyc_files.build(),
             transitive_implicit_pyc_source_files = self.transitive_implicit_pyc_source_files.build(),
             transitive_original_sources = self.transitive_original_sources.build(),

python/private/py_library.bzl

@@ -159,6 +159,17 @@ def py_library_impl(ctx, *, semantics):
     imports = []
     venv_symlinks = []
 
+    # TODO @aignas 2025-06-05: refactor code
+    package = None
+    dist_info_metadata = _get_distinfo_metadata(ctx)
+    if dist_info_metadata:
+        # in order to be able to have replacements in the venv, we have to add a
+        # third value into the venv_symlinks, which would be the normalized
+        # package name. This allows us to ensure that we can replace the `dist-info`
+        # directories by checking if the package key is there.
+        dist_info_dir = paths.basename(dist_info_metadata.dirname)
+        package, _, _suffix = dist_info_dir.rpartition(".dist-info")
+
     imports, venv_symlinks = _get_imports_and_venv_symlinks(ctx, semantics)
 
     cc_info = semantics.get_cc_info_for_library(ctx)
@@ -169,6 +180,7 @@ def py_library_impl(ctx, *, semantics):
         required_pyc_files = required_pyc_files,
         implicit_pyc_files = implicit_pyc_files,
         implicit_pyc_source_files = implicit_pyc_source_files,
+        package = package,
         imports = imports,
         venv_symlinks = venv_symlinks,
     )
@@ -222,7 +234,7 @@ def _get_distinfo_metadata(ctx):
 
 def _get_imports_and_venv_symlinks(ctx, semantics):
     imports = depset()
-    venv_symlinks = depset()
+    venv_symlinks = []
     if VenvsSitePackages.is_enabled(ctx):
         venv_symlinks = _get_venv_symlinks(ctx)
     else: