createPrompt responsible for assigning completionParams

nvms · Dec 4, 2023 · 9bca37a · 9bca37a
1 parent d1bd7ef
commit 9bca37a
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 36 deletions.
diff --git a/extension/dist/extension.umd.js b/extension/dist/extension.umd.js
diff --git a/extension/src/command.ts b/extension/src/command.ts
@@ -7,6 +7,7 @@ export async function createPrompt(prompt: PromptDefinition & { promptId: string
   const editor = vscode.window.activeTextEditor;
   const readable = getHumanReadableLanguageName(languageid(editor), extension(editor));
   const selection = getSelectionInfo(editor);
+  const completionParams = getActiveModeActivePresetKeyValue("completionParams") as Preset["completionParams"];
 
   const substitute = async (text: string) => {
     text = text.replaceAll("{{ft}}", languageid(editor));
@@ -53,11 +54,10 @@ export async function createPrompt(prompt: PromptDefinition & { promptId: string
         if (matchGroups && matchGroups.length === 3) {
           const paramName = matchGroups[1];
           const paramValue = matchGroups[2];
-          const activePresetCompletionParameters = getActiveModeActivePresetKeyValue("completionParams") as Preset["completionParams"];
 
-          // If the active preset has a completion parameter with this name, overwrite it with this value.
-          if (Object.hasOwnProperty.call(activePresetCompletionParameters, paramName)) {
-            activePresetCompletionParameters[paramName] = paramValue;
+          if (Object.hasOwnProperty.call(completionParams, paramName)) {
+            const numberRegex = /^[0-9]+(\.[0-9]+)?$/;
+            completionParams[paramName] = numberRegex.test(paramValue) ? Number(paramValue) : paramValue;
           }
 
           text = text.replace(match, "");
@@ -74,5 +74,5 @@ export async function createPrompt(prompt: PromptDefinition & { promptId: string
   const message = await substitute(prompt.message);
   const system = await substitute(prompt.system ?? getActiveModeActivePresetKeyValue("system") as Preset["system"]);
 
-  return { message, system };
+  return { message, system, completionParams };
 }
diff --git a/extension/src/dispatcher.ts b/extension/src/dispatcher.ts
@@ -1,5 +1,5 @@
 import * as vscode from "vscode";
-import { ChatEvents, InsertionMethod, PromptDefinition } from "../../shared";
+import { ChatEvents, InsertionMethod, PromptDefinition, Preset } from "../../shared";
 import { createPrompt } from "./command";
 import { providers } from "./providers/common";
 import { OpenAIProvider } from "./providers/openai";
@@ -145,7 +145,7 @@ export type PreparedCommand = {
   system: string;
   insertionMethod: InsertionMethod;
   url: string;
-  completionParams: Record<string, string | number | boolean | any[]>;
+  completionParams: Preset["completionParams"];
 };
 
 const prepareCommand = async (prompt: PromptDefinition & { promptId: string }): Promise<PreparedCommand> => {
@@ -161,6 +161,5 @@ const prepareCommand = async (prompt: PromptDefinition & { promptId: string }):
     ...substituted,
     insertionMethod,
     url: getActiveModeActivePresetKeyValue("url") as string,
-    completionParams: getActiveModeActivePresetKeyValue("completionParams") as Record<string, string | number | boolean>,
   };
 };