V3 graph implmentations

js/sdk/__tests__/r2rV2ClientIntegrationSuperUser.test.ts

@@ -81,7 +81,7 @@ let newCollectionId: string;
  *     X createGraph
  *     X enrichGraph
  *     X getEntities
- *     X getTriples
+ *     X getRelationships
  *     X getCommunities
  *     X getTunedPrompt
  *     X deduplicateEntities

js/sdk/__tests__/r2rV2ClientIntegrationUser.test.ts

@@ -77,7 +77,7 @@ const baseUrl = "http://localhost:7272";
  *     X createGraph
  *     X enrichGraph
  *     X getEntities
- *     X getTriples
+ *     X getRelationships
  *     X getCommunities
  *     X getTunedPrompt
  *     X deduplicateEntities

js/sdk/src/models.tsx

@@ -74,13 +74,13 @@ export enum KGRunType {
 }
 
 export interface KGCreationSettings {
-  kg_triples_extraction_prompt?: string;
+  kg_relationships_extraction_prompt?: string;
   kg_entity_description_prompt?: string;
   force_kg_creation?: boolean;
   entity_types?: string[];
   relation_types?: string[];
   extractions_merge_count?: number;
-  max_knowledge_triples?: number;
+  max_knowledge_relationships?: number;
   max_description_input_length?: number;
   generation_config?: GenerationConfig;
 }

js/sdk/src/r2rClient.ts

@@ -1685,21 +1685,21 @@ export class r2rClient extends BaseClient {
   }
 
   /**
-   * Retrieve triples from the knowledge graph.
+   * Retrieve relationships from the knowledge graph.
    * @returns A promise that resolves to the response from the server.
    * @param collection_id The ID of the collection to retrieve entities for.
    * @param offset The offset for pagination.
    * @param limit The limit for pagination.
    * @param entity_level The level of entity to filter by.
-   * @param triple_ids Triple IDs to filter by.
+   * @param relationship_ids Relationship IDs to filter by.
    */
