@trustgraph/react-state 1.4.2 → 1.4.3

package/dist/index.cjs

@@ -926,17 +926,19 @@ const useTriples = ({ flow, s, p, o, limit, collection }) => {
     const notify = useNotification();
     // Settings for default collection
     const { settings } = useSettings();
-    if (!flow)
-        flow = "default";
+    // Session state for default flow ID
+    const sessionFlowId = useSessionStore((state) => state.flowId);
+    // Use explicit param if provided, otherwise fall back to session state
+    const effectiveFlow = flow ?? sessionFlowId;
     /**
      * Query for fetching all token costs
      * Uses React Query for caching and background refetching
      */
     const query = reactQuery.useQuery({
-        queryKey: ["triples", { flow, s, p, o, limit }],
+        queryKey: ["triples", { flow: effectiveFlow, s, p, o, limit }],
         queryFn: () => {
             return socket
-                .flow(flow)
+                .flow(effectiveFlow)
                 .triplesQuery(s, p, o, limit, collection || settings.collection)
                 .then((x) => {
                 if (x["error"]) {
@@ -1302,13 +1304,17 @@ const updateSubgraphByRelationship = (socket, selectedNodeId, relationshipUri, d
  * Custom hook for managing graph visualization operations using React Query
  * Provides functionality for fetching and updating graph subgraphs
  * @param entityUri - The URI of the entity to build the graph around
- * @param flowId - The flow ID to use for the query
+ * @param flow - Optional flow ID to use for the query (defaults to session state)
  * @param collection - The collection to query
  * @returns {Object} Graph state and operations
  */
-const useGraphSubgraph = (entityUri, flowId, collection) => {
+const useGraphSubgraph = ({ entityUri, flow, collection, }) => {
     // WebSocket connection for communicating with the graph service
     const socket = reactProvider.useSocket();
+    // Session state for default flow ID
+    const sessionFlowId = useSessionStore((state) => state.flowId);
+    // Use explicit param if provided, otherwise fall back to session state
+    const effectiveFlow = flow ?? sessionFlowId;
     const addActivity = useProgressStateStore((state) => state.addActivity);
     const removeActivity = useProgressStateStore((state) => state.removeActivity);
     // Hook for displaying user notifications
@@ -1320,29 +1326,29 @@ const useGraphSubgraph = (entityUri, flowId, collection) => {
      * Uses React Query for caching and background refetching
      */
     const query = reactQuery.useQuery({
-        queryKey: ["graph-subgraph", { entityUri, flowId, collection }],
+        queryKey: ["graph-subgraph", { entityUri, flow: effectiveFlow, collection }],
         queryFn: async () => {
             if (!entityUri) {
                 throw new Error("Entity URI is required");
             }
             const sg = createSubgraph();
             // Use the existing updateSubgraph utility function for initial load
-            const api = socket.flow(flowId);
+            const api = socket.flow(effectiveFlow);
             return updateSubgraph(api, entityUri, sg, addActivity, removeActivity, collection);
         },
-        enabled: !!entityUri && !!flowId, // Only run query if both entityUri and flowId are available
+        enabled: !!entityUri && !!effectiveFlow, // Only run query if both entityUri and effectiveFlow are available
     });
     /**
      * Mutation for updating the graph subgraph when nodes are clicked
      */
     const updateMutation = reactQuery.useMutation({
         mutationFn: async ({ nodeId, currentGraph, }) => {
-            const api = socket.flow(flowId);
+            const api = socket.flow(effectiveFlow);
             return updateSubgraph(api, nodeId, currentGraph, addActivity, removeActivity);
         },
         onSuccess: (newGraph) => {
             // Update the cache with the new graph data
-            queryClient.setQueryData(["graph-subgraph", { entityUri, flowId, collection }], newGraph);
+            queryClient.setQueryData(["graph-subgraph", { entityUri, flow: effectiveFlow, collection }], newGraph);
         },
         onError: (err) => {
             console.log("Graph update error:", err);
@@ -1354,12 +1360,12 @@ const useGraphSubgraph = (entityUri, flowId, collection) => {
      */
     const relationshipNavigationMutation = reactQuery.useMutation({
         mutationFn: async ({ selectedNodeId, relationshipUri, direction, currentGraph, }) => {
-            const api = socket.flow(flowId);
+            const api = socket.flow(effectiveFlow);
             return updateSubgraphByRelationship(api, selectedNodeId, relationshipUri, direction, currentGraph, addActivity, removeActivity, collection);
         },
         onSuccess: (newGraph) => {
             // Update the cache with the new graph data
-            queryClient.setQueryData(["graph-subgraph", { entityUri, flowId, collection }], newGraph);
+            queryClient.setQueryData(["graph-subgraph", { entityUri, flow: effectiveFlow, collection }], newGraph);
         },
         onError: (err) => {
             console.log("Relationship navigation error:", err);
@@ -1405,17 +1411,19 @@ const useGraphEmbeddings = ({ flow, vecs, limit, collection }) => {
     const notify = useNotification();
     // Settings for default collection
     const { settings } = useSettings();
-    if (!flow)
-        flow = "default";
+    // Session state for default flow ID
+    const sessionFlowId = useSessionStore((state) => state.flowId);
+    // Use explicit param if provided, otherwise fall back to session state
+    const effectiveFlow = flow ?? sessionFlowId;
     /**
      * Query for fetching graph embeddings
      * Uses React Query for caching and background refetching
      */
     const query = reactQuery.useQuery({
-        queryKey: ["graph-embeddings", { vecs, limit }],
+        queryKey: ["graph-embeddings", { flow: effectiveFlow, vecs, limit }],
         queryFn: () => {
             return socket
-                .flow(flow)
+                .flow(effectiveFlow)
                 .graphEmbeddingsQuery(vecs, limit, collection || settings.collection)
                 .then((x) => {
                 return x;
@@ -1621,6 +1629,8 @@ const useVectorSearch = () => {
     const removeActivity = useProgressStateStore((state) => state.removeActivity);
     // Hook for displaying user notifications
     const notify = useNotification();
+    // Session state for default flow ID
+    const sessionFlowId = useSessionStore((state) => state.flowId);
     // State to track current search parameters
     const [searchParams, setSearchParams] = react.useState(null);
     /**
@@ -1632,7 +1642,7 @@ const useVectorSearch = () => {
         enabled: !!searchParams?.term,
         queryFn: () => {
             const { flow, term, limit, collection } = searchParams;
-            return vectorSearch(socket, flow || "default", addActivity, removeActivity, term, collection, limit)
+            return vectorSearch(socket, flow ?? sessionFlowId, addActivity, removeActivity, term, collection, limit)
                 .then((x) => {
                 if (x["error"]) {
                     console.log("Error:", x);
@@ -1654,7 +1664,7 @@ const useVectorSearch = () => {
             return;
         }
         setSearchParams({
-            flow: flow || "default",
+            flow: flow ?? sessionFlowId,
             term,
             limit: limit || 10,
             collection,
@@ -1678,13 +1688,17 @@ const useVectorSearch = () => {
  * Custom hook for managing entity detail operations using React Query
  * Provides functionality for fetching entity details and related triples
  * @param entityUri - The URI of the entity to fetch details for
- * @param flowId - The flow ID to use for the query
+ * @param flow - Optional flow ID to use for the query (defaults to session state)
  * @param collection - The collection to query
  * @returns {Object} Entity detail state and operations
  */
-const useEntityDetail = (entityUri, flowId, collection) => {
+const useEntityDetail = ({ entityUri, flow, collection, }) => {
     // WebSocket connection for communicating with the graph service
     const socket = reactProvider.useSocket();
+    // Session state for default flow ID
+    const sessionFlowId = useSessionStore((state) => state.flowId);
+    // Use explicit param if provided, otherwise fall back to session state
+    const effectiveFlow = flow ?? sessionFlowId;
     const addActivity = useProgressStateStore((state) => state.addActivity);
     const removeActivity = useProgressStateStore((state) => state.removeActivity);
     // Hook for displaying user notifications
@@ -1694,17 +1708,17 @@ const useEntityDetail = (entityUri, flowId, collection) => {
      * Uses React Query for caching and background refetching
      */
     const query = reactQuery.useQuery({
-        queryKey: ["entity-detail", { entityUri, flowId, collection }],
+        queryKey: ["entity-detail", { entityUri, flow: effectiveFlow, collection }],
         queryFn: async () => {
             if (!entityUri) {
                 throw new Error("Entity URI is required");
             }
             // Use the existing getTriples utility function
-            const api = socket.flow(flowId);
+            const api = socket.flow(effectiveFlow);
             return getTriples(api, entityUri, addActivity, removeActivity, undefined, collection);
         },
-        // Only run query if both entityUri and flowId are available
-        enabled: !!entityUri && !!flowId,
+        // Only run query if both entityUri and effectiveFlow are available
+        enabled: !!entityUri && !!effectiveFlow,
     });
     // Show loading indicators for long-running operations
     useActivity(query.isLoading, entityUri ? `Knowledge graph search: ${entityUri}` : "Loading entity");
@@ -1728,9 +1742,11 @@ const useEntityDetail = (entityUri, flowId, collection) => {
  * Hook providing low-level access to LLM inference services
  * No conversation state or side effects - just the API calls
  */
-const useInference = () => {
+const useInference = ({ flow } = {}) => {
     const socket = reactProvider.useSocket();
-    const flowId = useSessionStore((state) => state.flowId);
+    const sessionFlowId = useSessionStore((state) => state.flowId);
+    // Use explicit param if provided, otherwise fall back to session state
+    const effectiveFlow = flow ?? sessionFlowId;
     /**
      * Graph RAG inference with entity discovery
      */
@@ -1752,15 +1768,15 @@ const useInference = () => {
                         reject(new Error(error));
                     };
                     socket
-                        .flow(flowId)
+                        .flow(effectiveFlow)
                         .graphRagStreaming(input, onChunk, onError, options, collection);
                 })
-                : await socket.flow(flowId).graphRag(input, options || {}, collection);
+                : await socket.flow(effectiveFlow).graphRag(input, options || {}, collection);
             // Get embeddings for entity discovery
-            const embeddings = await socket.flow(flowId).embeddings(input);
+            const embeddings = await socket.flow(effectiveFlow).embeddings(input);
             // Query graph embeddings to find entities
             const entities = await socket
-                .flow(flowId)
+                .flow(effectiveFlow)
                 .graphEmbeddingsQuery(embeddings, options?.entityLimit || 10, collection);
             return { response, entities };
         },
@@ -1786,10 +1802,10 @@ const useInference = () => {
                         reject(new Error(error));
                     };
                     socket
-                        .flow(flowId)
+                        .flow(effectiveFlow)
                         .textCompletionStreaming(systemPrompt, input, onChunk, onError);
                 })
-                : await socket.flow(flowId).textCompletion(systemPrompt, input);
+                : await socket.flow(effectiveFlow).textCompletion(systemPrompt, input);
         },
     });
     /**
@@ -1817,7 +1833,7 @@ const useInference = () => {
                     reject(new Error(error));
                 };
                 socket
-                    .flow(flowId)
+                    .flow(effectiveFlow)
                     .agent(input, onThink, onObserve, onAnswer, onError);
             });
         },
@@ -1837,7 +1853,7 @@ const useInference = () => {
  * Combines conversation state with inference services
  * Handles routing, progress tracking, entity management, and notifications
  */
-const useChatSession = () => {
+const useChatSession = ({ flow } = {}) => {
     const socket = reactProvider.useSocket();
     const notify = useNotification();
     // Conversation state
@@ -1849,12 +1865,14 @@ const useChatSession = () => {
     const addActivity = useProgressStateStore((state) => state.addActivity);
     const removeActivity = useProgressStateStore((state) => state.removeActivity);
     // Session and workbench state
-    const flowId = useSessionStore((state) => state.flowId);
+    const sessionFlowId = useSessionStore((state) => state.flowId);
     const setEntities = useWorkbenchStateStore((state) => state.setEntities);
+    // Use explicit param if provided, otherwise fall back to session state
+    const effectiveFlow = flow ?? sessionFlowId;
     // Settings for GraphRAG configuration
     const { settings } = useSettings();
     // Inference services
-    const inference = useInference();
+    const inference = useInference({ flow });
     /**
      * Graph RAG chat handling with entity discovery
      */
@@ -1899,7 +1917,7 @@ const useChatSession = () => {
                 addActivity(labelActivity);
                 try {
                     const triples = await socket
-                        .flow(flowId)
+                        .flow(effectiveFlow)
                         .triplesQuery(entity, { t: "i", i: RDFS_LABEL }, undefined, 1, settings.collection);
                     removeActivity(labelActivity);
                     return triples;
@@ -2161,16 +2179,18 @@ const useStructuredQuery = () => {
  * Provides functionality for executing semantic searches on structured data indexes
  * First converts query text to embeddings, then searches for similar records
  */
-const useRowEmbeddingsQuery = () => {
+const useRowEmbeddingsQuery = ({ flow } = {}) => {
     // Socket connection for API calls
     const socket = reactProvider.useSocket();
     const connectionState = reactProvider.useConnectionState();
     // Notification system for user feedback
     const notify = useNotification();
     // Session state for current flow ID
-    const flowId = useSessionStore((state) => state.flowId);
+    const sessionFlowId = useSessionStore((state) => state.flowId);
     // Settings for default collection
     const { settings } = useSettings();
+    // Use explicit param if provided, otherwise fall back to session state
+    const effectiveFlow = flow ?? sessionFlowId;
     // Only enable operations when socket is connected and ready
     const isSocketReady = connectionState?.status === "authenticated" ||
         connectionState?.status === "unauthenticated";
@@ -2180,11 +2200,11 @@ const useRowEmbeddingsQuery = () => {
             if (!isSocketReady) {
                 throw new Error("Socket connection not ready");
             }
-            const flow = socket.flow(flowId);
+            const flowApi = socket.flow(effectiveFlow);
             // First, get embeddings for the query text
-            const vectors = await flow.embeddings(query);
+            const vectors = await flowApi.embeddings(query);
             // Then query row embeddings with those vectors
-            return flow.rowEmbeddingsQuery(vectors, schemaName, collection || settings.collection, indexName, limit || 10);
+            return flowApi.rowEmbeddingsQuery(vectors, schemaName, collection || settings.collection, indexName, limit || 10);
         },
         onError: (err) => {
             console.log("Row embeddings query error:", err);
@@ -2227,14 +2247,16 @@ const useRowEmbeddingsQuery = () => {
  * Custom hook for managing GraphQL rows queries
  * Provides functionality for executing GraphQL queries against structured row data
  */
-const useRowsQuery = () => {
+const useRowsQuery = ({ flow } = {}) => {
     // Socket connection for API calls
     const socket = reactProvider.useSocket();
     const connectionState = reactProvider.useConnectionState();
     // Notification system for user feedback
     const notify = useNotification();
     // Session state for current flow ID
-    const flowId = useSessionStore((state) => state.flowId);
+    const sessionFlowId = useSessionStore((state) => state.flowId);
+    // Use explicit param if provided, otherwise fall back to session state
+    const effectiveFlow = flow ?? sessionFlowId;
     // Settings for default collection
     const { settings } = useSettings();
     // Only enable operations when socket is connected and ready
@@ -2247,7 +2269,7 @@ const useRowsQuery = () => {
                 throw new Error("Socket connection not ready");
             }
             return socket
-                .flow(flowId)
+                .flow(effectiveFlow)
                 .rowsQuery(query, collection || settings.collection, variables, operationName);
         },
         onError: (err) => {
@@ -2293,18 +2315,20 @@ const useEmbeddings = ({ flow, term }) => {
         connectionState?.status === "unauthenticated";
     // Hook for displaying user notifications
     const notify = useNotification();
-    if (!flow)
-        flow = "default";
+    // Session state for default flow ID
+    const sessionFlowId = useSessionStore((state) => state.flowId);
+    // Use explicit param if provided, otherwise fall back to session state
+    const effectiveFlow = flow ?? sessionFlowId;
     /**
      * Query for fetching all token costs
      * Uses React Query for caching and background refetching
      */
     const query = reactQuery.useQuery({
-        queryKey: ["embeddings", { flow, term }],
-        enabled: isSocketReady && !!term && !!flow,
+        queryKey: ["embeddings", { flow: effectiveFlow, term }],
+        enabled: isSocketReady && !!term && !!effectiveFlow,
         queryFn: () => {
             return socket
-                .flow(flow)
+                .flow(effectiveFlow)
                 .embeddings(term)
                 .then((x) => {
                 if (x["error"]) {
@@ -2442,14 +2466,16 @@ const useCollections = () => {
  * Custom hook for managing NLP query operations
  * Provides functionality for converting natural language questions to GraphQL queries
  */
-const useNlpQuery = () => {
+const useNlpQuery = ({ flow } = {}) => {
     // Socket connection for API calls
     const socket = reactProvider.useSocket();
     const connectionState = reactProvider.useConnectionState();
     // Notification system for user feedback
     const notify = useNotification();
     // Session state for current flow ID
-    const flowId = useSessionStore((state) => state.flowId);
+    const sessionFlowId = useSessionStore((state) => state.flowId);
+    // Use explicit param if provided, otherwise fall back to session state
+    const effectiveFlow = flow ?? sessionFlowId;
     // Only enable operations when socket is connected and ready
     const isSocketReady = connectionState?.status === "authenticated" ||
         connectionState?.status === "unauthenticated";
@@ -2459,7 +2485,7 @@ const useNlpQuery = () => {
             if (!isSocketReady) {
                 throw new Error("Socket connection not ready");
             }
-            return socket.flow(flowId).nlpQuery(question, maxResults);
+            return socket.flow(effectiveFlow).nlpQuery(question, maxResults);
         },
         onError: (err) => {
             console.log("NLP query error:", err);