Make sure preprompt is set on open ai endpoint type (#913)

* Make sure preprompt is set on open ai endpoint type * fix preprompt passing to conversation
huggingface · Mar 7, 2024 · bcfa394 · bcfa394
1 parent 09eb258
commit bcfa394
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 21 deletions.
diff --git a/src/lib/server/endpoints/openai/endpointOai.ts b/src/lib/server/endpoints/openai/endpointOai.ts
@@ -67,7 +67,11 @@ export async function endpointOai(
  }));
 
  if (messagesOpenAI?.[0]?.role !== "system") {
- messagesOpenAI = [{ role: "system", content: preprompt ?? "" }, ...messagesOpenAI];
+ messagesOpenAI = [{ role: "system", content: "" }, ...messagesOpenAI];
+ }
+
+ if (messagesOpenAI?.[0]) {
+ messagesOpenAI[0].content = preprompt ?? "";
  }
 
  return openAIChatToTextGenerationStream(

diff --git a/src/routes/conversation/+server.ts b/src/routes/conversation/+server.ts
@@ -34,11 +34,29 @@ export const POST: RequestHandler = async ({ locals, request }) => {
  );
  }
 
+ // get preprompt from assistant if it exists
+
+ const model = models.find((m) => m.name === values.model);
+
+ if (!model) {
+ throw error(400, "Invalid model");
+ }
+
+ const assistant = await collections.assistants.findOne({
+ _id: new ObjectId(values.assistantId),
+ });
+
+ if (assistant) {
+ values.preprompt = assistant.preprompt;
+ } else {
+ values.preprompt ??= model?.preprompt ?? "";
+ }
+
  let messages: Message[] = [
  {
  id: v4(),
  from: "system",
- content: values.preprompt ?? "",
+ content: values.preprompt,
  createdAt: new Date(),
  updatedAt: new Date(),
  children: [],
@@ -67,37 +85,19 @@ export const POST: RequestHandler = async ({ locals, request }) => {
  embeddingModel = conversation.embeddingModel;
  }
 
- const model = models.find((m) => m.name === values.model);
-
- if (!model) {
- throw error(400, "Invalid model");
- }
-
  embeddingModel ??= model.embeddingModel ?? defaultEmbeddingModel.name;
 
  if (model.unlisted) {
  throw error(400, "Can't start a conversation with an unlisted model");
  }
 
- // Use the model preprompt if there is no conversation/preprompt in the request body
- const preprompt = await (async () => {
- if (values.assistantId) {
- const assistant = await collections.assistants.findOne({
- _id: new ObjectId(values.assistantId),
- });
- return assistant?.preprompt;
- } else {
- return values?.preprompt ?? model?.preprompt;
- }
- })();
-
  const res = await collections.conversations.insertOne({
  _id: new ObjectId(),
  title: title || "New Chat",
  rootMessageId,
  messages,
  model: values.model,
- preprompt: preprompt === model?.preprompt ? model?.preprompt : preprompt,
+ preprompt: values.preprompt,
  assistantId: values.assistantId ? new ObjectId(values.assistantId) : undefined,
  createdAt: new Date(),
  updatedAt: new Date(),