mirror of
https://github.com/trustgraph-ai/trustgraph.git
synced 2026-06-09 06:45:13 +02:00
4acd853023
Replace the config push mechanism that broadcast the full config blob on a 'state' class pub/sub queue with a lightweight notify signal containing only the version number and affected config types. Processors fetch the full config via request/response from the config service when notified. This eliminates the need for the pub/sub 'state' queue class and stateful pub/sub services entirely. The config push queue moves from 'state' to 'flow' class — a simple transient signal rather than a retained message. This solves the RabbitMQ late-subscriber problem where restarting processes never received the current config because their fresh queue had no historical messages. Key changes: - ConfigPush schema: config dict replaced with types list - Subscribe-then-fetch startup with retry: processors subscribe to notify queue, fetch config via request/response, then process buffered notifies with version comparison to avoid race conditions - register_config_handler() accepts optional types parameter so handlers only fire when their config types change - Short-lived config request/response clients to avoid subscriber contention on non-persistent response topics - Config service passes affected types through put/delete/flow operations - Gateway ConfigReceiver rewritten with same notify pattern and retry loop Tests updated New tests: - register_config_handler: without types, with types, multiple types, multiple handlers - on_config_notify: old/same version skipped, irrelevant types skipped (version still updated), relevant type triggers fetch, handler without types always called, mixed handler filtering, empty types invokes all, fetch failure handled gracefully - fetch_config: returns config+version, raises on error response, stops client even on exception - fetch_and_apply_config: applies to all handlers on startup, retries on failure
102 lines
3.2 KiB
Python
Executable file
102 lines
3.2 KiB
Python
Executable file
|
|
"""
|
|
Accepts entity/vector pairs and writes them to a Milvus store.
|
|
"""
|
|
|
|
import logging
|
|
|
|
from .... direct.milvus_graph_embeddings import EntityVectors
|
|
from .... base import GraphEmbeddingsStoreService, CollectionConfigHandler
|
|
from .... base import AsyncProcessor, Consumer, Producer
|
|
from .... base import ConsumerMetrics, ProducerMetrics
|
|
from .... schema import IRI, LITERAL
|
|
|
|
# Module logger
|
|
logger = logging.getLogger(__name__)
|
|
|
|
|
|
def get_term_value(term):
|
|
"""Extract the string value from a Term"""
|
|
if term is None:
|
|
return None
|
|
if term.type == IRI:
|
|
return term.iri
|
|
elif term.type == LITERAL:
|
|
return term.value
|
|
else:
|
|
# For blank nodes or other types, use id or value
|
|
return term.id or term.value
|
|
|
|
default_ident = "graph-embeddings-write"
|
|
default_store_uri = 'http://localhost:19530'
|
|
|
|
class Processor(CollectionConfigHandler, GraphEmbeddingsStoreService):
|
|
|
|
def __init__(self, **params):
|
|
|
|
store_uri = params.get("store_uri", default_store_uri)
|
|
|
|
super(Processor, self).__init__(
|
|
**params | {
|
|
"store_uri": store_uri,
|
|
}
|
|
)
|
|
|
|
self.vecstore = EntityVectors(store_uri)
|
|
|
|
# Register for config push notifications
|
|
self.register_config_handler(self.on_collection_config, types=["collection"])
|
|
|
|
async def store_graph_embeddings(self, message):
|
|
|
|
for entity in message.entities:
|
|
entity_value = get_term_value(entity.entity)
|
|
|
|
if entity_value != "" and entity_value is not None:
|
|
vec = entity.vector
|
|
if vec:
|
|
self.vecstore.insert(
|
|
vec, entity_value,
|
|
message.metadata.user,
|
|
message.metadata.collection,
|
|
chunk_id=entity.chunk_id or "",
|
|
)
|
|
|
|
@staticmethod
|
|
def add_args(parser):
|
|
|
|
GraphEmbeddingsStoreService.add_args(parser)
|
|
|
|
parser.add_argument(
|
|
'-t', '--store-uri',
|
|
default=default_store_uri,
|
|
help=f'Milvus store URI (default: {default_store_uri})'
|
|
)
|
|
|
|
async def create_collection(self, user: str, collection: str, metadata: dict):
|
|
"""
|
|
Create collection via config push - collections are created lazily on first write
|
|
with the correct dimension determined from the actual embeddings.
|
|
"""
|
|
try:
|
|
logger.info(f"Collection create request for {user}/{collection} - will be created lazily on first write")
|
|
self.vecstore.create_collection(user, collection)
|
|
|
|
except Exception as e:
|
|
logger.error(f"Failed to create collection {user}/{collection}: {e}", exc_info=True)
|
|
raise
|
|
|
|
async def delete_collection(self, user: str, collection: str):
|
|
"""Delete the collection for graph embeddings via config push"""
|
|
try:
|
|
self.vecstore.delete_collection(user, collection)
|
|
logger.info(f"Successfully deleted collection {user}/{collection}")
|
|
|
|
except Exception as e:
|
|
logger.error(f"Failed to delete collection {user}/{collection}: {e}", exc_info=True)
|
|
raise
|
|
|
|
def run():
|
|
|
|
Processor.launch(default_ident, __doc__)
|
|
|