diff --git a/Makefile b/Makefile index 6951087b..c33db3d6 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ # VERSION=$(shell git describe | sed 's/^v//') -VERSION=0.6.1 +VERSION=0.6.2 DOCKER=podman @@ -38,6 +38,6 @@ DCS=$(foreach template,${TEMPLATES},${template:%=docker-compose-%.yaml}) update-templates: set-version ${DCS} -docker-compose-%.yaml: templates/docker-compose-%.jsonnet templates/version.jsonnet +docker-compose-%.yaml: templates/docker-compose-%.jsonnet templates/components/version.jsonnet jsonnet -S ${@:docker-compose-%.yaml=templates/docker-compose-%.jsonnet} > $@ diff --git a/docker-compose-azure.yaml b/docker-compose-azure.yaml index 98a25510..0c03f9c0 100644 --- a/docker-compose-azure.yaml +++ b/docker-compose-azure.yaml @@ -11,14 +11,14 @@ - "chunker-recursive" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "embeddings": "command": - "embeddings-hf" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "etcd": "command": @@ -60,7 +60,7 @@ - "non-persistent://tg/request/prompt-rag" - "--prompt-response-queue" - "non-persistent://tg/response/prompt-rag-response" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "init-pulsar": "command": @@ -77,14 +77,14 @@ - "kg-extract-definitions" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "kg-extract-relationships": "command": - "kg-extract-relationships" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "milvus": "command": @@ -122,7 +122,7 @@ - "pdf-decoder" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "prometheus": "image": "docker.io/prom/prometheus:v2.53.1" @@ -141,7 +141,7 @@ - "non-persistent://tg/request/text-completion" - "--text-completion-response-queue" - "non-persistent://tg/response/text-completion-response" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "prompt-rag": "command": @@ -156,7 +156,7 @@ - "non-persistent://tg/request/text-completion-rag" - "--text-completion-response-queue" - "non-persistent://tg/response/text-completion-rag-response" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "pulsar": "command": "bin/pulsar standalone" @@ -183,7 +183,7 @@ - "pulsar://pulsar:6650" - "-t" - "http://milvus:19530" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "query-triples": "command": @@ -192,7 +192,7 @@ - "pulsar://pulsar:6650" - "-g" - "cassandra" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "store-graph-embeddings": "command": @@ -201,7 +201,7 @@ - "pulsar://pulsar:6650" - "-t" - "http://milvus:19530" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "store-triples": "command": @@ -210,7 +210,7 @@ - "pulsar://pulsar:6650" - "-g" - "cassandra" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "text-completion": "command": @@ -221,7 +221,7 @@ - "${AZURE_TOKEN}" - "-e" - "${AZURE_ENDPOINT}" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "text-completion-rag": "command": @@ -236,14 +236,14 @@ - "non-persistent://tg/request/text-completion-rag" - "-o" - "non-persistent://tg/response/text-completion-rag-response" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "vectorize": "command": - "embeddings-vectorize" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "volumes": "cassandra": {} diff --git a/docker-compose-bedrock.yaml b/docker-compose-bedrock.yaml index fa6edfa4..fb73a518 100644 --- a/docker-compose-bedrock.yaml +++ b/docker-compose-bedrock.yaml @@ -15,14 +15,14 @@ - "2000" - "--chunk-overlap" - "100" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "embeddings": "command": - "embeddings-hf" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "etcd": "command": @@ -64,7 +64,7 @@ - "non-persistent://tg/request/prompt-rag" - "--prompt-response-queue" - "non-persistent://tg/response/prompt-rag-response" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "init-pulsar": "command": @@ -81,14 +81,14 @@ - "kg-extract-definitions" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "kg-extract-relationships": "command": - "kg-extract-relationships" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "milvus": "command": @@ -126,7 +126,7 @@ - "pdf-decoder" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "prometheus": "image": "docker.io/prom/prometheus:v2.53.1" @@ -145,7 +145,7 @@ - "non-persistent://tg/request/text-completion" - "--text-completion-response-queue" - "non-persistent://tg/response/text-completion-response" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "prompt-rag": "command": @@ -160,7 +160,7 @@ - "non-persistent://tg/request/text-completion-rag" - "--text-completion-response-queue" - "non-persistent://tg/response/text-completion-rag-response" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "pulsar": "command": "bin/pulsar standalone" @@ -187,7 +187,7 @@ - "pulsar://pulsar:6650" - "-t" - "http://milvus:19530" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "query-triples": "command": @@ -196,7 +196,7 @@ - "pulsar://pulsar:6650" - "-g" - "cassandra" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "store-graph-embeddings": "command": @@ -205,7 +205,7 @@ - "pulsar://pulsar:6650" - "-t" - "http://milvus:19530" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "store-triples": "command": @@ -214,7 +214,7 @@ - "pulsar://pulsar:6650" - "-g" - "cassandra" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "text-completion": "command": @@ -227,7 +227,7 @@ - "${AWS_SECRET_KEY}" - "-r" - "us-west-2" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "text-completion-rag": "command": @@ -244,14 +244,14 @@ - "non-persistent://tg/request/text-completion-rag" - "-o" - "non-persistent://tg/response/text-completion-rag-response" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "vectorize": "command": - "embeddings-vectorize" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "volumes": "cassandra": {} diff --git a/docker-compose-claude.yaml b/docker-compose-claude.yaml index 635cd368..cdc79cd9 100644 --- a/docker-compose-claude.yaml +++ b/docker-compose-claude.yaml @@ -11,14 +11,14 @@ - "chunker-recursive" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "embeddings": "command": - "embeddings-hf" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "etcd": "command": @@ -60,7 +60,7 @@ - "non-persistent://tg/request/prompt-rag" - "--prompt-response-queue" - "non-persistent://tg/response/prompt-rag-response" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "init-pulsar": "command": @@ -77,14 +77,14 @@ - "kg-extract-definitions" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "kg-extract-relationships": "command": - "kg-extract-relationships" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "milvus": "command": @@ -122,7 +122,7 @@ - "pdf-decoder" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "prometheus": "image": "docker.io/prom/prometheus:v2.53.1" @@ -141,7 +141,7 @@ - "non-persistent://tg/request/text-completion" - "--text-completion-response-queue" - "non-persistent://tg/response/text-completion-response" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "prompt-rag": "command": @@ -156,7 +156,7 @@ - "non-persistent://tg/request/text-completion-rag" - "--text-completion-response-queue" - "non-persistent://tg/response/text-completion-rag-response" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "pulsar": "command": "bin/pulsar standalone" @@ -183,7 +183,7 @@ - "pulsar://pulsar:6650" - "-t" - "http://milvus:19530" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "query-triples": "command": @@ -192,7 +192,7 @@ - "pulsar://pulsar:6650" - "-g" - "cassandra" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "store-graph-embeddings": "command": @@ -201,7 +201,7 @@ - "pulsar://pulsar:6650" - "-t" - "http://milvus:19530" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "store-triples": "command": @@ -210,7 +210,7 @@ - "pulsar://pulsar:6650" - "-g" - "cassandra" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "text-completion": "command": @@ -219,7 +219,7 @@ - "pulsar://pulsar:6650" - "-k" - "${CLAUDE_KEY}" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "text-completion-rag": "command": @@ -232,14 +232,14 @@ - "non-persistent://tg/request/text-completion-rag" - "-o" - "non-persistent://tg/response/text-completion-rag-response" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "vectorize": "command": - "embeddings-vectorize" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "volumes": "cassandra": {} diff --git a/docker-compose-cohere.yaml b/docker-compose-cohere.yaml index 2f01fc0f..2d80a7b7 100644 --- a/docker-compose-cohere.yaml +++ b/docker-compose-cohere.yaml @@ -15,14 +15,14 @@ - "1000" - "--chunk-overlap" - "50" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "embeddings": "command": - "embeddings-hf" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "etcd": "command": @@ -64,7 +64,7 @@ - "non-persistent://tg/request/prompt-rag" - "--prompt-response-queue" - "non-persistent://tg/response/prompt-rag-response" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "init-pulsar": "command": @@ -81,14 +81,14 @@ - "kg-extract-definitions" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "kg-extract-relationships": "command": - "kg-extract-relationships" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "milvus": "command": @@ -126,7 +126,7 @@ - "pdf-decoder" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "prometheus": "image": "docker.io/prom/prometheus:v2.53.1" @@ -145,7 +145,7 @@ - "non-persistent://tg/request/text-completion" - "--text-completion-response-queue" - "non-persistent://tg/response/text-completion-response" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "prompt-rag": "command": @@ -160,7 +160,7 @@ - "non-persistent://tg/request/text-completion-rag" - "--text-completion-response-queue" - "non-persistent://tg/response/text-completion-rag-response" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "pulsar": "command": "bin/pulsar standalone" @@ -187,7 +187,7 @@ - "pulsar://pulsar:6650" - "-t" - "http://milvus:19530" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "query-triples": "command": @@ -196,7 +196,7 @@ - "pulsar://pulsar:6650" - "-g" - "cassandra" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "store-graph-embeddings": "command": @@ -205,7 +205,7 @@ - "pulsar://pulsar:6650" - "-t" - "http://milvus:19530" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "store-triples": "command": @@ -214,7 +214,7 @@ - "pulsar://pulsar:6650" - "-g" - "cassandra" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "text-completion": "command": @@ -223,7 +223,7 @@ - "pulsar://pulsar:6650" - "-k" - "${COHERE_KEY}" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "text-completion-rag": "command": @@ -236,14 +236,14 @@ - "non-persistent://tg/request/text-completion-rag" - "-o" - "non-persistent://tg/response/text-completion-rag-response" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "vectorize": "command": - "embeddings-vectorize" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "volumes": "cassandra": {} diff --git a/docker-compose-mix.yaml b/docker-compose-mix.yaml index 0bcd76ad..8306a043 100644 --- a/docker-compose-mix.yaml +++ b/docker-compose-mix.yaml @@ -15,14 +15,14 @@ - "4000" - "--chunk-overlap" - "120" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "embeddings": "command": - "embeddings-hf" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "etcd": "command": @@ -64,7 +64,7 @@ - "non-persistent://tg/request/prompt-rag" - "--prompt-response-queue" - "non-persistent://tg/response/prompt-rag-response" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "init-pulsar": "command": @@ -81,14 +81,14 @@ - "kg-extract-definitions" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "kg-extract-relationships": "command": - "kg-extract-relationships" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "milvus": "command": @@ -126,7 +126,7 @@ - "pdf-decoder" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "prometheus": "image": "docker.io/prom/prometheus:v2.53.1" @@ -145,7 +145,7 @@ - "non-persistent://tg/request/text-completion" - "--text-completion-response-queue" - "non-persistent://tg/response/text-completion-response" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "prompt-rag": "command": @@ -160,7 +160,7 @@ - "non-persistent://tg/request/text-completion-rag" - "--text-completion-response-queue" - "non-persistent://tg/response/text-completion-rag-response" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "pulsar": "command": "bin/pulsar standalone" @@ -187,7 +187,7 @@ - "pulsar://pulsar:6650" - "-t" - "http://milvus:19530" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "query-triples": "command": @@ -196,7 +196,7 @@ - "pulsar://pulsar:6650" - "-g" - "cassandra" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "store-graph-embeddings": "command": @@ -205,7 +205,7 @@ - "pulsar://pulsar:6650" - "-t" - "http://milvus:19530" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "store-triples": "command": @@ -214,7 +214,7 @@ - "pulsar://pulsar:6650" - "-g" - "cassandra" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "text-completion": "command": @@ -225,7 +225,7 @@ - "${COHERE_KEY}" - "-m" - "c4ai-aya-23-35b" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "text-completion-rag": "command": @@ -240,14 +240,14 @@ - "non-persistent://tg/response/text-completion-rag-response" - "-m" - "c4ai-aya-23-8b" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "vectorize": "command": - "embeddings-vectorize" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "volumes": "cassandra": {} diff --git a/docker-compose-ollama.yaml b/docker-compose-ollama.yaml index 3450c875..5c760332 100644 --- a/docker-compose-ollama.yaml +++ b/docker-compose-ollama.yaml @@ -11,14 +11,14 @@ - "chunker-recursive" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "embeddings": "command": - "embeddings-hf" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "etcd": "command": @@ -60,7 +60,7 @@ - "non-persistent://tg/request/prompt-rag" - "--prompt-response-queue" - "non-persistent://tg/response/prompt-rag-response" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "init-pulsar": "command": @@ -77,14 +77,14 @@ - "kg-extract-definitions" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "kg-extract-relationships": "command": - "kg-extract-relationships" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "milvus": "command": @@ -122,7 +122,7 @@ - "pdf-decoder" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "prometheus": "image": "docker.io/prom/prometheus:v2.53.1" @@ -141,7 +141,7 @@ - "non-persistent://tg/request/text-completion" - "--text-completion-response-queue" - "non-persistent://tg/response/text-completion-response" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "prompt-rag": "command": @@ -156,7 +156,7 @@ - "non-persistent://tg/request/text-completion-rag" - "--text-completion-response-queue" - "non-persistent://tg/response/text-completion-rag-response" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "pulsar": "command": "bin/pulsar standalone" @@ -183,7 +183,7 @@ - "pulsar://pulsar:6650" - "-t" - "http://milvus:19530" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "query-triples": "command": @@ -192,7 +192,7 @@ - "pulsar://pulsar:6650" - "-g" - "cassandra" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "store-graph-embeddings": "command": @@ -201,7 +201,7 @@ - "pulsar://pulsar:6650" - "-t" - "http://milvus:19530" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "store-triples": "command": @@ -210,7 +210,7 @@ - "pulsar://pulsar:6650" - "-g" - "cassandra" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "text-completion": "command": @@ -219,7 +219,7 @@ - "pulsar://pulsar:6650" - "-r" - "${OLLAMA_HOST}" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "text-completion-rag": "command": @@ -232,14 +232,14 @@ - "non-persistent://tg/request/text-completion-rag" - "-o" - "non-persistent://tg/response/text-completion-rag-response" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "vectorize": "command": - "embeddings-vectorize" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "volumes": "cassandra": {} diff --git a/docker-compose-openai-neo4j.yaml b/docker-compose-openai-neo4j.yaml index 4ef1c177..a44fb575 100644 --- a/docker-compose-openai-neo4j.yaml +++ b/docker-compose-openai-neo4j.yaml @@ -4,14 +4,14 @@ - "chunker-recursive" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "embeddings": "command": - "embeddings-hf" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "etcd": "command": @@ -53,7 +53,7 @@ - "non-persistent://tg/request/prompt-rag" - "--prompt-response-queue" - "non-persistent://tg/response/prompt-rag-response" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "init-pulsar": "command": @@ -70,14 +70,14 @@ - "kg-extract-definitions" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "kg-extract-relationships": "command": - "kg-extract-relationships" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "milvus": "command": @@ -125,7 +125,7 @@ - "pdf-decoder" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "prometheus": "image": "docker.io/prom/prometheus:v2.53.1" @@ -144,7 +144,7 @@ - "non-persistent://tg/request/text-completion" - "--text-completion-response-queue" - "non-persistent://tg/response/text-completion-response" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "prompt-rag": "command": @@ -159,7 +159,7 @@ - "non-persistent://tg/request/text-completion-rag" - "--text-completion-response-queue" - "non-persistent://tg/response/text-completion-rag-response" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "pulsar": "command": "bin/pulsar standalone" @@ -186,7 +186,7 @@ - "pulsar://pulsar:6650" - "-t" - "http://milvus:19530" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "query-triples": "command": @@ -195,7 +195,7 @@ - "pulsar://pulsar:6650" - "-g" - "bolt://neo4j:7687" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "store-graph-embeddings": "command": @@ -204,7 +204,7 @@ - "pulsar://pulsar:6650" - "-t" - "http://milvus:19530" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "store-triples": "command": @@ -213,7 +213,7 @@ - "pulsar://pulsar:6650" - "-g" - "bolt://neo4j:7687" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "text-completion": "command": @@ -222,7 +222,7 @@ - "pulsar://pulsar:6650" - "-k" - "${OPENAI_KEY}" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "text-completion-rag": "command": @@ -235,14 +235,14 @@ - "non-persistent://tg/request/text-completion-rag" - "-o" - "non-persistent://tg/response/text-completion-rag-response" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "vectorize": "command": - "embeddings-vectorize" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "volumes": "etcd": {} diff --git a/docker-compose-openai.yaml b/docker-compose-openai.yaml index 8a6e03ee..f6dd3667 100644 --- a/docker-compose-openai.yaml +++ b/docker-compose-openai.yaml @@ -11,14 +11,14 @@ - "chunker-recursive" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "embeddings": "command": - "embeddings-hf" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "etcd": "command": @@ -60,7 +60,7 @@ - "non-persistent://tg/request/prompt-rag" - "--prompt-response-queue" - "non-persistent://tg/response/prompt-rag-response" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "init-pulsar": "command": @@ -77,14 +77,14 @@ - "kg-extract-definitions" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "kg-extract-relationships": "command": - "kg-extract-relationships" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "milvus": "command": @@ -122,7 +122,7 @@ - "pdf-decoder" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "prometheus": "image": "docker.io/prom/prometheus:v2.53.1" @@ -141,7 +141,7 @@ - "non-persistent://tg/request/text-completion" - "--text-completion-response-queue" - "non-persistent://tg/response/text-completion-response" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "prompt-rag": "command": @@ -156,7 +156,7 @@ - "non-persistent://tg/request/text-completion-rag" - "--text-completion-response-queue" - "non-persistent://tg/response/text-completion-rag-response" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "pulsar": "command": "bin/pulsar standalone" @@ -183,7 +183,7 @@ - "pulsar://pulsar:6650" - "-t" - "http://milvus:19530" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "query-triples": "command": @@ -192,7 +192,7 @@ - "pulsar://pulsar:6650" - "-g" - "cassandra" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "store-graph-embeddings": "command": @@ -201,7 +201,7 @@ - "pulsar://pulsar:6650" - "-t" - "http://milvus:19530" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "store-triples": "command": @@ -210,7 +210,7 @@ - "pulsar://pulsar:6650" - "-g" - "cassandra" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "text-completion": "command": @@ -219,7 +219,7 @@ - "pulsar://pulsar:6650" - "-k" - "${OPENAI_KEY}" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "text-completion-rag": "command": @@ -232,14 +232,14 @@ - "non-persistent://tg/request/text-completion-rag" - "-o" - "non-persistent://tg/response/text-completion-rag-response" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "vectorize": "command": - "embeddings-vectorize" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "volumes": "cassandra": {} diff --git a/docker-compose-vertexai.yaml b/docker-compose-vertexai.yaml index 424e6942..fac552bd 100644 --- a/docker-compose-vertexai.yaml +++ b/docker-compose-vertexai.yaml @@ -11,14 +11,14 @@ - "chunker-recursive" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "embeddings": "command": - "embeddings-hf" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "etcd": "command": @@ -60,7 +60,7 @@ - "non-persistent://tg/request/prompt-rag" - "--prompt-response-queue" - "non-persistent://tg/response/prompt-rag-response" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "init-pulsar": "command": @@ -77,14 +77,14 @@ - "kg-extract-definitions" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "kg-extract-relationships": "command": - "kg-extract-relationships" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "milvus": "command": @@ -122,7 +122,7 @@ - "pdf-decoder" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "prometheus": "image": "docker.io/prom/prometheus:v2.53.1" @@ -141,7 +141,7 @@ - "non-persistent://tg/request/text-completion" - "--text-completion-response-queue" - "non-persistent://tg/response/text-completion-response" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "prompt-rag": "command": @@ -156,7 +156,7 @@ - "non-persistent://tg/request/text-completion-rag" - "--text-completion-response-queue" - "non-persistent://tg/response/text-completion-rag-response" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "pulsar": "command": "bin/pulsar standalone" @@ -183,7 +183,7 @@ - "pulsar://pulsar:6650" - "-t" - "http://milvus:19530" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "query-triples": "command": @@ -192,7 +192,7 @@ - "pulsar://pulsar:6650" - "-g" - "cassandra" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "store-graph-embeddings": "command": @@ -201,7 +201,7 @@ - "pulsar://pulsar:6650" - "-t" - "http://milvus:19530" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "store-triples": "command": @@ -210,7 +210,7 @@ - "pulsar://pulsar:6650" - "-g" - "cassandra" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "text-completion": "command": @@ -221,7 +221,7 @@ - "/vertexai/private.json" - "-r" - "us-west1" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "volumes": - "./vertexai:/vertexai" @@ -238,7 +238,7 @@ - "non-persistent://tg/request/text-completion-rag" - "-o" - "non-persistent://tg/response/text-completion-rag-response" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "volumes": - "./vertexai:/vertexai" @@ -247,7 +247,7 @@ - "embeddings-vectorize" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.2" "restart": "on-failure:100" "volumes": "cassandra": {} diff --git a/setup.py b/setup.py index 2963cc61..a395b74f 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.6.1" +version = "0.6.2" setuptools.setup( name="trustgraph", diff --git a/templates/components/azure.jsonnet b/templates/components/azure.jsonnet new file mode 100644 index 00000000..cbf5a3d1 --- /dev/null +++ b/templates/components/azure.jsonnet @@ -0,0 +1,38 @@ +local base = import "base.jsonnet"; +local images = import "images.jsonnet"; +local url = import "url.jsonnet"; +{ + services +: { + + "text-completion": base + { + image: images.trustgraph, + command: [ + "text-completion-azure", + "-p", + url.pulsar, + "-k", + "${AZURE_TOKEN}", + "-e", + "${AZURE_ENDPOINT}", + ], + }, + + "text-completion-rag": base + { + image: images.trustgraph, + command: [ + "text-completion-azure", + "-p", + url.pulsar, + "-k", + "${AZURE_TOKEN}", + "-e", + "${AZURE_ENDPOINT}", + "-i", + "non-persistent://tg/request/text-completion-rag", + "-o", + "non-persistent://tg/response/text-completion-rag-response", + ], + }, + + }, +} diff --git a/templates/components/bedrock.jsonnet b/templates/components/bedrock.jsonnet new file mode 100644 index 00000000..454e593a --- /dev/null +++ b/templates/components/bedrock.jsonnet @@ -0,0 +1,57 @@ +local base = import "base.jsonnet"; +local images = import "images.jsonnet"; +local url = import "url.jsonnet"; +{ + services +: { + + chunker: base + { + image: images.trustgraph, + command: [ + "chunker-recursive", + "-p", + url.pulsar, + "--chunk-size", + "2000", + "--chunk-overlap", + "100", + ], + }, + + "text-completion": base + { + image: images.trustgraph, + command: [ + "text-completion-bedrock", + "-p", + url.pulsar, + "-z", + "${AWS_ID_KEY}", + "-k", + "${AWS_SECRET_KEY}", + "-r", + "us-west-2", + ], + }, + + "text-completion-rag": base + { + image: images.trustgraph, + command: [ + "text-completion-bedrock", + "-p", + url.pulsar, + // "-m", + // "mistral.mistral-large-2407-v1:0", + "-z", + "${AWS_ID_KEY}", + "-k", + "${AWS_SECRET_KEY}", + "-r", + "us-west-2", + "-i", + "non-persistent://tg/request/text-completion-rag", + "-o", + "non-persistent://tg/response/text-completion-rag-response", + ], + }, + + }, +} diff --git a/templates/components/cassandra.jsonnet b/templates/components/cassandra.jsonnet index eb0cd466..af9dd5f1 100644 --- a/templates/components/cassandra.jsonnet +++ b/templates/components/cassandra.jsonnet @@ -1,10 +1,13 @@ local base = import "base.jsonnet"; local images = import "images.jsonnet"; +local url = import "url.jsonnet"; +local cassandra_hosts = "cassandra"; { volumes +: { cassandra: {}, }, services +: { + cassandra: base + { image: images.cassandra, ports: [ @@ -13,6 +16,29 @@ local images = import "images.jsonnet"; volumes: [ "cassandra:/var/lib/cassandra" ], - } + }, + + "store-triples": base + { + image: images.trustgraph, + command: [ + "triples-write-cassandra", + "-p", + url.pulsar, + "-g", + cassandra_hosts, + ], + }, + + "query-triples": base + { + image: images.trustgraph, + command: [ + "triples-query-cassandra", + "-p", + url.pulsar, + "-g", + cassandra_hosts, + ], + }, + }, } diff --git a/templates/components/claude.jsonnet b/templates/components/claude.jsonnet new file mode 100644 index 00000000..d446b748 --- /dev/null +++ b/templates/components/claude.jsonnet @@ -0,0 +1,34 @@ +local base = import "base.jsonnet"; +local images = import "images.jsonnet"; +local url = import "url.jsonnet"; +{ + services +: { + + "text-completion": base + { + image: images.trustgraph, + command: [ + "text-completion-claude", + "-p", + url.pulsar, + "-k", + "${CLAUDE_KEY}", + ], + }, + + "text-completion-rag": base + { + image: images.trustgraph, + command: [ + "text-completion-claude", + "-p", + url.pulsar, + "-k", + "${CLAUDE_KEY}", + "-i", + "non-persistent://tg/request/text-completion-rag", + "-o", + "non-persistent://tg/response/text-completion-rag-response", + ], + }, + + }, +} diff --git a/templates/components/cohere.jsonnet b/templates/components/cohere.jsonnet new file mode 100644 index 00000000..391ae054 --- /dev/null +++ b/templates/components/cohere.jsonnet @@ -0,0 +1,47 @@ +local base = import "base.jsonnet"; +local images = import "images.jsonnet"; +local url = import "url.jsonnet"; +{ + services +: { + + chunker: base + { + image: images.trustgraph, + command: [ + "chunker-recursive", + "-p", + url.pulsar, + "--chunk-size", + "1000", + "--chunk-overlap", + "50", + ], + }, + + "text-completion": base + { + image: images.trustgraph, + command: [ + "text-completion-cohere", + "-p", + url.pulsar, + "-k", + "${COHERE_KEY}", + ], + }, + + "text-completion-rag": base + { + image: images.trustgraph, + command: [ + "text-completion-cohere", + "-p", + url.pulsar, + "-k", + "${COHERE_KEY}", + "-i", + "non-persistent://tg/request/text-completion-rag", + "-o", + "non-persistent://tg/response/text-completion-rag-response", + ], + }, + + }, +} diff --git a/templates/components/neo4j.jsonnet b/templates/components/neo4j.jsonnet index 47f42394..dd6670d2 100644 --- a/templates/components/neo4j.jsonnet +++ b/templates/components/neo4j.jsonnet @@ -1,10 +1,14 @@ local base = import "base.jsonnet"; local images = import "images.jsonnet"; +local url = import "url.jsonnet"; { + volumes +: { neo4j: {}, }, + services +: { + neo4j: base + { image: images.neo4j, ports: [ @@ -20,6 +24,30 @@ local images = import "images.jsonnet"; volumes: [ "neo4j:/data" ], + }, + + "query-triples": base + { + image: images.trustgraph, + command: [ + "triples-query-neo4j", + "-p", + url.pulsar, + "-g", + "bolt://neo4j:7687", + ], + }, + + "store-triples": base + { + image: images.trustgraph, + command: [ + "triples-write-neo4j", + "-p", + url.pulsar, + "-g", + "bolt://neo4j:7687", + ], } + }, + } diff --git a/templates/components/ollama.jsonnet b/templates/components/ollama.jsonnet new file mode 100644 index 00000000..af9922c1 --- /dev/null +++ b/templates/components/ollama.jsonnet @@ -0,0 +1,38 @@ +local base = import "base.jsonnet"; +local images = import "images.jsonnet"; +local url = import "url.jsonnet"; +{ + services +: { + + "text-completion": base + { + image: images.trustgraph, + command: [ + "text-completion-ollama", + "-p", + url.pulsar, + // "-m", + // "llama3.1:8b", + "-r", + "${OLLAMA_HOST}", + ], + }, + + "text-completion-rag": base + { + image: images.trustgraph, + command: [ + "text-completion-ollama", + "-p", + url.pulsar, + // "-m", + // "llama3.1:8b", + "-r", + "${OLLAMA_HOST}", + "-i", + "non-persistent://tg/request/text-completion-rag", + "-o", + "non-persistent://tg/response/text-completion-rag-response", + ], + }, + + }, +} diff --git a/templates/components/openai.jsonnet b/templates/components/openai.jsonnet new file mode 100644 index 00000000..7bd21e55 --- /dev/null +++ b/templates/components/openai.jsonnet @@ -0,0 +1,34 @@ +local base = import "base.jsonnet"; +local images = import "images.jsonnet"; +local url = import "url.jsonnet"; +{ + services +: { + + "text-completion": base + { + image: images.trustgraph, + command: [ + "text-completion-openai", + "-p", + url.pulsar, + "-k", + "${OPENAI_KEY}", + ], + }, + + "text-completion-rag": base + { + image: images.trustgraph, + command: [ + "text-completion-openai", + "-p", + url.pulsar, + "-k", + "${OPENAI_KEY}", + "-i", + "non-persistent://tg/request/text-completion-rag", + "-o", + "non-persistent://tg/response/text-completion-rag-response", + ], + }, + + }, +} diff --git a/templates/components/trustgraph.jsonnet b/templates/components/trustgraph.jsonnet index 7281d906..0962c98f 100644 --- a/templates/components/trustgraph.jsonnet +++ b/templates/components/trustgraph.jsonnet @@ -5,8 +5,6 @@ local images = import "images.jsonnet"; local url = import "url.jsonnet"; -local cassandra_hosts = "cassandra"; - { services +: { @@ -88,28 +86,6 @@ local cassandra_hosts = "cassandra"; ], }, - "store-triples": base + { - image: images.trustgraph, - command: [ - "triples-write-cassandra", - "-p", - url.pulsar, - "-g", - cassandra_hosts, - ], - }, - - "query-triples": base + { - image: images.trustgraph, - command: [ - "triples-query-cassandra", - "-p", - url.pulsar, - "-g", - cassandra_hosts, - ], - }, - "graph-rag": base + { image: images.trustgraph, command: [ diff --git a/templates/components/version.jsonnet b/templates/components/version.jsonnet new file mode 100644 index 00000000..a3820e12 --- /dev/null +++ b/templates/components/version.jsonnet @@ -0,0 +1 @@ +"0.6.2" diff --git a/templates/components/vertexai.jsonnet b/templates/components/vertexai.jsonnet new file mode 100644 index 00000000..a0780f9b --- /dev/null +++ b/templates/components/vertexai.jsonnet @@ -0,0 +1,44 @@ +local base = import "base.jsonnet"; +local images = import "images.jsonnet"; +local url = import "url.jsonnet"; +{ + services +: { + + "text-completion": base + { + image: images.trustgraph, + command: [ + "text-completion-vertexai", + "-p", + url.pulsar, + "-k", + "/vertexai/private.json", + "-r", + "us-west1", + ], + volumes: [ + "./vertexai:/vertexai" + ], + }, + + "text-completion-rag": base + { + image: images.trustgraph, + command: [ + "text-completion-vertexai", + "-p", + url.pulsar, + "-k", + "/vertexai/private.json", + "-r", + "us-west1", + "-i", + "non-persistent://tg/request/text-completion-rag", + "-o", + "non-persistent://tg/response/text-completion-rag-response", + ], + volumes: [ + "./vertexai:/vertexai" + ], + }, + + }, +} diff --git a/templates/docker-compose-azure.jsonnet b/templates/docker-compose-azure.jsonnet index 0ceba3a4..4dba5d1a 100644 --- a/templates/docker-compose-azure.jsonnet +++ b/templates/docker-compose-azure.jsonnet @@ -1,49 +1,12 @@ -local base = import "components/base.jsonnet"; -local url = import "components/url.jsonnet"; -local images = import "components/images.jsonnet"; - local cassandra = import "components/cassandra.jsonnet"; local pulsar = import "components/pulsar.jsonnet"; local milvus = import "components/milvus.jsonnet"; local grafana = import "components/grafana.jsonnet"; local trustgraph = import "components/trustgraph.jsonnet"; +local azure = import "components/azure.jsonnet"; -local config = cassandra + pulsar + milvus + grafana + trustgraph + { - services +: { - - "text-completion": base + { - image: images.trustgraph, - command: [ - "text-completion-azure", - "-p", - url.pulsar, - "-k", - "${AZURE_TOKEN}", - "-e", - "${AZURE_ENDPOINT}", - ], - }, - - "text-completion-rag": base + { - image: images.trustgraph, - command: [ - "text-completion-azure", - "-p", - url.pulsar, - "-k", - "${AZURE_TOKEN}", - "-e", - "${AZURE_ENDPOINT}", - "-i", - "non-persistent://tg/request/text-completion-rag", - "-o", - "non-persistent://tg/response/text-completion-rag-response", - ], - }, - - } -}; +local config = cassandra + pulsar + milvus + grafana + trustgraph + azure; std.manifestYamlDoc(config) diff --git a/templates/docker-compose-bedrock.jsonnet b/templates/docker-compose-bedrock.jsonnet index 1f100694..4b233ba9 100644 --- a/templates/docker-compose-bedrock.jsonnet +++ b/templates/docker-compose-bedrock.jsonnet @@ -1,68 +1,12 @@ -local base = import "components/base.jsonnet"; -local url = import "components/url.jsonnet"; -local images = import "components/images.jsonnet"; - local cassandra = import "components/cassandra.jsonnet"; local pulsar = import "components/pulsar.jsonnet"; local milvus = import "components/milvus.jsonnet"; local grafana = import "components/grafana.jsonnet"; local trustgraph = import "components/trustgraph.jsonnet"; +local bedrock = import "components/bedrock.jsonnet"; -local config = cassandra + pulsar + milvus + grafana + trustgraph + { - services +: { - - chunker: base + { - image: images.trustgraph, - command: [ - "chunker-recursive", - "-p", - url.pulsar, - "--chunk-size", - "2000", - "--chunk-overlap", - "100", - ], - }, - - "text-completion": base + { - image: images.trustgraph, - command: [ - "text-completion-bedrock", - "-p", - url.pulsar, - "-z", - "${AWS_ID_KEY}", - "-k", - "${AWS_SECRET_KEY}", - "-r", - "us-west-2", - ], - }, - - "text-completion-rag": base + { - image: images.trustgraph, - command: [ - "text-completion-bedrock", - "-p", - url.pulsar, - // "-m", - // "mistral.mistral-large-2407-v1:0", - "-z", - "${AWS_ID_KEY}", - "-k", - "${AWS_SECRET_KEY}", - "-r", - "us-west-2", - "-i", - "non-persistent://tg/request/text-completion-rag", - "-o", - "non-persistent://tg/response/text-completion-rag-response", - ], - }, - - } -}; +local config = cassandra + pulsar + milvus + grafana + trustgraph + bedrock; std.manifestYamlDoc(config) diff --git a/templates/docker-compose-claude.jsonnet b/templates/docker-compose-claude.jsonnet index 32de766f..d698a079 100644 --- a/templates/docker-compose-claude.jsonnet +++ b/templates/docker-compose-claude.jsonnet @@ -1,45 +1,12 @@ -local base = import "components/base.jsonnet"; -local url = import "components/url.jsonnet"; -local images = import "components/images.jsonnet"; - local cassandra = import "components/cassandra.jsonnet"; local pulsar = import "components/pulsar.jsonnet"; local milvus = import "components/milvus.jsonnet"; local grafana = import "components/grafana.jsonnet"; local trustgraph = import "components/trustgraph.jsonnet"; +local claude = import "components/claude.jsonnet"; -local config = cassandra + pulsar + milvus + grafana + trustgraph + { - services +: { - - "text-completion": base + { - image: images.trustgraph, - command: [ - "text-completion-claude", - "-p", - url.pulsar, - "-k", - "${CLAUDE_KEY}", - ], - }, - - "text-completion-rag": base + { - image: images.trustgraph, - command: [ - "text-completion-claude", - "-p", - url.pulsar, - "-k", - "${CLAUDE_KEY}", - "-i", - "non-persistent://tg/request/text-completion-rag", - "-o", - "non-persistent://tg/response/text-completion-rag-response", - ], - }, - - } -}; +local config = cassandra + pulsar + milvus + grafana + trustgraph + claude; std.manifestYamlDoc(config) diff --git a/templates/docker-compose-cohere.jsonnet b/templates/docker-compose-cohere.jsonnet index 86c2fb29..1da8bab5 100644 --- a/templates/docker-compose-cohere.jsonnet +++ b/templates/docker-compose-cohere.jsonnet @@ -1,58 +1,12 @@ -local base = import "components/base.jsonnet"; -local url = import "components/url.jsonnet"; -local images = import "components/images.jsonnet"; - local cassandra = import "components/cassandra.jsonnet"; local pulsar = import "components/pulsar.jsonnet"; local milvus = import "components/milvus.jsonnet"; local grafana = import "components/grafana.jsonnet"; local trustgraph = import "components/trustgraph.jsonnet"; +local cohere = import "components/cohere.jsonnet"; -local config = cassandra + pulsar + milvus + grafana + trustgraph + { - services +: { - - chunker: base + { - image: images.trustgraph, - command: [ - "chunker-recursive", - "-p", - url.pulsar, - "--chunk-size", - "1000", - "--chunk-overlap", - "50", - ], - }, - - "text-completion": base + { - image: images.trustgraph, - command: [ - "text-completion-cohere", - "-p", - url.pulsar, - "-k", - "${COHERE_KEY}", - ], - }, - - "text-completion-rag": base + { - image: images.trustgraph, - command: [ - "text-completion-cohere", - "-p", - url.pulsar, - "-k", - "${COHERE_KEY}", - "-i", - "non-persistent://tg/request/text-completion-rag", - "-o", - "non-persistent://tg/response/text-completion-rag-response", - ], - }, - - } -}; +local config = cassandra + pulsar + milvus + grafana + trustgraph + cohere; std.manifestYamlDoc(config) diff --git a/templates/docker-compose-ollama.jsonnet b/templates/docker-compose-ollama.jsonnet index ca8359a8..0bd1abb6 100644 --- a/templates/docker-compose-ollama.jsonnet +++ b/templates/docker-compose-ollama.jsonnet @@ -1,49 +1,12 @@ -local base = import "components/base.jsonnet"; -local url = import "components/url.jsonnet"; -local images = import "components/images.jsonnet"; - local cassandra = import "components/cassandra.jsonnet"; local pulsar = import "components/pulsar.jsonnet"; local milvus = import "components/milvus.jsonnet"; local grafana = import "components/grafana.jsonnet"; local trustgraph = import "components/trustgraph.jsonnet"; +local ollama = import "components/ollama.jsonnet"; -local config = cassandra + pulsar + milvus + grafana + trustgraph + { - services +: { - - "text-completion": base + { - image: images.trustgraph, - command: [ - "text-completion-ollama", - "-p", - url.pulsar, - // "-m", - // "llama3.1:8b", - "-r", - "${OLLAMA_HOST}", - ], - }, - - "text-completion-rag": base + { - image: images.trustgraph, - command: [ - "text-completion-ollama", - "-p", - url.pulsar, - // "-m", - // "llama3.1:8b", - "-r", - "${OLLAMA_HOST}", - "-i", - "non-persistent://tg/request/text-completion-rag", - "-o", - "non-persistent://tg/response/text-completion-rag-response", - ], - }, - - } -}; +local config = cassandra + pulsar + milvus + grafana + trustgraph + ollama; std.manifestYamlDoc(config) diff --git a/templates/docker-compose-openai-neo4j.jsonnet b/templates/docker-compose-openai-neo4j.jsonnet index 391dcbf9..c0bf05b9 100644 --- a/templates/docker-compose-openai-neo4j.jsonnet +++ b/templates/docker-compose-openai-neo4j.jsonnet @@ -1,68 +1,12 @@ -local base = import "components/base.jsonnet"; -local url = import "components/url.jsonnet"; -local images = import "components/images.jsonnet"; - local neo4j = import "components/neo4j.jsonnet"; local pulsar = import "components/pulsar.jsonnet"; local milvus = import "components/milvus.jsonnet"; local grafana = import "components/grafana.jsonnet"; local trustgraph = import "components/trustgraph.jsonnet"; +local openai = import "components/openai.jsonnet"; -local config = neo4j + pulsar + milvus + grafana + trustgraph + { - - services: std.mergePatch(super.services, { - - "text-completion": base + { - image: images.trustgraph, - command: [ - "text-completion-openai", - "-p", - url.pulsar, - "-k", - "${OPENAI_KEY}", - ], - }, - - "text-completion-rag": base + { - image: images.trustgraph, - command: [ - "text-completion-openai", - "-p", - url.pulsar, - "-k", - "${OPENAI_KEY}", - "-i", - "non-persistent://tg/request/text-completion-rag", - "-o", - "non-persistent://tg/response/text-completion-rag-response", - ], - }, - - "query-triples": { - image: images.trustgraph, - command: [ - "triples-query-neo4j", - "-p", - url.pulsar, - "-g", - "bolt://neo4j:7687", - ], - }, - - "store-triples": { - image: images.trustgraph, - command: [ - "triples-write-neo4j", - "-p", - url.pulsar, - "-g", - "bolt://neo4j:7687", - ], - } - - }) -}; +local config = neo4j + pulsar + milvus + grafana + trustgraph + openai; std.manifestYamlDoc(config) diff --git a/templates/docker-compose-openai.jsonnet b/templates/docker-compose-openai.jsonnet index 2a5b6438..28386925 100644 --- a/templates/docker-compose-openai.jsonnet +++ b/templates/docker-compose-openai.jsonnet @@ -1,45 +1,12 @@ -local base = import "components/base.jsonnet"; -local url = import "components/url.jsonnet"; -local images = import "components/images.jsonnet"; - local cassandra = import "components/cassandra.jsonnet"; local pulsar = import "components/pulsar.jsonnet"; local milvus = import "components/milvus.jsonnet"; local grafana = import "components/grafana.jsonnet"; local trustgraph = import "components/trustgraph.jsonnet"; +local openai = import "components/openai.jsonnet"; -local config = cassandra + pulsar + milvus + grafana + trustgraph + { - services +: { - - "text-completion": base + { - image: images.trustgraph, - command: [ - "text-completion-openai", - "-p", - url.pulsar, - "-k", - "${OPENAI_KEY}", - ], - }, - - "text-completion-rag": base + { - image: images.trustgraph, - command: [ - "text-completion-openai", - "-p", - url.pulsar, - "-k", - "${OPENAI_KEY}", - "-i", - "non-persistent://tg/request/text-completion-rag", - "-o", - "non-persistent://tg/response/text-completion-rag-response", - ], - }, - - } -}; +local config = cassandra + pulsar + milvus + grafana + trustgraph + openai; std.manifestYamlDoc(config) diff --git a/templates/docker-compose-vertexai.jsonnet b/templates/docker-compose-vertexai.jsonnet index 55029de6..b148701b 100644 --- a/templates/docker-compose-vertexai.jsonnet +++ b/templates/docker-compose-vertexai.jsonnet @@ -1,55 +1,12 @@ -local base = import "components/base.jsonnet"; -local url = import "components/url.jsonnet"; -local images = import "components/images.jsonnet"; - local cassandra = import "components/cassandra.jsonnet"; local pulsar = import "components/pulsar.jsonnet"; local milvus = import "components/milvus.jsonnet"; local grafana = import "components/grafana.jsonnet"; local trustgraph = import "components/trustgraph.jsonnet"; +local vertexai = import "components/vertexai.jsonnet"; -local config = cassandra + pulsar + milvus + grafana + trustgraph + { - services +: { - - "text-completion": base + { - image: images.trustgraph, - command: [ - "text-completion-vertexai", - "-p", - url.pulsar, - "-k", - "/vertexai/private.json", - "-r", - "us-west1", - ], - volumes: [ - "./vertexai:/vertexai" - ], - }, - - "text-completion-rag": base + { - image: images.trustgraph, - command: [ - "text-completion-vertexai", - "-p", - url.pulsar, - "-k", - "/vertexai/private.json", - "-r", - "us-west1", - "-i", - "non-persistent://tg/request/text-completion-rag", - "-o", - "non-persistent://tg/response/text-completion-rag-response", - ], - volumes: [ - "./vertexai:/vertexai" - ], - }, - - } -}; +local config = cassandra + pulsar + milvus + grafana + trustgraph + vertexai; std.manifestYamlDoc(config)