From fcab3aeb0e1dab654352f416d8daf565dd5e7169 Mon Sep 17 00:00:00 2001 From: cybermaggedon Date: Mon, 23 Jun 2025 21:52:21 +0100 Subject: [PATCH] Fix/library translators (#415) * Fixing naming * Fix mapping of library document list --- trustgraph-base/trustgraph/messaging/__init__.py | 6 +++--- .../trustgraph/messaging/translators/__init__.py | 4 ++-- .../trustgraph/messaging/translators/library.py | 14 +++++++------- .../trustgraph/messaging/translators/metadata.py | 6 +++--- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/trustgraph-base/trustgraph/messaging/__init__.py b/trustgraph-base/trustgraph/messaging/__init__.py index 922ee7c8..a9caf950 100644 --- a/trustgraph-base/trustgraph/messaging/__init__.py +++ b/trustgraph-base/trustgraph/messaging/__init__.py @@ -11,7 +11,7 @@ from .translators.retrieval import ( ) from .translators.triples import TriplesQueryRequestTranslator, TriplesQueryResponseTranslator from .translators.knowledge import KnowledgeRequestTranslator, KnowledgeResponseTranslator -from .translators.library import LibraryDocumentTranslator, LibraryProcessingTranslator +from .translators.library import LibraryRequestTranslator, LibraryResponseTranslator from .translators.document_loading import DocumentTranslator, TextDocumentTranslator from .translators.config import ConfigRequestTranslator, ConfigResponseTranslator from .translators.flow import FlowRequestTranslator, FlowResponseTranslator @@ -66,8 +66,8 @@ TranslatorRegistry.register_service( TranslatorRegistry.register_service( "librarian", - LibraryDocumentTranslator(), - LibraryProcessingTranslator() + LibraryRequestTranslator(), + LibraryResponseTranslator() ) TranslatorRegistry.register_service( diff --git a/trustgraph-base/trustgraph/messaging/translators/__init__.py b/trustgraph-base/trustgraph/messaging/translators/__init__.py index 1a860217..fb487281 100644 --- a/trustgraph-base/trustgraph/messaging/translators/__init__.py +++ b/trustgraph-base/trustgraph/messaging/translators/__init__.py @@ -8,7 +8,7 @@ from .retrieval import DocumentRagRequestTranslator, DocumentRagResponseTranslat from .retrieval import GraphRagRequestTranslator, GraphRagResponseTranslator from .triples import TriplesQueryRequestTranslator, TriplesQueryResponseTranslator from .knowledge import KnowledgeRequestTranslator, KnowledgeResponseTranslator -from .library import LibraryDocumentTranslator, LibraryProcessingTranslator +from .library import LibraryRequestTranslator, LibraryResponseTranslator from .document_loading import DocumentTranslator, TextDocumentTranslator, ChunkTranslator, DocumentEmbeddingsTranslator from .config import ConfigRequestTranslator, ConfigResponseTranslator from .flow import FlowRequestTranslator, FlowResponseTranslator @@ -16,4 +16,4 @@ from .prompt import PromptRequestTranslator, PromptResponseTranslator from .embeddings_query import ( DocumentEmbeddingsRequestTranslator, DocumentEmbeddingsResponseTranslator, GraphEmbeddingsRequestTranslator, GraphEmbeddingsResponseTranslator -) \ No newline at end of file +) diff --git a/trustgraph-base/trustgraph/messaging/translators/library.py b/trustgraph-base/trustgraph/messaging/translators/library.py index f590459a..fc355dda 100644 --- a/trustgraph-base/trustgraph/messaging/translators/library.py +++ b/trustgraph-base/trustgraph/messaging/translators/library.py @@ -4,8 +4,8 @@ from .base import MessageTranslator from .metadata import DocumentMetadataTranslator, ProcessingMetadataTranslator -class LibraryDocumentTranslator(MessageTranslator): - """Translator for LibrarianRequest/Response schema objects""" +class LibraryRequestTranslator(MessageTranslator): + """Translator for LibrarianRequest schema objects""" def __init__(self): self.doc_metadata_translator = DocumentMetadataTranslator() @@ -73,7 +73,7 @@ class LibraryDocumentTranslator(MessageTranslator): result["user"] = obj.user if obj.collection: result["collection"] = obj.collection - if obj.criteria: + if obj.criteria is not None: result["criteria"] = [ { "key": c.key, @@ -86,7 +86,7 @@ class LibraryDocumentTranslator(MessageTranslator): return result -class LibraryProcessingTranslator(MessageTranslator): +class LibraryResponseTranslator(MessageTranslator): """Translator for LibrarianResponse schema objects""" def __init__(self): @@ -105,13 +105,13 @@ class LibraryProcessingTranslator(MessageTranslator): if obj.content: result["content"] = obj.content.decode("utf-8") if isinstance(obj.content, bytes) else obj.content - if obj.document_metadatas: + if obj.document_metadatas is not None: result["document-metadatas"] = [ self.doc_metadata_translator.from_pulsar(dm) for dm in obj.document_metadatas ] - if obj.processing_metadatas: + if obj.processing_metadatas is not None: result["processing-metadatas"] = [ self.proc_metadata_translator.from_pulsar(pm) for pm in obj.processing_metadatas @@ -121,4 +121,4 @@ class LibraryProcessingTranslator(MessageTranslator): def from_response_with_completion(self, obj: LibrarianResponse) -> Tuple[Dict[str, Any], bool]: """Returns (response_dict, is_final)""" - return self.from_pulsar(obj), True \ No newline at end of file + return self.from_pulsar(obj), True diff --git a/trustgraph-base/trustgraph/messaging/translators/metadata.py b/trustgraph-base/trustgraph/messaging/translators/metadata.py index 218a02bb..006b222c 100644 --- a/trustgraph-base/trustgraph/messaging/translators/metadata.py +++ b/trustgraph-base/trustgraph/messaging/translators/metadata.py @@ -18,7 +18,7 @@ class DocumentMetadataTranslator(Translator): kind=data.get("kind"), title=data.get("title"), comments=data.get("comments"), - metadata=self.subgraph_translator.to_pulsar(metadata) if metadata else [], + metadata=self.subgraph_translator.to_pulsar(metadata) if metadata is not None else [], user=data.get("user"), tags=data.get("tags") ) @@ -36,7 +36,7 @@ class DocumentMetadataTranslator(Translator): result["title"] = obj.title if obj.comments: result["comments"] = obj.comments - if obj.metadata: + if obj.metadata is not None: result["metadata"] = self.subgraph_translator.from_pulsar(obj.metadata) if obj.user: result["user"] = obj.user @@ -78,4 +78,4 @@ class ProcessingMetadataTranslator(Translator): if obj.tags is not None: result["tags"] = obj.tags - return result \ No newline at end of file + return result