ses fallback

Rhys Sullivan committed 8 months ago

Commit d85f3f01 parent 6d35a4e4 files · +19 −14Browse files

Unified · Split

4 files

bun.lock +1 −0
packages/control-plane/package.json +1 −0
packages/control-plane/src/runtime/workspace-execution-environment.ts +17 −11
packages/runtime-ses/src/index.ts +0 −3

@@ -148,6 +148,7 @@ · 147 unmodified lines
148	"@executor/codemode-mcp": "workspace:*",	148	"@executor/codemode-mcp": "workspace:*",
149	"@executor/codemode-openapi": "workspace:*",	149	"@executor/codemode-openapi": "workspace:*",
150	"@executor/runtime-deno-subprocess": "workspace:*",	150	"@executor/runtime-deno-subprocess": "workspace:*",
		151	"@executor/runtime-ses": "workspace:*",
151	"drizzle-orm": "1.0.0-beta.15-859cf75",	152	"drizzle-orm": "1.0.0-beta.15-859cf75",
152	"effect": "catalog:",	153	"effect": "catalog:",
153	"graphql": "^16.12.0",	154	"graphql": "^16.12.0",

packages/control-plane/package.json+1−0

@@ -27,6 +27,7 @@ · 26 unmodified lines
27	"@electric-sql/pglite": "^0.3.12",	27	"@electric-sql/pglite": "^0.3.12",
28	"@executor/codemode-core": "workspace:*",	28	"@executor/codemode-core": "workspace:*",
29	"@executor/codemode-mcp": "workspace:*",	29	"@executor/codemode-mcp": "workspace:*",
		30	"@executor/runtime-ses": "workspace:*",
30	"@executor/codemode-openapi": "workspace:*",	31	"@executor/codemode-openapi": "workspace:*",
31	"@executor/runtime-deno-subprocess": "workspace:*",	32	"@executor/runtime-deno-subprocess": "workspace:*",
32	"drizzle-orm": "1.0.0-beta.15-859cf75",	33	"drizzle-orm": "1.0.0-beta.15-859cf75",

packages/control-plane/src/runtime/workspace-execution-environment.ts+17−11

   type OpenApiToolDefinition,
   type OpenApiToolManifest,
 } from "@executor/codemode-openapi";
-import { makeDenoSubprocessExecutor } from "@executor/runtime-deno-subprocess";
+import { isDenoAvailable,
+  makeDenoSubprocessExecutor } from "@executor/runtime-deno-subprocess";
+import { makeSesExecutor } from "@executor/runtime-ses";
 import {
   SqlControlPlaneRowsService,
   type SqlControlPlaneRows,
                 description: definition.description,
                 interaction:
                   definition.method.toUpperCase() === "GET"
-                  || definition.method.toUpperCase() === "HEAD"
+                    || definition.method.toUpperCase() === "HEAD"
                     ? "auto"
                     : "required",
                 inputType: presentation.inputType,
     );
     const policies = Option.isSome(workspace)
       ? yield* input.rows.policies.listForWorkspaceContext({
-          organizationId: workspace.value.organizationId,
+        organizationId: workspace.value.organizationId,
-          workspaceId: input.workspaceId,
+        workspaceId: input.workspaceId,
-        }).pipe(
+      }).pipe(
-          Effect.mapError((cause) =>
+        Effect.mapError((cause) =>
-            cause instanceof Error ? cause : new Error(String(cause)),
+          cause instanceof Error ? cause : new Error(String(cause)),
-          ),
+        ),
-        )
+      )
       : [];
     const decision = evaluateInvocationPolicy({
         accountId: input.accountId,
         clientId:
           typeof input.context?.clientId === "string"
-          && input.context.clientId.length > 0
+            && input.context.clientId.length > 0
             ? input.context.clientId
             : null,
       },
         onElicitation,
       });
+      const executor = isDenoAvailable()
+        ? makeDenoSubprocessExecutor()
+        : makeSesExecutor();
       return {
-        executor: makeDenoSubprocessExecutor(),
+        executor,
         toolInvoker,
         catalog,
       } satisfies ExecutionEnvironment;

packages/runtime-ses/src/index.ts+0−3

   allowFetch?: boolean;
 };
-export type InProcessExecutorOptions = SesExecutorOptions;
 const DEFAULT_TIMEOUT_MS = 5 * 60_000;
 const DEFAULT_EVALUATION_ID = "evaluation";
 const WORKER_PATH = fileURLToPath(new URL("./sandbox-worker.mjs", import.meta.url));
   execute: (code: string, toolInvoker: ToolInvoker) => runInSes(options, code, toolInvoker),
 });
-export const makeInProcessExecutor = makeSesExecutor;