apunkt/trustgraph
1
0
Fork 0
mirror of https://github.com/trustgraph-ai/trustgraph.git synced 2026-04-27 09:26:22 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Boost version file, put 2y text-completion process in each docker compose just for RAG

Browse source
This commit is contained in:
Cyber MacGeddon 2024-08-05 23:00:05 +01:00
parent faa5dc26ac
commit 63a30b25eb
6 changed files with 121 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -1,6 +1,6 @@
# VERSION=$(shell git describe | sed 's/^v//') # VERSION=$(shell git describe | sed 's/^v//')
VERSION=0.5.5 VERSION=0.5.6
all: container all: container

40
docker-compose-azure.yaml
View file

@ -130,7 +130,7 @@ services:
restart: on-failure:100 restart: on-failure:100
pdf-decoder: pdf-decoder:
image: docker.io/trustgraph/trustgraph-flow:0.5.5 image: docker.io/trustgraph/trustgraph-flow:0.5.6
command: command:
- "pdf-decoder" - "pdf-decoder"
- "-p" - "-p"
@ -138,7 +138,7 @@ services:
restart: on-failure:100 restart: on-failure:100
chunker: chunker:
image: docker.io/trustgraph/trustgraph-flow:0.5.5 image: docker.io/trustgraph/trustgraph-flow:0.5.6
command: command:
- "chunker-recursive" - "chunker-recursive"
- "-p" - "-p"
@ -146,7 +146,7 @@ services:
restart: on-failure:100 restart: on-failure:100
vectorize: vectorize:
image: docker.io/trustgraph/trustgraph-flow:0.5.5 image: docker.io/trustgraph/trustgraph-flow:0.5.6
command: command:
- "embeddings-vectorize" - "embeddings-vectorize"
- "-p" - "-p"
@ -154,7 +154,7 @@ services:
restart: on-failure:100 restart: on-failure:100
embeddings: embeddings:
image: docker.io/trustgraph/trustgraph-flow:0.5.5 image: docker.io/trustgraph/trustgraph-flow:0.5.6
command: command:
- "embeddings-hf" - "embeddings-hf"
- "-p" - "-p"
@ -164,7 +164,7 @@ services:
restart: on-failure:100 restart: on-failure:100
kg-extract-definitions: kg-extract-definitions:
image: docker.io/trustgraph/trustgraph-flow:0.5.5 image: docker.io/trustgraph/trustgraph-flow:0.5.6
command: command:
- "kg-extract-definitions" - "kg-extract-definitions"
- "-p" - "-p"
@ -172,7 +172,7 @@ services:
restart: on-failure:100 restart: on-failure:100
kg-extract-relationships: kg-extract-relationships:
image: docker.io/trustgraph/trustgraph-flow:0.5.5 image: docker.io/trustgraph/trustgraph-flow:0.5.6
command: command:
- "kg-extract-relationships" - "kg-extract-relationships"
- "-p" - "-p"
@ -180,7 +180,7 @@ services:
restart: on-failure:100 restart: on-failure:100
store-graph-embeddings: store-graph-embeddings:
image: docker.io/trustgraph/trustgraph-flow:0.5.5 image: docker.io/trustgraph/trustgraph-flow:0.5.6
command: command:
- "ge-write-milvus" - "ge-write-milvus"
- "-p" - "-p"
@ -190,7 +190,7 @@ services:
restart: on-failure:100 restart: on-failure:100
store-triples: store-triples:
image: docker.io/trustgraph/trustgraph-flow:0.5.5 image: docker.io/trustgraph/trustgraph-flow:0.5.6
command: command:
- "triples-write-cassandra" - "triples-write-cassandra"
- "-p" - "-p"
@ -200,7 +200,7 @@ services:
restart: on-failure:100 restart: on-failure:100
text-completion: text-completion:
image: docker.io/trustgraph/trustgraph-flow:0.5.5 image: docker.io/trustgraph/trustgraph-flow:0.5.6
command: command:
- "text-completion-azure" - "text-completion-azure"
- "-p" - "-p"
@ -211,11 +211,31 @@ services:
- ${AZURE_ENDPOINT} - ${AZURE_ENDPOINT}
restart: on-failure:100 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: graph-rag:
image: docker.io/trustgraph/trustgraph-flow:0.5.5 image: docker.io/trustgraph/trustgraph-flow:0.5.6
command: command:
- "graph-rag" - "graph-rag"
- "-p" - "-p"
- "pulsar://pulsar:6650" - "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 restart: on-failure:100

