trustgraph-flow 0.20.11__tar.gz → 0.21.0__tar.gz

{trustgraph-flow-0.20.11 → trustgraph-flow-0.21.0}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: trustgraph-flow
-Version: 0.20.11
+Version: 0.21.0
 Summary: TrustGraph provides a means to run a pipeline of flexible AI processing components in a flexible means to achieve a processing pipeline.
 Home-page: https://github.com/trustgraph-ai/trustgraph
-Download-URL: https://github.com/trustgraph-ai/trustgraph/archive/refs/tags/v0.20.11.tar.gz
+Download-URL: https://github.com/trustgraph-ai/trustgraph/archive/refs/tags/v0.21.0.tar.gz
 Author: trustgraph.ai
 Author-email: security@trustgraph.ai
 Classifier: Programming Language :: Python :: 3

{trustgraph-flow-0.20.11 → trustgraph-flow-0.21.0}/setup.py

@@ -34,7 +34,7 @@ setuptools.setup(
     python_requires='>=3.8',
     download_url = "https://github.com/trustgraph-ai/trustgraph/archive/refs/tags/v" + version + ".tar.gz",
     install_requires=[
-        "trustgraph-base>=0.20,<0.21",
+        "trustgraph-base>=0.21,<0.22",
         "aiohttp",
         "anthropic",
         "cassandra-driver",

{trustgraph-flow-0.20.11 → trustgraph-flow-0.21.0}/trustgraph/direct/cassandra.py

@@ -6,7 +6,7 @@ class TrustGraph:
 
     def __init__(
             self, hosts=None,
-            keyspace="trustgraph", table="default",
+            keyspace="trustgraph", table="default", username=None, password=None
     ):
 
         if hosts is None:
@@ -14,8 +14,13 @@ class TrustGraph:
 
         self.keyspace = keyspace
         self.table = table
+        self.username = username
             
-        self.cluster = Cluster(hosts)
+        if username and password:
+            auth_provider = PlainTextAuthProvider(username=username, password=password)
+            self.cluster = Cluster(hosts, auth_provider=auth_provider)
+        else:
+            self.cluster = Cluster(hosts)
         self.session = self.cluster.connect()
 
         self.init()

trustgraph-flow-0.21.0/trustgraph/flow_version.py

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

{trustgraph-flow-0.20.11 → trustgraph-flow-0.21.0}/trustgraph/query/doc_embeddings/qdrant/service.py

@@ -30,6 +30,8 @@ class Processor(ConsumerProducer):
         output_queue = params.get("output_queue", default_output_queue)
         subscriber = params.get("subscriber", default_subscriber)
         store_uri = params.get("store_uri", default_store_uri)
+        #optional api key
+        api_key = params.get("api_key", None)
 
         super(Processor, self).__init__(
             **params | {
@@ -39,10 +41,11 @@ class Processor(ConsumerProducer):
                 "input_schema": DocumentEmbeddingsRequest,
                 "output_schema": DocumentEmbeddingsResponse,
                 "store_uri": store_uri,
+                "api_key": api_key,
             }
         )
 
-        self.client = QdrantClient(url=store_uri)
+        self.client = QdrantClient(url=store_uri, api_key=api_key)
 
     def handle(self, msg):
 
@@ -111,7 +114,13 @@ class Processor(ConsumerProducer):
         parser.add_argument(
             '-t', '--store-uri',
             default=default_store_uri,
-            help=f'Milvus store URI (default: {default_store_uri})'
+            help=f'Qdrant store URI (default: {default_store_uri})'
+        )
+        
+        parser.add_argument(
+            '-k', '--api-key',
+            default=None,
+            help=f'API key for qdrant (default: None)'
         )
 
 def run():

{trustgraph-flow-0.20.11 → trustgraph-flow-0.21.0}/trustgraph/query/graph_embeddings/qdrant/service.py

@@ -30,6 +30,7 @@ class Processor(ConsumerProducer):
         output_queue = params.get("output_queue", default_output_queue)
         subscriber = params.get("subscriber", default_subscriber)
         store_uri = params.get("store_uri", default_store_uri)
+        api_key = params.get("api_key", None)
 
         super(Processor, self).__init__(
             **params | {
@@ -39,10 +40,11 @@ class Processor(ConsumerProducer):
                 "input_schema": GraphEmbeddingsRequest,
                 "output_schema": GraphEmbeddingsResponse,
                 "store_uri": store_uri,
+                "api_key": api_key,
             }
         )
 
-        self.client = QdrantClient(url=store_uri)
+        self.client = QdrantClient(url=store_uri, api_key=api_key)
 
     def create_value(self, ent):
         if ent.startswith("http://") or ent.startswith("https://"):
@@ -137,7 +139,13 @@ class Processor(ConsumerProducer):
         parser.add_argument(
             '-t', '--store-uri',
             default=default_store_uri,
-            help=f'Milvus store URI (default: {default_store_uri})'
+            help=f'Qdrant store URI (default: {default_store_uri})'
+        )
+        
+        parser.add_argument(
+            '-k', '--api-key',
+            default=None,
+            help=f'API key for qdrant (default: None)'
         )
 
 def run():

{trustgraph-flow-0.20.11 → trustgraph-flow-0.21.0}/trustgraph/query/triples/cassandra/service.py

@@ -26,6 +26,8 @@ class Processor(ConsumerProducer):
         output_queue = params.get("output_queue", default_output_queue)
         subscriber = params.get("subscriber", default_subscriber)
         graph_host = params.get("graph_host", default_graph_host)
+        graph_username = params.get("graph_username", None)
+        graph_password = params.get("graph_password", None)
 
         super(Processor, self).__init__(
             **params | {
@@ -35,10 +37,14 @@ class Processor(ConsumerProducer):
                 "input_schema": TriplesQueryRequest,
                 "output_schema": TriplesQueryResponse,
                 "graph_host": graph_host,
+                "graph_username": graph_username,
+                "graph_password": graph_password,
             }
         )
 
         self.graph_host = [graph_host]
+        self.username = graph_username
+        self.password = graph_password
         self.table = None
 
     def create_value(self, ent):
@@ -56,10 +62,17 @@ class Processor(ConsumerProducer):
             table = (v.user, v.collection)
 
             if table != self.table:
-                self.tg = TrustGraph(
-                    hosts=self.graph_host,
-                    keyspace=v.user, table=v.collection,
-                )
+                if self.username and self.password:
+                    self.tg = TrustGraph(
+                        hosts=self.graph_host,
+                        keyspace=v.user, table=v.collection,
+                        username=self.username, password=self.password
+                    )
+                else:
+                    self.tg = TrustGraph(
+                        hosts=self.graph_host,
+                        keyspace=v.user, table=v.collection,
+                    )
                 self.table = table
 
             # Sender-produced ID
@@ -176,6 +189,19 @@ class Processor(ConsumerProducer):
             default="localhost",
             help=f'Graph host (default: localhost)'
         )
+        
+        parser.add_argument(
+            '--graph-username',
+            default=None,
+            help=f'Cassandra username'
+        )
+        
+        parser.add_argument(
+            '--graph-password',
+            default=None,
+            help=f'Cassandra password'
+        )
+
 
 def run():
 

{trustgraph-flow-0.20.11 → trustgraph-flow-0.21.0}/trustgraph/storage/doc_embeddings/qdrant/write.py

@@ -26,6 +26,7 @@ class Processor(Consumer):
         input_queue = params.get("input_queue", default_input_queue)
         subscriber = params.get("subscriber", default_subscriber)
         store_uri = params.get("store_uri", default_store_uri)
+        api_key = params.get("api_key", None)
 
         super(Processor, self).__init__(
             **params | {
@@ -33,6 +34,7 @@ class Processor(Consumer):
                 "subscriber": subscriber,
                 "input_schema": DocumentEmbeddings,
                 "store_uri": store_uri,
+                "api_key": api_key,
             }
         )
 
@@ -97,7 +99,13 @@ class Processor(Consumer):
         parser.add_argument(
             '-t', '--store-uri',
             default=default_store_uri,
-            help=f'Qdrant store URI (default: {default_store_uri})'
+            help=f'Qdrant URI (default: {default_store_uri})'
+        )
+        
+        parser.add_argument(
+            '-k', '--api-key',
+            default=None,
+            help=f'Qdrant API key (default: None)'
         )
 
 def run():

{trustgraph-flow-0.20.11 → trustgraph-flow-0.21.0}/trustgraph/storage/graph_embeddings/qdrant/write.py

@@ -26,6 +26,7 @@ class Processor(Consumer):
         input_queue = params.get("input_queue", default_input_queue)
         subscriber = params.get("subscriber", default_subscriber)
         store_uri = params.get("store_uri", default_store_uri)
+        api_key = params.get("api_key", None)
 
         super(Processor, self).__init__(
             **params | {
@@ -33,12 +34,13 @@ class Processor(Consumer):
                 "subscriber": subscriber,
                 "input_schema": GraphEmbeddings,
                 "store_uri": store_uri,
+                "api_key": api_key,
             }
         )
 
         self.last_collection = None
 
-        self.client = QdrantClient(url=store_uri)
+        self.client = QdrantClient(url=store_uri, api_key=api_key)
 
     def get_collection(self, dim, user, collection):
 
@@ -106,6 +108,12 @@ class Processor(Consumer):
             default=default_store_uri,
             help=f'Qdrant store URI (default: {default_store_uri})'
         )
