diff --git a/Makefile b/Makefile index 15e4271b..50897f51 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ # VERSION=$(shell git describe | sed 's/^v//') -VERSION=0.6.4 +VERSION=0.6.5 DOCKER=podman diff --git a/docker-compose-azure.yaml b/docker-compose-azure.yaml index e69d5c02..96ee2df4 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.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "restart": "on-failure:100" "embeddings": "command": - "embeddings-hf" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "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.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "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.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "restart": "on-failure:100" "kg-extract-relationships": "command": - "kg-extract-relationships" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "restart": "on-failure:100" "milvus": "command": @@ -122,7 +122,7 @@ - "pdf-decoder" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "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.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "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.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "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.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "restart": "on-failure:100" "query-triples": "command": @@ -192,7 +192,7 @@ - "pulsar://pulsar:6650" - "-g" - "cassandra" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "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.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "restart": "on-failure:100" "store-triples": "command": @@ -210,7 +210,7 @@ - "pulsar://pulsar:6650" - "-g" - "cassandra" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "restart": "on-failure:100" "text-completion": "command": @@ -221,7 +221,7 @@ - "${AZURE_TOKEN}" - "-e" - "${AZURE_ENDPOINT}" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "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.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "restart": "on-failure:100" "vectorize": "command": - "embeddings-vectorize" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "restart": "on-failure:100" "volumes": "cassandra": {} diff --git a/docker-compose-bedrock.yaml b/docker-compose-bedrock.yaml index 0250f0ab..62b21f06 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.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "restart": "on-failure:100" "embeddings": "command": - "embeddings-hf" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "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.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "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.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "restart": "on-failure:100" "kg-extract-relationships": "command": - "kg-extract-relationships" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "restart": "on-failure:100" "milvus": "command": @@ -126,7 +126,7 @@ - "pdf-decoder" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "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.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "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.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "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.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "restart": "on-failure:100" "query-triples": "command": @@ -196,7 +196,7 @@ - "pulsar://pulsar:6650" - "-g" - "cassandra" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "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.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "restart": "on-failure:100" "store-triples": "command": @@ -214,7 +214,7 @@ - "pulsar://pulsar:6650" - "-g" - "cassandra" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "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.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "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.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "restart": "on-failure:100" "vectorize": "command": - "embeddings-vectorize" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "restart": "on-failure:100" "volumes": "cassandra": {} diff --git a/docker-compose-claude.yaml b/docker-compose-claude.yaml index ea3d3080..4c76e19c 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.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "restart": "on-failure:100" "embeddings": "command": - "embeddings-hf" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "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.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "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.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "restart": "on-failure:100" "kg-extract-relationships": "command": - "kg-extract-relationships" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "restart": "on-failure:100" "milvus": "command": @@ -122,7 +122,7 @@ - "pdf-decoder" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "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.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "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.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "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.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "restart": "on-failure:100" "query-triples": "command": @@ -192,7 +192,7 @@ - "pulsar://pulsar:6650" - "-g" - "cassandra" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "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.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "restart": "on-failure:100" "store-triples": "command": @@ -210,7 +210,7 @@ - "pulsar://pulsar:6650" - "-g" - "cassandra" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "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.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "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.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "restart": "on-failure:100" "vectorize": "command": - "embeddings-vectorize" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "restart": "on-failure:100" "volumes": "cassandra": {} diff --git a/docker-compose-cohere.yaml b/docker-compose-cohere.yaml index 66438382..bee23f20 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.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "restart": "on-failure:100" "embeddings": "command": - "embeddings-hf" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "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.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "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.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "restart": "on-failure:100" "kg-extract-relationships": "command": - "kg-extract-relationships" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "restart": "on-failure:100" "milvus": "command": @@ -126,7 +126,7 @@ - "pdf-decoder" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "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.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "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.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "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.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "restart": "on-failure:100" "query-triples": "command": @@ -196,7 +196,7 @@ - "pulsar://pulsar:6650" - "-g" - "cassandra" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "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.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "restart": "on-failure:100" "store-triples": "command": @@ -214,7 +214,7 @@ - "pulsar://pulsar:6650" - "-g" - "cassandra" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "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.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "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.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "restart": "on-failure:100" "vectorize": "command": - "embeddings-vectorize" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "restart": "on-failure:100" "volumes": "cassandra": {} diff --git a/docker-compose-mix.yaml b/docker-compose-mix.yaml index 6e13cfce..65c18dc1 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.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "restart": "on-failure:100" "embeddings": "command": - "embeddings-hf" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "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.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "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.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "restart": "on-failure:100" "kg-extract-relationships": "command": - "kg-extract-relationships" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "restart": "on-failure:100" "milvus": "command": @@ -126,7 +126,7 @@ - "pdf-decoder" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "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.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "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.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "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.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "restart": "on-failure:100" "query-triples": "command": @@ -196,7 +196,7 @@ - "pulsar://pulsar:6650" - "-g" - "cassandra" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "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.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "restart": "on-failure:100" "store-triples": "command": @@ -214,7 +214,7 @@ - "pulsar://pulsar:6650" - "-g" - "cassandra" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "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.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "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.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "restart": "on-failure:100" "vectorize": "command": - "embeddings-vectorize" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "restart": "on-failure:100" "volumes": "cassandra": {} diff --git a/docker-compose-ollama.yaml b/docker-compose-ollama.yaml index f4d29dba..c8b2bda9 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.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "restart": "on-failure:100" "embeddings": "command": - "embeddings-hf" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "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.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "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.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "restart": "on-failure:100" "kg-extract-relationships": "command": - "kg-extract-relationships" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "restart": "on-failure:100" "milvus": "command": @@ -122,7 +122,7 @@ - "pdf-decoder" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "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.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "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.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "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.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "restart": "on-failure:100" "query-triples": "command": @@ -192,7 +192,7 @@ - "pulsar://pulsar:6650" - "-g" - "cassandra" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "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.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "restart": "on-failure:100" "store-triples": "command": @@ -210,7 +210,7 @@ - "pulsar://pulsar:6650" - "-g" - "cassandra" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "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.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "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.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "restart": "on-failure:100" "vectorize": "command": - "embeddings-vectorize" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "restart": "on-failure:100" "volumes": "cassandra": {} diff --git a/docker-compose-openai-neo4j.yaml b/docker-compose-openai-neo4j.yaml index 4d77fe5b..0fd5ef70 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.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "restart": "on-failure:100" "embeddings": "command": - "embeddings-hf" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "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.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "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.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "restart": "on-failure:100" "kg-extract-relationships": "command": - "kg-extract-relationships" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "restart": "on-failure:100" "milvus": "command": @@ -125,7 +125,7 @@ - "pdf-decoder" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "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.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "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.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "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.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "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.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "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.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "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.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "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.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "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.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "restart": "on-failure:100" "vectorize": "command": - "embeddings-vectorize" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "restart": "on-failure:100" "volumes": "etcd": {} diff --git a/docker-compose-openai.yaml b/docker-compose-openai.yaml index aac920ba..e29b861e 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.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "restart": "on-failure:100" "embeddings": "command": - "embeddings-hf" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "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.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "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.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "restart": "on-failure:100" "kg-extract-relationships": "command": - "kg-extract-relationships" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "restart": "on-failure:100" "milvus": "command": @@ -122,7 +122,7 @@ - "pdf-decoder" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "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.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "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.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "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.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "restart": "on-failure:100" "query-triples": "command": @@ -192,7 +192,7 @@ - "pulsar://pulsar:6650" - "-g" - "cassandra" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "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.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "restart": "on-failure:100" "store-triples": "command": @@ -210,7 +210,7 @@ - "pulsar://pulsar:6650" - "-g" - "cassandra" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "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.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "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.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "restart": "on-failure:100" "vectorize": "command": - "embeddings-vectorize" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "restart": "on-failure:100" "volumes": "cassandra": {} diff --git a/docker-compose-vertexai.yaml b/docker-compose-vertexai.yaml index 49e9e3d5..cf5c52a5 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.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "restart": "on-failure:100" "embeddings": "command": - "embeddings-hf" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "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.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "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.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "restart": "on-failure:100" "kg-extract-relationships": "command": - "kg-extract-relationships" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "restart": "on-failure:100" "milvus": "command": @@ -122,7 +122,7 @@ - "pdf-decoder" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "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.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "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.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "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.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "restart": "on-failure:100" "query-triples": "command": @@ -192,7 +192,7 @@ - "pulsar://pulsar:6650" - "-g" - "cassandra" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "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.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "restart": "on-failure:100" "store-triples": "command": @@ -210,7 +210,7 @@ - "pulsar://pulsar:6650" - "-g" - "cassandra" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "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.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "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.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "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.4" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.5" "restart": "on-failure:100" "volumes": "cassandra": {} diff --git a/setup.py b/setup.py index d7eedaf1..c47e1042 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.4" +version = "0.6.5" setuptools.setup( name="trustgraph", diff --git a/trustgraph/model/prompt/generic/service.py b/trustgraph/model/prompt/generic/service.py index ad232465..90b28af2 100755 --- a/trustgraph/model/prompt/generic/service.py +++ b/trustgraph/model/prompt/generic/service.py @@ -91,13 +91,14 @@ class Processor(ConsumerProducer): prompt = to_definitions(v.chunk) - print(prompt) - ans = self.llm.request(prompt) - print(ans) - - defs = json.loads(ans) + # Silently ignore JSON parse error + try: + defs = json.loads(ans) + except: + print("JSON parse error, ignored", flush=True) + defs = [] output = [] @@ -114,7 +115,7 @@ class Processor(ConsumerProducer): ) except: - pass + print("definition fields missing, ignored", flush=True) print("Send response...", flush=True) r = PromptResponse(definitions=output) @@ -128,7 +129,12 @@ class Processor(ConsumerProducer): ans = self.llm.request(prompt) - defs = json.loads(ans) + # Silently ignore JSON parse error + try: + defs = json.loads(ans) + except: + print("JSON parse error, ignored", flush=True) + defs = [] output = [] @@ -145,7 +151,7 @@ class Processor(ConsumerProducer): ) except Exception as e: - print(e) + print("relationship fields missing, ignored", flush=True) print("Send response...", flush=True) r = PromptResponse(relationships=output)