trustgraph-base 1.3.1__tar.gz → 1.3.3__tar.gz

{trustgraph_base-1.3.1 → trustgraph_base-1.3.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: trustgraph-base
-Version: 1.3.1
+Version: 1.3.3
 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-1.3.1 → trustgraph_base-1.3.3}/trustgraph/api/flow.py

@@ -383,3 +383,46 @@ class FlowInstance:
             input
         )
 
+    def objects_query(
+            self, query, user="trustgraph", collection="default",
+            variables=None, operation_name=None
+    ):
+
+        # The input consists of a GraphQL query and optional variables
+        input = {
+            "query": query,
+            "user": user,
+            "collection": collection,
+        }
+
+        if variables:
+            input["variables"] = variables
+
+        if operation_name:
+            input["operation_name"] = operation_name
+
+        response = self.request(
+            "service/objects",
+            input
+        )
+
+        # Check for system-level error
+        if "error" in response and response["error"]:
+            error_type = response["error"].get("type", "unknown")
+            error_message = response["error"].get("message", "Unknown error")
+            raise ProtocolException(f"{error_type}: {error_message}")
+
+        # Return the GraphQL response structure
+        result = {}
+        
+        if "data" in response:
+            result["data"] = response["data"]
+            
+        if "errors" in response and response["errors"]:
+            result["errors"] = response["errors"]
+            
+        if "extensions" in response and response["extensions"]:
+            result["extensions"] = response["extensions"]
+            
+        return result
+

trustgraph_base-1.3.3/trustgraph/base/cassandra_config.py

@@ -0,0 +1,144 @@
+"""
+Cassandra configuration utilities for standardized parameter handling.
+
+Provides consistent Cassandra configuration across all TrustGraph processors,
+including command-line arguments, environment variables, and defaults.
+"""
+
+import os
+import argparse
+from typing import Optional, Tuple, List, Any
+
+
+def get_cassandra_defaults() -> dict:
+    """
+    Get default Cassandra configuration values from environment variables or fallback defaults.
+    
+    Returns:
+        dict: Dictionary with 'host', 'username', and 'password' keys
+    """
+    return {
+        'host': os.getenv('CASSANDRA_HOST', 'cassandra'),
+        'username': os.getenv('CASSANDRA_USERNAME'),
+        'password': os.getenv('CASSANDRA_PASSWORD')
+    }
+
+
+def add_cassandra_args(parser: argparse.ArgumentParser) -> None:
+    """
+    Add standardized Cassandra configuration arguments to an argument parser.
+    
+    Shows environment variable values in help text when they are set.
+    Password values are never displayed for security.
+    
+    Args:
+        parser: ArgumentParser instance to add arguments to
+    """
+    defaults = get_cassandra_defaults()
+    
+    # Format help text with environment variable indication
+    host_help = f"Cassandra host list, comma-separated (default: {defaults['host']})"
+    if 'CASSANDRA_HOST' in os.environ:
+        host_help += " [from CASSANDRA_HOST]"
+    
+    username_help = "Cassandra username"
+    if defaults['username']:
+        username_help += f" (default: {defaults['username']})"
+        if 'CASSANDRA_USERNAME' in os.environ:
+            username_help += " [from CASSANDRA_USERNAME]"
+    
+    password_help = "Cassandra password"
+    if defaults['password']:
+        # Never show actual password value
+        password_help += " (default: <set>)"
+        if 'CASSANDRA_PASSWORD' in os.environ:
+            password_help += " [from CASSANDRA_PASSWORD]"
+    
+    parser.add_argument(
+        '--cassandra-host',
+        default=defaults['host'],
+        help=host_help
+    )
+    
+    parser.add_argument(
+        '--cassandra-username',
+        default=defaults['username'],
+        help=username_help
+    )
+    
+    parser.add_argument(
+        '--cassandra-password',
+        default=defaults['password'],
+        help=password_help
+    )
+
+
+def resolve_cassandra_config(
+    args: Optional[Any] = None,
+    host: Optional[str] = None,
+    username: Optional[str] = None,
+    password: Optional[str] = None
+) -> Tuple[List[str], Optional[str], Optional[str]]:
+    """
+    Resolve Cassandra configuration from various sources.
+    
+    Can accept either argparse args object or explicit parameters.
+    Converts host string to list format for Cassandra driver.
+    
+    Args:
+        args: Optional argparse namespace with cassandra_host, cassandra_username, cassandra_password
+        host: Optional explicit host parameter (overrides args)
+        username: Optional explicit username parameter (overrides args)
+        password: Optional explicit password parameter (overrides args)
+    
+    Returns:
+        tuple: (hosts_list, username, password)
+    """
+    # If args provided, extract values
+    if args is not None:
+        host = host or getattr(args, 'cassandra_host', None)
+        username = username or getattr(args, 'cassandra_username', None)
+        password = password or getattr(args, 'cassandra_password', None)
+    
+    # Apply defaults if still None
+    defaults = get_cassandra_defaults()
+    host = host or defaults['host']
+    username = username or defaults['username']
+    password = password or defaults['password']
+    
+    # Convert host string to list
+    if isinstance(host, str):
+        hosts = [h.strip() for h in host.split(',') if h.strip()]
+    else:
+        hosts = host
+    
+    return hosts, username, password
+
+
+def get_cassandra_config_from_params(params: dict) -> Tuple[List[str], Optional[str], Optional[str]]:
+    """
+    Extract and resolve Cassandra configuration from a parameters dictionary.
+    
+    Handles both old graph_* and new cassandra_* parameter names for backward compatibility.
+    
+    Args:
+        params: Dictionary of parameters that may contain Cassandra configuration
+    
+    Returns:
+        tuple: (hosts_list, username, password)
+    """
+    # Check for new parameter names first
+    host = params.get('cassandra_host')
+    username = params.get('cassandra_username')
+    password = params.get('cassandra_password')
+    
+    # Fall back to old graph_* names for backward compatibility
+    if not host:
+        host = params.get('graph_host')
+    if not username:
+        username = params.get('graph_username', params.get('cassandra_user'))
+    if not password:
+        password = params.get('graph_password')
+    
+    # Use resolve function to handle defaults and list conversion
+    return resolve_cassandra_config(host=host, username=username, password=password)