39
docker-compose-claude.yaml
View file

@ -130,7 +130,7 @@ services:
restart: on-failure:100 restart: on-failure:100
pdf-decoder: pdf-decoder:
image: docker.io/trustgraph/trustgraph-flow:0.5.5 image: docker.io/trustgraph/trustgraph-flow:0.5.6
command: command:
- "pdf-decoder" - "pdf-decoder"
- "-p" - "-p"
@ -138,7 +138,7 @@ services:
restart: on-failure:100 restart: on-failure:100
chunker: chunker:
image: docker.io/trustgraph/trustgraph-flow:0.5.5 image: docker.io/trustgraph/trustgraph-flow:0.5.6
command: command:
- "chunker-recursive" - "chunker-recursive"
- "-p" - "-p"
@ -146,7 +146,7 @@ services:
restart: on-failure:100 restart: on-failure:100
vectorize: vectorize:
image: docker.io/trustgraph/trustgraph-flow:0.5.5 image: docker.io/trustgraph/trustgraph-flow:0.5.6
command: command:
- "embeddings-vectorize" - "embeddings-vectorize"
- "-p" - "-p"
@ -154,7 +154,7 @@ services:
restart: on-failure:100 restart: on-failure:100
embeddings: embeddings:
image: docker.io/trustgraph/trustgraph-flow:0.5.5 image: docker.io/trustgraph/trustgraph-flow:0.5.6
command: command:
- "embeddings-hf" - "embeddings-hf"
- "-p" - "-p"
@ -164,7 +164,7 @@ services:
restart: on-failure:100 restart: on-failure:100
kg-extract-definitions: kg-extract-definitions:
image: docker.io/trustgraph/trustgraph-flow:0.5.5 image: docker.io/trustgraph/trustgraph-flow:0.5.6
command: command:
- "kg-extract-definitions" - "kg-extract-definitions"
- "-p" - "-p"
@ -172,7 +172,7 @@ services:
restart: on-failure:100 restart: on-failure:100
kg-extract-relationships: kg-extract-relationships:
image: docker.io/trustgraph/trustgraph-flow:0.5.5 image: docker.io/trustgraph/trustgraph-flow:0.5.6
command: command:
- "kg-extract-relationships" - "kg-extract-relationships"
- "-p" - "-p"
@ -180,7 +180,7 @@ services:
restart: on-failure:100 restart: on-failure:100
store-graph-embeddings: store-graph-embeddings:
image: docker.io/trustgraph/trustgraph-flow:0.5.5 image: docker.io/trustgraph/trustgraph-flow:0.5.6
command: command:
- "ge-write-milvus" - "ge-write-milvus"
- "-p" - "-p"
@ -190,7 +190,7 @@ services:
restart: on-failure:100 restart: on-failure:100
store-triples: store-triples:
image: docker.io/trustgraph/trustgraph-flow:0.5.5 image: docker.io/trustgraph/trustgraph-flow:0.5.6
command: command:
- "triples-write-cassandra" - "triples-write-cassandra"
- "-p" - "-p"
@ -200,7 +200,7 @@ services:
restart: on-failure:100 restart: on-failure:100
text-completion: text-completion:
image: docker.io/trustgraph/trustgraph-flow:0.5.5 image: docker.io/trustgraph/trustgraph-flow:0.5.6
command: command:
- "text-completion-claude" - "text-completion-claude"
- "-p" - "-p"
@ -209,11 +209,28 @@ services:
- ${CLAUDE_KEY} - ${CLAUDE_KEY}
restart: on-failure:100 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: graph-rag:
image: docker.io/trustgraph/trustgraph-flow:0.5.5 image: docker.io/trustgraph/trustgraph-flow:0.5.6
command: command:
- "graph-rag" - "graph-rag"
- "-p" - "-p"
- "pulsar://pulsar:6650" - "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 restart: on-failure:100

