Merge remote-tracking branch 'remotes/origin/main' into in-workflow-util

# Conflicts:
#	tests/worker/test_workflow.py

Author: cretz

.github/workflows/ci.yml

@@ -109,9 +109,8 @@ jobs:
 
   # Runs the sdk features repo tests with this repo's current SDK code
   features-tests:
-    uses: temporalio/features/.github/workflows/python.yaml@uv
+    uses: temporalio/features/.github/workflows/python.yaml@main
     with:
       python-repo-path: ${{github.event.pull_request.head.repo.full_name}}
       version: ${{github.event.pull_request.head.ref}}
       version-is-repo-ref: true
-      features-repo-ref: uv

README.md

@@ -97,7 +97,9 @@ informal introduction to the features and their implementation.
         - [Worker Shutdown](#worker-shutdown)
       - [Testing](#testing-1)
     - [Workflow Replay](#workflow-replay)
-    - [OpenTelemetry Support](#opentelemetry-support)
+    - [Observability](#observability)
+      - [Metrics](#metrics)
+      - [OpenTelemetry Tracing](#opentelemetry-tracing)
     - [Protobuf 3.x vs 4.x](#protobuf-3x-vs-4x)
     - [Known Compatibility Issues](#known-compatibility-issues)
       - [gevent Patching](#gevent-patching)
@@ -1344,10 +1346,30 @@ async def check_past_histories(my_client: Client):
   )
 ```
 
-### OpenTelemetry Support
+### Observability
 
-OpenTelemetry support requires the optional `opentelemetry` dependencies which are part of the `opentelemetry` extra.
-When using `pip`, running
+See https://github.com/temporalio/samples-python/tree/main/open_telemetry for a sample demonstrating collection of
+metrics and tracing data emitted by the SDK.
+
+#### Metrics
+
+The SDK emits various metrics by default: see https://docs.temporal.io/references/sdk-metrics. To configure additional
+attributes to be emitted with all metrics, pass
+[global_tags](https://python.temporal.io/temporalio.runtime.TelemetryConfig.html#global_tags) when creating the
+[TelemetryConfig](https://python.temporal.io/temporalio.runtime.TelemetryConfig.html).
+
+For emitting custom metrics, the SDK makes a metric meter available:
+- In Workflow code, use https://python.temporal.io/temporalio.workflow.html#metric_meter
+- In Activity code, use https://python.temporal.io/temporalio.activity.html#metric_meter
+- In normal application code, use https://python.temporal.io/temporalio.runtime.Runtime.html#metric_meter
+
+The attributes emitted by these default to `namespace`, `task_queue`, and `workflow_type`/`activity_type`; use
+`with_additional_attributes` to create a meter emitting additional attributes.
+
+#### OpenTelemetry Tracing
+
+Tracing support requires the optional `opentelemetry` dependencies which are part of the `opentelemetry` extra. When
+using `pip`, running
 
     pip install 'temporalio[opentelemetry]'
 

scripts/_proto/Dockerfile

@@ -1,14 +1,15 @@
 FROM python:3.10
 
 RUN curl -LsSf https://astral.sh/uv/install.sh | sh
+ENV PATH="$PATH:/root/.local/bin"
 RUN uv tool install poethepoet
 VOLUME ["/api_new", "/bridge_new"]
 
 COPY ./ ./
 
 RUN mkdir -p ./temporalio/api
-RUN uv sync --all-extras
 RUN uv add "protobuf<4"
+RUN uv sync --all-extras
 RUN poe gen-protos
 
 CMD cp -r ./temporalio/api/* /api_new && cp -r ./temporalio/bridge/proto/* /bridge_new

scripts/_proto/Dockerfile.dockerignore

@@ -2,10 +2,12 @@
 .idea/
 .mypy_cache/
 .pytest_cache/
+.ruff_cache/
 .venv/
 build/
 dist/
 temporalio/api/
 temporalio/bridge/**/target/
 temporalio/bridge/**/*.so
-Dockerfile
+Dockerfile
+.python-version

temporalio/activity.py

@@ -116,6 +116,7 @@ class Info:
     workflow_namespace: str
     workflow_run_id: str
     workflow_type: str
+    priority: temporalio.common.Priority
     # TODO(cretz): Consider putting identity on here for "worker_id" for logger?
 
     def _logger_details(self) -> Mapping[str, Any]:

temporalio/api/batch/v1/__init__.py

@@ -5,6 +5,8 @@
     BatchOperationReset,
     BatchOperationSignal,
     BatchOperationTermination,
+    BatchOperationUnpauseActivities,
+    BatchOperationUpdateWorkflowExecutionOptions,
 )
 
 __all__ = [
@@ -14,4 +16,6 @@
     "BatchOperationReset",
     "BatchOperationSignal",
     "BatchOperationTermination",
+    "BatchOperationUnpauseActivities",
+    "BatchOperationUpdateWorkflowExecutionOptions",
 ]

temporalio/api/batch/v1/message_pb2.py

@@ -28,12 +28,15 @@ import builtins
 import sys
 
 import google.protobuf.descriptor
+import google.protobuf.duration_pb2
+import google.protobuf.field_mask_pb2
 import google.protobuf.message
 import google.protobuf.timestamp_pb2
 
 import temporalio.api.common.v1.message_pb2
 import temporalio.api.enums.v1.batch_operation_pb2
 import temporalio.api.enums.v1.reset_pb2
+import temporalio.api.workflow.v1.message_pb2
 
 if sys.version_info >= (3, 8):
     import typing as typing_extensions
@@ -262,3 +265,130 @@ class BatchOperationReset(google.protobuf.message.Message):
     ) -> None: ...
 
 global___BatchOperationReset = BatchOperationReset
+
+class BatchOperationUpdateWorkflowExecutionOptions(google.protobuf.message.Message):
+    """BatchOperationUpdateWorkflowExecutionOptions sends UpdateWorkflowExecutionOptions requests to batch workflows.
+    Keep the parameters in sync with temporalio.api.workflowservice.v1.UpdateWorkflowExecutionOptionsRequest.
+    """
+
+    DESCRIPTOR: google.protobuf.descriptor.Descriptor
+
+    IDENTITY_FIELD_NUMBER: builtins.int
+    WORKFLOW_EXECUTION_OPTIONS_FIELD_NUMBER: builtins.int
+    UPDATE_MASK_FIELD_NUMBER: builtins.int
+    identity: builtins.str
+    """The identity of the worker/client."""
+    @property
+    def workflow_execution_options(
+        self,
+    ) -> temporalio.api.workflow.v1.message_pb2.WorkflowExecutionOptions:
+        """Workflow Execution options. Partial updates are accepted and controlled by update_mask."""
+    @property
+    def update_mask(self) -> google.protobuf.field_mask_pb2.FieldMask:
+        """Controls which fields from `workflow_execution_options` will be applied.
+        To unset a field, set it to null and use the update mask to indicate that it should be mutated.
+        """
+    def __init__(
+        self,
+        *,
+        identity: builtins.str = ...,
+        workflow_execution_options: temporalio.api.workflow.v1.message_pb2.WorkflowExecutionOptions
+        | None = ...,
+        update_mask: google.protobuf.field_mask_pb2.FieldMask | None = ...,
+    ) -> None: ...
+    def HasField(
+        self,
+        field_name: typing_extensions.Literal[
+            "update_mask",
+            b"update_mask",
+            "workflow_execution_options",
+            b"workflow_execution_options",
+        ],
+    ) -> builtins.bool: ...
+    def ClearField(
+        self,
+        field_name: typing_extensions.Literal[
+            "identity",
+            b"identity",
+            "update_mask",
+            b"update_mask",
+            "workflow_execution_options",
+            b"workflow_execution_options",
+        ],
+    ) -> None: ...
+
+global___BatchOperationUpdateWorkflowExecutionOptions = (
+    BatchOperationUpdateWorkflowExecutionOptions
+)
+
+class BatchOperationUnpauseActivities(google.protobuf.message.Message):
+    """BatchOperationUnpauseActivities sends unpause requests to batch workflows."""
+
+    DESCRIPTOR: google.protobuf.descriptor.Descriptor
+
+    IDENTITY_FIELD_NUMBER: builtins.int
+    TYPE_FIELD_NUMBER: builtins.int
+    MATCH_ALL_FIELD_NUMBER: builtins.int
+    RESET_ATTEMPTS_FIELD_NUMBER: builtins.int
+    RESET_HEARTBEAT_FIELD_NUMBER: builtins.int
+    JITTER_FIELD_NUMBER: builtins.int
+    identity: builtins.str
+    """The identity of the worker/client."""
+    type: builtins.str
+    match_all: builtins.bool
+    reset_attempts: builtins.bool
+    """Providing this flag will also reset the number of attempts."""
+    reset_heartbeat: builtins.bool
+    """Providing this flag will also reset the heartbeat details."""
+    @property
+    def jitter(self) -> google.protobuf.duration_pb2.Duration:
+        """If set, the activity will start at a random time within the specified jitter
+        duration, introducing variability to the start time.
+        """
+    def __init__(
+        self,
+        *,
+        identity: builtins.str = ...,
+        type: builtins.str = ...,
+        match_all: builtins.bool = ...,
+        reset_attempts: builtins.bool = ...,
+        reset_heartbeat: builtins.bool = ...,
+        jitter: google.protobuf.duration_pb2.Duration | None = ...,
+    ) -> None: ...
+    def HasField(
+        self,
+        field_name: typing_extensions.Literal[
+            "activity",
+            b"activity",
+            "jitter",
+            b"jitter",
+            "match_all",
+            b"match_all",
+            "type",
+            b"type",
+        ],
+    ) -> builtins.bool: ...
+    def ClearField(
+        self,
+        field_name: typing_extensions.Literal[
+            "activity",
+            b"activity",
+            "identity",
+            b"identity",
+            "jitter",
+            b"jitter",
+            "match_all",
+            b"match_all",
+            "reset_attempts",
+            b"reset_attempts",
+            "reset_heartbeat",
+            b"reset_heartbeat",
+            "type",
+            b"type",
+        ],
+    ) -> None: ...
+    def WhichOneof(
+        self, oneof_group: typing_extensions.Literal["activity", b"activity"]
+    ) -> typing_extensions.Literal["type", "match_all"] | None: ...
+
+global___BatchOperationUnpauseActivities = BatchOperationUnpauseActivities