From 4c4a53d57ff33fa2bd593eed9a69ff9975589174 Mon Sep 17 00:00:00 2001 From: MaheshtheDev Date: Tue, 6 Aug 2024 21:56:41 -0700 Subject: [PATCH 1/7] feat: Add "View" button for chrome extension --- apps/extension/content/ContentApp.tsx | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/apps/extension/content/ContentApp.tsx b/apps/extension/content/ContentApp.tsx index a510a77c..fb28925d 100644 --- a/apps/extension/content/ContentApp.tsx +++ b/apps/extension/content/ContentApp.tsx @@ -229,6 +229,18 @@ export default function ContentApp({ if (rep.status === 200) { toast({ title: "Saved to supermemory.ai", + action: ( + + ), }); } else { toast({ From 8879149c3939714340d99b1d9e1c832ed9fca6b0 Mon Sep 17 00:00:00 2001 From: Yh010 Date: Wed, 7 Aug 2024 12:48:04 +0530 Subject: [PATCH 2/7] fixes multiple memory submission bug --- apps/web/app/(dash)/menu.tsx | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/apps/web/app/(dash)/menu.tsx b/apps/web/app/(dash)/menu.tsx index f9363efb..b8bd25cc 100644 --- a/apps/web/app/(dash)/menu.tsx +++ b/apps/web/app/(dash)/menu.tsx @@ -31,10 +31,20 @@ import ComboboxWithCreate from "@repo/ui/shadcn/combobox"; import { StoredSpace } from "@repo/db/schema"; import useMeasure from "react-use-measure"; import { useKeyPress } from "@/lib/useKeyPress"; +import { useFormStatus } from "react-dom"; function Menu() { const [spaces, setSpaces] = useState([]); + function SubmitButton() { + const status = useFormStatus(); + return ( + + ); + } + useEffect(() => { (async () => { let spaces = await getSpaces(); @@ -319,13 +329,7 @@ function Menu() { - + From 30e944a4f139ecb620601f5fffb6245e8aac5408 Mon Sep 17 00:00:00 2001 From: Vinit Shah Date: Wed, 7 Aug 2024 18:18:56 -0700 Subject: [PATCH 3/7] fix: builds --- apps/cf-ai-backend/src/helper.ts | 6 +++--- apps/cf-ai-backend/src/queueConsumer/index.ts | 2 +- apps/extension/manifest.json | 2 +- apps/extension/package.json | 1 + apps/web/app/layout.tsx | 2 +- apps/web/app/providers.tsx | 6 ------ apps/web/wrangler.toml | 4 ++-- packages/db/schema.ts | 4 ++-- pnpm-lock.yaml | 3 +++ 9 files changed, 14 insertions(+), 16 deletions(-) diff --git a/apps/cf-ai-backend/src/helper.ts b/apps/cf-ai-backend/src/helper.ts index 70efaecd..1c4dd69f 100644 --- a/apps/cf-ai-backend/src/helper.ts +++ b/apps/cf-ai-backend/src/helper.ts @@ -9,7 +9,7 @@ import { z } from "zod"; import { seededRandom } from "./utils/seededRandom"; import { bulkInsertKv } from "./utils/kvBulkInsert"; -export async function initQuery(env: Env, model: string = "gpt-4o") { +export async function initQuery(env: Env, model: string = "gemini-1.5-pro") { const embeddings = new OpenAIEmbeddings({ apiKey: env.OPENAI_API_KEY, modelName: "text-embedding-3-small", @@ -35,12 +35,13 @@ export async function initQuery(env: Env, model: string = "gpt-4o") { console.log("Selected model: ", selectedModel); break; case "gemini-1.5-pro": + console.log("YES GOOGLE"); const googleai = createGoogleGenerativeAI({ apiKey: env.GOOGLE_AI_API_KEY, baseURL: "https://gateway.ai.cloudflare.com/v1/47c2b4d598af9d423c06fc9f936226d5/supermemory/google-vertex-ai", }); - selectedModel = googleai.chat("models/gemini-1.5-pro-latest"); + selectedModel = googleai.chat("models/gemini-pro"); console.log("Selected model: ", selectedModel); break; case "gpt-4o": @@ -49,7 +50,6 @@ export async function initQuery(env: Env, model: string = "gpt-4o") { apiKey: env.OPENAI_API_KEY, baseURL: "https://gateway.ai.cloudflare.com/v1/47c2b4d598af9d423c06fc9f936226d5/supermemory/openai", - compatibility: "strict", }); selectedModel = openai.chat("gpt-4o-mini"); break; diff --git a/apps/cf-ai-backend/src/queueConsumer/index.ts b/apps/cf-ai-backend/src/queueConsumer/index.ts index 761aeb56..2342d675 100644 --- a/apps/cf-ai-backend/src/queueConsumer/index.ts +++ b/apps/cf-ai-backend/src/queueConsumer/index.ts @@ -304,7 +304,7 @@ export async function queue( throw insertResponse.error; } console.log(JSON.stringify(insertResponse)); - contentId = insertResponse[0]?.id; + contentId = insertResponse[0]?.id || new Date().getTime(); console.log("this is the content Id", contentId); if (storeToSpaces.length > 0) { // Adding the many-to-many relationship between content and spaces diff --git a/apps/extension/manifest.json b/apps/extension/manifest.json index 7f998412..51040f89 100644 --- a/apps/extension/manifest.json +++ b/apps/extension/manifest.json @@ -1,7 +1,7 @@ { "manifest_version": 3, "$schema": "https://json.schemastore.org/chrome-manifest", - "version": "2.63.1", + "version": "2.63.2", "name": "supermemory", "description": "An extension for https://supermemory.ai - an AI hub for all your bookmarks.", "background": { diff --git a/apps/extension/package.json b/apps/extension/package.json index e028d680..818fd2d6 100644 --- a/apps/extension/package.json +++ b/apps/extension/package.json @@ -1,5 +1,6 @@ { "devDependencies": { + "@extension-create/develop": "^1.8.0", "@types/react": "^18.0.9", "@types/react-dom": "^18.0.5", "@webpack-cli/generators": "^3.0.7", diff --git a/apps/web/app/layout.tsx b/apps/web/app/layout.tsx index 28495d64..49805c16 100644 --- a/apps/web/app/layout.tsx +++ b/apps/web/app/layout.tsx @@ -86,7 +86,7 @@ export default function RootLayout({ > {children} - + {/* */} diff --git a/apps/web/app/providers.tsx b/apps/web/app/providers.tsx index f1f1237b..13e41647 100644 --- a/apps/web/app/providers.tsx +++ b/apps/web/app/providers.tsx @@ -4,12 +4,6 @@ import posthog from "posthog-js"; import { PostHogProvider } from "posthog-js/react"; if (typeof window !== "undefined") { - if ( - !process.env.NEXT_PUBLIC_POSTHOG_KEY || - !process.env.NEXT_PUBLIC_POSTHOG_HOST - ) { - console.error("PostHog key or host not found"); - } posthog.init(process.env.NEXT_PUBLIC_POSTHOG_KEY!, { api_host: process.env.NEXT_PUBLIC_POSTHOG_HOST, person_profiles: "identified_only", diff --git a/apps/web/wrangler.toml b/apps/web/wrangler.toml index a6232450..6062c8bf 100644 --- a/apps/web/wrangler.toml +++ b/apps/web/wrangler.toml @@ -26,8 +26,8 @@ bucket_name = "dev-r2-anycontext" [[d1_databases]] binding = "DATABASE" -database_name = "dev-d1-anycontext" -database_id = "fc562605-157a-4f60-b439-2a24ffed5b4c" +database_name = "prod-d1-supermemory" +database_id = "f527a727-c472-41d4-8eaf-3d7ba0f2f395" [[env.production.d1_databases]] binding = "DATABASE" diff --git a/packages/db/schema.ts b/packages/db/schema.ts index 70860066..d03afc5c 100644 --- a/packages/db/schema.ts +++ b/packages/db/schema.ts @@ -113,8 +113,8 @@ export const storedContent = createTable( 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 }), + baseUrl: text("baseUrl"), + ogImage: text("ogImage"), type: text("type").default("page"), image: text("image", { length: 255 }), userId: text("user").references(() => users.id, { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index fc32d273..da96f03b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -338,6 +338,9 @@ importers: specifier: ^1.0.7 version: 1.0.7(tailwindcss@3.4.7) devDependencies: + '@extension-create/develop': + specifier: ^1.8.0 + version: 1.8.0(browserslist@4.23.2)(esbuild@0.19.12)(typescript@5.3.3)(vue@3.4.34)(webpack-cli@5.1.4) '@types/react': specifier: ^18.0.9 version: 18.3.3 From 33b7e861bdf098d6491692ee182dad0c7598c68c Mon Sep 17 00:00:00 2001 From: Dhravya Shah Date: Thu, 8 Aug 2024 12:37:14 -0500 Subject: [PATCH 4/7] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index f95271f7..9f99cdfe 100644 --- a/README.md +++ b/README.md @@ -123,6 +123,7 @@ Built with: - [Cloudflare Queues](https://developers.cloudflare.com/queues/) - [Cloudflare Browser Rendering](https://developers.cloudflare.com/browser-rendering/) - [Cloudflare KV](https://developers.cloudflare.com/kv) +- [mem0](https://app.mem0.ai) ## Star History From c6ddb64fe92b4eb7b7315c4e910734df053776fe Mon Sep 17 00:00:00 2001 From: Dhravya Shah Date: Thu, 8 Aug 2024 13:03:46 -0500 Subject: [PATCH 5/7] Update README.md --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 9f99cdfe..b51829ba 100644 --- a/README.md +++ b/README.md @@ -76,7 +76,8 @@ To use the chrome extension, #### Architecture: -![overview](https://i.dhr.wtf/r/Clipboard_Apr_14,_2024_at_4.52 PM.png) +image + Supermemory has three main modules, managed by [turborepo](https://turbo.build): From 0ec21f4f8f41dee991ff85a6ff8dbc1dd53b6714 Mon Sep 17 00:00:00 2001 From: codetorso Date: Fri, 9 Aug 2024 02:37:11 +0530 Subject: [PATCH 6/7] memory queue fix --- apps/web/app/(dash)/menu.tsx | 42 ++++++++++++++---------------------- 1 file changed, 16 insertions(+), 26 deletions(-) diff --git a/apps/web/app/(dash)/menu.tsx b/apps/web/app/(dash)/menu.tsx index b8bd25cc..3dc47630 100644 --- a/apps/web/app/(dash)/menu.tsx +++ b/apps/web/app/(dash)/menu.tsx @@ -135,12 +135,25 @@ function Menu() { richColors: true, }); } else { - toast.error(`Memory creation failed: ${cont.error}`); throw new Error(`Memory creation failed: ${cont.error}`); return cont; } }; + const formSubmit = () => { + toast.promise(handleSubmit(content, selectedSpaces), { + loading: ( + + {" "} + Creating memory... + + ), + success: (data) => "Memory queued", + error: (error) => `Memory creation failed: ${error}`, + richColors: true, + }); + } + return ( <> {/* Desktop Menu */} @@ -191,20 +204,7 @@ function Menu() {
{ - const content = e.get("content")?.toString(); - toast.promise(handleSubmit(content, selectedSpaces), { - loading: ( - - {" "} - Creating memory... - - ), - success: (data) => "Memory queued", - error: (error) => error.message, - richColors: true, - }); - }} + action={formSubmit} className="flex flex-col gap-4 " > @@ -227,17 +227,7 @@ function Menu() { onKeyDown={(e) => { if (e.key === "Enter" && !e.shiftKey) { e.preventDefault(); - toast.promise(handleSubmit(content, selectedSpaces), { - loading: ( - - {" "} - Creating memory... - - ), - success: (data) => "Memory created", - error: (error) => error.message, - richColors: true, - }); + formSubmit(); } }} /> From c36bd93182815dd684c2d940b511bad4db265edb Mon Sep 17 00:00:00 2001 From: codetorso Date: Fri, 9 Aug 2024 02:49:18 +0530 Subject: [PATCH 7/7] one more commit needed --- apps/web/app/(dash)/menu.tsx | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/apps/web/app/(dash)/menu.tsx b/apps/web/app/(dash)/menu.tsx index 3dc47630..bdc1aa8a 100644 --- a/apps/web/app/(dash)/menu.tsx +++ b/apps/web/app/(dash)/menu.tsx @@ -130,14 +130,7 @@ function Menu() { }); setContent(""); setSelectedSpaces([]); - if (cont.success) { - toast.success("Memory queued", { - richColors: true, - }); - } else { - throw new Error(`Memory creation failed: ${cont.error}`); - return cont; - } + return cont; }; const formSubmit = () => { @@ -152,7 +145,7 @@ function Menu() { error: (error) => `Memory creation failed: ${error}`, richColors: true, }); - } + }; return ( <> @@ -203,10 +196,7 @@ function Menu() { - + Add memory