ros/claude-task-master
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: implement baseUrls on all ai providers(#521)

Browse Source
This commit is contained in:
Ralph Khreish
2025-05-16 15:34:29 +02:00
committed by GitHub
parent e96734a6cc
commit ed17cb0e0a
12 changed files with 161 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
src/ai-providers/google.js
View File

@@ -12,6 +12,16 @@ import { log } from '../../scripts/modules/utils.js'; // Import logging utility
const DEFAULT_MODEL = 'gemini-2.0-pro'; // Or a suitable default
const DEFAULT_TEMPERATURE = 0.2; // Or a suitable default
function getClient(apiKey, baseUrl) {
if (!apiKey) {
throw new Error('Google API key is required.');
}
return createGoogleGenerativeAI({
apiKey: apiKey,
...(baseUrl && { baseURL: baseUrl })
});
}
/**
* Generates text using a Google AI model.
*
@@ -29,7 +39,8 @@ async function generateGoogleText({
modelId = DEFAULT_MODEL,
temperature = DEFAULT_TEMPERATURE,
messages,
maxTokens // Note: Vercel SDK might handle this differently, needs verification
maxTokens,
baseUrl
}) {
if (!apiKey) {
throw new Error('Google API key is required.');
@@ -37,28 +48,21 @@ async function generateGoogleText({
log('info', `Generating text with Google model: ${modelId}`);
try {
// const google = new GoogleGenerativeAI({ apiKey }); // Incorrect instantiation
const googleProvider = createGoogleGenerativeAI({ apiKey }); // Correct instantiation
// const model = google.getGenerativeModel({ model: modelId }); // Incorrect model retrieval
const model = googleProvider(modelId); // Correct model retrieval
// Construct payload suitable for Vercel SDK's generateText
// Note: The exact structure might depend on how messages are passed
const googleProvider = getClient(apiKey, baseUrl);
const model = googleProvider(modelId);
const result = await generateText({
model, // Pass the model instance
messages, // Pass the messages array directly
model,
messages,
temperature,
maxOutputTokens: maxTokens // Map to correct Vercel SDK param if available
maxOutputTokens: maxTokens
});
// Assuming result structure provides text directly or within a property
return result.text; // Adjust based on actual SDK response
return result.text;
} catch (error) {
log(
'error',
`Error generating text with Google (${modelId}): ${error.message}`
);
throw error; // Re-throw for unified service handler
throw error;
}
}
@@ -79,7 +83,8 @@ async function streamGoogleText({
modelId = DEFAULT_MODEL,
temperature = DEFAULT_TEMPERATURE,
messages,
maxTokens
maxTokens,
baseUrl
}) {
if (!apiKey) {
throw new Error('Google API key is required.');
@@ -87,19 +92,15 @@ async function streamGoogleText({
log('info', `Streaming text with Google model: ${modelId}`);
try {
// const google = new GoogleGenerativeAI({ apiKey }); // Incorrect instantiation
const googleProvider = createGoogleGenerativeAI({ apiKey }); // Correct instantiation
// const model = google.getGenerativeModel({ model: modelId }); // Incorrect model retrieval
const model = googleProvider(modelId); // Correct model retrieval
const googleProvider = getClient(apiKey, baseUrl);
const model = googleProvider(modelId);
const stream = await streamText({
model, // Pass the model instance
model,
messages,
temperature,
maxOutputTokens: maxTokens
});
return stream; // Return the stream directly
return stream;
} catch (error) {
log(
'error',
@@ -130,7 +131,8 @@ async function generateGoogleObject({
messages,
schema,
objectName, // Note: Vercel SDK might use this differently or not at all
maxTokens
maxTokens,
baseUrl
}) {
if (!apiKey) {
throw new Error('Google API key is required.');
@@ -138,23 +140,16 @@ async function generateGoogleObject({
log('info', `Generating object with Google model: ${modelId}`);
try {
// const google = new GoogleGenerativeAI({ apiKey }); // Incorrect instantiation
const googleProvider = createGoogleGenerativeAI({ apiKey }); // Correct instantiation
// const model = google.getGenerativeModel({ model: modelId }); // Incorrect model retrieval
const model = googleProvider(modelId); // Correct model retrieval
const googleProvider = getClient(apiKey, baseUrl);
const model = googleProvider(modelId);
const { object } = await generateObject({
model, // Pass the model instance
model,
schema,
messages,
temperature,
maxOutputTokens: maxTokens
// Note: 'objectName' or 'mode' might not be directly applicable here
// depending on how `@ai-sdk/google` handles `generateObject`.
// Check SDK docs if specific tool calling/JSON mode needs explicit setup.
});
return object; // Return the parsed object
return object;
} catch (error) {
log(
'error',