40
docker-compose-ollama.yaml
View file

@ -130,7 +130,7 @@ services:
restart: on-failure:100 restart: on-failure:100
pdf-decoder: pdf-decoder:
image: docker.io/trustgraph/trustgraph-flow:0.5.5 image: docker.io/trustgraph/trustgraph-flow:0.5.6
command: command:
- "pdf-decoder" - "pdf-decoder"
- "-p" - "-p"
@ -138,7 +138,7 @@ services:
restart: on-failure:100 restart: on-failure:100
chunker: chunker:
image: docker.io/trustgraph/trustgraph-flow:0.5.5 image: docker.io/trustgraph/trustgraph-flow:0.5.6
command: command:
- "chunker-recursive" - "chunker-recursive"
- "-p" - "-p"
@ -146,7 +146,7 @@ services:
restart: on-failure:100 restart: on-failure:100
vectorize: vectorize:
image: docker.io/trustgraph/trustgraph-flow:0.5.5 image: docker.io/trustgraph/trustgraph-flow:0.5.6
command: command:
- "embeddings-vectorize" - "embeddings-vectorize"
- "-p" - "-p"
@ -154,7 +154,7 @@ services:
restart: on-failure:100 restart: on-failure:100
embeddings: embeddings:
image: docker.io/trustgraph/trustgraph-flow:0.5.5 image: docker.io/trustgraph/trustgraph-flow:0.5.6
command: command:
- "embeddings-hf" - "embeddings-hf"
- "-p" - "-p"
@ -164,7 +164,7 @@ services:
restart: on-failure:100 restart: on-failure:100
kg-extract-definitions: kg-extract-definitions:
image: docker.io/trustgraph/trustgraph-flow:0.5.5 image: docker.io/trustgraph/trustgraph-flow:0.5.6
command: command:
- "kg-extract-definitions" - "kg-extract-definitions"
- "-p" - "-p"
@ -172,7 +172,7 @@ services:
restart: on-failure:100 restart: on-failure:100
kg-extract-relationships: kg-extract-relationships:
image: docker.io/trustgraph/trustgraph-flow:0.5.5 image: docker.io/trustgraph/trustgraph-flow:0.5.6
command: command:
- "kg-extract-relationships" - "kg-extract-relationships"
- "-p" - "-p"
@ -180,7 +180,7 @@ services:
restart: on-failure:100 restart: on-failure:100
store-graph-embeddings: store-graph-embeddings:
image: docker.io/trustgraph/trustgraph-flow:0.5.5 image: docker.io/trustgraph/trustgraph-flow:0.5.6
command: command:
- "ge-write-milvus" - "ge-write-milvus"
- "-p" - "-p"
@ -190,7 +190,7 @@ services:
restart: on-failure:100 restart: on-failure:100
store-triples: store-triples:
image: docker.io/trustgraph/trustgraph-flow:0.5.5 image: docker.io/trustgraph/trustgraph-flow:0.5.6
command: command:
- "triples-write-cassandra" - "triples-write-cassandra"
- "-p" - "-p"
@ -200,7 +200,7 @@ services:
restart: on-failure:100 restart: on-failure:100
text-completion: text-completion:
image: docker.io/trustgraph/trustgraph-flow:0.5.5 image: docker.io/trustgraph/trustgraph-flow:0.5.6
command: command:
- "text-completion-ollama" - "text-completion-ollama"
- "-p" - "-p"
@ -210,12 +210,32 @@ services:
# - "-m" # - "-m"
# - "llama3.1:8b" # - "llama3.1:8b"
restart: on-failure:100 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: graph-rag:
image: docker.io/trustgraph/trustgraph-flow:0.5.5 image: docker.io/trustgraph/trustgraph-flow:0.5.6
command: command:
- "graph-rag" - "graph-rag"
- "-p" - "-p"
- "pulsar://pulsar:6650" - "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 restart: on-failure:100

42
docker-compose-vertexai.yaml
View file

