trustgraph-flow 1.3.3__tar.gz → 1.3.5__tar.gz

{trustgraph_flow-1.3.3 → trustgraph_flow-1.3.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: trustgraph-flow
-Version: 1.3.3
+Version: 1.3.5
 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_flow-1.3.3 → trustgraph_flow-1.3.5}/trustgraph/config/service/config.py

@@ -45,13 +45,13 @@ class Configuration:
 
     # FIXME: Some version vs config race conditions
 
-    def __init__(self, push, host, user, password, keyspace):
+    def __init__(self, push, host, username, password, keyspace):
 
         # External function to respond to update
         self.push = push
 
         self.table_store = ConfigTableStore(
-            host, user, password, keyspace
+            host, username, password, keyspace
         )
 
     async def inc_version(self):

{trustgraph_flow-1.3.3 → trustgraph_flow-1.3.5}/trustgraph/config/service/service.py

@@ -61,7 +61,7 @@ class Processor(AsyncProcessor):
         )
 
         cassandra_host = params.get("cassandra_host", default_cassandra_host)
-        cassandra_user = params.get("cassandra_user")
+        cassandra_username = params.get("cassandra_username")
         cassandra_password = params.get("cassandra_password")
 
         id = params.get("id")
@@ -77,7 +77,7 @@ class Processor(AsyncProcessor):
                 "flow_request_schema": FlowRequest.__name__,
                 "flow_response_schema": FlowResponse.__name__,
                 "cassandra_host": cassandra_host,
-                "cassandra_user": cassandra_user,
+                "cassandra_username": cassandra_username,
             }
         )
 
@@ -143,7 +143,7 @@ class Processor(AsyncProcessor):
 
         self.config = Configuration(
             host = cassandra_host.split(","),
-            user = cassandra_user,
+            username = cassandra_username,
             password = cassandra_password,
             keyspace = keyspace,
             push = self.push

{trustgraph_flow-1.3.3 → trustgraph_flow-1.3.5}/trustgraph/cores/knowledge.py

@@ -16,12 +16,12 @@ logger = logging.getLogger(__name__)
 class KnowledgeManager:
 
     def __init__(
-            self, cassandra_host, cassandra_user, cassandra_password,
+            self, cassandra_host, cassandra_username, cassandra_password,
             keyspace, flow_config,
     ):
 
         self.table_store = KnowledgeTableStore(
-            cassandra_host, cassandra_user, cassandra_password, keyspace
+            cassandra_host, cassandra_username, cassandra_password, keyspace
         )
 
         self.loader_queue = asyncio.Queue(maxsize=20)

{trustgraph_flow-1.3.3 → trustgraph_flow-1.3.5}/trustgraph/cores/service.py

@@ -50,7 +50,7 @@ class Processor(AsyncProcessor):
         )
 
         cassandra_host = params.get("cassandra_host", default_cassandra_host)
-        cassandra_user = params.get("cassandra_user")
+        cassandra_username = params.get("cassandra_username")
         cassandra_password = params.get("cassandra_password")
 
         super(Processor, self).__init__(
@@ -90,7 +90,7 @@ class Processor(AsyncProcessor):
 
         self.knowledge = KnowledgeManager(
             cassandra_host = cassandra_host.split(","),
-            cassandra_user = cassandra_user,
+            cassandra_username = cassandra_username,
             cassandra_password = cassandra_password,
             keyspace = keyspace,
             flow_config = self,

trustgraph_flow-1.3.5/trustgraph/flow_version.py

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

{trustgraph_flow-1.3.3 → trustgraph_flow-1.3.5}/trustgraph/librarian/librarian.py

@@ -16,7 +16,7 @@ class Librarian:
 
     def __init__(
             self,
-            cassandra_host, cassandra_user, cassandra_password,
+            cassandra_host, cassandra_username, cassandra_password,
             minio_host, minio_access_key, minio_secret_key,
             bucket_name, keyspace, load_document,
     ):
@@ -26,7 +26,7 @@ class Librarian:
         )
 
         self.table_store = LibraryTableStore(
-            cassandra_host, cassandra_user, cassandra_password, keyspace
+            cassandra_host, cassandra_username, cassandra_password, keyspace
         )
 
         self.load_document = load_document

{trustgraph_flow-1.3.3 → trustgraph_flow-1.3.5}/trustgraph/librarian/service.py

@@ -67,7 +67,7 @@ class Processor(AsyncProcessor):
         )
 
         cassandra_host = params.get("cassandra_host", default_cassandra_host)
