Feature/fix stream format (#1243)

* denote findings

* up

* up

* up

py/core/pipes/retrieval/streaming_rag_pipe.py

@@ -66,7 +66,6 @@ async def _run_logic(  # type: ignore
             result = format_search_results_for_stream(search_results)
             yield result
             gen_context = format_search_results_for_llm(search_results)
-            print("gen_context = ", gen_context)
             context += gen_context
 
         messages = self.prompt_provider._get_message_payload(

py/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "poetry.core.masonry.api"
 [tool.poetry]
 name = "r2r"
 readme = "README.md"
-version = "3.1.44"
+version = "3.1.45"
 description = "SciPhi R2R"
 authors = ["Owen Colegrove <[email protected]>"]
 license = "MIT"

py/sdk/ingestion.py

@@ -73,15 +73,14 @@ async def ingest_files(
                 )
             if metadatas:
                 data["metadatas"] = json.dumps(metadatas)
-                
+
             if chunking_config:
                 data["chunking_config"] = (
                     chunking_config.model_dump()  # type: ignore
                     if isinstance(chunking_config, ChunkingConfig)
                     else chunking_config
                 )
 
-
             return await client._make_request(
                 "POST", "ingest_files", data=data, files=files_tuples
             )

py/sdk/restructure.py

@@ -26,7 +26,9 @@ async def create_graph(
         if document_ids:
             data["document_ids"] = document_ids
         if kg_creation_settings:
-            data["kg_creation_settings"] = kg_creation_settings
+            if isinstance(kg_creation_settings, KGCreationSettings):
+                kg_creation_settings = kg_creation_settings.dict()
+            data["kg_creation_settings"] = kg_creation_settings  # type: ignore
 
         response = await client._make_request(
             "POST", "create_graph", json=data
@@ -60,7 +62,9 @@ async def enrich_graph(
         if force_enrichment:
             data["force_enrichment"] = force_enrichment
         if kg_enrichment_settings:
-            data["kg_enrichment_settings"] = kg_enrichment_settings
+            if isinstance(kg_enrichment_settings, KGEnrichmentSettings):
+                kg_enrichment_settings = kg_enrichment_settings.dict()
+            data["kg_enrichment_settings"] = kg_enrichment_settings  # type: ignore
 
         response = await client._make_request(
             "POST", "enrich_graph", json=data

py/shared/utils/base_utils.py

@@ -24,7 +24,7 @@ def format_search_results_for_llm(
         formatted_results += "KG Local Results:\n"
         for j, kg_result in enumerate(results.kg_search_results):
             formatted_results += (
-                f"Source [{j+1}]: Name - {kg_result.content.name}\n"
+                f"Source [{j+i+1}]: Name - {kg_result.content.name}\n"
             )
             formatted_results += (
                 f"Description - {kg_result.content.description}\n"

templates/ycombinator_graphrag/web-app/components/SearchResults.tsx

@@ -41,22 +41,63 @@ const VectorSearchResultItem: FC<{
   );
 };
 
+// const KGSearchResultItem: FC<{ entity: KGSearchResult; index: number }> = ({
+//   entity,
+//   index,
+// }) => {
+//   const { content } = entity;
+
+//   return (
+//     <div className="p-4 mb-2 flex items-center w-full">
+//       <div className="flex-grow mr-4">
+//         <div className="flex items-center mb-1">
+//           <h3 className="text-sm font-medium mr-2 overflow-hidden overflow-ellipsis">
+//             [{index}] {content.name}
+//           </h3>
+//         </div>
+
+//         <p className="text-xs text-wrap break-words">{content.description}</p>
+//       </div>
+//     </div>
+//   );
+// };
+
 const KGSearchResultItem: FC<{ entity: KGSearchResult; index: number }> = ({
   entity,
   index,
 }) => {
-  const { content } = entity;
+  const { content, metadata } = entity;
+  const findings = metadata?.findings;
 
   return (
-    <div className="p-4 mb-2 flex items-center w-full">
-      <div className="flex-grow mr-4">
-        <div className="flex items-center mb-1">
-          <h3 className="text-sm font-medium mr-2 overflow-hidden overflow-ellipsis">
+    <div className="p-4 mb-2 flex flex-col w-full">
+      <div className="flex-grow">
+        {/* Title */}
+        <div className="flex items-center mb-2">
+          <h3 className="text-sm font-medium overflow-hidden overflow-ellipsis">
             [{index}] {content.name}
           </h3>
         </div>
+        <h4 className="text-sm font-semibold mb-1">Summary:</h4>
+
+        {/* Description */}
+        {content.description && (
+          <p className="text-xs break-words mb-2">{content.description}</p>
+        )}
 
-        <p className="text-xs text-wrap break-words">{content.description}</p>
+        {/* Findings */}
+        {findings && findings.length > 0 && (
+          <div>
+            <h4 className="text-sm font-semibold mb-1">Findings:</h4>
+            <ul className="list-disc list-inside text-xs pl-4">
+              {findings.map((finding: string, idx: number) => (
+                <li key={idx} className="mb-1">
+                  {finding}
+                </li>
+              ))}
+            </ul>
+          </div>
+        )}
       </div>
     </div>
   );
@@ -113,8 +154,8 @@ export const SearchResults: React.FC<SearchResultsProps> = ({
         className="text-zinc-900 w-full max-w-2xl"
       >
         <TabsList>
-          <TabsTrigger value="kgEntities">KG Entities</TabsTrigger>
-          <TabsTrigger value="kgCommunities">KG Communities</TabsTrigger>
+        <TabsTrigger value="kgCommunities">KG Communities</TabsTrigger>
+        <TabsTrigger value="kgEntities">KG Entities</TabsTrigger>
           <TabsTrigger value="vectorSearch">Vector Search</TabsTrigger>
         </TabsList>
         <TabsContent value="vectorSearch">

templates/ycombinator_graphrag/web-app/pages/api/agent.ts

@@ -38,7 +38,6 @@ export default async function handler(req: Request) {
       // kg_search_type: "local", // kg_search_type ?? 'local',
     };
 
-    console.log('searchParams = ', searchParams);
 
     const kgSearchParams = use_kg_search
       ? { use_kg_search: true, kg_search_type: 'local' }

templates/ycombinator_graphrag/web-app/pages/index.tsx

@@ -10,6 +10,7 @@ const Index: React.FC = () => {
   const router = useRouter();
   const [query, setQuery] = useState('');
   const [agentUrl] = useState('https://infra.sciphi.ai');
+  // const [agentUrl] = useState('http://0.0.0.0:7272');
   const [isStreaming, setIsStreaming] = useState(false);
   const contentAreaRef = useRef<HTMLDivElement>(null);
   const [messages, setMessages] = useState<any[]>([]);