Proto regen

Author: Sushisource

scripts/gen_protos.py

@@ -54,6 +54,10 @@
         re.compile(r"'__module__' : 'temporal\.api\.").sub,
         r"'__module__' : 'temporalio.api.",
     ),
+    partial(
+        re.compile(r"'__module__' : 'nexusannotations\.").sub,
+        r"'__module__' : 'temporalio.api.dependencies.nexusannotations.",
+    ),
 ]
 
 pyi_fixes = [
@@ -201,10 +205,11 @@ def generate_protos(output_dir: Path):
     fix_generated_output(output_dir)
     # Move dependency protos
     deps_out_dir = api_out_dir / "dependencies"
+    shutil.rmtree(deps_out_dir / "protoc_gen_openapiv2", ignore_errors=True)
+    shutil.rmtree(deps_out_dir / "nexusannotations", ignore_errors=True)
     deps_out_dir.mkdir(exist_ok=True)
-    for dep in ["protoc_gen_openapiv2", "nexusannotations"]:
-        shutil.rmtree(deps_out_dir / dep, ignore_errors=True)
-        (output_dir / dep).replace(deps_out_dir / dep)
+    (output_dir / "protoc_gen_openapiv2").replace(deps_out_dir / "protoc_gen_openapiv2")
+    (output_dir / "nexusannotations").replace(deps_out_dir / "nexusannotations")
     (deps_out_dir / "__init__.py").touch()
     # Move protos
     for p in (output_dir / "temporal" / "api").iterdir():

scripts/gen_protos_docker.py

@@ -17,16 +17,28 @@
 )
 image_id = result.stdout.strip()
 
-subprocess.run(
+docker_run_command = [
+    "docker",
+    "run",
+    "--rm",
+]
+
+getuid = getattr(os, "getuid", None)
+getgid = getattr(os, "getgid", None)
+if callable(getuid) and callable(getgid):
+    docker_run_command.extend(["--user", f"{getuid()}:{getgid()}"])
+
+docker_run_command.extend(
     [
-        "docker",
-        "run",
-        "--rm",
         "-v",
         os.path.join(os.getcwd(), "temporalio", "api") + ":/api_new",
         "-v",
         os.path.join(os.getcwd(), "temporalio", "bridge", "proto") + ":/bridge_new",
         image_id,
-    ],
+    ]
+)
+
+subprocess.run(
+    docker_run_command,
     check=True,
 )

temporalio/api/activity/v1/message_pb2.py

@@ -209,7 +209,6 @@ class ActivityExecutionInfo(google.protobuf.message.Message):
     TOTAL_HEARTBEAT_COUNT_FIELD_NUMBER: builtins.int
     SDK_NAME_FIELD_NUMBER: builtins.int
     SDK_VERSION_FIELD_NUMBER: builtins.int
-    START_DELAY_FIELD_NUMBER: builtins.int
     activity_id: builtins.str
     """Unique identifier of this activity within its namespace along with run ID (below)."""
     run_id: builtins.str
@@ -342,9 +341,6 @@ class ActivityExecutionInfo(google.protobuf.message.Message):
     """The version of the SDK of the worker that most recently picked up an attempt of this activity.
     Overwritten on each new attempt. Empty if unknown.
     """
-    @property
-    def start_delay(self) -> google.protobuf.duration_pb2.Duration:
-        """Time to wait before dispatching the first activity task. This delay is not applied to retry attempts."""
     def __init__(
         self,
         *,
@@ -390,7 +386,6 @@ class ActivityExecutionInfo(google.protobuf.message.Message):
         total_heartbeat_count: builtins.int = ...,
         sdk_name: builtins.str = ...,
         sdk_version: builtins.str = ...,
-        start_delay: google.protobuf.duration_pb2.Duration | None = ...,
     ) -> None: ...
     def HasField(
         self,