- Add component template files for all LLM types

- Top-level templates simplified to use just components

Makefile

@@ -38,6 +38,6 @@ DCS=$(foreach template,${TEMPLATES},${template:%=docker-compose-%.yaml})
 
 update-templates: set-version ${DCS}
 
-docker-compose-%.yaml: templates/docker-compose-%.jsonnet templates/version.jsonnet
+docker-compose-%.yaml: templates/docker-compose-%.jsonnet templates/components/version.jsonnet
 	jsonnet -S ${@:docker-compose-%.yaml=templates/docker-compose-%.jsonnet} > $@
 

templates/components/azure.jsonnet

@@ -0,0 +1,38 @@
+local base = import "base.jsonnet";
+local images = import "images.jsonnet";
+local url = import "url.jsonnet";
+{
+    services +: {
+
+	"text-completion": base + {
+	    image: images.trustgraph,
+	    command: [
+		"text-completion-azure",
+		"-p",
+		url.pulsar,
+		"-k",
+		"${AZURE_TOKEN}",
+		"-e",
+		"${AZURE_ENDPOINT}",
+	    ],
+	},
+
+	"text-completion-rag": base + {
+	    image: images.trustgraph,
+	    command: [
+		"text-completion-azure",
+		"-p",
+		url.pulsar,
+		"-k",
+		"${AZURE_TOKEN}",
+		"-e",
+		"${AZURE_ENDPOINT}",
+		"-i",
+		"non-persistent://tg/request/text-completion-rag",
+		"-o",
+		"non-persistent://tg/response/text-completion-rag-response",
+	    ],
+	},
+	
+    },
+}

templates/components/bedrock.jsonnet

@@ -0,0 +1,57 @@
+local base = import "base.jsonnet";
+local images = import "images.jsonnet";
+local url = import "url.jsonnet";
+{
+    services +: {
+
+	chunker: base + {
+	    image: images.trustgraph,
+	    command: [
+		"chunker-recursive",
+		"-p",
+		url.pulsar,
+		"--chunk-size",
+		"2000",
+		"--chunk-overlap",
+		"100",
+	    ],
+	},
+
+	"text-completion": base + {
+	    image: images.trustgraph,
+	    command: [
+		"text-completion-bedrock",
+		"-p",
+		url.pulsar,
+		"-z",
+		"${AWS_ID_KEY}",
+		"-k",
+		"${AWS_SECRET_KEY}",
+		"-r",
+		"us-west-2",
+	    ],
+	},
+
+	"text-completion-rag": base + {
+	    image: images.trustgraph,
+	    command: [
+		"text-completion-bedrock",
+		"-p",
+		url.pulsar,
+		// "-m",
+		// "mistral.mistral-large-2407-v1:0",
+		"-z",
+		"${AWS_ID_KEY}",
+		"-k",
+		"${AWS_SECRET_KEY}",
+		"-r",
+		"us-west-2",
+		"-i",
+		"non-persistent://tg/request/text-completion-rag",
+		"-o",
+		"non-persistent://tg/response/text-completion-rag-response",
+	    ],
+	},
+	
+    },
+}

templates/components/cassandra.jsonnet

@@ -1,10 +1,13 @@
 local base = import "base.jsonnet";
 local images = import "images.jsonnet";
+local url = import "url.jsonnet";
+local cassandra_hosts = "cassandra";
 {
     volumes +: {
 	cassandra: {},
     },
     services +: {
+
 	cassandra: base + {
 	    image: images.cassandra,
 	    ports: [
@@ -13,6 +16,29 @@ local images = import "images.jsonnet";
 	    volumes: [
 		"cassandra:/var/lib/cassandra"
 	    ],
-	}
+	},
+
+	"store-triples": base + {
+	    image: images.trustgraph,
+	    command: [
+		"triples-write-cassandra",
+		"-p",
+		url.pulsar,
+		"-g",
+		cassandra_hosts,
+	    ],
+	},
+
+	"query-triples": base + {
+	    image: images.trustgraph,
+	    command: [
+		"triples-query-cassandra",
+		"-p",
+		url.pulsar,
+		"-g",
+		cassandra_hosts,
+	    ],
+	},
+
     },
 }