@ -130,7 +130,7 @@ services:
restart: on-failure:100 restart: on-failure:100
pdf-decoder: pdf-decoder:
image: docker.io/trustgraph/trustgraph-flow:0.5.5 image: docker.io/trustgraph/trustgraph-flow:0.5.6
command: command:
- "pdf-decoder" - "pdf-decoder"
- "-p" - "-p"
@ -138,7 +138,7 @@ services:
restart: on-failure:100 restart: on-failure:100
chunker: chunker:
image: docker.io/trustgraph/trustgraph-flow:0.5.5 image: docker.io/trustgraph/trustgraph-flow:0.5.6
command: command:
- "chunker-recursive" - "chunker-recursive"
- "-p" - "-p"
@ -146,7 +146,7 @@ services:
restart: on-failure:100 restart: on-failure:100
vectorize: vectorize:
image: docker.io/trustgraph/trustgraph-flow:0.5.5 image: docker.io/trustgraph/trustgraph-flow:0.5.6
command: command:
- "embeddings-vectorize" - "embeddings-vectorize"
- "-p" - "-p"
@ -154,7 +154,7 @@ services:
restart: on-failure:100 restart: on-failure:100
embeddings: embeddings:
image: docker.io/trustgraph/trustgraph-flow:0.5.5 image: docker.io/trustgraph/trustgraph-flow:0.5.6
command: command:
- "embeddings-hf" - "embeddings-hf"
- "-p" - "-p"
@ -164,7 +164,7 @@ services:
restart: on-failure:100 restart: on-failure:100
kg-extract-definitions: kg-extract-definitions:
image: docker.io/trustgraph/trustgraph-flow:0.5.5 image: docker.io/trustgraph/trustgraph-flow:0.5.6
command: command:
- "kg-extract-definitions" - "kg-extract-definitions"
- "-p" - "-p"
@ -172,7 +172,7 @@ services:
restart: on-failure:100 restart: on-failure:100
kg-extract-relationships: kg-extract-relationships:
image: docker.io/trustgraph/trustgraph-flow:0.5.5 image: docker.io/trustgraph/trustgraph-flow:0.5.6
command: command:
- "kg-extract-relationships" - "kg-extract-relationships"
- "-p" - "-p"
@ -180,7 +180,7 @@ services:
restart: on-failure:100 restart: on-failure:100
store-graph-embeddings: store-graph-embeddings:
image: docker.io/trustgraph/trustgraph-flow:0.5.5 image: docker.io/trustgraph/trustgraph-flow:0.5.6
command: command:
- "ge-write-milvus" - "ge-write-milvus"
- "-p" - "-p"
@ -190,7 +190,7 @@ services:
restart: on-failure:100 restart: on-failure:100
store-triples: store-triples:
image: docker.io/trustgraph/trustgraph-flow:0.5.5 image: docker.io/trustgraph/trustgraph-flow:0.5.6
command: command:
- "triples-write-cassandra" - "triples-write-cassandra"
- "-p" - "-p"
@ -200,9 +200,9 @@ services:
restart: on-failure:100 restart: on-failure:100
text-completion: text-completion:
image: docker.io/trustgraph/trustgraph-flow:0.5.5 image: docker.io/trustgraph/trustgraph-flow:0.5.6
command: command:
- "text-completion-ollama" - "text-completion-vertexai"
- "-p" - "-p"
- "pulsar://pulsar:6650" - "pulsar://pulsar:6650"
- "-k" - "-k"
@ -212,12 +212,32 @@ services:
volumes: volumes:
- "./vertexai:/vertexai" - "./vertexai:/vertexai"
restart: on-failure:100 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: graph-rag:
image: docker.io/trustgraph/trustgraph-flow:0.5.5 image: docker.io/trustgraph/trustgraph-flow:0.5.6
command: command:
- "graph-rag" - "graph-rag"
- "-p" - "-p"
- "pulsar://pulsar:6650" - "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 restart: on-failure:100

2
setup.py
View file

@ -4,7 +4,7 @@ import os
with open("README.md", "r") as fh: with open("README.md", "r") as fh:
long_description = fh.read() long_description = fh.read()
version = "0.5.5" version = "0.5.6"
setuptools.setup( setuptools.setup(
name="trustgraph", name="trustgraph",