Skip to content

Commit

Permalink
Add Mistral, use "ai" lib (#321)
Browse files Browse the repository at this point in the history
Co-authored-by: Brett Beutell <[email protected]>
  • Loading branch information
keturiosakys and brettimus authored Oct 18, 2024
1 parent c8d8e6a commit fe38e62
Show file tree
Hide file tree
Showing 19 changed files with 1,018 additions and 795 deletions.
4 changes: 4 additions & 0 deletions api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,9 @@
"fpx": "bin/cli.js"
},
"dependencies": {
"@ai-sdk/anthropic": "^0.0.51",
"@ai-sdk/mistral": "^0.0.42",
"@ai-sdk/openai": "^0.0.66",
"@anthropic-ai/sdk": "^0.24.3",
"@fiberplane/fpx-types": "workspace:*",
"@hono/node-server": "^1.11.1",
Expand All @@ -48,6 +51,7 @@
"@libsql/client": "^0.6.2",
"acorn": "^8.11.3",
"acorn-walk": "^8.3.2",
"ai": "^3.4.10",
"chalk": "^5.3.0",
"dotenv": "^16.4.5",
"drizzle-kit": "^0.24.2",
Expand Down
118 changes: 0 additions & 118 deletions api/src/lib/ai/anthropic.ts

This file was deleted.

174 changes: 112 additions & 62 deletions api/src/lib/ai/index.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,45 @@
import { createAnthropic } from "@ai-sdk/anthropic";
import { createMistral } from "@ai-sdk/mistral";
import { createOpenAI } from "@ai-sdk/openai";
import type { Settings } from "@fiberplane/fpx-types";
import { generateRequestWithAnthropic } from "./anthropic.js";
import { generateRequestWithOpenAI } from "./openai.js";
import { generateObject } from "ai";
import logger from "../../logger.js";
import { invokeRequestGenerationPrompt } from "./prompts.js";
import { requestSchema } from "./tools.js";

function configureProvider(
aiProvider: string,
providerConfig: {
apiKey: string;
baseUrl?: string | undefined;
model: string;
},
) {
if (aiProvider === "openai") {
const openai = createOpenAI({
apiKey: providerConfig.apiKey,
baseURL: providerConfig.baseUrl ?? undefined,
});
return openai(providerConfig.model, { structuredOutputs: true });
}
if (aiProvider === "anthropic") {
const anthropic = createAnthropic({
apiKey: providerConfig.apiKey,
baseURL: providerConfig.baseUrl ?? undefined,
});
return anthropic(providerConfig.model);
}

if (aiProvider === "mistral") {
const mistral = createMistral({
apiKey: providerConfig.apiKey,
baseURL: providerConfig.baseUrl ?? undefined,
});
return mistral(providerConfig.model);
}

throw new Error("Unknown AI provider");
}

export async function generateRequestWithAiProvider({
inferenceConfig,
Expand Down Expand Up @@ -29,67 +68,78 @@ export async function generateRequestWithAiProvider({
}[];
middlewareContext?: string;
}) {
const {
openaiApiKey,
openaiModel,
openaiBaseUrl,
anthropicApiKey,
anthropicModel,
anthropicBaseUrl,
aiProviderType,
} = inferenceConfig;
if (aiProviderType === "openai") {
return generateRequestWithOpenAI({
apiKey: openaiApiKey ?? "",
model: openaiModel ?? "",
baseUrl: openaiBaseUrl,
persona,
method,
path,
handler,
handlerContext,
history,
openApiSpec,
middleware,
middlewareContext,
}).then(
(parsedArgs) => {
return { data: parsedArgs, error: null };
},
(error) => {
if (error instanceof Error) {
return { data: null, error: { message: error.message } };
}
return { data: null, error: { message: "Unknown error" } };
},
);
const { aiEnabled, aiProviderConfigurations, aiProvider } = inferenceConfig;
if (!aiEnabled) {
return { data: null, error: { message: "AI is not enabled" } };
}
if (aiProviderType === "anthropic") {
return generateRequestWithAnthropic({
apiKey: anthropicApiKey ?? "",
baseUrl: anthropicBaseUrl,
model: anthropicModel ?? "",
persona,
method,
path,
handler,
handlerContext,
history,
openApiSpec,
middleware,
middlewareContext,
}).then(
(parsedArgs) => {
return { data: parsedArgs, error: null };
},
(error) => {
if (error instanceof Error) {
return { data: null, error: { message: error.message } };
}
return { data: null, error: { message: "Unknown error" } };
},
);

if (!aiProvider) {
return { data: null, error: { message: "AI provider is not set" } };
}

return { data: null, error: { message: "Unknown AI provider" } };
if (!aiProviderConfigurations || !aiProviderConfigurations[aiProvider]) {
return {
data: null,
error: { message: "AI provider is not configured properly" },
};
}

const providerConfig = aiProviderConfigurations[aiProvider];

const provider = configureProvider(aiProvider, providerConfig);

logger.debug("Generating request with AI provider", {
aiProvider,
providerConfig,
});

try {
const {
object: generatedObject,
warnings,
usage,
} = await generateObject({
model: provider,
schema: requestSchema,
prompt: await invokeRequestGenerationPrompt({
handler,
handlerContext,
history,
openApiSpec,
middleware,
middlewareContext,
persona,
method,
path,
}),
});

logger.debug("Generated object, warnings, usage", {
generatedObject,
warnings,
usage,
});

// Remove x-fpx-trace-id header from the generated object
const filteredHeaders = generatedObject?.headers?.filter(
(header) => header.key.toLowerCase() !== "x-fpx-trace-id",
);

return {
data: { ...generatedObject, headers: filteredHeaders },
error: null,
};
} catch (error) {
logger.error("Error generating request with AI provider", {
error,
});
const errorMessage =
error instanceof Error
? error.message
: "Error generating request with AI provider";
return {
data: null,
error: { message: errorMessage },
};
}
}
Loading

0 comments on commit fe38e62

Please sign in to comment.