merges main@upstream

Author: romank0

.github/workflows/build-binaries.yml

@@ -4,7 +4,6 @@ on:
     branches:
       - main
       - "releases/*"
-      - fix-build-binaries
 
 jobs:
   # Compile the binaries and upload artifacts
@@ -20,7 +19,7 @@ jobs:
             runsOn: ubuntu-24.04-arm64-2-core
           - os: macos-intel
             package-suffix: macos-amd64
-            runsOn: macos-13
+            runsOn: macos-15-intel
           - os: macos-arm
             package-suffix: macos-aarch64
             runsOn: macos-14
@@ -66,7 +65,7 @@ jobs:
           if [ "$RUNNER_OS" = "Windows" ]; then
             bindir=Scripts
           fi
-          ./.venv/$bindir/pip install 'protobuf>=3.20,<6' 'types-protobuf>=3.20,<6' 'typing-extensions>=4.2.0,<5' pytest pytest_asyncio grpcio 'nexus-rpc>=1.1.0' pydantic opentelemetry-api opentelemetry-sdk python-dateutil 'openai-agents>=0.2.3,<=0.2.9'
+          ./.venv/$bindir/pip install 'protobuf>=3.20,<6' 'types-protobuf>=3.20,<6' 'typing-extensions>=4.2.0,<5' pytest pytest_asyncio grpcio 'nexus-rpc>=1.1.0' pydantic opentelemetry-api opentelemetry-sdk python-dateutil 'openai-agents>=0.2.3,<=0.2.9' 'googleapis-common-protos==1.70.0'
           ./.venv/$bindir/pip install --no-index --find-links=../dist temporalio
           ./.venv/$bindir/python -m pytest -s -k test_workflow_hello
 

.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-13
-          # 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"
+            runsOn: macos-15-intel
           - 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,11 +98,10 @@ 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
-          poe format
           [[ -z $(git status --porcelain temporalio) ]] || (git diff temporalio; echo "Protos changed"; exit 1)
           poe test -s
         timeout-minutes: 10
@@ -148,6 +132,8 @@ jobs:
         with:
           submodules: recursive
       - uses: dtolnay/rust-toolchain@stable
+        with:
+          components: "clippy"
       - uses: Swatinem/rust-cache@v2
         with:
           workspaces: temporalio/bridge -> target

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,32 +3,33 @@ name = "temporalio"
 version = "1.18.1"
 description = "Temporal.io Python SDK"
 authors = [{ name = "Temporal Technologies Inc", email = "sdk@temporal.io" }]
-requires-python = ">=3.9"
+requires-python = ">=3.10"
 readme = "README.md"
 license = { file = "LICENSE" }
-keywords = [
-    "temporal",
-    "workflow",
-]
+keywords = ["temporal", "workflow"]
 dependencies = [
-    "nexus-rpc==1.1.0",
-    "protobuf>=3.20,<7.0.0",
-    "python-dateutil>=2.8.2,<3 ; python_version < '3.11'",
-    "types-protobuf>=3.20",
-    "typing-extensions>=4.2.0,<5",
+  "nexus-rpc==1.1.0",
+  "protobuf>=3.20,<7.0.0",
+  "python-dateutil>=2.8.2,<3 ; python_version < '3.11'",
+  "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",
-]
+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'",
+  "openai-agents>=0.3,<0.4",
+  "mcp>=1.9.4, <2",
 ]
 
 [project.urls]
@@ -39,48 +40,63 @@ Documentation = "https://docs.temporal.io/docs/python"
 
 [dependency-groups]
 dev = [
-    "cibuildwheel>=2.22.0,<3",
-    "grpcio-tools>=1.48.2,<2",
-    "mypy==1.4.1",
-    "mypy-protobuf>=3.3.0,<4",
-    "psutil>=5.9.3,<6",
-    "pydocstyle>=6.3.0,<7",
-    "pydoctor>=24.11.1,<25",
-    "pyright==1.1.403",
-    "pytest~=7.4",
-    "pytest-asyncio>=0.21,<0.22",
-    "pytest-timeout~=2.2",
-    "ruff>=0.5.0,<0.6",
-    "toml>=0.10.2,<0.11",
-    "twine>=4.0.1,<5",
-    "ruff>=0.5.0,<0.6",
-    "maturin>=1.8.2",
-    "pytest-cov>=6.1.1",
-    "httpx>=0.28.1",
-    "pytest-pretty>=1.3.0",
-    "openai-agents[litellm]>=0.3,<0.4"
+  "cibuildwheel>=2.22.0,<3",
+  "grpcio-tools>=1.48.2,<2",
+  "mypy==1.18.2",
+  "mypy-protobuf>=3.3.0,<4",
+  "psutil>=5.9.3,<6",
+  "pydocstyle>=6.3.0,<7",
+  "pydoctor>=24.11.1,<25",
+  "pyright==1.1.403",
+  "pytest~=7.4",
+  "pytest-asyncio>=0.21,<0.22",
+  "pytest-timeout~=2.2",
+  "ruff>=0.5.0,<0.6",
+  "toml>=0.10.2,<0.11",
+  "twine>=4.0.1,<5",
+  "maturin>=1.8.2",
+  "pytest-cov>=6.1.1",
+  "httpx>=0.28.1",
+  "pytest-pretty>=1.3.0",
+  "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",
 ]
 
 [tool.poe.tasks]
 build-develop = "uv run maturin develop --uv"
 build-develop-with-release = { cmd = "uv run maturin develop --release --uv" }
