github_mirrors/puter
1
0
Fork 0
mirror of https://github.com/HeyPuter/puter.git synced 2025-02-02 14:18:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

dev: use message normalization and clean up openai service

Browse Source
This commit is contained in:
KernelDeimos 2025-01-29 16:45:15 -05:00
parent 0009ededfa
commit 7151723894
2 changed files with 6 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/backend/src/modules/puterai/AIChatService.js
View File

@ -27,6 +27,7 @@ const { TypedValue } = require("../../services/drivers/meta/Runtime");
const { Context } = require("../../util/context");
const { AsModeration } = require("./lib/AsModeration");
const FunctionCalling = require("./lib/FunctionCalling");
const Messages = require("./lib/Messages");
// Maximum number of fallback attempts when a model fails, including the first attempt
const MAX_FALLBACKS = 3 + 1; // includes first attempt
@ -351,6 +352,10 @@ class AIChatService extends BaseService {
test_mode = true;
}
if ( parameters.messages ) {
Messages.normalize_messages(parameters.messages);
}
if ( ! test_mode && ! await this.moderate(parameters) ) {
test_mode = true;
}

44
src/backend/src/modules/puterai/OpenAICompletionService.js
View File

@ -251,48 +251,6 @@ class OpenAICompletionService extends BaseService {
model = model ?? this.get_default_model();
for ( let i = 0; i < messages.length; i++ ) {
let msg = messages[i];
if ( typeof msg === 'string' ) msg = { content: msg };
if ( typeof msg !== 'object' ) {
throw new Error('each message must be a string or an object');
}
if ( ! msg.role ) msg.role = 'user';
if ( msg.role === 'assistant' && ! msg.content ) {
continue;
}
if ( ! msg.content ) {
throw new Error('each message must have a `content` property');
}
const texts = [];
if ( typeof msg.content === 'string' ) texts.push(msg.content);
else if ( typeof msg.content === 'object' ) {
if ( Array.isArray(msg.content) ) {
texts.push(...msg.content.filter(o => (
( ! o.type && o.hasOwnProperty('text') ) ||
o.type === 'text')).map(o => o.text));
}
else texts.push(msg.content.text);
}
this.log.noticeme('OPENAI MODERATION CHECK', {
moderation,
context_value: Context.get('moderated'),
})
if ( moderation && ! Context.get('moderated') ) {
console.log('RAN MODERATION');
for ( const text of texts ) {
const moderation_result = await this.check_moderation(text);
if ( moderation_result.flagged ) {
throw new Error('message is not allowed');
}
}
}
messages[i] = msg;
}
messages.unshift({
role: 'system',
content: 'You are running inside a Puter app.',
@ -320,7 +278,7 @@ class OpenAICompletionService extends BaseService {
if ( ! msg.content ) continue;
if ( typeof msg.content !== 'object' ) continue;
const content = smol.ensure_array(msg.content);
const content = msg.content;
for ( const o of content ) {
if ( ! o.hasOwnProperty('image_url') ) continue;