Merge branch 'main' into ntk/1160-modify-doc-comment-for-worker-build_id

Author: ntaylorkhan

.github/workflows/ci.yml

@@ -16,39 +16,24 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python: ["3.9", "3.13"]
+        python: ["3.10", "3.14"]
         os: [ubuntu-latest, ubuntu-arm, macos-intel, macos-arm, windows-latest]
         include:
-          # On 3.9 there is a problem with import errors caused by pytests' loader that surface due
-          # to a bug in CPython (https://github.com/python/cpython/issues/91351), so we avoid using
-          # the assert rewriter.
-          - python: "3.9"
-            pytestExtraArgs: "--assert=plain"
           - os: ubuntu-latest
-            python: "3.13"
+            python: "3.14"
             docsTarget: true
             cloudTestTarget: true
             openaiTestTarget: true
             clippyLinter: true
           - os: ubuntu-latest
-            python: "3.9"
+            python: "3.10"
             protoCheckTarget: true
           - os: ubuntu-arm
             runsOn: ubuntu-24.04-arm64-2-core
           - os: macos-intel
             runsOn: macos-15-intel
-          # On 3.13.3 there is some issue with macOS intel where it hangs after pytest with some
-          # test that may have a worker that cannot properly shutdown, but it does not occur on
-          # other versions, platforms, etc. See https://github.com/temporalio/sdk-python/issues/834.
-          - os: macos-intel
-            python: "3.13"
-            pythonOverride: "3.13.2"
           - os: macos-arm
             runsOn: macos-latest
-          # On 3.13.5, python3.lib is missing for the linker
-          - os: windows-latest
-            python: "3.13"
-            pythonOverride: "3.13.4"
     runs-on: ${{ matrix.runsOn || matrix.os }}
     steps:
       - uses: actions/checkout@v4
@@ -113,7 +98,7 @@ jobs:
         env:
           TEMPORAL_TEST_PROTO3: 1
         run: |
-          uv add --python 3.9 "protobuf<4"
+          uv add --python 3.10 "protobuf<4"
           uv sync --all-extras
           poe build-develop
           poe gen-protos

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

pyproject.toml

@@ -3,7 +3,7 @@ name = "temporalio"
 version = "1.18.1"
 description = "Temporal.io Python SDK"
 authors = [{ name = "Temporal Technologies Inc", email = "[email protected]" }]
-requires-python = ">=3.9"
+requires-python = ">=3.10"
 readme = "README.md"
 license = { file = "LICENSE" }
 keywords = ["temporal", "workflow"]
@@ -14,15 +14,22 @@ dependencies = [
   "types-protobuf>=3.20",
   "typing-extensions>=4.2.0,<5",
 ]
+classifiers = [
+  "License :: OSI Approved :: MIT License",
+  "Programming Language :: Python :: 3.10",
+  "Programming Language :: Python :: 3.11",
+  "Programming Language :: Python :: 3.12",
+  "Programming Language :: Python :: 3.13",
+  "Programming Language :: Python :: 3.14",
+]
 
 [project.optional-dependencies]
 grpc = ["grpcio>=1.48.2,<2"]
 opentelemetry = ["opentelemetry-api>=1.11.1,<2", "opentelemetry-sdk>=1.11.1,<2"]
 pydantic = ["pydantic>=2.0.0,<3"]
 openai-agents = [
   "openai-agents>=0.3,<0.4",
-  "eval-type-backport>=0.2.2; python_version < '3.10'",
-  "mcp>=1.9.4, <2; python_version >= '3.10'",
+  "mcp>=1.9.4, <2",
 ]
 
 [project.urls]
