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

Fix auto-templates (#17)

Browse source
This commit is contained in:
cybermaggedon 2024-08-22 00:19:55 +01:00 • committed by GitHub
parent c4bfd9fc8c
commit d3cdb97528
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
28 changed files with 150 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Makefile
View file

@ -36,10 +36,10 @@ set-version:
TEMPLATES=azure bedrock claude cohere mix ollama openai vertexai \ TEMPLATES=azure bedrock claude cohere mix ollama openai vertexai \
openai-neo4j storage openai-neo4j storage
DCS=$(foreach template,${TEMPLATES},${template:%=docker-compose-%.yaml}) DCS=$(foreach template,${TEMPLATES},${template:%=tg-launch-%.yaml})
update-templates: set-version ${DCS} update-templates: set-version ${DCS}
docker-compose-%.yaml: templates/docker-compose-%.jsonnet templates/components/version.jsonnet tg-launch-%.yaml: templates/%.jsonnet templates/components/version.jsonnet
jsonnet -S ${@:docker-compose-%.yaml=templates/docker-compose-%.jsonnet} > $@ jsonnet -S ${@:tg-launch-%.yaml=templates/%.jsonnet} > $@

0
templates/docker-compose-azure.jsonnet → templates/azure.jsonnet
View file

0
templates/docker-compose-bedrock.jsonnet → templates/bedrock.jsonnet
View file

0
templates/docker-compose-claude.jsonnet → templates/claude.jsonnet
View file

0
templates/docker-compose-cohere.jsonnet → templates/cohere.jsonnet
View file

8
templates/components/azure.jsonnet
View file

@ -14,6 +14,10 @@ local url = import "url.jsonnet";
"${AZURE_TOKEN}", "${AZURE_TOKEN}",
"-e", "-e",
"${AZURE_ENDPOINT}", "${AZURE_ENDPOINT}",
"-x",
"4096",
"-t",
"0.0",
], ],
}, },
@ -28,6 +32,10 @@ local url = import "url.jsonnet";
"-e", "-e",
"${AZURE_ENDPOINT}", "${AZURE_ENDPOINT}",
"-i", "-i",
"-x",
"4096",
"-t",
"0.0",
"non-persistent://tg/request/text-completion-rag", "non-persistent://tg/request/text-completion-rag",
"-o", "-o",
"non-persistent://tg/response/text-completion-rag-response", "non-persistent://tg/response/text-completion-rag-response",

12
templates/components/bedrock.jsonnet
View file

@ -29,6 +29,12 @@ local url = import "url.jsonnet";
"${AWS_SECRET_KEY}", "${AWS_SECRET_KEY}",
"-r", "-r",
"us-west-2", "us-west-2",
"-x",
"4096",
"-t",
"0.0",
"-m",
"mistral.mixtral-8x7b-instruct-v0:1",
], ],
}, },
@ -46,6 +52,12 @@ local url = import "url.jsonnet";
"${AWS_SECRET_KEY}", "${AWS_SECRET_KEY}",
"-r", "-r",
"us-west-2", "us-west-2",
"-x",
"4096",
"-t",
"0.0",
"-m",
"mistral.mixtral-8x7b-instruct-v0:1",
"-i", "-i",
"non-persistent://tg/request/text-completion-rag", "non-persistent://tg/request/text-completion-rag",
"-o", "-o",

8
templates/components/claude.jsonnet
View file

@ -12,6 +12,10 @@ local url = import "url.jsonnet";
url.pulsar, url.pulsar,
"-k", "-k",
"${CLAUDE_KEY}", "${CLAUDE_KEY}",
"-x",
"4096",
"-t",
"0.0",
], ],
}, },
@ -23,6 +27,10 @@ local url = import "url.jsonnet";
url.pulsar, url.pulsar,
"-k", "-k",
"${CLAUDE_KEY}", "${CLAUDE_KEY}",
"-x",
"4096",
"-t",
"0.0",
"-i", "-i",
"non-persistent://tg/request/text-completion-rag", "non-persistent://tg/request/text-completion-rag",
"-o", "-o",

10
templates/components/cohere.jsonnet
View file

