bug fixes

apps/roam/src/index.ts

@@ -27,6 +27,7 @@ import {
   installDiscourseFloatingMenu,
   removeDiscourseFloatingMenu,
 } from "./components/DiscourseFloatingMenu";
+import { createOrUpdateDiscourseEmbedding } from "./utils/syncDgNodesToSupabase";
 
 const initPostHog = () => {
   posthog.init("phc_SNMmBqwNfcEpNduQ41dBUjtGNEUEKAy6jTn63Fzsrax", {
@@ -134,6 +135,9 @@ export default runExtension(async (onloadArgs) => {
     getDiscourseNodes: getDiscourseNodes,
   };
 
+  // TODO: REMOVE AFTER TESTING
+  await createOrUpdateDiscourseEmbedding(onloadArgs.extensionAPI);
+
   installDiscourseFloatingMenu(onloadArgs.extensionAPI);
 
   return {

apps/roam/src/utils/supabaseContext.ts

@@ -27,11 +27,10 @@ export type SupabaseContext = {
 
 let _contextCache: SupabaseContext | null = null;
 
-const settingsConfigPageUid = getPageUidByPageTitle(
-  DISCOURSE_CONFIG_PAGE_TITLE,
-);
-
 const getOrCreateSpacePassword = () => {
+  const settingsConfigPageUid = getPageUidByPageTitle(
+    DISCOURSE_CONFIG_PAGE_TITLE,
+  );
   const props = getBlockProps(settingsConfigPageUid);
   const existing: string | unknown = props["space-user-password"];
   if (existing && typeof existing === "string") return existing;

apps/roam/src/utils/syncDgNodesToSupabase.ts

@@ -11,16 +11,12 @@ import {
 } from "./supabaseContext";
 import { LocalContentDataInput } from "@repo/database/inputTypes";
 import { RoamDiscourseNodeData } from "./getAllDiscourseNodesSince";
-import getDiscourseRelations from "./getDiscourseRelations";
 import getDiscourseNodes, { DiscourseNode } from "./getDiscourseNodes";
 import {
   discourseNodeBlockToLocalConcept,
   discourseNodeSchemaToLocalConcept,
   orderConceptsByDependency,
-  discourseRelationSchemaToLocalConcept,
-  discourseRelationDataToLocalConcept,
 } from "./conceptConversion";
-import getDiscourseRelationTriples from "./getDiscourseRelationTriples";
 import { OnloadArgs } from "roamjs-components/types";
 import { DGSupabaseClient } from "@repo/ui/lib/supabase/client";
 import { fetchEmbeddingsForNodes } from "./upsertNodesAsContentWithEmbeddings";
@@ -208,16 +204,6 @@ export const convertDgToSupabaseConcepts = async ({
     return discourseNodeSchemaToLocalConcept(context, node);
   });
 
-  const relationSchemas = getDiscourseRelations();
-
-  const relationsToEmbed = relationSchemas.map((relation) => {
-    const localConcept = discourseRelationSchemaToLocalConcept(
-      context,
-      relation,
-    );
-    return localConcept;
-  });
-
   const nodeBlockToLocalConcepts = nodesSince.map((node) => {
     const localConcept = discourseNodeBlockToLocalConcept(context, {
       nodeUid: node.source_local_id,
@@ -227,28 +213,9 @@ export const convertDgToSupabaseConcepts = async ({
     return localConcept;
   });
 
-  const relationTriples = getDiscourseRelationTriples();
-  const relationLabelToId = Object.fromEntries(
-    relationSchemas.map((r) => [r.label, r.id]),
-  );
-  const relationBlockToLocalConcepts = relationTriples
-    .map(({ relation, source, target }) => {
-      const relationSchemaUid = relationLabelToId[relation];
-      if (!relationSchemaUid) {
-        return null;
-      }
-      return discourseRelationDataToLocalConcept(context, relationSchemaUid, {
-        source,
-        target,
-      });
-    })
-    .filter((x): x is NonNullable<typeof x> => x !== null);
-
   const conceptsToUpsert = [
     ...nodesTypesToLocalConcepts,
-    ...relationsToEmbed,
     ...nodeBlockToLocalConcepts,
-    ...relationBlockToLocalConcepts,
   ];
   const { ordered } = orderConceptsByDependency(conceptsToUpsert);
   const { error } = await supabaseClient.rpc("upsert_concepts", {
@@ -279,7 +246,9 @@ export const upsertNodesToSupabaseAsContentWithEmbeddings = async (
 
   let nodesWithEmbeddings: LocalContentDataInput[];
   try {
-    nodesWithEmbeddings = await fetchEmbeddingsForNodes(allNodeInstancesAsLocalContent);
+    nodesWithEmbeddings = await fetchEmbeddingsForNodes(
+      allNodeInstancesAsLocalContent,
+    );
   } catch (error) {
     const message = error instanceof Error ? error.message : String(error);
     console.error(

apps/roam/src/utils/upsertNodesAsContentWithEmbeddings.ts

@@ -36,6 +36,12 @@ export const convertRoamNodeToLocalContent = ({
       text: text,
       variant: variant,
       scale: "document",
+      document_inline: {
+        source_local_id: node.source_local_id,
+        created: new Date(node.created || Date.now()).toISOString(),
+        last_modified: new Date(node.last_modified || Date.now()).toISOString(),
+        author_local_id: node.author_local_id,
+      },
     };
   });
 };

packages/database/supabase/functions/create-space/index.ts

@@ -181,8 +181,19 @@ const processAndGetOrCreateSpace = async (
   return result;
 };
 
+const corsHeaders = {
+  "Access-Control-Allow-Origin": "*",
+  "Access-Control-Allow-Headers":
+    "authorization,x-client-info,apikey,content-type",
+};
+
 // @ts-ignore Deno is not visible to the IDE
 Deno.serve(async (req) => {
+  // Handle pre-flight requests
+  if (req.method === "OPTIONS") {
+    return new Response("ok", { headers: corsHeaders });
+  }
+
   const input = await req.json();
   // TODO: We should check whether the request comes from a vetted source, like
   // the roam or obsidian plugin. A combination of CSRF, headers, etc.
@@ -193,7 +204,7 @@ Deno.serve(async (req) => {
   if (!url || !key) {
     return new Response("Missing SUPABASE_URL or SUPABASE_SERVICE_ROLE_KEY", {
       status: 500,
-      headers: { "Content-Type": "application/json" },
+      headers: { "Content-Type": "application/json", ...corsHeaders },
     });
   }
   const supabase: DGSupabaseClient = createClient(url, key);
@@ -203,12 +214,12 @@ Deno.serve(async (req) => {
     const status = error.code === "invalid space" ? 400 : 500;
     return new Response(JSON.stringify(error), {
       status,
-      headers: { "Content-Type": "application/json" },
+      headers: { "Content-Type": "application/json", ...corsHeaders },
     });
   }
 
   return new Response(JSON.stringify(data), {
-    headers: { "Content-Type": "application/json" },
+    headers: { "Content-Type": "application/json", ...corsHeaders },
   });
 });