Skip to content

Commit 6948766

Browse files
committed
merge main
2 parents e11b51e + 6065780 commit 6948766

56 files changed

Lines changed: 2168 additions & 243 deletions

Some content is hidden

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

.github/workflows/ci.yml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ env:
2222
IS_MAIN_OR_RELEASE: ${{ vars.IS_TEMPORALIO_SDK_TYPESCRIPT_REPO == 'true' && github.event_name != 'pull_request' && ( github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/') || startsWith(github.ref, 'refs/heads/releases')) }}
2323

2424
# Use these variables to force specific version of CLI/Time Skipping Server for SDK tests
25-
TESTS_CLI_VERSION: 'v1.6.2-server-1.31.0-151.6'
25+
# TESTS_CLI_VERSION: 'v1.7.0'
2626
# TESTS_TIME_SKIPPING_SERVER_VERSION: 'v1.24.1'
2727

2828
jobs:
@@ -202,7 +202,13 @@ jobs:
202202
--db-filename temporal.sqlite \
203203
--sqlite-pragma journal_mode=WAL \
204204
--sqlite-pragma synchronous=OFF \
205-
--headless &> ./devserver.log &
205+
--headless &> ./devserver.log \
206+
--dynamic-config-value system.enableActivityEagerExecution=true \
207+
--dynamic-config-value history.enableRequestIdRefLinks=true \
208+
--dynamic-config-value frontend.activityAPIsEnabled=true \
209+
--dynamic-config-value activity.enableStandalone=true \
210+
--dynamic-config-value history.enableChasm=true \
211+
--dynamic-config-value history.enableTransitionHistory=true &
206212
207213
- name: Run Tests (Node)
208214
if: matrix.node != 'bun'
@@ -218,7 +224,7 @@ jobs:
218224
TEMPORAL_CLOUD_MTLS_TEST_CLIENT_KEY: ${{ secrets.TEMPORAL_CLIENT_KEY }}
219225

220226
# For Temporal Cloud + API key tests
221-
TEMPORAL_CLOUD_API_KEY_TEST_TARGET_HOST: us-west-2.aws.api.temporal.io:7233
227+
TEMPORAL_CLOUD_API_KEY_TEST_TARGET_HOST: us-east-1.aws.api.temporal.io:7233
222228
TEMPORAL_CLOUD_API_KEY_TEST_NAMESPACE: ${{ vars.TEMPORAL_CLIENT_NAMESPACE }}
223229
TEMPORAL_CLOUD_API_KEY_TEST_API_KEY: ${{ secrets.TEMPORAL_CLIENT_CLOUD_API_KEY }}
224230

.gitmodules

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

packages/activity/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@temporalio/activity",
3-
"version": "1.16.0",
3+
"version": "1.17.0",
44
"description": "Temporal.io SDK Activity sub-package",
55
"main": "lib/index.js",
66
"types": "./lib/index.d.ts",

packages/activity/src/index.ts

Lines changed: 35 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -153,18 +153,26 @@ export const asyncLocalStorage: AsyncLocalStorage<Context> = (globalThis as any)
153153
* Holds information about the current Activity Execution. Retrieved inside an Activity with `Context.current().info`.
154154
*/
155155
export interface Info {
156+
/**
157+
* Task token associated with this activity execution. Can be used for asynchronous completion
158+
*/
156159
readonly taskToken: Uint8Array;
157160
/**
158-
* Base64 encoded `taskToken`
161+
* Base64 encoded {@link taskToken}
159162
*/
160163
readonly base64TaskToken: string;
164+
/**
165+
* ID of this activity
166+
*/
161167
readonly activityId: string;
162168
/**
163169
* Exposed Activity function name
164170
*/
165171
readonly activityType: string;
166172
/**
167173
* The namespace this Activity is running in
174+
*
175+
* @deprecated Use {@link namespace} instead
168176
*/
169177
readonly activityNamespace: string;
170178
/**
@@ -176,20 +184,22 @@ export interface Info {
176184
*/
177185
readonly isLocal: boolean;
178186
/**
179-
* Information about the Workflow that scheduled the Activity
187+
* Information about the Workflow that scheduled the Activity. Not set if the activity was not started by a Workflow
180188
*/
181-
readonly workflowExecution: {
189+
readonly workflowExecution?: {
182190
readonly workflowId: string;
183191
readonly runId: string;
184192
};
185193
/**
186-
* The namespace of the Workflow that scheduled this Activity
194+
* The namespace of the Workflow that scheduled this Activity. Not set if the activity was not started by a Workflow
195+
*
196+
* @deprecated Use {@link namespace} instead
187197
*/
188-
readonly workflowNamespace: string;
198+
readonly workflowNamespace?: string;
189199
/**
190-
* The module name of the Workflow that scheduled this Activity
200+
* The module name of the Workflow that scheduled this Activity. Not set if the activity was not started by a Workflow
191201
*/
192-
readonly workflowType: string;
202+
readonly workflowType?: string;
193203
/**
194204
* Timestamp for when this Activity was first scheduled.
195205
* For retries, this will have the timestamp of the first attempt.
@@ -249,6 +259,24 @@ export interface Info {
249259
* version), but it may still be defined server-side.
250260
*/
251261
readonly retryPolicy?: RetryPolicy;
262+
/**
263+
* The namespace this Activity is running in
264+
*/
265+
readonly namespace: string;
266+
/**
267+
* ID of the current run of this activity. Can be used to differentiate between different activity executions that
268+
* share the same ID. Activities started by a Workflow don't have activity run ID - instead, they can be identified by
269+
* workflow ID and workflow run ID; see {@link workflowExecution}
270+
*
271+
* @experimental Standalone Activities are experimental. APIs may be subject to change.
272+
*/
273+
readonly activityRunId?: string;
274+
/**
275+
* Whether this activity was started by a workflow
276+
*
277+
* @experimental Standalone Activities are experimental. APIs may be subject to change.
278+
*/
279+
readonly inWorkflow: boolean;
252280
}
253281

254282
/**

packages/ai-sdk/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@temporalio/ai-sdk",
3-
"version": "1.16.0",
3+
"version": "1.17.0",
44
"description": "Temporal AI SDK integration package",
55
"main": "lib/index.js",
66
"types": "./lib/index.d.ts",

packages/client/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@temporalio/client",
3-
"version": "1.16.0",
3+
"version": "1.17.0",
44
"description": "Temporal.io SDK Client sub-package",
55
"main": "lib/index.js",
66
"types": "./lib/index.d.ts",

0 commit comments

Comments
 (0)