fix: conflicts

ShivTestOrg · Oct 27, 2024 · 9efaf53 · 9efaf53
1 parent e0b252a
commit 9efaf53
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 16 deletions.
diff --git a/package.json b/package.json
@@ -17,7 +17,7 @@
     "knip-ci": "knip --no-exit-code --reporter json --config .github/knip.ts",
     "prepare": "husky install",
     "test": "jest --setupFiles dotenv/config --coverage",
-    "worker": "wrangler dev --env dev --port 4000"
+    "worker": "wrangler dev --env dev --port 5000"
   },
   "keywords": [
     "typescript",

diff --git a/src/handlers/ask-llm.ts b/src/handlers/ask-llm.ts
@@ -59,25 +59,15 @@ export async function askGpt(context: Context, question: string, formattedChat:
   formattedChat = formattedChat.filter((text) => text !== null);
   similarText = similarText.filter((text) => text !== "");
   const rerankedText = similarText.length > 0 ? await context.adapters.voyage.reranker.reRankResults(similarText, question) : [];
-  //Calculate the current context size in tokens
-  const numTokens = await context.adapters.openai.completions.findTokenLength(question, rerankedText, formattedChat, [
-    "typescript",
-    "github",
-    "cloudflare worker",
-    "actions",
-    "jest",
-    "supabase",
-    "openai",
-  ]);
-  context.logger.info(`Number of tokens: ${numTokens}`);
-
   const languages = await fetchRepoLanguageStats(context);
   const { dependencies, devDependencies } = await fetchRepoDependencies(context);
   const groundTruths = await findGroundTruths(context, "chat-bot", {
     languages,
     dependencies,
     devDependencies,
   });
-
+  //Calculate the current context size in tokens
+  const numTokens = await context.adapters.openai.completions.findTokenLength(question, rerankedText, formattedChat, groundTruths);
+  context.logger.info(`Number of tokens: ${numTokens}`);
   return context.adapters.openai.completions.createCompletion(question, model, rerankedText, formattedChat, groundTruths, UBIQUITY_OS_APP_NAME);
 }
diff --git a/tests/main.test.ts b/tests/main.test.ts
@@ -107,7 +107,7 @@ describe("Ask plugin tests", () => {
     createComments([transformCommentTemplate(1, 1, TEST_QUESTION, "ubiquity", "test-repo", true)]);
     await runPlugin(ctx);
 
-    expect(infoSpy).toHaveBeenCalledTimes(4);
+    expect(infoSpy).toHaveBeenCalledTimes(5);
     expect(infoSpy).toHaveBeenNthCalledWith(1, `Asking question: @UbiquityOS ${TEST_QUESTION}`);
     expect(infoSpy).toHaveBeenNthCalledWith(4, "Answer: This is a mock answer for the chat", {
       caller: LOG_CALLER,
@@ -131,7 +131,7 @@ describe("Ask plugin tests", () => {
 
     await runPlugin(ctx);
 
-    expect(infoSpy).toHaveBeenCalledTimes(4);
+    expect(infoSpy).toHaveBeenCalledTimes(5);
 
     expect(infoSpy).toHaveBeenNthCalledWith(1, `Asking question: @UbiquityOS ${TEST_QUESTION}`);