diff --git a/trustgraph-flow/trustgraph/query/doc_embeddings/milvus/service.py b/trustgraph-flow/trustgraph/query/doc_embeddings/milvus/service.py index 0148a98d..dab4a892 100755 --- a/trustgraph-flow/trustgraph/query/doc_embeddings/milvus/service.py +++ b/trustgraph-flow/trustgraph/query/doc_embeddings/milvus/service.py @@ -4,11 +4,16 @@ Document embeddings query service. Input is vector, output is an array of chunks """ +import logging + from .... direct.milvus_doc_embeddings import DocVectors from .... schema import DocumentEmbeddingsResponse from .... schema import Error, Value from .... base import DocumentEmbeddingsQueryService +# Module logger +logger = logging.getLogger(__name__) + default_ident = "de-query" default_store_uri = 'http://localhost:19530' @@ -48,7 +53,7 @@ class Processor(DocumentEmbeddingsQueryService): except Exception as e: - print(f"Exception: {e}") + logger.error(f"Exception querying document embeddings: {e}", exc_info=True) raise e @staticmethod diff --git a/trustgraph-flow/trustgraph/query/doc_embeddings/pinecone/service.py b/trustgraph-flow/trustgraph/query/doc_embeddings/pinecone/service.py index 8388a8ca..a0fec166 100755 --- a/trustgraph-flow/trustgraph/query/doc_embeddings/pinecone/service.py +++ b/trustgraph-flow/trustgraph/query/doc_embeddings/pinecone/service.py @@ -4,14 +4,18 @@ Document embeddings query service. Input is vector, output is an array of chunks. Pinecone implementation. """ -from pinecone import Pinecone, ServerlessSpec -from pinecone.grpc import PineconeGRPC, GRPCClientConfig - +import logging import uuid import os +from pinecone import Pinecone, ServerlessSpec +from pinecone.grpc import PineconeGRPC, GRPCClientConfig + from .... base import DocumentEmbeddingsQueryService +# Module logger +logger = logging.getLogger(__name__) + default_ident = "de-query" default_api_key = os.getenv("PINECONE_API_KEY", "not-specified") @@ -78,7 +82,7 @@ class Processor(DocumentEmbeddingsQueryService): except Exception as e: - print(f"Exception: {e}") + logger.error(f"Exception querying document embeddings: {e}", exc_info=True) raise e @staticmethod diff --git a/trustgraph-flow/trustgraph/query/doc_embeddings/qdrant/service.py b/trustgraph-flow/trustgraph/query/doc_embeddings/qdrant/service.py index c5543690..cedcaf52 100755 --- a/trustgraph-flow/trustgraph/query/doc_embeddings/qdrant/service.py +++ b/trustgraph-flow/trustgraph/query/doc_embeddings/qdrant/service.py @@ -4,6 +4,8 @@ Document embeddings query service. Input is vector, output is an array of chunks """ +import logging + from qdrant_client import QdrantClient from qdrant_client.models import PointStruct from qdrant_client.models import Distance, VectorParams @@ -12,6 +14,9 @@ from .... schema import DocumentEmbeddingsResponse from .... schema import Error, Value from .... base import DocumentEmbeddingsQueryService +# Module logger +logger = logging.getLogger(__name__) + default_ident = "de-query" default_store_uri = 'http://localhost:6333' @@ -63,7 +68,7 @@ class Processor(DocumentEmbeddingsQueryService): except Exception as e: - print(f"Exception: {e}") + logger.error(f"Exception querying document embeddings: {e}", exc_info=True) raise e @staticmethod diff --git a/trustgraph-flow/trustgraph/query/graph_embeddings/milvus/service.py b/trustgraph-flow/trustgraph/query/graph_embeddings/milvus/service.py index 7603f4d6..750dd99b 100755 --- a/trustgraph-flow/trustgraph/query/graph_embeddings/milvus/service.py +++ b/trustgraph-flow/trustgraph/query/graph_embeddings/milvus/service.py @@ -4,11 +4,16 @@ Graph embeddings query service. Input is vector, output is list of entities """ +import logging + from .... direct.milvus_graph_embeddings import EntityVectors from .... schema import GraphEmbeddingsResponse from .... schema import Error, Value from .... base import GraphEmbeddingsQueryService +# Module logger +logger = logging.getLogger(__name__) + default_ident = "ge-query" default_store_uri = 'http://localhost:19530' @@ -68,14 +73,12 @@ class Processor(GraphEmbeddingsQueryService): entities = ents2 - print("Send response...", flush=True) + logger.debug("Send response...") return entities - print("Done.", flush=True) - except Exception as e: - print(f"Exception: {e}") + logger.error(f"Exception querying graph embeddings: {e}", exc_info=True) raise e @staticmethod diff --git a/trustgraph-flow/trustgraph/query/graph_embeddings/pinecone/service.py b/trustgraph-flow/trustgraph/query/graph_embeddings/pinecone/service.py index 94781fc1..64a2bb10 100755 --- a/trustgraph-flow/trustgraph/query/graph_embeddings/pinecone/service.py +++ b/trustgraph-flow/trustgraph/query/graph_embeddings/pinecone/service.py @@ -4,16 +4,20 @@ Graph embeddings query service. Input is vector, output is list of entities. Pinecone implementation. """ -from pinecone import Pinecone, ServerlessSpec -from pinecone.grpc import PineconeGRPC, GRPCClientConfig - +import logging import uuid import os +from pinecone import Pinecone, ServerlessSpec +from pinecone.grpc import PineconeGRPC, GRPCClientConfig + from .... schema import GraphEmbeddingsResponse from .... schema import Error, Value from .... base import GraphEmbeddingsQueryService +# Module logger +logger = logging.getLogger(__name__) + default_ident = "ge-query" default_api_key = os.getenv("PINECONE_API_KEY", "not-specified") @@ -107,7 +111,7 @@ class Processor(GraphEmbeddingsQueryService): except Exception as e: - print(f"Exception: {e}") + logger.error(f"Exception querying graph embeddings: {e}", exc_info=True) raise e @staticmethod diff --git a/trustgraph-flow/trustgraph/query/graph_embeddings/qdrant/service.py b/trustgraph-flow/trustgraph/query/graph_embeddings/qdrant/service.py index 32da00e5..00e711db 100755 --- a/trustgraph-flow/trustgraph/query/graph_embeddings/qdrant/service.py +++ b/trustgraph-flow/trustgraph/query/graph_embeddings/qdrant/service.py @@ -4,6 +4,8 @@ Graph embeddings query service. Input is vector, output is list of entities """ +import logging + from qdrant_client import QdrantClient from qdrant_client.models import PointStruct from qdrant_client.models import Distance, VectorParams @@ -12,6 +14,9 @@ from .... schema import GraphEmbeddingsResponse from .... schema import Error, Value from .... base import GraphEmbeddingsQueryService +# Module logger +logger = logging.getLogger(__name__) + default_ident = "ge-query" default_store_uri = 'http://localhost:6333' @@ -85,14 +90,12 @@ class Processor(GraphEmbeddingsQueryService): entities = ents2 - print("Send response...", flush=True) + logger.debug("Send response...") return entities - print("Done.", flush=True) - except Exception as e: - print(f"Exception: {e}") + logger.error(f"Exception querying graph embeddings: {e}", exc_info=True) raise e @staticmethod diff --git a/trustgraph-flow/trustgraph/query/triples/cassandra/service.py b/trustgraph-flow/trustgraph/query/triples/cassandra/service.py index 6fcf4a19..c53743e8 100755 --- a/trustgraph-flow/trustgraph/query/triples/cassandra/service.py +++ b/trustgraph-flow/trustgraph/query/triples/cassandra/service.py @@ -4,11 +4,16 @@ Triples query service. Input is a (s, p, o) triple, some values may be null. Output is a list of triples. """ +import logging + from .... direct.cassandra import TrustGraph from .... schema import TriplesQueryRequest, TriplesQueryResponse, Error from .... schema import Value, Triple from .... base import TriplesQueryService +# Module logger +logger = logging.getLogger(__name__) + default_ident = "triples-query" default_graph_host='localhost' @@ -135,7 +140,7 @@ class Processor(TriplesQueryService): except Exception as e: - print(f"Exception: {e}") + logger.error(f"Exception querying triples: {e}", exc_info=True) raise e @staticmethod diff --git a/trustgraph-flow/trustgraph/query/triples/falkordb/service.py b/trustgraph-flow/trustgraph/query/triples/falkordb/service.py index 2bbe5e2f..d1c7be7d 100755 --- a/trustgraph-flow/trustgraph/query/triples/falkordb/service.py +++ b/trustgraph-flow/trustgraph/query/triples/falkordb/service.py @@ -5,12 +5,17 @@ Input is a (s, p, o) triple, some values may be null. Output is a list of triples. """ +import logging + from falkordb import FalkorDB from .... schema import TriplesQueryRequest, TriplesQueryResponse, Error from .... schema import Value, Triple from .... base import TriplesQueryService +# Module logger +logger = logging.getLogger(__name__) + default_ident = "triples-query" default_graph_url = 'falkor://falkordb:6379' @@ -299,7 +304,7 @@ class Processor(TriplesQueryService): except Exception as e: - print(f"Exception: {e}") + logger.error(f"Exception querying triples: {e}", exc_info=True) raise e @staticmethod diff --git a/trustgraph-flow/trustgraph/query/triples/memgraph/service.py b/trustgraph-flow/trustgraph/query/triples/memgraph/service.py index bc75dd16..dcf00281 100755 --- a/trustgraph-flow/trustgraph/query/triples/memgraph/service.py +++ b/trustgraph-flow/trustgraph/query/triples/memgraph/service.py @@ -5,12 +5,17 @@ Input is a (s, p, o) triple, some values may be null. Output is a list of triples. """ +import logging + from neo4j import GraphDatabase from .... schema import TriplesQueryRequest, TriplesQueryResponse, Error from .... schema import Value, Triple from .... base import TriplesQueryService +# Module logger +logger = logging.getLogger(__name__) + default_ident = "triples-query" default_graph_host = 'bolt://memgraph:7687' @@ -296,9 +301,7 @@ class Processor(TriplesQueryService): except Exception as e: - print(f"Exception: {e}") - - print(f"Exception: {e}") + logger.error(f"Exception querying triples: {e}", exc_info=True) raise e @staticmethod diff --git a/trustgraph-flow/trustgraph/query/triples/neo4j/service.py b/trustgraph-flow/trustgraph/query/triples/neo4j/service.py index f65c0f56..69e10d62 100755 --- a/trustgraph-flow/trustgraph/query/triples/neo4j/service.py +++ b/trustgraph-flow/trustgraph/query/triples/neo4j/service.py @@ -5,12 +5,17 @@ Input is a (s, p, o) triple, some values may be null. Output is a list of triples. """ +import logging + from neo4j import GraphDatabase from .... schema import TriplesQueryRequest, TriplesQueryResponse, Error from .... schema import Value, Triple from .... base import TriplesQueryService +# Module logger +logger = logging.getLogger(__name__) + default_ident = "triples-query" default_graph_host = 'bolt://neo4j:7687' @@ -280,7 +285,7 @@ class Processor(TriplesQueryService): except Exception as e: - print(f"Exception: {e}") + logger.error(f"Exception querying triples: {e}", exc_info=True) raise e @staticmethod