templates/components/claude.jsonnet

@@ -0,0 +1,34 @@
+local base = import "base.jsonnet";
+local images = import "images.jsonnet";
+local url = import "url.jsonnet";
+{
+    services +: {
+
+	"text-completion": base + {
+	    image: images.trustgraph,
+	    command: [
+		"text-completion-claude",
+		"-p",
+		url.pulsar,
+		"-k",
+		"${CLAUDE_KEY}",
+	    ],
+	},
+
+	"text-completion-rag": base + {
+	    image: images.trustgraph,
+	    command: [
+		"text-completion-claude",
+		"-p",
+		url.pulsar,
+		"-k",
+		"${CLAUDE_KEY}",
+		"-i",
+		"non-persistent://tg/request/text-completion-rag",
+		"-o",
+		"non-persistent://tg/response/text-completion-rag-response",
+	    ],
+	},
+	
+    },
+}

templates/components/cohere.jsonnet

@@ -0,0 +1,47 @@
+local base = import "base.jsonnet";
+local images = import "images.jsonnet";
+local url = import "url.jsonnet";
+{
+    services +: {
+
+	chunker: base + {
+	    image: images.trustgraph,
+	    command: [
+		"chunker-recursive",
+		"-p",
+		url.pulsar,
+		"--chunk-size",
+		"1000",
+		"--chunk-overlap",
+		"50",
+	    ],
+	},
+
+	"text-completion": base + {
+	    image: images.trustgraph,
+	    command: [
+		"text-completion-cohere",
+		"-p",
+		url.pulsar,
+		"-k",
+		"${COHERE_KEY}",
+	    ],
+	},
+
+	"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",
+	    ],
+	},
+
+    },
+}

templates/components/neo4j.jsonnet

@@ -1,10 +1,14 @@
 local base = import "base.jsonnet";
 local images = import "images.jsonnet";