@ -7,13 +7,13 @@ local url = import "url.jsonnet";
chunker: base + { chunker: base + {
image: images.trustgraph, image: images.trustgraph,
command: [ command: [
"chunker-recursive", "${CHUNKER:-chunker-token}",
"-p", "-p",
url.pulsar, url.pulsar,
"--chunk-size", "--chunk-size",
"1000", "150",
"--chunk-overlap", "--chunk-overlap",
"50", "10",
], ],
}, },
@ -25,6 +25,8 @@ local url = import "url.jsonnet";
url.pulsar, url.pulsar,
"-k", "-k",
"${COHERE_KEY}", "${COHERE_KEY}",
"-t",
"0.0",
], ],
}, },
@ -36,6 +38,8 @@ local url = import "url.jsonnet";
url.pulsar, url.pulsar,
"-k", "-k",
"${COHERE_KEY}", "${COHERE_KEY}",
"-t",
"0.0",
"-i", "-i",
"non-persistent://tg/request/text-completion-rag", "non-persistent://tg/request/text-completion-rag",
"-o", "-o",

8
templates/components/ollama.jsonnet
View file

@ -10,8 +10,8 @@ local url = import "url.jsonnet";
"text-completion-ollama", "text-completion-ollama",
"-p", "-p",
url.pulsar, url.pulsar,
// "-m", "-m",
// "llama3.1:8b", "gemma2:9b",
"-r", "-r",
"${OLLAMA_HOST}", "${OLLAMA_HOST}",
], ],
@ -23,8 +23,8 @@ local url = import "url.jsonnet";
"text-completion-ollama", "text-completion-ollama",
"-p", "-p",
url.pulsar, url.pulsar,
// "-m", "-m",
// "llama3.1:8b", "gemma2:9b",
"-r", "-r",
"${OLLAMA_HOST}", "${OLLAMA_HOST}",
"-i", "-i",

8
templates/components/openai.jsonnet
View file

@ -12,6 +12,10 @@ local url = import "url.jsonnet";
url.pulsar, url.pulsar,
"-k", "-k",
"${OPENAI_KEY}", "${OPENAI_KEY}",
"-x",
"4096",
"-t",
"0.0",
], ],
}, },
@ -23,6 +27,10 @@ local url = import "url.jsonnet";
url.pulsar, url.pulsar,
"-k", "-k",
"${OPENAI_KEY}", "${OPENAI_KEY}",
"-x",
"4096",
"-t",
"0.0",
"-i", "-i",
"non-persistent://tg/request/text-completion-rag", "non-persistent://tg/request/text-completion-rag",
"-o", "-o",

12
templates/components/vertexai.jsonnet
View file

