rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2025-06-05 21:59:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Rename MakerSuite => AI Studio

Browse Source
This commit is contained in:
Cohee
2024-08-21 21:00:17 +03:00
parent 86ec1fdd40
commit 06e3d5f8de
22 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/endpoints/backends/chat-completions.js
View File

@@ -259,7 +259,7 @@ async function sendMakerSuiteRequest(request, response) {
const apiKey = request.body.reverse_proxy ? request.body.proxy_password : readSecret(request.user.directories, SECRET_KEYS.MAKERSUITE);
if (!request.body.reverse_proxy && !apiKey) {
console.log('MakerSuite API key is missing.');
console.log('Google AI Studio API key is missing.');
return response.status(400).send({ error: true });
}
@@ -326,7 +326,7 @@ async function sendMakerSuiteRequest(request, response) {
}
const body = isGemini ? getGeminiBody() : getBisonBody();
console.log('MakerSuite request:', body);
console.log('Google AI Studio request:', body);
try {
const controller = new AbortController();
@@ -362,7 +362,7 @@ async function sendMakerSuiteRequest(request, response) {
}
} else {
if (!generateResponse.ok) {
console.log(`MakerSuite API returned error: ${generateResponse.status} ${generateResponse.statusText} ${await generateResponse.text()}`);
console.log(`Google AI Studio API returned error: ${generateResponse.status} ${generateResponse.statusText} ${await generateResponse.text()}`);
return response.status(generateResponse.status).send({ error: true });
}
@@ -370,7 +370,7 @@ async function sendMakerSuiteRequest(request, response) {
const candidates = generateResponseJson?.candidates;
if (!candidates || candidates.length === 0) {
let message = 'MakerSuite API returned no candidate';
let message = 'Google AI Studio API returned no candidate';
console.log(message, generateResponseJson);
if (generateResponseJson?.promptFeedback?.blockReason) {
message += `\nPrompt was blocked due to : ${generateResponseJson.promptFeedback.blockReason}`;
@@ -381,19 +381,19 @@ async function sendMakerSuiteRequest(request, response) {
const responseContent = candidates[0].content ?? candidates[0].output;
const responseText = typeof responseContent === 'string' ? responseContent : responseContent?.parts?.[0]?.text;
if (!responseText) {
let message = 'MakerSuite Candidate text empty';
let message = 'Google AI Studio Candidate text empty';
console.log(message, generateResponseJson);
return response.send({ error: { message } });
}
console.log('MakerSuite response:', responseText);
console.log('Google AI Studio response:', responseText);
// Wrap it back to OAI format
const reply = { choices: [{ 'message': { 'content': responseText } }] };
return response.send(reply);
}
} catch (error) {
console.log('Error communicating with MakerSuite API: ', error);
console.log('Error communicating with Google AI Studio API: ', error);
if (!response.headersSent) {
return response.status(500).send({ error: true });
}

2
src/endpoints/google.js
View File

@@ -44,7 +44,7 @@ router.post('/caption-image', jsonParser, async (request, response) => {
if (!result.ok) {
const error = await result.json();
console.log(`MakerSuite API returned error: ${result.status} ${result.statusText}`, error);
console.log(`Google AI Studio API returned error: ${result.status} ${result.statusText}`, error);
return response.status(result.status).send({ error: true });
}

8
src/vectors/makersuite-vectors.js
View File

@@ -23,8 +23,8 @@ async function getMakerSuiteVector(text, directories) {
const key = readSecret(directories, SECRET_KEYS.MAKERSUITE);
if (!key) {
console.log('No MakerSuite key found');
throw new Error('No MakerSuite key found');
console.log('No Google AI Studio key found');
throw new Error('No Google AI Studio key found');
}
const response = await fetch(`https://generativelanguage.googleapis.com/v1beta/models/embedding-gecko-001:embedText?key=${key}`, {
@@ -39,8 +39,8 @@ async function getMakerSuiteVector(text, directories) {
if (!response.ok) {
const text = await response.text();
console.log('MakerSuite request failed', response.statusText, text);
throw new Error('MakerSuite request failed');
console.log('Google AI Studio request failed', response.statusText, text);
throw new Error('Google AI Studio request failed');
}
const data = await response.json();