diff --git a/Makefile b/Makefile index 348aa2aa..0d96919f 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ # VERSION=$(shell git describe | sed 's/^v//') -VERSION=0.5.5 +VERSION=0.5.6 all: container diff --git a/docker-compose-azure.yaml b/docker-compose-azure.yaml index 3dc3653b..0149cc4c 100644 --- a/docker-compose-azure.yaml +++ b/docker-compose-azure.yaml @@ -130,7 +130,7 @@ services: restart: on-failure:100 pdf-decoder: - image: docker.io/trustgraph/trustgraph-flow:0.5.5 + image: docker.io/trustgraph/trustgraph-flow:0.5.6 command: - "pdf-decoder" - "-p" @@ -138,7 +138,7 @@ services: restart: on-failure:100 chunker: - image: docker.io/trustgraph/trustgraph-flow:0.5.5 + image: docker.io/trustgraph/trustgraph-flow:0.5.6 command: - "chunker-recursive" - "-p" @@ -146,7 +146,7 @@ services: restart: on-failure:100 vectorize: - image: docker.io/trustgraph/trustgraph-flow:0.5.5 + image: docker.io/trustgraph/trustgraph-flow:0.5.6 command: - "embeddings-vectorize" - "-p" @@ -154,7 +154,7 @@ services: restart: on-failure:100 embeddings: - image: docker.io/trustgraph/trustgraph-flow:0.5.5 + image: docker.io/trustgraph/trustgraph-flow:0.5.6 command: - "embeddings-hf" - "-p" @@ -164,7 +164,7 @@ services: restart: on-failure:100 kg-extract-definitions: - image: docker.io/trustgraph/trustgraph-flow:0.5.5 + image: docker.io/trustgraph/trustgraph-flow:0.5.6 command: - "kg-extract-definitions" - "-p" @@ -172,7 +172,7 @@ services: restart: on-failure:100 kg-extract-relationships: - image: docker.io/trustgraph/trustgraph-flow:0.5.5 + image: docker.io/trustgraph/trustgraph-flow:0.5.6 command: - "kg-extract-relationships" - "-p" @@ -180,7 +180,7 @@ services: restart: on-failure:100 store-graph-embeddings: - image: docker.io/trustgraph/trustgraph-flow:0.5.5 + image: docker.io/trustgraph/trustgraph-flow:0.5.6 command: - "ge-write-milvus" - "-p" @@ -190,7 +190,7 @@ services: restart: on-failure:100 store-triples: - image: docker.io/trustgraph/trustgraph-flow:0.5.5 + image: docker.io/trustgraph/trustgraph-flow:0.5.6 command: - "triples-write-cassandra" - "-p" @@ -200,7 +200,7 @@ services: restart: on-failure:100 text-completion: - image: docker.io/trustgraph/trustgraph-flow:0.5.5 + image: docker.io/trustgraph/trustgraph-flow:0.5.6 command: - "text-completion-azure" - "-p" @@ -211,11 +211,31 @@ services: - ${AZURE_ENDPOINT} restart: on-failure:100 + text-completion-rag: + image: docker.io/trustgraph/trustgraph-flow:0.5.6 + command: + - "text-completion-azure" + - "-p" + - "pulsar://pulsar:6650" + - "-k" + - ${AZURE_TOKEN} + - "-e" + - ${AZURE_ENDPOINT} + - "-i" + - "non-persistent://tg/request/text-completion-rag" + - "-o" + - "non-persistent://tg/response/text-completion-rag-response" + restart: on-failure:100 + graph-rag: - image: docker.io/trustgraph/trustgraph-flow:0.5.5 + image: docker.io/trustgraph/trustgraph-flow:0.5.6 command: - "graph-rag" - "-p" - "pulsar://pulsar:6650" + - "--text-completion-request-queue" + - "non-persistent://tg/request/text-completion-rag" + - "--text-completion-response-queue" + - "non-persistent://tg/response/text-completion-rag-response" restart: on-failure:100 diff --git a/docker-compose-claude.yaml b/docker-compose-claude.yaml index 26e205ea..35b422db 100644 --- a/docker-compose-claude.yaml +++ b/docker-compose-claude.yaml @@ -130,7 +130,7 @@ services: restart: on-failure:100 pdf-decoder: - image: docker.io/trustgraph/trustgraph-flow:0.5.5 + image: docker.io/trustgraph/trustgraph-flow:0.5.6 command: - "pdf-decoder" - "-p" @@ -138,7 +138,7 @@ services: restart: on-failure:100 chunker: - image: docker.io/trustgraph/trustgraph-flow:0.5.5 + image: docker.io/trustgraph/trustgraph-flow:0.5.6 command: - "chunker-recursive" - "-p" @@ -146,7 +146,7 @@ services: restart: on-failure:100 vectorize: - image: docker.io/trustgraph/trustgraph-flow:0.5.5 + image: docker.io/trustgraph/trustgraph-flow:0.5.6 command: - "embeddings-vectorize" - "-p" @@ -154,7 +154,7 @@ services: restart: on-failure:100 embeddings: - image: docker.io/trustgraph/trustgraph-flow:0.5.5 + image: docker.io/trustgraph/trustgraph-flow:0.5.6 command: - "embeddings-hf" - "-p" @@ -164,7 +164,7 @@ services: restart: on-failure:100 kg-extract-definitions: - image: docker.io/trustgraph/trustgraph-flow:0.5.5 + image: docker.io/trustgraph/trustgraph-flow:0.5.6 command: - "kg-extract-definitions" - "-p" @@ -172,7 +172,7 @@ services: restart: on-failure:100 kg-extract-relationships: - image: docker.io/trustgraph/trustgraph-flow:0.5.5 + image: docker.io/trustgraph/trustgraph-flow:0.5.6 command: - "kg-extract-relationships" - "-p" @@ -180,7 +180,7 @@ services: restart: on-failure:100 store-graph-embeddings: - image: docker.io/trustgraph/trustgraph-flow:0.5.5 + image: docker.io/trustgraph/trustgraph-flow:0.5.6 command: - "ge-write-milvus" - "-p" @@ -190,7 +190,7 @@ services: restart: on-failure:100 store-triples: - image: docker.io/trustgraph/trustgraph-flow:0.5.5 + image: docker.io/trustgraph/trustgraph-flow:0.5.6 command: - "triples-write-cassandra" - "-p" @@ -200,7 +200,7 @@ services: restart: on-failure:100 text-completion: - image: docker.io/trustgraph/trustgraph-flow:0.5.5 + image: docker.io/trustgraph/trustgraph-flow:0.5.6 command: - "text-completion-claude" - "-p" @@ -209,11 +209,28 @@ services: - ${CLAUDE_KEY} restart: on-failure:100 + text-completion-rag: + image: docker.io/trustgraph/trustgraph-flow:0.5.6 + command: + - "text-completion-ollama" + - "-p" + - "pulsar://pulsar:6650" + - "-k" + - ${CLAUDE_KEY} + - "-i" + - "non-persistent://tg/request/text-completion-rag" + - "-o" + - "non-persistent://tg/response/text-completion-rag-response" + restart: on-failure:100 + graph-rag: - image: docker.io/trustgraph/trustgraph-flow:0.5.5 + image: docker.io/trustgraph/trustgraph-flow:0.5.6 command: - "graph-rag" - "-p" - "pulsar://pulsar:6650" + - "--text-completion-request-queue" + - "non-persistent://tg/request/text-completion-rag" + - "--text-completion-response-queue" + - "non-persistent://tg/response/text-completion-rag-response" restart: on-failure:100 - diff --git a/docker-compose-ollama.yaml b/docker-compose-ollama.yaml index a2ec6f1a..0ae7288a 100644 --- a/docker-compose-ollama.yaml +++ b/docker-compose-ollama.yaml @@ -130,7 +130,7 @@ services: restart: on-failure:100 pdf-decoder: - image: docker.io/trustgraph/trustgraph-flow:0.5.5 + image: docker.io/trustgraph/trustgraph-flow:0.5.6 command: - "pdf-decoder" - "-p" @@ -138,7 +138,7 @@ services: restart: on-failure:100 chunker: - image: docker.io/trustgraph/trustgraph-flow:0.5.5 + image: docker.io/trustgraph/trustgraph-flow:0.5.6 command: - "chunker-recursive" - "-p" @@ -146,7 +146,7 @@ services: restart: on-failure:100 vectorize: - image: docker.io/trustgraph/trustgraph-flow:0.5.5 + image: docker.io/trustgraph/trustgraph-flow:0.5.6 command: - "embeddings-vectorize" - "-p" @@ -154,7 +154,7 @@ services: restart: on-failure:100 embeddings: - image: docker.io/trustgraph/trustgraph-flow:0.5.5 + image: docker.io/trustgraph/trustgraph-flow:0.5.6 command: - "embeddings-hf" - "-p" @@ -164,7 +164,7 @@ services: restart: on-failure:100 kg-extract-definitions: - image: docker.io/trustgraph/trustgraph-flow:0.5.5 + image: docker.io/trustgraph/trustgraph-flow:0.5.6 command: - "kg-extract-definitions" - "-p" @@ -172,7 +172,7 @@ services: restart: on-failure:100 kg-extract-relationships: - image: docker.io/trustgraph/trustgraph-flow:0.5.5 + image: docker.io/trustgraph/trustgraph-flow:0.5.6 command: - "kg-extract-relationships" - "-p" @@ -180,7 +180,7 @@ services: restart: on-failure:100 store-graph-embeddings: - image: docker.io/trustgraph/trustgraph-flow:0.5.5 + image: docker.io/trustgraph/trustgraph-flow:0.5.6 command: - "ge-write-milvus" - "-p" @@ -190,7 +190,7 @@ services: restart: on-failure:100 store-triples: - image: docker.io/trustgraph/trustgraph-flow:0.5.5 + image: docker.io/trustgraph/trustgraph-flow:0.5.6 command: - "triples-write-cassandra" - "-p" @@ -200,7 +200,7 @@ services: restart: on-failure:100 text-completion: - image: docker.io/trustgraph/trustgraph-flow:0.5.5 + image: docker.io/trustgraph/trustgraph-flow:0.5.6 command: - "text-completion-ollama" - "-p" @@ -210,12 +210,32 @@ services: # - "-m" # - "llama3.1:8b" restart: on-failure:100 + + text-completion-rag: + image: docker.io/trustgraph/trustgraph-flow:0.5.6 + command: + - "text-completion-ollama" + - "-p" + - "pulsar://pulsar:6650" + - "-r" + - "http://${OLLAMA_HOST}:11434/" + - "-i" + - "non-persistent://tg/request/text-completion-rag" + - "-o" + - "non-persistent://tg/response/text-completion-rag-response" + - "-m" + - "llama3.1:8b" + restart: on-failure:100 graph-rag: - image: docker.io/trustgraph/trustgraph-flow:0.5.5 + image: docker.io/trustgraph/trustgraph-flow:0.5.6 command: - "graph-rag" - "-p" - "pulsar://pulsar:6650" + - "--text-completion-request-queue" + - "non-persistent://tg/request/text-completion-rag" + - "--text-completion-response-queue" + - "non-persistent://tg/response/text-completion-rag-response" restart: on-failure:100 diff --git a/docker-compose-vertexai.yaml b/docker-compose-vertexai.yaml index c55a04b5..4417cea7 100644 --- a/docker-compose-vertexai.yaml +++ b/docker-compose-vertexai.yaml @@ -130,7 +130,7 @@ services: restart: on-failure:100 pdf-decoder: - image: docker.io/trustgraph/trustgraph-flow:0.5.5 + image: docker.io/trustgraph/trustgraph-flow:0.5.6 command: - "pdf-decoder" - "-p" @@ -138,7 +138,7 @@ services: restart: on-failure:100 chunker: - image: docker.io/trustgraph/trustgraph-flow:0.5.5 + image: docker.io/trustgraph/trustgraph-flow:0.5.6 command: - "chunker-recursive" - "-p" @@ -146,7 +146,7 @@ services: restart: on-failure:100 vectorize: - image: docker.io/trustgraph/trustgraph-flow:0.5.5 + image: docker.io/trustgraph/trustgraph-flow:0.5.6 command: - "embeddings-vectorize" - "-p" @@ -154,7 +154,7 @@ services: restart: on-failure:100 embeddings: - image: docker.io/trustgraph/trustgraph-flow:0.5.5 + image: docker.io/trustgraph/trustgraph-flow:0.5.6 command: - "embeddings-hf" - "-p" @@ -164,7 +164,7 @@ services: restart: on-failure:100 kg-extract-definitions: - image: docker.io/trustgraph/trustgraph-flow:0.5.5 + image: docker.io/trustgraph/trustgraph-flow:0.5.6 command: - "kg-extract-definitions" - "-p" @@ -172,7 +172,7 @@ services: restart: on-failure:100 kg-extract-relationships: - image: docker.io/trustgraph/trustgraph-flow:0.5.5 + image: docker.io/trustgraph/trustgraph-flow:0.5.6 command: - "kg-extract-relationships" - "-p" @@ -180,7 +180,7 @@ services: restart: on-failure:100 store-graph-embeddings: - image: docker.io/trustgraph/trustgraph-flow:0.5.5 + image: docker.io/trustgraph/trustgraph-flow:0.5.6 command: - "ge-write-milvus" - "-p" @@ -190,7 +190,7 @@ services: restart: on-failure:100 store-triples: - image: docker.io/trustgraph/trustgraph-flow:0.5.5 + image: docker.io/trustgraph/trustgraph-flow:0.5.6 command: - "triples-write-cassandra" - "-p" @@ -200,9 +200,9 @@ services: restart: on-failure:100 text-completion: - image: docker.io/trustgraph/trustgraph-flow:0.5.5 + image: docker.io/trustgraph/trustgraph-flow:0.5.6 command: - - "text-completion-ollama" + - "text-completion-vertexai" - "-p" - "pulsar://pulsar:6650" - "-k" @@ -212,12 +212,32 @@ services: volumes: - "./vertexai:/vertexai" restart: on-failure:100 + + text-completion-rag: + image: docker.io/trustgraph/trustgraph-flow:0.5.6 + command: + - "text-completion-vertexai" + - "-p" + - "pulsar://pulsar:6650" + - "-k" + - "/vertexai/private.json" + - "-r" + - "us-west1" + - "-i" + - "non-persistent://tg/request/text-completion-rag" + - "-o" + - "non-persistent://tg/response/text-completion-rag-response" + restart: on-failure:100 graph-rag: - image: docker.io/trustgraph/trustgraph-flow:0.5.5 + image: docker.io/trustgraph/trustgraph-flow:0.5.6 command: - "graph-rag" - "-p" - "pulsar://pulsar:6650" + - "--text-completion-request-queue" + - "non-persistent://tg/request/text-completion-rag" + - "--text-completion-response-queue" + - "non-persistent://tg/response/text-completion-rag-response" restart: on-failure:100 diff --git a/setup.py b/setup.py index 6e9c8b9e..2be871ac 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.5.5" +version = "0.5.6" setuptools.setup( name="trustgraph",