Make templating work more flexibly (#44)

* Restructure directory
* Config loading
* Variable override points in JSONNET templates, separate pulsar-manager template
* Bump version
* Tidy chunking
* Simplified prompt overrides
* Update config loader
* Fix recursive chunker template
This commit is contained in:
cybermaggedon 2024-08-30 17:47:35 +01:00 committed by GitHub
parent f10c2822f4
commit f7a30006ad
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
84 changed files with 1140 additions and 1164 deletions

View file

@ -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