@shipfox/api-agent 4.0.0 → 6.0.0

package/src/presentation/routes/upsert-model-provider-config.ts

@@ -7,47 +7,53 @@ import {requireWorkspaceAccess} from '@shipfox/api-auth-context';
 import {defineRoute} from '@shipfox/node-fastify';
 import {z} from 'zod';
 import {testAndSaveModelProviderConfig} from '#core/index.js';
+import type {AgentSecretsClient} from '#core/secrets-client.js';
 import {toModelProviderConfigDto} from '#presentation/dto/index.js';
 import {translateModelProviderRouteError} from './errors.js';
 
-export const upsertModelProviderConfigRoute = defineRoute({
-  method: 'PUT',
-  path: '/model-providers/:providerId',
-  description: 'Test and save a model provider configuration for a workspace',
-  schema: {
-    params: z.object({
-      workspaceId: z.string().uuid(),
-      providerId: supportedModelProviderIdSchema,
-    }),
-    body: updateModelProviderConfigBodySchema,
-    response: {
-      200: modelProviderConfigDtoSchema,
+export function createUpsertModelProviderConfigRoute(secrets: AgentSecretsClient) {
+  return defineRoute({
+    method: 'PUT',
+    path: '/model-providers/:providerId',
+    description: 'Test and save a model provider configuration for a workspace',
+    schema: {
+      params: z.object({
+        workspaceId: z.string().uuid(),
+        providerId: supportedModelProviderIdSchema,
+      }),
+      body: updateModelProviderConfigBodySchema,
+      response: {
+        200: modelProviderConfigDtoSchema,
+      },
     },
-  },
-  errorHandler: translateModelProviderRouteError,
-  handler: async (request, reply) => {
-    const {workspaceId, providerId} = request.params;
-    const abortController = new AbortController();
-    let responseFinished = false;
-    reply.raw.on('finish', () => {
-      responseFinished = true;
-    });
-    reply.raw.on('close', () => {
-      if (!responseFinished) abortController.abort();
-    });
+    errorHandler: translateModelProviderRouteError,
+    handler: async (request, reply) => {
+      const {workspaceId, providerId} = request.params;
+      const abortController = new AbortController();
+      let responseFinished = false;
+      reply.raw.on('finish', () => {
+        responseFinished = true;
+      });
+      reply.raw.on('close', () => {
+        if (!responseFinished) abortController.abort();
+      });
 
-    const membership = requireWorkspaceAccess({request, workspaceId});
+      const membership = requireWorkspaceAccess({request, workspaceId});
 
-    const config = await testAndSaveModelProviderConfig({
-      workspaceId,
-      providerId,
-      ...('default_model' in request.body ? {defaultModel: request.body.default_model} : {}),
-      credentials: request.body.credentials,
-      editedBy: membership.userId,
-      setAsDefault: request.body.set_as_default,
-      signal: abortController.signal,
-    });
+      const config = await testAndSaveModelProviderConfig(
+        {
+          workspaceId,
+          providerId,
+          ...('default_model' in request.body ? {defaultModel: request.body.default_model} : {}),
+          credentials: request.body.credentials,
+          editedBy: membership.userId,
+          setAsDefault: request.body.set_as_default,
+          signal: abortController.signal,
+        },
+        {secrets},
+      );
 
-    return toModelProviderConfigDto(config);
-  },
-});
+      return toModelProviderConfigDto(config);
+    },
+  });
+}

package/test/fixtures/secrets-client.ts

@@ -0,0 +1,80 @@
+import {secretsInterModuleContract} from '@shipfox/api-secrets-dto/inter-module';
+import {createInterModuleKnownError} from '@shipfox/inter-module';
+import type {AgentSecretsClient} from '#core/secrets-client.js';
+
+const values = new Map<string, string>();
+
+function scopeId(params: {
+  workspaceId: string;
+  projectId?: string | null | undefined;
+  namespace?: string | undefined;
+}) {
+  return `${params.workspaceId}\0${params.projectId ?? ''}\0${params.namespace ?? ''}`;
+}
+
+function keyId(
+  params: {
+    workspaceId: string;
+    projectId?: string | null | undefined;
+    namespace?: string | undefined;
+  },
+  key: string,
+) {
+  return `${scopeId(params)}\0${key}`;
+}
+
+export const agentTestSecretsClient: AgentSecretsClient = {
+  deleteSecrets: async (params) => {
+    const keys = params.keys ?? (await getSecretsByNamespace(params));
+    let deleted = 0;
+    for (const key of Array.isArray(keys) ? keys : Object.keys(keys)) {
+      if (values.delete(keyId(params, key))) deleted += 1;
+    }
+    return {deleted};
+  },
+  getSecretsByNamespace: async (params) => ({values: await getSecretsByNamespace(params)}),
+  setSecrets: async (params) => {
+    await Promise.resolve();
+    for (const value of Object.values(params.values)) {
+      if (Buffer.byteLength(value, 'utf8') > 64 * 1024) {
+        throw createInterModuleKnownError(
+          secretsInterModuleContract.methods.setSecrets,
+          'value-too-large',
+          {maxBytes: 64 * 1024},
+        );
+      }
+    }
+    for (const [key, value] of Object.entries(params.values)) values.set(keyId(params, key), value);
+    return {};
+  },
+};
+
+export async function getSecretsByNamespace(params: {
+  workspaceId: string;
+  projectId?: string | null | undefined;
+  namespace?: string | undefined;
+}): Promise<Record<string, string>> {
+  await Promise.resolve();
+  const selected = new Map<string, string>();
+  const workspaceScope = `${scopeId({...params, projectId: null})}\0`;
+  const projectScope = `${scopeId(params)}\0`;
+  for (const [id, value] of values) {
+    if (id.startsWith(workspaceScope)) selected.set(id.slice(workspaceScope.length), value);
+    if (params.projectId && id.startsWith(projectScope))
+      selected.set(id.slice(projectScope.length), value);
+  }
+  return Object.fromEntries(selected);
+}
+
+export async function setSecrets(params: {
+  workspaceId: string;
+  projectId?: string | null | undefined;
+  namespace?: string | undefined;
+  values: Record<string, string>;
+}): Promise<void> {
+  await agentTestSecretsClient.setSecrets(params);
+}
+
+export function resetAgentTestSecrets(): void {
+  values.clear();
+}

package/test/globalSetup.ts

@@ -1,5 +1,4 @@
 import './env.js';
-import {secretsModule} from '@shipfox/api-secrets';
 import {runMigrations} from '@shipfox/node-drizzle';
 import {closePostgresClient, createPostgresClient} from '@shipfox/node-postgres';
 import {sql} from 'drizzle-orm';
@@ -9,14 +8,6 @@ export async function setup() {
   createPostgresClient();
 
   await runMigrations(db(), migrationsPath, '__drizzle_migrations_agent');
-  if (!secretsModule.database || Array.isArray(secretsModule.database)) {
-    throw new Error('Secrets module database is not configured');
-  }
-  await runMigrations(
-    secretsModule.database.db(),
-    secretsModule.database.migrationsPath,
-    '__drizzle_migrations_secrets',
-  );
   await db().execute(sql`TRUNCATE model_provider_configs CASCADE`);
   await db().execute(sql`TRUNCATE agent_workspace_settings CASCADE`);
 

package/test/setup.ts

@@ -2,6 +2,13 @@ import './env.js';
 import {closePostgresClient, createPostgresClient} from '@shipfox/node-postgres';
 import {afterAll, afterEach, beforeAll, vi} from '@shipfox/vitest/vi';
 import {closeDb} from '#db/index.js';
+import {agentTestSecretsClient, resetAgentTestSecrets} from '#test/fixtures/secrets-client.js';
+
+vi.doMock('#core/secrets-client.js', () => {
+  return {
+    requireAgentSecretsClient: (client: unknown) => client ?? agentTestSecretsClient,
+  };
+});
 
 beforeAll(() => {
   createPostgresClient();
@@ -9,6 +16,7 @@ beforeAll(() => {
 
 afterEach(() => {
   vi.restoreAllMocks();
+  resetAgentTestSecrets();
 });
 
 afterAll(async () => {