-  @feature("getTriples")
-  async getTriples(
+  @feature("getRelationships")
+  async getRelationships(
     collection_id?: string,
     offset?: number,
     limit?: number,
     entity_level?: string,
-    triple_ids?: string[],
+    relationship_ids?: string[],
   ): Promise<any> {
     this._ensureAuthenticated();
 
@@ -1716,11 +1716,11 @@ export class r2rClient extends BaseClient {
     if (entity_level !== undefined) {
       params.entity_level = entity_level;
     }
-    if (triple_ids !== undefined) {
-      params.entity_ids = triple_ids;
+    if (relationship_ids !== undefined) {
+      params.entity_ids = relationship_ids;
     }
 
-    return this._makeRequest("GET", `triples`, { params });
+    return this._makeRequest("GET", `relationships`, { params });
   }
 
   /**

py/cli/commands/v2/kg.py

@@ -229,7 +229,7 @@ async def get_entities(
 @click.option(
     "--collection-id",
     required=True,
-    help="Collection ID to retrieve triples from.",
+    help="Collection ID to retrieve relationships from.",
 )
 @click.option(
     "--offset",
@@ -244,31 +244,31 @@ async def get_entities(
     help="Limit for pagination.",
 )
 @click.option(
-    "--triple-ids",
+    "--relationship-ids",
     multiple=True,
-    help="Triple IDs to filter by.",
+    help="Relationship IDs to filter by.",
 )
 @click.option(
     "--entity-names",
     multiple=True,
     help="Entity names to filter by.",
 )
 @pass_context
-async def get_triples(
-    ctx, collection_id, offset, limit, triple_ids, entity_names
+async def get_relationships(
+    ctx, collection_id, offset, limit, relationship_ids, entity_names
 ):
     """
-    Retrieve triples from the knowledge graph.
+    Retrieve relationships from the knowledge graph.
     """
     client: R2RAsyncClient = ctx.obj
 
     with timer():
-        response = await client.get_triples(
+        response = await client.get_relationships(
             collection_id,
             offset,
             limit,
             list(entity_names),
-            list(triple_ids),
+            list(relationship_ids),
         )
 
     click.echo(json.dumps(response, indent=2))
@@ -291,7 +291,7 @@ async def delete_graph_for_collection(ctx, collection_id, cascade):
     """
     Delete the graph for a given collection.
 
-    NOTE: Setting the cascade flag to true will delete entities and triples for documents that are shared across multiple collections. Do not set this flag unless you are absolutely sure that you want to delete the entities and triples for all documents in the collection.
+    NOTE: Setting the cascade flag to true will delete entities and relationships for documents that are shared across multiple collections. Do not set this flag unless you are absolutely sure that you want to delete the entities and relationships for all documents in the collection.
     """
     client: R2RAsyncClient = ctx.obj
 

py/core/__init__.py

@@ -63,7 +63,7 @@
     # KG abstractions
     "Entity",
     "KGExtraction",
-    "Triple",
+    "Relationship",
     # LLM abstractions
     "GenerationConfig",
     "LLMChatCompletion",
@@ -213,7 +213,7 @@
     ## PIPES
     "SearchPipe",
     "EmbeddingPipe",
-    "KGTriplesExtractionPipe",
+    "KGRelationshipsExtractionPipe",
     "ParsingPipe",
     "QueryTransformPipe",
     "SearchRAGPipe",

py/core/base/__init__.py

@@ -32,7 +32,12 @@
     # KG abstractions
     "Entity",
     "KGExtraction",
-    "Triple",
+    "Relationship",
+    "Community",
+    "CommunityInfo",
+    "KGCreationSettings",
+    "KGEnrichmentSettings",
+    "KGRunType",
     # LLM abstractions
     "GenerationConfig",
     "LLMChatCompletion",
@@ -47,10 +52,6 @@
     "VectorSearchResult",
     "SearchSettings",
     "HybridSearchSettings",
-    # KG abstractions
-    "KGCreationSettings",
-    "KGEnrichmentSettings",
-    "KGRunType",
     # User abstractions
     "Token",
     "TokenData",

py/core/base/abstractions/__init__.py

@@ -22,13 +22,14 @@
 from shared.abstractions.graph import (
     Community,
     CommunityInfo,
-    CommunityReport,
+    Community,
     Entity,
     EntityLevel,
     EntityType,
+    Graph,
     KGExtraction,
     RelationshipType,
-    Triple,
+    Relationship,
 )
 from shared.abstractions.ingestion import (
     ChunkEnrichmentSettings,
@@ -109,9 +110,9 @@
     "EntityType",
     "RelationshipType",
     "Community",
-    "CommunityReport",
+    "CommunityInfo",
     "KGExtraction",
-    "Triple",
+    "Relationship",
     "EntityLevel",
     # Index abstractions
     "IndexConfig",

py/core/base/api/models/__init__.py

@@ -19,20 +19,36 @@
     WrappedUpdateResponse,
 )
 from shared.api.models.kg.responses import (
-    KGCreationEstimationResponse,
     KGCreationResponse,
-    KGDeduplicationEstimationResponse,
-    KGEnrichmentEstimationResponse,
     KGEnrichmentResponse,
     KGEntityDeduplicationResponse,
     WrappedKGCommunitiesResponse,
     WrappedKGCreationResponse,
     WrappedKGEnrichmentResponse,
     WrappedKGEntitiesResponse,
     WrappedKGEntityDeduplicationResponse,
-    WrappedKGTriplesResponse,
+    WrappedKGRelationshipsResponse,
     WrappedKGTunePromptResponse,
 )
+
+
+from shared.api.models.kg.responses_v3 import (
+    WrappedKGEntitiesResponse as WrappedKGEntitiesResponseV3,
+    WrappedKGRelationshipsResponse as WrappedKGRelationshipsResponseV3,
+    WrappedKGCommunitiesResponse as WrappedKGCommunitiesResponseV3,
+    WrappedKGCreationResponse as WrappedKGCreationResponseV3,
+    WrappedKGEnrichmentResponse as WrappedKGEnrichmentResponseV3,
+    WrappedKGTunePromptResponse as WrappedKGTunePromptResponseV3,
+    WrappedKGEntityDeduplicationResponse as WrappedKGEntityDeduplicationResponseV3,
+    WrappedKGDeletionResponse as WrappedKGDeletionResponseV3,
+    KGCreationResponse as KGCreationResponseV3,
+    KGEnrichmentResponse as KGEnrichmentResponseV3,
+    KGEntityDeduplicationResponse as KGEntityDeduplicationResponseV3,
+    KGTunePromptResponse as KGTunePromptResponseV3,
+    KGDeletionResponse as KGDeletionResponseV3,
+)
+
+
 from shared.api.models.management.responses import (
     AnalyticsResponse,
     AppSettingsResponse,
@@ -96,17 +112,29 @@
     "WrappedMetadataUpdateResponse",
     "WrappedListVectorIndicesResponse",
     "UpdateResponse",
-    # Knowledge Graph Responses
+    # Knowledge Graph Responses for V2
+    # will be removed eventually
     "KGCreationResponse",
     "WrappedKGCreationResponse",
     "KGEnrichmentResponse",
     "WrappedKGEnrichmentResponse",
     "KGEntityDeduplicationResponse",
     "WrappedKGEntityDeduplicationResponse",
     "WrappedKGTunePromptResponse",
-    "KGCreationEstimationResponse",
-    "KGDeduplicationEstimationResponse",
-    "KGEnrichmentEstimationResponse",
+    # Knowledge Graph Responses for V3
+    "WrappedKGEntitiesResponseV3",
+    "WrappedKGRelationshipsResponseV3",
+    "WrappedKGCommunitiesResponseV3",
+    "WrappedKGCreationResponseV3",
+    "WrappedKGEnrichmentResponseV3",
+    "WrappedKGTunePromptResponseV3",
+    "WrappedKGEntityDeduplicationResponseV3",
+    "KGCreationResponseV3",
+    "KGEnrichmentResponseV3",
+    "KGEntityDeduplicationResponseV3",
+    "KGTunePromptResponseV3",
+    "WrappedKGDeletionResponseV3",
+    "KGDeletionResponseV3",
     # Management Responses
     "PromptResponse",
     "ServerStats",

py/core/base/providers/__init__.py

@@ -8,7 +8,7 @@
     DatabaseProvider,
     DocumentHandler,
     FileHandler,
-    KGHandler,
+    GraphHandler,
     LoggingHandler,
     PostgresConfigurationSettings,
     PromptHandler,
@@ -48,7 +48,7 @@
     "UserHandler",
     "LoggingHandler",
     "VectorHandler",
-    "KGHandler",
+    "GraphHandler",
     "PromptHandler",
     "FileHandler",
     "DatabaseConfig",