Merge branch 'main' into amazzeo/temporal-nexus-operation-handler-saa

Author: VegetarianOrc

.gitattributes

@@ -0,0 +1 @@
+CHANGELOG.md merge=union

CHANGELOG.md

@@ -0,0 +1,20 @@
+<!--
+High-level release notes.
+Loosely based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
+
+When your PR includes a user-facing change, add an entry below under the
+appropriate heading (create the heading if it does not yet exist). Within
+each heading content can be free-form. Feel free to include examples, links
+to docs, or any other relevant information.
+
+### Added            — new features
+### Changed          — changes in existing functionality
+### Deprecated       — soon-to-be-removed features
+### Breaking Changes — removed or backwards-incompatible features
+### Fixed            — notable bug fixes
+### Security         — notable security fixes
+-->
+
+# Changelog
+
+## [Unreleased]

CONTRIBUTING.md

@@ -0,0 +1,21 @@
+# Contributing to the Temporal Python SDK
+
+Thanks for your interest in contributing!
+
+All contributors must complete the Temporal Contributor License Agreement (CLA) before changes
+can be merged. A link to the CLA will be posted in the PR.
+
+See the [README](README.md) for build and development instructions.
+
+## Changelog
+
+User-facing changes are recorded in [`CHANGELOG.md`](CHANGELOG.md), loosely following the
+[Keep a Changelog](https://keepachangelog.com/en/1.1.0/) format.
+
+If your PR includes a user-facing change (new feature, behavior change, deprecation, breaking
+change, notable bug fix, or security fix), add a short, high-level entry to the `## [Unreleased]`
+section at the top of `CHANGELOG.md` under the appropriate heading, creating it if needed:
+Added, Changed, Deprecated, Breaking Changes, Fixed, or Security.
+
+Keep entries high-level and written for users. The full commit log is appended at release time,
+so internal-only changes (refactors, tests, CI, docs) don't need an entry.

scripts/gen_protos.py

@@ -43,6 +43,10 @@
         re.compile(r"from protoc_gen_openapiv2\.").sub,
         r"from temporalio.api.dependencies.protoc_gen_openapiv2.",
     ),
+    partial(
+        re.compile(r"from nexusannotations\.").sub,
+        r"from temporalio.api.dependencies.nexusannotations.",
+    ),
     partial(
         re.compile(r"from temporal\.sdk\.core\.").sub, r"from temporalio.bridge.proto."
     ),
@@ -58,6 +62,10 @@
         re.compile(r"protoc_gen_openapiv2\.").sub,
         r"temporalio.api.dependencies.protoc_gen_openapiv2.",
     ),
+    partial(
+        re.compile(r"nexusannotations\.").sub,
+        r"temporalio.api.dependencies.nexusannotations.",
+    ),
     partial(re.compile(r"temporal\.sdk\.core\.").sub, r"temporalio.bridge.proto."),
 ]
 
@@ -191,11 +199,12 @@ def generate_protos(output_dir: Path):
             grpc_file.unlink()
     # Apply fixes before moving code
     fix_generated_output(output_dir)
-    # Move openapiv2 dependency protos
+    # Move dependency protos
     deps_out_dir = api_out_dir / "dependencies"
-    shutil.rmtree(deps_out_dir / "protoc_gen_openapiv2", ignore_errors=True)
     deps_out_dir.mkdir(exist_ok=True)
-    (output_dir / "protoc_gen_openapiv2").replace(deps_out_dir / "protoc_gen_openapiv2")
+    for dep in ["protoc_gen_openapiv2", "nexusannotations"]:
+        shutil.rmtree(deps_out_dir / dep, ignore_errors=True)
+        (output_dir / dep).replace(deps_out_dir / dep)
     (deps_out_dir / "__init__.py").touch()
     # Move protos
     for p in (output_dir / "temporal" / "api").iterdir():

temporalio/api/activity/v1/message_pb2.py

@@ -207,6 +207,9 @@ class ActivityExecutionInfo(google.protobuf.message.Message):
     CANCELED_REASON_FIELD_NUMBER: builtins.int
     LINKS_FIELD_NUMBER: builtins.int
     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
@@ -251,7 +254,9 @@ class ActivityExecutionInfo(google.protobuf.message.Message):
         """The retry policy for the activity. Will never exceed `schedule_to_close_timeout`."""
     @property
     def heartbeat_details(self) -> temporalio.api.common.v1.message_pb2.Payloads:
-        """Details provided in the last recorded activity heartbeat."""
+        """Details provided in the last recorded activity heartbeat.
+        DescribeActivityExecution does not set this field unless include_heartbeat_details was true in the request.
+        """
     @property
     def last_heartbeat_time(self) -> google.protobuf.timestamp_pb2.Timestamp:
         """Time the last heartbeat was recorded."""
@@ -274,7 +279,9 @@ class ActivityExecutionInfo(google.protobuf.message.Message):
         """Time when the activity transitioned to a closed state."""
     @property
     def last_failure(self) -> temporalio.api.failure.v1.message_pb2.Failure:
-        """Failure details from the last failed attempt."""
+        """Failure details from the last failed attempt.
+        DescribeActivityExecution does not set this field unless include_last_failure was true in the request.
+        """
     last_worker_identity: builtins.str
     @property
     def current_retry_interval(self) -> google.protobuf.duration_pb2.Duration:
@@ -327,6 +334,17 @@ class ActivityExecutionInfo(google.protobuf.message.Message):
         """Links to related entities, such as the entity that started this activity."""
     total_heartbeat_count: builtins.int
     """Total number of heartbeats recorded across all attempts of this activity, including retries."""
+    sdk_name: builtins.str
+    """The name of the SDK of the worker that most recently picked up an attempt of this activity.
+    Overwritten on each new attempt. Empty if unknown.
+    """
+    sdk_version: builtins.str
+    """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,
         *,
@@ -370,6 +388,9 @@ class ActivityExecutionInfo(google.protobuf.message.Message):
         links: collections.abc.Iterable[temporalio.api.common.v1.message_pb2.Link]
         | None = ...,
         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,
@@ -414,6 +435,8 @@ class ActivityExecutionInfo(google.protobuf.message.Message):
             b"schedule_to_start_timeout",
             "search_attributes",
             b"search_attributes",
+            "start_delay",
+            b"start_delay",
             "start_to_close_timeout",
             b"start_to_close_timeout",
             "user_metadata",
@@ -475,8 +498,14 @@ class ActivityExecutionInfo(google.protobuf.message.Message):
             b"schedule_to_close_timeout",
             "schedule_to_start_timeout",
             b"schedule_to_start_timeout",
+            "sdk_name",
+            b"sdk_name",
+            "sdk_version",
+            b"sdk_version",
             "search_attributes",
             b"search_attributes",
+            "start_delay",
+            b"start_delay",
             "start_to_close_timeout",
             b"start_to_close_timeout",
             "state_size_bytes",