-format = [{cmd = "uv run ruff check --select I --fix"}, {cmd = "uv run ruff format"}, ]
+format = [
+  { cmd = "uv run ruff check --select I --fix" },
+  { cmd = "uv run ruff format" },
+  { cmd = "cargo fmt", cwd = "temporalio/bridge" },
+]
 gen-docs = "uv run scripts/gen_docs.py"
-gen-protos = "uv run scripts/gen_protos.py"
-gen-protos-docker = "uv run scripts/gen_protos_docker.py"
+gen-protos = [
+  { cmd = "uv run scripts/gen_protos.py" },
+  { cmd = "uv run scripts/gen_payload_visitor.py" },
+  { cmd = "uv run scripts/gen_bridge_client.py" },
+  { ref = "format" },
+]
+gen-protos-docker = [
+  { cmd = "uv run scripts/gen_protos_docker.py" },
+  { cmd = "uv run scripts/gen_payload_visitor.py" },
+  { cmd = "uv run scripts/gen_bridge_client.py" },
+  { ref = "format" },
+]
 lint = [
-  {cmd = "uv run ruff check --select I"},
-  {cmd = "uv run ruff format --check"},
-  {ref = "lint-types"},
-  {ref = "lint-docs"},
+  { cmd = "uv run ruff check --select I" },
+  { cmd = "uv run ruff format --check" },
+  { ref = "lint-types" },
+  { ref = "lint-docs" },
 ]
 bridge-lint = { cmd = "cargo clippy -- -D warnings", cwd = "temporalio/bridge" }
 # TODO(cretz): Why does pydocstyle complain about @overload missing docs after
 # https://github.com/PyCQA/pydocstyle/pull/511?
 lint-docs = "uv run pydocstyle --ignore-decorators=overload"
 lint-types = [
-  { cmd = "uv run pyright"},
-  { cmd = "uv run mypy --namespace-packages --check-untyped-defs ."},
+  { cmd = "uv run pyright" },
+  { cmd = "uv run mypy --namespace-packages --check-untyped-defs ." },
 ]
 run-bench = "uv run python scripts/run_bench.py"
 test = "uv run pytest"
@@ -104,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]
@@ -120,7 +136,7 @@ ignore_missing_imports = true
 exclude = [
   # Ignore generated code
   'temporalio/api',
-  'temporalio/bridge/proto'
+  'temporalio/bridge/proto',
 ]
 
 [tool.pydocstyle]
@@ -130,7 +146,8 @@ match_dir = "^(?!(docs|scripts|tests|api|proto|\\.)).*"
 add_ignore = [
   # We like to wrap at a certain number of chars, even long summary sentences.
   # https://github.com/PyCQA/pydocstyle/issues/184
-  "D205", "D415"
+  "D205",
+  "D415",
 ]
 
 [tool.pydoctor]
@@ -226,9 +243,7 @@ manifest-path = "temporalio/bridge/Cargo.toml"
 module-name = "temporalio.bridge.temporal_sdk_bridge"
 python-packages = ["temporalio"]
 include = ["LICENSE"]
-exclude = [
-    "temporalio/bridge/target/**/*",
-]
+exclude = ["temporalio/bridge/target/**/*"]
 
 [tool.uv]
 # Prevent uv commands from building the package by default

scripts/_proto/Dockerfile

@@ -10,6 +10,6 @@ COPY ./ ./
 RUN mkdir -p ./temporalio/api
 RUN uv add "protobuf<4"
 RUN uv sync --all-extras
-RUN poe gen-protos
+RUN uv run scripts/gen_protos.py
 
 CMD ["sh", "-c", "cp -r ./temporalio/api/* /api_new && cp -r ./temporalio/bridge/proto/* /bridge_new"]