Skip to content

Composio powers 1000+ toolkits, tool search, context management, authentication, and a sandboxed workbench to help you build AI agents that turn intent into action.

feat(core): introduce #config_defaults, so that Cloudflare has "{ autoUploadDownloadFiles: true "} default, fixing @test-e2e/cf-workers-basic

jkomyno83f5e4539fee
diff --git a/ts/e2e-tests/runtimes/cloudflare/cf-workers-basic/tsconfig.json b/ts/e2e-tests/runtimes/cloudflare/cf-workers-basic/tsconfig.json
index b30f6f4d1..2dc131ca3 100644
--- a/ts/e2e-tests/runtimes/cloudflare/cf-workers-basic/tsconfig.json
+++ b/ts/e2e-tests/runtimes/cloudflare/cf-workers-basic/tsconfig.json
@@ -12,7 +12,7 @@
"forceConsistentCasingInFileNames": true,
"strict": true,
"skipLibCheck": true,
- "types": ["@cloudflare/workers-types/2023-07-01"]
+ "types": ["@cloudflare/workers-types"]
},
"include": ["src/**/*.ts", "test/**/*.ts"]
}
diff --git a/ts/packages/core/package.json b/ts/packages/core/package.json
index 80f3860fa..f4554a8f7 100644
--- a/ts/packages/core/package.json
+++ b/ts/packages/core/package.json
@@ -45,6 +45,18 @@
"import": "./dist/utils/modifiers/FileToolModifier.node.mjs",
"require": "./dist/utils/modifiers/FileToolModifier.node.cjs"
}
+ },
+ "#config_defaults": {
+ "workerd": "./dist/utils/config-defaults/ConfigDefaults.workerd.mjs",
+ "edge-light": "./dist/utils/config-defaults/ConfigDefaults.workerd.mjs",
+ "node": {
+ "import": "./dist/utils/config-defaults/ConfigDefaults.node.mjs",
+ "require": "./dist/utils/config-defaults/ConfigDefaults.node.cjs"
+ },
+ "default": {
+ "import": "./dist/utils/config-defaults/ConfigDefaults.node.mjs",
+ "require": "./dist/utils/config-defaults/ConfigDefaults.node.cjs"
+ }
}
},
"exports": {
diff --git a/ts/packages/core/src/composio.ts b/ts/packages/core/src/composio.ts
index e0b83fc69..dcdd43612 100644
--- a/ts/packages/core/src/composio.ts
+++ b/ts/packages/core/src/composio.ts
@@ -19,6 +19,7 @@ import { getDefaultHeaders } from './utils/session';
import { ToolkitVersionParam } from './types/tool.types';
import { ToolRouter } from './models/ToolRouter';
import { ToolRouterCreateSessionConfig, ToolRouterSession } from './types/toolRouter.types';
+import { CONFIG_DEFAULTS } from './utils/config-defaults';
export type ComposioConfig<
TProvider extends BaseComposioProvider<unknown, unknown, unknown> = OpenAIProvider,
@@ -249,8 +250,9 @@ export class Composio<
baseURL: baseURLParsed,
apiKey: apiKeyParsed,
toolkitVersions: getToolkitVersionsFromEnv(config?.toolkitVersions),
- allowTracking: config?.allowTracking ?? true,
- autoUploadDownloadFiles: config?.autoUploadDownloadFiles ?? true,
+ allowTracking: config?.allowTracking ?? CONFIG_DEFAULTS.allowTracking,
+ autoUploadDownloadFiles:
+ config?.autoUploadDownloadFiles ?? CONFIG_DEFAULTS.autoUploadDownloadFiles,
provider: config?.provider ?? this.provider,
};
diff --git a/ts/packages/core/src/models/Tools.ts b/ts/packages/core/src/models/Tools.ts
index e9001e8a5..87edf55ab 100644
--- a/ts/packages/core/src/models/Tools.ts
+++ b/ts/packages/core/src/models/Tools.ts
@@ -54,6 +54,7 @@ import { getToolkitVersion } from '../utils/toolkitVersion';
import { handleToolExecutionError } from '../errors/ToolErrors';
import { ToolExecuteMetaParams } from '../types/tool.types';
import { SessionExecuteMetaParams } from '@composio/client/resources/tool-router.mjs';
+import { CONFIG_DEFAULTS } from '../utils/config-defaults';
/**
* This class is used to manage tools in the Composio SDK.
* It provides methods to list, get, and execute tools.
@@ -80,8 +81,9 @@ export class Tools<
this.client = client;
this.customTools = new CustomTools(client);
this.provider = config.provider;
- this.autoUploadDownloadFiles = config?.autoUploadDownloadFiles ?? true;
- this.toolkitVersions = config?.toolkitVersions ?? 'latest';
+ this.autoUploadDownloadFiles =
+ config?.autoUploadDownloadFiles ?? CONFIG_DEFAULTS.autoUploadDownloadFiles;
+ this.toolkitVersions = config?.toolkitVersions ?? CONFIG_DEFAULTS.toolkitVersions;
// Bind the execute method to ensure correct 'this' context
this.execute = this.execute.bind(this);
// Set the execute method for the provider.
diff --git a/ts/packages/core/src/models/Triggers.ts b/ts/packages/core/src/models/Triggers.ts
index 647b1dccb..1236dd86f 100644
--- a/ts/packages/core/src/models/Triggers.ts
+++ b/ts/packages/core/src/models/Triggers.ts
@@ -48,6 +48,7 @@ import { ToolkitVersionParam } from '../types/tool.types';
import { ComposioConfig } from '../composio';
import { BaseComposioProvider } from '../provider/BaseProvider';
import { hmacSha256Base64, timingSafeEqual } from '../utils/crypto';
+import { CONFIG_DEFAULTS } from '../utils/config-defaults';
/**
* Trigger (Instance) class
* /api/v3/trigger_instances
@@ -61,7 +62,7 @@ export class Triggers<TProvider extends BaseComposioProvider<unknown, unknown, u
constructor(client: ComposioClient, config?: ComposioConfig<TProvider>) {
this.client = client;
this.pusherService = new PusherService(client);
- this.toolkitVersions = config?.toolkitVersions ?? 'latest';
+ this.toolkitVersions = config?.toolkitVersions ?? CONFIG_DEFAULTS.toolkitVersions;
telemetry.instrument(this, 'Triggers');
}
diff --git a/ts/packages/core/src/utils/config-defaults/ConfigDefaults.node.ts b/ts/packages/core/src/utils/config-defaults/ConfigDefaults.node.ts
new file mode 100644
index 000000000..d83d095c5
--- /dev/null
+++ b/ts/packages/core/src/utils/config-defaults/ConfigDefaults.node.ts
@@ -0,0 +1,7 @@
+import type { ConfigDefaults } from './types';
+
+export const CONFIG_DEFAULTS: ConfigDefaults = {
+ autoUploadDownloadFiles: true,
+ allowTracking: true,
+ toolkitVersions: 'latest',
+};
diff --git a/ts/packages/core/src/utils/config-defaults/ConfigDefaults.workerd.ts b/ts/packages/core/src/utils/config-defaults/ConfigDefaults.workerd.ts
new file mode 100644
index 000000000..76550bf67
--- /dev/null
+++ b/ts/packages/core/src/utils/config-defaults/ConfigDefaults.workerd.ts
@@ -0,0 +1,10 @@
+import type { ConfigDefaults } from './types';
+
+export const CONFIG_DEFAULTS: ConfigDefaults = {
+ /**
+ * We don't support auto-uploading/download files in Cloudflare Workers yet.
+ */
+ autoUploadDownloadFiles: false,
+ allowTracking: true,
+ toolkitVersions: 'latest',
+};
diff --git a/ts/packages/core/src/utils/config-defaults/index.ts b/ts/packages/core/src/utils/config-defaults/index.ts
new file mode 100644
index 000000000..c5887ba9f
--- /dev/null
+++ b/ts/packages/core/src/utils/config-defaults/index.ts
@@ -0,0 +1 @@
+export { CONFIG_DEFAULTS } from '#config_defaults';
diff --git a/ts/packages/core/src/utils/config-defaults/types.ts b/ts/packages/core/src/utils/config-defaults/types.ts
new file mode 100644
index 000000000..4e4ba2b39
--- /dev/null
+++ b/ts/packages/core/src/utils/config-defaults/types.ts
@@ -0,0 +1,14 @@
+import type { ComposioConfig } from '../../composio';
+import type { BaseComposioProvider } from '../../provider/BaseProvider';
+
+/**
+ * Configuration defaults for Composio.
+ * These are the required fields that must have default values.
+ * The provider type is set to never since defaults don't include a provider instance.
+ */
+export type ConfigDefaults = Required<
+ Pick<
+ ComposioConfig<BaseComposioProvider<never, never, never>>,
+ 'autoUploadDownloadFiles' | 'allowTracking' | 'toolkitVersions'
+ >
+>;
diff --git a/ts/packages/core/tsconfig.json b/ts/packages/core/tsconfig.json
index ffdfb863f..940bd6901 100644
--- a/ts/packages/core/tsconfig.json
+++ b/ts/packages/core/tsconfig.json
@@ -17,6 +17,10 @@
"#file_tool_modifier": [
"./src/utils/modifiers/FileToolModifier.node.ts",
"./src/utils/modifiers/FileToolModifier.workerd.ts"
+ ],
+ "#config_defaults": [
+ "./src/utils/config-defaults/ConfigDefaults.node.ts",
+ "./src/utils/config-defaults/ConfigDefaults.workerd.ts"
]
}
},
diff --git a/ts/packages/core/tsdown.config.ts b/ts/packages/core/tsdown.config.ts
index f91714baa..459fc6d91 100644
--- a/ts/packages/core/tsdown.config.ts
+++ b/ts/packages/core/tsdown.config.ts
@@ -19,6 +19,10 @@ export default defineConfig({
// #file_tool_modifier
'src/utils/modifiers/FileToolModifier.node.ts',
'src/utils/modifiers/FileToolModifier.workerd.ts',
+
+ // #config_defaults
+ 'src/utils/config-defaults/ConfigDefaults.node.ts',
+ 'src/utils/config-defaults/ConfigDefaults.workerd.ts',
],
attw: {
...baseConfig.attw,
@@ -41,5 +45,11 @@ export default defineConfig({
* We don't want to accidentally bundle `node:*` packages (e.g., `node:module`)
* as not all of them are available in Cloudflare Workers / Vercel Edge runtimes.
*/
- external: [...(baseConfig.external ?? []), '#platform', '#files', '#file_tool_modifier'],
+ external: [
+ ...(baseConfig.external ?? []),
+ '#platform',
+ '#files',
+ '#file_tool_modifier',
+ '#config_defaults',
+ ],
});
diff --git a/ts/packages/core/vitest.config.ts b/ts/packages/core/vitest.config.ts
index 2130e2137..79f7e9d62 100644
--- a/ts/packages/core/vitest.config.ts
+++ b/ts/packages/core/vitest.config.ts
@@ -13,6 +13,10 @@ export default defineConfig({
__dirname,
'src/utils/modifiers/FileToolModifier.node.ts'
),
+ '#config_defaults': path.resolve(
+ __dirname,
+ 'src/utils/config-defaults/ConfigDefaults.node.ts'
+ ),
},
},
test: {