@@ -35,7 +42,7 @@ Documentation = "https://docs.temporal.io/docs/python"
 dev = [
   "cibuildwheel>=2.22.0,<3",
   "grpcio-tools>=1.48.2,<2",
-  "mypy==1.4.1",
+  "mypy==1.18.2",
   "mypy-protobuf>=3.3.0,<4",
   "psutil>=5.9.3,<6",
   "pydocstyle>=6.3.0,<7",
@@ -51,7 +58,8 @@ dev = [
   "pytest-cov>=6.1.1",
   "httpx>=0.28.1",
   "pytest-pretty>=1.3.0",
-  "openai-agents[litellm]>=0.3,<0.4",
+  "openai-agents>=0.3,<0.4; python_version >= '3.14'",
+  "openai-agents[litellm]>=0.3,<0.4; python_version < '3.14'",
   "googleapis-common-protos==1.70.0",
 ]
 
@@ -112,7 +120,7 @@ filterwarnings = [
 
 [tool.cibuildwheel]
 before-all = "pip install protoc-wheel-0"
-build = "cp39-win_amd64 cp39-manylinux_x86_64 cp39-manylinux_aarch64 cp39-macosx_x86_64 cp39-macosx_arm64"
+build = "cp310-win_amd64 cp310-manylinux_x86_64 cp310-manylinux_aarch64 cp310-macosx_x86_64 cp310-macosx_arm64"
 build-verbosity = 1
 
 [tool.cibuildwheel.macos]

temporalio/bridge/Cargo.toml

@@ -22,7 +22,7 @@ futures = "0.3"
 prost = "0.13"
 pyo3 = { version = "0.25", features = [
     "extension-module",
-    "abi3-py39",
+    "abi3-py310",
     "anyhow",
     "multiple-pymethods",
 ] }

temporalio/client.py

@@ -942,7 +942,7 @@ async def execute_update_with_start_workflow(
             MultiParamSpec, LocalReturnType
         ],
         *,
-        args: MultiParamSpec.args,  # pyright: ignore
+        args: MultiParamSpec.args,  # type: ignore
         start_workflow_operation: WithStartWorkflowOperation[SelfType, Any],
         id: Optional[str] = None,
         rpc_metadata: Mapping[str, Union[str, bytes]] = {},
@@ -1061,7 +1061,7 @@ async def start_update_with_start_workflow(
             MultiParamSpec, LocalReturnType
         ],
         *,
-        args: MultiParamSpec.args,  # pyright: ignore
+        args: MultiParamSpec.args,  # type: ignore
         start_workflow_operation: WithStartWorkflowOperation[SelfType, Any],
         wait_for_stage: WorkflowUpdateStage,
         id: Optional[str] = None,
@@ -2252,7 +2252,7 @@ async def execute_update(
             MultiParamSpec, LocalReturnType
         ],
         *,
-        args: MultiParamSpec.args,  # pyright: ignore
+        args: MultiParamSpec.args,  # type: ignore
         id: Optional[str] = None,
         rpc_metadata: Mapping[str, Union[str, bytes]] = {},
         rpc_timeout: Optional[timedelta] = None,
@@ -2353,7 +2353,7 @@ async def start_update(
             MultiParamSpec, LocalReturnType
         ],
         *,
-        args: MultiParamSpec.args,  # pyright: ignore
+        args: MultiParamSpec.args,  # type: ignore
         wait_for_stage: WorkflowUpdateStage,
         id: Optional[str] = None,
         rpc_metadata: Mapping[str, Union[str, bytes]] = {},
@@ -3355,7 +3355,7 @@ def from_json(
     ) -> WorkflowHistory:
         """Construct a WorkflowHistory from an ID and a json dump of history.
 
-        This is built to work both with Temporal UI/tctl JSON as well as
+        This is built to work both with Temporal UI/CLI JSON as well as
         :py:meth:`to_json` even though they are slightly different.
 
         Args:

temporalio/contrib/openai_agents/__init__.py

@@ -8,15 +8,10 @@
     Use with caution in production environments.
 """
 
-# Best Effort mcp, as it is not supported on Python 3.9
-try:
-    from temporalio.contrib.openai_agents._mcp import (
-        StatefulMCPServerProvider,
-        StatelessMCPServerProvider,
-    )
-except ImportError:
-    pass
-
+from temporalio.contrib.openai_agents._mcp import (
+    StatefulMCPServerProvider,
+    StatelessMCPServerProvider,
+)
 from temporalio.contrib.openai_agents._model_parameters import ModelActivityParameters
 from temporalio.contrib.openai_agents._temporal_openai_agents import (
     OpenAIAgentsPlugin,

temporalio/contrib/openai_agents/_temporal_openai_agents.py

@@ -47,12 +47,6 @@
 from temporalio.worker import WorkflowRunner
 from temporalio.worker.workflow_sandbox import SandboxedWorkflowRunner
 
-# Unsupported on python 3.9
-try:
-    from agents.mcp import MCPServer
-except ImportError:
-    pass
-
 if typing.TYPE_CHECKING:
     from temporalio.contrib.openai_agents import (
         StatefulMCPServerProvider,

temporalio/contrib/opentelemetry.py

@@ -292,6 +292,30 @@ async def start_workflow_update(
         ):
             return await super().start_workflow_update(input)
 
+    async def start_update_with_start_workflow(
+        self, input: temporalio.client.StartWorkflowUpdateWithStartInput
+    ) -> temporalio.client.WorkflowUpdateHandle[Any]:
+        attrs = {
+            "temporalWorkflowID": input.start_workflow_input.id,
+        }
+        if input.update_workflow_input.update_id is not None:
+            attrs["temporalUpdateID"] = input.update_workflow_input.update_id
+
+        with self.root._start_as_current_span(
+            f"StartUpdateWithStartWorkflow:{input.start_workflow_input.workflow}",
+            attributes=attrs,
+            input=input.start_workflow_input,
+            kind=opentelemetry.trace.SpanKind.CLIENT,
+        ):
+            otel_header = input.start_workflow_input.headers.get(self.root.header_key)
+            if otel_header:
+                input.update_workflow_input.headers = {
+                    **input.update_workflow_input.headers,
+                    self.root.header_key: otel_header,
+                }
+
+            return await super().start_update_with_start_workflow(input)
+
 
 class _TracingActivityInboundInterceptor(temporalio.worker.ActivityInboundInterceptor):
     def __init__(

temporalio/worker/_replayer.py

@@ -112,7 +112,7 @@ async def replay_workflow(
         Args:
             history: The history to replay. Can be fetched directly, or use
                 :py:meth:`temporalio.client.WorkflowHistory.from_json` to parse
-                a history downloaded via ``tctl`` or the web UI.
+                a history downloaded via ``Temporal CLI`` or the web UI.
             raise_on_replay_failure: If ``True`` (the default), this will raise
                 a :py:attr:`WorkflowReplayResult.replay_failure` if it is
                 present.

temporalio/worker/_workflow_instance.py

@@ -45,7 +45,7 @@
 
 import nexusrpc.handler
 from nexusrpc import InputT, OutputT
-from typing_extensions import Self, TypeAlias, TypedDict
+from typing_extensions import Self, TypeAlias, TypedDict, TypeVarTuple, Unpack
 
 import temporalio.activity
 import temporalio.api.common.v1
@@ -2603,10 +2603,12 @@ def _timer_handle_cancelled(self, handle: asyncio.TimerHandle) -> None:
             return
         handle._apply_cancel_command(self._add_command())
 
+    _Ts = TypeVarTuple("_Ts")
+
     def call_soon(
         self,
-        callback: Callable[..., Any],
-        *args: Any,
+        callback: Callable[[Unpack[_Ts]], object],
+        *args: Unpack[_Ts],
         context: Optional[contextvars.Context] = None,
     ) -> asyncio.Handle:
         # We need to allow this during delete because this is how tasks schedule
@@ -2619,8 +2621,8 @@ def call_soon(
     def call_later(
         self,
         delay: float,
-        callback: Callable[..., Any],
-        *args: Any,
+        callback: Callable[[Unpack[_Ts]], object],
+        *args: Unpack[_Ts],
         context: Optional[contextvars.Context] = None,
     ) -> asyncio.TimerHandle:
         options = _TimerOptionsCtxVar.get()
@@ -2629,8 +2631,8 @@ def call_later(
     def call_at(
         self,
         when: float,
-        callback: Callable[..., Any],
-        *args: Any,
+        callback: Callable[[Unpack[_Ts]], object],
+        *args: Unpack[_Ts],
         context: Optional[contextvars.Context] = None,
     ) -> asyncio.TimerHandle:
         # We usually would not support fixed-future-time call (and we didn't