+        
+        parser.add_argument(
+            '-k', '--api-key',
+            default=None,
+            help=f'Qdrant API key'
+        )
 
 def run():
 

{trustgraph-flow-0.20.11 → trustgraph-flow-0.21.0}/trustgraph/storage/rows/cassandra/write.py

@@ -29,6 +29,8 @@ class Processor(Consumer):
         input_queue = params.get("input_queue", default_input_queue)
         subscriber = params.get("subscriber", default_subscriber)
         graph_host = params.get("graph_host", default_graph_host)
+        graph_username = params.get("graph_username", None)
+        graph_password = params.get("graph_password", None)
 
         super(Processor, self).__init__(
             **params | {
@@ -36,10 +38,16 @@ class Processor(Consumer):
                 "subscriber": subscriber,
                 "input_schema": Rows,
                 "graph_host": graph_host,
+                "graph_username": graph_username,
+                "graph_password": graph_password,
             }
         )
-
-        self.cluster = Cluster(graph_host.split(","))
+        
+        if graph_username and graph_password:
+            auth_provider = PlainTextAuthProvider(username=graph_username, password=graph_password)
+            self.cluster = Cluster(graph_host.split(","), auth_provider=auth_provider)
+        else:
+            self.cluster = Cluster(graph_host.split(","))
         self.session = self.cluster.connect()
 
         self.tables = set()
