Skip to content

Commit c6a0728

Browse files
authored
Merge branch 'main' into fix-swallowed-cancel
2 parents 935ae61 + 85dde16 commit c6a0728

134 files changed

Lines changed: 15200 additions & 1783 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/CODEOWNERS

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,16 @@
33
# @temporalio/sdk will be requested for review when
44
# someone opens a pull request.
55
* @temporalio/sdk
6+
7+
8+
# Below are owners for modules in the temporalio/contrib/
9+
# and tests/contrib/ directories that are owned by teams
10+
# other than the SDK team. For each one, we add the owning team,
11+
# as well as @temporalio/sdk, so the SDK team can continue to
12+
# manage repo-wide concerns.
13+
/temporalio/contrib/google_adk_agents/ @temporalio/ai-sdk @temporalio/sdk
14+
/temporalio/contrib/langsmith/ @temporalio/ai-sdk @temporalio/sdk
15+
/temporalio/contrib/openai_agents/ @temporalio/ai-sdk @temporalio/sdk
16+
/tests/contrib/google_adk_agents/ @temporalio/ai-sdk @temporalio/sdk
17+
/tests/contrib/langsmith/ @temporalio/ai-sdk @temporalio/sdk
18+
/tests/contrib/openai_agents/ @temporalio/ai-sdk @temporalio/sdk

.gitmodules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[submodule "sdk-core"]
22
path = temporalio/bridge/sdk-core
3-
url = https://github.com/temporalio/sdk-core.git
3+
url = https://github.com/temporalio/sdk-rust.git

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1937,7 +1937,7 @@ users are encouraged to not use gevent in asyncio applications (including Tempor
19371937
# Development
19381938

19391939
The Python SDK is built to work with Python 3.9 and newer. It is built using
1940-
[SDK Core](https://github.com/temporalio/sdk-core/) which is written in Rust.
1940+
[SDK Core](https://github.com/temporalio/sdk-rust/) which is written in Rust.
19411941

19421942
### Building
19431943

pyproject.toml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[project]
22
name = "temporalio"
3-
version = "1.26.0"
3+
version = "1.27.0"
44
description = "Temporal.io Python SDK"
55
authors = [{ name = "Temporal Technologies Inc", email = "sdk@temporal.io" }]
66
requires-python = ">=3.10"
@@ -30,6 +30,7 @@ opentelemetry = ["opentelemetry-api>=1.11.1,<2", "opentelemetry-sdk>=1.11.1,<2"]
3030
pydantic = ["pydantic>=2.0.0,<3"]
3131
openai-agents = ["openai-agents>=0.14.0", "mcp>=1.9.4, <2"]
3232
google-adk = ["google-adk>=1.27.0,<2"]
33+
langgraph = ["langgraph>=1.1.0"]
3334
langsmith = ["langsmith>=0.7.0,<0.8"]
3435
lambda-worker-otel = [
3536
"opentelemetry-api>=1.11.1,<2",
@@ -60,7 +61,7 @@ dev = [
6061
"pydocstyle>=6.3.0,<7",
6162
"pydoctor>=25.10.1,<26",
6263
"pyright==1.1.403",
63-
"pytest~=7.4",
64+
"pytest~=9.0",
6465
"pytest-asyncio>=0.21,<0.22",
6566
"pytest-timeout~=2.2",
6667
"ruff>=0.5.0,<0.6",
@@ -79,11 +80,13 @@ dev = [
7980
"pytest-rerunfailures>=16.1",
8081
"pytest-xdist>=3.6,<4",
8182
"moto[s3,server]>=5",
82-
"langsmith>=0.7.0,<0.8",
83+
"langgraph>=1.1.0",
84+
"langsmith>=0.7.0,<0.7.34",
8385
"setuptools<82",
8486
"opentelemetry-exporter-otlp-proto-grpc>=1.11.1,<2",
8587
"opentelemetry-semantic-conventions>=0.40b0,<1",
8688
"opentelemetry-sdk-extension-aws>=2.0.0,<3",
89+
"async-timeout>=4.0,<6; python_version < '3.11'",
8790
]
8891

8992
[tool.poe.tasks]

temporalio/api/activity/v1/__init__.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,13 @@
33
ActivityExecutionListInfo,
44
ActivityExecutionOutcome,
55
ActivityOptions,
6+
CallbackInfo,
67
)
78

89
__all__ = [
910
"ActivityExecutionInfo",
1011
"ActivityExecutionListInfo",
1112
"ActivityExecutionOutcome",
1213
"ActivityOptions",
14+
"CallbackInfo",
1315
]

temporalio/api/activity/v1/message_pb2.py

Lines changed: 52 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)