trustgraph-base 2.10.2__tar.gz → 2.10.4__tar.gz

{trustgraph_base-2.10.2 → trustgraph_base-2.10.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: trustgraph-base
-Version: 2.10.2
+Version: 2.10.4
 Summary: TrustGraph provides a means to run a pipeline of flexible AI processing components in a flexible means to achieve a processing pipeline.
 Author-email: "trustgraph.ai" <security@trustgraph.ai>
 Project-URL: Homepage, https://github.com/trustgraph-ai/trustgraph

{trustgraph_base-2.10.2 → trustgraph_base-2.10.4}/trustgraph/api/flow.py

@@ -403,11 +403,15 @@ class FlowInstance:
         )["answer"]
 
     def graph_rag(
-            self, query,collection="default",
+            self, query, collection="default",
             entity_limit=50, triple_limit=30, max_subgraph_size=150,
             max_path_length=2, edge_score_limit=30, edge_limit=25,
             max_reranker_input=350,
             user_context=None,
+            grounding_seeds=None,
+            graph_seeds=None,
+            languages=None,
+            traversal_instructions=None,
     ):
         """
         Execute graph-based Retrieval-Augmented Generation (RAG) query.
@@ -425,6 +429,10 @@ class FlowInstance:
             edge_score_limit: Max edges for semantic pre-filter (default: 50)
             edge_limit: Max edges after LLM scoring (default: 25)
             max_reranker_input: Max candidate edges sent to reranker per hop (default: 350)
+            grounding_seeds: Optional list of concept strings to bypass LLM extraction
+            graph_seeds: Optional list of entity IRIs as traversal starting points
+            languages: Optional list of language tags to filter by
+            traversal_instructions: Optional list of dicts with per-hop restrictions
 
         Returns:
             str: Generated response incorporating graph context
@@ -433,7 +441,8 @@ class FlowInstance:
             ```python
             flow = api.flow().id("default")
             response = flow.graph_rag(
-                query="Tell me about Marie Curie's discoveries",collection="scientists",
+                query="Tell me about Marie Curie's discoveries",
+                collection="scientists",
                 entity_limit=20,
                 max_path_length=3
             )
@@ -456,6 +465,14 @@ class FlowInstance:
 
         if user_context is not None:
             input["user-context"] = dataclass_to_dict(user_context)
+        if grounding_seeds:
+            input["grounding-seeds"] = grounding_seeds
+        if graph_seeds:
+            input["graph-seeds"] = graph_seeds
+        if languages:
+            input["languages"] = languages
+        if traversal_instructions:
+            input["traversal-instructions"] = traversal_instructions
 
         result = self.request(
             "service/graph-rag",

{trustgraph_base-2.10.2 → trustgraph_base-2.10.4}/trustgraph/api/socket_client.py

@@ -718,6 +718,10 @@ class SocketFlowInstance:
         edge_limit: int = 25,
         max_reranker_input: int = 350,
         streaming: bool = False,
+        grounding_seeds: Optional[List[str]] = None,
+        graph_seeds: Optional[List[str]] = None,
+        languages: Optional[List[str]] = None,
+        traversal_instructions: Optional[List[dict]] = None,
         **kwargs: Any
     ) -> Union[TextCompletionResult, Iterator[RAGChunk]]:
         """Execute graph-based RAG query with optional streaming.
@@ -737,6 +741,14 @@ class SocketFlowInstance:
             "max-reranker-input": max_reranker_input,
             "streaming": streaming
         }
+        if grounding_seeds:
+            request["grounding-seeds"] = grounding_seeds
+        if graph_seeds:
+            request["graph-seeds"] = graph_seeds
+        if languages:
+            request["languages"] = languages
+        if traversal_instructions:
+            request["traversal-instructions"] = traversal_instructions
         request.update(kwargs)
 
         result = self.client._send_request_sync("graph-rag", self.flow_id, request, streaming)
@@ -763,6 +775,10 @@ class SocketFlowInstance:
         edge_score_limit: int = 30,
         edge_limit: int = 25,
         max_reranker_input: int = 350,
