+
+ Settings
+
+
+
+
+
+
+
+
+
+
diff --git a/src/components/ui/form/form-button.svelte b/src/components/ui/form/form-button.svelte
new file mode 100644
index 0000000..71090ce
--- /dev/null
+++ b/src/components/ui/form/form-button.svelte
@@ -0,0 +1,10 @@
+
+
+
+
+{error}
+ {/each}
+
+
+
@@ -35,13 +35,14 @@
variant="outline"
onclick={async () => {
const id = await newChat();
- goto(`/chat/${id}`);
+ await invalidate("view:chats");
+ await goto(route(`/chat/[id]`, { id }));
}}
>
-
+
-
- {#if store.selected.modelId}
-
- {/if}
-
-
- {#if chat.isLoading}
-
- {:else}
-
-
-
-
-
-
- {/if}
-
- (format = "markdown")} variant="outline" class="hover:bg-gray-200"
- >Markdown
- (format = "text")} variant="outline" class="hover:bg-gray-200">Text
- {
- stop();
- removeResponse(response.id);
- }}
- />
-
-
- {#if response.error}
-
- {/if}
-
- {#if format === "markdown"}
-
-
diff --git a/src/routes/(app)/chat/[id]/revise/ResponseCard.test.ts b/src/routes/(app)/chat/[id]/revise/ResponseCard.test.ts
deleted file mode 100644
index 7b0889b..0000000
--- a/src/routes/(app)/chat/[id]/revise/ResponseCard.test.ts
+++ /dev/null
@@ -1,143 +0,0 @@
-import { fireEvent, render, screen, waitFor } from "@testing-library/svelte";
-import { beforeEach, describe, expect, it, vi } from "vitest";
-import ResponseCard from "./ResponseCard.svelte";
-import { useDb } from "@/database/client";
-import { useChat } from "$lib/use-chat.svelte";
-
-// Mock the dependencies
-vi.mock("@/database/client", () => ({
- useDb: vi.fn(),
-}));
-
-vi.mock("$lib/use-chat.svelte", () => ({
- useChat: vi.fn(),
-}));
-
-vi.mock("svelte-french-toast", () => ({
- toast: {
- error: vi.fn(),
- },
-}));
-
-vi.mock("../$data", () => ({
- updateResponsePrompt: vi.fn(),
- // Include other exports from $data if necessary
- removeResponse: vi.fn(),
- updateMessages: vi.fn(),
-}));
-
-describe("ResponseCard", () => {
- const mockResponse = {
- id: "1",
- model: { name: "TestModel" },
- error: null,
- };
-
- const mockInitialMessages = [
- { role: "user", content: "Hello" },
- { role: "assistant", content: "**Hi there!**" },
- ];
-
- const mockService = {
- providerId: "test-provider",
- baseURL: "https://api.test.com",
- apiKey: "test-api-key",
- };
-
- beforeEach(() => {
- vi.clearAllMocks();
-
- // Mock useChat
- vi.mocked(useChat).mockReturnValue({
- // @ts-expect-error messages type mismatch
- messages: mockInitialMessages,
- isLoading: false,
- reload: vi.fn(),
- stop: vi.fn(),
- });
-
- // Mock useDb
- vi.mocked(useDb).mockReturnValue({
- query: {
- // @ts-expect-error
- modelTable: {
- findFirst: vi.fn().mockResolvedValue({ id: "1", name: "TestModel" }),
- },
- },
- update: vi.fn().mockReturnValue({
- set: vi.fn().mockReturnValue({
- where: vi.fn().mockResolvedValue({}),
- }),
- }),
- });
- });
-
- it("renders the component with initial messages", () => {
- render(ResponseCard, {
- // @ts-expect-error partial mock
- response: mockResponse,
- // @ts-expect-error partial mock
- initialMessages: mockInitialMessages,
- // @ts-expect-error partial mock
- service: mockService,
- });
-
- expect(screen.getByText("TestModel")).toBeTruthy();
- expect(screen.getByText("Hi there!")).toBeTruthy();
- });
-
- it("switches between markdown and text format", async () => {
- render(ResponseCard, {
- // @ts-expect-error partial mock
- response: mockResponse,
- // @ts-expect-error partial mock
- initialMessages: mockInitialMessages,
- // @ts-expect-error partial mock
- service: mockService,
- });
-
- const markdownBadge = screen.getByText("Markdown");
- const textBadge = screen.getByText("Text");
-
- await fireEvent.click(textBadge);
- expect(screen.getByText("**Hi there!**")).toBeTruthy();
-
- await fireEvent.click(markdownBadge);
- // You might need to adjust this expectation based on how your MessageMarkdown component renders content
- expect(screen.getByText("Hi there!")).toBeTruthy();
- });
-
- it.skip("handles refresh action", async () => {
- render(ResponseCard, {
- // @ts-expect-error partial mock
- response: mockResponse,
- // @ts-expect-error partial mock
- initialMessages: mockInitialMessages,
- // @ts-expect-error partial mock
- service: mockService,
- });
-
- // Use the aria-label to find the refresh button
- const refreshButton = screen.getByLabelText("refresh");
- await fireEvent.click(refreshButton);
-
- await waitFor(() => {
- expect(useDb().update).toHaveBeenCalled();
- expect(useChat().reload).toHaveBeenCalled();
- });
- });
-
- it("displays error message when present", () => {
- const errorResponse = { ...mockResponse, error: "Test error message" };
- render(ResponseCard, {
- // @ts-expect-error partial mock
- response: errorResponse,
- // @ts-expect-error partial mock
- initialMessages: mockInitialMessages,
- // @ts-expect-error partial mock
- service: mockService,
- });
-
- expect(screen.getByText("Test error message")).toBeTruthy();
- });
-});
diff --git a/src/routes/(app)/chat/[id]/revise/RevisePage.svelte b/src/routes/(app)/chat/[id]/revise/RevisePage.svelte
new file mode 100644
index 0000000..cc38b8a
--- /dev/null
+++ b/src/routes/(app)/chat/[id]/revise/RevisePage.svelte
@@ -0,0 +1,295 @@
+
+
+ {
console.log("name clicked", document.name);
- goto(`/document/${document.id}`);
+ goto(route(`/document/[id]`, { id: document.id }));
}}
class="p-2 "
>
@@ -63,7 +67,7 @@
{
console.log("description clicked", document.description);
- goto(`/document/${document.id}`);
+ goto(route(`/document/[id]`, { id: document.id }));
}}
class="p-2 "
>
@@ -72,7 +76,7 @@
-
+
{
+ showAttachmentControls = false;
+ onPaste && onPaste();
+ }}
+ />
+{/if}
+
+ {#if editable}
+
+ {#if mode === "edit" && editable}
+ (message.content = content)}
+ onKeyPress={handleKeyPress}
+ />
+ {:else if format === "markdown"}
+
+
diff --git a/src/routes/(app)/chat/[id]/MessageEditor.svelte b/src/routes/(app)/chat/[id]/MessageEditor.svelte
new file mode 100644
index 0000000..ffb8b59
--- /dev/null
+++ b/src/routes/(app)/chat/[id]/MessageEditor.svelte
@@ -0,0 +1,92 @@
+
+
+>((acc, model) => {
acc[model.id] = model;
@@ -86,11 +85,10 @@
- {#each services as service (service.id)}
- {@const provider = providersById[service.providerId]}
+ {#each keys as key (key.id)}
- {provider.name} {service.name ? `(${service.name})` : ""}
- {#each service.models as model (model.id)}
+ {key.service.name} {key.name ? `(${key.name})` : ""}
+ {#each key.models as model (model.id)}
{#if model.visible}
{model.name}
diff --git a/src/routes/(app)/chat/[id]/[...rest]/config/$data.test.ts b/src/routes/(app)/chat/[id]/[...rest]/config/$data.test.ts
deleted file mode 100644
index ff58cb7..0000000
--- a/src/routes/(app)/chat/[id]/[...rest]/config/$data.test.ts
+++ /dev/null
@@ -1,233 +0,0 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
-import {
- loadServices,
- addService,
- deleteService,
- updateService,
- replaceModels,
- toggleVisible,
- toggleAllVisible,
-} from "./$data";
-import Database from "better-sqlite3";
-import { type BetterSQLite3Database, drizzle } from "drizzle-orm/better-sqlite3";
-import * as schema from "@/database/schema";
-import { runMigrations } from "@/database/migrator";
-import { eq } from "drizzle-orm";
-import { invalidate } from "$app/navigation";
-import { nanoid } from "nanoid";
-
-let sqlite: Database.Database;
-let db: BetterSQLite3Database;
-
-beforeEach(async () => {
- // Set up database
- sqlite = new Database(":memory:");
- db = drizzle(sqlite, { schema });
-
- // Set up mocks
- vi.mock("$app/navigation", () => ({
- invalidate: vi.fn(),
- }));
-
- vi.mock("nanoid", () => ({
- nanoid: vi.fn(() => "mockedNanoId"),
- }));
-
- // Mock the useDb function and other imports
- vi.mock("@/database/client", () => ({
- useDb: vi.fn(() => db),
- }));
-
- await runMigrations(true);
-
- // Insert test data
- await db.insert(schema.serviceTable).values([
- {
- id: "service1",
- name: "Test Service",
- providerId: "provider1",
- baseURL: "https://api.test.com",
- apiKey: "test-api-key",
- },
- ]);
-
- await db.insert(schema.modelTable).values([
- { id: "model1", serviceId: "service1", name: "Test Model 1", visible: 1 },
- { id: "model2", serviceId: "service1", name: "Test Model 2", visible: 0 },
- ]);
-});
-
-afterEach(() => {
- sqlite.close();
- vi.restoreAllMocks();
-});
-
-describe("loadServices", () => {
- it("should load all services with their models", async () => {
- const services = await loadServices();
- expect(services).toHaveLength(1);
- expect(services[0].id).toBe("service1");
- expect(services[0].models).toHaveLength(2);
- });
-});
-
-describe("addService", () => {
- it("should add a new service", async () => {
- const provider = {
- id: "newProvider",
- name: "New Provider",
- defaultBaseURL: "https://api.newprovider.com",
- };
- const newService = await addService(provider);
- expect(newService.id).toBe("mockedNanoId");
- expect(newService.providerId).toBe("newProvider");
- expect(invalidate).toHaveBeenCalledWith("view:services");
- });
-});
-
-describe("deleteService", () => {
- it("should delete a service and its models", async () => {
- const service = {
- id: "service1",
- name: "Test Service",
- providerId: "provider1",
- baseURL: "https://api.test.com",
- apiKey: "test-api-key",
- createdAt: new Date().toISOString(),
- };
- await deleteService(service);
- const remainingServices = await db.query.serviceTable.findMany();
- const remainingModels = await db.query.modelTable.findMany();
- expect(remainingServices).toHaveLength(0);
- expect(remainingModels).toHaveLength(0);
- });
-});
-
-describe("updateService", () => {
- it("should update a service", async () => {
- const updatedService = {
- id: "service1",
- name: "Updated Service",
- providerId: "provider1",
- baseURL: "https://updated.api.com",
- apiKey: "new-api-key",
- createdAt: new Date().toISOString(),
- };
- await updateService(updatedService);
- const service = await db.query.serviceTable.findFirst({
- where: eq(schema.serviceTable.id, "service1"),
- });
- expect(service).toEqual({ ...updatedService, createdAt: expect.any(String) });
- });
-});
-
-describe("replaceModels", () => {
- it("should replace models for a service", async () => {
- // Local mock for nanoid
- let idCounter = 0;
- vi.mocked(nanoid).mockImplementation(() => `uniqueId${idCounter++}`);
-
- const service = {
- id: "service1",
- name: "Updated Service",
- providerId: "provider1",
- baseURL: "https://updated.api.com",
- apiKey: "new-api-key",
- createdAt: new Date().toISOString(),
- };
- const newModels = [{ name: "New Model 1" }, { name: "New Model 2" }, { name: "Test Model 1" }];
- await replaceModels(service, newModels);
-
- const models = await db.query.modelTable.findMany({
- where: eq(schema.modelTable.serviceId, "service1"),
- });
-
- expect(models).toHaveLength(3);
- expect(models.map((m) => m.name)).toEqual(
- expect.arrayContaining(["New Model 1", "New Model 2", "Test Model 1"]),
- );
- expect(models.map((m) => m.id)).toEqual(
- expect.arrayContaining(["uniqueId0", "uniqueId1", "model1"]),
- );
-
- // Reset the mock after the test
- vi.mocked(nanoid).mockReset();
- });
-
- it("should not create duplicate models", async () => {
- // Local mock for nanoid
- let idCounter = 0;
- vi.mocked(nanoid).mockImplementation(() => `uniqueId${idCounter++}`);
-
- const service = {
- id: "service1",
- name: "Updated Service",
- providerId: "provider1",
- baseURL: "https://updated.api.com",
- apiKey: "new-api-key",
- createdAt: new Date().toISOString(),
- };
- const newModels = [
- { name: "New Model 1" },
- { name: "New Model 2" },
- { name: "Test Model 1" },
- { name: "Test Model 1" }, // Duplicate
- ];
- await replaceModels(service, newModels);
-
- const models = await db.query.modelTable.findMany({
- where: eq(schema.modelTable.serviceId, "service1"),
- });
-
- expect(models).toHaveLength(3); // Should still be 3, not 4
- expect(models.map((m) => m.name)).toEqual(
- expect.arrayContaining(["New Model 1", "New Model 2", "Test Model 1"]),
- );
-
- // Reset the mock after the test
- vi.mocked(nanoid).mockReset();
- });
-});
-
-describe("toggleVisible", () => {
- it("should toggle the visibility of a model", async () => {
- const service = {
- id: "service1",
- name: "Updated Service",
- providerId: "provider1",
- baseURL: "https://updated.api.com",
- apiKey: "new-api-key",
- createdAt: new Date().toISOString(),
- };
- const model = {
- id: "model1",
- visible: 1,
- name: "Test Model 1",
- serviceId: "service1",
- createdAt: new Date().toISOString(),
- };
- await toggleVisible(service, model);
- const updatedModel = await db.query.modelTable.findFirst({
- where: eq(schema.modelTable.id, "model1"),
- });
- expect(updatedModel?.visible).toBe(0);
- });
-});
-
-describe("toggleAllVisible", () => {
- it("should toggle visibility for all models of a service", async () => {
- const service = {
- id: "service1",
- name: "Updated Service",
- providerId: "provider1",
- baseURL: "https://updated.api.com",
- apiKey: "new-api-key",
- createdAt: new Date().toISOString(),
- };
- await toggleAllVisible(service, 0);
- const models = await db.query.modelTable.findMany({
- where: eq(schema.modelTable.serviceId, "service1"),
- });
- expect(models.every((m) => m.visible === 0)).toBe(true);
- });
-});
diff --git a/src/routes/(app)/chat/[id]/[...rest]/config/$data.ts b/src/routes/(app)/chat/[id]/[...rest]/config/$data.ts
deleted file mode 100644
index d8babf2..0000000
--- a/src/routes/(app)/chat/[id]/[...rest]/config/$data.ts
+++ /dev/null
@@ -1,103 +0,0 @@
-import {
- invalidateModel,
- type Model,
- modelTable,
- type Service,
- serviceTable,
- useDb,
-} from "@/database";
-import type { Provider } from "$lib/providers";
-import { and, asc, eq, notInArray } from "drizzle-orm";
-import { invalidate } from "$app/navigation";
-import { nanoid } from "nanoid";
-
-export type ServicesView = Awaited>;
-
-export async function loadServices() {
- return useDb().query.serviceTable.findMany({
- with: {
- models: true,
- },
- });
-}
-
-export async function addService(provider: Provider) {
- const newId = nanoid(10);
- const result = await useDb()
- .insert(serviceTable)
- .values({
- id: newId,
- name: "",
- providerId: provider.id,
- baseURL: provider.defaultBaseURL,
- apiKey: "",
- })
- .returning();
- if (result.length < 1) {
- throw Error("Failed to add service");
- }
- await invalidate("view:services");
- return result[0];
-}
-
-export async function deleteService(service: Service) {
- await useDb().transaction(async (tx) => {
- await tx.delete(modelTable).where(eq(modelTable.serviceId, service.id));
- await tx.delete(serviceTable).where(eq(serviceTable.id, service.id));
- });
- await invalidateModel(serviceTable, service);
-}
-
-export async function updateService(service: Service) {
- console.time("updateService");
- await useDb()
- .update(serviceTable)
- .set({ ...service })
- .where(eq(serviceTable.id, service.id));
- console.timeEnd("updateService");
- await invalidateModel(serviceTable, service);
-}
-
-export async function replaceModels(service: Service, newModels: any[]) {
- console.time("replaceModels");
- await useDb().transaction(async (tx) => {
- // remove models that no longer exist
- await tx.delete(modelTable).where(
- and(
- eq(modelTable.serviceId, service.id),
- notInArray(
- modelTable.name,
- newModels.map((m) => m.name),
- ),
- ),
- );
- console.log("newModels", newModels);
- for (const model of newModels) {
- await tx
- .insert(modelTable)
- .values({ id: nanoid(10), name: model.name, visible: 1, serviceId: service.id })
- .onConflictDoNothing({
- target: [modelTable.name, modelTable.serviceId],
- });
- }
- });
- console.timeEnd("replaceModels");
- await invalidateModel(serviceTable, service);
-}
-
-export async function toggleVisible(service: Service, model: Model) {
- await useDb()
- .update(modelTable)
- .set({ visible: model.visible ? 0 : 1 })
- .where(and(eq(modelTable.id, model.id), eq(modelTable.serviceId, service.id)));
- await invalidateModel(serviceTable, service);
- await invalidateModel(modelTable, model);
-}
-
-export async function toggleAllVisible(service: Service, visible: 1 | 0) {
- console.time("toggleAllVisible");
- await useDb().update(modelTable).set({ visible }).where(eq(modelTable.serviceId, service.id));
- console.timeEnd("toggleAllVisible");
- await invalidateModel(serviceTable, service);
- await invalidate("view:chat");
-}
diff --git a/src/routes/(app)/chat/[id]/[...rest]/config/+layout.svelte b/src/routes/(app)/chat/[id]/[...rest]/config/+layout.svelte
deleted file mode 100644
index 64eae0c..0000000
--- a/src/routes/(app)/chat/[id]/[...rest]/config/+layout.svelte
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
diff --git a/src/routes/(app)/chat/[id]/[...rest]/config/+layout.ts b/src/routes/(app)/chat/[id]/[...rest]/config/+layout.ts
deleted file mode 100644
index 77ff5d9..0000000
--- a/src/routes/(app)/chat/[id]/[...rest]/config/+layout.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { loadServices } from "./$data";
-import { registerModel, serviceTable } from "@/database";
-
-export async function load({ depends, route }) {
- const services = await loadServices();
- registerModel(serviceTable, services, depends);
- depends("view:services");
- return {
- services,
- };
-}
diff --git a/src/routes/(app)/chat/[id]/[...rest]/config/+page.svelte b/src/routes/(app)/chat/[id]/[...rest]/config/+page.svelte
deleted file mode 100644
index a0f2ade..0000000
--- a/src/routes/(app)/chat/[id]/[...rest]/config/+page.svelte
+++ /dev/null
@@ -1,12 +0,0 @@
-
diff --git a/src/routes/(app)/chat/[id]/[...rest]/config/[serviceId]/+page.svelte b/src/routes/(app)/chat/[id]/[...rest]/config/[serviceId]/+page.svelte
deleted file mode 100644
index 5405889..0000000
--- a/src/routes/(app)/chat/[id]/[...rest]/config/[serviceId]/+page.svelte
+++ /dev/null
@@ -1,223 +0,0 @@
-
-
-
- Update AI account
-
-
- Select AI provider
-
-
- Your AI accounts
-
-;
-
-beforeEach(async () => {
- // Set up database
- sqlite = new Database(":memory:");
- db = drizzle(sqlite, { schema });
- vi.mocked(useDb).mockReturnValue(db);
-
- await runMigrations(true);
-
- // Insert test data
- await db.insert(schema.serviceTable).values([
- {
- id: "service1",
- name: "Test Service",
- providerId: "provider1",
- baseURL: "https://api.test.com",
- apiKey: "test-api-key",
- },
- ]);
-
- await db
- .insert(schema.modelTable)
- .values([{ id: "model1", serviceId: "service1", name: "Test Model", visible: 1 }]);
-
- await db
- .insert(schema.chatTable)
- .values([{ id: "chat1", name: "Test Chat", prompt: "Test prompt" }]);
-
- await db
- .insert(schema.responseTable)
- .values([{ id: "response1", chatId: "chat1", modelId: "model1" }]);
-
- await db.insert(schema.responseMessageTable).values([
- { id: "message1", index: 0, responseId: "response1", role: "user", content: "Hello" },
- { id: "message2", index: 1, responseId: "response1", role: "assistant", content: "Hi there" },
- ]);
-});
-
-afterEach(() => {
- sqlite.close();
- vi.resetAllMocks();
-});
-
-describe("loadResponses", () => {
- it("should load responses for a given chat", async () => {
- const responses = await loadResponses("chat1");
-
- expect(responses).toHaveLength(1);
- expect(responses[0]).toEqual(
- expect.objectContaining({
- id: "response1",
- chatId: "chat1",
- modelId: "model1",
- }),
- );
- expect(responses[0].messages).toHaveLength(2);
- expect(responses[0].model).toBeDefined();
- expect(responses[0].model.service).toBeDefined();
- });
-
- it("should return an empty array if no responses are found", async () => {
- const responses = await loadResponses("nonexistent");
- expect(responses).toHaveLength(0);
- });
-});
-
-describe("updateMessages", () => {
- it("should update existing messages and add new ones", async () => {
- const newMessages = [
- { id: "message1", role: "user", content: "Hello", createdAt: new Date() },
- { id: "new-message2", role: "assistant", content: "Updated Hi there", createdAt: new Date() },
- ];
-
- // @ts-expect-error message type mismatch
- await updateMessages("response1", newMessages);
-
- const updatedMessages = await db.query.responseMessageTable.findMany({
- where: eq(schema.responseMessageTable.responseId, "response1"),
- orderBy: [schema.responseMessageTable.index],
- });
-
- expect(updatedMessages).toHaveLength(2);
- expect(updatedMessages[0].content).toBe("Hello");
- expect(updatedMessages[1].content).toBe("Updated Hi there");
- expect(invalidate).toHaveBeenCalledWith("view:responses");
- });
-});
-
-describe("removeResponse", () => {
- it("should remove a response and its messages", async () => {
- await removeResponse("response1");
-
- const response = await db.query.responseTable.findFirst({
- where: eq(schema.responseTable.id, "response1"),
- });
- expect(response).toBeUndefined();
-
- const messages = await db.query.responseMessageTable.findMany({
- where: eq(schema.responseMessageTable.responseId, "response1"),
- });
- expect(messages).toHaveLength(0);
-
- expect(invalidate).toHaveBeenCalledWith("view:responses");
- });
-});
diff --git a/src/routes/(app)/chat/[id]/revise/$data.ts b/src/routes/(app)/chat/[id]/revise/$data.ts
deleted file mode 100644
index e900c5d..0000000
--- a/src/routes/(app)/chat/[id]/revise/$data.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-import { responseMessageTable, responseTable, useDb } from "@/database";
-import { asc, eq } from "drizzle-orm";
-import { invalidate } from "$app/navigation";
-import { type Message } from "ai";
-
-export type ResponsesView = Awaited>;
-
-export function loadResponses(chatId: string) {
- return useDb().query.responseTable.findMany({
- with: {
- messages: true,
- model: {
- with: {
- service: true,
- },
- },
- },
- where: eq(responseTable.chatId, chatId),
- });
-}
-
-export async function updateMessages(responseId: string, newMessages: Message[]) {
- const currentMessages = await useDb().query.responseMessageTable.findMany({
- where: eq(responseMessageTable.responseId, responseId),
- orderBy: [asc(responseMessageTable.index)],
- });
-
- await useDb().transaction(async (tx) => {
- let index = 0;
- for (const newMessage of newMessages) {
- const currentMessage = currentMessages[index];
- if (currentMessage && newMessage.id !== currentMessage.id) {
- // update required
- await tx
- .update(responseMessageTable)
- .set({ ...newMessage, createdAt: newMessage.createdAt?.toISOString(), index })
- .where(eq(responseMessageTable.id, currentMessage.id));
- } else if (!currentMessage) {
- // new message
- await tx.insert(responseMessageTable).values({
- ...newMessage,
- createdAt: newMessage.createdAt?.toISOString(),
- responseId,
- index,
- });
- }
- index += 1;
- }
- });
- await invalidate("view:responses");
-}
-
-export async function removeResponse(responseId: string) {
- console.time("removeMessages");
- await useDb().transaction(async (tx) => {
- await tx.delete(responseMessageTable).where(eq(responseMessageTable.responseId, responseId));
- await tx.delete(responseTable).where(eq(responseTable.id, responseId));
- });
- console.timeEnd("removeMessages");
- await invalidate("view:responses");
-}
diff --git a/src/routes/(app)/chat/[id]/revise/+page.svelte b/src/routes/(app)/chat/[id]/revise/+page.svelte
index 5a32a0d..ce03a17 100644
--- a/src/routes/(app)/chat/[id]/revise/+page.svelte
+++ b/src/routes/(app)/chat/[id]/revise/+page.svelte
@@ -1,54 +1,12 @@
-
+
+
diff --git a/src/routes/(app)/chat/[id]/revise/ResponseCard.svelte b/src/routes/(app)/chat/[id]/revise/ResponseCard.svelte
deleted file mode 100644
index 63dbec6..0000000
--- a/src/routes/(app)/chat/[id]/revise/ResponseCard.svelte
+++ /dev/null
@@ -1,166 +0,0 @@
-
-
-
+
diff --git a/src/routes/(app)/chat/[id]/AttachmentControls.svelte b/src/routes/(app)/chat/[id]/AttachmentControls.svelte
new file mode 100644
index 0000000..db43b1f
--- /dev/null
+++ b/src/routes/(app)/chat/[id]/AttachmentControls.svelte
@@ -0,0 +1,25 @@
+
+
+
+ {#if onRemove}
+
+ {/if}
+
+
+
+
+ {#if attachment.loading}
+ 
+ {:else}
+
+
+
+ {:else if attachment.type.startsWith("image/")}
+ {attachment.error.message}
+{attachment.content}
+ {/if} + +
+ {humanType(attachment.type)}
+
+
+
+
+
+
+
+
+
diff --git a/src/routes/(app)/chat/[id]/ChatPage.svelte b/src/routes/(app)/chat/[id]/ChatPage.svelte
new file mode 100644
index 0000000..c67299e
--- /dev/null
+++ b/src/routes/(app)/chat/[id]/ChatPage.svelte
@@ -0,0 +1,121 @@
+
+
+
+
diff --git a/src/routes/(app)/chat/[id]/ChatTitlebar.svelte b/src/routes/(app)/chat/[id]/ChatTitlebar.svelte
new file mode 100644
index 0000000..1e29bd6
--- /dev/null
+++ b/src/routes/(app)/chat/[id]/ChatTitlebar.svelte
@@ -0,0 +1,112 @@
+
+
+
+ {#each chatService.messages as message, index (message.id)}
+
+
+ {
+ updateChat(chat.id, { name });
+ }}
+ />
+ {#if unsavedChanges}
+
+ {/if}
+
diff --git a/src/routes/(app)/chat/[id]/MessageCard.svelte b/src/routes/(app)/chat/[id]/MessageCard.svelte
new file mode 100644
index 0000000..8a530db
--- /dev/null
+++ b/src/routes/(app)/chat/[id]/MessageCard.svelte
@@ -0,0 +1,137 @@
+
+
+{#if message.attachments && message.attachments.length > 0}
+
+ {#if revision}
+
+ v{revision.version}
+
+ {/if}
+
+ {#if tab === "revise"}
+
+ {/if}
+
+ {#each message.attachments as attachment, index (index)}
+
+{/if}
+{#if showAttachmentControls}
+
+
+
+ {message.role}
+
+
+ (message.role = "user")}>User
+ (message.role = "assistant")}>
+ Assistant
+
+ (message.role = "system")}>System
+
+
+
+
+
+
+
+ {/if}
+
+
+ {#if showPlaceholder}
+
+
+
diff --git a/src/routes/(app)/chat/[id]/MessageInput.svelte b/src/routes/(app)/chat/[id]/MessageInput.svelte
new file mode 100644
index 0000000..e445ca6
--- /dev/null
+++ b/src/routes/(app)/chat/[id]/MessageInput.svelte
@@ -0,0 +1,118 @@
+
+
+{placeholder}
+ {/if}
+
+
+
+ {#if attachmentService.attachments.length > 0}
+
+
+
diff --git a/src/routes/(app)/chat/[id]/SelectModel.svelte b/src/routes/(app)/chat/[id]/SelectModel.svelte
index 58f0dea..f8b832b 100644
--- a/src/routes/(app)/chat/[id]/SelectModel.svelte
+++ b/src/routes/(app)/chat/[id]/SelectModel.svelte
@@ -9,18 +9,17 @@
SelectValue,
} from "@/components/ui/select";
import { store } from "@/lib/store.svelte";
- import { providersById } from "@/lib/providers";
- import type { ServicesView } from "./$data";
+ import type { KeysView } from "./$data";
import { modelTable, useDb } from "@/database";
- import { asc, desc, eq } from "drizzle-orm";
+ import { asc, eq } from "drizzle-orm";
- let { services }: { services: ServicesView } = $props();
+ let { keys }: { keys: KeysView } = $props();
- let visibleModels = $derived(services.map((s) => s.models.filter((m) => m.visible)).flat());
+ let visibleModels = $derived(keys.map((key) => key.models.filter((m) => m.visible)).flat());
let modelsById = $derived(
- services
- .map((s) => s.models)
+ keys
+ .map((key) => key.models)
.flat()
.reduce
+ {#each attachmentService.attachments as attachment, index (index)}
+ attachmentService.remove(index)} />
+ {/each}
+
+ {/if}
+ {#if isUploadOpen}
+
+
+
+
+
+
+
-
-
-
- {/if}
-
diff --git a/src/routes/(app)/chat/[id]/[...rest]/config/[serviceId]/+page.ts b/src/routes/(app)/chat/[id]/[...rest]/config/[serviceId]/+page.ts
deleted file mode 100644
index fd85f4d..0000000
--- a/src/routes/(app)/chat/[id]/[...rest]/config/[serviceId]/+page.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { registerModel, serviceTable, useDb } from "@/database";
-import { eq } from "drizzle-orm";
-import { error } from "@sveltejs/kit";
-
-export async function load({ depends, params }) {
- const service = await useDb().query.serviceTable.findFirst({
- with: {
- models: true,
- },
- where: eq(serviceTable.id, params.serviceId),
- });
- if (!service) {
- return error(404, "Service not found");
- }
- registerModel(serviceTable, service, depends);
- depends("view:service");
- return {
- service,
- };
-}
diff --git a/src/routes/(app)/chat/[id]/[...rest]/config/create/+page.svelte b/src/routes/(app)/chat/[id]/[...rest]/config/create/+page.svelte
deleted file mode 100644
index 67a624d..0000000
--- a/src/routes/(app)/chat/[id]/[...rest]/config/create/+page.svelte
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
-
-
- {#if service}
-
-
-
-
-
-
-
- {
- if (selected) {
- service.providerId = selected.value;
- save();
- }
- }}
- >
-
-
-
- {#each Providers as provider (provider.id)}
- {provider.name}
- {/each}
-
-
-
-
-
-
-
-
-
-
-
- {#if showOptions}
-
-
-
-
-
-
-
- {:else}
-
-
-
- {/if}
-
-
- {/if}
- {#if error}{/if}
- {#if service.models.length > 0}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/routes/(app)/chat/[id]/[...rest]/config/select/+page.svelte b/src/routes/(app)/chat/[id]/[...rest]/config/select/+page.svelte
deleted file mode 100644
index 532611e..0000000
--- a/src/routes/(app)/chat/[id]/[...rest]/config/select/+page.svelte
+++ /dev/null
@@ -1,52 +0,0 @@
-
-
-
-
-
-
-
diff --git a/src/routes/(app)/chat/[id]/revise/$data.test.ts b/src/routes/(app)/chat/[id]/revise/$data.test.ts
deleted file mode 100644
index de6af91..0000000
--- a/src/routes/(app)/chat/[id]/revise/$data.test.ts
+++ /dev/null
@@ -1,121 +0,0 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
-import { loadResponses, removeResponse, updateMessages } from "./$data";
-import Database from "better-sqlite3";
-import { type BetterSQLite3Database, drizzle } from "drizzle-orm/better-sqlite3";
-import * as schema from "@/database/schema";
-import { runMigrations } from "@/database/migrator";
-import { eq } from "drizzle-orm";
-import { invalidate } from "$app/navigation";
-import { useDb } from "@/database";
-
-vi.mock("nanoid");
-vi.mock("$app/navigation");
-vi.mock("@/database/client");
-
-let sqlite: Database.Database;
-let db: BetterSQLite3Database
- {
- console.log("onChange", data.chat.name);
- onChange();
- }}
- />
-
-
- {#each data.responses.toReversed() as response (response.id)}
- {@const service = response.model?.service}
-
-
-
-
-
-
-
+{#key $page.params.id}
+ {#key data.version}
+
-
-
-
-
-
-
-
diff --git a/src/routes/(app)/chat/[id]/revise/MessageDivider.svelte b/src/routes/(app)/chat/[id]/revise/MessageDivider.svelte
new file mode 100644
index 0000000..c9826b7
--- /dev/null
+++ b/src/routes/(app)/chat/[id]/revise/MessageDivider.svelte
@@ -0,0 +1,58 @@
+
+
+{#if $open && warning}
+
+
+
+{/if}
+
+{warning}
+
+
+
diff --git a/src/routes/(app)/chat/[id]/revise/MessageMarkdown.svelte b/src/routes/(app)/chat/[id]/revise/MessageMarkdown.svelte
index d6e856f..24c409a 100644
--- a/src/routes/(app)/chat/[id]/revise/MessageMarkdown.svelte
+++ b/src/routes/(app)/chat/[id]/revise/MessageMarkdown.svelte
@@ -76,3 +76,9 @@
{/if}
{/each}
+
+
+
+{response.model?.name || "deleted"}
-
-
+
diff --git a/src/routes/(app)/document/+page.svelte b/src/routes/(app)/document/+page.svelte
index 15ff428..c03541d 100644
--- a/src/routes/(app)/document/+page.svelte
+++ b/src/routes/(app)/document/+page.svelte
@@ -10,19 +10,23 @@
import { toast } from "svelte-french-toast";
import { useDb } from "@/database/client";
import { invalidateModel } from "@/database";
+ import { route } from "$lib/route";
let { data } = $props();
- let confirmDelete: Document | null = $state(null);
+ let documentToDelete: Document | null = $state(null);
- async function deleteDocument(document: Document) {
+ async function deleteDocument() {
+ if (!documentToDelete) {
+ return;
+ }
try {
- await useDb().delete(documentTable).where(eq(documentTable.id, document.id));
- await invalidateModel(documentTable, document);
+ await useDb().delete(documentTable).where(eq(documentTable.id, documentToDelete.id));
+ await invalidateModel(documentTable, documentToDelete);
} catch (e) {
toast.error(e instanceof Error ? e.message : "Unknown error");
}
- confirmDelete = null;
+ documentToDelete = null;
}
@@ -54,7 +58,7 @@
+ 0 && chatService.messages[0].role === "assistant"
+ ? "Some AI providers (e.g. Anthropic) require the first message to be a user message"
+ : ""}
+ {handleInsertMessage}
+ />
+ {#each chatService.messages as message, index (message.id)}
+ {@const showWarning =
+ index < chatService.messages.length - 1 &&
+ chatService.messages[index + 1].role === chatService.messages[index].role}
+ {#if message.role !== "assistant" || index < chatService.messages.length - 1}
+ handlePaste(index)}
+ onSubmit={handleSubmit}
+ onRemove={() => handleRemove(index)}
+ onRemoveAttachment={(attachmentIndex) => handleRemoveAttachment(index, attachmentIndex)}
+ />
+
+
+
+
+ {#if haveResponse}
+
+
+ {#if haveResponse}
+
+
+
+
+
+
+
+
+
+
+ {#if responseMode === "view" || chatService.isLoading}
+ {
+ chatService.messages[chatService.messages.length - 1].content = content;
+ }}
+ />
+ {/if}
+ {#if chatService.isLoading}
+
+ {/if}
+
+
+
+ {/if}
+
-
diff --git a/src/routes/(app)/document/Header.svelte b/src/routes/(app)/document/Header.svelte
deleted file mode 100644
index a932d5b..0000000
--- a/src/routes/(app)/document/Header.svelte
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
diff --git a/src/routes/(app)/document/[id]/+page.svelte b/src/routes/(app)/document/[id]/+page.svelte
index 8b1bae3..1fb0157 100644
--- a/src/routes/(app)/document/[id]/+page.svelte
+++ b/src/routes/(app)/document/[id]/+page.svelte
@@ -5,6 +5,7 @@
import { eq } from "drizzle-orm";
import { toast } from "svelte-french-toast";
import { useDb } from "@/database/client";
+ import { route } from "$lib/route";
let { data } = $props();
let document = $derived(data.document);
@@ -20,7 +21,7 @@
content: document.content,
})
.where(eq(documentTable.id, document.id));
- await goto(`/document`);
+ await goto(route(`/document`));
} catch (e) {
toast.error(e instanceof Error ? e.message : "Unknown error");
}
diff --git a/src/routes/(app)/document/new/+page.svelte b/src/routes/(app)/document/new/+page.svelte
index 28cce40..fd36259 100644
--- a/src/routes/(app)/document/new/+page.svelte
+++ b/src/routes/(app)/document/new/+page.svelte
@@ -1,27 +1,17 @@
diff --git a/src/routes/(app)/settings/+layout.svelte b/src/routes/(app)/settings/+layout.svelte
new file mode 100644
index 0000000..826a352
--- /dev/null
+++ b/src/routes/(app)/settings/+layout.svelte
@@ -0,0 +1,23 @@
+
+
+
+
diff --git a/src/routes/(app)/settings/+page.ts b/src/routes/(app)/settings/+page.ts
new file mode 100644
index 0000000..34b8925
--- /dev/null
+++ b/src/routes/(app)/settings/+page.ts
@@ -0,0 +1,6 @@
+import { redirect } from "@sveltejs/kit";
+import { route } from "$lib/route";
+
+export async function load() {
+ return redirect(301, route("/settings/keys"));
+}
diff --git a/src/routes/(app)/settings/Nav.svelte b/src/routes/(app)/settings/Nav.svelte
new file mode 100644
index 0000000..090bd1f
--- /dev/null
+++ b/src/routes/(app)/settings/Nav.svelte
@@ -0,0 +1,29 @@
+
+
+
+
+
diff --git a/src/routes/(app)/settings/keys/$data.ts b/src/routes/(app)/settings/keys/$data.ts
new file mode 100644
index 0000000..2bf092c
--- /dev/null
+++ b/src/routes/(app)/settings/keys/$data.ts
@@ -0,0 +1,82 @@
+import { z } from "zod";
+import { invalidateModel, type Key, keyTable, type Model, modelTable, useDb } from "@/database";
+import { and, eq, notInArray } from "drizzle-orm";
+import { invalidate } from "$app/navigation";
+import { nanoid } from "nanoid";
+import type { SQLiteTransaction } from "drizzle-orm/sqlite-core";
+
+export const formSchema = z.object({
+ serviceId: z.string().min(1, { message: "Service is required" }),
+ name: z.string().min(1, { message: "Name is required" }),
+ apiKey: z.string().min(1, { message: "API Key is required" }),
+ baseURL: z.string().nullable(),
+});
+
+export async function loadKeys() {
+ return useDb().query.keyTable.findMany({ with: { service: { with: { sdk: true } } } });
+}
+
+export async function loadServices() {
+ return useDb().query.serviceTable.findMany({ with: { sdk: true } });
+}
+
+export async function fetchModels(
+ apiKey: string,
+ baseURL: string | null,
+ sdkId: string,
+ serviceId: string,
+) {
+ return await fetch("/api/models", {
+ method: "POST",
+ headers: {
+ Authorization: apiKey,
+ ContentType: "application/json",
+ },
+ body: JSON.stringify({
+ sdkId,
+ baseURL,
+ serviceId,
+ }),
+ });
+}
+
+export async function refreshModels(
+ tx: SQLiteTransaction,
+ keyId: string,
+ models: any[],
+) {
+ await tx.delete(modelTable).where(
+ and(
+ eq(modelTable.keyId, keyId),
+ notInArray(
+ modelTable.name,
+ models.map((m) => m.name),
+ ),
+ ),
+ );
+ for (const model of models) {
+ await tx
+ .insert(modelTable)
+ .values({ id: nanoid(10), name: model.name, visible: 1, keyId })
+ .onConflictDoNothing({
+ target: [modelTable.name, modelTable.keyId],
+ });
+ }
+}
+
+export async function toggleVisible(key: Key, model: Model) {
+ await useDb()
+ .update(modelTable)
+ .set({ visible: model.visible ? 0 : 1 })
+ .where(and(eq(modelTable.id, model.id), eq(modelTable.keyId, key.id)));
+ await invalidateModel(keyTable, key);
+ await invalidateModel(modelTable, model);
+}
+
+export async function toggleAllVisible(key: Key, visible: 1 | 0) {
+ console.time("toggleAllVisible");
+ await useDb().update(modelTable).set({ visible }).where(eq(modelTable.keyId, key.id));
+ console.timeEnd("toggleAllVisible");
+ await invalidateModel(keyTable, key);
+ await invalidate("view:key");
+}
diff --git a/src/routes/(app)/settings/keys/+page.svelte b/src/routes/(app)/settings/keys/+page.svelte
new file mode 100644
index 0000000..febff77
--- /dev/null
+++ b/src/routes/(app)/settings/keys/+page.svelte
@@ -0,0 +1,43 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/routes/(app)/settings/keys/+page.ts b/src/routes/(app)/settings/keys/+page.ts
new file mode 100644
index 0000000..d57c77d
--- /dev/null
+++ b/src/routes/(app)/settings/keys/+page.ts
@@ -0,0 +1,11 @@
+import { keyTable, registerModel } from "@/database";
+import { loadKeys } from "./$data";
+
+export async function load({ depends }) {
+ const keys = await loadKeys();
+ registerModel(keyTable, keys, depends);
+ depends("view:services");
+ return {
+ keys,
+ };
+}
diff --git a/src/routes/(app)/settings/keys/[id]/+page.svelte b/src/routes/(app)/settings/keys/[id]/+page.svelte
new file mode 100644
index 0000000..afa790d
--- /dev/null
+++ b/src/routes/(app)/settings/keys/[id]/+page.svelte
@@ -0,0 +1,282 @@
+
+
+
+{#if data.key.service.sdk.type === "model"}
+
+
+
+
+
+ {#if data.key.models.length > 0}
+
+
+{/if}
+
+
+
+
+
+
+
+
diff --git a/src/routes/(app)/settings/keys/[id]/+page.ts b/src/routes/(app)/settings/keys/[id]/+page.ts
new file mode 100644
index 0000000..4ca5d34
--- /dev/null
+++ b/src/routes/(app)/settings/keys/[id]/+page.ts
@@ -0,0 +1,30 @@
+import { keyTable, registerModel, useDb } from "@/database";
+import { eq } from "drizzle-orm";
+import { superValidate } from "sveltekit-superforms";
+import { zod } from "sveltekit-superforms/adapters";
+import { formSchema, loadServices } from "../$data";
+import { error } from "@sveltejs/kit";
+
+export async function load({ params, depends }) {
+ const key = await useDb().query.keyTable.findFirst({
+ where: eq(keyTable.id, params.id),
+ with: {
+ models: true,
+ service: {
+ with: {
+ sdk: true,
+ },
+ },
+ },
+ });
+ if (!key) {
+ return error(404, "Account not found");
+ }
+ const form = await superValidate(key, zod(formSchema));
+ registerModel(keyTable, key, depends);
+ return {
+ form,
+ key,
+ services: await loadServices(),
+ };
+}
diff --git a/src/routes/(app)/settings/keys/add/+page.svelte b/src/routes/(app)/settings/keys/add/+page.svelte
new file mode 100644
index 0000000..5c69342
--- /dev/null
+++ b/src/routes/(app)/settings/keys/add/+page.svelte
@@ -0,0 +1,224 @@
+
+
+
diff --git a/src/routes/(app)/settings/keys/add/+page.ts b/src/routes/(app)/settings/keys/add/+page.ts
new file mode 100644
index 0000000..01fef86
--- /dev/null
+++ b/src/routes/(app)/settings/keys/add/+page.ts
@@ -0,0 +1,16 @@
+import { formSchema, loadServices } from "../$data";
+import { registerModel, serviceTable } from "@/database";
+import { superValidate } from "sveltekit-superforms";
+import { zod } from "sveltekit-superforms/adapters";
+
+export async function load({ depends, route }) {
+ const form = await superValidate(zod(formSchema));
+ const services = await loadServices();
+ console.log("services", services);
+ registerModel(serviceTable, services, depends);
+ depends("view:services");
+ return {
+ form,
+ services,
+ };
+}
diff --git a/src/routes/(app)/chat/[id]/[...rest]/config/SelectAccount.svelte b/src/routes/(app)/settings/titles/+page.svelte
similarity index 100%
rename from src/routes/(app)/chat/[id]/[...rest]/config/SelectAccount.svelte
rename to src/routes/(app)/settings/titles/+page.svelte
diff --git a/src/routes/test/editor/+page.svelte b/src/routes/test/editor/+page.svelte
new file mode 100644
index 0000000..c63c893
--- /dev/null
+++ b/src/routes/test/editor/+page.svelte
@@ -0,0 +1,5 @@
+
+
+");
+ expect(chatRequest.messages[0].content).toContain('');
+ expect(chatRequest.messages[0].content).toContain("Message with multiple attachments");
+
+ // Verify that the original message doesn't contain processed attachments
+ expect(chatService.messages[0].content).toBe("Message with multiple attachments");
+ expect(chatService.messages[0].attachments).toHaveLength(2);
+ });
+
+ it("should handle empty attachments gracefully in chat request", async () => {
+ chatService.messages.push({
+ id: "test-message",
+ role: "user",
+ content: "Message with empty attachment",
+ attachments: [
+ { id: "test-attachment", type: "pasted", content: "", attributes: {}, name: "Pasted" },
+ ],
+ });
+ await chatService.submit();
+
+ const chatRequest = chatService.createChatRequest();
+ expect(chatRequest.messages[0].content).not.toContain("");
+ expect(chatRequest.messages[0].content).toBe("Message with empty attachment");
+
+ // Verify that the original message preserves the empty attachment
+ expect(chatService.messages[0].content).toBe("Message with empty attachment");
+ expect(chatService.messages[0].attachments).toHaveLength(1);
+ expect(chatService.messages[0].attachments![0].content).toBe("");
+ });
+
+ it("should handle attachments with special characters in chat request", async () => {
+ chatService.messages.push({
+ id: "test-message",
+ role: "user",
+ content: "Message with special characters",
+ attachments: [
+ {
+ id: "test-attachment",
+ type: "pasted",
+ content: "Content with and \n newlines",
+ attributes: {},
+ name: "Pasted",
+ },
+ ],
+ });
+ await chatService.submit();
+
+ const chatRequest = chatService.createChatRequest();
+ expect(chatRequest.messages[0].content).toContain("<tags>");
+ expect(chatRequest.messages[0].content).toContain("\n newlines");
+ });
+});
diff --git a/test/use-chat/mock-server.ts b/test/chat-service/mock-server.ts
similarity index 100%
rename from test/use-chat/mock-server.ts
rename to test/chat-service/mock-server.ts
diff --git a/test/registry.test.ts b/test/registry.test.ts
index 0651c39..7b15cfb 100644
--- a/test/registry.test.ts
+++ b/test/registry.test.ts
@@ -1,22 +1,12 @@
import { describe, expect, it } from "vitest";
-import {
- type Model,
- type Chat,
- chatTable,
- type Response,
- type ResponseMessage,
- type Service,
-} from "@/database/schema";
+import { type Chat, chatTable, type Message, type Revision } from "@/database/schema";
import { registerModel } from "../src/database";
describe("cache", () => {
it("should use relations to extract models", async () => {
type ChatView = Chat & {
- responses: (Response & {
- model: Model & {
- service: Service;
- };
- messages: ResponseMessage[];
+ revisions: (Revision & {
+ messages: Message[];
})[];
};
@@ -25,18 +15,18 @@ describe("cache", () => {
name: "Untitled",
prompt: "",
createdAt: new Date().toISOString(),
- responses: [
+ revisions: [
{
- id: "id-response",
+ id: "id-revision",
+ version: 1,
chatId: "id-chat",
- modelId: "id-model",
error: null,
createdAt: new Date().toISOString(),
messages: [
{
id: "id-message",
index: 0,
- responseId: "id-response",
+ revisionId: "id-revision",
role: "user",
content: "",
createdAt: new Date().toISOString(),
@@ -44,27 +34,12 @@ describe("cache", () => {
{
id: "id-message2",
index: 0,
- responseId: "id-response",
+ revisionId: "id-revision",
role: "user",
content: "",
createdAt: new Date().toISOString(),
},
],
- model: {
- id: "id-model",
- serviceId: "id-service",
- name: "",
- visible: 1,
- createdAt: new Date().toISOString(),
- service: {
- id: "id-service",
- name: "",
- providerId: "",
- baseURL: "",
- apiKey: "",
- createdAt: new Date().toISOString(),
- },
- },
},
],
};
@@ -74,12 +49,10 @@ describe("cache", () => {
});
expect(dependencies).toEqual(
new Set([
- "model:chat:id-chat",
- "model:response:id-response",
- "model:responseMessage:id-message",
- "model:responseMessage:id-message2",
- "model:model:id-model",
- "model:service:id-service",
+ "model:public.chat:id-chat",
+ "model:public.revision:id-revision",
+ "model:public.message:id-message",
+ "model:public.message:id-message2",
]),
);
});
diff --git a/test/route.test.ts b/test/route.test.ts
new file mode 100644
index 0000000..092e2cd
--- /dev/null
+++ b/test/route.test.ts
@@ -0,0 +1,151 @@
+import { describe, expect, it } from "vitest";
+import { extractParams, match, route } from "$lib/route";
+
+describe("route function", () => {
+ it("should correctly handle parameterized routes", () => {
+ const result = route("/chat/[id]", { id: "hello" });
+ expect(result).toBe("/chat/hello");
+ });
+
+ it("should handle query parameters", () => {
+ const result = route("/chat/[id]", { id: "hello", $query: { message: "test" } });
+ expect(result).toBe("/chat/hello?message=test");
+ });
+
+ it("should handle hash", () => {
+ const result = route("/chat/[id]", { id: "hello", $hash: "section1" });
+ expect(result).toBe("/chat/hello#section1");
+ });
+
+ it("should handle query parameters and hash", () => {
+ const result = route("/chat/[id]", {
+ id: "hello",
+ $query: { message: "test" },
+ $hash: "section1",
+ });
+ expect(result).toBe("/chat/hello?message=test#section1");
+ });
+
+ it("should handle routes with catch-all parameters", () => {
+ const result = route("/chat/[id]/[...rest]/config/[serviceId]", {
+ id: "chatId",
+ rest: "some/nested/route",
+ serviceId: "serviceId",
+ });
+ expect(result).toBe("/chat/chatId/some/nested/route/config/serviceId");
+ });
+
+ it("should throw an error if required param is missing", () => {
+ // @ts-expect-error error test, should throw
+ expect(() => route("/chat/[id]", {})).toThrow();
+ });
+
+ it("should handle group routes correctly", () => {
+ const result = route("/document/new", {});
+ expect(result).toBe("/document/new");
+ });
+ it("should correctly handle parameterized routes", () => {
+ const result = route("/chat/[id]", { id: "hello" });
+ expect(result).toBe("/chat/hello");
+ });
+
+ it("should handle query parameters", () => {
+ const result = route("/chat/[id]", { id: "hello", $query: { message: "test" } });
+ expect(result).toBe("/chat/hello?message=test");
+ });
+
+ it("should handle hash", () => {
+ const result = route("/chat/[id]", { id: "hello", $hash: "section1" });
+ expect(result).toBe("/chat/hello#section1");
+ });
+
+ it("should handle query parameters and hash", () => {
+ const result = route("/chat/[id]", {
+ id: "hello",
+ $query: { message: "test" },
+ $hash: "section1",
+ });
+ expect(result).toBe("/chat/hello?message=test#section1");
+ });
+
+ it("should handle routes with catch-all parameters", () => {
+ const result = route("/chat/[id]/[...rest]/config/[serviceId]", {
+ id: "chatId",
+ rest: "some/nested/route",
+ serviceId: "serviceId",
+ });
+ expect(result).toBe("/chat/chatId/some/nested/route/config/serviceId");
+ });
+
+ it("should throw an error if required param is missing", () => {
+ // @ts-expect-error error test, should throw
+ expect(() => route("/chat/[id]", {})).toThrow();
+ });
+
+ it("should handle group routes correctly", () => {
+ const result = route("/document/new", {});
+ expect(result).toBe("/document/new");
+ });
+});
+
+describe("match function", () => {
+ it("should match routes with group prefix", () => {
+ expect(match("/chat/[id]", "/(app)/chat/1")).toBe(true);
+ });
+
+ it("should match exact routes", () => {
+ expect(match("/document/new", "/document/new")).toBe(true);
+ });
+
+ it("should match parameterized routes", () => {
+ expect(match("/chat/[id]", "/chat/123")).toBe(true);
+ });
+
+ it("should not match routes with different lengths", () => {
+ expect(match("/chat/[id]", "/chat/123/messages")).toBe(false);
+ });
+
+ it("should not match routes with different static parts", () => {
+ expect(match("/chat/[id]", "/user/123")).toBe(false);
+ });
+
+ it("should match routes with multiple parameters", () => {
+ expect(match("/chat/[id]/[...rest]/config/[serviceId]", "/chat/123/config/456")).toBe(true);
+ });
+
+ it("should match routes with catch-all parameters", () => {
+ expect(match("/chat/[id]/[...rest]/config", "/chat/123/foo/bar/baz/config")).toBe(true);
+ });
+});
+
+describe("extractParams function", () => {
+ it("should extract params from a simple route", () => {
+ const params = extractParams("/chat/[id]", "/chat/123");
+ expect(params).toEqual({ id: "123" });
+ });
+
+ it("should extract multiple params", () => {
+ const params = extractParams("/chat/[id]/[...rest]/config/[serviceId]", "/chat/123/config/456");
+ expect(params).toEqual({ id: "123", serviceId: "456", rest: "" });
+ });
+
+ it("should extract catch-all params", () => {
+ const params = extractParams("/chat/[id]/[...rest]/config", "/chat/123/foo/bar/baz/config");
+ expect(params).toEqual({ id: "123", rest: "foo/bar/baz" });
+ });
+
+ it("should return null for non-matching routes", () => {
+ const params = extractParams("/chat/[id]", "/user/123");
+ expect(params).toBeNull();
+ });
+
+ it("should return null for routes with different lengths", () => {
+ const params = extractParams("/chat/[id]", "/chat/123/messages");
+ expect(params).toBeNull();
+ });
+
+ it("should return an empty object for routes with no params", () => {
+ const params = extractParams("/document/new", "/document/new");
+ expect(params).toEqual({});
+ });
+});
diff --git a/test/runes/counter.svelte.ts b/test/runes/counter.svelte.ts
new file mode 100644
index 0000000..4350c24
--- /dev/null
+++ b/test/runes/counter.svelte.ts
@@ -0,0 +1,16 @@
+export class Counter {
+ count = $state(0);
+ doubleCount = $derived(this.count * 2);
+
+ constructor(initial: number = 0) {
+ this.count = initial;
+ }
+
+ increment() {
+ this.count++;
+ }
+
+ decrement() {
+ this.count--;
+ }
+}
diff --git a/test/runes/counter.test.ts b/test/runes/counter.test.ts
new file mode 100644
index 0000000..2aefec2
--- /dev/null
+++ b/test/runes/counter.test.ts
@@ -0,0 +1,33 @@
+import { describe, expect, it } from "vitest";
+import { Counter } from "./counter.svelte";
+import { tick } from "svelte";
+
+describe("Counter", () => {
+ it("should initialize with the given value", () => {
+ const counter = new Counter(5);
+ expect(counter.count).toBe(5);
+ });
+
+ it("should increment the count", async () => {
+ const counter = new Counter(0);
+ counter.increment();
+ await tick();
+ expect(counter.count).toBe(1);
+ });
+
+ it("should decrement the count", async () => {
+ const counter = new Counter(5);
+ counter.decrement();
+ await tick();
+ expect(counter.count).toBe(4);
+ });
+
+ it("should calculate doubleCount correctly", async () => {
+ const counter = new Counter(2);
+ expect(counter.doubleCount).toBe(4);
+ counter.increment();
+ await tick();
+ expect(counter.count).toBe(3);
+ expect(counter.doubleCount).toBe(6);
+ });
+});
diff --git a/test/use-chat/TestUseChat.svelte b/test/use-chat/TestUseChat.svelte
deleted file mode 100644
index dd34836..0000000
--- a/test/use-chat/TestUseChat.svelte
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-
+
+
+ Your keys
+ Manage your API keys.
+
+
+
+ {#if data.keys.length === 0}
+
+
+
+ No keys found.
+ {/if} + {#each data.keys as key (key.id)} + +
+
+
+ {/each}
+ {key.name}
+{key.service.name}
+
+
+
+ {data.key.service.name} models
+ Show or hide models displayed in the chat interface.
+
+
+
+
+
+
+
+
+
+
+ {/if}
+
+
+
+ Delete key
+ Delete this API key and models configuration.
+
+
- {#if chat.isLoading}
-
-
-
diff --git a/test/use-chat/use-chat.test.ts b/test/use-chat/use-chat.test.ts
deleted file mode 100644
index d85e8b1..0000000
--- a/test/use-chat/use-chat.test.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-/* @vitest-environment jsdom */
-import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
-import { fireEvent, render, waitFor } from "@testing-library/svelte";
-import TestUseChatComponent from "./TestUseChat.svelte";
-import { createMockServer } from "./mock-server";
-
-describe("useChat in Svelte component", () => {
- const mockServer = createMockServer();
-
- beforeEach(() => {
- mockServer.listen();
- });
-
- afterEach(() => {
- mockServer.close();
- vi.restoreAllMocks();
- });
-
- it("should handle the complete request chain correctly", async () => {
- // @ts-expect-error render expects class component
- const { getByText, getByPlaceholderText, findByText } = render(TestUseChatComponent, {
- props: {},
- });
-
- // Type a message in the input
- const input = getByPlaceholderText("Type a message...");
- await fireEvent.input(input, { target: { value: "Hi there!" } });
-
- // Submit the form
- const submitButton = getByText("Send Message");
- await fireEvent.click(submitButton);
-
- // Wait for the loading state
- await findByText("Loading...");
-
- // Wait for the response to be rendered
- await waitFor(
- () => {
- expect(getByText("user: Hi there!")).toBeTruthy();
- expect(getByText("assistant: Hello, world.")).toBeTruthy();
- },
- { timeout: 500 },
- );
- });
-});
diff --git a/vite.config.ts b/vite.config.ts
index 0a799fa..0305f40 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -16,7 +16,7 @@ export default defineConfig({
},
},
optimizeDeps: {
- exclude: ["sqlocal"],
+ exclude: ["sqlocal", "@electric-sql/pglite"],
},
plugins: [
sveltekit(),
Loading...
- {:else if chat.error} -Error: {chat.error.message}
- {:else} --
- {#each chat.messages as message}
-
- {message.role}: {message.content} - {/each} -