aboutsummaryrefslogtreecommitdiff
path: root/apps/web
diff options
context:
space:
mode:
authorDhravya Shah <[email protected]>2024-08-06 11:20:29 -0700
committerGitHub <[email protected]>2024-08-06 11:20:29 -0700
commit7fc39cd770e4b2f55c6fdae1fa02fe0a66a93f6d (patch)
tree82e6a03099b50441c2fe9a9bf8e8ddf7afa293e5 /apps/web
parentMerge pull request #219 from Deepakchowdavarapu/readme-issue (diff)
parentupdated kv and queues (diff)
downloadsupermemory-7fc39cd770e4b2f55c6fdae1fa02fe0a66a93f6d.tar.xz
supermemory-7fc39cd770e4b2f55c6fdae1fa02fe0a66a93f6d.zip
Merge pull request #193 from supermemoryai/kush/be-queue
Kush/be queue
Diffstat (limited to 'apps/web')
-rw-r--r--apps/web/app/(auth)/onboarding/page.tsx2
-rw-r--r--apps/web/app/(dash)/(memories)/content.tsx2
-rw-r--r--apps/web/app/(dash)/(memories)/space/[spaceid]/page.tsx2
-rw-r--r--apps/web/app/(dash)/dialogContentContainer.tsx4
-rw-r--r--apps/web/app/(dash)/menu.tsx14
-rw-r--r--apps/web/app/actions/doers.ts502
-rw-r--r--apps/web/app/actions/fetchers.ts2
-rw-r--r--apps/web/app/api/chat/history/route.ts2
-rw-r--r--apps/web/app/api/chat/route.ts2
-rw-r--r--apps/web/app/api/ensureAuth.ts2
-rw-r--r--apps/web/app/api/getCount/route.ts2
-rw-r--r--apps/web/app/api/me/route.ts2
-rw-r--r--apps/web/app/api/memories/route.ts2
-rw-r--r--apps/web/app/api/spaces/route.ts2
-rw-r--r--apps/web/app/api/store/friend/route.ts44
-rw-r--r--apps/web/app/api/store/helper.ts20
-rw-r--r--apps/web/app/api/telegram/route.ts2
-rw-r--r--apps/web/drizzle.config.ts2
-rw-r--r--apps/web/lib/constants.ts6
-rw-r--r--apps/web/lib/get-metadata.ts40
-rw-r--r--apps/web/migrations/0000_fixed_pandemic.sql (renamed from apps/web/migrations/0000_steep_moira_mactaggert.sql)19
-rw-r--r--apps/web/migrations/0001_Adding_jobs_table.sql19
-rw-r--r--apps/web/migrations/meta/0000_snapshot.json108
-rw-r--r--apps/web/migrations/meta/_journal.json4
-rw-r--r--apps/web/next.config.mjs39
-rw-r--r--apps/web/package.json1
-rw-r--r--apps/web/server/auth.ts2
-rw-r--r--apps/web/server/db/index.ts2
-rw-r--r--apps/web/server/db/schema.ts244
-rw-r--r--apps/web/wrangler.toml1
30 files changed, 439 insertions, 656 deletions
diff --git a/apps/web/app/(auth)/onboarding/page.tsx b/apps/web/app/(auth)/onboarding/page.tsx
index 93e07e73..9a6ac481 100644
--- a/apps/web/app/(auth)/onboarding/page.tsx
+++ b/apps/web/app/(auth)/onboarding/page.tsx
@@ -294,7 +294,7 @@ function StepThree({ currStep }: { currStep: number }) {
});
if (cont.success) {
- toast.success("Memory created", {
+ toast.success("Memory queued", {
richColors: true,
});
} else {
diff --git a/apps/web/app/(dash)/(memories)/content.tsx b/apps/web/app/(dash)/(memories)/content.tsx
index 179b4ef2..6e2659cb 100644
--- a/apps/web/app/(dash)/(memories)/content.tsx
+++ b/apps/web/app/(dash)/(memories)/content.tsx
@@ -1,6 +1,6 @@
"use client";
-import { Content, StoredSpace } from "@/server/db/schema";
+import { Content, StoredSpace } from "@repo/db/schema";
import { MemoriesIcon, NextIcon, SearchIcon, UrlIcon } from "@repo/ui/icons";
import {
ArrowLeftIcon,
diff --git a/apps/web/app/(dash)/(memories)/space/[spaceid]/page.tsx b/apps/web/app/(dash)/(memories)/space/[spaceid]/page.tsx
index ed1ea1cc..8ad9d9cc 100644
--- a/apps/web/app/(dash)/(memories)/space/[spaceid]/page.tsx
+++ b/apps/web/app/(dash)/(memories)/space/[spaceid]/page.tsx
@@ -3,7 +3,7 @@ import { redirect } from "next/navigation";
import MemoriesPage from "../../content";
import { db } from "@/server/db";
import { and, eq } from "drizzle-orm";
-import { spacesAccess } from "@/server/db/schema";
+import { spacesAccess } from "@repo/db/schema";
import { auth } from "@/server/auth";
async function Page({ params: { spaceid } }: { params: { spaceid: number } }) {
diff --git a/apps/web/app/(dash)/dialogContentContainer.tsx b/apps/web/app/(dash)/dialogContentContainer.tsx
index 4e8d81ef..1a11ac6d 100644
--- a/apps/web/app/(dash)/dialogContentContainer.tsx
+++ b/apps/web/app/(dash)/dialogContentContainer.tsx
@@ -1,4 +1,4 @@
-import { StoredSpace } from "@/server/db/schema";
+import { StoredSpace } from "@repo/db/schema";
import { useEffect, useMemo, useState } from "react";
import { createMemory, createSpace } from "../actions/doers";
import ComboboxWithCreate from "@repo/ui/shadcn/combobox";
@@ -76,7 +76,7 @@ export function DialogContentContainer({
setSelectedSpaces([]);
if (cont.success) {
- toast.success("Memory created", {
+ toast.success("Memory queued", {
richColors: true,
});
} else {
diff --git a/apps/web/app/(dash)/menu.tsx b/apps/web/app/(dash)/menu.tsx
index 7eac5a56..1c0ce1ee 100644
--- a/apps/web/app/(dash)/menu.tsx
+++ b/apps/web/app/(dash)/menu.tsx
@@ -28,7 +28,7 @@ import { getSpaces } from "../actions/fetchers";
import { HomeIcon } from "@heroicons/react/24/solid";
import { createMemory, createSpace } from "../actions/doers";
import ComboboxWithCreate from "@repo/ui/shadcn/combobox";
-import { StoredSpace } from "@/server/db/schema";
+import { StoredSpace } from "@repo/db/schema";
import useMeasure from "react-use-measure";
import { useKeyPress } from "@/lib/useKeyPress";
@@ -121,9 +121,14 @@ function Menu() {
setContent("");
setSelectedSpaces([]);
if (cont.success) {
+ toast.success("Memory queued", {
+ richColors: true,
+ });
+ } else {
+ toast.error(`Memory creation failed: ${cont.error}`);
+ throw new Error(`Memory creation failed: ${cont.error}`);
return cont;
}
- throw new Error(`Memory creation failed: ${cont.error}`);
};
return (
@@ -275,10 +280,7 @@ function Menu() {
]);
setSelectedSpaces((prev) => [...prev, creationTask.data!]);
} else {
- toast.error(
- "Space creation failed: " + creationTask.error ??
- "Unknown error",
- );
+ toast.error("Space creation failed: " + creationTask.error);
}
}}
placeholder="Select or create a new space."
diff --git a/apps/web/app/actions/doers.ts b/apps/web/app/actions/doers.ts
index 9750a705..c11d5f0a 100644
--- a/apps/web/app/actions/doers.ts
+++ b/apps/web/app/actions/doers.ts
@@ -11,13 +11,13 @@ import {
spacesAccess,
storedContent,
users,
-} from "../../server/db/schema";
+} from "@repo/db/schema";
import { ServerActionReturnType } from "./types";
import { auth } from "../../server/auth";
import { Tweet } from "react-tweet/api";
-import { getMetaData } from "@/lib/get-metadata";
+// import { getMetaData } from "@/lib/get-metadata";
import { and, eq, inArray, sql } from "drizzle-orm";
-import { LIMITS } from "@/lib/constants";
+import { LIMITS } from "@repo/shared-types";
import { ChatHistory } from "@repo/shared-types";
import { decipher } from "@/server/encrypt";
import { redirect } from "next/navigation";
@@ -104,25 +104,6 @@ const typeDecider = (content: string): "page" | "tweet" | "note" => {
}
};
-export const limit = async (
- userId: string,
- type = "page",
- items: number = 1,
-) => {
- const countResult = await db
- .select({
- count: sql<number>`count(*)`.mapWith(Number),
- })
- .from(storedContent)
- .where(and(eq(storedContent.userId, userId), eq(storedContent.type, type)));
-
- const currentCount = countResult[0]?.count || 0;
- const totalLimit = LIMITS[type as keyof typeof LIMITS];
- const remainingLimit = totalLimit - currentCount;
-
- return items <= remainingLimit;
-};
-
export const addUserToSpace = async (userEmail: string, spaceId: number) => {
const data = await auth();
@@ -208,122 +189,15 @@ export const createMemory = async (input: {
return { error: "Not authenticated", success: false };
}
- const type = typeDecider(input.content);
-
- let pageContent = input.content;
- let metadata: Awaited<ReturnType<typeof getMetaData>>;
- let vectorData: string;
-
- if (!(await limit(data.user.id, type))) {
- return {
- success: false,
- data: 0,
- error: `You have exceeded the limit of ${LIMITS[type as keyof typeof LIMITS]} ${type}s.`,
- };
- }
-
- let noteId = 0;
-
- if (type === "page") {
- const response = await fetch("https://md.dhr.wtf/?url=" + input.content, {
- headers: {
- Authorization: "Bearer " + process.env.BACKEND_SECURITY_KEY,
- },
- });
- pageContent = await response.text();
- vectorData = pageContent;
- try {
- metadata = await getMetaData(input.content);
- } catch (e) {
- return {
- success: false,
- error: "Failed to fetch metadata for the page. Please try again later.",
- };
- }
- } else if (type === "tweet") {
- //Request the worker for the entire thread
-
- let thread: string;
- let errorOccurred: boolean = false;
-
- try {
- const cf_thread_endpoint = process.env.THREAD_CF_WORKER;
- const authKey = process.env.THREAD_CF_AUTH;
- const threadRequest = await fetch(cf_thread_endpoint, {
- method: "POST",
- headers: {
- "Content-Type": "application/json",
- Authorization: authKey,
- },
- body: JSON.stringify({ url: input.content }),
- });
-
- if (threadRequest.status !== 200) {
- throw new Error(
- `Failed to fetch the thread: ${input.content}, Reason: ${threadRequest.statusText}`,
- );
- }
-
- thread = await threadRequest.text();
- if (thread.trim().length === 2) {
- console.log("Thread is an empty array");
- throw new Error(
- "[THREAD FETCHING SERVICE] Got no content form thread worker",
- );
- }
- } catch (e) {
- console.log("[THREAD FETCHING SERVICE] Failed to fetch the thread", e);
- errorOccurred = true;
- }
-
- const tweet = await getTweetData(input.content.split("/").pop() as string);
-
- pageContent = tweetToMd(tweet);
- console.log("THis ishte page content!!", pageContent);
- //@ts-ignore
- vectorData = errorOccurred ? JSON.stringify(pageContent) : thread;
- metadata = {
- baseUrl: input.content,
- description: tweet.text.slice(0, 200),
- image: tweet.user.profile_image_url_https,
- title: `Tweet by ${tweet.user.name}`,
- };
- } else if (type === "note") {
- pageContent = input.content;
- vectorData = pageContent;
- noteId = new Date().getTime();
- metadata = {
- baseUrl: `https://supermemory.ai/note/${noteId}`,
- description: `Note created at ${new Date().toLocaleString()}`,
- image: "https://supermemory.ai/logo.png",
- title: `${pageContent.slice(0, 20)} ${pageContent.length > 20 ? "..." : ""}`,
- };
- } else {
- return {
- success: false,
- data: 0,
- error: "Invalid type",
- };
- }
-
- let storeToSpaces = input.spaces;
-
- if (!storeToSpaces) {
- storeToSpaces = [];
- }
-
- const vectorSaveResponse = await fetch(
+ // make the backend reqeust for the queue here
+ const vectorSaveResponses = await fetch(
`${process.env.BACKEND_BASE_URL}/api/add`,
{
method: "POST",
body: JSON.stringify({
- pageContent: vectorData,
- title: metadata.title,
- description: metadata.description,
- url: metadata.baseUrl,
- spaces: storeToSpaces.map((spaceId) => spaceId.toString()),
+ url: input.content,
+ spaces: input.spaces,
user: data.user.id,
- type,
}),
headers: {
"Content-Type": "application/json",
@@ -331,126 +205,262 @@ export const createMemory = async (input: {
},
},
);
-
- if (!vectorSaveResponse.ok) {
- const errorData = await vectorSaveResponse.text();
- console.error(errorData);
- return {
- success: false,
- data: 0,
- error: `Failed to save to vector store. Backend returned error: ${errorData}`,
- };
- }
-
- let contentId: number;
-
- const response = (await vectorSaveResponse.json()) as {
+ const response = (await vectorSaveResponses.json()) as {
status: string;
- chunkedInput: string;
message?: string;
};
- try {
- if (response.status !== "ok") {
- if (response.status === "error") {
- return {
- success: false,
- data: 0,
- error: response.message,
- };
- } else {
- return {
- success: false,
- data: 0,
- error: `Failed to save to vector store. Backend returned error: ${response.message}`,
- };
- }
- }
- } catch (e) {
+ if (response.status !== "ok") {
return {
success: false,
data: 0,
- error: `Failed to save to vector store. Backend returned error: ${e}`,
+ error: response.message,
};
}
- const saveToDbUrl =
- (metadata.baseUrl.split("#supermemory-user-")[0] ?? metadata.baseUrl) +
- "#supermemory-user-" +
- data.user.id;
-
- // Insert into database
- try {
- const insertResponse = await db
- .insert(storedContent)
- .values({
- content: pageContent,
- title: metadata.title,
- description: metadata.description,
- url: saveToDbUrl,
- baseUrl: saveToDbUrl,
- image: metadata.image,
- savedAt: new Date(),
- userId: data.user.id,
- type,
- noteId,
- })
- .returning({ id: storedContent.id });
- revalidatePath("/memories");
- revalidatePath("/home");
-
- if (!insertResponse[0]?.id) {
- return {
- success: false,
- data: 0,
- error: "Something went wrong while saving the document to the database",
- };
- }
-
- contentId = insertResponse[0]?.id;
- } catch (e) {
- const error = e as Error;
- console.log("Error: ", error.message);
-
- if (
- error.message.includes(
- "D1_ERROR: UNIQUE constraint failed: storedContent.baseUrl",
- )
- ) {
- return {
- success: false,
- data: 0,
- error: "Content already exists",
- };
- }
-
- return {
- success: false,
- data: 0,
- error: "Failed to save to database with error: " + error.message,
- };
- }
-
- if (storeToSpaces.length > 0) {
- // Adding the many-to-many relationship between content and spaces
- const spaceData = await db
- .select()
- .from(space)
- .where(
- and(inArray(space.id, storeToSpaces), eq(space.user, data.user.id)),
- )
- .all();
-
- await Promise.all(
- spaceData.map(async (s) => {
- await db
- .insert(contentToSpace)
- .values({ contentId: contentId, spaceId: s.id });
-
- await db.update(space).set({ numItems: s.numItems + 1 });
- }),
- );
- }
+ // const type = typeDecider(input.content);
+
+ // let pageContent = input.content;
+ // let metadata: Awaited<ReturnType<typeof getMetaData>>;
+ // let vectorData: string;
+
+ // if (!(await limit(data.user.id, type))) {
+ // return {
+ // success: false,
+ // data: 0,
+ // error: `You have exceeded the limit of ${LIMITS[type as keyof typeof LIMITS]} ${type}s.`,
+ // };
+ // } --> How would this fit in the backend???
+
+ // let noteId = 0;
+
+ // if (type === "page") {
+ // const response = await fetch("https://md.dhr.wtf/?url=" + input.content, {
+ // headers: {
+ // Authorization: "Bearer " + process.env.BACKEND_SECURITY_KEY,
+ // },
+ // });
+ // pageContent = await response.text();
+ // vectorData = pageContent;
+ // try {
+ // metadata = await getMetaData(input.content);
+ // } catch (e) {
+ // return {
+ // success: false,
+ // error: "Failed to fetch metadata for the page. Please try again later.",
+ // };
+ // }
+ // } else if (type === "tweet") {
+ // //Request the worker for the entire thread
+
+ // let thread: string;
+ // let errorOccurred: boolean = false;
+
+ // try {
+ // const cf_thread_endpoint = process.env.THREAD_CF_WORKER;
+ // const authKey = process.env.THREAD_CF_AUTH;
+ // const threadRequest = await fetch(cf_thread_endpoint, {
+ // method: "POST",
+ // headers: {
+ // "Content-Type": "application/json",
+ // Authorization: authKey,
+ // },
+ // body: JSON.stringify({ url: input.content }),
+ // });
+
+ // if (threadRequest.status !== 200) {
+ // throw new Error(
+ // `Failed to fetch the thread: ${input.content}, Reason: ${threadRequest.statusText}`,
+ // );
+ // }
+
+ // thread = await threadRequest.text();
+ // if (thread.trim().length === 2) {
+ // console.log("Thread is an empty array");
+ // throw new Error(
+ // "[THREAD FETCHING SERVICE] Got no content form thread worker",
+ // );
+ // }
+ // } catch (e) {
+ // console.log("[THREAD FETCHING SERVICE] Failed to fetch the thread", e);
+ // errorOccurred = true;
+ // }
+
+ // const tweet = await getTweetData(input.content.split("/").pop() as string);
+
+ // pageContent = tweetToMd(tweet);
+ // console.log("THis ishte page content!!", pageContent);
+ // //@ts-ignore
+ // vectorData = errorOccurred ? JSON.stringify(pageContent) : thread;
+ // metadata = {
+ // baseUrl: input.content,
+ // description: tweet.text.slice(0, 200),
+ // image: tweet.user.profile_image_url_https,
+ // title: `Tweet by ${tweet.user.name}`,
+ // };
+ // } else if (type === "note") {
+ // pageContent = input.content;
+ // vectorData = pageContent;
+ // noteId = new Date().getTime();
+ // metadata = {
+ // baseUrl: `https://supermemory.ai/note/${noteId}`,
+ // description: `Note created at ${new Date().toLocaleString()}`,
+ // image: "https://supermemory.ai/logo.png",
+ // title: `${pageContent.slice(0, 20)} ${pageContent.length > 20 ? "..." : ""}`,
+ // };
+ // } else {
+ // return {
+ // success: false,
+ // data: 0,
+ // error: "Invalid type",
+ // };
+ // }
+
+ // let storeToSpaces = input.spaces;
+
+ // if (!storeToSpaces) {
+ // storeToSpaces = [];
+ // }
+
+ // const vectorSaveResponse = await fetch(
+ // `${process.env.BACKEND_BASE_URL}/api/add`,
+ // {
+ // method: "POST",
+ // body: JSON.stringify({
+ // pageContent: vectorData,
+ // title: metadata.title,
+ // description: metadata.description,
+ // url: metadata.baseUrl,
+ // spaces: storeToSpaces.map((spaceId) => spaceId.toString()),
+ // user: data.user.id,
+ // type,
+ // }),
+ // headers: {
+ // "Content-Type": "application/json",
+ // Authorization: "Bearer " + process.env.BACKEND_SECURITY_KEY,
+ // },
+ // },
+ // );
+
+ // if (!vectorSaveResponse.ok) {
+ // const errorData = await vectorSaveResponse.text();
+ // console.error(errorData);
+ // return {
+ // success: false,
+ // data: 0,
+ // error: `Failed to save to vector store. Backend returned error: ${errorData}`,
+ // };
+ // }
+
+ // let contentId: number;
+
+ // const response = (await vectorSaveResponse.json()) as {
+ // status: string;
+ // chunkedInput: string;
+ // message?: string;
+ // };
+
+ // try {
+ // if (response.status !== "ok") {
+ // if (response.status === "error") {
+ // return {
+ // success: false,
+ // data: 0,
+ // error: response.message,
+ // };
+ // } else {
+ // return {
+ // success: false,
+ // data: 0,
+ // error: `Failed to save to vector store. Backend returned error: ${response.message}`,
+ // };
+ // }
+ // }
+ // } catch (e) {
+ // return {
+ // success: false,
+ // data: 0,
+ // error: `Failed to save to vector store. Backend returned error: ${e}`,
+ // };
+ // }
+
+ // const saveToDbUrl =
+ // (metadata.baseUrl.split("#supermemory-user-")[0] ?? metadata.baseUrl) +
+ // "#supermemory-user-" +
+ // data.user.id;
+
+ // // Insert into database
+ // try {
+ // const insertResponse = await db
+ // .insert(storedContent)
+ // .values({
+ // content: pageContent,
+ // title: metadata.title,
+ // description: metadata.description,
+ // url: saveToDbUrl,
+ // baseUrl: saveToDbUrl,
+ // image: metadata.image,
+ // savedAt: new Date(),
+ // userId: data.user.id,
+ // type,
+ // noteId,
+ // })
+ // .returning({ id: storedContent.id });
+ // revalidatePath("/memories");
+ // revalidatePath("/home");
+
+ // if (!insertResponse[0]?.id) {
+ // return {
+ // success: false,
+ // data: 0,
+ // error: "Something went wrong while saving the document to the database",
+ // };
+ // }
+
+ // contentId = insertResponse[0]?.id;
+ // } catch (e) {
+ // const error = e as Error;
+ // console.log("Error: ", error.message);
+
+ // if (
+ // error.message.includes(
+ // "D1_ERROR: UNIQUE constraint failed: storedContent.baseUrl",
+ // )
+ // ) {
+ // return {
+ // success: false,
+ // data: 0,
+ // error: "Content already exists",
+ // };
+ // }
+
+ // return {
+ // success: false,
+ // data: 0,
+ // error: "Failed to save to database with error: " + error.message,
+ // };
+ // }
+
+ // if (storeToSpaces.length > 0) {
+ // // Adding the many-to-many relationship between content and spaces
+ // const spaceData = await db
+ // .select()
+ // .from(space)
+ // .where(
+ // and(inArray(space.id, storeToSpaces), eq(space.user, data.user.id)),
+ // )
+ // .all();
+
+ // await Promise.all(
+ // spaceData.map(async (s) => {
+ // await db
+ // .insert(contentToSpace)
+ // .values({ contentId: contentId, spaceId: s.id });
+
+ // await db.update(space).set({ numItems: s.numItems + 1 });
+ // }),
+ // );
+ // }
return {
success: true,
@@ -828,9 +838,9 @@ export async function getQuerySuggestions() {
};
}
- const fullQuery = content
- .map((c) => `${c.title} \n\n${c.content}`)
- .join(" ");
+ const fullQuery = (
+ content?.map((c) => `${c.title} \n\n${c.content}`) ?? []
+ ).join(" ");
const suggestionsCall = (await env.AI.run(
// @ts-ignore
diff --git a/apps/web/app/actions/fetchers.ts b/apps/web/app/actions/fetchers.ts
index 5f72089a..f00feb3c 100644
--- a/apps/web/app/actions/fetchers.ts
+++ b/apps/web/app/actions/fetchers.ts
@@ -15,7 +15,7 @@ import {
StoredSpace,
User,
users,
-} from "../../server/db/schema";
+} from "@repo/db/schema";
import { ServerActionReturnType } from "./types";
import { auth } from "../../server/auth";
import { ChatHistory, SourceZod } from "@repo/shared-types";
diff --git a/apps/web/app/api/chat/history/route.ts b/apps/web/app/api/chat/history/route.ts
index 98b66064..197b8ee6 100644
--- a/apps/web/app/api/chat/history/route.ts
+++ b/apps/web/app/api/chat/history/route.ts
@@ -2,7 +2,7 @@ import { NextRequest } from "next/server";
import { ensureAuth } from "../../ensureAuth";
import { db } from "@/server/db";
import { eq } from "drizzle-orm";
-import { chatThreads } from "@/server/db/schema";
+import { chatThreads } from "@repo/db/schema";
export const runtime = "edge";
diff --git a/apps/web/app/api/chat/route.ts b/apps/web/app/api/chat/route.ts
index a14c96df..78878e40 100644
--- a/apps/web/app/api/chat/route.ts
+++ b/apps/web/app/api/chat/route.ts
@@ -8,7 +8,7 @@ import {
import { ensureAuth } from "../ensureAuth";
import { z } from "zod";
import { db } from "@/server/db";
-import { chatHistory as chatHistoryDb, chatThreads } from "@/server/db/schema";
+import { chatHistory as chatHistoryDb, chatThreads } from "@repo/db/schema";
import { and, eq, gt, sql } from "drizzle-orm";
import { join } from "path";
diff --git a/apps/web/app/api/ensureAuth.ts b/apps/web/app/api/ensureAuth.ts
index 1fcd2914..92a5e3e8 100644
--- a/apps/web/app/api/ensureAuth.ts
+++ b/apps/web/app/api/ensureAuth.ts
@@ -1,6 +1,6 @@
import { NextRequest } from "next/server";
import { db } from "../../server/db";
-import { accounts, sessions, users } from "../../server/db/schema";
+import { accounts, sessions, users } from "@repo/db/schema";
import { eq } from "drizzle-orm";
export async function ensureAuth(req: NextRequest) {
diff --git a/apps/web/app/api/getCount/route.ts b/apps/web/app/api/getCount/route.ts
index f91b7b94..4fd77efd 100644
--- a/apps/web/app/api/getCount/route.ts
+++ b/apps/web/app/api/getCount/route.ts
@@ -1,6 +1,6 @@
import { db } from "@/server/db";
import { and, eq, ne, sql } from "drizzle-orm";
-import { sessions, storedContent, users } from "@/server/db/schema";
+import { sessions, storedContent, users } from "@repo/db/schema";
import { type NextRequest, NextResponse } from "next/server";
import { ensureAuth } from "../ensureAuth";
diff --git a/apps/web/app/api/me/route.ts b/apps/web/app/api/me/route.ts
index ab408f3e..25aa27bc 100644
--- a/apps/web/app/api/me/route.ts
+++ b/apps/web/app/api/me/route.ts
@@ -1,6 +1,6 @@
import { db } from "@/server/db";
import { eq } from "drizzle-orm";
-import { sessions, users } from "@/server/db/schema";
+import { sessions, users } from "@repo/db/schema";
import { type NextRequest, NextResponse } from "next/server";
export const runtime = "edge";
diff --git a/apps/web/app/api/memories/route.ts b/apps/web/app/api/memories/route.ts
index acb43b5d..0084524e 100644
--- a/apps/web/app/api/memories/route.ts
+++ b/apps/web/app/api/memories/route.ts
@@ -6,7 +6,7 @@ import {
contentToSpace,
storedContent,
users,
-} from "@/server/db/schema";
+} from "@repo/db/schema";
import { ensureAuth } from "../ensureAuth";
export const runtime = "edge";
diff --git a/apps/web/app/api/spaces/route.ts b/apps/web/app/api/spaces/route.ts
index e85e07ed..27ff0dfb 100644
--- a/apps/web/app/api/spaces/route.ts
+++ b/apps/web/app/api/spaces/route.ts
@@ -1,5 +1,5 @@
import { db } from "@/server/db";
-import { space } from "@/server/db/schema";
+import { space } from "@repo/db/schema";
import { eq } from "drizzle-orm";
import { NextRequest, NextResponse } from "next/server";
import { ensureAuth } from "../ensureAuth";
diff --git a/apps/web/app/api/store/friend/route.ts b/apps/web/app/api/store/friend/route.ts
deleted file mode 100644
index 554b1cee..00000000
--- a/apps/web/app/api/store/friend/route.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-import { type NextRequest } from "next/server";
-import { createMemoryFromAPI } from "../helper";
-
-type FriendData = {
- id: string;
- created_at: string;
- transcript: string;
- structured: {
- title: string;
- overview: string;
- action_items: [
- {
- description: string;
- },
- ];
- };
-};
-
-export async function POST(req: NextRequest) {
- const body: FriendData = await req.json();
-
- const userId = new URL(req.url).searchParams.get("uid");
-
- if (!userId) {
- return new Response(
- JSON.stringify({ status: 400, body: "Missing user ID" }),
- );
- }
-
- await createMemoryFromAPI({
- data: {
- title: "Friend: " + body.structured.title,
- description: body.structured.overview,
- pageContent:
- body.transcript + "\n\n" + JSON.stringify(body.structured.action_items),
- spaces: [],
- type: "note",
- url: "https://basedhardware.com",
- },
- userId: userId,
- });
-
- return new Response(JSON.stringify({ status: 200, body: "success" }));
-}
diff --git a/apps/web/app/api/store/helper.ts b/apps/web/app/api/store/helper.ts
index a2c04dc1..db13ca91 100644
--- a/apps/web/app/api/store/helper.ts
+++ b/apps/web/app/api/store/helper.ts
@@ -1,22 +1,22 @@
import { z } from "zod";
import { db } from "@/server/db";
-import { contentToSpace, space, storedContent } from "@/server/db/schema";
+import { contentToSpace, space, storedContent } from "@repo/db/schema";
import { and, eq, inArray } from "drizzle-orm";
-import { LIMITS } from "@/lib/constants";
-import { limit } from "@/app/actions/doers";
+// import { LIMITS } from "@repo/shared-types";
+// import { limit } from "@/app/actions/doers";
import { type AddFromAPIType } from "@repo/shared-types";
export const createMemoryFromAPI = async (input: {
data: AddFromAPIType;
userId: string;
}) => {
- if (!(await limit(input.userId, input.data.type))) {
- return {
- success: false,
- data: 0,
- error: `You have exceeded the limit of ${LIMITS[input.data.type as keyof typeof LIMITS]} ${input.data.type}s.`,
- };
- }
+ // if (!(await limit(input.userId, input.data.type))) {
+ // return {
+ // success: false,
+ // data: 0,
+ // error: `You have exceeded the limit of ${LIMITS[input.data.type as keyof typeof LIMITS]} ${input.data.type}s.`,
+ // };
+ // }
const vectorSaveResponse = await fetch(
`${process.env.BACKEND_BASE_URL}/api/add`,
diff --git a/apps/web/app/api/telegram/route.ts b/apps/web/app/api/telegram/route.ts
index 06499c7d..c629e409 100644
--- a/apps/web/app/api/telegram/route.ts
+++ b/apps/web/app/api/telegram/route.ts
@@ -1,5 +1,5 @@
import { db } from "@/server/db";
-import { storedContent, users } from "@/server/db/schema";
+import { storedContent, users } from "@repo/db/schema";
import { cipher } from "@/server/encrypt";
import { eq } from "drizzle-orm";
import { Bot, webhookCallback } from "grammy";
diff --git a/apps/web/drizzle.config.ts b/apps/web/drizzle.config.ts
index 58116123..5df2ca29 100644
--- a/apps/web/drizzle.config.ts
+++ b/apps/web/drizzle.config.ts
@@ -1,7 +1,7 @@
import { type Config } from "drizzle-kit";
export default {
- schema: "./server/db/schema.ts",
+ schema: "../../packages/db/schema.ts",
dialect: "sqlite",
driver: "d1",
dbCredentials: {
diff --git a/apps/web/lib/constants.ts b/apps/web/lib/constants.ts
index 241a6a1d..73f9a83d 100644
--- a/apps/web/lib/constants.ts
+++ b/apps/web/lib/constants.ts
@@ -1,9 +1,3 @@
-export const LIMITS = {
- page: 100,
- tweet: 1000,
- note: 1000,
-};
-
export const codeLanguageSubset = [
"python",
"javascript",
diff --git a/apps/web/lib/get-metadata.ts b/apps/web/lib/get-metadata.ts
deleted file mode 100644
index c81397ff..00000000
--- a/apps/web/lib/get-metadata.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-"use server";
-import * as cheerio from "cheerio";
-
-// TODO: THIS SHOULD PROBABLY ALSO FETCH THE OG-IMAGE
-export async function getMetaData(url: string) {
- const response = await fetch(url);
- const html = await response.text();
-
- const $ = cheerio.load(html);
-
- // Extract the base URL
- const baseUrl = url;
-
- // Extract title
- const title = $("title").text().trim();
-
- const description = $("meta[name=description]").attr("content") ?? "";
-
- const _favicon =
- $("link[rel=icon]").attr("href") ?? "https://supermemory.dhr.wtf/web.svg";
-
- let favicon =
- _favicon.trim().length > 0
- ? _favicon.trim()
- : "https://supermemory.dhr.wtf/web.svg";
- if (favicon.startsWith("/")) {
- favicon = baseUrl + favicon;
- } else if (favicon.startsWith("./")) {
- favicon = baseUrl + favicon.slice(1);
- }
-
- // Prepare the metadata object
- const metadata = {
- title,
- description,
- image: favicon,
- baseUrl,
- };
- return metadata;
-}
diff --git a/apps/web/migrations/0000_steep_moira_mactaggert.sql b/apps/web/migrations/0000_fixed_pandemic.sql
index 5813639d..09b5431a 100644
--- a/apps/web/migrations/0000_steep_moira_mactaggert.sql
+++ b/apps/web/migrations/0000_fixed_pandemic.sql
@@ -43,7 +43,7 @@ CREATE TABLE `chatHistory` (
`answerParts` text,
`answerSources` text,
`answerJustification` text,
- `createdAt` integer DEFAULT '"2024-07-25T22:31:50.848Z"' NOT NULL,
+ `createdAt` integer DEFAULT '"2024-07-31T07:35:53.819Z"' NOT NULL,
FOREIGN KEY (`threadId`) REFERENCES `chatThread`(`id`) ON UPDATE no action ON DELETE cascade
);
--> statement-breakpoint
@@ -62,6 +62,19 @@ CREATE TABLE `contentToSpace` (
FOREIGN KEY (`spaceId`) REFERENCES `space`(`id`) ON UPDATE no action ON DELETE cascade
);
--> statement-breakpoint
+CREATE TABLE `jobs` (
+ `id` integer PRIMARY KEY AUTOINCREMENT NOT NULL,
+ `userId` text NOT NULL,
+ `url` text NOT NULL,
+ `status` text NOT NULL,
+ `attempts` integer DEFAULT 0 NOT NULL,
+ `lastAttemptAt` integer,
+ `error` blob,
+ `createdAt` integer NOT NULL,
+ `updatedAt` integer NOT NULL,
+ FOREIGN KEY (`userId`) REFERENCES `user`(`id`) ON UPDATE no action ON DELETE cascade
+);
+--> statement-breakpoint
CREATE TABLE `session` (
`sessionToken` text PRIMARY KEY NOT NULL,
`userId` text NOT NULL,
@@ -122,6 +135,10 @@ CREATE UNIQUE INDEX `authenticator_credentialID_unique` ON `authenticator` (`cre
CREATE INDEX `canvas_user_userId` ON `canvas` (`userId`);--> statement-breakpoint
CREATE INDEX `chatHistory_thread_idx` ON `chatHistory` (`threadId`);--> statement-breakpoint
CREATE INDEX `chatThread_user_idx` ON `chatThread` (`userId`);--> statement-breakpoint
+CREATE INDEX `jobs_userId_idx` ON `jobs` (`userId`);--> statement-breakpoint
+CREATE INDEX `jobs_status_idx` ON `jobs` (`status`);--> statement-breakpoint
+CREATE INDEX `jobs_createdAt_idx` ON `jobs` (`createdAt`);--> statement-breakpoint
+CREATE INDEX `jobs_url_idx` ON `jobs` (`url`);--> statement-breakpoint
CREATE UNIQUE INDEX `space_name_unique` ON `space` (`name`);--> statement-breakpoint
CREATE INDEX `spaces_name_idx` ON `space` (`name`);--> statement-breakpoint
CREATE INDEX `spaces_user_idx` ON `space` (`user`);--> statement-breakpoint
diff --git a/apps/web/migrations/0001_Adding_jobs_table.sql b/apps/web/migrations/0001_Adding_jobs_table.sql
new file mode 100644
index 00000000..7a687f72
--- /dev/null
+++ b/apps/web/migrations/0001_Adding_jobs_table.sql
@@ -0,0 +1,19 @@
+-- Migration number: 0001 2024-08-05T18:05:16.793Z
+CREATE TABLE `jobs` (
+ `id` integer PRIMARY KEY AUTOINCREMENT NOT NULL,
+ `userId` text NOT NULL,
+ `url` text NOT NULL,
+ `status` text NOT NULL,
+ `attempts` integer DEFAULT 0 NOT NULL,
+ `lastAttemptAt` integer,
+ `error` blob,
+ `createdAt` integer NOT NULL,
+ `updatedAt` integer NOT NULL,
+ FOREIGN KEY (`userId`) REFERENCES `user`(`id`) ON UPDATE no action ON DELETE cascade
+);
+
+
+CREATE INDEX `jobs_userId_idx` ON `jobs` (`userId`);--> statement-breakpoint
+CREATE INDEX `jobs_status_idx` ON `jobs` (`status`);--> statement-breakpoint
+CREATE INDEX `jobs_createdAt_idx` ON `jobs` (`createdAt`);--> statement-breakpoint
+CREATE INDEX `jobs_url_idx` ON `jobs` (`url`);--> statement-breakpoint \ No newline at end of file
diff --git a/apps/web/migrations/meta/0000_snapshot.json b/apps/web/migrations/meta/0000_snapshot.json
index a7689010..3bb8617f 100644
--- a/apps/web/migrations/meta/0000_snapshot.json
+++ b/apps/web/migrations/meta/0000_snapshot.json
@@ -1,7 +1,7 @@
{
"version": "6",
"dialect": "sqlite",
- "id": "8705302a-eae7-4fbf-9ce8-8ae23df228a2",
+ "id": "3fbdb153-2764-4b09-ac22-05c3a131ec35",
"prevId": "00000000-0000-0000-0000-000000000000",
"tables": {
"account": {
@@ -305,7 +305,7 @@
"primaryKey": false,
"notNull": true,
"autoincrement": false,
- "default": "'\"2024-07-25T22:31:50.848Z\"'"
+ "default": "'\"2024-07-31T07:35:53.819Z\"'"
}
},
"indexes": {
@@ -422,6 +422,110 @@
},
"uniqueConstraints": {}
},
+ "jobs": {
+ "name": "jobs",
+ "columns": {
+ "id": {
+ "name": "id",
+ "type": "integer",
+ "primaryKey": true,
+ "notNull": true,
+ "autoincrement": true
+ },
+ "userId": {
+ "name": "userId",
+ "type": "text",
+ "primaryKey": false,
+ "notNull": true,
+ "autoincrement": false
+ },
+ "url": {
+ "name": "url",
+ "type": "text",
+ "primaryKey": false,
+ "notNull": true,
+ "autoincrement": false
+ },
+ "status": {
+ "name": "status",
+ "type": "text",
+ "primaryKey": false,
+ "notNull": true,
+ "autoincrement": false
+ },
+ "attempts": {
+ "name": "attempts",
+ "type": "integer",
+ "primaryKey": false,
+ "notNull": true,
+ "autoincrement": false,
+ "default": 0
+ },
+ "lastAttemptAt": {
+ "name": "lastAttemptAt",
+ "type": "integer",
+ "primaryKey": false,
+ "notNull": false,
+ "autoincrement": false
+ },
+ "error": {
+ "name": "error",
+ "type": "blob",
+ "primaryKey": false,
+ "notNull": false,
+ "autoincrement": false
+ },
+ "createdAt": {
+ "name": "createdAt",
+ "type": "integer",
+ "primaryKey": false,
+ "notNull": true,
+ "autoincrement": false
+ },
+ "updatedAt": {
+ "name": "updatedAt",
+ "type": "integer",
+ "primaryKey": false,
+ "notNull": true,
+ "autoincrement": false
+ }
+ },
+ "indexes": {
+ "jobs_userId_idx": {
+ "name": "jobs_userId_idx",
+ "columns": ["userId"],
+ "isUnique": false
+ },
+ "jobs_status_idx": {
+ "name": "jobs_status_idx",
+ "columns": ["status"],
+ "isUnique": false
+ },
+ "jobs_createdAt_idx": {
+ "name": "jobs_createdAt_idx",
+ "columns": ["createdAt"],
+ "isUnique": false
+ },
+ "jobs_url_idx": {
+ "name": "jobs_url_idx",
+ "columns": ["url"],
+ "isUnique": false
+ }
+ },
+ "foreignKeys": {
+ "jobs_userId_user_id_fk": {
+ "name": "jobs_userId_user_id_fk",
+ "tableFrom": "jobs",
+ "tableTo": "user",
+ "columnsFrom": ["userId"],
+ "columnsTo": ["id"],
+ "onDelete": "cascade",
+ "onUpdate": "no action"
+ }
+ },
+ "compositePrimaryKeys": {},
+ "uniqueConstraints": {}
+ },
"session": {
"name": "session",
"columns": {
diff --git a/apps/web/migrations/meta/_journal.json b/apps/web/migrations/meta/_journal.json
index d79e2607..59ab4ea6 100644
--- a/apps/web/migrations/meta/_journal.json
+++ b/apps/web/migrations/meta/_journal.json
@@ -5,8 +5,8 @@
{
"idx": 0,
"version": "6",
- "when": 1721946710900,
- "tag": "0000_steep_moira_mactaggert",
+ "when": 1722411353835,
+ "tag": "0000_fixed_pandemic",
"breakpoints": true
}
]
diff --git a/apps/web/next.config.mjs b/apps/web/next.config.mjs
index c0001fa5..307d5bdc 100644
--- a/apps/web/next.config.mjs
+++ b/apps/web/next.config.mjs
@@ -1,6 +1,5 @@
import MillionLint from "@million/lint";
import { setupDevPlatform } from "@cloudflare/next-on-pages/next-dev";
-import { withSentryConfig } from "@sentry/nextjs";
/** @type {import('next').NextConfig} */
const baseNextConfig = {
@@ -9,6 +8,9 @@ const baseNextConfig = {
env: {
TELEGRAM_BOT_TOKEN: process.env.TELEGRAM_BOT_TOKEN,
},
+ eslint: {
+ disableDuringBuilds: true,
+ },
};
let selectedCofig = baseNextConfig;
@@ -21,41 +23,6 @@ if (process.env.NODE_ENV === "development") {
export default selectedCofig;
-//! Disabled sentry for now because of unreasonably large bundle size
-// export default withSentryConfig(selectedCofig, {
-// // For all available options, see:
-// // https://github.com/getsentry/sentry-webpack-plugin#options
-
-// org: "none-h00",
-// project: "javascript-nextjs",
-// // Only print logs for uploading source maps in CI
-// silent: !process.env.CI,
-
-// // For all available options, see:
-// // https://docs.sentry.io/platforms/javascript/guides/nextjs/manual-setup/
-
-// // Upload a larger set of source maps for prettier stack traces (increases build time)
-// widenClientFileUpload: true,
-
-// // Route browser requests to Sentry through a Next.js rewrite to circumvent ad-blockers.
-// // This can increase your server load as well as your hosting bill.
-// // Note: Check that the configured route will not match with your Next.js middleware, otherwise reporting of client-
-// // side errors will fail.
-// tunnelRoute: "/monitoring",
-
-// // Hides source maps from generated client bundles
-// hideSourceMaps: true,
-
-// // Automatically tree-shake Sentry logger statements to reduce bundle size
-// disableLogger: true,
-
-// // Enables automatic instrumentation of Vercel Cron Monitors. (Does not yet work with App Router route handlers.)
-// // See the following for more information:
-// // https://docs.sentry.io/product/crons/
-// // https://vercel.com/docs/cron-jobs
-// automaticVercelMonitors: true,
-// });
-
// we only need to use the utility during development so we can check NODE_ENV
// (note: this check is recommended but completely optional)
if (process.env.NODE_ENV === "development") {
diff --git a/apps/web/package.json b/apps/web/package.json
index 5773fe39..d3bf1f48 100644
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -46,7 +46,6 @@
"@types/node": "^20.11.24",
"@types/react": "^18.2.61",
"@types/react-dom": "^18.2.19",
- "drizzle-kit": "0.21.2",
"eslint": "^8.57.0",
"postcss": "^8.4.38",
"typescript": "^5.3.3",
diff --git a/apps/web/server/auth.ts b/apps/web/server/auth.ts
index 20e42e9a..645989fa 100644
--- a/apps/web/server/auth.ts
+++ b/apps/web/server/auth.ts
@@ -2,7 +2,7 @@ import NextAuth, { NextAuthResult } from "next-auth";
import Google from "next-auth/providers/google";
import { DrizzleAdapter } from "@auth/drizzle-adapter";
import { db } from "./db";
-import { accounts, sessions, users, verificationTokens } from "./db/schema";
+import { accounts, sessions, users, verificationTokens } from "@repo/db/schema";
export const {
handlers: { GET, POST },
diff --git a/apps/web/server/db/index.ts b/apps/web/server/db/index.ts
index a9ec9106..52f3e350 100644
--- a/apps/web/server/db/index.ts
+++ b/apps/web/server/db/index.ts
@@ -1,6 +1,6 @@
import { drizzle } from "drizzle-orm/d1";
-import * as schema from "./schema";
+import * as schema from "@repo/db/schema";
export const db = drizzle(process.env.DATABASE, {
schema,
diff --git a/apps/web/server/db/schema.ts b/apps/web/server/db/schema.ts
deleted file mode 100644
index 32b80719..00000000
--- a/apps/web/server/db/schema.ts
+++ /dev/null
@@ -1,244 +0,0 @@
-import { create } from "domain";
-import { relations, sql } from "drizzle-orm";
-import {
- index,
- int,
- primaryKey,
- sqliteTableCreator,
- text,
- integer,
-} from "drizzle-orm/sqlite-core";
-import type { AdapterAccountType } from "next-auth/adapters";
-
-export const createTable = sqliteTableCreator((name) => `${name}`);
-
-export const users = createTable(
- "user",
- {
- id: text("id")
- .primaryKey()
- .$defaultFn(() => crypto.randomUUID()),
- name: text("name"),
- email: text("email").notNull(),
- emailVerified: integer("emailVerified", { mode: "timestamp_ms" }),
- image: text("image"),
- telegramId: text("telegramId"),
- hasOnboarded: integer("hasOnboarded", { mode: "boolean" }).default(false),
- },
- (user) => ({
- emailIdx: index("users_email_idx").on(user.email),
- telegramIdx: index("users_telegram_idx").on(user.telegramId),
- idIdx: index("users_id_idx").on(user.id),
- }),
-);
-
-export type User = typeof users.$inferSelect;
-
-export const accounts = createTable(
- "account",
- {
- userId: text("userId")
- .notNull()
- .references(() => users.id, { onDelete: "cascade" }),
- type: text("type").$type<AdapterAccountType>().notNull(),
- provider: text("provider").notNull(),
- providerAccountId: text("providerAccountId").notNull(),
- refresh_token: text("refresh_token"),
- access_token: text("access_token"),
- expires_at: integer("expires_at"),
- token_type: text("token_type"),
- scope: text("scope"),
- id_token: text("id_token"),
- session_state: text("session_state"),
- },
- (account) => ({
- compoundKey: primaryKey({
- columns: [account.provider, account.providerAccountId],
- }),
- }),
-);
-
-export const sessions = createTable("session", {
- sessionToken: text("sessionToken").primaryKey(),
- userId: text("userId")
- .notNull()
- .references(() => users.id, { onDelete: "cascade" }),
- expires: integer("expires", { mode: "timestamp_ms" }).notNull(),
-});
-
-export const verificationTokens = createTable(
- "verificationToken",
- {
- identifier: text("identifier").notNull(),
- token: text("token").notNull(),
- expires: integer("expires", { mode: "timestamp_ms" }).notNull(),
- },
- (verificationToken) => ({
- compositePk: primaryKey({
- columns: [verificationToken.identifier, verificationToken.token],
- }),
- }),
-);
-
-export const authenticators = createTable(
- "authenticator",
- {
- credentialID: text("credentialID").notNull().unique(),
- userId: text("userId")
- .notNull()
- .references(() => users.id, { onDelete: "cascade" }),
- providerAccountId: text("providerAccountId").notNull(),
- credentialPublicKey: text("credentialPublicKey").notNull(),
- counter: integer("counter").notNull(),
- credentialDeviceType: text("credentialDeviceType").notNull(),
- credentialBackedUp: integer("credentialBackedUp", {
- mode: "boolean",
- }).notNull(),
- transports: text("transports"),
- },
- (authenticator) => ({
- compositePK: primaryKey({
- columns: [authenticator.userId, authenticator.credentialID],
- }),
- }),
-);
-
-export const storedContent = createTable(
- "storedContent",
- {
- id: integer("id").notNull().primaryKey({ autoIncrement: true }),
- content: text("content").notNull(),
- title: text("title", { length: 255 }),
- description: text("description", { length: 255 }),
- url: text("url").notNull(),
- savedAt: int("savedAt", { mode: "timestamp" }).notNull(),
- baseUrl: text("baseUrl", { length: 255 }).unique(),
- ogImage: text("ogImage", { length: 255 }),
- type: text("type").default("page"),
- image: text("image", { length: 255 }),
- userId: text("user").references(() => users.id, {
- onDelete: "cascade",
- }),
- noteId: integer("noteId"),
- },
- (sc) => ({
- urlIdx: index("storedContent_url_idx").on(sc.url),
- savedAtIdx: index("storedContent_savedAt_idx").on(sc.savedAt),
- titleInx: index("storedContent_title_idx").on(sc.title),
- userIdx: index("storedContent_user_idx").on(sc.userId),
- }),
-);
-
-export type Content = typeof storedContent.$inferSelect;
-
-export const contentToSpace = createTable(
- "contentToSpace",
- {
- contentId: integer("contentId")
- .notNull()
- .references(() => storedContent.id, { onDelete: "cascade" }),
- spaceId: integer("spaceId")
- .notNull()
- .references(() => space.id, { onDelete: "cascade" }),
- },
- (cts) => ({
- compoundKey: primaryKey({ columns: [cts.contentId, cts.spaceId] }),
- }),
-);
-
-export const space = createTable(
- "space",
- {
- id: integer("id").notNull().primaryKey({ autoIncrement: true }),
- name: text("name").notNull().unique().default("none"),
- user: text("user", { length: 255 }).references(() => users.id, {
- onDelete: "cascade",
- }),
- createdAt: int("createdAt", { mode: "timestamp" }).notNull(),
- numItems: integer("numItems").notNull().default(0),
- },
- (space) => ({
- nameIdx: index("spaces_name_idx").on(space.name),
- userIdx: index("spaces_user_idx").on(space.user),
- }),
-);
-
-export const spacesAccess = createTable(
- "spacesAccess",
- {
- spaceId: integer("spaceId")
- .notNull()
- .references(() => space.id, { onDelete: "cascade" }),
- userEmail: text("userEmail").notNull(),
- },
- (spaceAccess) => ({
- compoundKey: primaryKey({
- columns: [spaceAccess.spaceId, spaceAccess.userEmail],
- }),
- }),
-);
-
-export type StoredContent = Omit<typeof storedContent.$inferSelect, "user">;
-export type StoredSpace = typeof space.$inferSelect;
-export type ChachedSpaceContent = StoredContent & {
- space: number;
-};
-
-export const chatThreads = createTable(
- "chatThread",
- {
- id: text("id")
- .notNull()
- .primaryKey()
- .$defaultFn(() => crypto.randomUUID()),
- firstMessage: text("firstMessage").notNull(),
- userId: text("userId")
- .notNull()
- .references(() => users.id, { onDelete: "cascade" }),
- },
- (thread) => ({
- userIdx: index("chatThread_user_idx").on(thread.userId),
- }),
-);
-
-export const chatHistory = createTable(
- "chatHistory",
- {
- id: integer("id").notNull().primaryKey({ autoIncrement: true }),
- threadId: text("threadId")
- .notNull()
- .references(() => chatThreads.id, { onDelete: "cascade" }),
- question: text("question").notNull(),
- answer: text("answerParts"), // Single answer part as string
- answerSources: text("answerSources"), // JSON stringified array of objects
- answerJustification: text("answerJustification"),
- createdAt: int("createdAt", { mode: "timestamp" })
- .notNull()
- .default(new Date()),
- },
- (history) => ({
- threadIdx: index("chatHistory_thread_idx").on(history.threadId),
- }),
-);
-
-export const canvas = createTable(
- "canvas",
- {
- id: text("id")
- .notNull()
- .primaryKey()
- .$defaultFn(() => crypto.randomUUID()),
- title: text("title").default("Untitled").notNull(),
- description: text("description").default("Untitled").notNull(),
- imageUrl: text("url").default("").notNull(),
- userId: text("userId")
- .notNull()
- .references(() => users.id, { onDelete: "cascade" }),
- },
- (canvas) => ({
- userIdx: index("canvas_user_userId").on(canvas.userId),
- }),
-);
-
-export type ChatThread = typeof chatThreads.$inferSelect;
-export type ChatHistory = typeof chatHistory.$inferSelect;
diff --git a/apps/web/wrangler.toml b/apps/web/wrangler.toml
index 7f3fa047..a6232450 100644
--- a/apps/web/wrangler.toml
+++ b/apps/web/wrangler.toml
@@ -29,7 +29,6 @@ binding = "DATABASE"
database_name = "dev-d1-anycontext"
database_id = "fc562605-157a-4f60-b439-2a24ffed5b4c"
-
[[env.production.d1_databases]]
binding = "DATABASE"
database_name = "prod-d1-supermemory"