eng-1344 f10b upload obsidian relations and their schemas

apps/obsidian/src/types.ts

@@ -33,6 +33,18 @@ export type DiscourseRelation = {
   modified: number;
 };
 
+export type RelationInstance = {
+  id: string;
+  type: string;
+  source: string;
+  destination: string;
+  created: number;
+  author: string;
+  lastModified?: number;
+  importedFromSpaceId?: number;
+  publishedToGroupId?: string[];
+};
+
 export type Settings = {
   nodeTypes: DiscourseNode[];
   discourseRelations: DiscourseRelation[];

apps/obsidian/src/utils/conceptConversion.ts

@@ -1,7 +1,13 @@
 /* eslint-disable @typescript-eslint/naming-convention */
 import type { TFile } from "obsidian";
-import type { DiscourseNode } from "~/types";
+import type {
+  DiscourseNode,
+  DiscourseRelation,
+  DiscourseRelationType,
+  RelationInstance,
+} from "~/types";
 import type { SupabaseContext } from "./supabaseContext";
+import type { DiscourseNodeInVault } from "./syncDgNodesToSupabase";
 import type { LocalConceptDataInput } from "@repo/database/inputTypes";
 import type { ObsidianDiscourseNodeData } from "./syncDgNodesToSupabase";
 import type { Json } from "@repo/database/dbTypes";
@@ -53,6 +59,78 @@ export const discourseNodeSchemaToLocalConcept = ({
   };
 };
 
+const STANDARD_ROLES = ["source", "destination"];
+
+export const discourseRelationTypeToLocalConcept = ({
+  context,
+  relationType,
+  accountLocalId,
+}: {
+  context: SupabaseContext;
+  relationType: DiscourseRelationType;
+  accountLocalId: string;
+}): LocalConceptDataInput => {
+  const { id, label, complement, created, modified, ...otherData } =
+    relationType;
+  return {
+    space_id: context.spaceId,
+    name: label,
+    source_local_id: id,
+    is_schema: true,
+    author_local_id: accountLocalId,
+    created: new Date(created).toISOString(),
+    last_modified: new Date(modified).toISOString(),
+    literal_content: {
+      label,
+      complement,
+      source_data: otherData,
+    } as unknown as Json,
+  };
+};
+
+export const discourseRelationSchemaToLocalConcept = ({
+  context,
+  relation,
+  accountLocalId,
+  nodeTypesById,
+  relationTypesById,
+}: {
+  context: SupabaseContext;
+  relation: DiscourseRelation;
+  accountLocalId: string;
+  nodeTypesById: Record<string, DiscourseNode>;
+  relationTypesById: Record<string, DiscourseRelationType>;
+}): LocalConceptDataInput => {
+  const { id, relationshipTypeId, sourceId, destinationId, created, modified } =
+    relation;
+  const sourceName = nodeTypesById[sourceId]?.name ?? sourceId;
+  const destinationName = nodeTypesById[destinationId]?.name ?? destinationId;
+  const relationType = relationTypesById[relationshipTypeId];
+  if (!relationType)
+    throw new Error(`missing relation type ${relationshipTypeId}`);
+  const { label, complement } = relationType;
+
+  return {
+    space_id: context.spaceId,
+    name: `${sourceName} -${label}-> ${destinationName}`,
+    source_local_id: id,
+    is_schema: true,
+    author_local_id: accountLocalId,
+    created: new Date(created).toISOString(),
+    last_modified: new Date(modified).toISOString(),
+    literal_content: {
+      roles: STANDARD_ROLES,
+      label,
+      complement,
+    },
+    local_reference_content: {
+      relation_type: relationshipTypeId,
+      source: sourceId,
+      destination: destinationId,
+    },
+  };
+};
+
 /**
  * Convert discourse node instance (file) to LocalConceptDataInput
  */
@@ -81,6 +159,73 @@ export const discourseNodeInstanceToLocalConcept = ({
   };
 };
 
+export const relationInstanceToLocalConcept = ({
+  context,
+  relationTypesById,
+  relationTriples,
+  allNodesById,
+  relationData,
+}: {
+  context: SupabaseContext;
+  relationTypesById: Record<string, DiscourseRelationType>;
+  relationTriples: DiscourseRelation[];
+  allNodesById: Record<string, DiscourseNodeInVault>;
+  relationData: RelationInstance;
+}): LocalConceptDataInput | null => {
+  const relationType = relationTypesById[relationData.type];
+  if (!relationType) {
+    console.error("Missing relation type " + relationData.type);
+    return null;
+  }
+  const sourceNode = allNodesById[relationData.source];
+  if (!sourceNode) {
+    console.error("Missing source node " + relationData.source);
+    return null;
+  }
+  const destinationNode = allNodesById[relationData.destination];
+  if (!destinationNode) {
+    console.error("Missing destination node " + relationData.destination);
+    return null;
+  }
+  const sourceTypeId = sourceNode.nodeTypeId;
+  const destinationTypeId = destinationNode.nodeTypeId;
+  const triples = relationTriples.filter(
+    (triple) =>
+      triple.relationshipTypeId == relationData.type &&
+      triple.sourceId === sourceTypeId &&
+      triple.destinationId === destinationTypeId,
+  );
+  if (triples.length === 0) {
+    console.error(
+      `Missing destination triple for ${sourceTypeId}-${relationData.type}->${destinationTypeId}`,
+    );
+    return null;
+  }
+  if (triples.length > 1) {
+    console.warn(
+      `Multiple triples for ${sourceTypeId}-${relationData.type}->${destinationTypeId}`,
+    );
+  }
+  const triple = triples[0]!;
+
+  return {
+    space_id: context.spaceId,
+    name: `[[${sourceNode.file.basename}]] -${relationType.label}-> [[${destinationNode.file.basename}]]`,
+    source_local_id: relationData.id,
+    author_local_id: relationData.author,
+    schema_represented_by_local_id: triple.id,
+    is_schema: false,
+    created: new Date(relationData.created).toISOString(),
+    last_modified: new Date(
+      relationData.lastModified || relationData.created,
+    ).toISOString(),
+    local_reference_content: {
+      source: relationData.source,
+      destination: relationData.destination,
+    },
+  };
+};
+
 export const relatedConcepts = (concept: LocalConceptDataInput): string[] => {
   const relations = Object.values(
     concept.local_reference_content || {},

apps/obsidian/src/utils/relationsStore.ts

@@ -4,6 +4,7 @@ import type DiscourseGraphPlugin from "~/index";
 import { ensureNodeInstanceId } from "~/utils/nodeInstanceId";
 import { checkAndCreateFolder } from "~/utils/file";
 import { getVaultId } from "./supabaseContext";
+import type { RelationInstance } from "~/types";
 
 const RELATIONS_FILE_NAME = "relations.json";
 const RELATIONS_FILE_VERSION = 1;
@@ -16,18 +17,6 @@ export const getRelationsFilePath = (plugin: DiscourseGraphPlugin): string => {
     : normalizePath(RELATIONS_FILE_NAME);
 };
 
-export type RelationInstance = {
-  id: string;
-  type: string;
-  source: string;
-  destination: string;
-  created: number;
-  author: string;
-  lastModified?: number;
-  importedFromSpaceId?: number;
-  publishedToGroupId?: string[];
-};
-
 export type RelationsFile = {
   version: number;
   lastModified: number;
@@ -162,7 +151,7 @@ export const removeRelationById = async (
   delete data.relations[relationInstanceId];
   await saveRelations(plugin, data);
   return true;
-}
+};
 
 export const getRelationsForNodeInstanceId = async (
   plugin: DiscourseGraphPlugin,
@@ -174,7 +163,7 @@ export const getRelationsForNodeInstanceId = async (
   return Object.values(relations).filter(
     (r) => r.source === nodeInstanceId || r.destination === nodeInstanceId,
   );
-}
+};
 
 const DEFAULT_CACHE_WAIT_MS = 500;
 const CACHE_POLL_INTERVAL_MS = 30;
@@ -215,7 +204,7 @@ export const getNodeInstanceIdForFile = async (
     return null;
   }
   return await ensureNodeInstanceId(plugin, file, frontmatter);
-}
+};
 
 /**
  * Returns the node type id from a file's frontmatter (nodeTypeId).
@@ -252,7 +241,7 @@ export const getFileForNodeInstanceId = async (
     }
   }
   return null;
-}
+};
 
 /**
  * Find a relation instance by source, destination, and type. Returns the first match.
@@ -313,7 +302,11 @@ export const removeRelationBySourceDestinationType = async (
   const data = await loadRelations(plugin);
   let removed = 0;
   for (const [id, r] of Object.entries(data.relations)) {
-    if (r.source === source && r.destination === destination && r.type === type) {
+    if (
+      r.source === source &&
+      r.destination === destination &&
+      r.type === type
+    ) {
       delete data.relations[id];
       removed++;
     }
@@ -322,7 +315,7 @@ export const removeRelationBySourceDestinationType = async (
     await saveRelations(plugin, data);
   }
   return removed;
-}
+};
 
 /**
  * Returns true if the frontmatter link (e.g. "[[path]]" or "[[path.md]]") resolves to the same file as targetFile.
@@ -334,7 +327,9 @@ const frontmatterLinkPointsToFile = (
   sourceFilePath: string,
   targetFile: TFile,
 ): boolean => {
-  const match = String(linkStr).trim().match(/\[\[(.*?)\]\]/);
+  const match = String(linkStr)
+    .trim()
+    .match(/\[\[(.*?)\]\]/);
   const linkpath = match?.[1]?.trim();
   if (!linkpath) return false;
   const resolved = plugin.app.metadataCache.getFirstLinkpathDest(
@@ -476,4 +471,4 @@ export const migrateFrontmatterRelationsToRelationsJson = async (
       );
     }
   }
-}
+};