Skip to content

Commit 8513bed

Browse files
kishanprmrkishanprmr
committed
Merge remote-tracking branch 'origin/main' into pr/AnkitSharmaOnGithub/7607
2 parents 7c6e60b + bf7ad6d commit 8513bed

73 files changed

Lines changed: 1739 additions & 1184 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.

‎docker-compose.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
version: '3.0'
22
services:
33
activepieces:
4-
image: ghcr.io/activepieces/activepieces:0.53.1
4+
image: ghcr.io/activepieces/activepieces:0.54.0
55
container_name: activepieces
66
restart: unless-stopped
77
## Enable the following line if you already use AP_EXECUTION_MODE with SANDBOXED or old activepieces, checking the breaking change documentation for more info.

‎package-lock.json‎

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

‎package.json‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "activepieces",
3-
"version": "0.53.1",
3+
"version": "0.54.0",
44
"rcVersion": "0.54.0-rc.0",
55
"scripts": {
66
"prepare": "husky install",
@@ -28,7 +28,7 @@
2828
"dependencies": {
2929
"@activepieces/import-fresh-webpack": "3.3.0",
3030
"@actual-app/api": "25.3.1",
31-
"@ai-sdk/anthropic": "1.0.5",
31+
"@ai-sdk/anthropic": "1.2.10",
3232
"@ai-sdk/azure": "1.0.10",
3333
"@ai-sdk/openai": "0.0.70",
3434
"@anthropic-ai/sdk": "0.39.0",
@@ -47,7 +47,7 @@
4747
"@dnd-kit/core": "6.1.0",
4848
"@dnd-kit/modifiers": "7.0.0",
4949
"@dnd-kit/sortable": "8.0.0",
50-
"@dust-tt/client": "1.0.41",
50+
"@dust-tt/client": "1.0.49",
5151
"@fastify/basic-auth": "5.0.0",
5252
"@fastify/cors": "8.3.0",
5353
"@fastify/formbody": "7.4.0",
@@ -57,11 +57,15 @@
5757
"@fastify/type-provider-typebox": "3.5.0",
5858
"@google/generative-ai": "0.21.0",
5959
"@hookform/resolvers": "3.9.0",
60+
"@langchain/anthropic": "0.3.20",
61+
"@langchain/core": "0.3.55",
62+
"@langchain/mcp-adapters": "0.4.2",
63+
"@langchain/openai": "0.5.10",
6064
"@mailchimp/mailchimp_marketing": "3.0.80",
6165
"@mailerlite/mailerlite-nodejs": "1.1.0",
6266
"@microsoft/microsoft-graph-client": "3.0.7",
6367
"@microsoft/microsoft-graph-types": "2.40.0",
64-
"@modelcontextprotocol/sdk": "1.7.0",
68+
"@modelcontextprotocol/sdk": "1.11.0",
6569
"@notionhq/client": "2.2.11",
6670
"@nx/devkit": "20.0.1",
6771
"@octokit/rest": "21.1.1",

‎packages/engine/src/lib/handler/code-executor.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import path from 'path'
22
import importFresh from '@activepieces/import-fresh-webpack'
3-
import { ActionType, CodeAction, GenericStepOutput, StepOutputStatus } from '@activepieces/shared'
3+
import { ActionType, assertNotNullOrUndefined, CodeAction, GenericStepOutput, StepOutputStatus } from '@activepieces/shared'
44
import { initCodeSandbox } from '../core/code/code-sandbox'
55
import { CodeModule } from '../core/code/code-sandbox-common'
66
import { continueIfFailureHandler, handleExecutionError, runWithExponentialBackoff } from '../helper/error-handling'
@@ -34,7 +34,8 @@ const executeAction: ActionHandler<CodeAction> = async ({ action, executionState
3434
})
3535

3636
try {
37-
const artifactPath = path.resolve(`${constants.baseCodeDirectory}/${constants.flowVersionId}/${action.name}/index.js`)
37+
assertNotNullOrUndefined(constants.runEnvironment, 'Run environment is required')
38+
const artifactPath = path.resolve(`${constants.baseCodeDirectory}/${constants.flowVersionId}/${action.name}/${constants.runEnvironment.toString()}/index.js`)
3839
const codeModule: CodeModule = await importFresh(artifactPath)
3940
const codeSandbox = await initCodeSandbox()
4041

‎packages/engine/src/lib/handler/context/engine-constants.ts‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { ExecuteFlowOperation, ExecutePropsOptions, ExecuteStepOperation, ExecuteToolOperation, ExecuteTriggerOperation, ExecutionType, FlowVersionState, ProgressUpdateType, Project, ProjectId, ResumePayload, TriggerHookType } from '@activepieces/shared'
1+
import { ExecuteFlowOperation, ExecutePropsOptions, ExecuteStepOperation, ExecuteToolOperation, ExecuteTriggerOperation, ExecutionType, FlowVersionState, ProgressUpdateType, Project, ProjectId, ResumePayload, RunEnvironment, TriggerHookType } from '@activepieces/shared'
22
import { createPropsResolver, PropsResolver } from '../../variables/props-resolver'
33

44
type RetryConstants = {
@@ -51,6 +51,7 @@ export class EngineConstants {
5151
public readonly serverHandlerId: string | null,
5252
public readonly httpRequestId: string | null,
5353
public readonly resumePayload?: ResumePayload,
54+
public readonly runEnvironment?: RunEnvironment,
5455
) {
5556
if (!publicApiUrl.endsWith('/api/')) {
5657
throw new Error('Public URL must end with a slash, got: ' + publicApiUrl)
@@ -81,6 +82,7 @@ export class EngineConstants {
8182
input.serverHandlerId ?? null,
8283
input.httpRequestId ?? null,
8384
input.executionType === ExecutionType.RESUME ? input.resumePayload : undefined,
85+
input.runEnvironment,
8486
)
8587
}
8688

@@ -126,6 +128,8 @@ export class EngineConstants {
126128
ProgressUpdateType.NONE,
127129
null,
128130
null,
131+
undefined,
132+
input.runEnvironment,
129133
)
130134
}
131135

‎packages/engine/test/handler/test-helper.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Action, ActionErrorHandlingOptions, ActionType, BranchCondition, BranchExecutionType, CodeAction, FlowVersionState, LoopOnItemsAction, PackageType, PieceAction, PieceType, ProgressUpdateType, RouterExecutionType } from '@activepieces/shared'
1+
import { Action, ActionErrorHandlingOptions, ActionType, BranchCondition, BranchExecutionType, CodeAction, FlowVersionState, LoopOnItemsAction, PackageType, PieceAction, PieceType, ProgressUpdateType, RouterExecutionType, RunEnvironment } from '@activepieces/shared'
22
import { EngineConstants } from '../../src/lib/handler/context/engine-constants'
33
import { createPropsResolver } from '../../src/lib/variables/props-resolver'
44

@@ -27,6 +27,7 @@ export const generateMockEngineConstants = (params?: Partial<EngineConstants>):
2727
params?.serverHandlerId ?? null,
2828
params?.httpRequestId ?? null,
2929
params?.resumePayload,
30+
params?.runEnvironment ?? RunEnvironment.TESTING,
3031
)
3132
}
3233

packages/engine/test/resources/codes/flowVersionId/echo_step/index.js renamed to packages/engine/test/resources/codes/flowVersionId/echo_step/TESTING/index.js

File renamed without changes.

packages/engine/test/resources/codes/flowVersionId/echo_step_1/index.js renamed to packages/engine/test/resources/codes/flowVersionId/echo_step_1/TESTING/index.js

File renamed without changes.

packages/engine/test/resources/codes/flowVersionId/runtime/index.js renamed to packages/engine/test/resources/codes/flowVersionId/runtime/TESTING/index.js

File renamed without changes.

‎packages/pieces/community/agent/.eslintrc.json‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
{
2+
"extends": [
3+
"../../../../.eslintrc.base.json"
4+
],
5+
"ignorePatterns": [
6+
"!**/*"
7+
],
8+
"overrides": [
9+
{
10+
"files": [
11+
"*.ts",
12+
"*.tsx",
13+
"*.js",
14+
"*.jsx"
15+
],
16+
"rules": {}
17+
},
18+
{
19+
"files": [
20+
"*.ts",
21+
"*.tsx"
22+
],
23+
"rules": {}
24+
},
25+
{
26+
"files": [
27+
"*.js",
28+
"*.jsx"
29+
],
30+
"rules": {}
31+
}
32+
]
33+
}

0 commit comments

Comments
 (0)