Merge branch 'main' into otel/context-detach

Author: VegetarianOrc

README.md

@@ -1676,8 +1676,8 @@ worker = Worker(
 ### Workflow Replay
 
 Given a workflow's history, it can be replayed locally to check for things like non-determinism errors. For example,
-assuming `history_str` is populated with a JSON string history either exported from the web UI or from `tctl`, the
-following function will replay it:
+assuming `history_str` is populated with a JSON string history either exported from the web UI or from the 
+`Temporal CLI`, the following function will replay it:
 
 ```python
 from temporalio.client import WorkflowHistory

scripts/gen_protos.py

@@ -42,6 +42,10 @@
     partial(
         re.compile(r"from temporal\.sdk\.core\.").sub, r"from temporalio.bridge.proto."
     ),
+    partial(
+        re.compile(r"'__module__' : 'temporal\.api\.").sub,
+        r"'__module__' : 'temporalio.api.",
+    ),
 ]
 
 pyi_fixes = [
@@ -60,7 +64,6 @@ def fix_generated_output(base_path: Path):
     - protoc doesn't generate the correct import paths
         (https://github.com/protocolbuffers/protobuf/issues/1491)
     """
-
     imports: Mapping[str, List[str]] = collections.defaultdict(list)
     for p in base_path.iterdir():
         if p.is_dir():