Skip to content

Fix: Allow 'tool' role in ChatMessageInput #501

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
otchlan wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix: Allow 'tool' role in ChatMessageInput #501

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 25 additions & 5 deletions packages/lms-client/src/ChatInput.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
//packages/lms-client/src/ChatInput.ts
import {
type ChatHistoryData,
type ChatMessageData,
type ChatMessageRoleData,
chatMessageRoleDataSchema,
type ChatMessagePartFileData,
type ChatMessagePartTextData,
} from "@lmstudio/lms-shared-types";
Expand All @@ -17,7 +20,7 @@ export interface ChatMessageInput {
* The sender of this message. Only "user", "assistant", and "system" is allowed. Defaults to
* "user" if not specified.
*/
role?: "user" | "assistant" | "system";
role?: ChatMessageRoleData;
/**
* Text content of the message.
*/
Expand All @@ -29,7 +32,7 @@ export interface ChatMessageInput {
images?: Array<FileHandle>;
}
export const chatMessageInputSchema = z.object({
role: z.enum(["user", "assistant", "system"]).optional(),
role: chatMessageRoleDataSchema.optional(),
content: z.string().optional(),
images: z.array(z.instanceof(FileHandle)).optional(),
});
Expand Down Expand Up @@ -72,10 +75,27 @@ export function chatMessageInputToChatMessageData(
chatMessageInput: ChatMessageInput,
): ChatMessageData {
const { role, content, images } = chatMessageInput;

// Jeśli rola to "tool", zwróć specjalną strukturę
if (role === "tool") {
if (content === undefined) {
throw new Error("Tool messages must have content");
}
// Tool messages wymagają toolCallResult parts
return {
role: "tool",
content: [{
type: "toolCallResult",
content: content,
// toolCallId i name są opcjonalne
}],
};
}

// Reszta kodu dla user/assistant/system bez zmian...
const parts: Array<ChatMessagePartTextData | ChatMessagePartFileData> = [];
if (images === undefined || images.length === 0) {
if (content === undefined) {
// If both content and file are undefined, let's just create an empty part.
parts.push({
type: "text",
text: "",
Expand All @@ -101,5 +121,5 @@ export function chatMessageInputToChatMessageData(
return {
role: role ?? "user",
content: parts,
};
}
} as ChatMessageData;
}
Loading