@@ -120,6 +128,18 @@ class Processor(Consumer):
             default="localhost",
             help=f'Graph host (default: localhost)'
         )
+        
+        parser.add_argument(
+            '--graph-username',
+            default=None,
+            help=f'Cassandra username'
+        )
+        
+        parser.add_argument(
+            '--graph-password',
+            default=None,
+            help=f'Cassandra password'
+        )
 
 def run():
 

{trustgraph-flow-0.20.11 → trustgraph-flow-0.21.0}/trustgraph/storage/triples/cassandra/write.py

@@ -28,6 +28,8 @@ class Processor(Consumer):
         input_queue = params.get("input_queue", default_input_queue)
         subscriber = params.get("subscriber", default_subscriber)
         graph_host = params.get("graph_host", default_graph_host)
+        graph_username = params.get("graph_username", None)
+        graph_password = params.get("graph_password", None)
 
         super(Processor, self).__init__(
             **params | {
@@ -35,10 +37,14 @@ class Processor(Consumer):
                 "subscriber": subscriber,
                 "input_schema": Triples,
                 "graph_host": graph_host,
+                "graph_username": graph_username,
+                "graph_password": graph_password,
             }
         )
-
+        
         self.graph_host = [graph_host]
+        self.username = graph_username
+        self.password = graph_password
         self.table = None
 
     def handle(self, msg):
@@ -52,10 +58,17 @@ class Processor(Consumer):
             self.tg = None
 
             try:
-                self.tg = TrustGraph(
-                    hosts=self.graph_host,
-                    keyspace=v.metadata.user, table=v.metadata.collection,
-                )
+                if self.username and self.password:
+                    self.tg = TrustGraph(
+                        hosts=self.graph_host,
+                        keyspace=v.metadata.user, table=v.metadata.collection,
+                        username=self.username, password=self.password
+                    )
+                else:
+                    self.tg = TrustGraph(
+                        hosts=self.graph_host,
+                        keyspace=v.metadata.user, table=v.metadata.collection,
+                    )
             except Exception as e:
                 print("Exception", e, flush=True)
                 time.sleep(1)
@@ -82,6 +95,18 @@ class Processor(Consumer):
             default="localhost",
             help=f'Graph host (default: localhost)'
         )
+        
+        parser.add_argument(
+            '--graph-username',
+            default=None,
+            help=f'Cassandra username'
+        )
+        
+        parser.add_argument(
+            '--graph-password',
+            default=None,
+            help=f'Cassandra password'
+        )
 
 def run():
 

{trustgraph-flow-0.20.11 → trustgraph-flow-0.21.0}/trustgraph_flow.egg-info/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: trustgraph-flow
-Version: 0.20.11
+Version: 0.21.0
 Summary: TrustGraph provides a means to run a pipeline of flexible AI processing components in a flexible means to achieve a processing pipeline.
 Home-page: https://github.com/trustgraph-ai/trustgraph
-Download-URL: https://github.com/trustgraph-ai/trustgraph/archive/refs/tags/v0.20.11.tar.gz
+Download-URL: https://github.com/trustgraph-ai/trustgraph/archive/refs/tags/v0.21.0.tar.gz
 Author: trustgraph.ai
 Author-email: security@trustgraph.ai
 Classifier: Programming Language :: Python :: 3

{trustgraph-flow-0.20.11 → trustgraph-flow-0.21.0}/trustgraph_flow.egg-info/requires.txt

@@ -26,5 +26,5 @@ rdflib
 requests
 tabulate
 tiktoken
-trustgraph-base<0.21,>=0.20
+trustgraph-base<0.22,>=0.21
 urllib3

trustgraph-flow-0.20.11/trustgraph/flow_version.py

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