fix: types

Author: giladgd

src/evaluator/LlamaChat/LlamaChat.ts

@@ -278,22 +278,7 @@ export type LLamaChatGenerateResponseOptions<Functions extends ChatModelFunction
          * A number between `0` (exclusive) and `1` (inclusive).
          */
         minimumOverlapPercentageToPreventContextShift?: number
-    }
-} & ({
-    grammar?: LlamaGrammar,
-    functions?: never,
-    documentFunctionParams?: never,
-    maxParallelFunctionCalls?: never,
-    onFunctionCall?: never,
-    onFunctionCallParamsChunk?: never
-} | {
-    grammar?: never,
-    functions?: Functions | ChatModelFunctions,
-    documentFunctionParams?: boolean,
-    maxParallelFunctionCalls?: number,
-    onFunctionCall?: (
-        functionCall: LlamaChatResponseFunctionCall<Functions extends ChatModelFunctions ? Functions : ChatModelFunctions>
-    ) => void,
+    },
 
     /**
      * Called as the model generates function calls with the generated parameters chunk for each function call.
@@ -310,6 +295,22 @@ export type LLamaChatGenerateResponseOptions<Functions extends ChatModelFunction
      * Only relevant when using function calling (via passing the `functions` option).
      */
     onFunctionCallParamsChunk?: (chunk: LlamaChatResponseFunctionCallParamsChunk) => void
+} & ({
+    grammar?: LlamaGrammar,
+    functions?: never,
+    documentFunctionParams?: never,
+    maxParallelFunctionCalls?: never,
+    onFunctionCall?: never,
+    onFunctionCallParamsChunk?: never
+} | {
+    grammar?: never,
+    functions?: Functions | ChatModelFunctions,
+    documentFunctionParams?: boolean,
+    maxParallelFunctionCalls?: number,
+    onFunctionCall?: (
+        functionCall: LlamaChatResponseFunctionCall<Functions extends ChatModelFunctions ? Functions : ChatModelFunctions>
+    ) => void,
+    onFunctionCallParamsChunk?: (chunk: LlamaChatResponseFunctionCallParamsChunk) => void
 });
 
 export type LLamaChatLoadAndCompleteUserMessageOptions<Functions extends ChatModelFunctions | undefined = undefined> = {

src/evaluator/LlamaChatSession/LlamaChatSession.ts

@@ -193,18 +193,7 @@ export type LLamaChatPromptOptions<Functions extends ChatSessionModelFunctions |
     /**
      * Custom stop triggers to stop the generation of the response when any of the provided triggers are found.
      */
-    customStopTriggers?: (LlamaText | string | (string | Token)[])[]
-} & ({
-    grammar?: LlamaGrammar,
-    functions?: never,
-    documentFunctionParams?: never,
-    maxParallelFunctionCalls?: never,
-    onFunctionCallParamsChunk?: never
-} | {
-    grammar?: never,
-    functions?: Functions | ChatSessionModelFunctions,
-    documentFunctionParams?: boolean,
-    maxParallelFunctionCalls?: number,
+    customStopTriggers?: (LlamaText | string | (string | Token)[])[],
 
     /**
      * Called as the model generates function calls with the generated parameters chunk for each function call.
@@ -221,6 +210,18 @@ export type LLamaChatPromptOptions<Functions extends ChatSessionModelFunctions |
      * Only relevant when using function calling (via passing the `functions` option).
      */
     onFunctionCallParamsChunk?: (chunk: LlamaChatResponseFunctionCallParamsChunk) => void
+} & ({
+    grammar?: LlamaGrammar,
+    functions?: never,
+    documentFunctionParams?: never,
+    maxParallelFunctionCalls?: never,
+    onFunctionCallParamsChunk?: never
+} | {
+    grammar?: never,
+    functions?: Functions | ChatSessionModelFunctions,
+    documentFunctionParams?: boolean,
+    maxParallelFunctionCalls?: number,
+    onFunctionCallParamsChunk?: (chunk: LlamaChatResponseFunctionCallParamsChunk) => void
 });
 
 export type LLamaChatCompletePromptOptions = {
@@ -462,12 +463,13 @@ export class LlamaChatSession {
         const {responseText} = await this.promptWithMeta<Functions>(prompt, {
             // this is a workaround to allow passing both `functions` and `grammar`
             functions: functions as undefined,
+            grammar: grammar as undefined,
             documentFunctionParams: documentFunctionParams as undefined,
             maxParallelFunctionCalls: maxParallelFunctionCalls as undefined,
             onFunctionCallParamsChunk: onFunctionCallParamsChunk as undefined,
 
             onTextChunk, onToken, onResponseChunk, signal, stopOnAbortSignal, maxTokens,
-            temperature, minP, topK, topP, seed, grammar,
+            temperature, minP, topK, topP, seed,
             trimWhitespaceSuffix, responsePrefix, repeatPenalty, tokenBias, customStopTriggers
         });