diff --git a/Makefile b/Makefile index ad51a31a..68ea1c3b 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ # VERSION=$(shell git describe | sed 's/^v//') -VERSION=0.8.0 +VERSION=0.8.1 DOCKER=podman @@ -30,7 +30,7 @@ clean: rm -rf wheels/ set-version: - echo '"${VERSION}"' > templates/components/version.jsonnet + echo '"${VERSION}"' > templates/values/version.jsonnet TEMPLATES=azure bedrock claude cohere mix ollama openai vertexai \ openai-neo4j storage @@ -40,19 +40,23 @@ DCS=$(foreach template,${TEMPLATES},${template:%=tg-launch-%.yaml}) MODELS=azure bedrock claude cohere ollama openai vertexai GRAPHS=cassandra neo4j -tg-launch-%.yaml: templates/%.jsonnet templates/components/version.jsonnet - jsonnet -S ${@:tg-launch-%.yaml=templates/%.jsonnet} > $@ +# tg-launch-%.yaml: templates/%.jsonnet templates/components/version.jsonnet +# jsonnet -Jtemplates \ +# -S ${@:tg-launch-%.yaml=templates/%.jsonnet} > $@ # VECTORDB=milvus VECTORDB=qdrant +JSONNET_FLAGS=-J templates -J . + update-templates: set-version for graph in ${GRAPHS}; do \ cm=$${graph},pulsar,${VECTORDB},grafana; \ input=templates/main.jsonnet; \ output=tg-storage-$${graph}.yaml; \ echo $${graph} '->' $${output}; \ - jsonnet --ext-str options=$${cm} -S $${input} > $${output}; \ + jsonnet ${JSONNET_FLAGS} \ + --ext-str options=$${cm} -S $${input} > $${output}; \ done for model in ${MODELS}; do \ for graph in ${GRAPHS}; do \ @@ -60,6 +64,7 @@ update-templates: set-version input=templates/main.jsonnet; \ output=tg-launch-$${model}-$${graph}.yaml; \ echo $${model} + $${graph} '->' $${output}; \ - jsonnet --ext-str options=$${cm} -S $${input} > $${output}; \ + jsonnet ${JSONNET_FLAGS} \ + --ext-str options=$${cm} -S $${input} > $${output}; \ done; \ done diff --git a/setup.py b/setup.py index 6d35e20c..5b7a6606 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.8.0" +version = "0.8.1" setuptools.setup( name="trustgraph", diff --git a/templates/all-patterns.jsonnet b/templates/all-patterns.jsonnet new file mode 100644 index 00000000..f2363b53 --- /dev/null +++ b/templates/all-patterns.jsonnet @@ -0,0 +1,23 @@ +[ + import "patterns/pulsar.jsonnet", + import "patterns/pulsar-manager.jsonnet", + import "patterns/trustgraph-base.jsonnet", + import "patterns/graph-rag-cassandra.jsonnet", + import "patterns/graph-rag-neo4j.jsonnet", + import "patterns/prompt-template-kg-query.jsonnet", + import "patterns/prompt-template-definitions.jsonnet", + import "patterns/prompt-template-relationships.jsonnet", + import "patterns/prompt-template-document-query.jsonnet", + import "patterns/prompt-template-rows-template.jsonnet", + import "patterns/override-recursive-chunker.jsonnet", + import "patterns/llm-azure.jsonnet", + import "patterns/llm-bedrock.jsonnet", + import "patterns/llm-claude.jsonnet", + import "patterns/llm-cohere.jsonnet", + import "patterns/llm-ollama.jsonnet", + import "patterns/llm-openai.jsonnet", + import "patterns/llm-vertexai.jsonnet", + import "patterns/vector-store-milvus.jsonnet", + import "patterns/vector-store-qdrant.jsonnet", + import "patterns/grafana.jsonnet", +] diff --git a/templates/azure.jsonnet b/templates/azure.jsonnet deleted file mode 100644 index 4dba5d1a..00000000 --- a/templates/azure.jsonnet +++ /dev/null @@ -1,12 +0,0 @@ - -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 + azure; - -std.manifestYamlDoc(config) - diff --git a/templates/components/base.jsonnet b/templates/base/base.jsonnet similarity index 100% rename from templates/components/base.jsonnet rename to templates/base/base.jsonnet diff --git a/templates/bedrock.jsonnet b/templates/bedrock.jsonnet deleted file mode 100644 index 4b233ba9..00000000 --- a/templates/bedrock.jsonnet +++ /dev/null @@ -1,12 +0,0 @@ - -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 + bedrock; - -std.manifestYamlDoc(config) - diff --git a/templates/claude.jsonnet b/templates/claude.jsonnet deleted file mode 100644 index d698a079..00000000 --- a/templates/claude.jsonnet +++ /dev/null @@ -1,12 +0,0 @@ - -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 + claude; - -std.manifestYamlDoc(config) - diff --git a/templates/cohere.jsonnet b/templates/cohere.jsonnet deleted file mode 100644 index 1da8bab5..00000000 --- a/templates/cohere.jsonnet +++ /dev/null @@ -1,12 +0,0 @@ - -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 + cohere; - -std.manifestYamlDoc(config) - diff --git a/templates/components/azure.jsonnet b/templates/components/azure.jsonnet index a597177b..18e09181 100644 --- a/templates/components/azure.jsonnet +++ b/templates/components/azure.jsonnet @@ -1,8 +1,14 @@ -local base = import "base.jsonnet"; -local images = import "images.jsonnet"; -local url = import "url.jsonnet"; -local prompts = import "../prompts/mixtral.jsonnet"; +local base = import "base/base.jsonnet"; +local images = import "values/images.jsonnet"; +local url = import "values/url.jsonnet"; +local prompts = import "prompts/mixtral.jsonnet"; { + + "azure-token":: "${AZURE_TOKEN}", + "azure-endpoint":: "${AZURE_ENDPOINT}", + "azure-max-output":: 4096, + "azure-temperature":: 0.0, + services +: { "text-completion": base + { @@ -12,13 +18,13 @@ local prompts = import "../prompts/mixtral.jsonnet"; "-p", url.pulsar, "-k", - "${AZURE_TOKEN}", + $["azure-token"], "-e", - "${AZURE_ENDPOINT}", + $["azure-endpoint"], "-x", - "4096", + std.toString($["azure-max-output"]), "-t", - "0.0", + std.toString($["azure-temperature"]), ], deploy: { resources: { @@ -41,14 +47,14 @@ local prompts = import "../prompts/mixtral.jsonnet"; "-p", url.pulsar, "-k", - "${AZURE_TOKEN}", + $["azure-token"], "-e", - "${AZURE_ENDPOINT}", + $["azure-endpoint"], "-i", "-x", - "4096", + std.toString($["azure-max-output"]), "-t", - "0.0", + std.toString($["azure-temperature"]), "non-persistent://tg/request/text-completion-rag", "-o", "non-persistent://tg/response/text-completion-rag-response", @@ -70,4 +76,3 @@ local prompts = import "../prompts/mixtral.jsonnet"; }, } + prompts - diff --git a/templates/components/bedrock.jsonnet b/templates/components/bedrock.jsonnet index 9e2d4678..b6b3bb2c 100644 --- a/templates/components/bedrock.jsonnet +++ b/templates/components/bedrock.jsonnet @@ -1,34 +1,17 @@ -local base = import "base.jsonnet"; -local images = import "images.jsonnet"; -local url = import "url.jsonnet"; -local prompts = import "../prompts/mixtral.jsonnet"; +local base = import "base/base.jsonnet"; +local images = import "values/images.jsonnet"; +local url = import "values/url.jsonnet"; +local prompts = import "prompts/mixtral.jsonnet"; +local chunker = import "chunker-recursive.jsonnet"; { - services +: { + "aws-id-key":: "${AWS_ID_KEY}", + "aws-secret-key":: "${AWS_SECRET_KEY}", + "aws-region":: "us-west-2", + "bedrock-max-output-tokens":: 4096, + "bedrock-temperature":: 0.0, + "bedrock-model":: "mistral.mixtral-8x7b-instruct-v0:1", - chunker: base + { - image: images.trustgraph, - command: [ - "chunker-recursive", - "-p", - url.pulsar, - "--chunk-size", - "2000", - "--chunk-overlap", - "100", - ], - deploy: { - resources: { - limits: { - cpus: '0.5', - memory: '128M' - }, - reservations: { - cpus: '0.1', - memory: '128M' - } - } - }, - }, + services +: { "text-completion": base + { image: images.trustgraph, @@ -37,17 +20,17 @@ local prompts = import "../prompts/mixtral.jsonnet"; "-p", url.pulsar, "-z", - "${AWS_ID_KEY}", + $["aws-id-key"], "-k", - "${AWS_SECRET_KEY}", + $["aws-secret-key"], "-r", - "us-west-2", + $["aws-region"], "-x", - "4096", + std.toString($["bedrock-max-output-tokens"]), "-t", - "0.0", + std.toString($["bedrock-temperature"]), "-m", - "mistral.mixtral-8x7b-instruct-v0:1", + $["bedrock-model"], ], deploy: { resources: { @@ -69,20 +52,18 @@ local prompts = import "../prompts/mixtral.jsonnet"; "text-completion-bedrock", "-p", url.pulsar, - // "-m", - // "mistral.mistral-large-2407-v1:0", "-z", - "${AWS_ID_KEY}", + $["aws-id-key"], "-k", - "${AWS_SECRET_KEY}", + $["aws-secret-key"], "-r", - "us-west-2", + $["aws-region"], "-x", - "4096", + std.toString($["bedrock-max-output-tokens"]), "-t", - "0.0", + std.toString($["bedrock-temperature"]), "-m", - "mistral.mixtral-8x7b-instruct-v0:1", + $["bedrock-model"], "-i", "non-persistent://tg/request/text-completion-rag", "-o", @@ -103,6 +84,5 @@ local prompts = import "../prompts/mixtral.jsonnet"; }, }, -} + prompts - +} + prompts + chunker diff --git a/templates/components/cassandra.jsonnet b/templates/components/cassandra.jsonnet index e8dd2c35..98c3b32a 100644 --- a/templates/components/cassandra.jsonnet +++ b/templates/components/cassandra.jsonnet @@ -1,6 +1,6 @@ -local base = import "base.jsonnet"; -local images = import "images.jsonnet"; -local url = import "url.jsonnet"; +local base = import "base/base.jsonnet"; +local images = import "values/images.jsonnet"; +local url = import "values/url.jsonnet"; local cassandra_hosts = "cassandra"; local cassandra = import "stores/cassandra.jsonnet"; diff --git a/templates/components/chunker-recursive.jsonnet b/templates/components/chunker-recursive.jsonnet new file mode 100644 index 00000000..792cc67d --- /dev/null +++ b/templates/components/chunker-recursive.jsonnet @@ -0,0 +1,39 @@ +local base = import "base/base.jsonnet"; +local images = import "values/images.jsonnet"; +local url = import "values/url.jsonnet"; +local prompts = import "prompts/mixtral.jsonnet"; +{ + + "chunk-size":: 2000, + "chunk-overlap":: 100, + + services +: { + + chunker: base + { + image: images.trustgraph, + command: [ + "chunker-recursive", + "-p", + url.pulsar, + "--chunk-size", + std.toString($["chunk-size"]), + "--chunk-overlap", + std.toString($["chunk-overlap"]), + ], + deploy: { + resources: { + limits: { + cpus: '0.5', + memory: '128M' + }, + reservations: { + cpus: '0.1', + memory: '128M' + } + } + }, + }, + + }, +} + prompts + diff --git a/templates/components/claude.jsonnet b/templates/components/claude.jsonnet index 5385dcb8..ac87d8fb 100644 --- a/templates/components/claude.jsonnet +++ b/templates/components/claude.jsonnet @@ -1,8 +1,13 @@ -local base = import "base.jsonnet"; -local images = import "images.jsonnet"; -local url = import "url.jsonnet"; -local prompts = import "../prompts/mixtral.jsonnet"; +local base = import "base/base.jsonnet"; +local images = import "values/images.jsonnet"; +local url = import "values/url.jsonnet"; +local prompts = import "prompts/mixtral.jsonnet"; { + + "claude-key":: "${CLAUDE_KEY}", + "claude-max-output-tokens":: 4096, + "claude-temperature":: 0.0, + services +: { "text-completion": base + { @@ -12,11 +17,11 @@ local prompts = import "../prompts/mixtral.jsonnet"; "-p", url.pulsar, "-k", - "${CLAUDE_KEY}", + $["claude-key"], "-x", - "4096", + std.toString($["claude-max-output-tokens"]), "-t", - "0.0", + std.toString($["claude-temperature"]), ], deploy: { resources: { @@ -39,11 +44,11 @@ local prompts = import "../prompts/mixtral.jsonnet"; "-p", url.pulsar, "-k", - "${CLAUDE_KEY}", + $["claude-key"], "-x", - "4096", + std.toString($["claude-max-output-tokens"]), "-t", - "0.0", + std.toString($["claude-temperature"]), "-i", "non-persistent://tg/request/text-completion-rag", "-o", diff --git a/templates/components/cohere.jsonnet b/templates/components/cohere.jsonnet index c8a9888d..0abce83a 100644 --- a/templates/components/cohere.jsonnet +++ b/templates/components/cohere.jsonnet @@ -1,34 +1,17 @@ -local base = import "base.jsonnet"; -local images = import "images.jsonnet"; -local url = import "url.jsonnet"; -local prompts = import "../prompts/mixtral.jsonnet"; +local base = import "base/base.jsonnet"; +local images = import "values/images.jsonnet"; +local url = import "values/url.jsonnet"; +local prompts = import "prompts/cohere.jsonnet"; { - services +: { - chunker: base + { - image: images.trustgraph, - command: [ - "${CHUNKER:-chunker-token}", - "-p", - url.pulsar, - "--chunk-size", - "150", - "--chunk-overlap", - "10", - ], - deploy: { - resources: { - limits: { - cpus: '0.5', - memory: '128M' - }, - reservations: { - cpus: '0.1', - memory: '128M' - } - } - }, - }, + // Override chunking + "chunk-size":: 150, + "chunk-overlap":: 10, + + "cohere-key":: "${COHERE_KEY}", + "cohere-temperature":: 0.0, + + services +: { "text-completion": base + { image: images.trustgraph, @@ -37,9 +20,9 @@ local prompts = import "../prompts/mixtral.jsonnet"; "-p", url.pulsar, "-k", - "${COHERE_KEY}", + $["cohere-key"], "-t", - "0.0", + $["cohere-temperature"], ], deploy: { resources: { @@ -62,9 +45,9 @@ local prompts = import "../prompts/mixtral.jsonnet"; "-p", url.pulsar, "-k", - "${COHERE_KEY}", + $["cohere-key"], "-t", - "0.0", + $["cohere-temperature"], "-i", "non-persistent://tg/request/text-completion-rag", "-o", diff --git a/templates/components/grafana.jsonnet b/templates/components/grafana.jsonnet index 970cc438..4d812ffd 100644 --- a/templates/components/grafana.jsonnet +++ b/templates/components/grafana.jsonnet @@ -1,5 +1,5 @@ -local base = import "base.jsonnet"; -local images = import "images.jsonnet"; +local base = import "base/base.jsonnet"; +local images = import "values/images.jsonnet"; { volumes +: { "prometheus-data": {}, diff --git a/templates/components/milvus.jsonnet b/templates/components/milvus.jsonnet index 90518e0f..e6b767a0 100644 --- a/templates/components/milvus.jsonnet +++ b/templates/components/milvus.jsonnet @@ -1,6 +1,6 @@ -local base = import "base.jsonnet"; -local images = import "images.jsonnet"; -local url = import "url.jsonnet"; +local base = import "base/base.jsonnet"; +local images = import "values/images.jsonnet"; +local url = import "values/url.jsonnet"; local milvus = import "stores/milvus.jsonnet"; milvus + { diff --git a/templates/components/neo4j.jsonnet b/templates/components/neo4j.jsonnet index 034912a9..5e63b5d5 100644 --- a/templates/components/neo4j.jsonnet +++ b/templates/components/neo4j.jsonnet @@ -1,6 +1,6 @@ -local base = import "base.jsonnet"; -local images = import "images.jsonnet"; -local url = import "url.jsonnet"; +local base = import "base/base.jsonnet"; +local images = import "values/images.jsonnet"; +local url = import "values/url.jsonnet"; local neo4j = import "stores/neo4j.jsonnet"; neo4j + { diff --git a/templates/components/null.jsonnet b/templates/components/null.jsonnet new file mode 100644 index 00000000..2c63c085 --- /dev/null +++ b/templates/components/null.jsonnet @@ -0,0 +1,2 @@ +{ +} diff --git a/templates/components/ollama.jsonnet b/templates/components/ollama.jsonnet index 612e1747..a1cb0bb7 100644 --- a/templates/components/ollama.jsonnet +++ b/templates/components/ollama.jsonnet @@ -1,7 +1,7 @@ -local base = import "base.jsonnet"; -local images = import "images.jsonnet"; -local url = import "url.jsonnet"; -local prompts = import "../prompts/slm.jsonnet"; +local base = import "base/base.jsonnet"; +local images = import "values/images.jsonnet"; +local url = import "values/url.jsonnet"; +local prompts = import "prompts/slm.jsonnet"; { services +: { diff --git a/templates/components/openai.jsonnet b/templates/components/openai.jsonnet index b18f0ae3..b13621fe 100644 --- a/templates/components/openai.jsonnet +++ b/templates/components/openai.jsonnet @@ -1,8 +1,13 @@ -local base = import "base.jsonnet"; -local images = import "images.jsonnet"; -local url = import "url.jsonnet"; -local prompts = import "../prompts/openai.jsonnet"; +local base = import "base/base.jsonnet"; +local images = import "values/images.jsonnet"; +local url = import "values/url.jsonnet"; +local prompts = import "prompts/openai.jsonnet"; { + + "openai-key":: "${OPENAI_KEY}", + "openai-max-output-tokens":: 4096, + "openai-temperature":: 0.0, + services +: { "text-completion": base + { @@ -12,11 +17,11 @@ local prompts = import "../prompts/openai.jsonnet"; "-p", url.pulsar, "-k", - "${OPENAI_KEY}", + $["openai-key"], "-x", - "4096", + std.toString($["openai-max-output-tokens"]), "-t", - "0.0", + std.toString($["openai-temperature"]), ], deploy: { resources: { @@ -39,11 +44,11 @@ local prompts = import "../prompts/openai.jsonnet"; "-p", url.pulsar, "-k", - "${OPENAI_KEY}", + $["openai-key"], "-x", - "4096", + std.toString($["openai-max-output-tokens"]), "-t", - "0.0", + std.toString($["openai-temperature"]), "-i", "non-persistent://tg/request/text-completion-rag", "-o", diff --git a/templates/components/prompt-generic.jsonnet b/templates/components/prompt-generic.jsonnet new file mode 100644 index 00000000..d461cdfb --- /dev/null +++ b/templates/components/prompt-generic.jsonnet @@ -0,0 +1,67 @@ +local base = import "base/base.jsonnet"; +local images = import "values/images.jsonnet"; +local url = import "values/url.jsonnet"; + +{ + + services +: { + + "prompt": base + { + image: images.trustgraph, + command: [ + "prompt-generic", + "-p", + url.pulsar, + "--text-completion-request-queue", + "non-persistent://tg/request/text-completion", + "--text-completion-response-queue", + "non-persistent://tg/response/text-completion-response", + ], + deploy: { + resources: { + limits: { + cpus: '0.5', + memory: '128M' + }, + reservations: { + cpus: '0.1', + memory: '128M' + } + } + }, + }, + + "prompt-rag": base + { + image: images.trustgraph, + command: [ + "prompt-generic", + "-p", + url.pulsar, + "-i", + "non-persistent://tg/request/prompt-rag", + "-o", + "non-persistent://tg/response/prompt-rag-response", + "--text-completion-request-queue", + "non-persistent://tg/request/text-completion-rag", + "--text-completion-response-queue", + "non-persistent://tg/response/text-completion-rag-response", + ], + deploy: { + resources: { + limits: { + cpus: '0.5', + memory: '128M' + }, + reservations: { + cpus: '0.1', + memory: '128M' + } + } + + }, + }, + + } + +} + diff --git a/templates/components/prompt-template.jsonnet b/templates/components/prompt-template.jsonnet new file mode 100644 index 00000000..4fe6ff54 --- /dev/null +++ b/templates/components/prompt-template.jsonnet @@ -0,0 +1,89 @@ + +// For VertexAI Gemini + +local base = import "base/base.jsonnet"; +local images = import "values/images.jsonnet"; +local url = import "values/url.jsonnet"; +local default_prompts = import "prompts/default-prompts.jsonnet"; + +default_prompts + { + + services +: { + + "prompt": base + { + image: images.trustgraph, + command: [ + "prompt-template", + "-p", + url.pulsar, + "--text-completion-request-queue", + "non-persistent://tg/request/text-completion", + "--text-completion-response-queue", + "non-persistent://tg/response/text-completion-response", + "--definition-template", + $["prompt-definition-template"], + "--relationship-template", + $["prompt-relationship-template"], + "--knowledge-query-template", + $["prompt-knowledge-query-template"], + "--document-query-template", + $["prompt-document-query-template"], + "--rows-template", + $["prompt-rows-template"], + ], + deploy: { + resources: { + limits: { + cpus: '0.5', + memory: '128M' + }, + reservations: { + cpus: '0.1', + memory: '128M' + } + } + }, + }, + + "prompt-rag": base + { + image: images.trustgraph, + command: [ + "prompt-template", + "-p", + url.pulsar, + "-i", + "non-persistent://tg/request/prompt-rag", + "-o", + "non-persistent://tg/response/prompt-rag-response", + "--text-completion-request-queue", + "non-persistent://tg/request/text-completion-rag", + "--text-completion-response-queue", + "non-persistent://tg/response/text-completion-rag-response", + "--definition-template", + $["prompt-definition-template"], + "--relationship-template", + $["prompt-relationship-template"], + "--knowledge-query-template", + $["prompt-knowledge-query-template"], + "--document-query-template", + $["prompt-document-query-template"], + "--rows-template", + $["prompt-rows-template"], + ], + deploy: { + resources: { + limits: { + cpus: '0.5', + memory: '128M' + }, + reservations: { + cpus: '0.1', + memory: '128M' + } + } + }, + }, + + }, + +} diff --git a/templates/components/pulsar-manager.jsonnet b/templates/components/pulsar-manager.jsonnet new file mode 100644 index 00000000..f9f881ae --- /dev/null +++ b/templates/components/pulsar-manager.jsonnet @@ -0,0 +1,33 @@ +local base = import "base/base.jsonnet"; +local images = import "values/images.jsonnet"; +{ + + // FIXME: Should persist *something* + volumes +: { + }, + + services +: { + "pulsar-manager": base + { + image: images.pulsar_manager, + ports: [ + "9527:9527", + "7750:7750", + ], + environment: { + SPRING_CONFIGURATION_FILE: "/pulsar-manager/pulsar-manager/application.properties", + }, + deploy: { + resources: { + limits: { + cpus: '0.5', + memory: '1.4G' + }, + reservations: { + cpus: '0.1', + memory: '1.4G' + } + } + }, + }, + } +} diff --git a/templates/components/pulsar.jsonnet b/templates/components/pulsar.jsonnet index 71f2cb32..ee64b859 100644 --- a/templates/components/pulsar.jsonnet +++ b/templates/components/pulsar.jsonnet @@ -1,5 +1,5 @@ -local base = import "base.jsonnet"; -local images = import "images.jsonnet"; +local base = import "base/base.jsonnet"; +local images = import "values/images.jsonnet"; { volumes +: { "pulsar-conf": {}, @@ -58,27 +58,5 @@ local images = import "images.jsonnet"; } }, }, - "pulsar-manager": base + { - image: images.pulsar_manager, - ports: [ - "9527:9527", - "7750:7750", - ], - environment: { - SPRING_CONFIGURATION_FILE: "/pulsar-manager/pulsar-manager/application.properties", - }, - deploy: { - resources: { - limits: { - cpus: '0.5', - memory: '1.4G' - }, - reservations: { - cpus: '0.1', - memory: '1.4G' - } - } - }, - }, } } diff --git a/templates/components/qdrant.jsonnet b/templates/components/qdrant.jsonnet index e2d69f39..d92449b7 100644 --- a/templates/components/qdrant.jsonnet +++ b/templates/components/qdrant.jsonnet @@ -1,6 +1,6 @@ -local base = import "base.jsonnet"; -local images = import "images.jsonnet"; -local url = import "url.jsonnet"; +local base = import "base/base.jsonnet"; +local images = import "values/images.jsonnet"; +local url = import "values/url.jsonnet"; local qdrant = import "stores/qdrant.jsonnet"; qdrant + { diff --git a/templates/components/trustgraph.jsonnet b/templates/components/trustgraph.jsonnet index ab6ac88a..fcda055a 100644 --- a/templates/components/trustgraph.jsonnet +++ b/templates/components/trustgraph.jsonnet @@ -1,11 +1,17 @@ - -local base = import "base.jsonnet"; - -local images = import "images.jsonnet"; - -local url = import "url.jsonnet"; +local base = import "base/base.jsonnet"; +local images = import "values/images.jsonnet"; +local url = import "values/url.jsonnet"; +local prompts = import "prompt-template.jsonnet"; { + + "chunk-size":: 250, + "chunk-overlap":: 15, + "embeddings-model":: "all-MiniLM-L6-v2", + "graph-rag-entity-limit":: 50, + "graph-rag-triple-limit":: 30, + "graph-rag-max-subgraph-size":: 3000, + services +: { "pdf-decoder": base + { @@ -32,13 +38,13 @@ local url = import "url.jsonnet"; chunker: base + { image: images.trustgraph, command: [ - "${CHUNKER:-chunker-token}", + "chunker-token", "-p", url.pulsar, "--chunk-size", - "250", + std.toString($["chunk-size"]), "--chunk-overlap", - "15", + std.toString($["chunk-overlap"]), ], deploy: { resources: { @@ -82,7 +88,7 @@ local url = import "url.jsonnet"; "-p", url.pulsar, "-m", - "all-MiniLM-L6-v2", + $["embeddings-model"], ], deploy: { resources: { @@ -151,11 +157,11 @@ local url = import "url.jsonnet"; "--prompt-response-queue", "non-persistent://tg/response/prompt-rag-response", "--entity-limit", - "50", + std.toString($["graph-rag-entity-limit"]), "--triple-limit", - "30", + std.toString($["graph-rag-triple-limit"]), "--max-subgraph-size", - "3000", + std.toString($["graph-rag-max-subgraph-size"]), ], deploy: { resources: { @@ -173,5 +179,7 @@ local url = import "url.jsonnet"; } -} +} + prompts + + diff --git a/templates/components/vertexai.jsonnet b/templates/components/vertexai.jsonnet index 95d80bd8..ab1e8d54 100644 --- a/templates/components/vertexai.jsonnet +++ b/templates/components/vertexai.jsonnet @@ -1,8 +1,15 @@ -local base = import "base.jsonnet"; -local images = import "images.jsonnet"; -local url = import "url.jsonnet"; -local prompts = import "../prompts/gemini.jsonnet"; +local base = import "base/base.jsonnet"; +local images = import "values/images.jsonnet"; +local url = import "values/url.jsonnet"; +local prompts = import "prompts/gemini.jsonnet"; { + + "vertexai-model":: "gemini-1.0-pro-001", + "vertexai-private-key":: "/vertexai/private.json", + "vertexai-region":: "us-central1", + "vertexai-max-output-tokens":: 4096, + "vertexai-temperature":: 0.0, + services +: { "text-completion": base + { @@ -12,13 +19,15 @@ local prompts = import "../prompts/gemini.jsonnet"; "-p", url.pulsar, "-k", - "/vertexai/private.json", + $["vertexai-private-key"], "-r", - "us-central1", + $["vertexai-region"], "-x", - "4096", + std.toString($["vertexai-max-output-tokens"]), "-t", - "0.0", + std.toString($["vertexai-temperature"]), + "-m", + $["vertexai-model"], ], volumes: [ "./vertexai:/vertexai" @@ -44,13 +53,15 @@ local prompts = import "../prompts/gemini.jsonnet"; "-p", url.pulsar, "-k", - "/vertexai/private.json", + $["vertexai-private-key"], "-r", - "us-central1", + $["vertexai-region"], "-x", - "4096", + std.toString($["vertexai-max-output-tokens"]), "-t", - "0.0", + std.toString($["vertexai-temperature"]), + "-m", + $["vertexai-model"], "-i", "non-persistent://tg/request/text-completion-rag", "-o", @@ -76,4 +87,3 @@ local prompts = import "../prompts/gemini.jsonnet"; }, } + prompts - diff --git a/templates/config-loader.jsonnet b/templates/config-loader.jsonnet new file mode 100644 index 00000000..d599eaaf --- /dev/null +++ b/templates/config-loader.jsonnet @@ -0,0 +1,50 @@ +local components = { + "azure": import "components/azure.jsonnet", + "bedrock": import "components/bedrock.jsonnet", + "claude": import "components/claude.jsonnet", + "cohere": import "components/cohere.jsonnet", + "grafana": import "components/grafana.jsonnet", + "graph-rag-cassandra": import "components/cassandra.jsonnet", + "graph-rag-neo4j": import "components/neo4j.jsonnet", + "ollama": import "components/ollama.jsonnet", + "openai": import "components/openai.jsonnet", + "override-recursive-chunker": import "components/chunker-recursive.jsonnet", + "prompt-template-definitions": import "components/null.jsonnet", + "prompt-template-document-query": import "components/null.jsonnet", + "prompt-template-kq-query": import "components/null.jsonnet", + "prompt-template-relationships": import "components/null.jsonnet", + "prompt-template-rows-template": import "components/null.jsonnet", + "pulsar": import "components/pulsar.jsonnet", + "pulsar-manager": import "components/pulsar.jsonnet", + "trustgraph-base": import "components/trustgraph.jsonnet", + "vector-store-milvus": import "components/milvus.jsonnet", + "vector-store-qdrant": import "components/qdrant.jsonnet", + "vertexai": import "components/vertexai.jsonnet" +}; + +local config = function(p) + (components[p.name] + { + + with:: function(k, v) self + { + [k]:: v + }, + + with_params:: function(pars) + self + std.foldl( + function(obj, par) obj.with(par.key, par.value), + std.objectKeysValues(pars), + self + ), + + }).with_params(p.parameters); + +local options = import "config.json"; + +local add = function(state, p) state + config(p); + +local output = std.foldl(add, options, {}); + +//std.manifestYamlDoc(config) + +output + diff --git a/templates/mix.jsonnet b/templates/mix.jsonnet deleted file mode 100644 index 26e6800e..00000000 --- a/templates/mix.jsonnet +++ /dev/null @@ -1,62 +0,0 @@ - -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 config = cassandra + pulsar + milvus + grafana + trustgraph + { - services +: { - - chunker: base + { - image: images.trustgraph, - command: [ - "chunker-recursive", - "-p", - url.pulsar, - "--chunk-size", - "4000", - "--chunk-overlap", - "120", - ], - }, - - "text-completion": base + { - image: images.trustgraph, - command: [ - "text-completion-cohere", - "-p", - url.pulsar, - "-k", - "${COHERE_KEY}", - "-m", - "c4ai-aya-23-35b", - ], - }, - - "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", - "-m", - "c4ai-aya-23-8b", - ], - }, - - } -}; - -std.manifestYamlDoc(config) - diff --git a/templates/module-list.jsonnet b/templates/module-list.jsonnet new file mode 100644 index 00000000..b949021e --- /dev/null +++ b/templates/module-list.jsonnet @@ -0,0 +1,9 @@ + +local all = import "all-patterns.jsonnet"; + +std.foldl( + function(m, p) m + { [p.pattern.name]: p.module}, + all, + {} +) + diff --git a/templates/ollama.jsonnet b/templates/ollama.jsonnet deleted file mode 100644 index 0bd1abb6..00000000 --- a/templates/ollama.jsonnet +++ /dev/null @@ -1,12 +0,0 @@ - -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 + ollama; - -std.manifestYamlDoc(config) - diff --git a/templates/openai-neo4j.jsonnet b/templates/openai-neo4j.jsonnet deleted file mode 100644 index c0bf05b9..00000000 --- a/templates/openai-neo4j.jsonnet +++ /dev/null @@ -1,12 +0,0 @@ - -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 + openai; - -std.manifestYamlDoc(config) - diff --git a/templates/openai.jsonnet b/templates/openai.jsonnet deleted file mode 100644 index 28386925..00000000 --- a/templates/openai.jsonnet +++ /dev/null @@ -1,12 +0,0 @@ - -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 + openai; - -std.manifestYamlDoc(config) - diff --git a/templates/patterns/grafana.jsonnet b/templates/patterns/grafana.jsonnet new file mode 100644 index 00000000..12827e4e --- /dev/null +++ b/templates/patterns/grafana.jsonnet @@ -0,0 +1,13 @@ +{ + pattern: { + name: "grafana", + icon: "📈🧯", + title: "Add Prometheus and Grafana for monitoring and dashboards", + description: "System monitoring and dashboarding using Grafana and Prometheus", + requires: ["pulsar", "trustgraph"], + features: ["prometheus", "grafana"], + args: [ + ], + }, + module: "components/grafana.jsonnet", +} diff --git a/templates/patterns/graph-rag-cassandra.jsonnet b/templates/patterns/graph-rag-cassandra.jsonnet new file mode 100644 index 00000000..3d801572 --- /dev/null +++ b/templates/patterns/graph-rag-cassandra.jsonnet @@ -0,0 +1,12 @@ +{ + pattern: { + name: "graph-rag-cassandra", + icon: "🖇️🙋‍♀️", + title: "Add GraphRAG indexing and querying using Cassandra", + description: "The core Trustgraph deployment does not include a GraphRag store; this pattern adds the Cassandra store, and adds GraphRAG adapters so that Cassandra is integrated with GraphRag indexing and querying.", + requires: ["pulsar", "trustgraph"], + features: ["cassandra", "rag"], + args: [], + }, + module: "components/cassandra.jsonnet", +} diff --git a/templates/patterns/graph-rag-neo4j.jsonnet b/templates/patterns/graph-rag-neo4j.jsonnet new file mode 100644 index 00000000..c75986a2 --- /dev/null +++ b/templates/patterns/graph-rag-neo4j.jsonnet @@ -0,0 +1,12 @@ +{ + pattern: { + name: "graph-rag-neo4j", + icon: "🖇️🙋‍♀️", + title: "Deploys GraphRAG indexing and querying using a Neo4j community edition store", + description: "The core Trustgraph deployment does not include a GraphRag store; this pattern adds the Neo4j store, and adds GraphRAG adapters so that Neo4j is integrated with GraphRag indexing and querying.", + requires: ["pulsar", "trustgraph"], + features: ["neo4j", "rag"], + args: [], + }, + module: "components/neo4j.jsonnet", +} diff --git a/templates/patterns/llm-azure.jsonnet b/templates/patterns/llm-azure.jsonnet new file mode 100644 index 00000000..59ba9741 --- /dev/null +++ b/templates/patterns/llm-azure.jsonnet @@ -0,0 +1,13 @@ +{ + pattern: { + name: "azure", + icon: "🤖💬", + title: "Add Azure LLM endpoint for text completion", + description: "This pattern integrates an Azure LLM endpoint hosted in the Azure cloud for text completion operations. You need an Azure subscription and to have an endpoint deployed to be able to use this service.", + requires: ["pulsar", "trustgraph"], + features: ["llm"], + args: [ + ] + }, + module: "components/azure.jsonnet", +} diff --git a/templates/patterns/llm-bedrock.jsonnet b/templates/patterns/llm-bedrock.jsonnet new file mode 100644 index 00000000..2122a522 --- /dev/null +++ b/templates/patterns/llm-bedrock.jsonnet @@ -0,0 +1,13 @@ +{ + pattern: { + name: "bedrock", + icon: "🤖💬", + title: "Add AWS Bedrock for text completion", + description: "This pattern integrates an AWS Bedrock LLM service hosted in the AWS cloud for text completion operations. You need an AWS cloud subscription and to have Bedrock configured to be able to use this service.", + requires: ["pulsar", "trustgraph"], + features: ["llm"], + args: [ + ] + }, + module: "components/bedrock.jsonnet", +} diff --git a/templates/patterns/llm-claude.jsonnet b/templates/patterns/llm-claude.jsonnet new file mode 100644 index 00000000..0b5f35c2 --- /dev/null +++ b/templates/patterns/llm-claude.jsonnet @@ -0,0 +1,13 @@ +{ + pattern: { + name: "claude", + icon: "🤖💬", + title: "Add Anthropic Claude for text completion", + description: "This pattern integrates an Anthropic Claude LLM service for text completion operations. You need a Claude subscription to be able to use this service.", + requires: ["pulsar", "trustgraph"], + features: ["llm"], + args: [ + ] + }, + module: "components/claude.jsonnet", +} diff --git a/templates/patterns/llm-cohere.jsonnet b/templates/patterns/llm-cohere.jsonnet new file mode 100644 index 00000000..61b572dd --- /dev/null +++ b/templates/patterns/llm-cohere.jsonnet @@ -0,0 +1,13 @@ +{ + pattern: { + name: "cohere", + icon: "🤖💬", + title: "Add Cohere LLM endpoint for text completion", + description: "This pattern integrates the Cohere LLM service for text completion operations. You need a Cohere subscription and API keys to be able to use this service.", + requires: ["pulsar", "trustgraph"], + features: ["llm"], + args: [ + ] + }, + module: "components/cohere.jsonnet", +} diff --git a/templates/patterns/llm-ollama.jsonnet b/templates/patterns/llm-ollama.jsonnet new file mode 100644 index 00000000..8790ffc9 --- /dev/null +++ b/templates/patterns/llm-ollama.jsonnet @@ -0,0 +1,13 @@ +{ + pattern: { + name: "ollama", + icon: "🤖💬", + title: "Add Ollama LLM for text completion", + description: "This pattern integrates an Ollama service for text completion operations. You need to have a running Ollama service with the necessary models added in order to be able to use this service.", + requires: ["pulsar", "trustgraph"], + features: ["llm"], + args: [ + ] + }, + module: "components/ollama.jsonnet", +} diff --git a/templates/patterns/llm-openai.jsonnet b/templates/patterns/llm-openai.jsonnet new file mode 100644 index 00000000..35804f27 --- /dev/null +++ b/templates/patterns/llm-openai.jsonnet @@ -0,0 +1,13 @@ +{ + pattern: { + name: "openai", + icon: "🤖💬", + title: "Add OpenAI LLM endpoint for text completion", + description: "This pattern integrates an OpenAI LLM service for text completion operations. You need an OpenAI subscription and have an API key to be able to use this service.", + requires: ["pulsar", "trustgraph"], + features: ["llm"], + args: [ + ] + }, + module: "components/openai.jsonnet", +} diff --git a/templates/patterns/llm-vertexai.jsonnet b/templates/patterns/llm-vertexai.jsonnet new file mode 100644 index 00000000..eaeab872 --- /dev/null +++ b/templates/patterns/llm-vertexai.jsonnet @@ -0,0 +1,13 @@ +{ + pattern: { + name: "vertexai", + icon: "🤖💬", + title: "Add Google Cloud VertexAI LLM for text completion", + description: "This pattern integrates a VertexAI endpoint hosted in Google Cloud for text completion operations. You need a GCP subscription and to have VertexAI enabled to be able to use this service.", + requires: ["pulsar", "trustgraph"], + features: ["llm"], + args: [ + ] + }, + module: "components/vertexai.jsonnet", +} diff --git a/templates/patterns/override-recursive-chunker.jsonnet b/templates/patterns/override-recursive-chunker.jsonnet new file mode 100644 index 00000000..1b85f2f7 --- /dev/null +++ b/templates/patterns/override-recursive-chunker.jsonnet @@ -0,0 +1,27 @@ +{ + pattern: { + name: "override-recursive-chunker", + icon: "✂️🪚", + title: "Replace default chunker with recursive chunker", + description: "The default chunker used in Trustgraph core is a token-based chunker. This pattern replaces that with a recursive chunker, and allows ou to configure the chunking parameters.", + requires: ["pulsar", "trustgraph"], + features: [], + args: [ + { + name: "chunk-size", + type: "int", + description: "Chunk size value", + default: 2000, + required: true, + }, + { + name: "chunk-overlap", + type: "int", + description: "Overlap size value", + default: 100, + required: true, + } + ] + }, + module: "components/cassandra.jsonnet", +} diff --git a/templates/patterns/prompt-template-definitions.jsonnet b/templates/patterns/prompt-template-definitions.jsonnet new file mode 100644 index 00000000..7a7f0e00 --- /dev/null +++ b/templates/patterns/prompt-template-definitions.jsonnet @@ -0,0 +1,21 @@ +{ + pattern: { + name: "prompt-template-definitions", + icon: "📜️️💬", + title: "Override definition extraction prompt", + description: "This pattern overrides the default definition extraction LLM prompt allowing you to provide your own prompt.", + requires: ["pulsar", "trustgraph"], + features: ["extract-definition-prompt"], + args: [ + { + name: "prompt-definition-template", + type: "string", + width: 2000, + description: "Definition extraction prompt", + default: "\nStudy the following text and derive definitions for any discovered entities.\nDo not provide definitions for entities whose definitions are incomplete\nor unknown.\nOutput relationships in JSON format as an arary of objects with fields:\n- entity: the name of the entity\n- definition: English text which defines the entity\n\n\n\n{text}\n\n\n\nYou will respond only with raw JSON format data. Do not provide\nexplanations. Do not use special characters in the abstract text. The\nabstract will be written as plain text. Do not add markdown formatting\nor headers or prefixes. Do not include null or unknown definitions.\n", + required: true, + } + ] + }, + module: "components/null.jsonnet", +} diff --git a/templates/patterns/prompt-template-document-query.jsonnet b/templates/patterns/prompt-template-document-query.jsonnet new file mode 100644 index 00000000..5a46320e --- /dev/null +++ b/templates/patterns/prompt-template-document-query.jsonnet @@ -0,0 +1,21 @@ +{ + pattern: { + name: "prompt-template-document-query", + icon: "📜️️💬", + title: "Override document query prompt", + description: "This pattern overrides the default document query prompt used for DocumentRAG allowing you to specify your own prompt.", + requires: ["pulsar", "trustgraph"], + features: ["document-query-prompt"], + args: [ + { + name: "prompt-document-query-template", + type: "string", + width: 2000, + description: "Document query prompt", + default: "Study the following context. Use only the information provided in the context in your response. Do not speculate if the answer is not found in the provided set of knowledge statements.\n\nHere is the context:\n{documents}\n\nUse only the provided knowledge statements to respond to the following:\n{query}\n", + required: true, + } + ] + }, + module: "components/null.jsonnet", +} diff --git a/templates/patterns/prompt-template-kg-query.jsonnet b/templates/patterns/prompt-template-kg-query.jsonnet new file mode 100644 index 00000000..20a03b8e --- /dev/null +++ b/templates/patterns/prompt-template-kg-query.jsonnet @@ -0,0 +1,21 @@ +{ + pattern: { + name: "prompt-template-kq-query", + icon: "📜️️💬", + title: "Override knowledge query prompt", + description: "This pattern overrides the default knowledge query LLM prompt allowing you to provide your own prompt.", + requires: ["pulsar", "trustgraph"], + features: ["kg-query-prompt"], + args: [ + { + name: "prompt-knowledge-query-template", + type: "string", + width: 2000, + description: "Knowledge graph extraction prompt", + default: "Study the following set of knowledge statements. The statements are written in Cypher format that has been extracted from a knowledge graph. Use only the provided set of knowledge statements in your response. Do not speculate if the answer is not found in the provided set of knowledge statements.\n\nHere's the knowledge statements:\n{graph}\n\nUse only the provided knowledge statements to respond to the following:\n{query}\n", + required: true, + } + ] + }, + module: "components/null.jsonnet", +} diff --git a/templates/patterns/prompt-template-relationships.jsonnet b/templates/patterns/prompt-template-relationships.jsonnet new file mode 100644 index 00000000..0664895c --- /dev/null +++ b/templates/patterns/prompt-template-relationships.jsonnet @@ -0,0 +1,21 @@ +{ + pattern: { + name: "prompt-template-relationships", + icon: "📜️️💬", + title: "Override relationship extraction prompt", + description: "This pattern overrides the default relationship extraction LLM prompt allowing you to provide your own prompt.", + requires: ["pulsar", "trustgraph"], + features: ["extract-relationship-prompt"], + args: [ + { + name: "prompt-relationship-template", + type: "string", + width: 2000, + description: "Relationship extraction prompt", + default: "\nStudy the following text and derive entity relationships. For each\nrelationship, derive the subject, predicate and object of the relationship.\nOutput relationships in JSON format as an arary of objects with fields:\n- subject: the subject of the relationship\n- predicate: the predicate\n- object: the object of the relationship\n- object-entity: false if the object is a simple data type: name, value or date. true if it is an entity.\n\n\n\n{text}\n\n\n\nYou will respond only with raw JSON format data. Do not provide\nexplanations. Do not use special characters in the abstract text. The\nabstract must be written as plain text. Do not add markdown formatting\nor headers or prefixes.\n", + required: true, + } + ] + }, + module: "components/null.jsonnet", +} diff --git a/templates/patterns/prompt-template-rows-template.jsonnet b/templates/patterns/prompt-template-rows-template.jsonnet new file mode 100644 index 00000000..3ea9c0e4 --- /dev/null +++ b/templates/patterns/prompt-template-rows-template.jsonnet @@ -0,0 +1,21 @@ +{ + pattern: { + name: "prompt-template-rows-template", + icon: "📜️️💬", + title: "Override table/row extraction prompt", + description: "This pattern overrides the default table/row extraction prompt to be changed. This is used for DatabaseRAG pipelines.", + requires: ["pulsar", "trustgraph"], + features: ["extract-rows-prompt"], + args: [ + { + name: "prompt-rows-template", + type: "string", + width: 2000, + description: "Row data extraction prompt", + default: "\nStudy the following text and derive objects which match the schema provided.\n\nYou must output an array of JSON objects for each object you discover\nwhich matches the schema. For each object, output a JSON object whose fields\ncarry the name field specified in the schema.\n\n\n\n{schema}\n\n\n\n{text}\n\n\n\nYou will respond only with raw JSON format data. Do not provide\nexplanations. Do not add markdown formatting or headers or prefixes.\n", + required: true, + } + ] + }, + module: "components/null.jsonnet", +} diff --git a/templates/patterns/pulsar-manager.jsonnet b/templates/patterns/pulsar-manager.jsonnet new file mode 100644 index 00000000..93519f0f --- /dev/null +++ b/templates/patterns/pulsar-manager.jsonnet @@ -0,0 +1,21 @@ +{ + pattern: { + name: "pulsar-manager", + icon: "🏻🛃", + title: "Add Pulsar Manager", + description: "Adds Pulsar Manager which provides a web interface to manage Pulsar. Pulsar Manager is a large container and deployment requiring over 1GB of RAM, so is not deployed by default. This is not a required component, it may be useful to help manage a large operational deployment.", + requires: ["pulsar"], + features: ["pulsar-manager"], + args: [ + { + name: "default-admin-password", + type: "string", + width: 20, + description: "Admin password to apply", + default: "pulsaradmin", + required: true, + } + ] + }, + module: "components/pulsar.jsonnet", +} diff --git a/templates/patterns/pulsar.jsonnet b/templates/patterns/pulsar.jsonnet new file mode 100644 index 00000000..75247a12 --- /dev/null +++ b/templates/patterns/pulsar.jsonnet @@ -0,0 +1,13 @@ +{ + pattern: { + name: "pulsar", + icon: "🌟☄️", + title: "Deploy foundation messaging fabric", + description: "Deploy Pulsar as the inter-process messaging fabric. Pulsar is a Cloud-native, distributed messaging and Streaming. Apache Pulsar is an open-source, distributed messaging and streaming platform built for the cloud. Trustgraph uses Pulsar to manage the message flow between all components.", + requires: [], + features: ["pulsar"], + args: [ + ] + }, + module: "components/pulsar.jsonnet", +} diff --git a/templates/patterns/trustgraph-base.jsonnet b/templates/patterns/trustgraph-base.jsonnet new file mode 100644 index 00000000..6ceafcf0 --- /dev/null +++ b/templates/patterns/trustgraph-base.jsonnet @@ -0,0 +1,13 @@ +{ + pattern: { + name: "trustgraph-base", + icon: "🤝😂", + title: "Add Trustgraph base processing flows", + description: "This pattern adds a core set of Trustgraph flows, including PDF ingest, chunking, embeddings, and knowledge graph extraction. You should also consider adding an LLM and at least one RAG processing flow.", + requires: ["pulsar"], + features: ["trustgraph"], + args: [ + ] + }, + module: "components/trustgraph.jsonnet", +} diff --git a/templates/patterns/vector-store-milvus.jsonnet b/templates/patterns/vector-store-milvus.jsonnet new file mode 100644 index 00000000..5b0f04c5 --- /dev/null +++ b/templates/patterns/vector-store-milvus.jsonnet @@ -0,0 +1,13 @@ +{ + pattern: { + name: "vector-store-milvus", + icon: "❓🌐", + title: "Add Milvus, a vector embeddings store", + description: "The Trustgraph core does not include a vector store by default. This configuration pattern adds a simple Milvus store and integrates with embeddings handling.", + requires: ["pulsar", "trustgraph"], + features: ["milvus", "vectordb"], + args: [ + ] + }, + module: "components/milvus.jsonnet", +} diff --git a/templates/patterns/vector-store-qdrant.jsonnet b/templates/patterns/vector-store-qdrant.jsonnet new file mode 100644 index 00000000..18ca2b1a --- /dev/null +++ b/templates/patterns/vector-store-qdrant.jsonnet @@ -0,0 +1,13 @@ +{ + pattern: { + name: "vector-store-qdrant", + icon: "❓🌐", + title: "Adds Qdrant, a vector embeddings store", + description: "The Trustgraph core does not include a vector store by default. This configuration pattern adds a simple Qdrant store and integrates with embeddings handling.", + requires: ["pulsar", "trustgraph"], + features: ["qdrant", "vectordb"], + args: [ + ] + }, + module: "components/qdrant.jsonnet", +} diff --git a/templates/prompts/cohere.jsonnet b/templates/prompts/cohere.jsonnet new file mode 100644 index 00000000..f70e1704 --- /dev/null +++ b/templates/prompts/cohere.jsonnet @@ -0,0 +1,16 @@ + +// For Cohere. Not currently overriding prompts + +{ + +// "prompt-definition-template": "PROMPT GOES HERE", + +// "prompt-relationship-template":: "PROMPT GOES HERE", + +// "prompt-knowledge-query-template":: "PROMPT GOES HERE", + +// "prompt-document-query-template":: "PROMPT GOES HERE", + +// "prompt-rows-template":: "PROMPT GOES HERE", + +} diff --git a/templates/prompts/default-prompts.jsonnet b/templates/prompts/default-prompts.jsonnet new file mode 100644 index 00000000..980e7940 --- /dev/null +++ b/templates/prompts/default-prompts.jsonnet @@ -0,0 +1,17 @@ + +// Prompt templates. For tidy JSONNET use, don't change these templates +// here, but use over-rides in the prompt directory + +{ + + "prompt-definition-template":: "\nStudy the following text and derive definitions for any discovered entities.\nDo not provide definitions for entities whose definitions are incomplete\nor unknown.\nOutput relationships in JSON format as an arary of objects with fields:\n- entity: the name of the entity\n- definition: English text which defines the entity\n\n\n\n{text}\n\n\n\nYou will respond only with raw JSON format data. Do not provide\nexplanations. Do not use special characters in the abstract text. The\nabstract will be written as plain text. Do not add markdown formatting\nor headers or prefixes. Do not include null or unknown definitions.\n", + + "prompt-relationship-template":: "\nStudy the following text and derive entity relationships. For each\nrelationship, derive the subject, predicate and object of the relationship.\nOutput relationships in JSON format as an arary of objects with fields:\n- subject: the subject of the relationship\n- predicate: the predicate\n- object: the object of the relationship\n- object-entity: false if the object is a simple data type: name, value or date. true if it is an entity.\n\n\n\n{text}\n\n\n\nYou will respond only with raw JSON format data. Do not provide\nexplanations. Do not use special characters in the abstract text. The\nabstract must be written as plain text. Do not add markdown formatting\nor headers or prefixes.\n", + + "prompt-knowledge-query-template":: "Study the following set of knowledge statements. The statements are written in Cypher format that has been extracted from a knowledge graph. Use only the provided set of knowledge statements in your response. Do not speculate if the answer is not found in the provided set of knowledge statements.\n\nHere's the knowledge statements:\n{graph}\n\nUse only the provided knowledge statements to respond to the following:\n{query}\n", + + "prompt-document-query-template":: "Study the following context. Use only the information provided in the context in your response. Do not speculate if the answer is not found in the provided set of knowledge statements.\n\nHere is the context:\n{documents}\n\nUse only the provided knowledge statements to respond to the following:\n{query}\n", + + "prompt-rows-template":: "\nStudy the following text and derive objects which match the schema provided.\n\nYou must output an array of JSON objects for each object you discover\nwhich matches the schema. For each object, output a JSON object whose fields\ncarry the name field specified in the schema.\n\n\n\n{schema}\n\n\n\n{text}\n\n\n\nYou will respond only with raw JSON format data. Do not provide\nexplanations. Do not add markdown formatting or headers or prefixes.\n", + +} \ No newline at end of file diff --git a/templates/prompts/gemini.jsonnet b/templates/prompts/gemini.jsonnet index 03dadfd1..cfcb81c1 100644 --- a/templates/prompts/gemini.jsonnet +++ b/templates/prompts/gemini.jsonnet @@ -1,88 +1,15 @@ -// For VertexAI Gemini - -local base = import "../components/base.jsonnet"; -local images = import "../components/images.jsonnet"; -local url = import "../components/url.jsonnet"; - +// For VertexAI Gemini. Not currently overriding prompts { - services +: { +// "prompt-definition-template": "PROMPT GOES HERE", - "prompt": base + { - image: images.trustgraph, - command: [ - "prompt-template", - "-p", - url.pulsar, - "--text-completion-request-queue", - "non-persistent://tg/request/text-completion", - "--text-completion-response-queue", - "non-persistent://tg/response/text-completion-response", - "--definition-template", - "\nStudy the following text and derive definitions for any discovered entities.\nDo not provide definitions for entities whose definitions are incomplete\nor unknown.\nOutput relationships in JSON format as an arary of objects with fields:\n- entity: the name of the entity\n- definition: English text which defines the entity\n\n\n\n{text}\n\n\n\nYou will respond only with raw JSON format data. Do not provide\nexplanations. Do not use special characters in the abstract text. The\nabstract will be written as plain text. Do not add markdown formatting\nor headers or prefixes. Do not include null or unknown definitions.\n", - "--relationship-template", - "\nStudy the following text and derive entity relationships. For each\nrelationship, derive the subject, predicate and object of the relationship.\nOutput relationships in JSON format as an arary of objects with fields:\n- subject: the subject of the relationship\n- predicate: the predicate\n- object: the object of the relationship\n- object-entity: false if the object is a simple data type: name, value or date. true if it is an entity.\n\n\n\n{text}\n\n\n\nYou will respond only with raw JSON format data. Do not provide\nexplanations. Do not use special characters in the abstract text. The\nabstract must be written as plain text. Do not add markdown formatting\nor headers or prefixes.\n", - "--knowledge-query-template", - "Study the following set of knowledge statements. The statements are written in Cypher format that has been extracted from a knowledge graph. Use only the provided set of knowledge statements in your response. Do not speculate if the answer is not found in the provided set of knowledge statements.\n\nHere's the knowledge statements:\n{graph}\n\nUse only the provided knowledge statements to respond to the following:\n{query}\n", - "--document-query-template", - "Study the following context. Use only the information provided in the context in your response. Do not speculate if the answer is not found in the provided set of knowledge statements.\n\nHere is the context:\n{documents}\n\nUse only the provided knowledge statements to respond to the following:\n{query}\n", - "--rows-template", - "\nStudy the following text and derive objects which match the schema provided.\n\nYou must output an array of JSON objects for each object you discover\nwhich matches the schema. For each object, output a JSON object whose fields\ncarry the name field specified in the schema.\n\n\n\n{schema}\n\n\n\n{text}\n\n\n\nYou will respond only with raw JSON format data. Do not provide\nexplanations. Do not add markdown formatting or headers or prefixes.\n", - ], - deploy: { - resources: { - limits: { - cpus: '0.5', - memory: '128M' - }, - reservations: { - cpus: '0.1', - memory: '128M' - } - } - }, - }, +// "prompt-relationship-template":: "PROMPT GOES HERE", - "prompt-rag": base + { - image: images.trustgraph, - command: [ - "prompt-template", - "-p", - url.pulsar, - "-i", - "non-persistent://tg/request/prompt-rag", - "-o", - "non-persistent://tg/response/prompt-rag-response", - "--text-completion-request-queue", - "non-persistent://tg/request/text-completion-rag", - "--text-completion-response-queue", - "non-persistent://tg/response/text-completion-rag-response", - "--definition-template", - "\nStudy the following text and derive definitions for any discovered entities.\nDo not provide definitions for entities whose definitions are incomplete\nor unknown.\nOutput relationships in JSON format as an arary of objects with fields:\n- entity: the name of the entity\n- definition: English text which defines the entity\n\n\n\n{text}\n\n\n\nYou will respond only with raw JSON format data. Do not provide\nexplanations. Do not use special characters in the abstract text. The\nabstract will be written as plain text. Do not add markdown formatting\nor headers or prefixes. Do not include null or unknown definitions.\n", - "--relationship-template", - "\nStudy the following text and derive entity relationships. For each\nrelationship, derive the subject, predicate and object of the relationship.\nOutput relationships in JSON format as an arary of objects with fields:\n- subject: the subject of the relationship\n- predicate: the predicate\n- object: the object of the relationship\n- object-entity: false if the object is a simple data type: name, value or date. true if it is an entity.\n\n\n\n{text}\n\n\n\nYou will respond only with raw JSON format data. Do not provide\nexplanations. Do not use special characters in the abstract text. The\nabstract must be written as plain text. Do not add markdown formatting\nor headers or prefixes.\n", - "--knowledge-query-template", - "Study the following set of knowledge statements. The statements are written in Cypher format that has been extracted from a knowledge graph. Use only the provided set of knowledge statements in your response. Do not speculate if the answer is not found in the provided set of knowledge statements.\n\nHere's the knowledge statements:\n{graph}\n\nUse only the provided knowledge statements to respond to the following:\n{query}\n", - "--document-query-template", - "Study the following context. Use only the information provided in the context in your response. Do not speculate if the answer is not found in the provided set of knowledge statements.\n\nHere is the context:\n{documents}\n\nUse only the provided knowledge statements to respond to the following:\n{query}\n", - "--rows-template", - "\nStudy the following text and derive objects which match the schema provided.\n\nYou must output an array of JSON objects for each object you discover\nwhich matches the schema. For each object, output a JSON object whose fields\ncarry the name field specified in the schema.\n\n\n\n{schema}\n\n\n\n{text}\n\n\n\nYou will respond only with raw JSON format data. Do not provide\nexplanations. Do not add markdown formatting or headers or prefixes.\n", - ], - deploy: { - resources: { - limits: { - cpus: '0.5', - memory: '128M' - }, - reservations: { - cpus: '0.1', - memory: '128M' - } - } - }, - }, +// "prompt-knowledge-query-template":: "PROMPT GOES HERE", - }, +// "prompt-document-query-template":: "PROMPT GOES HERE", + +// "prompt-rows-template":: "PROMPT GOES HERE", } diff --git a/templates/prompts/mixtral.jsonnet b/templates/prompts/mixtral.jsonnet index 74f9ff09..ee119eee 100644 --- a/templates/prompts/mixtral.jsonnet +++ b/templates/prompts/mixtral.jsonnet @@ -1,88 +1,16 @@ -// For Mixtral - -local base = import "../components/base.jsonnet"; -local images = import "../components/images.jsonnet"; -local url = import "../components/url.jsonnet"; +// For Mixtral. Not currently overriding prompts { - services +: { +// "prompt-definition-template": "PROMPT GOES HERE", - "prompt": base + { - image: images.trustgraph, - command: [ - "prompt-template", - "-p", - url.pulsar, - "--text-completion-request-queue", - "non-persistent://tg/request/text-completion", - "--text-completion-response-queue", - "non-persistent://tg/response/text-completion-response", - "--definition-template", - "\nStudy the following text and derive definitions for any discovered entities.\nDo not provide definitions for entities whose definitions are incomplete\nor unknown.\nOutput relationships in JSON format as an arary of objects with fields:\n- entity: the name of the entity\n- definition: English text which defines the entity\n\n\n\n{text}\n\n\n\nYou will respond only with raw JSON format data. Do not provide\nexplanations. Do not use special characters in the abstract text. The\nabstract will be written as plain text. Do not add markdown formatting\nor headers or prefixes. Do not include null or unknown definitions.\n", - "--relationship-template", - "\nStudy the following text and derive entity relationships. For each\nrelationship, derive the subject, predicate and object of the relationship.\nOutput relationships in JSON format as an arary of objects with fields:\n- subject: the subject of the relationship\n- predicate: the predicate\n- object: the object of the relationship\n- object-entity: false if the object is a simple data type: name, value or date. true if it is an entity.\n\n\n\n{text}\n\n\n\nYou will respond only with raw JSON format data. Do not provide\nexplanations. Do not use special characters in the abstract text. The\nabstract must be written as plain text. Do not add markdown formatting\nor headers or prefixes.\n", - "--knowledge-query-template", - "Study the following set of knowledge statements. The statements are written in Cypher format that has been extracted from a knowledge graph. Use only the provided set of knowledge statements in your response. Do not speculate if the answer is not found in the provided set of knowledge statements.\n\nHere's the knowledge statements:\n{graph}\n\nUse only the provided knowledge statements to respond to the following:\n{query}\n", - "--document-query-template", - "Study the following context. Use only the information provided in the context in your response. Do not speculate if the answer is not found in the provided set of knowledge statements.\n\nHere is the context:\n{documents}\n\nUse only the provided knowledge statements to respond to the following:\n{query}\n", - "--rows-template", - "\nStudy the following text and derive objects which match the schema provided.\n\nYou must output an array of JSON objects for each object you discover\nwhich matches the schema. For each object, output a JSON object whose fields\ncarry the name field specified in the schema.\n\n\n\n{schema}\n\n\n\n{text}\n\n\n\nYou will respond only with raw JSON format data. Do not provide\nexplanations. Do not add markdown formatting or headers or prefixes.\n", - ], - deploy: { - resources: { - limits: { - cpus: '0.5', - memory: '128M' - }, - reservations: { - cpus: '0.1', - memory: '128M' - } - } - }, - }, +// "prompt-relationship-template":: "PROMPT GOES HERE", - "prompt-rag": base + { - image: images.trustgraph, - command: [ - "prompt-template", - "-p", - url.pulsar, - "-i", - "non-persistent://tg/request/prompt-rag", - "-o", - "non-persistent://tg/response/prompt-rag-response", - "--text-completion-request-queue", - "non-persistent://tg/request/text-completion-rag", - "--text-completion-response-queue", - "non-persistent://tg/response/text-completion-rag-response", - "--definition-template", - "\nStudy the following text and derive definitions for any discovered entities.\nDo not provide definitions for entities whose definitions are incomplete\nor unknown.\nOutput relationships in JSON format as an arary of objects with fields:\n- entity: the name of the entity\n- definition: English text which defines the entity\n\n\n\n{text}\n\n\n\nYou will respond only with raw JSON format data. Do not provide\nexplanations. Do not use special characters in the abstract text. The\nabstract will be written as plain text. Do not add markdown formatting\nor headers or prefixes. Do not include null or unknown definitions.\n", - "--relationship-template", - "\nStudy the following text and derive entity relationships. For each\nrelationship, derive the subject, predicate and object of the relationship.\nOutput relationships in JSON format as an arary of objects with fields:\n- subject: the subject of the relationship\n- predicate: the predicate\n- object: the object of the relationship\n- object-entity: false if the object is a simple data type: name, value or date. true if it is an entity.\n\n\n\n{text}\n\n\n\nYou will respond only with raw JSON format data. Do not provide\nexplanations. Do not use special characters in the abstract text. The\nabstract must be written as plain text. Do not add markdown formatting\nor headers or prefixes.\n", - "--knowledge-query-template", - "Study the following set of knowledge statements. The statements are written in Cypher format that has been extracted from a knowledge graph. Use only the provided set of knowledge statements in your response. Do not speculate if the answer is not found in the provided set of knowledge statements.\n\nHere's the knowledge statements:\n{graph}\n\nUse only the provided knowledge statements to respond to the following:\n{query}\n", - "--document-query-template", - "Study the following context. Use only the information provided in the context in your response. Do not speculate if the answer is not found in the provided set of knowledge statements.\n\nHere is the context:\n{documents}\n\nUse only the provided knowledge statements to respond to the following:\n{query}\n", - "--rows-template", - "\nStudy the following text and derive objects which match the schema provided.\n\nYou must output an array of JSON objects for each object you discover\nwhich matches the schema. For each object, output a JSON object whose fields\ncarry the name field specified in the schema.\n\n\n\n{schema}\n\n\n\n{text}\n\n\n\nYou will respond only with raw JSON format data. Do not provide\nexplanations. Do not add markdown formatting or headers or prefixes.\n", - ], - deploy: { - resources: { - limits: { - cpus: '0.5', - memory: '128M' - }, - reservations: { - cpus: '0.1', - memory: '128M' - } - } - }, - }, +// "prompt-knowledge-query-template":: "PROMPT GOES HERE", - }, +// "prompt-document-query-template":: "PROMPT GOES HERE", + +// "prompt-rows-template":: "PROMPT GOES HERE", } diff --git a/templates/prompts/openai.jsonnet b/templates/prompts/openai.jsonnet index ffbb78d5..04bcb9b9 100644 --- a/templates/prompts/openai.jsonnet +++ b/templates/prompts/openai.jsonnet @@ -1,88 +1,21 @@ // For OpenAI LLMs -local base = import "../components/base.jsonnet"; -local images = import "../components/images.jsonnet"; -local url = import "../components/url.jsonnet"; +local base = import "base/base.jsonnet"; +local images = import "values/images.jsonnet"; +local url = import "values/url.jsonnet"; { - services +: { +// "prompt-definition-template": "PROMPT GOES HERE", - "prompt": base + { - image: images.trustgraph, - command: [ - "prompt-template", - "-p", - url.pulsar, - "--text-completion-request-queue", - "non-persistent://tg/request/text-completion", - "--text-completion-response-queue", - "non-persistent://tg/response/text-completion-response", - "--definition-template", - "\nStudy the following text and derive definitions for any discovered entities.\nDo not provide definitions for entities whose definitions are incomplete\nor unknown.\nOutput relationships in JSON format as an arary of objects with fields:\n- entity: the name of the entity\n- definition: English text which defines the entity\n\n\n\n{text}\n\n\n\nYou will respond only with raw JSON format data. Do not provide\nexplanations. Do not use special characters in the abstract text. The\nabstract will be written as plain text. Do not add markdown formatting\nor headers or prefixes. Do not include null or unknown definitions.\n", - "--relationship-template", - "\nStudy the following text and derive entity relationships. For each\nrelationship, derive the subject, predicate and object of the relationship.\nOutput relationships in JSON format as an arary of objects with fields:\n- subject: the subject of the relationship\n- predicate: the predicate\n- object: the object of the relationship\n- object-entity: false if the object is a simple data type: name, value or date. true if it is an entity.\n\n\n\n{text}\n\n\n\nYou will respond only with raw JSON format data. Do not provide\nexplanations. Do not use special characters in the abstract text. The\nabstract must be written as plain text. Do not add markdown formatting\nor headers or prefixes.\n", - "--knowledge-query-template", - "Study the following set of knowledge statements. The statements are written in Cypher format that has been extracted from a knowledge graph. Use only the provided set of knowledge statements in your response. Do not speculate if the answer is not found in the provided set of knowledge statements.\n\nHere's the knowledge statements:\n{graph}\n\nUse only the provided knowledge statements to respond to the following:\n{query}\n", - "--document-query-template", - "Study the following context. Use only the information provided in the context in your response. Do not speculate if the answer is not found in the provided set of knowledge statements.\n\nHere is the context:\n{documents}\n\nUse only the provided knowledge statements to respond to the following:\n{query}\n", - "--rows-template", - "\nStudy the following text and derive objects which match the schema provided.\n\nYou must output an array of JSON objects for each object you discover\nwhich matches the schema. For each object, output a JSON object whose fields\ncarry the name field specified in the schema.\n\n\n\n{schema}\n\n\n\n{text}\n\n\n\nYou will respond only with raw JSON format data. Do not provide\nexplanations. Do not add markdown formatting or headers or prefixes.\n", - ], - deploy: { - resources: { - limits: { - cpus: '0.5', - memory: '128M' - }, - reservations: { - cpus: '0.1', - memory: '128M' - } - } - }, - }, +// "prompt-relationship-template":: "PROMPT GOES HERE", - "prompt-rag": base + { - image: images.trustgraph, - command: [ - "prompt-template", - "-p", - url.pulsar, - "-i", - "non-persistent://tg/request/prompt-rag", - "-o", - "non-persistent://tg/response/prompt-rag-response", - "--text-completion-request-queue", - "non-persistent://tg/request/text-completion-rag", - "--text-completion-response-queue", - "non-persistent://tg/response/text-completion-rag-response", - "--definition-template", - "\nStudy the following text and derive definitions for any discovered entities.\nDo not provide definitions for entities whose definitions are incomplete\nor unknown.\nOutput relationships in JSON format as an arary of objects with fields:\n- entity: the name of the entity\n- definition: English text which defines the entity\n\n\n\n{text}\n\n\n\nYou will respond only with raw JSON format data. Do not provide\nexplanations. Do not use special characters in the abstract text. The\nabstract will be written as plain text. Do not add markdown formatting\nor headers or prefixes. Do not include null or unknown definitions.\n", - "--relationship-template", - "\nStudy the following text and derive entity relationships. For each\nrelationship, derive the subject, predicate and object of the relationship.\nOutput relationships in JSON format as an arary of objects with fields:\n- subject: the subject of the relationship\n- predicate: the predicate\n- object: the object of the relationship\n- object-entity: false if the object is a simple data type: name, value or date. true if it is an entity.\n\n\n\n{text}\n\n\n\nYou will respond only with raw JSON format data. Do not provide\nexplanations. Do not use special characters in the abstract text. The\nabstract must be written as plain text. Do not add markdown formatting\nor headers or prefixes.\n", - "--knowledge-query-template", - "Study the following set of knowledge statements. The statements are written in Cypher format that has been extracted from a knowledge graph. Use only the provided set of knowledge statements in your response. Do not speculate if the answer is not found in the provided set of knowledge statements.\n\nHere's the knowledge statements:\n{graph}\n\nUse only the provided knowledge statements to respond to the following:\n{query}\n", - "--document-query-template", - "Study the following context. Use only the information provided in the context in your response. Do not speculate if the answer is not found in the provided set of knowledge statements.\n\nHere is the context:\n{documents}\n\nUse only the provided knowledge statements to respond to the following:\n{query}\n", - "--rows-template", - "\nStudy the following text and derive objects which match the schema provided.\n\nYou must output an array of JSON objects for each object you discover\nwhich matches the schema. For each object, output a JSON object whose fields\ncarry the name field specified in the schema.\n\n\n\n{schema}\n\n\n\n{text}\n\n\n\nYou will respond only with raw JSON format data. Do not provide\nexplanations. Do not add markdown formatting or headers or prefixes.\n", - ], - deploy: { - resources: { - limits: { - cpus: '0.5', - memory: '128M' - }, - reservations: { - cpus: '0.1', - memory: '128M' - } - } - }, - }, +// "prompt-knowledge-query-template":: "PROMPT GOES HERE", - }, +// "prompt-document-query-template":: "PROMPT GOES HERE", + +// "prompt-rows-template":: "PROMPT GOES HERE", } + diff --git a/templates/prompts/slm.jsonnet b/templates/prompts/slm.jsonnet index ebdd808b..bd0cbff3 100644 --- a/templates/prompts/slm.jsonnet +++ b/templates/prompts/slm.jsonnet @@ -1,69 +1,7 @@ // For basic SLMs, use prompt-generic -local base = import "../components/base.jsonnet"; -local images = import "../components/images.jsonnet"; -local url = import "../components/url.jsonnet"; +local prompts = import "components/prompt-generic.jsonnet"; -{ +prompts - services +: { - - "prompt": base + { - image: images.trustgraph, - command: [ - "prompt-generic", - "-p", - url.pulsar, - "--text-completion-request-queue", - "non-persistent://tg/request/text-completion", - "--text-completion-response-queue", - "non-persistent://tg/response/text-completion-response", - ], - deploy: { - resources: { - limits: { - cpus: '0.5', - memory: '128M' - }, - reservations: { - cpus: '0.1', - memory: '128M' - } - } - }, - }, - - "prompt-rag": base + { - image: images.trustgraph, - command: [ - "prompt-generic", - "-p", - url.pulsar, - "-i", - "non-persistent://tg/request/prompt-rag", - "-o", - "non-persistent://tg/response/prompt-rag-response", - "--text-completion-request-queue", - "non-persistent://tg/request/text-completion-rag", - "--text-completion-response-queue", - "non-persistent://tg/response/text-completion-rag-response", - ], - deploy: { - resources: { - limits: { - cpus: '0.5', - memory: '128M' - }, - reservations: { - cpus: '0.1', - memory: '128M' - } - } - - }, - }, - - }, - -} diff --git a/templates/components/stores/cassandra.jsonnet b/templates/stores/cassandra.jsonnet similarity index 83% rename from templates/components/stores/cassandra.jsonnet rename to templates/stores/cassandra.jsonnet index 0a536a1a..93d8a510 100644 --- a/templates/components/stores/cassandra.jsonnet +++ b/templates/stores/cassandra.jsonnet @@ -1,5 +1,5 @@ -local base = import "../base.jsonnet"; -local images = import "../images.jsonnet"; +local base = import "base/base.jsonnet"; +local images = import "values/images.jsonnet"; { volumes +: { cassandra: {}, diff --git a/templates/components/stores/milvus.jsonnet b/templates/stores/milvus.jsonnet similarity index 95% rename from templates/components/stores/milvus.jsonnet rename to templates/stores/milvus.jsonnet index 9fdbe753..19779ce0 100644 --- a/templates/components/stores/milvus.jsonnet +++ b/templates/stores/milvus.jsonnet @@ -1,5 +1,5 @@ -local base = import "../base.jsonnet"; -local images = import "../images.jsonnet"; +local base = import "base/base.jsonnet"; +local images = import "values/images.jsonnet"; { diff --git a/templates/components/stores/neo4j.jsonnet b/templates/stores/neo4j.jsonnet similarity index 87% rename from templates/components/stores/neo4j.jsonnet rename to templates/stores/neo4j.jsonnet index 39999f26..20a7c60b 100644 --- a/templates/components/stores/neo4j.jsonnet +++ b/templates/stores/neo4j.jsonnet @@ -1,5 +1,5 @@ -local base = import "../base.jsonnet"; -local images = import "../images.jsonnet"; +local base = import "base/base.jsonnet"; +local images = import "values/images.jsonnet"; { volumes +: { diff --git a/templates/components/stores/qdrant.jsonnet b/templates/stores/qdrant.jsonnet similarity index 82% rename from templates/components/stores/qdrant.jsonnet rename to templates/stores/qdrant.jsonnet index 63c41325..54f2a9e7 100644 --- a/templates/components/stores/qdrant.jsonnet +++ b/templates/stores/qdrant.jsonnet @@ -1,5 +1,5 @@ -local base = import "../base.jsonnet"; -local images = import "../images.jsonnet"; +local base = import "base/base.jsonnet"; +local images = import "values/images.jsonnet"; { diff --git a/templates/test.jsonnet b/templates/test.jsonnet deleted file mode 100644 index d80b056c..00000000 --- a/templates/test.jsonnet +++ /dev/null @@ -1 +0,0 @@ -std.extVar("asd") diff --git a/templates/components/images.jsonnet b/templates/values/images.jsonnet similarity index 100% rename from templates/components/images.jsonnet rename to templates/values/images.jsonnet diff --git a/templates/components/url.jsonnet b/templates/values/url.jsonnet similarity index 100% rename from templates/components/url.jsonnet rename to templates/values/url.jsonnet diff --git a/templates/vertexai.jsonnet b/templates/vertexai.jsonnet deleted file mode 100644 index b148701b..00000000 --- a/templates/vertexai.jsonnet +++ /dev/null @@ -1,12 +0,0 @@ - -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 + vertexai; - -std.manifestYamlDoc(config) - diff --git a/tg-launch-azure-cassandra.yaml b/tg-launch-azure-cassandra.yaml index bc28bcfd..e4040ddb 100644 --- a/tg-launch-azure-cassandra.yaml +++ b/tg-launch-azure-cassandra.yaml @@ -18,7 +18,7 @@ - "cassandra:/var/lib/cassandra" "chunker": "command": - - "${CHUNKER:-chunker-token}" + - "chunker-token" - "-p" - "pulsar://pulsar:6650" - "--chunk-size" @@ -33,7 +33,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "embeddings": "command": @@ -50,7 +50,7 @@ "reservations": "cpus": "0.5" "memory": "256M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "grafana": "deploy": @@ -95,7 +95,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "init-pulsar": "command": @@ -128,7 +128,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "kg-extract-relationships": "command": @@ -143,7 +143,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "pdf-decoder": "command": @@ -158,7 +158,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "prometheus": "deploy": @@ -217,7 +217,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "prompt-rag": "command": @@ -264,7 +264,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "pulsar": "command": "bin/pulsar standalone" @@ -286,22 +286,6 @@ "volumes": - "pulsar-conf:/pulsar/conf" - "pulsar-data:/pulsar/data" - "pulsar-manager": - "deploy": - "resources": - "limits": - "cpus": "0.5" - "memory": "1.4G" - "reservations": - "cpus": "0.1" - "memory": "1.4G" - "environment": - "SPRING_CONFIGURATION_FILE": "/pulsar-manager/pulsar-manager/application.properties" - "image": "docker.io/apachepulsar/pulsar-manager:v0.4.0" - "ports": - - "9527:9527" - - "7750:7750" - "restart": "on-failure:100" "qdrant": "deploy": "resources": @@ -333,7 +317,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "query-triples": "command": @@ -350,7 +334,7 @@ "reservations": "cpus": "0.1" "memory": "512M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "store-graph-embeddings": "command": @@ -367,7 +351,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "store-triples": "command": @@ -384,7 +368,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "text-completion": "command": @@ -398,7 +382,7 @@ - "-x" - "4096" - "-t" - - "0.0" + - "0" "deploy": "resources": "limits": @@ -407,7 +391,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "text-completion-rag": "command": @@ -422,7 +406,7 @@ - "-x" - "4096" - "-t" - - "0.0" + - "0" - "non-persistent://tg/request/text-completion-rag" - "-o" - "non-persistent://tg/response/text-completion-rag-response" @@ -434,7 +418,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "vectorize": "command": @@ -449,7 +433,7 @@ "reservations": "cpus": "0.5" "memory": "512M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "volumes": "cassandra": {} diff --git a/tg-launch-azure-neo4j.yaml b/tg-launch-azure-neo4j.yaml index 0691fe4f..8fd788fe 100644 --- a/tg-launch-azure-neo4j.yaml +++ b/tg-launch-azure-neo4j.yaml @@ -1,7 +1,7 @@ "services": "chunker": "command": - - "${CHUNKER:-chunker-token}" + - "chunker-token" - "-p" - "pulsar://pulsar:6650" - "--chunk-size" @@ -16,7 +16,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "embeddings": "command": @@ -33,7 +33,7 @@ "reservations": "cpus": "0.5" "memory": "256M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "grafana": "deploy": @@ -78,7 +78,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "init-pulsar": "command": @@ -111,7 +111,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "kg-extract-relationships": "command": @@ -126,7 +126,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "neo4j": "deploy": @@ -159,7 +159,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "prometheus": "deploy": @@ -218,7 +218,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "prompt-rag": "command": @@ -265,7 +265,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "pulsar": "command": "bin/pulsar standalone" @@ -287,22 +287,6 @@ "volumes": - "pulsar-conf:/pulsar/conf" - "pulsar-data:/pulsar/data" - "pulsar-manager": - "deploy": - "resources": - "limits": - "cpus": "0.5" - "memory": "1.4G" - "reservations": - "cpus": "0.1" - "memory": "1.4G" - "environment": - "SPRING_CONFIGURATION_FILE": "/pulsar-manager/pulsar-manager/application.properties" - "image": "docker.io/apachepulsar/pulsar-manager:v0.4.0" - "ports": - - "9527:9527" - - "7750:7750" - "restart": "on-failure:100" "qdrant": "deploy": "resources": @@ -334,7 +318,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "query-triples": "command": @@ -351,7 +335,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "store-graph-embeddings": "command": @@ -368,7 +352,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "store-triples": "command": @@ -385,7 +369,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "text-completion": "command": @@ -399,7 +383,7 @@ - "-x" - "4096" - "-t" - - "0.0" + - "0" "deploy": "resources": "limits": @@ -408,7 +392,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "text-completion-rag": "command": @@ -423,7 +407,7 @@ - "-x" - "4096" - "-t" - - "0.0" + - "0" - "non-persistent://tg/request/text-completion-rag" - "-o" - "non-persistent://tg/response/text-completion-rag-response" @@ -435,7 +419,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "vectorize": "command": @@ -450,7 +434,7 @@ "reservations": "cpus": "0.5" "memory": "512M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "volumes": "grafana-storage": {} diff --git a/tg-launch-bedrock-cassandra.yaml b/tg-launch-bedrock-cassandra.yaml index e0247f3f..82f04a74 100644 --- a/tg-launch-bedrock-cassandra.yaml +++ b/tg-launch-bedrock-cassandra.yaml @@ -33,7 +33,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "embeddings": "command": @@ -50,7 +50,7 @@ "reservations": "cpus": "0.5" "memory": "256M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "grafana": "deploy": @@ -95,7 +95,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "init-pulsar": "command": @@ -128,7 +128,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "kg-extract-relationships": "command": @@ -143,7 +143,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "pdf-decoder": "command": @@ -158,7 +158,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "prometheus": "deploy": @@ -217,7 +217,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "prompt-rag": "command": @@ -264,7 +264,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "pulsar": "command": "bin/pulsar standalone" @@ -286,22 +286,6 @@ "volumes": - "pulsar-conf:/pulsar/conf" - "pulsar-data:/pulsar/data" - "pulsar-manager": - "deploy": - "resources": - "limits": - "cpus": "0.5" - "memory": "1.4G" - "reservations": - "cpus": "0.1" - "memory": "1.4G" - "environment": - "SPRING_CONFIGURATION_FILE": "/pulsar-manager/pulsar-manager/application.properties" - "image": "docker.io/apachepulsar/pulsar-manager:v0.4.0" - "ports": - - "9527:9527" - - "7750:7750" - "restart": "on-failure:100" "qdrant": "deploy": "resources": @@ -333,7 +317,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "query-triples": "command": @@ -350,7 +334,7 @@ "reservations": "cpus": "0.1" "memory": "512M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "store-graph-embeddings": "command": @@ -367,7 +351,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "store-triples": "command": @@ -384,7 +368,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "text-completion": "command": @@ -400,7 +384,7 @@ - "-x" - "4096" - "-t" - - "0.0" + - "0" - "-m" - "mistral.mixtral-8x7b-instruct-v0:1" "deploy": @@ -411,7 +395,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "text-completion-rag": "command": @@ -427,7 +411,7 @@ - "-x" - "4096" - "-t" - - "0.0" + - "0" - "-m" - "mistral.mixtral-8x7b-instruct-v0:1" - "-i" @@ -442,7 +426,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "vectorize": "command": @@ -457,7 +441,7 @@ "reservations": "cpus": "0.5" "memory": "512M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "volumes": "cassandra": {} diff --git a/tg-launch-bedrock-neo4j.yaml b/tg-launch-bedrock-neo4j.yaml index 598120ad..a8711f42 100644 --- a/tg-launch-bedrock-neo4j.yaml +++ b/tg-launch-bedrock-neo4j.yaml @@ -16,7 +16,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "embeddings": "command": @@ -33,7 +33,7 @@ "reservations": "cpus": "0.5" "memory": "256M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "grafana": "deploy": @@ -78,7 +78,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "init-pulsar": "command": @@ -111,7 +111,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "kg-extract-relationships": "command": @@ -126,7 +126,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "neo4j": "deploy": @@ -159,7 +159,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "prometheus": "deploy": @@ -218,7 +218,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "prompt-rag": "command": @@ -265,7 +265,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "pulsar": "command": "bin/pulsar standalone" @@ -287,22 +287,6 @@ "volumes": - "pulsar-conf:/pulsar/conf" - "pulsar-data:/pulsar/data" - "pulsar-manager": - "deploy": - "resources": - "limits": - "cpus": "0.5" - "memory": "1.4G" - "reservations": - "cpus": "0.1" - "memory": "1.4G" - "environment": - "SPRING_CONFIGURATION_FILE": "/pulsar-manager/pulsar-manager/application.properties" - "image": "docker.io/apachepulsar/pulsar-manager:v0.4.0" - "ports": - - "9527:9527" - - "7750:7750" - "restart": "on-failure:100" "qdrant": "deploy": "resources": @@ -334,7 +318,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "query-triples": "command": @@ -351,7 +335,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "store-graph-embeddings": "command": @@ -368,7 +352,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "store-triples": "command": @@ -385,7 +369,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "text-completion": "command": @@ -401,7 +385,7 @@ - "-x" - "4096" - "-t" - - "0.0" + - "0" - "-m" - "mistral.mixtral-8x7b-instruct-v0:1" "deploy": @@ -412,7 +396,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "text-completion-rag": "command": @@ -428,7 +412,7 @@ - "-x" - "4096" - "-t" - - "0.0" + - "0" - "-m" - "mistral.mixtral-8x7b-instruct-v0:1" - "-i" @@ -443,7 +427,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "vectorize": "command": @@ -458,7 +442,7 @@ "reservations": "cpus": "0.5" "memory": "512M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "volumes": "grafana-storage": {} diff --git a/tg-launch-claude-cassandra.yaml b/tg-launch-claude-cassandra.yaml index 05b85c42..bfb2e0fe 100644 --- a/tg-launch-claude-cassandra.yaml +++ b/tg-launch-claude-cassandra.yaml @@ -18,7 +18,7 @@ - "cassandra:/var/lib/cassandra" "chunker": "command": - - "${CHUNKER:-chunker-token}" + - "chunker-token" - "-p" - "pulsar://pulsar:6650" - "--chunk-size" @@ -33,7 +33,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "embeddings": "command": @@ -50,7 +50,7 @@ "reservations": "cpus": "0.5" "memory": "256M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "grafana": "deploy": @@ -95,7 +95,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "init-pulsar": "command": @@ -128,7 +128,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "kg-extract-relationships": "command": @@ -143,7 +143,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "pdf-decoder": "command": @@ -158,7 +158,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "prometheus": "deploy": @@ -217,7 +217,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "prompt-rag": "command": @@ -264,7 +264,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "pulsar": "command": "bin/pulsar standalone" @@ -286,22 +286,6 @@ "volumes": - "pulsar-conf:/pulsar/conf" - "pulsar-data:/pulsar/data" - "pulsar-manager": - "deploy": - "resources": - "limits": - "cpus": "0.5" - "memory": "1.4G" - "reservations": - "cpus": "0.1" - "memory": "1.4G" - "environment": - "SPRING_CONFIGURATION_FILE": "/pulsar-manager/pulsar-manager/application.properties" - "image": "docker.io/apachepulsar/pulsar-manager:v0.4.0" - "ports": - - "9527:9527" - - "7750:7750" - "restart": "on-failure:100" "qdrant": "deploy": "resources": @@ -333,7 +317,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "query-triples": "command": @@ -350,7 +334,7 @@ "reservations": "cpus": "0.1" "memory": "512M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "store-graph-embeddings": "command": @@ -367,7 +351,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "store-triples": "command": @@ -384,7 +368,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "text-completion": "command": @@ -396,7 +380,7 @@ - "-x" - "4096" - "-t" - - "0.0" + - "0" "deploy": "resources": "limits": @@ -405,7 +389,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "text-completion-rag": "command": @@ -417,7 +401,7 @@ - "-x" - "4096" - "-t" - - "0.0" + - "0" - "-i" - "non-persistent://tg/request/text-completion-rag" - "-o" @@ -430,7 +414,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "vectorize": "command": @@ -445,7 +429,7 @@ "reservations": "cpus": "0.5" "memory": "512M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "volumes": "cassandra": {} diff --git a/tg-launch-claude-neo4j.yaml b/tg-launch-claude-neo4j.yaml index f0bfa034..db2a0fe5 100644 --- a/tg-launch-claude-neo4j.yaml +++ b/tg-launch-claude-neo4j.yaml @@ -1,7 +1,7 @@ "services": "chunker": "command": - - "${CHUNKER:-chunker-token}" + - "chunker-token" - "-p" - "pulsar://pulsar:6650" - "--chunk-size" @@ -16,7 +16,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "embeddings": "command": @@ -33,7 +33,7 @@ "reservations": "cpus": "0.5" "memory": "256M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "grafana": "deploy": @@ -78,7 +78,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "init-pulsar": "command": @@ -111,7 +111,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "kg-extract-relationships": "command": @@ -126,7 +126,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "neo4j": "deploy": @@ -159,7 +159,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "prometheus": "deploy": @@ -218,7 +218,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "prompt-rag": "command": @@ -265,7 +265,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "pulsar": "command": "bin/pulsar standalone" @@ -287,22 +287,6 @@ "volumes": - "pulsar-conf:/pulsar/conf" - "pulsar-data:/pulsar/data" - "pulsar-manager": - "deploy": - "resources": - "limits": - "cpus": "0.5" - "memory": "1.4G" - "reservations": - "cpus": "0.1" - "memory": "1.4G" - "environment": - "SPRING_CONFIGURATION_FILE": "/pulsar-manager/pulsar-manager/application.properties" - "image": "docker.io/apachepulsar/pulsar-manager:v0.4.0" - "ports": - - "9527:9527" - - "7750:7750" - "restart": "on-failure:100" "qdrant": "deploy": "resources": @@ -334,7 +318,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "query-triples": "command": @@ -351,7 +335,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "store-graph-embeddings": "command": @@ -368,7 +352,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "store-triples": "command": @@ -385,7 +369,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "text-completion": "command": @@ -397,7 +381,7 @@ - "-x" - "4096" - "-t" - - "0.0" + - "0" "deploy": "resources": "limits": @@ -406,7 +390,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "text-completion-rag": "command": @@ -418,7 +402,7 @@ - "-x" - "4096" - "-t" - - "0.0" + - "0" - "-i" - "non-persistent://tg/request/text-completion-rag" - "-o" @@ -431,7 +415,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "vectorize": "command": @@ -446,7 +430,7 @@ "reservations": "cpus": "0.5" "memory": "512M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "volumes": "grafana-storage": {} diff --git a/tg-launch-cohere-cassandra.yaml b/tg-launch-cohere-cassandra.yaml index c6751c5c..dad0f086 100644 --- a/tg-launch-cohere-cassandra.yaml +++ b/tg-launch-cohere-cassandra.yaml @@ -18,7 +18,7 @@ - "cassandra:/var/lib/cassandra" "chunker": "command": - - "${CHUNKER:-chunker-token}" + - "chunker-token" - "-p" - "pulsar://pulsar:6650" - "--chunk-size" @@ -33,7 +33,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "embeddings": "command": @@ -50,7 +50,7 @@ "reservations": "cpus": "0.5" "memory": "256M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "grafana": "deploy": @@ -95,7 +95,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "init-pulsar": "command": @@ -128,7 +128,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "kg-extract-relationships": "command": @@ -143,7 +143,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "pdf-decoder": "command": @@ -158,7 +158,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "prometheus": "deploy": @@ -217,7 +217,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "prompt-rag": "command": @@ -264,7 +264,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "pulsar": "command": "bin/pulsar standalone" @@ -286,22 +286,6 @@ "volumes": - "pulsar-conf:/pulsar/conf" - "pulsar-data:/pulsar/data" - "pulsar-manager": - "deploy": - "resources": - "limits": - "cpus": "0.5" - "memory": "1.4G" - "reservations": - "cpus": "0.1" - "memory": "1.4G" - "environment": - "SPRING_CONFIGURATION_FILE": "/pulsar-manager/pulsar-manager/application.properties" - "image": "docker.io/apachepulsar/pulsar-manager:v0.4.0" - "ports": - - "9527:9527" - - "7750:7750" - "restart": "on-failure:100" "qdrant": "deploy": "resources": @@ -333,7 +317,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "query-triples": "command": @@ -350,7 +334,7 @@ "reservations": "cpus": "0.1" "memory": "512M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "store-graph-embeddings": "command": @@ -367,7 +351,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "store-triples": "command": @@ -384,7 +368,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "text-completion": "command": @@ -394,7 +378,7 @@ - "-k" - "${COHERE_KEY}" - "-t" - - "0.0" + - 0 "deploy": "resources": "limits": @@ -403,7 +387,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "text-completion-rag": "command": @@ -413,7 +397,7 @@ - "-k" - "${COHERE_KEY}" - "-t" - - "0.0" + - 0 - "-i" - "non-persistent://tg/request/text-completion-rag" - "-o" @@ -426,7 +410,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "vectorize": "command": @@ -441,7 +425,7 @@ "reservations": "cpus": "0.5" "memory": "512M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "volumes": "cassandra": {} diff --git a/tg-launch-cohere-neo4j.yaml b/tg-launch-cohere-neo4j.yaml index a93850d3..a21869d7 100644 --- a/tg-launch-cohere-neo4j.yaml +++ b/tg-launch-cohere-neo4j.yaml @@ -1,7 +1,7 @@ "services": "chunker": "command": - - "${CHUNKER:-chunker-token}" + - "chunker-token" - "-p" - "pulsar://pulsar:6650" - "--chunk-size" @@ -16,7 +16,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "embeddings": "command": @@ -33,7 +33,7 @@ "reservations": "cpus": "0.5" "memory": "256M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "grafana": "deploy": @@ -78,7 +78,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "init-pulsar": "command": @@ -111,7 +111,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "kg-extract-relationships": "command": @@ -126,7 +126,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "neo4j": "deploy": @@ -159,7 +159,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "prometheus": "deploy": @@ -218,7 +218,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "prompt-rag": "command": @@ -265,7 +265,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "pulsar": "command": "bin/pulsar standalone" @@ -287,22 +287,6 @@ "volumes": - "pulsar-conf:/pulsar/conf" - "pulsar-data:/pulsar/data" - "pulsar-manager": - "deploy": - "resources": - "limits": - "cpus": "0.5" - "memory": "1.4G" - "reservations": - "cpus": "0.1" - "memory": "1.4G" - "environment": - "SPRING_CONFIGURATION_FILE": "/pulsar-manager/pulsar-manager/application.properties" - "image": "docker.io/apachepulsar/pulsar-manager:v0.4.0" - "ports": - - "9527:9527" - - "7750:7750" - "restart": "on-failure:100" "qdrant": "deploy": "resources": @@ -334,7 +318,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "query-triples": "command": @@ -351,7 +335,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "store-graph-embeddings": "command": @@ -368,7 +352,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "store-triples": "command": @@ -385,7 +369,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "text-completion": "command": @@ -395,7 +379,7 @@ - "-k" - "${COHERE_KEY}" - "-t" - - "0.0" + - 0 "deploy": "resources": "limits": @@ -404,7 +388,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "text-completion-rag": "command": @@ -414,7 +398,7 @@ - "-k" - "${COHERE_KEY}" - "-t" - - "0.0" + - 0 - "-i" - "non-persistent://tg/request/text-completion-rag" - "-o" @@ -427,7 +411,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "vectorize": "command": @@ -442,7 +426,7 @@ "reservations": "cpus": "0.5" "memory": "512M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "volumes": "grafana-storage": {} diff --git a/tg-launch-ollama-cassandra.yaml b/tg-launch-ollama-cassandra.yaml index e9c00ebb..fdb601c4 100644 --- a/tg-launch-ollama-cassandra.yaml +++ b/tg-launch-ollama-cassandra.yaml @@ -18,7 +18,7 @@ - "cassandra:/var/lib/cassandra" "chunker": "command": - - "${CHUNKER:-chunker-token}" + - "chunker-token" - "-p" - "pulsar://pulsar:6650" - "--chunk-size" @@ -33,7 +33,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "embeddings": "command": @@ -50,7 +50,7 @@ "reservations": "cpus": "0.5" "memory": "256M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "grafana": "deploy": @@ -95,7 +95,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "init-pulsar": "command": @@ -128,7 +128,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "kg-extract-relationships": "command": @@ -143,7 +143,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "pdf-decoder": "command": @@ -158,7 +158,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "prometheus": "deploy": @@ -193,7 +193,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "prompt-rag": "command": @@ -216,7 +216,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "pulsar": "command": "bin/pulsar standalone" @@ -238,22 +238,6 @@ "volumes": - "pulsar-conf:/pulsar/conf" - "pulsar-data:/pulsar/data" - "pulsar-manager": - "deploy": - "resources": - "limits": - "cpus": "0.5" - "memory": "1.4G" - "reservations": - "cpus": "0.1" - "memory": "1.4G" - "environment": - "SPRING_CONFIGURATION_FILE": "/pulsar-manager/pulsar-manager/application.properties" - "image": "docker.io/apachepulsar/pulsar-manager:v0.4.0" - "ports": - - "9527:9527" - - "7750:7750" - "restart": "on-failure:100" "qdrant": "deploy": "resources": @@ -285,7 +269,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "query-triples": "command": @@ -302,7 +286,7 @@ "reservations": "cpus": "0.1" "memory": "512M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "store-graph-embeddings": "command": @@ -319,7 +303,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "store-triples": "command": @@ -336,7 +320,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "text-completion": "command": @@ -355,7 +339,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "text-completion-rag": "command": @@ -378,7 +362,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "vectorize": "command": @@ -393,7 +377,7 @@ "reservations": "cpus": "0.5" "memory": "512M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "volumes": "cassandra": {} diff --git a/tg-launch-ollama-neo4j.yaml b/tg-launch-ollama-neo4j.yaml index ba2408dd..9644b5d6 100644 --- a/tg-launch-ollama-neo4j.yaml +++ b/tg-launch-ollama-neo4j.yaml @@ -1,7 +1,7 @@ "services": "chunker": "command": - - "${CHUNKER:-chunker-token}" + - "chunker-token" - "-p" - "pulsar://pulsar:6650" - "--chunk-size" @@ -16,7 +16,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "embeddings": "command": @@ -33,7 +33,7 @@ "reservations": "cpus": "0.5" "memory": "256M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "grafana": "deploy": @@ -78,7 +78,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "init-pulsar": "command": @@ -111,7 +111,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "kg-extract-relationships": "command": @@ -126,7 +126,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "neo4j": "deploy": @@ -159,7 +159,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "prometheus": "deploy": @@ -194,7 +194,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "prompt-rag": "command": @@ -217,7 +217,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "pulsar": "command": "bin/pulsar standalone" @@ -239,22 +239,6 @@ "volumes": - "pulsar-conf:/pulsar/conf" - "pulsar-data:/pulsar/data" - "pulsar-manager": - "deploy": - "resources": - "limits": - "cpus": "0.5" - "memory": "1.4G" - "reservations": - "cpus": "0.1" - "memory": "1.4G" - "environment": - "SPRING_CONFIGURATION_FILE": "/pulsar-manager/pulsar-manager/application.properties" - "image": "docker.io/apachepulsar/pulsar-manager:v0.4.0" - "ports": - - "9527:9527" - - "7750:7750" - "restart": "on-failure:100" "qdrant": "deploy": "resources": @@ -286,7 +270,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "query-triples": "command": @@ -303,7 +287,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "store-graph-embeddings": "command": @@ -320,7 +304,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "store-triples": "command": @@ -337,7 +321,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "text-completion": "command": @@ -356,7 +340,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "text-completion-rag": "command": @@ -379,7 +363,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "vectorize": "command": @@ -394,7 +378,7 @@ "reservations": "cpus": "0.5" "memory": "512M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "volumes": "grafana-storage": {} diff --git a/tg-launch-openai-cassandra.yaml b/tg-launch-openai-cassandra.yaml index e4f4471b..4df2ee97 100644 --- a/tg-launch-openai-cassandra.yaml +++ b/tg-launch-openai-cassandra.yaml @@ -18,7 +18,7 @@ - "cassandra:/var/lib/cassandra" "chunker": "command": - - "${CHUNKER:-chunker-token}" + - "chunker-token" - "-p" - "pulsar://pulsar:6650" - "--chunk-size" @@ -33,7 +33,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "embeddings": "command": @@ -50,7 +50,7 @@ "reservations": "cpus": "0.5" "memory": "256M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "grafana": "deploy": @@ -95,7 +95,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "init-pulsar": "command": @@ -128,7 +128,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "kg-extract-relationships": "command": @@ -143,7 +143,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "pdf-decoder": "command": @@ -158,7 +158,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "prometheus": "deploy": @@ -217,7 +217,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "prompt-rag": "command": @@ -264,7 +264,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "pulsar": "command": "bin/pulsar standalone" @@ -286,22 +286,6 @@ "volumes": - "pulsar-conf:/pulsar/conf" - "pulsar-data:/pulsar/data" - "pulsar-manager": - "deploy": - "resources": - "limits": - "cpus": "0.5" - "memory": "1.4G" - "reservations": - "cpus": "0.1" - "memory": "1.4G" - "environment": - "SPRING_CONFIGURATION_FILE": "/pulsar-manager/pulsar-manager/application.properties" - "image": "docker.io/apachepulsar/pulsar-manager:v0.4.0" - "ports": - - "9527:9527" - - "7750:7750" - "restart": "on-failure:100" "qdrant": "deploy": "resources": @@ -333,7 +317,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "query-triples": "command": @@ -350,7 +334,7 @@ "reservations": "cpus": "0.1" "memory": "512M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "store-graph-embeddings": "command": @@ -367,7 +351,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "store-triples": "command": @@ -384,7 +368,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "text-completion": "command": @@ -396,7 +380,7 @@ - "-x" - "4096" - "-t" - - "0.0" + - "0" "deploy": "resources": "limits": @@ -405,7 +389,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "text-completion-rag": "command": @@ -417,7 +401,7 @@ - "-x" - "4096" - "-t" - - "0.0" + - "0" - "-i" - "non-persistent://tg/request/text-completion-rag" - "-o" @@ -430,7 +414,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "vectorize": "command": @@ -445,7 +429,7 @@ "reservations": "cpus": "0.5" "memory": "512M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "volumes": "cassandra": {} diff --git a/tg-launch-openai-neo4j.yaml b/tg-launch-openai-neo4j.yaml index 4ced5703..7f8c8cf9 100644 --- a/tg-launch-openai-neo4j.yaml +++ b/tg-launch-openai-neo4j.yaml @@ -1,7 +1,7 @@ "services": "chunker": "command": - - "${CHUNKER:-chunker-token}" + - "chunker-token" - "-p" - "pulsar://pulsar:6650" - "--chunk-size" @@ -16,7 +16,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "embeddings": "command": @@ -33,7 +33,7 @@ "reservations": "cpus": "0.5" "memory": "256M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "grafana": "deploy": @@ -78,7 +78,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "init-pulsar": "command": @@ -111,7 +111,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "kg-extract-relationships": "command": @@ -126,7 +126,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "neo4j": "deploy": @@ -159,7 +159,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "prometheus": "deploy": @@ -218,7 +218,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "prompt-rag": "command": @@ -265,7 +265,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "pulsar": "command": "bin/pulsar standalone" @@ -287,22 +287,6 @@ "volumes": - "pulsar-conf:/pulsar/conf" - "pulsar-data:/pulsar/data" - "pulsar-manager": - "deploy": - "resources": - "limits": - "cpus": "0.5" - "memory": "1.4G" - "reservations": - "cpus": "0.1" - "memory": "1.4G" - "environment": - "SPRING_CONFIGURATION_FILE": "/pulsar-manager/pulsar-manager/application.properties" - "image": "docker.io/apachepulsar/pulsar-manager:v0.4.0" - "ports": - - "9527:9527" - - "7750:7750" - "restart": "on-failure:100" "qdrant": "deploy": "resources": @@ -334,7 +318,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "query-triples": "command": @@ -351,7 +335,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "store-graph-embeddings": "command": @@ -368,7 +352,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "store-triples": "command": @@ -385,7 +369,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "text-completion": "command": @@ -397,7 +381,7 @@ - "-x" - "4096" - "-t" - - "0.0" + - "0" "deploy": "resources": "limits": @@ -406,7 +390,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "text-completion-rag": "command": @@ -418,7 +402,7 @@ - "-x" - "4096" - "-t" - - "0.0" + - "0" - "-i" - "non-persistent://tg/request/text-completion-rag" - "-o" @@ -431,7 +415,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "vectorize": "command": @@ -446,7 +430,7 @@ "reservations": "cpus": "0.5" "memory": "512M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "volumes": "grafana-storage": {} diff --git a/tg-launch-vertexai-cassandra.yaml b/tg-launch-vertexai-cassandra.yaml index 7d8fedc3..9f660be3 100644 --- a/tg-launch-vertexai-cassandra.yaml +++ b/tg-launch-vertexai-cassandra.yaml @@ -18,7 +18,7 @@ - "cassandra:/var/lib/cassandra" "chunker": "command": - - "${CHUNKER:-chunker-token}" + - "chunker-token" - "-p" - "pulsar://pulsar:6650" - "--chunk-size" @@ -33,7 +33,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "embeddings": "command": @@ -50,7 +50,7 @@ "reservations": "cpus": "0.5" "memory": "256M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "grafana": "deploy": @@ -95,7 +95,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "init-pulsar": "command": @@ -128,7 +128,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "kg-extract-relationships": "command": @@ -143,7 +143,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "pdf-decoder": "command": @@ -158,7 +158,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "prometheus": "deploy": @@ -217,7 +217,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "prompt-rag": "command": @@ -264,7 +264,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "pulsar": "command": "bin/pulsar standalone" @@ -286,22 +286,6 @@ "volumes": - "pulsar-conf:/pulsar/conf" - "pulsar-data:/pulsar/data" - "pulsar-manager": - "deploy": - "resources": - "limits": - "cpus": "0.5" - "memory": "1.4G" - "reservations": - "cpus": "0.1" - "memory": "1.4G" - "environment": - "SPRING_CONFIGURATION_FILE": "/pulsar-manager/pulsar-manager/application.properties" - "image": "docker.io/apachepulsar/pulsar-manager:v0.4.0" - "ports": - - "9527:9527" - - "7750:7750" - "restart": "on-failure:100" "qdrant": "deploy": "resources": @@ -333,7 +317,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "query-triples": "command": @@ -350,7 +334,7 @@ "reservations": "cpus": "0.1" "memory": "512M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "store-graph-embeddings": "command": @@ -367,7 +351,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "store-triples": "command": @@ -384,7 +368,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "text-completion": "command": @@ -398,7 +382,9 @@ - "-x" - "4096" - "-t" - - "0.0" + - "0" + - "-m" + - "gemini-1.0-pro-001" "deploy": "resources": "limits": @@ -407,7 +393,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "volumes": - "./vertexai:/vertexai" @@ -423,7 +409,9 @@ - "-x" - "4096" - "-t" - - "0.0" + - "0" + - "-m" + - "gemini-1.0-pro-001" - "-i" - "non-persistent://tg/request/text-completion-rag" - "-o" @@ -436,7 +424,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "volumes": - "./vertexai:/vertexai" @@ -453,7 +441,7 @@ "reservations": "cpus": "0.5" "memory": "512M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "volumes": "cassandra": {} diff --git a/tg-launch-vertexai-neo4j.yaml b/tg-launch-vertexai-neo4j.yaml index 0ed96c1e..8b9c54e8 100644 --- a/tg-launch-vertexai-neo4j.yaml +++ b/tg-launch-vertexai-neo4j.yaml @@ -1,7 +1,7 @@ "services": "chunker": "command": - - "${CHUNKER:-chunker-token}" + - "chunker-token" - "-p" - "pulsar://pulsar:6650" - "--chunk-size" @@ -16,7 +16,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "embeddings": "command": @@ -33,7 +33,7 @@ "reservations": "cpus": "0.5" "memory": "256M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "grafana": "deploy": @@ -78,7 +78,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "init-pulsar": "command": @@ -111,7 +111,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "kg-extract-relationships": "command": @@ -126,7 +126,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "neo4j": "deploy": @@ -159,7 +159,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "prometheus": "deploy": @@ -218,7 +218,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "prompt-rag": "command": @@ -265,7 +265,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "pulsar": "command": "bin/pulsar standalone" @@ -287,22 +287,6 @@ "volumes": - "pulsar-conf:/pulsar/conf" - "pulsar-data:/pulsar/data" - "pulsar-manager": - "deploy": - "resources": - "limits": - "cpus": "0.5" - "memory": "1.4G" - "reservations": - "cpus": "0.1" - "memory": "1.4G" - "environment": - "SPRING_CONFIGURATION_FILE": "/pulsar-manager/pulsar-manager/application.properties" - "image": "docker.io/apachepulsar/pulsar-manager:v0.4.0" - "ports": - - "9527:9527" - - "7750:7750" - "restart": "on-failure:100" "qdrant": "deploy": "resources": @@ -334,7 +318,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "query-triples": "command": @@ -351,7 +335,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "store-graph-embeddings": "command": @@ -368,7 +352,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "store-triples": "command": @@ -385,7 +369,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "text-completion": "command": @@ -399,7 +383,9 @@ - "-x" - "4096" - "-t" - - "0.0" + - "0" + - "-m" + - "gemini-1.0-pro-001" "deploy": "resources": "limits": @@ -408,7 +394,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "volumes": - "./vertexai:/vertexai" @@ -424,7 +410,9 @@ - "-x" - "4096" - "-t" - - "0.0" + - "0" + - "-m" + - "gemini-1.0-pro-001" - "-i" - "non-persistent://tg/request/text-completion-rag" - "-o" @@ -437,7 +425,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "volumes": - "./vertexai:/vertexai" @@ -454,7 +442,7 @@ "reservations": "cpus": "0.5" "memory": "512M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "volumes": "grafana-storage": {} diff --git a/tg-storage-cassandra.yaml b/tg-storage-cassandra.yaml index 18cd3e33..3adb2893 100644 --- a/tg-storage-cassandra.yaml +++ b/tg-storage-cassandra.yaml @@ -90,22 +90,6 @@ "volumes": - "pulsar-conf:/pulsar/conf" - "pulsar-data:/pulsar/data" - "pulsar-manager": - "deploy": - "resources": - "limits": - "cpus": "0.5" - "memory": "1.4G" - "reservations": - "cpus": "0.1" - "memory": "1.4G" - "environment": - "SPRING_CONFIGURATION_FILE": "/pulsar-manager/pulsar-manager/application.properties" - "image": "docker.io/apachepulsar/pulsar-manager:v0.4.0" - "ports": - - "9527:9527" - - "7750:7750" - "restart": "on-failure:100" "qdrant": "deploy": "resources": @@ -137,7 +121,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "query-triples": "command": @@ -154,7 +138,7 @@ "reservations": "cpus": "0.1" "memory": "512M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "store-graph-embeddings": "command": @@ -171,7 +155,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "store-triples": "command": @@ -188,7 +172,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "volumes": "cassandra": {} diff --git a/tg-storage-neo4j.yaml b/tg-storage-neo4j.yaml index a6fde20c..a26adba7 100644 --- a/tg-storage-neo4j.yaml +++ b/tg-storage-neo4j.yaml @@ -91,22 +91,6 @@ "volumes": - "pulsar-conf:/pulsar/conf" - "pulsar-data:/pulsar/data" - "pulsar-manager": - "deploy": - "resources": - "limits": - "cpus": "0.5" - "memory": "1.4G" - "reservations": - "cpus": "0.1" - "memory": "1.4G" - "environment": - "SPRING_CONFIGURATION_FILE": "/pulsar-manager/pulsar-manager/application.properties" - "image": "docker.io/apachepulsar/pulsar-manager:v0.4.0" - "ports": - - "9527:9527" - - "7750:7750" - "restart": "on-failure:100" "qdrant": "deploy": "resources": @@ -138,7 +122,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "query-triples": "command": @@ -155,7 +139,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "store-graph-embeddings": "command": @@ -172,7 +156,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "store-triples": "command": @@ -189,7 +173,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" "restart": "on-failure:100" "volumes": "grafana-storage": {}