@ -13,7 +13,11 @@ local url = import "url.jsonnet";
"-k", "-k",
"/vertexai/private.json", "/vertexai/private.json",
"-r", "-r",
"us-west1", "us-central1",
"-x",
"4096",
"-t",
"0.0",
], ],
volumes: [ volumes: [
"./vertexai:/vertexai" "./vertexai:/vertexai"
@ -29,7 +33,11 @@ local url = import "url.jsonnet";
"-k", "-k",
"/vertexai/private.json", "/vertexai/private.json",
"-r", "-r",
"us-west1", "us-central1",
"-x",
"4096",
"-t",
"0.0",
"-i", "-i",
"non-persistent://tg/request/text-completion-rag", "non-persistent://tg/request/text-completion-rag",
"-o", "-o",

27
templates/docker-compose.jsonnet Normal file
View file

@ -0,0 +1,27 @@
local components = {
neo4j: import "components/neo4j.jsonnet",
cassandra: import "components/neo4j.jsonnet",
pulsar: import "components/pulsar.jsonnet",
milvus: import "components/milvus.jsonnet",
grafana: import "components/grafana.jsonnet",
trustgraph: import "components/trustgraph.jsonnet",
azure: import "components/azure.jsonnet",
bedrock: import "components/bedrock.jsonnet",
cohere: import "components/cohere.jsonnet",
claude: import "components/claude.jsonnet",
ollama: import "components/ollama.jsonnet",
openai: import "components/openai.jsonnet",
mix: import "components/mix.jsonnet",
vertexai: import "components/vertexai.jsonnet",
};
local options = std.split(std.extVar("options"), ",");
local add = function(state, name) state + components[name];
local config = std.foldl(add, options, {});
std.manifestYamlDoc(config)

0
templates/docker-compose-mix.jsonnet → templates/mix.jsonnet
View file

0
templates/docker-compose-ollama.jsonnet → templates/ollama.jsonnet
View file

0
templates/docker-compose-openai-neo4j.jsonnet → templates/openai-neo4j.jsonnet
View file

0
templates/docker-compose-openai.jsonnet → templates/openai.jsonnet
View file

0
templates/docker-compose-storage.jsonnet → templates/storage.jsonnet
View file

0
templates/docker-compose-vertexai.jsonnet → templates/vertexai.jsonnet
View file

16
tg-launch-azure.yaml
View file

@ -229,14 +229,14 @@
- "text-completion-azure" - "text-completion-azure"
- "-p" - "-p"
- "pulsar://pulsar:6650" - "pulsar://pulsar:6650"
# - "-x"
# - "4096"
# - "-t"
# - "0.0"
- "-k" - "-k"
- "${AZURE_TOKEN}" - "${AZURE_TOKEN}"
- "-e" - "-e"
- "${AZURE_ENDPOINT}" - "${AZURE_ENDPOINT}"
- "-x"
- "4096"
- "-t"
- "0.0"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.9" "image": "docker.io/trustgraph/trustgraph-flow:0.6.9"
"restart": "on-failure:100" "restart": "on-failure:100"
"text-completion-rag": "text-completion-rag":
@ -244,15 +244,15 @@
- "text-completion-azure" - "text-completion-azure"
- "-p" - "-p"
- "pulsar://pulsar:6650" - "pulsar://pulsar:6650"
# - "-x"
# - "4096"
# - "-t"
# - "0.0"
- "-k" - "-k"
- "${AZURE_TOKEN}" - "${AZURE_TOKEN}"
- "-e" - "-e"
- "${AZURE_ENDPOINT}" - "${AZURE_ENDPOINT}"
- "-i" - "-i"
- "-x"
- "4096"
- "-t"
- "0.0"
- "non-persistent://tg/request/text-completion-rag" - "non-persistent://tg/request/text-completion-rag"
- "-o" - "-o"
- "non-persistent://tg/response/text-completion-rag-response" - "non-persistent://tg/response/text-completion-rag-response"

25
tg-launch-bedrock.yaml
View file

@ -24,6 +24,7 @@
- "pulsar://pulsar:6650" - "pulsar://pulsar:6650"
- "-m" - "-m"
- "all-MiniLM-L6-v2" - "all-MiniLM-L6-v2"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.9"
"restart": "on-failure:100" "restart": "on-failure:100"
"etcd": "etcd":
"command": "command":
@ -228,18 +229,18 @@
- "text-completion-bedrock" - "text-completion-bedrock"
- "-p" - "-p"
- "pulsar://pulsar:6650" - "pulsar://pulsar:6650"
# - "-x"
# - "4096"
# - "-t"
# - "0.0"
# - "-m"
# - "mistral.mixtral-8x7b-instruct-v0:1"
- "-z" - "-z"
- "${AWS_ID_KEY}" - "${AWS_ID_KEY}"
- "-k" - "-k"
- "${AWS_SECRET_KEY}" - "${AWS_SECRET_KEY}"
- "-r" - "-r"
- "us-west-2" - "us-west-2"
- "-x"
- "4096"
- "-t"
- "0.0"
- "-m"
- "mistral.mixtral-8x7b-instruct-v0:1"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.9" "image": "docker.io/trustgraph/trustgraph-flow:0.6.9"
"restart": "on-failure:100" "restart": "on-failure:100"
"text-completion-rag": "text-completion-rag":
@ -247,18 +248,18 @@
- "text-completion-bedrock" - "text-completion-bedrock"
- "-p" - "-p"
- "pulsar://pulsar:6650" - "pulsar://pulsar:6650"
# - "-x"
# - "4096"
# - "-x"
# - "0.0"
# - "-m"
# - "mistral.mixtral-8x7b-instruct-v0:1"
- "-z" - "-z"
- "${AWS_ID_KEY}" - "${AWS_ID_KEY}"
- "-k" - "-k"
- "${AWS_SECRET_KEY}" - "${AWS_SECRET_KEY}"
- "-r" - "-r"
- "us-west-2" - "us-west-2"
- "-x"
- "4096"
- "-t"
- "0.0"
- "-m"
- "mistral.mixtral-8x7b-instruct-v0:1"
- "-i" - "-i"
- "non-persistent://tg/request/text-completion-rag" - "non-persistent://tg/request/text-completion-rag"
- "-o" - "-o"

16
tg-launch-claude.yaml
View file

@ -229,12 +229,12 @@
- "text-completion-claude" - "text-completion-claude"
- "-p" - "-p"
- "pulsar://pulsar:6650" - "pulsar://pulsar:6650"
# - "-x"
# - "4096"
# - "-t"
# - "0.0"
- "-k" - "-k"
- "${CLAUDE_KEY}" - "${CLAUDE_KEY}"
- "-x"
- "4096"
- "-t"
- "0.0"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.9" "image": "docker.io/trustgraph/trustgraph-flow:0.6.9"
"restart": "on-failure:100" "restart": "on-failure:100"
"text-completion-rag": "text-completion-rag":
@ -242,12 +242,12 @@
- "text-completion-claude" - "text-completion-claude"
- "-p" - "-p"
- "pulsar://pulsar:6650" - "pulsar://pulsar:6650"
# - "-x"
# - "4096"
# - "-t"
# - "0.0"
- "-k" - "-k"
- "${CLAUDE_KEY}" - "${CLAUDE_KEY}"
- "-x"
- "4096"
- "-t"
- "0.0"
- "-i" - "-i"
- "non-persistent://tg/request/text-completion-rag" - "non-persistent://tg/request/text-completion-rag"
- "-o" - "-o"

8
tg-launch-cohere.yaml
View file

@ -229,10 +229,10 @@
- "text-completion-cohere" - "text-completion-cohere"
- "-p" - "-p"
- "pulsar://pulsar:6650" - "pulsar://pulsar:6650"
# - "-t"
# - "0.0"
- "-k" - "-k"
- "${COHERE_KEY}" - "${COHERE_KEY}"
- "-t"
- "0.0"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.9" "image": "docker.io/trustgraph/trustgraph-flow:0.6.9"
"restart": "on-failure:100" "restart": "on-failure:100"
"text-completion-rag": "text-completion-rag":
@ -240,10 +240,10 @@
- "text-completion-cohere" - "text-completion-cohere"
- "-p" - "-p"
- "pulsar://pulsar:6650" - "pulsar://pulsar:6650"
# - "-t"
# - "0.0"
- "-k" - "-k"
- "${COHERE_KEY}" - "${COHERE_KEY}"
- "-t"
- "0.0"
- "-i" - "-i"
- "non-persistent://tg/request/text-completion-rag" - "non-persistent://tg/request/text-completion-rag"
- "-o" - "-o"

12
tg-launch-mix.yaml
View file

@ -12,9 +12,9 @@
- "-p" - "-p"
- "pulsar://pulsar:6650" - "pulsar://pulsar:6650"
- "--chunk-size" - "--chunk-size"
- "2000" - "4000"
- "--chunk-overlap" - "--chunk-overlap"
- "100" - "120"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.9" "image": "docker.io/trustgraph/trustgraph-flow:0.6.9"
"restart": "on-failure:100" "restart": "on-failure:100"
"embeddings": "embeddings":
@ -229,10 +229,6 @@
- "text-completion-cohere" - "text-completion-cohere"
- "-p" - "-p"
- "pulsar://pulsar:6650" - "pulsar://pulsar:6650"
# - "-x"
# - "4096"
# - "-t"
# - "0.0"
- "-k" - "-k"
- "${COHERE_KEY}" - "${COHERE_KEY}"
- "-m" - "-m"
@ -244,10 +240,6 @@
- "text-completion-cohere" - "text-completion-cohere"
- "-p" - "-p"
- "pulsar://pulsar:6650" - "pulsar://pulsar:6650"
# - "-x"
# - "4096"
# - "-t"
# - "0.0"
- "-k" - "-k"
- "${COHERE_KEY}" - "${COHERE_KEY}"
- "-i" - "-i"

8
tg-launch-ollama.yaml
View file

@ -229,10 +229,10 @@
- "text-completion-ollama" - "text-completion-ollama"
- "-p" - "-p"
- "pulsar://pulsar:6650" - "pulsar://pulsar:6650"
- "-m"
- "gemma2:9b"
- "-r" - "-r"
- "${OLLAMA_HOST}" - "${OLLAMA_HOST}"
# - "-m"
# - "phi3.5:latest"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.9" "image": "docker.io/trustgraph/trustgraph-flow:0.6.9"
"restart": "on-failure:100" "restart": "on-failure:100"
"text-completion-rag": "text-completion-rag":
@ -240,10 +240,10 @@
- "text-completion-ollama" - "text-completion-ollama"
- "-p" - "-p"
- "pulsar://pulsar:6650" - "pulsar://pulsar:6650"
- "-m"
- "gemma2:9b"
- "-r" - "-r"
- "${OLLAMA_HOST}" - "${OLLAMA_HOST}"
# - "-m"
# - "phi3.5:latest"
- "-i" - "-i"
- "non-persistent://tg/request/text-completion-rag" - "non-persistent://tg/request/text-completion-rag"
- "-o" - "-o"

16
tg-launch-openai-neo4j.yaml
View file

@ -232,12 +232,12 @@
- "text-completion-openai" - "text-completion-openai"
- "-p" - "-p"
- "pulsar://pulsar:6650" - "pulsar://pulsar:6650"
# - "-x"
# - "4096"
# - "-t"
# - "0.0"
- "-k" - "-k"
- "${OPENAI_KEY}" - "${OPENAI_KEY}"
- "-x"
- "4096"
- "-t"
- "0.0"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.9" "image": "docker.io/trustgraph/trustgraph-flow:0.6.9"
"restart": "on-failure:100" "restart": "on-failure:100"
"text-completion-rag": "text-completion-rag":
@ -245,12 +245,12 @@
- "text-completion-openai" - "text-completion-openai"
- "-p" - "-p"
- "pulsar://pulsar:6650" - "pulsar://pulsar:6650"
# - "-x"
# - "4096"
# - "-t"
# - "0.0"
- "-k" - "-k"
- "${OPENAI_KEY}" - "${OPENAI_KEY}"
- "-x"
- "4096"
- "-t"
- "0.0"
- "-i" - "-i"
- "non-persistent://tg/request/text-completion-rag" - "non-persistent://tg/request/text-completion-rag"
- "-o" - "-o"

16
tg-launch-openai.yaml
View file

@ -229,12 +229,12 @@
- "text-completion-openai" - "text-completion-openai"
- "-p" - "-p"
- "pulsar://pulsar:6650" - "pulsar://pulsar:6650"
# - "-x"
# - "4096"
# - "-t"
# - "0.0"
- "-k" - "-k"
- "${OPENAI_KEY}" - "${OPENAI_KEY}"
- "-x"
- "4096"
- "-t"
- "0.0"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.9" "image": "docker.io/trustgraph/trustgraph-flow:0.6.9"
"restart": "on-failure:100" "restart": "on-failure:100"
"text-completion-rag": "text-completion-rag":
@ -242,12 +242,12 @@
- "text-completion-openai" - "text-completion-openai"
- "-p" - "-p"
- "pulsar://pulsar:6650" - "pulsar://pulsar:6650"
# - "-x"
# - "4096"
# - "-t"
# - "0.0"
- "-k" - "-k"
- "${OPENAI_KEY}" - "${OPENAI_KEY}"
- "-x"
- "4096"
- "-t"
- "0.0"
- "-i" - "-i"
- "non-persistent://tg/request/text-completion-rag" - "non-persistent://tg/request/text-completion-rag"
- "-o" - "-o"

16
tg-launch-vertexai.yaml
View file

@ -229,14 +229,14 @@
- "text-completion-vertexai" - "text-completion-vertexai"
- "-p" - "-p"
- "pulsar://pulsar:6650" - "pulsar://pulsar:6650"
# - "-x"
# - "4096"
# - "-t"
# - "0.0"
- "-k" - "-k"
- "/vertexai/private.json" - "/vertexai/private.json"
- "-r" - "-r"
- "us-central1" - "us-central1"
- "-x"
- "4096"
- "-t"
- "0.0"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.9" "image": "docker.io/trustgraph/trustgraph-flow:0.6.9"
"restart": "on-failure:100" "restart": "on-failure:100"
"volumes": "volumes":
@ -246,14 +246,14 @@
- "text-completion-vertexai" - "text-completion-vertexai"
- "-p" - "-p"
- "pulsar://pulsar:6650" - "pulsar://pulsar:6650"
# - "-x"
# - "4096"
# - "-t"
# - "0.0"
- "-k" - "-k"
- "/vertexai/private.json" - "/vertexai/private.json"
- "-r" - "-r"
- "us-central1" - "us-central1"
- "-x"
- "4096"
- "-t"
- "0.0"
- "-i" - "-i"
- "non-persistent://tg/request/text-completion-rag" - "non-persistent://tg/request/text-completion-rag"
- "-o" - "-o"