xonecas.io
53129
Pa

PAT / commit 9b28426

fix: implement code review changes

xonecas2025-12-21 9b28426400bd956984a339831dcc41222d1ddbf5 parent f78b84a

5 files changed

src/components/MessageEditor.tsx+1−1
@@ -35,7 +35,7 @@ export default function MessageEditor() {
3535 );
3636
3737 const { mutate: createThreadMessage, isPending: isCreatingThreadMessage } = useNewThreadMessage(
38- selectedThreadId || 0,
38+ selectedThreadId,
3939 userMessage,
4040 () => {
4141 setUserMessage("");
src/hooks/api/useNewThreadMessage.ts+12−1
@@ -3,11 +3,19 @@
33 import { Message } from "@/src/lib/db/schema";
44 import { useMutation, useQueryClient } from "@tanstack/react-query";
55
6-export function useNewThreadMessage(threadId: number, message: string, onSuccess?: () => void) {
6+export function useNewThreadMessage(
7+ threadId: number | null,
8+ message: string,
9+ onSuccess?: () => void
10+) {
711 const queryClient = useQueryClient();
812
913 return useMutation<{ message: Message }, Error>({
1014 mutationFn: async () => {
15+ if (!threadId) {
16+ throw new Error("Thread ID is required");
17+ }
18+
1119 const response = await fetch(`/api/threads/${threadId}/messages`, {
1220 method: "POST",
1321 body: JSON.stringify({ message }),
@@ -18,6 +26,9 @@ export function useNewThreadMessage(threadId: number, message: string, onSuccess
1826 return response.json();
1927 },
2028 onSuccess: () => {
29+ if (!threadId) {
30+ return;
31+ }
2132 queryClient.invalidateQueries({ queryKey: ["threadMessages", threadId] });
2233 onSuccess?.();
2334 },
src/hooks/api/useThreadMessages.ts+2−1
@@ -14,7 +14,7 @@ export function useThreadMessages(threadId: number | null, optionalRoles: string
1414 queryFn: async () => {
1515 if (!threadId) {
1616 console.error("Thread ID is missing");
17- return [];
17+ return { messages: [] };
1818 }
1919 const requestParams = new URLSearchParams();
2020 if (optionalRoles.length > 0) {
@@ -26,5 +26,6 @@ export function useThreadMessages(threadId: number | null, optionalRoles: string
2626 }
2727 return response.json();
2828 },
29+ enabled: threadId !== null,
2930 });
3031 }
src/lib/chat.ts+4−7
@@ -39,20 +39,17 @@ export async function generateResponse(threadId: number) {
3939 role: message.role,
4040 content: message.content,
4141 }));
42+ let iterations = 0;
4243 let toolCallsExist = true;
43- let errors = [];
4444
4545 // Repeatedly generate model responses until no tool calls remain
4646 while (toolCallsExist) {
47- // Check if we have errors from tool calls.
48- errors = chatMessages.filter(
49- (message) => message.role === "tool" && message.content.includes("Error:")
50- );
47+ iterations++;
5148
5249 const response = await ollama.chat({
5350 model: thread[0].model,
5451 messages: chatMessages,
55- tools: errors.length > 0 ? undefined : tools, // If we have errors, force an answer with no tool calls.
52+ tools: iterations >= 10 ? undefined : tools, // Avoid looping forever
5653 think: true,
5754 });
5855
@@ -71,7 +68,7 @@ export async function generateResponse(threadId: number) {
7168 });
7269 } catch (error) {
7370 const content = `${toolCall.function.name}: Error: ${error instanceof Error ? error.message : "Unknown error"}`;
74- createMessage(content, "tool", threadId);
71+ await createMessage(content, "tool", threadId);
7572 chatMessages.push({
7673 role: "tool",
7774 content: content,
src/lib/threads.ts+9−6
@@ -1,16 +1,17 @@
11 import { generateResponse } from "@/src/lib/chat";
22 import { db } from "@/src/lib/db";
33 import { threads } from "@/src/lib/db/schema";
4+import { debug } from "@/src/lib/debug";
45 import { createMessage } from "@/src/lib/messages";
56 import ollama from "ollama";
67
7-export async function generateTitle(model: string, message: string): Promise<string | null> {
8+export async function generateTitle(model: string, message: string): Promise<string> {
89 const response = await ollama.generate({
910 model: model,
10- prompt: `Create a concise summary of the following message: "${message}. Return only alphanumeric characters and spaces."`,
11+ prompt: `Create a concise summary using only alphanumeric characters and spaces of the following message: "${message}."`,
1112 });
1213
13- return response.response || message.substring(0, 100);
14+ return response.response ?? message.substring(0, 100);
1415 }
1516
1617 export function generateSystemPrompt(options: {
@@ -78,9 +79,11 @@ export async function createThread(
7879 time: string,
7980 timezone: string
8081 ) {
81- let title = await generateTitle(model, userMessage);
82- if (!title) {
83- title = userMessage.substring(0, 100);
82+ let title = userMessage.substring(0, 100);
83+ try {
84+ title = await generateTitle(model, userMessage);
85+ } catch (error) {
86+ debug(`[Threads] Error generating title:`, error);
8487 }
8588
8689 const newThread = await db