xonecas.io
53129
Pa

PAT / commit f78b84a

chore: sort all imports

xonecas2025-12-21 f78b84a379d0ed4aa8ea3f4dfd309ea18f766917 parent b87ddc2

19 files changed

app/api/models/route.ts+1−1
@@ -1,6 +1,6 @@
1+import { debug } from "@/src/lib/debug";
12 import { NextResponse } from "next/server";
23 import ollama from "ollama";
3-import { debug } from "@/src/lib/debug";
44
55 export async function GET() {
66 try {
app/api/threads/[id]/messages/[messageId]/route.ts+2−2
@@ -1,8 +1,8 @@
1-import { NextResponse } from "next/server";
21 import { db } from "@/src/lib/db";
32 import { messages } from "@/src/lib/db/schema";
4-import { eq, and } from "drizzle-orm";
53 import { debug } from "@/src/lib/debug";
4+import { and, eq } from "drizzle-orm";
5+import { NextResponse } from "next/server";
66
77 export async function DELETE(
88 request: Request,
app/api/threads/[id]/messages/route.ts+3−3
@@ -1,10 +1,10 @@
1-import { NextResponse } from "next/server";
1+import { generateResponse } from "@/src/lib/chat";
22 import { db } from "@/src/lib/db";
33 import { messages } from "@/src/lib/db/schema";
4-import { eq, asc, and, inArray } from "drizzle-orm";
54 import { debug } from "@/src/lib/debug";
65 import { createMessage } from "@/src/lib/messages";
7-import { generateResponse } from "@/src/lib/chat";
6+import { and, asc, eq, inArray } from "drizzle-orm";
7+import { NextResponse } from "next/server";
88
99 export async function GET(request: Request, { params }: { params: Promise<{ id: string }> }) {
1010 let threadId: number | null = null;
app/api/threads/[id]/route.ts+2−2
@@ -1,8 +1,8 @@
1-import { NextResponse } from "next/server";
21 import { db } from "@/src/lib/db";
32 import { threads } from "@/src/lib/db/schema";
4-import { eq } from "drizzle-orm";
53 import { debug } from "@/src/lib/debug";
4+import { eq } from "drizzle-orm";
5+import { NextResponse } from "next/server";
66
77 export async function DELETE(request: Request, { params }: { params: Promise<{ id: string }> }) {
88 let threadId: number | null = null;
app/api/threads/route.ts+2−2
@@ -1,9 +1,9 @@
1-import { NextResponse } from "next/server";
21 import { db } from "@/src/lib/db";
32 import { threads } from "@/src/lib/db/schema";
4-import { desc, count } from "drizzle-orm";
53 import { debug } from "@/src/lib/debug";
64 import { createThread } from "@/src/lib/threads";
5+import { count, desc } from "drizzle-orm";
6+import { NextResponse } from "next/server";
77
88 export async function POST(request: Request) {
99 try {
src/components/App.tsx+5−5
@@ -1,13 +1,13 @@
11 "use client";
22
3-import { createContext, useContext, useState } from "react";
4-import { useModels, type Model } from "@/src/hooks/api/useModels";
3+import MessageEditor from "@/src/components/MessageEditor";
54 import MessageList from "@/src/components/MessageList";
6-import Welcome from "@/src/components/Welcome";
75 import Sidebar from "@/src/components/Sidebar";
8-import { useTheme } from "@/src/hooks/useTheme";
6+import Welcome from "@/src/components/Welcome";
7+import { useModels, type Model } from "@/src/hooks/api/useModels";
98 import { useLocalStorage } from "@/src/hooks/useLocalStorage";
10-import MessageEditor from "@/src/components/MessageEditor";
9+import { useTheme } from "@/src/hooks/useTheme";
10+import { createContext, useContext, useState } from "react";
1111
1212 export type AppContextType = {
1313 selectedModel: Model | null;
src/components/MessageEditor.tsx+3−3
@@ -1,13 +1,13 @@
11 "use client";
22
3-import { useAutoResizeTextarea } from "@/src/hooks/useAutoResizeTextarea";
4-import { useState } from "react";
3+import { useAppContext } from "@/src/components/App";
54 import Button from "@/src/components/Button";
65 import PaperPlaneIcon from "@/src/components/icons/PaperPlaneIcon";
76 import TrashIcon from "@/src/components/icons/TrashIcon";
87 import { useNewThread } from "@/src/hooks/api/useNewThread";
9-import { useAppContext } from "@/src/components/App";
108 import { useNewThreadMessage } from "@/src/hooks/api/useNewThreadMessage";
9+import { useAutoResizeTextarea } from "@/src/hooks/useAutoResizeTextarea";
10+import { useState } from "react";
1111
1212 export default function MessageEditor() {
1313 const [userMessage, setUserMessage] = useState("");
src/components/MessageList.tsx+5−5
@@ -1,15 +1,15 @@
11 "use client";
22
33 import { useAppContext } from "@/src/components/App";
4+import Button from "@/src/components/Button";
5+import TrashIcon from "@/src/components/icons/TrashIcon";
6+import useDeleteMessage from "@/src/hooks/api/useDeleteMessage";
47 import { useThreadMessages } from "@/src/hooks/api/useThreadMessages";
58 import { Message } from "@/src/lib/db/schema";
9+import { useEffect, useRef, useState } from "react";
610 import ReactMarkdown from "react-markdown";
7-import remarkGfm from "remark-gfm";
811 import rehypeHighlight from "rehype-highlight";
9-import { useEffect, useRef, useState } from "react";
10-import Button from "@/src/components/Button";
11-import TrashIcon from "@/src/components/icons/TrashIcon";
12-import useDeleteMessage from "@/src/hooks/api/useDeleteMessage";
12+import remarkGfm from "remark-gfm";
1313
1414 function BaseMessage({
1515 message,
src/components/SettingsForm.tsx+1−1
@@ -1,8 +1,8 @@
11 "use client";
22
3-import type { Model } from "@/src/hooks/api/useModels";
43 import { useAppContext } from "@/src/components/App";
54 import { Switch } from "@/src/components/Switch";
5+import type { Model } from "@/src/hooks/api/useModels";
66 import { useAutoResizeTextarea } from "@/src/hooks/useAutoResizeTextarea";
77
88 export default function SettingsForm() {
src/components/Sidebar.tsx+2−2
@@ -1,10 +1,10 @@
11 "use client";
22
3-import BowtieIcon from "@/src/components/icons/BowtieIcon";
4-import PlusIcon from "@/src/components/icons/PlusIcon";
53 import { useAppContext } from "@/src/components/App";
64 import Button from "@/src/components/Button";
5+import BowtieIcon from "@/src/components/icons/BowtieIcon";
76 import ChevronDownIcon from "@/src/components/icons/ChevronDownIcon";
7+import PlusIcon from "@/src/components/icons/PlusIcon";
88 import { useThreads } from "@/src/hooks/api/useThreads";
99
1010 export default function Sidebar() {
src/components/Welcome.tsx+2−2
@@ -1,10 +1,10 @@
11 "use client";
22
3-import SettingsForm from "@/src/components/SettingsForm";
43 import Button from "@/src/components/Button";
54 import GearIcon from "@/src/components/icons/GearIcon";
6-import { useState } from "react";
75 import XIcon from "@/src/components/icons/XIcon";
6+import SettingsForm from "@/src/components/SettingsForm";
7+import { useState } from "react";
88
99 export default function Welcome() {
1010 const [isSettingsOpen, setIsSettingsOpen] = useState(false);
src/hooks/api/useThreadMessages.ts+1−1
@@ -1,5 +1,5 @@
1-import { useQuery } from "@tanstack/react-query";
21 import { Message } from "@/src/lib/db/schema";
2+import { useQuery } from "@tanstack/react-query";
33
44 /**
55 * Fetches messages for a given thread using react-query.
src/hooks/useTheme.ts+1−1
@@ -1,5 +1,5 @@
1-import { useEffect } from "react";
21 import { useLocalStorage } from "@/src/hooks/useLocalStorage";
2+import { useEffect } from "react";
33
44 /**
55 * Custom hook for managing theme mode (device, dark, or light).
src/lib/chat.ts+8−8
@@ -1,16 +1,16 @@
1-import { db } from "./db";
2-import { messages, threads } from "./db/schema";
3-import { eq, asc } from "drizzle-orm";
4-import ollama, { type Tool } from "ollama";
1+import { debug } from "@/src/lib/debug";
2+import { createMessage } from "@/src/lib/messages";
53 import {
64 duckDuckGoTool,
7- weatherTool,
5+ executeToolCall,
86 fetchPageTool,
7+ weatherTool,
98 webSearchTool,
10- executeToolCall,
119 } from "@/src/lib/tools";
12-import { createMessage } from "@/src/lib/messages";
13-import { debug } from "@/src/lib/debug";
10+import { asc, eq } from "drizzle-orm";
11+import ollama, { type Tool } from "ollama";
12+import { db } from "./db";
13+import { messages, threads } from "./db/schema";
1414
1515 export async function generateResponse(threadId: number) {
1616 if (!threadId) {
src/lib/db/schema.ts+1−1
@@ -1,6 +1,6 @@
11 /* personal-assistant-thing/src/lib/db/schema.ts */
2-import { pgTable, serial, text, integer, timestamp } from "drizzle-orm/pg-core";
32 import { relations } from "drizzle-orm";
3+import { integer, pgTable, serial, text, timestamp } from "drizzle-orm/pg-core";
44
55 export const threads = pgTable("threads", {
66 id: serial("id").primaryKey(),
src/lib/threads.ts+1−1
@@ -1,7 +1,7 @@
1+import { generateResponse } from "@/src/lib/chat";
12 import { db } from "@/src/lib/db";
23 import { threads } from "@/src/lib/db/schema";
34 import { createMessage } from "@/src/lib/messages";
4-import { generateResponse } from "@/src/lib/chat";
55 import ollama from "ollama";
66
77 export async function generateTitle(model: string, message: string): Promise<string | null> {
src/lib/tools/index.ts+2−2
@@ -1,12 +1,12 @@
11 /* personal-assistant-thing/src/lib/ollama/tools/index.ts */
22
3-import type { ToolCall } from "ollama";
43 import { queryDuckDuckGo } from "@/src/lib/tools/duckduckgo";
54 import { fetchPage } from "@/src/lib/tools/fetchpage";
65 import { queryWeather } from "@/src/lib/tools/weather";
76 import { queryWebSearch } from "@/src/lib/tools/websearch";
7+import type { ToolCall } from "ollama";
88
9-export { queryDuckDuckGo, duckDuckGoTool } from "@/src/lib/tools/duckduckgo";
9+export { duckDuckGoTool, queryDuckDuckGo } from "@/src/lib/tools/duckduckgo";
1010 export { fetchPage, fetchPageTool } from "@/src/lib/tools/fetchpage";
1111 export { queryWeather, weatherTool } from "@/src/lib/tools/weather";
1212 export { queryWebSearch, webSearchTool } from "@/src/lib/tools/websearch";
src/lib/tools/websearch.ts+1−1
@@ -1,8 +1,8 @@
11 /* personal-assistant-thing/src/lib/ollama/tools/websearch.ts */
22
3-import { google } from "googleapis";
43 import { getCache, setCache } from "@/src/lib/cache";
54 import { createRateLimiter } from "@/src/lib/ratelimit";
5+import { google } from "googleapis";
66
77 const CACHE_TTL_MS = 6 * 60 * 60 * 1000; // 6 hours
88
src/tests/lib/ratelimit.test.ts+2−2
@@ -1,8 +1,8 @@
11 /* personal-assistant-thing/src/lib/ratelimit.test.ts */
22
3-import { describe, it, expect, beforeEach, afterEach, vi } from "vitest";
4-import { createRateLimiter, type RateLimitConfig } from "@/src/lib/ratelimit";
53 import * as cacheModule from "@/src/lib/cache";
4+import { createRateLimiter, type RateLimitConfig } from "@/src/lib/ratelimit";
5+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
66
77 // Mock the cache module
88 vi.mock("@/src/lib/cache", () => ({