From 7d00a5371199a638fa3af4944e66a83a6d24ab77 Mon Sep 17 00:00:00 2001 From: Cyber MacGeddon Date: Wed, 21 Aug 2024 17:17:24 +0100 Subject: [PATCH] Some default values in yaml file --- docker-compose-azure.yaml | 14 +++++++++++++- docker-compose-bedrock.yaml | 8 ++++++++ docker-compose-claude.yaml | 14 +++++++++++++- docker-compose-cohere.yaml | 8 ++++++++ docker-compose-mix.yaml | 8 ++++++++ docker-compose-ollama.yaml | 14 +++++++++++++- docker-compose-openai-neo4j.yaml | 14 +++++++++++++- docker-compose-openai.yaml | 14 +++++++++++++- docker-compose-vertexai.yaml | 14 +++++++++++++- templates/components/trustgraph.jsonnet | 16 +++++++++++++--- 10 files changed, 115 insertions(+), 9 deletions(-) diff --git a/docker-compose-azure.yaml b/docker-compose-azure.yaml index 345a0d54..9b35a3fc 100644 --- a/docker-compose-azure.yaml +++ b/docker-compose-azure.yaml @@ -8,9 +8,13 @@ - "cassandra:/var/lib/cassandra" "chunker": "command": - - "chunker-recursive" + - "${CHUNKER:-chunker-token}" - "-p" - "pulsar://pulsar:6650" + - "--chunk-size" + - "250" + - "--chunk-overlap" + - "15" "image": "docker.io/trustgraph/trustgraph-flow:0.6.8" "restart": "on-failure:100" "embeddings": @@ -18,6 +22,8 @@ - "embeddings-hf" - "-p" - "pulsar://pulsar:6650" + - "-m" + - "all-MiniLM-L6-v2" "image": "docker.io/trustgraph/trustgraph-flow:0.6.8" "restart": "on-failure:100" "etcd": @@ -60,6 +66,12 @@ - "non-persistent://tg/request/prompt-rag" - "--prompt-response-queue" - "non-persistent://tg/response/prompt-rag-response" + - "--entity-limit" + - "50" + - "--triple-limit" + - "30" + - "--max-subgraph-size" + - "3000" "image": "docker.io/trustgraph/trustgraph-flow:0.6.8" "restart": "on-failure:100" "init-pulsar": diff --git a/docker-compose-bedrock.yaml b/docker-compose-bedrock.yaml index e01075c1..19ac5741 100644 --- a/docker-compose-bedrock.yaml +++ b/docker-compose-bedrock.yaml @@ -22,6 +22,8 @@ - "embeddings-hf" - "-p" - "pulsar://pulsar:6650" + - "-m" + - "all-MiniLM-L6-v2" "image": "docker.io/trustgraph/trustgraph-flow:0.6.8" "restart": "on-failure:100" "etcd": @@ -64,6 +66,12 @@ - "non-persistent://tg/request/prompt-rag" - "--prompt-response-queue" - "non-persistent://tg/response/prompt-rag-response" + - "--entity-limit" + - "50" + - "--triple-limit" + - "30" + - "--max-subgraph-size" + - "3000" "image": "docker.io/trustgraph/trustgraph-flow:0.6.8" "restart": "on-failure:100" "init-pulsar": diff --git a/docker-compose-claude.yaml b/docker-compose-claude.yaml index a8b208ef..2e9b9849 100644 --- a/docker-compose-claude.yaml +++ b/docker-compose-claude.yaml @@ -8,9 +8,13 @@ - "cassandra:/var/lib/cassandra" "chunker": "command": - - "chunker-recursive" + - "${CHUNKER:-chunker-token}" - "-p" - "pulsar://pulsar:6650" + - "--chunk-size" + - "250" + - "--chunk-overlap" + - "15" "image": "docker.io/trustgraph/trustgraph-flow:0.6.8" "restart": "on-failure:100" "embeddings": @@ -18,6 +22,8 @@ - "embeddings-hf" - "-p" - "pulsar://pulsar:6650" + - "-m" + - "all-MiniLM-L6-v2" "image": "docker.io/trustgraph/trustgraph-flow:0.6.8" "restart": "on-failure:100" "etcd": @@ -60,6 +66,12 @@ - "non-persistent://tg/request/prompt-rag" - "--prompt-response-queue" - "non-persistent://tg/response/prompt-rag-response" + - "--entity-limit" + - "50" + - "--triple-limit" + - "30" + - "--max-subgraph-size" + - "3000" "image": "docker.io/trustgraph/trustgraph-flow:0.6.8" "restart": "on-failure:100" "init-pulsar": diff --git a/docker-compose-cohere.yaml b/docker-compose-cohere.yaml index 000ab0e7..3b7fa360 100644 --- a/docker-compose-cohere.yaml +++ b/docker-compose-cohere.yaml @@ -22,6 +22,8 @@ - "embeddings-hf" - "-p" - "pulsar://pulsar:6650" + - "-m" + - "all-MiniLM-L6-v2" "image": "docker.io/trustgraph/trustgraph-flow:0.6.8" "restart": "on-failure:100" "etcd": @@ -64,6 +66,12 @@ - "non-persistent://tg/request/prompt-rag" - "--prompt-response-queue" - "non-persistent://tg/response/prompt-rag-response" + - "--entity-limit" + - "50" + - "--triple-limit" + - "30" + - "--max-subgraph-size" + - "3000" "image": "docker.io/trustgraph/trustgraph-flow:0.6.8" "restart": "on-failure:100" "init-pulsar": diff --git a/docker-compose-mix.yaml b/docker-compose-mix.yaml index a44a0f23..09925303 100644 --- a/docker-compose-mix.yaml +++ b/docker-compose-mix.yaml @@ -22,6 +22,8 @@ - "embeddings-hf" - "-p" - "pulsar://pulsar:6650" + - "-m" + - "all-MiniLM-L6-v2" "image": "docker.io/trustgraph/trustgraph-flow:0.6.8" "restart": "on-failure:100" "etcd": @@ -64,6 +66,12 @@ - "non-persistent://tg/request/prompt-rag" - "--prompt-response-queue" - "non-persistent://tg/response/prompt-rag-response" + - "--entity-limit" + - "50" + - "--triple-limit" + - "30" + - "--max-subgraph-size" + - "3000" "image": "docker.io/trustgraph/trustgraph-flow:0.6.8" "restart": "on-failure:100" "init-pulsar": diff --git a/docker-compose-ollama.yaml b/docker-compose-ollama.yaml index f2ba8e67..b75fc44e 100644 --- a/docker-compose-ollama.yaml +++ b/docker-compose-ollama.yaml @@ -8,9 +8,13 @@ - "cassandra:/var/lib/cassandra" "chunker": "command": - - "chunker-recursive" + - "${CHUNKER:-chunker-token}" - "-p" - "pulsar://pulsar:6650" + - "--chunk-size" + - "250" + - "--chunk-overlap" + - "15" "image": "docker.io/trustgraph/trustgraph-flow:0.6.8" "restart": "on-failure:100" "embeddings": @@ -18,6 +22,8 @@ - "embeddings-hf" - "-p" - "pulsar://pulsar:6650" + - "-m" + - "all-MiniLM-L6-v2" "image": "docker.io/trustgraph/trustgraph-flow:0.6.8" "restart": "on-failure:100" "etcd": @@ -60,6 +66,12 @@ - "non-persistent://tg/request/prompt-rag" - "--prompt-response-queue" - "non-persistent://tg/response/prompt-rag-response" + - "--entity-limit" + - "50" + - "--triple-limit" + - "30" + - "--max-subgraph-size" + - "3000" "image": "docker.io/trustgraph/trustgraph-flow:0.6.8" "restart": "on-failure:100" "init-pulsar": diff --git a/docker-compose-openai-neo4j.yaml b/docker-compose-openai-neo4j.yaml index 231b0d46..07cff05d 100644 --- a/docker-compose-openai-neo4j.yaml +++ b/docker-compose-openai-neo4j.yaml @@ -1,9 +1,13 @@ "services": "chunker": "command": - - "chunker-recursive" + - "${CHUNKER:-chunker-token}" - "-p" - "pulsar://pulsar:6650" + - "--chunk-size" + - "250" + - "--chunk-overlap" + - "15" "image": "docker.io/trustgraph/trustgraph-flow:0.6.8" "restart": "on-failure:100" "embeddings": @@ -11,6 +15,8 @@ - "embeddings-hf" - "-p" - "pulsar://pulsar:6650" + - "-m" + - "all-MiniLM-L6-v2" "image": "docker.io/trustgraph/trustgraph-flow:0.6.8" "restart": "on-failure:100" "etcd": @@ -53,6 +59,12 @@ - "non-persistent://tg/request/prompt-rag" - "--prompt-response-queue" - "non-persistent://tg/response/prompt-rag-response" + - "--entity-limit" + - "50" + - "--triple-limit" + - "30" + - "--max-subgraph-size" + - "3000" "image": "docker.io/trustgraph/trustgraph-flow:0.6.8" "restart": "on-failure:100" "init-pulsar": diff --git a/docker-compose-openai.yaml b/docker-compose-openai.yaml index e1f59daa..ab9326fc 100644 --- a/docker-compose-openai.yaml +++ b/docker-compose-openai.yaml @@ -8,9 +8,13 @@ - "cassandra:/var/lib/cassandra" "chunker": "command": - - "chunker-recursive" + - "${CHUNKER:-chunker-token}" - "-p" - "pulsar://pulsar:6650" + - "--chunk-size" + - "250" + - "--chunk-overlap" + - "15" "image": "docker.io/trustgraph/trustgraph-flow:0.6.8" "restart": "on-failure:100" "embeddings": @@ -18,6 +22,8 @@ - "embeddings-hf" - "-p" - "pulsar://pulsar:6650" + - "-m" + - "all-MiniLM-L6-v2" "image": "docker.io/trustgraph/trustgraph-flow:0.6.8" "restart": "on-failure:100" "etcd": @@ -60,6 +66,12 @@ - "non-persistent://tg/request/prompt-rag" - "--prompt-response-queue" - "non-persistent://tg/response/prompt-rag-response" + - "--entity-limit" + - "50" + - "--triple-limit" + - "30" + - "--max-subgraph-size" + - "3000" "image": "docker.io/trustgraph/trustgraph-flow:0.6.8" "restart": "on-failure:100" "init-pulsar": diff --git a/docker-compose-vertexai.yaml b/docker-compose-vertexai.yaml index adec3a97..551aa830 100644 --- a/docker-compose-vertexai.yaml +++ b/docker-compose-vertexai.yaml @@ -8,9 +8,13 @@ - "cassandra:/var/lib/cassandra" "chunker": "command": - - "chunker-recursive" + - "${CHUNKER:-chunker-token}" - "-p" - "pulsar://pulsar:6650" + - "--chunk-size" + - "250" + - "--chunk-overlap" + - "15" "image": "docker.io/trustgraph/trustgraph-flow:0.6.8" "restart": "on-failure:100" "embeddings": @@ -18,6 +22,8 @@ - "embeddings-hf" - "-p" - "pulsar://pulsar:6650" + - "-m" + - "all-MiniLM-L6-v2" "image": "docker.io/trustgraph/trustgraph-flow:0.6.8" "restart": "on-failure:100" "etcd": @@ -60,6 +66,12 @@ - "non-persistent://tg/request/prompt-rag" - "--prompt-response-queue" - "non-persistent://tg/response/prompt-rag-response" + - "--entity-limit" + - "50" + - "--triple-limit" + - "30" + - "--max-subgraph-size" + - "3000" "image": "docker.io/trustgraph/trustgraph-flow:0.6.8" "restart": "on-failure:100" "init-pulsar": diff --git a/templates/components/trustgraph.jsonnet b/templates/components/trustgraph.jsonnet index ef84fa07..459e284a 100644 --- a/templates/components/trustgraph.jsonnet +++ b/templates/components/trustgraph.jsonnet @@ -20,9 +20,13 @@ local url = import "url.jsonnet"; chunker: base + { image: images.trustgraph, command: [ - "chunker-recursive", + "${CHUNKER:-chunker-token}", "-p", url.pulsar, + "--chunk-size", + "250", + "--chunk-overlap", + "15", ], }, @@ -41,8 +45,8 @@ local url = import "url.jsonnet"; "embeddings-hf", "-p", url.pulsar, - // "-m", - // "mixedbread-ai/mxbai-embed-large-v1", + "-m", + "all-MiniLM-L6-v2", ], }, @@ -74,6 +78,12 @@ local url = import "url.jsonnet"; "non-persistent://tg/request/prompt-rag", "--prompt-response-queue", "non-persistent://tg/response/prompt-rag-response", + "--entity-limit", + "50", + "--triple-limit", + "30", + "--max-subgraph-size", + "3000", ], },