Open-source, secure environment with real-world tools for enterprise-grade agents.
Python agentaiai-agentai-agentscode-interpretercopilotdevelopmentdevtoolsgptgpt-4javascriptllmnextjsopenaipythonreactsoftwaretypescript
Fix js open ai integration
Tomas Valentacc66d1553388
diff --git a/packages/js-sdk/package.json b/packages/js-sdk/package.jsonindex cc0c63ef5..5d5c5f7a8 100644--- a/packages/js-sdk/package.json+++ b/packages/js-sdk/package.json@@ -44,6 +44,7 @@"knip": "^2.34.0","markdown-it": "^13.0.2","npm-check-updates": "^16.14.6",+ "openai": "^4.17.4","openapi-typescript": "^5.4.1","tsup": "^6.7.0","typescript": "^5.2.2",@@ -70,7 +71,6 @@],"dependencies": {"normalize-path": "^3.0.0",- "openai": "^4.17.4","openapi-typescript-fetch": "^1.1.3","path-browserify": "^1.0.1","platform": "^1.3.6",diff --git a/packages/js-sdk/src/index.ts b/packages/js-sdk/src/index.tsindex d9c9f2506..da54084b0 100644--- a/packages/js-sdk/src/index.ts+++ b/packages/js-sdk/src/index.ts@@ -28,6 +28,7 @@ export { DataAnalysis as CodeInterpreter }export { Artifact, DataAnalysis } from './templates/dataAnalysis'export type { RunPythonOpts } from './templates/dataAnalysis'+export type { Action } from './sandbox/index'export { Sandbox }export default Sandboxdiff --git a/packages/js-sdk/src/sandbox/index.ts b/packages/js-sdk/src/sandbox/index.tsindex 7ef1bf7b3..a8a427c9d 100644--- a/packages/js-sdk/src/sandbox/index.ts+++ b/packages/js-sdk/src/sandbox/index.ts@@ -10,6 +10,7 @@ import { Process, ProcessManager, ProcessMessage, ProcessOpts, ProcessOutput, primport { CallOpts, SandboxConnection, SandboxConnectionOpts } from './sandboxConnection'import { Terminal, TerminalManager, TerminalOpts, TerminalOutput, terminalService } from './terminal'import { resolvePath } from '../utils/filesystem'+import { Assistant } from '../templates/openai'export type DownloadFileFormat =| 'base64'@@ -26,12 +27,18 @@ export interface SandboxOpts extends SandboxConnectionOpts {onExit?: () => Promise<void> | void;}+export interface Action<T = { [key: string]: any }> {+ (sandbox: Sandbox, args: T): string | Promise<string>+}+export class Sandbox extends SandboxConnection {readonly terminal: TerminalManagerreadonly filesystem: FilesystemManagerreadonly process: ProcessManager- private onScanPorts?: ScanOpenPortsHandler+ readonly _actions: Map<string, Action<any>> = new Map()++ private readonly onScanPorts?: ScanOpenPortsHandlerprotected constructor(opts?: SandboxOpts) {opts = opts || {}@@ -407,12 +414,22 @@ export class Sandbox extends SandboxConnection {* The file will be uploaded to the user's home directory with the same name.* If a file with the same name already exists, it will be overwritten.*/- public get fileURL() {+ get fileURL() {const protocol = this.opts.__debug_devEnv === 'local' ? 'http' : 'https'const hostname = this.getHostname(this.opts.__debug_port || ENVD_PORT)return `${protocol}://${hostname}${FILE_ROUTE}`}+ get actions() {+ return [...this._actions.entries()]+ }++ get openai() {+ return {+ assistant: new Assistant(this),+ } as const+ }+static async create(opts?: SandboxOpts) {return new Sandbox(opts)._open({ timeout: opts?.timeout })@@ -425,21 +442,14 @@ export class Sandbox extends SandboxConnection {})}- protected override async _open(opts: CallOpts) {- await super._open(opts)+ registerAction<T = { [name: string]: any }>(name: string, action: Action<T>) {+ this._actions.set(name, action)- const portsHandler = this.onScanPorts- ? (ports: { State: string; Ip: string; Port: number }[]) =>- this.onScanPorts?.(- ports.map((p) => ({ ip: p.Ip, port: p.Port, state: p.State })),- )- : undefined+ return this+ }- await this._handleSubscriptions(- portsHandler- ? this._subscribe(codeSnippetService, portsHandler, 'scanOpenedPorts')- : undefined,- )+ unregisterAction(name: string) {+ this._actions.delete(name)return this}@@ -503,4 +513,23 @@ export class Sandbox extends SandboxConnection {return await response.arrayBuffer()}}++ protected override async _open(opts: CallOpts) {+ await super._open(opts)++ const portsHandler = this.onScanPorts+ ? (ports: { State: string; Ip: string; Port: number }[]) =>+ this.onScanPorts?.(+ ports.map((p) => ({ ip: p.Ip, port: p.Port, state: p.State })),+ )+ : undefined++ await this._handleSubscriptions(+ portsHandler+ ? this._subscribe(codeSnippetService, portsHandler, 'scanOpenedPorts')+ : undefined,+ )++ return this+ }}diff --git a/packages/js-sdk/src/templates/openai.ts b/packages/js-sdk/src/templates/openai.tsindex 3827fe499..ba51b1cc1 100644--- a/packages/js-sdk/src/templates/openai.ts+++ b/packages/js-sdk/src/templates/openai.ts@@ -1,59 +1,36 @@-import type OpenAI from 'openai'-import { Sandbox, SandboxOpts } from '../'-import { RunSubmitToolOutputsParams } from 'openai/resources/beta/threads/runs/runs'+import type { Run, RunSubmitToolOutputsParams } from 'openai/resources/beta/threads/runs/runs'-export interface Action<T = { [key: string]: any }> {- (sandbox: Sandbox, args: T): string | Promise<string>-}+import type { Sandbox } from '../sandbox'++export class Assistant {+ constructor(private readonly sandbox: Sandbox) { }-export class ActionSandbox extends Sandbox {- readonly openai = {- assistant: {- run: async (run: OpenAI.Beta.Threads.Runs.Run): Promise<RunSubmitToolOutputsParams.ToolOutput[]> => {- if (run.status !== 'requires_action') {- return []- }-- if (!run.required_action) {- return []- }-- const outputs: RunSubmitToolOutputsParams.ToolOutput[] = []-- for (const toolCall of run.required_action.submit_tool_outputs.tool_calls) {- const action = this.actions.get(toolCall.function.name)- if (!action) {- continue- }-- const args = JSON.parse(toolCall.function.arguments)- const output = await action(this, args)-- outputs.push({- tool_call_id: toolCall.id,- output,- })- }-- return outputs- },- } as const,- } as const-- private actions: Map<string, Action<any>> = new Map()-- static override async create(opts: SandboxOpts) {- const sandbox = new this(opts)- await sandbox._open({ timeout: opts?.timeout })- if (opts?.cwd) {- await sandbox.filesystem.makeDir(opts.cwd)+ async run(run: Run): Promise<RunSubmitToolOutputsParams.ToolOutput[]> {+ if (run.status !== 'requires_action') {+ return []+ }++ if (!run.required_action) {+ return []}- return sandbox- }- registerAction<T = { [name: string]: any }>(name: string, action: Action<T>) {- this.actions.set(name, action)+ const outputs: RunSubmitToolOutputsParams.ToolOutput[] = []++ for (const toolCall of run.required_action.submit_tool_outputs.tool_calls) {+ const action = this.sandbox._actions.get(toolCall.function.name)+ if (!action) {+ continue+ }++ const args = JSON.parse(toolCall.function.arguments)+ const output = await action(this.sandbox, args)++ outputs.push({+ tool_call_id: toolCall.id,+ output,+ })+ }- return this+ return outputs}}diff --git a/packages/python-sdk/e2b/__init__.py b/packages/python-sdk/e2b/__init__.pyindex e98a69bb5..cd4da1ac0 100644--- a/packages/python-sdk/e2b/__init__.py+++ b/packages/python-sdk/e2b/__init__.py@@ -18,6 +18,7 @@ from .sandbox import (ProcessManager,Process,OpenPort,+ Action,EnvVars,SandboxException,TerminalException,diff --git a/packages/python-sdk/e2b/sandbox/__init__.py b/packages/python-sdk/e2b/sandbox/__init__.pyindex d523d64bc..0d32d2b3d 100644--- a/packages/python-sdk/e2b/sandbox/__init__.py+++ b/packages/python-sdk/e2b/sandbox/__init__.py@@ -13,7 +13,7 @@ from .filesystem_watcher import (FilesystemOperation,FilesystemWatcher,)-from .main import Sandbox+from .main import Sandbox, Actionfrom .process import (Process,ProcessManager,diff --git a/pnpm-lock.yaml b/pnpm-lock.yamlindex a08683fc0..dc483fc82 100644--- a/pnpm-lock.yaml+++ b/pnpm-lock.yaml@@ -315,9 +315,6 @@ importers:normalize-path:specifier: ^3.0.0version: 3.0.0- openai:- specifier: ^4.17.4- version: 4.17.4openapi-typescript-fetch:specifier: ^1.1.3version: 1.1.3@@ -358,6 +355,9 @@ importers:npm-check-updates:specifier: ^16.14.6version: 16.14.6+ openai:+ specifier: ^4.17.4+ version: 4.17.4openapi-typescript:specifier: ^5.4.1version: 5.4.1@@ -2862,7 +2862,7 @@ packages:dependencies:'@types/node': 20.9.0form-data: 4.0.0- dev: false+ dev: true/@types/[email protected]:resolution: {integrity: sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ==}@@ -2870,6 +2870,7 @@ packages:/@types/[email protected]:resolution: {integrity: sha512-wf3Vz+jCmOQ2HV1YUJuCWdL64adYxumkrxtc+H1VUQlnQI04+5HtH+qZCOE21lBE7gIrt+CwX2Wv8Acrw5Ak6w==}+ dev: true/@types/[email protected]:resolution: {integrity: sha512-HksnYH4Ljr4VQgEy2lTStbCKv/P590tmPe5HqOnv9Gprffgv5WXAY+Y5Gqniu0GGqeTCUdBnzC3QSrzPkBkAMA==}@@ -3476,7 +3477,7 @@ packages:engines: {node: '>=6.5'}dependencies:event-target-shim: 5.0.1- dev: false+ dev: trueresolution: {integrity: sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==}@@ -3516,6 +3517,7 @@ packages:engines: {node: '>= 8.0.0'}dependencies:humanize-ms: 1.2.1+ dev: trueresolution: {integrity: sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==}@@ -3762,7 +3764,7 @@ packages:resolution: {integrity: sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==}- dev: false+ dev: trueresolution: {integrity: sha512-KCuPB8ZCIqFdA4HwKXsvz7j6gvSDNhDP7WnUjBleRkKjPdvCmHFuQ77ocavI8FT6NdvlBnE2UFr2H4Mycn8Vew==}@@ -3812,7 +3814,7 @@ packages:resolution: {integrity: sha512-Y5gU45svrR5tI2Vt/X9GPd3L0HNIKzGu202EjxrXMpuc2V2CiKgemAbUUsqYmZJvPtCXoUKjNZwBJzsNScUbXA==}- dev: false+ dev: trueresolution: {integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==}@@ -4148,7 +4150,7 @@ packages:resolution: {integrity: sha512-yrLQ/yVUFXkzg7EDQsPieE/53+0RlaWTs+wBrvW36cyilJ2SaDWfl4Yj7MtLTXleV9uEKefbAGUPv2/iWSooRA==}- dev: false+ dev: trueresolution: {integrity: sha512-iKEoDYaRmd1mxM90a2OEfWhjsjPpYPuQ+lMYsoxB126+t8fw7ySEO48nmDg5COTjxDI65/Y2OWpeEHk3ZOe8zg==}@@ -4326,7 +4328,7 @@ packages:engines: {node: '>= 0.8'}dependencies:delayed-stream: 1.0.0- dev: false+ dev: trueresolution: {integrity: sha512-Fu4hJdvzeylCfQPp9SGWidpzrMs7tTrlu6Vb8XGaRGck8QSNZJJp538Wrb60Lax4fPwR64ViY468OIUTbRlGZg==}@@ -4439,7 +4441,7 @@ packages:resolution: {integrity: sha512-mCxBlsHFYh9C+HVpiEacem8FEBnMXgU9gy4zmNC+SXAZNB/1idgp/aulFJ4FgCi7GPEVbfyng092GqL2k2rmow==}- dev: false+ dev: trueresolution: {integrity: sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==}@@ -4640,7 +4642,7 @@ packages:resolution: {integrity: sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==}engines: {node: '>=0.4.0'}- dev: false+ dev: trueresolution: {integrity: sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==}@@ -4682,7 +4684,7 @@ packages:dependencies:base-64: 0.1.0md5: 2.3.0- dev: false+ dev: trueresolution: {integrity: sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==}@@ -5393,7 +5395,7 @@ packages:resolution: {integrity: sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==}engines: {node: '>=6'}- dev: false+ dev: trueresolution: {integrity: sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==}@@ -5587,7 +5589,7 @@ packages:resolution: {integrity: sha512-qfqtYan3rxrnCk1VYaA4H+Ms9xdpPqvLZa6xmMgFvhO32x7/3J/ExcTd6qpxM0vH2GdMI+poehyBZvqfMTto8A==}- dev: false+ dev: trueresolution: {integrity: sha512-yDYSgNMraqvnxiEXO4hi88+YZxaHC6QKzb5N84iRCTDeRO7ZALpir/lVmf/uXUhnwUr2O4HU8s/n6x+yNjQkHw==}@@ -5601,7 +5603,7 @@ packages:asynckit: 0.4.0combined-stream: 1.0.8mime-types: 2.1.35- dev: false+ dev: trueresolution: {integrity: sha512-0iirZp3uVDjVGt9p49aTaqjk84TrglENEDuqfdlZQ1roC9CWlPk6Avf8EEnZNcAqPonwkG35x4n3ww/1THYAeQ==}@@ -5609,7 +5611,7 @@ packages:dependencies:node-domexception: 1.0.0web-streams-polyfill: 4.0.0-beta.3- dev: false+ dev: trueresolution: {integrity: sha512-+yRYRhpnFPWXSly/6V4Lw9IfOV26uu30kynGJ03PW+MnjOEQe45RZ141QcS0aJehYBYA50GfCDnsRbFJdhssRw==}@@ -6145,6 +6147,7 @@ packages:resolution: {integrity: sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ==}dependencies:ms: 2.1.3+ dev: trueresolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==}@@ -6310,7 +6313,7 @@ packages:resolution: {integrity: sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==}- dev: false+ dev: trueresolution: {integrity: sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==}@@ -7129,7 +7132,7 @@ packages:charenc: 0.0.2crypt: 0.0.2is-buffer: 1.1.6- dev: false+ dev: trueresolution: {integrity: sha512-8SVPMuHqlPME/z3gqVwWY4zVXn8lqKv/pAhC57FuJ40ImXyBpmO5ukh98zB2v7Blql2FiHjHv9LVztSIqjY+MA==}@@ -7717,14 +7720,12 @@ packages:resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==}engines: {node: '>= 0.6'}- dev: falseresolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==}engines: {node: '>= 0.6'}dependencies:mime-db: 1.52.0- dev: falseresolution: {integrity: sha512-jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A==}@@ -7912,6 +7913,7 @@ packages:resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==}+ dev: trueresolution: {integrity: sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==}@@ -8066,7 +8068,7 @@ packages:resolution: {integrity: sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==}engines: {node: '>=10.5.0'}- dev: false+ dev: trueresolution: {integrity: sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==}@@ -8078,7 +8080,6 @@ packages:optional: truedependencies:whatwg-url: 5.0.0- dev: falseresolution: {integrity: sha512-RdbZCEynH2tH46+tj0ua9caUHVWrd/RHnRfvly2EVdqGmI3ndS1Vn/xjm5KuGejDt2RNDQsVRLPNd2QPwcewVg==}@@ -8410,7 +8411,7 @@ packages:web-streams-polyfill: 3.2.1transitivePeerDependencies:- encoding- dev: false+ dev: trueresolution: {integrity: sha512-smLZPck4OkKMNExcw8jMgrMOGgVGx2N/s6DbKL2ftNl77g5HfoGpZGFy79RBzU/EkaO0OZpwBnslfdBfh7ZcWg==}@@ -10257,7 +10258,6 @@ packages:resolution: {integrity: sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==}- dev: falseresolution: {integrity: sha512-dTpowEjclQ7Kgx5SdBkqRzVhERQXov8/l9Ft9dVM9fmg0W0KQSVaXX9T4i6twCPNtYiZM53lpSSUAwJbFPOHxA==}@@ -11013,16 +11013,15 @@ packages:resolution: {integrity: sha512-e0MO3wdXWKrLbL0DgGnUV7WHVuw9OUvL4hjgnPkIeEvESk74gAITi5G606JtZPp39cd8HA9VQzCIvA49LpPN5Q==}engines: {node: '>= 8'}- dev: false+ dev: trueresolution: {integrity: sha512-QW95TCTaHmsYfHDybGMwO5IJIM93I/6vTRk+daHTWFPhwh+C8Cg7j7XyKrwrj8Ib6vYXe0ocYNrmzY4xAAN6ug==}engines: {node: '>= 14'}- dev: false+ dev: trueresolution: {integrity: sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==}- dev: falseresolution: {integrity: sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==}@@ -11092,7 +11091,6 @@ packages:dependencies:tr46: 0.0.3webidl-conversions: 3.0.1- dev: falseresolution: {integrity: sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==}