Merge pull request #1002: [py] fix python build

Author: je-ik

MANIFEST.in

@@ -0,0 +1 @@
+recursive-include rpc/src/main/proto *.proto

setup.py

@@ -14,54 +14,71 @@
 # limitations under the License.
 #
 
-import os
+from pathlib import Path
 import sys
 import grpc_tools
 import grpc_tools.protoc as protoc
 from setuptools import setup
 
-def get_version():
+def get_version() -> str:
   return "0.15.0"
 
-def build_ingest_rpc(name):
-  
-  proto_dir = os.path.split(os.path.abspath(sys.argv[0]))[0] + "/rpc/src/main/proto/"
-  protos = filter(lambda x: x.endswith(".proto"), os.listdir(proto_dir))
-  protos = list(map(lambda x: proto_dir + "/" + x, protos))
+def build_ingest_rpc(name: str):
+  # Anchor all paths to the project root (the folder that contains this setup.py)
+  PROJECT_ROOT = Path(__file__).resolve().parent
+  PROTO_DIR = PROJECT_ROOT / "rpc" / "src" / "main" / "proto"
+  TARGET_DIR = PROJECT_ROOT / "target"
 
-  packages = []
-  imports = ""
- 
-  os.makedirs("./target", exist_ok=True)
-    
-  
+  if not PROTO_DIR.is_dir():
+    raise FileNotFoundError(
+      f"Expected proto dir at {PROTO_DIR} but it does not exist. "
+      "Make sure you run the build from the project root and that "
+      "rpc/src/main/proto is present in the sdist."
+    )
+
+  protos = sorted(str(p) for p in PROTO_DIR.glob("*.proto"))
+  if not protos:
+    raise FileNotFoundError(f"No .proto files found in {PROTO_DIR}")
+
+  TARGET_DIR.mkdir(exist_ok=True)
+
+  # Build protoc args
   args = [
     "grpc_tools.protoc",
-    "--proto_path=%s" % (proto_dir, )]
-  
-  for item in grpc_tools.__spec__.submodule_search_locations:
-    args.append("--proto_path=%s" % (item + "/_proto"))
-  
-  args += ["--python_out=./target", "--grpc_python_out=./target"] + protos
-  
-  protoc.main(args)
+    f"--proto_path={PROTO_DIR}",
+  ]
 
-  for proto in protos:
-    proto_name = proto.split("/")[-1].split(".")[0]
-    packages += [proto_name + "_pb2", proto_name + "_pb2_grpc"]
+  # Add grpc_tools’ bundled well-known types include path
+  for item in getattr(grpc_tools.__spec__, "submodule_search_locations", []) or []:
+    args.append(f"--proto_path={Path(item) / '_proto'}")
 
-  return packages
+  args += [
+    f"--python_out={TARGET_DIR}",
+    f"--grpc_python_out={TARGET_DIR}",
+    *protos,
+  ]
+
+  # Run generation
+  code = protoc.main(args)
+  if code not in (0, None):
+    raise RuntimeError(f"protoc failed with exit code {code}")
+
+  # Return the generated module names so setuptools can package them
+  modules = []
+  for proto in protos:
+    base = Path(proto).stem
+    modules += [f"{base}_pb2", f"{base}_pb2_grpc"]
+  return modules
 
-  
 to_build = {"ingest_grpc": build_ingest_rpc}
 modules = []
-
 for name, build in to_build.items():
-  result = build(name)
-  modules += result
+  modules += build(name)
 
-setup(name = 'proxima',
-  version = get_version(),
-  description = 'Proxima python bindings',
-  package_dir = {'': "target"},
-  py_modules = modules)
+setup(
+  name="proxima",
+  version=get_version(),
+  description="Proxima python bindings",
+  package_dir={"": "target"},
+  py_modules=modules,
+)