+        grounding_seeds: Optional[List[str]] = None,
+        graph_seeds: Optional[List[str]] = None,
+        languages: Optional[List[str]] = None,
+        traversal_instructions: Optional[List[dict]] = None,
         **kwargs: Any
     ) -> Iterator[Union[RAGChunk, ProvenanceEvent]]:
         """Execute graph-based RAG query with explainability support."""
@@ -779,6 +795,14 @@ class SocketFlowInstance:
             "streaming": True,
             "explainable": True,
         }
+        if grounding_seeds:
+            request["grounding-seeds"] = grounding_seeds
+        if graph_seeds:
+            request["graph-seeds"] = graph_seeds
+        if languages:
+            request["languages"] = languages
+        if traversal_instructions:
+            request["traversal-instructions"] = traversal_instructions
         request.update(kwargs)
 
         return self.client._send_request_sync(

{trustgraph_base-2.10.2 → trustgraph_base-2.10.4}/trustgraph/base/graph_rag_client.py

@@ -6,6 +6,10 @@ class GraphRagClient:
     async def rag(self, query, collection="default",
                   chunk_callback=None, explain_callback=None,
                   parent_uri="",
+                  grounding_seeds=None,
+                  graph_seeds=None,
+                  languages=None,
+                  traversal_instructions=None,
                   timeout=600):
         """
         Execute a graph RAG query with optional streaming callbacks.
@@ -50,6 +54,10 @@ class GraphRagClient:
                 query = query,
                 collection = collection,
                 parent_uri = parent_uri,
+                grounding_seeds = grounding_seeds or [],
+                graph_seeds = graph_seeds or [],
+                languages = languages or [],
+                traversal_instructions = traversal_instructions or [],
             ),
             timeout=timeout,
             recipient=recipient,

trustgraph_base-2.10.4/trustgraph/base_version.py

@@ -0,0 +1 @@
+__version__ = "2.10.4"

{trustgraph_base-2.10.2 → trustgraph_base-2.10.4}/trustgraph/messaging/translators/iam.py

@@ -122,6 +122,7 @@ class IamRequestTranslator(MessageTranslator):
                 data.get("workspace_record")
             ),
             key=_api_key_input_from_dict(data.get("key")),
+            user_context_json=data.get("user_context_json", ""),
             group_id=data.get("group_id", ""),
             member_type=data.get("member_type", ""),
             member_id=data.get("member_id", ""),
@@ -138,6 +139,7 @@ class IamRequestTranslator(MessageTranslator):
         for fname in (
                 "workspace", "actor", "user_id", "username", "key_id",
                 "api_key", "password", "new_password",
+                "user_context_json",
                 "group_id", "member_type", "member_id",
                 "capability", "resource_json", "parameters_json",
                 "authorise_checks",

{trustgraph_base-2.10.2 → trustgraph_base-2.10.4}/trustgraph/messaging/translators/retrieval.py

@@ -1,6 +1,6 @@
-from typing import Dict, Any, Tuple
+from typing import Dict, Any, List, Tuple
 from ...schema import DocumentRagQuery, DocumentRagResponse, GraphRagQuery, GraphRagResponse
-from ...schema import UserContext
+from ...schema import TraversalStep, UserContext
 from ...base.serialization import dict_to_dataclass, dataclass_to_dict
 from .base import MessageTranslator
 from .primitives import TripleTranslator
@@ -95,8 +95,38 @@ class DocumentRagResponseTranslator(MessageTranslator):
 class GraphRagRequestTranslator(MessageTranslator):
     """Translator for GraphRagQuery schema objects"""
 
+    @staticmethod
+    def _decode_traversal_instructions(
+        data: List[Dict[str, Any]],
+    ) -> list[TraversalStep]:
+        steps = []
+        for item in data:
+            steps.append(TraversalStep(
+                types=item.get("types", []),
+                relationships=item.get("relationships", []),
+                graphs=item.get("graphs", []),
+            ))
+        return steps
+
+    @staticmethod
+    def _encode_traversal_instructions(
+        steps: list[TraversalStep],
+    ) -> List[Dict[str, Any]]:
+        result = []
+        for step in steps:
+            item: Dict[str, Any] = {}
+            if step.types:
+                item["types"] = step.types
+            if step.relationships:
+                item["relationships"] = step.relationships
+            if step.graphs:
+                item["graphs"] = step.graphs
+            result.append(item)
+        return result
+
     def decode(self, data: Dict[str, Any]) -> GraphRagQuery:
         uc = data.get("user-context")
+        raw_ti = data.get("traversal-instructions", [])
         return GraphRagQuery(
             query=data["query"],
             collection=data.get("collection", "default"),
@@ -109,6 +139,10 @@ class GraphRagRequestTranslator(MessageTranslator):
             max_reranker_input=int(data.get("max-reranker-input", 350)),
             streaming=data.get("streaming", False),
             user_context=dict_to_dataclass(uc, UserContext) if uc else None,
+            grounding_seeds=data.get("grounding-seeds", []),
+            graph_seeds=data.get("graph-seeds", []),
+            languages=data.get("languages", []),
+            traversal_instructions=self._decode_traversal_instructions(raw_ti),
         )
 
     def encode(self, obj: GraphRagQuery) -> Dict[str, Any]:
@@ -126,6 +160,14 @@ class GraphRagRequestTranslator(MessageTranslator):
         }
         if obj.user_context is not None:
             result["user-context"] = dataclass_to_dict(obj.user_context)
+        if obj.grounding_seeds:
+            result["grounding-seeds"] = obj.grounding_seeds
+        if obj.graph_seeds:
+            result["graph-seeds"] = obj.graph_seeds
+        if obj.languages:
+            result["languages"] = obj.languages
+        if obj.traversal_instructions:
+            result["traversal-instructions"] = self._encode_traversal_instructions(obj.traversal_instructions)
         return result
 
 

{trustgraph_base-2.10.2 → trustgraph_base-2.10.4}/trustgraph/schema/iam.py

@@ -111,6 +111,9 @@ class IamRequest:
     request_id: str = ""
     client_ip: str = ""
 
+    # ---- mint-token input ----
+    user_context_json: str = ""
+
     # ---- authorise / authorise-many inputs ----
     capability: str = ""
     resource_json: str = ""

{trustgraph_base-2.10.2 → trustgraph_base-2.10.4}/trustgraph/schema/retrieval.py

@@ -1,5 +1,6 @@
 
 from dataclasses import dataclass, field
+from typing import Optional
 
 from .core.primitives import Error, Term, Triple
 from .user_context import UserContext
@@ -8,6 +9,12 @@ from .user_context import UserContext
 
 # Graph RAG text retrieval
 
+@dataclass
+class TraversalStep:
+    types: list[str] = field(default_factory=list)
+    relationships: list[str] = field(default_factory=list)
+    graphs: list[str] = field(default_factory=list)
+
 @dataclass
 class GraphRagQuery:
     query: str = ""
@@ -22,6 +29,10 @@ class GraphRagQuery:
     streaming: bool = False
     parent_uri: str = ""
     user_context: UserContext | None = None
+    grounding_seeds: list[str] = field(default_factory=list)
+    graph_seeds: list[str] = field(default_factory=list)
+    languages: list[str] = field(default_factory=list)
+    traversal_instructions: list[TraversalStep] = field(default_factory=list)
 
 @dataclass
 class Source:

{trustgraph_base-2.10.2 → trustgraph_base-2.10.4}/trustgraph_base.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: trustgraph-base
-Version: 2.10.2
+Version: 2.10.4
 Summary: TrustGraph provides a means to run a pipeline of flexible AI processing components in a flexible means to achieve a processing pipeline.
 Author-email: "trustgraph.ai" <security@trustgraph.ai>
 Project-URL: Homepage, https://github.com/trustgraph-ai/trustgraph

trustgraph_base-2.10.2/trustgraph/base_version.py

@@ -1 +0,0 @@
-__version__ = "2.10.2"