{trustgraph_base-1.3.1 → trustgraph_base-1.3.3}/trustgraph/base/document_embeddings_client.py

@@ -27,7 +27,7 @@ class DocumentEmbeddingsClient(RequestResponse):
         if resp.error:
             raise RuntimeError(resp.error.message)
 
-        return resp.documents
+        return resp.chunks
 
 class DocumentEmbeddingsClientSpec(RequestResponseSpec):
     def __init__(

{trustgraph_base-1.3.1 → trustgraph_base-1.3.3}/trustgraph/base/document_embeddings_query_service.py

@@ -57,7 +57,7 @@ class DocumentEmbeddingsQueryService(FlowProcessor):
             docs = await self.query_document_embeddings(request)
 
             logger.debug("Sending document embeddings query response...")
-            r = DocumentEmbeddingsResponse(documents=docs, error=None)
+            r = DocumentEmbeddingsResponse(chunks=docs, error=None)
             await flow("response").send(r, properties={"id": id})
 
             logger.debug("Document embeddings query request completed")
@@ -73,7 +73,7 @@ class DocumentEmbeddingsQueryService(FlowProcessor):
                     type = "document-embeddings-query-error",
                     message = str(e),
                 ),
-                response=None,
+                chunks=None,
             )
 
             await flow("response").send(r, properties={"id": id})

trustgraph_base-1.3.3/trustgraph/base_version.py

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

{trustgraph_base-1.3.1 → trustgraph_base-1.3.3}/trustgraph/clients/document_embeddings_client.py

@@ -47,5 +47,5 @@ class DocumentEmbeddingsClient(BaseClient):
         return self.call(
             user=user, collection=collection,
             vectors=vectors, limit=limit, timeout=timeout
-        ).documents
+        ).chunks
 

{trustgraph_base-1.3.1 → trustgraph_base-1.3.3}/trustgraph/messaging/__init__.py

@@ -21,6 +21,7 @@ from .translators.embeddings_query import (
     DocumentEmbeddingsRequestTranslator, DocumentEmbeddingsResponseTranslator,
     GraphEmbeddingsRequestTranslator, GraphEmbeddingsResponseTranslator
 )