-        cassandra_user = params.get("cassandra_user")
+        cassandra_username = params.get("cassandra_username")
         cassandra_password = params.get("cassandra_password")
 
         super(Processor, self).__init__(
@@ -77,7 +77,7 @@ class Processor(AsyncProcessor):
                 "minio_host": minio_host,
                 "minio_access_key": minio_access_key,
                 "cassandra_host": cassandra_host,
-                "cassandra_user": cassandra_user,
+                "cassandra_username": cassandra_username,
             }
         )
 
@@ -109,7 +109,7 @@ class Processor(AsyncProcessor):
 
         self.librarian = Librarian(
             cassandra_host = cassandra_host.split(","),
-            cassandra_user = cassandra_user,
+            cassandra_username = cassandra_username,
             cassandra_password = cassandra_password,
             minio_host = minio_host,
             minio_access_key = minio_access_key,

{trustgraph_flow-1.3.3 → trustgraph_flow-1.3.5}/trustgraph/query/objects/cassandra/service.py

@@ -21,12 +21,12 @@ from strawberry.tools import create_type
 from .... schema import ObjectsQueryRequest, ObjectsQueryResponse, GraphQLError
 from .... schema import Error, RowSchema, Field as SchemaField
 from .... base import FlowProcessor, ConsumerSpec, ProducerSpec
+from .... base.cassandra_config import add_cassandra_args, resolve_cassandra_config
 
 # Module logger
 logger = logging.getLogger(__name__)
 
 default_ident = "objects-query"
-default_graph_host = 'localhost'
 
 # GraphQL filter input types
 @strawberry.input
@@ -68,10 +68,22 @@ class Processor(FlowProcessor):
         
         id = params.get("id", default_ident)
         
-        # Cassandra connection parameters
-        self.graph_host = params.get("graph_host", default_graph_host)
-        self.graph_username = params.get("graph_username", None)
-        self.graph_password = params.get("graph_password", None)
+        # Get Cassandra parameters
+        cassandra_host = params.get("cassandra_host")
+        cassandra_username = params.get("cassandra_username")
+        cassandra_password = params.get("cassandra_password")
+        
+        # Resolve configuration with environment variable fallback
+        hosts, username, password = resolve_cassandra_config(
+            host=cassandra_host,
+            username=cassandra_username,
+            password=cassandra_password
+        )
+        
+        # Store resolved configuration with proper names
+        self.cassandra_host = hosts  # Store as list
+        self.cassandra_username = username
+        self.cassandra_password = password
         
         # Config key for schemas
         self.config_key = params.get("config_type", "schema")
@@ -124,20 +136,20 @@ class Processor(FlowProcessor):
             return
             
         try:
-            if self.graph_username and self.graph_password:
+            if self.cassandra_username and self.cassandra_password:
                 auth_provider = PlainTextAuthProvider(
-                    username=self.graph_username,
-                    password=self.graph_password
+                    username=self.cassandra_username,
+                    password=self.cassandra_password
                 )
                 self.cluster = Cluster(
-                    contact_points=[self.graph_host],
+                    contact_points=self.cassandra_host,
                     auth_provider=auth_provider
                 )
             else:
-                self.cluster = Cluster(contact_points=[self.graph_host])
+                self.cluster = Cluster(contact_points=self.cassandra_host)
             
             self.session = self.cluster.connect()
-            logger.info(f"Connected to Cassandra cluster at {self.graph_host}")
+            logger.info(f"Connected to Cassandra cluster at {self.cassandra_host}")
             
         except Exception as e:
             logger.error(f"Failed to connect to Cassandra: {e}", exc_info=True)
@@ -399,7 +411,6 @@ class Processor(FlowProcessor):
             def make_resolver(s_name, r_schema, g_type, f_type, sort_enum):
                 async def resolver(
                     info: Info,
-                    collection: str,
                     where: Optional[f_type] = None,
                     order_by: Optional[str] = None,
                     direction: Optional[sort_enum] = None,
@@ -408,6 +419,7 @@ class Processor(FlowProcessor):
                     # Get the processor instance from context
                     processor = info.context["processor"]
                     user = info.context["user"]
+                    collection = info.context["collection"]
                     
                     # Parse the idiomatic where clause
                     filters = processor.parse_idiomatic_where_clause(where)
@@ -712,24 +724,7 @@ class Processor(FlowProcessor):
         """Add command-line arguments"""
         
         FlowProcessor.add_args(parser)
-        
-        parser.add_argument(
-            '-g', '--graph-host',
-            default=default_graph_host,
-            help=f'Cassandra host (default: {default_graph_host})'
-        )
-        
-        parser.add_argument(
-            '--graph-username',
-            default=None,
-            help='Cassandra username'
-        )
-        
-        parser.add_argument(
-            '--graph-password',
-            default=None,
-            help='Cassandra password'
-        )
+        add_cassandra_args(parser)
         
         parser.add_argument(
             '--config-type',

{trustgraph_flow-1.3.3 → trustgraph_flow-1.3.5}/trustgraph/query/triples/cassandra/service.py

@@ -22,10 +22,10 @@ class Processor(TriplesQueryService):
 
     def __init__(self, **params):
 
-        # Use new parameter names, fall back to old for compatibility
-        cassandra_host = params.get("cassandra_host", params.get("graph_host"))
-        cassandra_username = params.get("cassandra_username", params.get("graph_username"))
-        cassandra_password = params.get("cassandra_password", params.get("graph_password"))
+        # Get Cassandra parameters
+        cassandra_host = params.get("cassandra_host")
+        cassandra_username = params.get("cassandra_username")
+        cassandra_password = params.get("cassandra_password")
 
         # Resolve configuration with environment variable fallback
         hosts, username, password = resolve_cassandra_config(
@@ -41,9 +41,9 @@ class Processor(TriplesQueryService):
             }
         )
 
-        self.graph_host = hosts
-        self.username = username
-        self.password = password
+        self.cassandra_host = hosts
+        self.cassandra_username = username
+        self.cassandra_password = password
         self.table = None
 
     def create_value(self, ent):
@@ -59,15 +59,15 @@ class Processor(TriplesQueryService):
             table = (query.user, query.collection)
 
             if table != self.table:
-                if self.username and self.password:
+                if self.cassandra_username and self.cassandra_password:
                     self.tg = TrustGraph(
-                        hosts=self.graph_host,
+                        hosts=self.cassandra_host,
                         keyspace=query.user, table=query.collection,
-                        username=self.username, password=self.password
+                        username=self.cassandra_username, password=self.cassandra_password
                     )
                 else:
                     self.tg = TrustGraph(
-                        hosts=self.graph_host,
+                        hosts=self.cassandra_host,
                         keyspace=query.user, table=query.collection,
                     )
                 self.table = table

{trustgraph_flow-1.3.3 → trustgraph_flow-1.3.5}/trustgraph/storage/knowledge/store.py

@@ -25,7 +25,7 @@ class Processor(FlowProcessor):
         # Use helper to resolve configuration
         hosts, username, password = resolve_cassandra_config(
             host=params.get("cassandra_host"),
-            username=params.get("cassandra_user", params.get("cassandra_username")),
+            username=params.get("cassandra_username"),
             password=params.get("cassandra_password")
         )
 
@@ -55,7 +55,7 @@ class Processor(FlowProcessor):
 
         self.table_store = KnowledgeTableStore(
             cassandra_host = hosts,
-            cassandra_user = username,
+            cassandra_username = username,
             cassandra_password = password,
             keyspace = keyspace,
         )

{trustgraph_flow-1.3.3 → trustgraph_flow-1.3.5}/trustgraph/storage/objects/cassandra/write.py

@@ -27,10 +27,10 @@ class Processor(FlowProcessor):
         
         id = params.get("id", default_ident)
         
-        # Use new parameter names, fall back to old for compatibility
-        cassandra_host = params.get("cassandra_host", params.get("graph_host"))
-        cassandra_username = params.get("cassandra_username", params.get("graph_username"))
-        cassandra_password = params.get("cassandra_password", params.get("graph_password"))
+        # Get Cassandra parameters
+        cassandra_host = params.get("cassandra_host")
+        cassandra_username = params.get("cassandra_username")
+        cassandra_password = params.get("cassandra_password")
         
         # Resolve configuration with environment variable fallback
         hosts, username, password = resolve_cassandra_config(
@@ -39,10 +39,10 @@ class Processor(FlowProcessor):
             password=cassandra_password
         )
         
-        # Store resolved configuration
-        self.graph_host = hosts  # Store as list
-        self.graph_username = username
-        self.graph_password = password
+        # Store resolved configuration with proper names
+        self.cassandra_host = hosts  # Store as list
+        self.cassandra_username = username
+        self.cassandra_password = password
         
         # Config key for schemas
         self.config_key = params.get("config_type", "schema")
@@ -82,20 +82,20 @@ class Processor(FlowProcessor):
             return
             
         try:
-            if self.graph_username and self.graph_password:
+            if self.cassandra_username and self.cassandra_password:
                 auth_provider = PlainTextAuthProvider(
-                    username=self.graph_username,
-                    password=self.graph_password
+                    username=self.cassandra_username,
+                    password=self.cassandra_password
                 )
                 self.cluster = Cluster(
-                    contact_points=self.graph_host,
+                    contact_points=self.cassandra_host,
                     auth_provider=auth_provider
                 )
             else:
-                self.cluster = Cluster(contact_points=self.graph_host)
+                self.cluster = Cluster(contact_points=self.cassandra_host)
             
             self.session = self.cluster.connect()
-            logger.info(f"Connected to Cassandra cluster at {self.graph_host}")
+            logger.info(f"Connected to Cassandra cluster at {self.cassandra_host}")
             
         except Exception as e:
             logger.error(f"Failed to connect to Cassandra: {e}", exc_info=True)

{trustgraph_flow-1.3.3 → trustgraph_flow-1.3.5}/trustgraph/storage/rows/cassandra/write.py

@@ -36,10 +36,10 @@ class Processor(Consumer):
         input_queue = params.get("input_queue", default_input_queue)
         subscriber = params.get("subscriber", default_subscriber)
         
-        # Use new parameter names, fall back to old for compatibility
-        cassandra_host = params.get("cassandra_host", params.get("graph_host"))
-        cassandra_username = params.get("cassandra_username", params.get("graph_username"))
-        cassandra_password = params.get("cassandra_password", params.get("graph_password"))
+        # Get Cassandra parameters
+        cassandra_host = params.get("cassandra_host")
+        cassandra_username = params.get("cassandra_username")
+        cassandra_password = params.get("cassandra_password")
         
         # Resolve configuration with environment variable fallback
         hosts, username, password = resolve_cassandra_config(

{trustgraph_flow-1.3.3 → trustgraph_flow-1.3.5}/trustgraph/storage/triples/cassandra/write.py

@@ -26,10 +26,10 @@ class Processor(TriplesStoreService):
         
         id = params.get("id", default_ident)
 
-        # Use new parameter names, fall back to old for compatibility
-        cassandra_host = params.get("cassandra_host", params.get("graph_host"))
-        cassandra_username = params.get("cassandra_username", params.get("graph_username"))
-        cassandra_password = params.get("cassandra_password", params.get("graph_password"))
+        # Get Cassandra parameters
+        cassandra_host = params.get("cassandra_host")
+        cassandra_username = params.get("cassandra_username")
+        cassandra_password = params.get("cassandra_password")
 
         # Resolve configuration with environment variable fallback
         hosts, username, password = resolve_cassandra_config(
@@ -45,9 +45,9 @@ class Processor(TriplesStoreService):
             }
         )
         
-        self.graph_host = hosts
-        self.username = username
-        self.password = password
+        self.cassandra_host = hosts
+        self.cassandra_username = username
+        self.cassandra_password = password
         self.table = None
 
     async def store_triples(self, message):
@@ -59,16 +59,16 @@ class Processor(TriplesStoreService):
             self.tg = None
 
             try:
-                if self.username and self.password:
+                if self.cassandra_username and self.cassandra_password:
                     self.tg = TrustGraph(
-                        hosts=self.graph_host,
+                        hosts=self.cassandra_host,
                         keyspace=message.metadata.user,
                         table=message.metadata.collection,
-                        username=self.username, password=self.password
+                        username=self.cassandra_username, password=self.cassandra_password
                     )
                 else:
                     self.tg = TrustGraph(
-                        hosts=self.graph_host,
+                        hosts=self.cassandra_host,
                         keyspace=message.metadata.user,
                         table=message.metadata.collection,
                     )

{trustgraph_flow-1.3.3 → trustgraph_flow-1.3.5}/trustgraph/tables/config.py

@@ -17,7 +17,7 @@ class ConfigTableStore:
 
     def __init__(
             self,
-            cassandra_host, cassandra_user, cassandra_password, keyspace,
+            cassandra_host, cassandra_username, cassandra_password, keyspace,
     ):
 
         self.keyspace = keyspace
@@ -28,10 +28,10 @@ class ConfigTableStore:
         if isinstance(cassandra_host, str):
             cassandra_host = [h.strip() for h in cassandra_host.split(',')]
 
-        if cassandra_user and cassandra_password:
+        if cassandra_username and cassandra_password:
             ssl_context = SSLContext(PROTOCOL_TLSv1_2)
             auth_provider = PlainTextAuthProvider(
-                username=cassandra_user, password=cassandra_password
+                username=cassandra_username, password=cassandra_password
             )
             self.cluster = Cluster(
                 cassandra_host,

{trustgraph_flow-1.3.3 → trustgraph_flow-1.3.5}/trustgraph/tables/knowledge.py

@@ -17,7 +17,7 @@ class KnowledgeTableStore:
 
     def __init__(
             self,
-            cassandra_host, cassandra_user, cassandra_password, keyspace,
+            cassandra_host, cassandra_username, cassandra_password, keyspace,
     ):
 
         self.keyspace = keyspace
@@ -28,10 +28,10 @@ class KnowledgeTableStore:
         if isinstance(cassandra_host, str):
             cassandra_host = [h.strip() for h in cassandra_host.split(',')]
 
-        if cassandra_user and cassandra_password:
+        if cassandra_username and cassandra_password:
             ssl_context = SSLContext(PROTOCOL_TLSv1_2)
             auth_provider = PlainTextAuthProvider(
-                username=cassandra_user, password=cassandra_password
+                username=cassandra_username, password=cassandra_password
             )
             self.cluster = Cluster(
                 cassandra_host,

{trustgraph_flow-1.3.3 → trustgraph_flow-1.3.5}/trustgraph/tables/library.py

@@ -21,7 +21,7 @@ class LibraryTableStore:
 
     def __init__(
             self,
-            cassandra_host, cassandra_user, cassandra_password, keyspace,
+            cassandra_host, cassandra_username, cassandra_password, keyspace,
     ):
 
         self.keyspace = keyspace
@@ -32,10 +32,10 @@ class LibraryTableStore:
         if isinstance(cassandra_host, str):
             cassandra_host = [h.strip() for h in cassandra_host.split(',')]
 
-        if cassandra_user and cassandra_password:
+        if cassandra_username and cassandra_password:
             ssl_context = SSLContext(PROTOCOL_TLSv1_2)
             auth_provider = PlainTextAuthProvider(
-                username=cassandra_user, password=cassandra_password
+                username=cassandra_username, password=cassandra_password
             )
             self.cluster = Cluster(
                 cassandra_host,

{trustgraph_flow-1.3.3 → trustgraph_flow-1.3.5}/trustgraph_flow.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: trustgraph-flow
-Version: 1.3.3
+Version: 1.3.5
 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_flow-1.3.3/trustgraph/flow_version.py

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