diff --git a/Makefile b/Makefile index ab6a1347..ef2ee557 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ # VERSION=$(shell git describe | sed 's/^v//') -VERSION=0.3.2 +VERSION=0.3.3 all: container diff --git a/docker-compose-azure.yaml b/docker-compose-azure.yaml index 4ae7cc01..f970add6 100644 --- a/docker-compose-azure.yaml +++ b/docker-compose-azure.yaml @@ -91,7 +91,7 @@ services: restart: on-failure:100 pdf-decoder: - image: docker.io/trustgraph/trustgraph-flow:0.3.1 + image: docker.io/trustgraph/trustgraph-flow:0.3.3 command: - "pdf-decoder" - "-p" @@ -99,7 +99,7 @@ services: restart: on-failure:100 chunker: - image: docker.io/trustgraph/trustgraph-flow:0.3.1 + image: docker.io/trustgraph/trustgraph-flow:0.3.3 command: - "chunker-recursive" - "-p" @@ -107,7 +107,7 @@ services: restart: on-failure:100 vectorize: - image: docker.io/trustgraph/trustgraph-flow:0.3.1 + image: docker.io/trustgraph/trustgraph-flow:0.3.3 command: - "embeddings-vectorize" - "-p" @@ -115,7 +115,7 @@ services: restart: on-failure:100 embeddings: - image: docker.io/trustgraph/trustgraph-flow:0.3.1 + image: docker.io/trustgraph/trustgraph-flow:0.3.3 command: - "embeddings-hf" - "-p" @@ -123,7 +123,7 @@ services: restart: on-failure:100 kg-extract-definitions: - image: docker.io/trustgraph/trustgraph-flow:0.3.1 + image: docker.io/trustgraph/trustgraph-flow:0.3.3 command: - "kg-extract-definitions" - "-p" @@ -131,7 +131,7 @@ services: restart: on-failure:100 kg-extract-relationships: - image: docker.io/trustgraph/trustgraph-flow:0.3.1 + image: docker.io/trustgraph/trustgraph-flow:0.3.3 command: - "kg-extract-relationships" - "-p" @@ -139,7 +139,7 @@ services: restart: on-failure:100 vector-write: - image: docker.io/trustgraph/trustgraph-flow:0.3.1 + image: docker.io/trustgraph/trustgraph-flow:0.3.3 command: - "vector-write-milvus" - "-p" @@ -149,7 +149,7 @@ services: restart: on-failure:100 graph-write: - image: docker.io/trustgraph/trustgraph-flow:0.3.1 + image: docker.io/trustgraph/trustgraph-flow:0.3.3 command: - "graph-write-cassandra" - "-p" @@ -159,7 +159,7 @@ services: restart: on-failure:100 llm: - image: docker.io/trustgraph/trustgraph-flow:0.3.1 + image: docker.io/trustgraph/trustgraph-flow:0.3.3 command: - "llm-azure-text" - "-p" @@ -171,7 +171,7 @@ services: restart: on-failure:100 graph-rag: - image: docker.io/trustgraph/trustgraph-flow:0.3.1 + image: docker.io/trustgraph/trustgraph-flow:0.3.3 command: - "graph-rag" - "-p" diff --git a/docker-compose-claude.yaml b/docker-compose-claude.yaml index cbebfba7..bbceceac 100644 --- a/docker-compose-claude.yaml +++ b/docker-compose-claude.yaml @@ -91,7 +91,7 @@ services: restart: on-failure:100 pdf-decoder: - image: docker.io/trustgraph/trustgraph-flow:0.3.1 + image: docker.io/trustgraph/trustgraph-flow:0.3.3 command: - "pdf-decoder" - "-p" @@ -99,7 +99,7 @@ services: restart: on-failure:100 chunker: - image: docker.io/trustgraph/trustgraph-flow:0.3.1 + image: docker.io/trustgraph/trustgraph-flow:0.3.3 command: - "chunker-recursive" - "-p" @@ -107,7 +107,7 @@ services: restart: on-failure:100 vectorize: - image: docker.io/trustgraph/trustgraph-flow:0.3.1 + image: docker.io/trustgraph/trustgraph-flow:0.3.3 command: - "embeddings-vectorize" - "-p" @@ -115,7 +115,7 @@ services: restart: on-failure:100 embeddings: - image: docker.io/trustgraph/trustgraph-flow:0.3.1 + image: docker.io/trustgraph/trustgraph-flow:0.3.3 command: - "embeddings-hf" - "-p" @@ -123,7 +123,7 @@ services: restart: on-failure:100 kg-extract-definitions: - image: docker.io/trustgraph/trustgraph-flow:0.3.1 + image: docker.io/trustgraph/trustgraph-flow:0.3.3 command: - "kg-extract-definitions" - "-p" @@ -131,7 +131,7 @@ services: restart: on-failure:100 kg-extract-relationships: - image: docker.io/trustgraph/trustgraph-flow:0.3.1 + image: docker.io/trustgraph/trustgraph-flow:0.3.3 command: - "kg-extract-relationships" - "-p" @@ -139,7 +139,7 @@ services: restart: on-failure:100 vector-write: - image: docker.io/trustgraph/trustgraph-flow:0.3.1 + image: docker.io/trustgraph/trustgraph-flow:0.3.3 command: - "vector-write-milvus" - "-p" @@ -149,7 +149,7 @@ services: restart: on-failure:100 graph-write: - image: docker.io/trustgraph/trustgraph-flow:0.3.1 + image: docker.io/trustgraph/trustgraph-flow:0.3.3 command: - "graph-write-cassandra" - "-p" @@ -159,7 +159,7 @@ services: restart: on-failure:100 llm: - image: docker.io/trustgraph/trustgraph-flow:0.3.1 + image: docker.io/trustgraph/trustgraph-flow:0.3.3 command: - "llm-claude-text" - "-p" @@ -169,7 +169,7 @@ services: restart: on-failure:100 graph-rag: - image: docker.io/trustgraph/trustgraph-flow:0.3.1 + image: docker.io/trustgraph/trustgraph-flow:0.3.3 command: - "graph-rag" - "-p" diff --git a/docker-compose-ollama.yaml b/docker-compose-ollama.yaml index 621af948..dd618cd2 100644 --- a/docker-compose-ollama.yaml +++ b/docker-compose-ollama.yaml @@ -91,7 +91,7 @@ services: restart: on-failure:100 pdf-decoder: - image: docker.io/trustgraph/trustgraph-flow:0.3.1 + image: docker.io/trustgraph/trustgraph-flow:0.3.3 command: - "pdf-decoder" - "-p" @@ -99,7 +99,7 @@ services: restart: on-failure:100 chunker: - image: docker.io/trustgraph/trustgraph-flow:0.3.1 + image: docker.io/trustgraph/trustgraph-flow:0.3.3 command: - "chunker-recursive" - "-p" @@ -107,7 +107,7 @@ services: restart: on-failure:100 vectorize: - image: docker.io/trustgraph/trustgraph-flow:0.3.1 + image: docker.io/trustgraph/trustgraph-flow:0.3.3 command: - "embeddings-vectorize" - "-p" @@ -115,7 +115,7 @@ services: restart: on-failure:100 embeddings: - image: docker.io/trustgraph/trustgraph-flow:0.3.1 + image: docker.io/trustgraph/trustgraph-flow:0.3.3 command: - "embeddings-hf" - "-p" @@ -125,7 +125,7 @@ services: restart: on-failure:100 kg-extract-definitions: - image: docker.io/trustgraph/trustgraph-flow:0.3.1 + image: docker.io/trustgraph/trustgraph-flow:0.3.3 command: - "kg-extract-definitions" - "-p" @@ -133,7 +133,7 @@ services: restart: on-failure:100 kg-extract-relationships: - image: docker.io/trustgraph/trustgraph-flow:0.3.1 + image: docker.io/trustgraph/trustgraph-flow:0.3.3 command: - "kg-extract-relationships" - "-p" @@ -141,7 +141,7 @@ services: restart: on-failure:100 vector-write: - image: docker.io/trustgraph/trustgraph-flow:0.3.1 + image: docker.io/trustgraph/trustgraph-flow:0.3.3 command: - "vector-write-milvus" - "-p" @@ -151,7 +151,7 @@ services: restart: on-failure:100 graph-write: - image: docker.io/trustgraph/trustgraph-flow:0.3.1 + image: docker.io/trustgraph/trustgraph-flow:0.3.3 command: - "graph-write-cassandra" - "-p" @@ -161,7 +161,7 @@ services: restart: on-failure:100 llm: - image: docker.io/trustgraph/trustgraph-flow:0.3.1 + image: docker.io/trustgraph/trustgraph-flow:0.3.3 command: - "llm-ollama-text" - "-p" @@ -171,7 +171,7 @@ services: restart: on-failure:100 graph-rag: - image: docker.io/trustgraph/trustgraph-flow:0.3.1 + image: docker.io/trustgraph/trustgraph-flow:0.3.3 command: - "graph-rag" - "-p" diff --git a/docker-compose-vertexai.yaml b/docker-compose-vertexai.yaml index 215dfe02..b3a90f7a 100644 --- a/docker-compose-vertexai.yaml +++ b/docker-compose-vertexai.yaml @@ -91,7 +91,7 @@ services: restart: on-failure:100 pdf-decoder: - image: docker.io/trustgraph/trustgraph-flow:0.3.1 + image: docker.io/trustgraph/trustgraph-flow:0.3.3 command: - "pdf-decoder" - "-p" @@ -99,7 +99,7 @@ services: restart: on-failure:100 chunker: - image: docker.io/trustgraph/trustgraph-flow:0.3.1 + image: docker.io/trustgraph/trustgraph-flow:0.3.3 command: - "chunker-recursive" - "-p" @@ -107,7 +107,7 @@ services: restart: on-failure:100 vectorize: - image: docker.io/trustgraph/trustgraph-flow:0.3.1 + image: docker.io/trustgraph/trustgraph-flow:0.3.3 command: - "embeddings-vectorize" - "-p" @@ -115,7 +115,7 @@ services: restart: on-failure:100 embeddings: - image: docker.io/trustgraph/trustgraph-flow:0.3.1 + image: docker.io/trustgraph/trustgraph-flow:0.3.3 command: - "embeddings-hf" - "-p" @@ -123,7 +123,7 @@ services: restart: on-failure:100 kg-extract-definitions: - image: docker.io/trustgraph/trustgraph-flow:0.3.1 + image: docker.io/trustgraph/trustgraph-flow:0.3.3 command: - "kg-extract-definitions" - "-p" @@ -131,7 +131,7 @@ services: restart: on-failure:100 kg-extract-relationships: - image: docker.io/trustgraph/trustgraph-flow:0.3.1 + image: docker.io/trustgraph/trustgraph-flow:0.3.3 command: - "kg-extract-relationships" - "-p" @@ -139,7 +139,7 @@ services: restart: on-failure:100 vector-write: - image: docker.io/trustgraph/trustgraph-flow:0.3.1 + image: docker.io/trustgraph/trustgraph-flow:0.3.3 command: - "vector-write-milvus" - "-p" @@ -149,7 +149,7 @@ services: restart: on-failure:100 graph-write: - image: docker.io/trustgraph/trustgraph-flow:0.3.1 + image: docker.io/trustgraph/trustgraph-flow:0.3.3 command: - "graph-write-cassandra" - "-p" @@ -159,7 +159,7 @@ services: restart: on-failure:100 llm: - image: docker.io/trustgraph/trustgraph-flow:0.3.1 + image: docker.io/trustgraph/trustgraph-flow:0.3.3 command: - "llm-vertexai-text" - "-p" @@ -173,7 +173,7 @@ services: restart: on-failure:100 graph-rag: - image: docker.io/trustgraph/trustgraph-flow:0.3.1 + image: docker.io/trustgraph/trustgraph-flow:0.3.3 command: - "graph-rag" - "-p" diff --git a/setup.py b/setup.py index eb22db9a..6d109949 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ import os with open("README.md", "r") as fh: long_description = fh.read() -version = "0.3.2" +version = "0.3.3" setuptools.setup( name="trustgraph", diff --git a/trustgraph/rag/graph/rag.py b/trustgraph/rag/graph/rag.py index 1299eb19..3ea322c1 100755 --- a/trustgraph/rag/graph/rag.py +++ b/trustgraph/rag/graph/rag.py @@ -12,7 +12,7 @@ from ... base import ConsumerProducer default_input_queue = 'graph-rag-query' default_output_queue = 'graph-rag-response' default_subscriber = 'graph-rag' -default_graph_hosts = [ 'localhost' ] +default_graph_hosts = 'localhost' default_vector_store = 'http://localhost:19530' class Processor(ConsumerProducer): @@ -43,7 +43,7 @@ class Processor(ConsumerProducer): self.rag = GraphRag( pulsar_host=pulsar_host, - graph_hosts=graph_hosts, + graph_hosts=graph_hosts.split(","), vector_store=vector_store, verbose=True, entity_limit=entity_limit, @@ -114,4 +114,3 @@ def run(): Processor.start('graph-rag', __doc__) -