+from .translators.objects_query import ObjectsQueryRequestTranslator, ObjectsQueryResponseTranslator
 
 # Register all service translators
 TranslatorRegistry.register_service(
@@ -107,6 +108,12 @@ TranslatorRegistry.register_service(
     GraphEmbeddingsResponseTranslator()
 )
 
+TranslatorRegistry.register_service(
+    "objects-query", 
+    ObjectsQueryRequestTranslator(), 
+    ObjectsQueryResponseTranslator()
+)
+
 # Register single-direction translators for document loading
 TranslatorRegistry.register_request("document", DocumentTranslator())
 TranslatorRegistry.register_request("text-document", TextDocumentTranslator())

{trustgraph_base-1.3.1 → trustgraph_base-1.3.3}/trustgraph/messaging/translators/__init__.py

@@ -17,3 +17,4 @@ from .embeddings_query import (
     DocumentEmbeddingsRequestTranslator, DocumentEmbeddingsResponseTranslator,
     GraphEmbeddingsRequestTranslator, GraphEmbeddingsResponseTranslator
 )
+from .objects_query import ObjectsQueryRequestTranslator, ObjectsQueryResponseTranslator

{trustgraph_base-1.3.1 → trustgraph_base-1.3.3}/trustgraph/messaging/translators/embeddings_query.py

@@ -36,10 +36,10 @@ class DocumentEmbeddingsResponseTranslator(MessageTranslator):
     def from_pulsar(self, obj: DocumentEmbeddingsResponse) -> Dict[str, Any]:
         result = {}
         
-        if obj.documents:
-            result["documents"] = [
-                doc.decode("utf-8") if isinstance(doc, bytes) else doc
-                for doc in obj.documents
+        if obj.chunks is not None:
+            result["chunks"] = [
+                chunk.decode("utf-8") if isinstance(chunk, bytes) else chunk
+                for chunk in obj.chunks
             ]
         
         return result

trustgraph_base-1.3.3/trustgraph/messaging/translators/objects_query.py

@@ -0,0 +1,79 @@
+from typing import Dict, Any, Tuple, Optional
+from ...schema import ObjectsQueryRequest, ObjectsQueryResponse
+from .base import MessageTranslator
+import json
+
+
+class ObjectsQueryRequestTranslator(MessageTranslator):
+    """Translator for ObjectsQueryRequest schema objects"""
+    
+    def to_pulsar(self, data: Dict[str, Any]) -> ObjectsQueryRequest:
+        return ObjectsQueryRequest(
+            user=data.get("user", "trustgraph"),
+            collection=data.get("collection", "default"),
+            query=data.get("query", ""),
+            variables=data.get("variables", {}),
+            operation_name=data.get("operation_name", None)
+        )
+    
+    def from_pulsar(self, obj: ObjectsQueryRequest) -> Dict[str, Any]:
+        result = {
+            "user": obj.user,
+            "collection": obj.collection,
+            "query": obj.query,
+            "variables": dict(obj.variables) if obj.variables else {}
+        }
+        
+        if obj.operation_name:
+            result["operation_name"] = obj.operation_name
+            
+        return result
+
+
+class ObjectsQueryResponseTranslator(MessageTranslator):
+    """Translator for ObjectsQueryResponse schema objects"""
+    
+    def to_pulsar(self, data: Dict[str, Any]) -> ObjectsQueryResponse:
+        raise NotImplementedError("Response translation to Pulsar not typically needed")
+    
+    def from_pulsar(self, obj: ObjectsQueryResponse) -> Dict[str, Any]:
+        result = {}
+        
+        # Handle GraphQL response data
+        if obj.data:
+            try:
+                result["data"] = json.loads(obj.data)
+            except json.JSONDecodeError:
+                result["data"] = obj.data
+        else:
+            result["data"] = None
+        
+        # Handle GraphQL errors
+        if obj.errors:
+            result["errors"] = []
+            for error in obj.errors:
+                error_dict = {
+                    "message": error.message
+                }
+                if error.path:
+                    error_dict["path"] = list(error.path)
+                if error.extensions:
+                    error_dict["extensions"] = dict(error.extensions)
+                result["errors"].append(error_dict)
+        
+        # Handle extensions
+        if obj.extensions:
+            result["extensions"] = dict(obj.extensions)
+        
+        # Handle system-level error
+        if obj.error:
+            result["error"] = {
+                "type": obj.error.type,
+                "message": obj.error.message
+            }
+            
+        return result
+    
+    def from_response_with_completion(self, obj: ObjectsQueryResponse) -> Tuple[Dict[str, Any], bool]:
+        """Returns (response_dict, is_final)"""
+        return self.from_pulsar(obj), True

{trustgraph_base-1.3.1 → trustgraph_base-1.3.3}/trustgraph/schema/services/__init__.py

@@ -8,4 +8,5 @@ from .config import *
 from .library import *
 from .lookup import *
 from .nlp_query import *
-from .structured_query import *
+from .structured_query import *
+from .objects_query import *

{trustgraph_base-1.3.1 → trustgraph_base-1.3.3}/trustgraph/schema/services/agent.py

@@ -16,8 +16,8 @@ class AgentStep(Record):
 
 class AgentRequest(Record):
     question = String()
-    plan = String()
     state = String()
+    group = Array(String())
     history = Array(AgentStep())
 
 class AgentResponse(Record):

trustgraph_base-1.3.3/trustgraph/schema/services/objects_query.py

@@ -0,0 +1,28 @@
+from pulsar.schema import Record, String, Map, Array
+
+from ..core.primitives import Error
+from ..core.topic import topic
+
+############################################################################
+
+# Objects Query Service - executes GraphQL queries against structured data
+
+class GraphQLError(Record):
+    message = String()
+    path = Array(String())       # Path to the field that caused the error
+    extensions = Map(String())   # Additional error metadata
+
+class ObjectsQueryRequest(Record):
+    user = String()              # Cassandra keyspace (follows pattern from TriplesQueryRequest)
+    collection = String()        # Data collection identifier (required for partition key)
+    query = String()             # GraphQL query string
+    variables = Map(String())    # GraphQL variables
+    operation_name = String()    # Operation to execute for multi-operation documents
+
+class ObjectsQueryResponse(Record):
+    error = Error()              # System-level error (connection, timeout, etc.)
+    data = String()              # JSON-encoded GraphQL response data
+    errors = Array(GraphQLError()) # GraphQL field-level errors
+    extensions = Map(String())   # Query metadata (execution time, etc.)
+
+############################################################################

{trustgraph_base-1.3.1 → trustgraph_base-1.3.3}/trustgraph/schema/services/query.py

@@ -45,4 +45,11 @@ class DocumentEmbeddingsRequest(Record):
 
 class DocumentEmbeddingsResponse(Record):
     error = Error()
-    chunks = Array(String())
+    chunks = Array(String())
+
+document_embeddings_request_queue = topic(
+    "non-persistent://trustgraph/document-embeddings-request"
+)
+document_embeddings_response_queue = topic(
+    "non-persistent://trustgraph/document-embeddings-response"
+)

{trustgraph_base-1.3.1 → trustgraph_base-1.3.3}/trustgraph_base.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: trustgraph-base
-Version: 1.3.1
+Version: 1.3.3
 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-1.3.1 → trustgraph_base-1.3.3}/trustgraph_base.egg-info/SOURCES.txt

@@ -16,6 +16,7 @@ trustgraph/base/__init__.py
 trustgraph/base/agent_client.py
 trustgraph/base/agent_service.py
 trustgraph/base/async_processor.py
+trustgraph/base/cassandra_config.py
 trustgraph/base/consumer.py
 trustgraph/base/consumer_spec.py
 trustgraph/base/document_embeddings_client.py
@@ -78,6 +79,7 @@ trustgraph/messaging/translators/flow.py
 trustgraph/messaging/translators/knowledge.py
 trustgraph/messaging/translators/library.py
 trustgraph/messaging/translators/metadata.py
+trustgraph/messaging/translators/objects_query.py
 trustgraph/messaging/translators/primitives.py
 trustgraph/messaging/translators/prompt.py
 trustgraph/messaging/translators/retrieval.py
@@ -109,6 +111,7 @@ trustgraph/schema/services/library.py
 trustgraph/schema/services/llm.py
 trustgraph/schema/services/lookup.py
 trustgraph/schema/services/nlp_query.py
+trustgraph/schema/services/objects_query.py
 trustgraph/schema/services/prompt.py
 trustgraph/schema/services/query.py
 trustgraph/schema/services/retrieval.py

trustgraph_base-1.3.1/trustgraph/base_version.py

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