Switch back from grpc_python to self-written py_proto_library

The upstream patch to grpc-python adds the pyi files to the srcs field
of the py_library.  This is incorrect and results in errors during type
checking (library found twice).

Add and use grpc-python-inspired rules that add the pyi files to the
correct field.

CMK-20994

Change-Id: I6c4e9ce4c6598e7aadcfec8a9a6181cd5b3c507b

Author: Synss

MODULE.bazel

@@ -24,6 +24,14 @@ bazel_dep(name = "rules_cc", version = "0.0.17")
 bazel_dep(name = "rules_multitool", version = "0.4.0")
 bazel_dep(name = "rules_rust", version = "0.49.3")
 bazel_dep(name = "rules_python", version = "1.1.0")
+single_version_override(
+    module_name = "rules_python",
+    patch_strip = 1,
+    patches = [
+        "//bazel/patches:rules_python-py_wheel-package_pyi_files.patch",
+        "//bazel/patches:rules_python-py_wheel-filter_out_virtual_imports.patch",
+    ],
+)
 bazel_dep(name = "rules_uv", version = "0.44.0")
 single_version_override(
     module_name = "rules_uv",
@@ -102,19 +110,6 @@ bazel_dep(
     version = "0.3.7",
 )
 bazel_dep(name = "rules_proto_grpc", version = "5.0.1")
-bazel_dep(name = "rules_proto_grpc_python", version = "5.0.1")
-single_version_override(
-    module_name = "rules_proto_grpc_python",
-    patch_strip = 3,
-    patches = [
-        # https://github.com/rules-proto-grpc/rules_proto_grpc/commit/155b8fe1028d9284670ff9fa0cb9168c72faf6e6
-        "//bazel/patches:rules_proto_grpc_python-generate_pyi.patch",
-        # Provide our own `requirement("protobuf")` dependency to avoid
-        # package collisions.
-        # See also: https://github.com/rules-proto-grpc/rules_proto_grpc/issues/394
-        "//bazel/patches:rules_proto_grpc_python-no_protobuf_dep.patch",
-    ],
-)
 
 fork_cc_toolchain_config = use_repo_rule("//bazel/toolchains/cc:fork_cc_toolchain_config.bzl", "fork_cc_toolchain_config")
 

MODULE.bazel.lock

@@ -0,0 +1,22 @@
+commit 136a8d919256542107d90053a388263f7ac41860
+Author: Mathias Laurin <[email protected]>
+Date:   Thu Feb 6 12:19:55 2025 +0100
+
+    Do not package _virtual_imports
+
+diff --git a/python/private/py_wheel.bzl b/python/private/py_wheel.bzl
+index c196ca6a..1b534f84 100644
+--- a/python/private/py_wheel.bzl
++++ b/python/private/py_wheel.bzl
+@@ -325,8 +325,10 @@ def _py_wheel_impl(ctx):
+         if PyInfo in dep:
+             direct_pyi_files.extend(dep[PyInfo].direct_pyi_files.to_list())
+ 
++    direct_files = [dep for dep in ctx.files.deps if "/_virtual_imports/" not in dep.short_path]
++
+     inputs_to_package = depset(
+-        direct = ctx.files.deps + direct_pyi_files,
++        direct = direct_files + direct_pyi_files,
+     )
+ 
+     # Inputs to this rule which are not to be packaged.

bazel/patches/rules_proto_grpc_python-generate_pyi.patch

@@ -0,0 +1,33 @@
+commit 0d432d7455edc3ff00404403de59ecfd20936c92
+Author: Mathias Laurin <[email protected]>
+Date:   Thu Feb 6 11:26:29 2025 +0100
+
+    Package pyi files in wheel
+
+diff --git a/python/private/py_wheel.bzl b/python/private/py_wheel.bzl
+index b5fbec9c..c196ca6a 100644
+--- a/python/private/py_wheel.bzl
++++ b/python/private/py_wheel.bzl
+@@ -14,6 +14,7 @@
+ 
+ "Implementation of py_wheel rule"
+ 
++load(":py_info.bzl", "PyInfo")
+ load(":py_package.bzl", "py_package_lib")
+ load(":py_wheel_normalize_pep440.bzl", "normalize_pep440")
+ load(":stamp.bzl", "is_stamping_enabled")
+@@ -319,8 +320,13 @@ def _py_wheel_impl(ctx):
+ 
+     name_file = ctx.actions.declare_file(ctx.label.name + ".name")
+ 
++    direct_pyi_files = []
++    for dep in ctx.attr.deps:
++        if PyInfo in dep:
++            direct_pyi_files.extend(dep[PyInfo].direct_pyi_files.to_list())
++
+     inputs_to_package = depset(
+-        direct = ctx.files.deps,
++        direct = ctx.files.deps + direct_pyi_files,
+     )
+ 
+     # Inputs to this rule which are not to be packaged.

bazel/patches/rules_proto_grpc_python-no_protobuf_dep.patch

@@ -0,0 +1,18 @@
+load("@cmk_requirements//:requirements.bzl", "requirement")
+load("@rules_proto_grpc//:defs.bzl", "proto_plugin")
+load("@rules_python//python/entry_points:py_console_script_binary.bzl", "py_console_script_binary")
+
+py_console_script_binary(
+    name = "protoc-gen-mypy",
+    pkg = requirement("mypy-protobuf"),
+    script = "protoc-gen-mypy",
+)
+
+proto_plugin(
+    name = "pyi_plugin",
+    exclusions = ["google/protobuf"],
+    outputs = ["{protopath|python}_pb2.pyi"],
+    # protoc_plugin_name = "pyi",
+    tool = ":protoc-gen-mypy",
+    visibility = ["//visibility:public"],
+)

bazel/patches/rules_python-py_wheel-filter_out_virtual_imports.patch

@@ -0,0 +1,53 @@
+load(
+    "@rules_proto_grpc//:defs.bzl",
+    "ProtoPluginInfo",
+    "proto_compile_attrs",
+    "proto_compile_impl",
+    "proto_compile_toolchains",
+)
+load("@rules_python//python:defs.bzl", _py_library = "py_library")
+load("@rules_python//python:proto.bzl", _py_proto_library = "py_proto_library")
+
+py_proto_compile = rule(
+    implementation = proto_compile_impl,
+    attrs = dict(
+        proto_compile_attrs,
+        _plugins = attr.label_list(
+            providers = [ProtoPluginInfo],
+            default = [Label("//bazel/rules/private/proto:pyi_plugin")],
+            cfg = "exec",
+            doc = "List of protoc plugins to apply",
+        ),
+    ),
+    toolchains = proto_compile_toolchains,
+)
+
+def py_proto_library(name, protos, output_mode = None, **kwargs):
+    """py_proto_library generates Python code from proto and creates a py_library for them.
+
+    Args:
+        name: the name of the target.
+        protos: the proto files.
+        output_mode: "PREFIX" or "NO_PREFIX".
+        **kwargs: arguments forwarded to the py_library.
+    """
+    name_pb = name + "_pb"
+    _py_proto_library(
+        name = name_pb,
+        deps = protos,
+    )
+
+    name_pyi = name + "_pyi"
+    py_proto_compile(
+        name = name_pyi,
+        output_mode = output_mode,
+        protos = protos,
+    )
+
+    _py_library(
+        name = name,
+        srcs = [name_pb],
+        pyi_srcs = [name_pyi],
+        imports = ["."],
+        **kwargs
+    )