Merge pull request #257 from lmstudio-ai/ryan/fix-validator

Fix validator not returning parsed value
lmstudio-ai · Mar 4, 2025 · 4a8ac2f · 4a8ac2f
2 parents 6663b21 + 0b7e721
commit 4a8ac2f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/packages/lms-client/src/Chat.ts b/packages/lms-client/src/Chat.ts
@@ -406,11 +406,11 @@ export class Chat extends MaybeMutable<ChatHistoryData> {
  */
 export type ChatLike = ChatInput | string | Chat | ChatMessageInput | ChatHistoryData;
 export const chatHistoryLikeSchema = z.union([
+  z.instanceof(Chat as any),
   chatHistoryDataSchema,
   z.string(),
   chatHistoryInputSchema,
   chatMessageInputSchema,
-  z.instanceof(Chat as any),
 ]) as ZodSchema<ChatLike>;
 
 /**
@@ -772,8 +772,8 @@ export class ChatMessage extends MaybeMutable<ChatMessageData> {
  */
 export type ChatMessageLike = ChatMessageInput | string | ChatMessage | ChatMessageData;
 export const chatMessageLikeSchema = z.union([
+  z.instanceof(ChatMessage as any),
   chatMessageInputSchema,
   z.string(),
-  z.instanceof(ChatMessage as any),
   chatMessageDataSchema,
 ]) as ZodSchema<ChatMessageLike>;
diff --git a/packages/lms-client/src/llm/LLMDynamicHandle.ts b/packages/lms-client/src/llm/LLMDynamicHandle.ts
@@ -134,7 +134,9 @@ export interface LLMRespondOpts<TStructuredOutputType = unknown>
    */
   onMessage?: (message: ChatMessage) => void;
 }
-const llmRespondOptsSchema = llmPredictionOptsSchema;
+const llmRespondOptsSchema = llmPredictionOptsSchema.extend({
+  onMessage: z.function().optional(),
+});
 
 type LLMRespondExtraOpts<TStructuredOutputType = unknown> = Omit<
   LLMRespondOpts<TStructuredOutputType>,

diff --git a/packages/lms-common/src/Validator.ts b/packages/lms-common/src/Validator.ts
@@ -91,7 +91,7 @@ export class Validator {
         index,
       }));
     if (errors.length === 0) {
-      return values as T;
+      return results.map(result => (result as any).data) as T;
     } else {
       const erroredValues = new Set(errors.map(({ index }) => index));
       const lead = leadProducer(erroredValues);