Wroclaw/GPTcord
1
0
Fork 0
Code Issues 7 Pull requests 1 Releases Activity

functionManager: Forward username mapping here

Browse source
This commit is contained in:
Wroclaw 2023-09-28 11:42:01 +02:00
parent 52f16c9d0a
commit 6e0a5e72ea
2 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/execution.ts
View file

@ -212,6 +212,7 @@ async function executeFromQueue(channel: string) {
const message = channelQueue.at(0) as RequestMessage; const message = channelQueue.at(0) as RequestMessage;
let functionRanCounter = 0; let functionRanCounter = 0;
let OpenAImessages: ChatCompletionMessageParam[] = []; let OpenAImessages: ChatCompletionMessageParam[] = [];
let modelUsernameMap: Map<string, string>;
// ignore if we can't even send anything to reply // ignore if we can't even send anything to reply
if (!canReplyToRequest(message)) return; if (!canReplyToRequest(message)) return;
@ -237,7 +238,7 @@ async function executeFromQueue(channel: string) {
return b.createdTimestamp - a.createdTimestamp; return b.createdTimestamp - a.createdTimestamp;
}); });
[OpenAImessages] = toOpenAIMessages(messages.values()); [OpenAImessages, modelUsernameMap] = toOpenAIMessages(messages.values());
let generatedMessage: ChatCompletionMessage | undefined = undefined; let generatedMessage: ChatCompletionMessage | undefined = undefined;
let answer: Awaited<ReturnType<typeof openai.chat.completions.create>>; let answer: Awaited<ReturnType<typeof openai.chat.completions.create>>;
@ -259,7 +260,7 @@ async function executeFromQueue(channel: string) {
OpenAImessages.push(generatedMessage); OpenAImessages.push(generatedMessage);
// FIXME: don't use new instance of FunctionManager // FIXME: don't use new instance of FunctionManager
OpenAImessages.push( OpenAImessages.push(
new FunctionManager().handleFunction(generatedMessage.function_call) new FunctionManager().handleFunction(generatedMessage.function_call, modelUsernameMap)
); );
} }
} while (generatedMessage.function_call); } while (generatedMessage.function_call);

12
src/funcitonManager.ts
View file

@ -43,7 +43,10 @@ export abstract class OpenAIFunction<T extends nameTypeMap = nameTypeMap> {
}; };
} }
abstract execute(data: OpenAIFunctionRequestData<T>): string; abstract execute(
data: OpenAIFunctionRequestData<T>,
modelUsernameMap: Map<string, string>,
): string;
} }
/* /*
@ -64,7 +67,10 @@ export default class FunctionManager {
return rvalue; return rvalue;
} }
public handleFunction(request: ChatCompletionFunctionCall): ChatCompletionMessageParam { public handleFunction(
request: ChatCompletionFunctionCall,
modelUsernameMap: Map<string, string> = new Map(),
): ChatCompletionMessageParam {
// eslint-disable-next-line @typescript-eslint/no-explicit-any // eslint-disable-next-line @typescript-eslint/no-explicit-any
let parsedArguments: any; let parsedArguments: any;
@ -91,7 +97,7 @@ export default class FunctionManager {
role: "function", role: "function",
name: request.name, name: request.name,
// eslint-disable-next-line @typescript-eslint/no-unsafe-argument // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
content: functionToRun.execute(parsedArguments), content: functionToRun.execute(parsedArguments, modelUsernameMap),
}; };
} }
} }