+local url = import "url.jsonnet";
 {
+
     volumes +: {
 	neo4j: {},
     },
+
     services +: {
+
 	neo4j: base + {
 	    image: images.neo4j,
 	    ports: [
@@ -20,6 +24,30 @@ local images = import "images.jsonnet";
 	    volumes: [
 		"neo4j:/data"
 	    ],
+	},
+
+	"query-triples": base + {
+	    image: images.trustgraph,
+	    command: [
+		"triples-query-neo4j",
+		"-p",
+		url.pulsar,
+		"-g",
+		"bolt://neo4j:7687",
+	    ],
+	},
+
+	"store-triples": base + {
+	    image: images.trustgraph,
+	    command: [
+		"triples-write-neo4j",
+		"-p",
+		url.pulsar,
+		"-g",
+		"bolt://neo4j:7687",
+	    ],
 	}
+
     },
+
 }

templates/components/ollama.jsonnet

@@ -0,0 +1,38 @@
+local base = import "base.jsonnet";
+local images = import "images.jsonnet";
+local url = import "url.jsonnet";
+{
+    services +: {
+
+	"text-completion": base + {
+	    image: images.trustgraph,
+	    command: [
+		"text-completion-ollama",
+		"-p",
+		url.pulsar,
+                // "-m",
+                // "llama3.1:8b",
+		"-r",
+		"${OLLAMA_HOST}",
+	    ],
+	},
+
+	"text-completion-rag": base + {
+	    image: images.trustgraph,
+	    command: [
+		"text-completion-ollama",
+		"-p",
+		url.pulsar,
+                // "-m",
+                // "llama3.1:8b",
+		"-r",
+		"${OLLAMA_HOST}",
+		"-i",
+		"non-persistent://tg/request/text-completion-rag",
+		"-o",
+		"non-persistent://tg/response/text-completion-rag-response",
+	    ],
+	},
+	
+    },
+}

templates/components/openai.jsonnet

@@ -0,0 +1,34 @@
+local base = import "base.jsonnet";
+local images = import "images.jsonnet";
+local url = import "url.jsonnet";
+{
+    services +: {
+
+	"text-completion": base + {
+	    image: images.trustgraph,
+	    command: [
+		"text-completion-openai",
+		"-p",
+		url.pulsar,
+		"-k",
+		"${OPENAI_KEY}",
+	    ],
+	},
+
+	"text-completion-rag": base + {
+	    image: images.trustgraph,
+	    command: [
+		"text-completion-openai",
+		"-p",
+		url.pulsar,
+		"-k",
+		"${OPENAI_KEY}",
+		"-i",
+		"non-persistent://tg/request/text-completion-rag",
+		"-o",
+		"non-persistent://tg/response/text-completion-rag-response",
+	    ],
+	},
+	
+    },
+}

templates/components/trustgraph.jsonnet

@@ -5,8 +5,6 @@ local images = import "images.jsonnet";
 
 local url = import "url.jsonnet";
 
-local cassandra_hosts = "cassandra";
-
 {
     services +: {
 
@@ -88,28 +86,6 @@ local cassandra_hosts = "cassandra";
 	    ],
 	},
 
-	"store-triples": base + {
-	    image: images.trustgraph,
-	    command: [
-		"triples-write-cassandra",
-		"-p",
-		url.pulsar,
-		"-g",
-		cassandra_hosts,
-	    ],
-	},
-
-	"query-triples": base + {
-	    image: images.trustgraph,
-	    command: [
-		"triples-query-cassandra",
-		"-p",
-		url.pulsar,
-		"-g",
-		cassandra_hosts,
-	    ],
-	},
-
 	"graph-rag": base + {
 	    image: images.trustgraph,
 	    command: [

templates/components/version.jsonnet

@@ -0,0 +1 @@
+"0.6.1"

templates/components/vertexai.jsonnet

@@ -0,0 +1,44 @@
+local base = import "base.jsonnet";
+local images = import "images.jsonnet";
+local url = import "url.jsonnet";
+{
+    services +: {
+
+	"text-completion": base + {
+	    image: images.trustgraph,
+	    command: [
+		"text-completion-vertexai",
+		"-p",
+		url.pulsar,
+		"-k",
+		"/vertexai/private.json",
+		"-r",
+		"us-west1",
+	    ],
+	    volumes: [
+		"./vertexai:/vertexai"
+	    ],
+	},
+
+	"text-completion-rag": base + {
+	    image: images.trustgraph,
+	    command: [
+		"text-completion-vertexai",
+		"-p",
+		url.pulsar,
+		"-k",
+		"/vertexai/private.json",
+		"-r",
+		"us-west1",
+		"-i",
+		"non-persistent://tg/request/text-completion-rag",
+		"-o",
+		"non-persistent://tg/response/text-completion-rag-response",
+	    ],
+	    volumes: [
+		"./vertexai:/vertexai"
+	    ],
+	},
+
+    },
+}

templates/docker-compose-azure.jsonnet

@@ -1,49 +1,12 @@
 
-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 azure = import "components/azure.jsonnet";
 
-local config = cassandra + pulsar + milvus + grafana + trustgraph + {
+local config = cassandra + pulsar + milvus + grafana + trustgraph + azure;
-    services +: {
-
-	"text-completion": base + {
-	    image: images.trustgraph,
-	    command: [
-		"text-completion-azure",
-		"-p",
-		url.pulsar,
-		"-k",
-		"${AZURE_TOKEN}",
-		"-e",
-		"${AZURE_ENDPOINT}",
-	    ],
-	},
-
-	"text-completion-rag": base + {
-	    image: images.trustgraph,
-	    command: [
-		"text-completion-azure",
-		"-p",
-		url.pulsar,
-		"-k",
-		"${AZURE_TOKEN}",
-		"-e",
-		"${AZURE_ENDPOINT}",
-		"-i",
-		"non-persistent://tg/request/text-completion-rag",
-		"-o",
-		"non-persistent://tg/response/text-completion-rag-response",
-	    ],
-	},
-	
-    }
-};
 
 std.manifestYamlDoc(config)
 

templates/docker-compose-bedrock.jsonnet

@@ -1,68 +1,12 @@
 
-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 bedrock = import "components/bedrock.jsonnet";
 
-local config = cassandra + pulsar + milvus + grafana + trustgraph + {
+local config = cassandra + pulsar + milvus + grafana + trustgraph + bedrock;
-    services +: {
-
-	chunker: base + {
-	    image: images.trustgraph,
-	    command: [
-		"chunker-recursive",
-		"-p",
-		url.pulsar,
-		"--chunk-size",
-		"2000",
-		"--chunk-overlap",
-		"100",
-	    ],
-	},
-
-	"text-completion": base + {
-	    image: images.trustgraph,
-	    command: [
-		"text-completion-bedrock",
-		"-p",
-		url.pulsar,
-		"-z",
-		"${AWS_ID_KEY}",
-		"-k",
-		"${AWS_SECRET_KEY}",
-		"-r",
-		"us-west-2",
-	    ],
-	},
-
-	"text-completion-rag": base + {
-	    image: images.trustgraph,
-	    command: [
-		"text-completion-bedrock",
-		"-p",
-		url.pulsar,
-		// "-m",
-		// "mistral.mistral-large-2407-v1:0",
-		"-z",
-		"${AWS_ID_KEY}",
-		"-k",
-		"${AWS_SECRET_KEY}",
-		"-r",
-		"us-west-2",
-		"-i",
-		"non-persistent://tg/request/text-completion-rag",
-		"-o",
-		"non-persistent://tg/response/text-completion-rag-response",
-	    ],
-	},
-	
-    }
-};
 
 std.manifestYamlDoc(config)
 

templates/docker-compose-claude.jsonnet

@@ -1,45 +1,12 @@
 
-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 claude = import "components/claude.jsonnet";
 
-local config = cassandra + pulsar + milvus + grafana + trustgraph + {
+local config = cassandra + pulsar + milvus + grafana + trustgraph + claude;
-    services +: {
-
-	"text-completion": base + {
-	    image: images.trustgraph,
-	    command: [
-		"text-completion-claude",
-		"-p",
-		url.pulsar,
-		"-k",
-		"${CLAUDE_KEY}",
-	    ],
-	},
-
-	"text-completion-rag": base + {
-	    image: images.trustgraph,
-	    command: [
-		"text-completion-claude",
-		"-p",
-		url.pulsar,
-		"-k",
-		"${CLAUDE_KEY}",
-		"-i",
-		"non-persistent://tg/request/text-completion-rag",
-		"-o",
-		"non-persistent://tg/response/text-completion-rag-response",
-	    ],
-	},
-	
-    }
-};
 
 std.manifestYamlDoc(config)
 

templates/docker-compose-cohere.jsonnet

@@ -1,58 +1,12 @@
 
-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 cohere = import "components/cohere.jsonnet";
 
-local config = cassandra + pulsar + milvus + grafana + trustgraph + {
+local config = cassandra + pulsar + milvus + grafana + trustgraph + cohere;
-    services +: {
-
-	chunker: base + {
-	    image: images.trustgraph,
-	    command: [
-		"chunker-recursive",
-		"-p",
-		url.pulsar,
-		"--chunk-size",
-		"1000",
-		"--chunk-overlap",
-		"50",
-	    ],
-	},
-
-	"text-completion": base + {
-	    image: images.trustgraph,
-	    command: [
-		"text-completion-cohere",
-		"-p",
-		url.pulsar,
-		"-k",
-		"${COHERE_KEY}",
-	    ],
-	},
-
-	"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",
-	    ],
-	},
-	
-    }
-};
 
 std.manifestYamlDoc(config)
 

templates/docker-compose-ollama.jsonnet

@@ -1,49 +1,12 @@
 
-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 ollama = import "components/ollama.jsonnet";
 
-local config = cassandra + pulsar + milvus + grafana + trustgraph + {
+local config = cassandra + pulsar + milvus + grafana + trustgraph + ollama;
-    services +: {
-
-	"text-completion": base + {
-	    image: images.trustgraph,
-	    command: [
-		"text-completion-ollama",
-		"-p",
-		url.pulsar,
-                // "-m",
-                // "llama3.1:8b",
-		"-r",
-		"${OLLAMA_HOST}",
-	    ],
-	},
-
-	"text-completion-rag": base + {
-	    image: images.trustgraph,
-	    command: [
-		"text-completion-ollama",
-		"-p",
-		url.pulsar,
-                // "-m",
-                // "llama3.1:8b",
-		"-r",
-		"${OLLAMA_HOST}",
-		"-i",
-		"non-persistent://tg/request/text-completion-rag",
-		"-o",
-		"non-persistent://tg/response/text-completion-rag-response",
-	    ],
-	},
-	
-    }
-};
 
 std.manifestYamlDoc(config)
 

templates/docker-compose-openai-neo4j.jsonnet

@@ -1,68 +1,12 @@
 
-local base = import "components/base.jsonnet";
-local url = import "components/url.jsonnet";
-local images = import "components/images.jsonnet";
-
 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 + {
+local config = neo4j + pulsar + milvus + grafana + trustgraph + openai;
-
-    services: std.mergePatch(super.services, {
-
-	"text-completion": base + {
-	    image: images.trustgraph,
-	    command: [
-		"text-completion-openai",
-		"-p",
-		url.pulsar,
-		"-k",
-		"${OPENAI_KEY}",
-	    ],
-	},
-
-	"text-completion-rag": base + {
-	    image: images.trustgraph,
-	    command: [
-		"text-completion-openai",
-		"-p",
-		url.pulsar,
-		"-k",
-		"${OPENAI_KEY}",
-		"-i",
-		"non-persistent://tg/request/text-completion-rag",
-		"-o",
-		"non-persistent://tg/response/text-completion-rag-response",
-	    ],
-	},
-
-	"query-triples": {
-	    image: images.trustgraph,
-	    command: [
-		"triples-query-neo4j",
-		"-p",
-		url.pulsar,
-		"-g",
-		"bolt://neo4j:7687",
-	    ],
-	},
-
-	"store-triples": {
-	    image: images.trustgraph,
-	    command: [
-		"triples-write-neo4j",
-		"-p",
-		url.pulsar,
-		"-g",
-		"bolt://neo4j:7687",
-	    ],
-	}
-
-    })
-};
 
 std.manifestYamlDoc(config)
 

templates/docker-compose-openai.jsonnet

@@ -1,45 +1,12 @@
 
-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 openai = import "components/openai.jsonnet";
 
-local config = cassandra + pulsar + milvus + grafana + trustgraph + {
+local config = cassandra + pulsar + milvus + grafana + trustgraph + openai;
-    services +: {
-
-	"text-completion": base + {
-	    image: images.trustgraph,
-	    command: [
-		"text-completion-openai",
-		"-p",
-		url.pulsar,
-		"-k",
-		"${OPENAI_KEY}",
-	    ],
-	},
-
-	"text-completion-rag": base + {
-	    image: images.trustgraph,
-	    command: [
-		"text-completion-openai",
-		"-p",
-		url.pulsar,
-		"-k",
-		"${OPENAI_KEY}",
-		"-i",
-		"non-persistent://tg/request/text-completion-rag",
-		"-o",
-		"non-persistent://tg/response/text-completion-rag-response",
-	    ],
-	},
-	
-    }
-};
 
 std.manifestYamlDoc(config)
 

templates/docker-compose-vertexai.jsonnet

@@ -1,55 +1,12 @@
 
-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 vertexai = import "components/vertexai.jsonnet";
 
-local config = cassandra + pulsar + milvus + grafana + trustgraph + {
+local config = cassandra + pulsar + milvus + grafana + trustgraph + vertexai;
-    services +: {
-
-	"text-completion": base + {
-	    image: images.trustgraph,
-	    command: [
-		"text-completion-vertexai",
-		"-p",
-		url.pulsar,
-		"-k",
-		"/vertexai/private.json",
-		"-r",
-		"us-west1",
-	    ],
-	    volumes: [
-		"./vertexai:/vertexai"
-	    ],
-	},
-
-	"text-completion-rag": base + {
-	    image: images.trustgraph,
-	    command: [
-		"text-completion-vertexai",
-		"-p",
-		url.pulsar,
-		"-k",
-		"/vertexai/private.json",
-		"-r",
-		"us-west1",
-		"-i",
-		"non-persistent://tg/request/text-completion-rag",
-		"-o",
-		"non-persistent://tg/response/text-completion-rag-response",
-	    ],
-	    volumes: [
-		"./vertexai:/vertexai"
-	    ],
-	},
-	
-    }
-};
 
 std.manifestYamlDoc(config)