diff --git a/Makefile b/Makefile index 68ea1c3b..52b3432d 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ # VERSION=$(shell git describe | sed 's/^v//') -VERSION=0.8.1 +VERSION=0.8.2 DOCKER=podman @@ -60,7 +60,7 @@ update-templates: set-version done for model in ${MODELS}; do \ for graph in ${GRAPHS}; do \ - cm=$${graph},pulsar,${VECTORDB},grafana,trustgraph,$${model}; \ + cm=$${graph},pulsar,${VECTORDB},embeddings-hf,graph-rag,grafana,trustgraph,$${model}; \ input=templates/main.jsonnet; \ output=tg-launch-$${model}-$${graph}.yaml; \ echo $${model} + $${graph} '->' $${output}; \ diff --git a/setup.py b/setup.py index 5b7a6606..da2aadf4 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.1" +version = "0.8.2" setuptools.setup( name="trustgraph", @@ -58,6 +58,8 @@ setuptools.setup( "scripts/concat-parquet", "scripts/de-query-milvus", "scripts/de-write-milvus", + "scripts/de-query-qdrant", + "scripts/de-write-qdrant", "scripts/document-rag", "scripts/dump-parquet", "scripts/embeddings-hf", diff --git a/templates/all-patterns.jsonnet b/templates/all-patterns.jsonnet index f2363b53..8d588d62 100644 --- a/templates/all-patterns.jsonnet +++ b/templates/all-patterns.jsonnet @@ -1,15 +1,11 @@ [ - 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/document-rag.jsonnet", + import "patterns/embeddings-hf.jsonnet", + import "patterns/embeddings-ollama.jsonnet", + import "patterns/grafana.jsonnet", + import "patterns/triple-store-cassandra.jsonnet", + import "patterns/triple-store-neo4j.jsonnet", + import "patterns/graph-rag.jsonnet", import "patterns/llm-azure.jsonnet", import "patterns/llm-bedrock.jsonnet", import "patterns/llm-claude.jsonnet", @@ -17,7 +13,15 @@ import "patterns/llm-ollama.jsonnet", import "patterns/llm-openai.jsonnet", import "patterns/llm-vertexai.jsonnet", + import "patterns/override-recursive-chunker.jsonnet", + import "patterns/prompt-template-definitions.jsonnet", + import "patterns/prompt-template-document-query.jsonnet", + import "patterns/prompt-template-kg-query.jsonnet", + import "patterns/prompt-template-relationships.jsonnet", + import "patterns/prompt-template-rows-template.jsonnet", + import "patterns/pulsar-manager.jsonnet", + import "patterns/pulsar.jsonnet", + import "patterns/trustgraph-base.jsonnet", import "patterns/vector-store-milvus.jsonnet", import "patterns/vector-store-qdrant.jsonnet", - import "patterns/grafana.jsonnet", ] diff --git a/templates/components/document-rag.jsonnet b/templates/components/document-rag.jsonnet new file mode 100644 index 00000000..5939733a --- /dev/null +++ b/templates/components/document-rag.jsonnet @@ -0,0 +1,38 @@ +local base = import "base/base.jsonnet"; +local images = import "values/images.jsonnet"; +local url = import "values/url.jsonnet"; +local prompts = import "prompt-template.jsonnet"; + +{ + + services +: { + + "document-rag": base + { + image: images.trustgraph, + command: [ + "document-rag", + "-p", + url.pulsar, + "--prompt-request-queue", + "non-persistent://tg/request/prompt-rag", + "--prompt-response-queue", + "non-persistent://tg/response/prompt-rag-response", + ], + deploy: { + resources: { + limits: { + cpus: '0.5', + memory: '128M' + }, + reservations: { + cpus: '0.1', + memory: '128M' + } + } + }, + }, + + } + +} + prompts + diff --git a/templates/components/embeddings-hf.jsonnet b/templates/components/embeddings-hf.jsonnet new file mode 100644 index 00000000..a90b0655 --- /dev/null +++ b/templates/components/embeddings-hf.jsonnet @@ -0,0 +1,40 @@ +local base = import "base/base.jsonnet"; +local images = import "values/images.jsonnet"; +local url = import "values/url.jsonnet"; +local prompts = import "prompt-template.jsonnet"; + +{ + + "embeddings-model":: "all-MiniLM-L6-v2", + + services +: { + + embeddings: base + { + image: images.trustgraph, + command: [ + "embeddings-hf", + "-p", + url.pulsar, + "-m", + $["embeddings-model"], + ], + deploy: { + resources: { + limits: { + cpus: '1.0', + memory: '256M' + }, + reservations: { + cpus: '0.5', + memory: '256M' + } + } + }, + }, + + } + +} + prompts + + + diff --git a/templates/components/embeddings-ollama.yaml b/templates/components/embeddings-ollama.yaml new file mode 100644 index 00000000..fe0ad7b5 --- /dev/null +++ b/templates/components/embeddings-ollama.yaml @@ -0,0 +1,41 @@ +local base = import "base/base.jsonnet"; +local images = import "values/images.jsonnet"; +local url = import "values/url.jsonnet"; +local prompts = import "prompt-template.jsonnet"; + +{ + + "embeddings-model":: "mxbai-embed-large", + "ollama-url":: "${OLLAMA_HOST}", + + services +: { + + embeddings: base + { + image: images.trustgraph, + command: [ + "embeddings-ollama", + "-p", + url.pulsar, + "-m", + $["embeddings-model"], + "-r", + $["ollama-url"], + ], + deploy: { + resources: { + limits: { + cpus: '0.5', + memory: '128M' + }, + reservations: { + cpus: '0.1', + memory: '128M' + } + } + }, + }, + + } + +} + prompts + diff --git a/templates/components/graph-rag.jsonnet b/templates/components/graph-rag.jsonnet new file mode 100644 index 00000000..148fa71d --- /dev/null +++ b/templates/components/graph-rag.jsonnet @@ -0,0 +1,92 @@ +local base = import "base/base.jsonnet"; +local images = import "values/images.jsonnet"; +local url = import "values/url.jsonnet"; +local prompts = import "prompt-template.jsonnet"; + +{ + + "graph-rag-entity-limit":: 50, + "graph-rag-triple-limit":: 30, + "graph-rag-max-subgraph-size":: 3000, + + services +: { + + "kg-extract-definitions": base + { + image: images.trustgraph, + command: [ + "kg-extract-definitions", + "-p", + url.pulsar, + ], + deploy: { + resources: { + limits: { + cpus: '0.5', + memory: '128M' + }, + reservations: { + cpus: '0.1', + memory: '128M' + } + } + }, + }, + + "kg-extract-relationships": base + { + image: images.trustgraph, + command: [ + "kg-extract-relationships", + "-p", + url.pulsar, + ], + deploy: { + resources: { + limits: { + cpus: '0.5', + memory: '128M' + }, + reservations: { + cpus: '0.1', + memory: '128M' + } + } + }, + }, + + "graph-rag": base + { + image: images.trustgraph, + command: [ + "graph-rag", + "-p", + url.pulsar, + "--prompt-request-queue", + "non-persistent://tg/request/prompt-rag", + "--prompt-response-queue", + "non-persistent://tg/response/prompt-rag-response", + "--entity-limit", + std.toString($["graph-rag-entity-limit"]), + "--triple-limit", + std.toString($["graph-rag-triple-limit"]), + "--max-subgraph-size", + std.toString($["graph-rag-max-subgraph-size"]), + ], + deploy: { + resources: { + limits: { + cpus: '0.5', + memory: '128M' + }, + reservations: { + cpus: '0.1', + memory: '128M' + } + } + }, + }, + + } + +} + prompts + + + diff --git a/templates/components/milvus.jsonnet b/templates/components/milvus.jsonnet index e6b767a0..ad9e308a 100644 --- a/templates/components/milvus.jsonnet +++ b/templates/components/milvus.jsonnet @@ -53,10 +53,7 @@ milvus + { }, }, -/* - -// Document embeddings writer & query service. Not currently enabled. - + // Document embeddings writer & query service. "store-doc-embeddings": base + { image: images.trustgraph, command: [ @@ -103,8 +100,6 @@ milvus + { }, }, -*/ - } } diff --git a/templates/components/ollama.jsonnet b/templates/components/ollama.jsonnet index a6cddcef..e175fe1a 100644 --- a/templates/components/ollama.jsonnet +++ b/templates/components/ollama.jsonnet @@ -3,8 +3,11 @@ local images = import "values/images.jsonnet"; local url = import "values/url.jsonnet"; local prompts = import "prompts/slm.jsonnet"; { + + "ollama-model":: "gemma2:9b", + "ollama-url":: "${OLLAMA_HOST}", + services +: { - "ollama-model":: "gemma2:9b", "text-completion": base + { image: images.trustgraph, @@ -15,7 +18,7 @@ local prompts = import "prompts/slm.jsonnet"; "-m", $["ollama-model"], "-r", - "${OLLAMA_HOST}", + $["ollama-url"], ], deploy: { resources: { @@ -40,7 +43,7 @@ local prompts = import "prompts/slm.jsonnet"; "-m", $["ollama-model"], "-r", - "${OLLAMA_HOST}", + $["ollama-url"], "-i", "non-persistent://tg/request/text-completion-rag", "-o", diff --git a/templates/components/qdrant.jsonnet b/templates/components/qdrant.jsonnet index d92449b7..b0070e8c 100644 --- a/templates/components/qdrant.jsonnet +++ b/templates/components/qdrant.jsonnet @@ -53,9 +53,7 @@ qdrant + { }, }, -/* - -// Document embeddings writer & query service. Not currently enabled. + // Document embeddings writer & query service. "store-doc-embeddings": base + { image: images.trustgraph, @@ -103,8 +101,6 @@ qdrant + { }, }, -*/ - } } diff --git a/templates/components/trustgraph.jsonnet b/templates/components/trustgraph.jsonnet index fcda055a..d0815983 100644 --- a/templates/components/trustgraph.jsonnet +++ b/templates/components/trustgraph.jsonnet @@ -7,10 +7,6 @@ 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 +: { @@ -81,102 +77,6 @@ local prompts = import "prompt-template.jsonnet"; }, }, - embeddings: base + { - image: images.trustgraph, - command: [ - "embeddings-hf", - "-p", - url.pulsar, - "-m", - $["embeddings-model"], - ], - deploy: { - resources: { - limits: { - cpus: '1.0', - memory: '256M' - }, - reservations: { - cpus: '0.5', - memory: '256M' - } - } - }, - }, - - "kg-extract-definitions": base + { - image: images.trustgraph, - command: [ - "kg-extract-definitions", - "-p", - url.pulsar, - ], - deploy: { - resources: { - limits: { - cpus: '0.5', - memory: '128M' - }, - reservations: { - cpus: '0.1', - memory: '128M' - } - } - }, - }, - - "kg-extract-relationships": base + { - image: images.trustgraph, - command: [ - "kg-extract-relationships", - "-p", - url.pulsar, - ], - deploy: { - resources: { - limits: { - cpus: '0.5', - memory: '128M' - }, - reservations: { - cpus: '0.1', - memory: '128M' - } - } - }, - }, - - "graph-rag": base + { - image: images.trustgraph, - command: [ - "graph-rag", - "-p", - url.pulsar, - "--prompt-request-queue", - "non-persistent://tg/request/prompt-rag", - "--prompt-response-queue", - "non-persistent://tg/response/prompt-rag-response", - "--entity-limit", - std.toString($["graph-rag-entity-limit"]), - "--triple-limit", - std.toString($["graph-rag-triple-limit"]), - "--max-subgraph-size", - std.toString($["graph-rag-max-subgraph-size"]), - ], - deploy: { - resources: { - limits: { - cpus: '0.5', - memory: '128M' - }, - reservations: { - cpus: '0.1', - memory: '128M' - } - } - }, - }, - } } + prompts diff --git a/templates/config-loader.jsonnet b/templates/config-loader.jsonnet index e88bf783..79fe1f91 100644 --- a/templates/config-loader.jsonnet +++ b/templates/config-loader.jsonnet @@ -3,9 +3,13 @@ local components = { "bedrock": import "components/bedrock.jsonnet", "claude": import "components/claude.jsonnet", "cohere": import "components/cohere.jsonnet", + "document-rag": import "components/document-rag.jsonnet", + "embeddings-hf": import "components/embeddings-hf.jsonnet", + "embeddings-ollama": import "components/embeddings-ollama.jsonnet", "grafana": import "components/grafana.jsonnet", - "graph-rag-cassandra": import "components/cassandra.jsonnet", - "graph-rag-neo4j": import "components/neo4j.jsonnet", + "graph-rag": import "components/graph-rag.jsonnet", + "triple-store-cassandra": import "components/cassandra.jsonnet", + "triple-store-neo4j": import "components/neo4j.jsonnet", "ollama": import "components/ollama.jsonnet", "openai": import "components/openai.jsonnet", "override-recursive-chunker": import "components/chunker-recursive.jsonnet", diff --git a/templates/main.jsonnet b/templates/main.jsonnet index 24773618..3e0cbc88 100644 --- a/templates/main.jsonnet +++ b/templates/main.jsonnet @@ -14,6 +14,10 @@ local components = { openai: import "components/openai.jsonnet", mix: import "components/mix.jsonnet", vertexai: import "components/vertexai.jsonnet", + "embeddings-hf": import "components/embeddings-hf.jsonnet", + "embeddings-ollama": import "components/embeddings-ollama.jsonnet", + "graph-rag": import "components/graph-rag.jsonnet", + "document-rag": import "components/document-rag.jsonnet", }; local options = std.split(std.extVar("options"), ","); diff --git a/templates/patterns/document-rag.jsonnet b/templates/patterns/document-rag.jsonnet new file mode 100644 index 00000000..631c14a5 --- /dev/null +++ b/templates/patterns/document-rag.jsonnet @@ -0,0 +1,14 @@ +{ + pattern: { + name: "document-rag", + icon: "🤝😂", + title: "Add DocumentRAG processing flow", + description: "This pattern adds DocumentRAG components for extracting and querying documents based on document embeddings. You should make sure a vector store is included in your plan.", + requires: ["pulsar", "trustgraph", "llm"], + features: ["document-rag"], + args: [ + ], + category: [ "processing" ], + }, + module: "components/document-rag.jsonnet", +} diff --git a/templates/patterns/embeddings-hf.jsonnet b/templates/patterns/embeddings-hf.jsonnet new file mode 100644 index 00000000..0235dbd1 --- /dev/null +++ b/templates/patterns/embeddings-hf.jsonnet @@ -0,0 +1,26 @@ +{ + pattern: { + name: "embeddings-hf", + icon: "🤖💬", + title: "Add embeddings model which uses HuggingFace models", + description: "This pattern integrates an embeddings model based on HuggingFace sentence-transformer library.", + requires: ["pulsar", "trustgraph"], + features: ["llm"], + args: [ + { + name: "embeddings-model", + label: "Embeddings model", + type: "select", + description: "Embeddings model for sentence analysis", + options: [ + { id: "all-MiniLM-L6-v2", description: "all-MiniLM-L6-v2" }, + { id: "mixedbread-ai/mxbai-embed-large-v1", description: "mxbai-embed-large-v1" }, + ], + default: "all-MiniLM-L6-v2", + required: true, + }, + ], + category: [ "embeddings" ], + }, + module: "components/embeddings-hf.jsonnet", +} diff --git a/templates/patterns/embeddings-ollama.jsonnet b/templates/patterns/embeddings-ollama.jsonnet new file mode 100644 index 00000000..c3ed70a2 --- /dev/null +++ b/templates/patterns/embeddings-ollama.jsonnet @@ -0,0 +1,34 @@ +{ + pattern: { + name: "embeddings-ollama", + icon: "🤖💬", + title: "Add embeddings model hosted on Ollama", + description: "This pattern integrates an embeddings model based on HuggingFace sentence-transformer library.", + requires: ["pulsar", "trustgraph"], + features: ["llm"], + args: [ + { + name: "embeddings-model", + label: "Embeddings model", + type: "select", + description: "Embeddings model for sentence analysis", + options: [ + { id: "mxbai-embed-large", description: "mxbai-embed-large" }, + ], + default: "mxbai-embed-large", + required: true, + }, + { + name: "ollama-url", + label: "URL", + type: "text", + width: 120, + description: "URL of the Ollama service", + default: "http://ollama:11434", + required: true, + }, + ], + category: [ "embeddings" ], + }, + module: "components/embeddings-hf.jsonnet", +} diff --git a/templates/patterns/graph-rag-cassandra.jsonnet b/templates/patterns/graph-rag-cassandra.jsonnet deleted file mode 100644 index e71a3e1c..00000000 --- a/templates/patterns/graph-rag-cassandra.jsonnet +++ /dev/null @@ -1,13 +0,0 @@ -{ - 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: [], - category: ["knowledge-graph"], - }, - module: "components/cassandra.jsonnet", -} diff --git a/templates/patterns/graph-rag-neo4j.jsonnet b/templates/patterns/graph-rag-neo4j.jsonnet deleted file mode 100644 index 16b1b4a9..00000000 --- a/templates/patterns/graph-rag-neo4j.jsonnet +++ /dev/null @@ -1,13 +0,0 @@ -{ - 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: [], - category: [ "knowledge-graph" ], - }, - module: "components/neo4j.jsonnet", -} diff --git a/templates/patterns/graph-rag.jsonnet b/templates/patterns/graph-rag.jsonnet new file mode 100644 index 00000000..5f598006 --- /dev/null +++ b/templates/patterns/graph-rag.jsonnet @@ -0,0 +1,38 @@ +{ + pattern: { + name: "graph-rag", + icon: "🤝😂", + title: "Add GraphRAG processing flow", + description: "This pattern adds GraphRAG components for extracting and querying graph edges. You should make sure a triple store and vector store are included in your plan.", + requires: ["pulsar", "trustgraph", "llm"], + features: ["graph-rag"], + args: [ + { + name: "graph-rag-entity-limit", + label: "GraphRAG entity query limit", + type: "integer", + description: "Limit on entities to fetch from vector store", + default: 50, + required: true, + }, + { + name: "graph-rag-triple-limit", + label: "GraphRAG triple query limit", + type: "integer", + description: "Limit on triples to fetch from triple store", + default: 30, + required: true, + }, + { + name: "graph-rag-max-subgraph-size", + label: "GraphRAG maximum subgraph size", + type: "integer", + description: "Limit on size of subgraph to present to text-completion model", + default: 3000, + required: true, + }, + ], + category: [ "processing" ], + }, + module: "components/trustgraph.jsonnet", +} diff --git a/templates/patterns/llm-ollama.jsonnet b/templates/patterns/llm-ollama.jsonnet index a46b9c57..ea82bbc7 100644 --- a/templates/patterns/llm-ollama.jsonnet +++ b/templates/patterns/llm-ollama.jsonnet @@ -25,6 +25,15 @@ step: 0.05, default: 0.5, }, + { + name: "ollama-url", + label: "URL", + type: "text", + width: 120, + description: "URL of the Ollama service", + default: "http://ollama:11434", + required: true, + }, ], category: [ "llm" ], }, diff --git a/templates/patterns/triple-store-cassandra.jsonnet b/templates/patterns/triple-store-cassandra.jsonnet new file mode 100644 index 00000000..b386b2f5 --- /dev/null +++ b/templates/patterns/triple-store-cassandra.jsonnet @@ -0,0 +1,13 @@ +{ + pattern: { + name: "triple-store-cassandra", + icon: "🖇️🙋‍♀️", + title: "Adds a Cassandra store configured to act as a triple store", + description: "GraphRAG processing needs a triple store. This pattern adds a Cassandra store, along with plumbing so that Cassandra is integrated with GraphRag indexing and querying.", + requires: ["pulsar", "trustgraph"], + features: ["cassandra", "triple-store"], + args: [], + category: ["knowledge-graph"], + }, + module: "components/cassandra.jsonnet", +} diff --git a/templates/patterns/triple-store-neo4j.jsonnet b/templates/patterns/triple-store-neo4j.jsonnet new file mode 100644 index 00000000..b8a93e31 --- /dev/null +++ b/templates/patterns/triple-store-neo4j.jsonnet @@ -0,0 +1,13 @@ +{ + pattern: { + name: "triple-store-neo4j", + icon: "🖇️🙋‍♀️", + title: "Adds a Neo4j store configured to act as a triple store.", + description: "GraphRAG processing needs a triple store. This pattern adds a Cassandra store, along with plumbing so that Cassandra is integrated with GraphRag indexing and querying.", + requires: ["pulsar", "trustgraph"], + features: ["neo4j", "triple-store"], + args: [], + category: [ "knowledge-graph" ], + }, + module: "components/neo4j.jsonnet", +} diff --git a/templates/patterns/trustgraph-base.jsonnet b/templates/patterns/trustgraph-base.jsonnet index d129934e..c7e912f5 100644 --- a/templates/patterns/trustgraph-base.jsonnet +++ b/templates/patterns/trustgraph-base.jsonnet @@ -7,41 +7,6 @@ requires: ["pulsar"], features: ["trustgraph"], args: [ - { - name: "embeddings-model", - label: "Embeddings model", - type: "select", - description: "Embeddings model for sentence analysis", - options: [ - { id: "all-MiniLM-L6-v2", description: "all-MiniLM-L6-v2" }, - ], - default: "all-MiniLM-L6-v2", - required: true, - }, - { - name: "graph-rag-entity-limit", - label: "GraphRAG entity query limit", - type: "integer", - description: "Limit on entities to fetch from vector store", - default: 50, - required: true, - }, - { - name: "graph-rag-triple-limit", - label: "GraphRAG triple query limit", - type: "integer", - description: "Limit on triples to fetch from triple store", - default: 30, - required: true, - }, - { - name: "graph-rag-max-subgraph-size", - label: "GraphRAG maximum subgraph size", - type: "integer", - description: "Limit on size of subgraph to present to text-completion model", - default: 3000, - required: true, - }, ], category: [ "foundation" ], }, diff --git a/tests/test-doc-rag b/tests/test-doc-rag index dfb731f2..718157b6 100755 --- a/tests/test-doc-rag +++ b/tests/test-doc-rag @@ -6,8 +6,7 @@ from trustgraph.clients.document_rag_client import DocumentRagClient rag = DocumentRagClient(pulsar_host="pulsar://localhost:6650") query=""" -This knowledge graph describes the Space Shuttle disaster. -Present 20 facts which are present in the knowledge graph.""" +What was the cause of the space shuttle disaster?""" resp = rag.request(query) diff --git a/tg-launch-azure-cassandra.yaml b/tg-launch-azure-cassandra.yaml index e4040ddb..0786766d 100644 --- a/tg-launch-azure-cassandra.yaml +++ b/tg-launch-azure-cassandra.yaml @@ -33,7 +33,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "embeddings": "command": @@ -50,7 +50,7 @@ "reservations": "cpus": "0.5" "memory": "256M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "grafana": "deploy": @@ -95,7 +95,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "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.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "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.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "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.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "prometheus": "deploy": @@ -217,7 +217,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "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.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "pulsar": "command": "bin/pulsar standalone" @@ -302,6 +302,23 @@ "restart": "on-failure:100" "volumes": - "qdrant:/qdrant/storage" + "query-doc-embeddings": + "command": + - "de-query-qdrant" + - "-p" + - "pulsar://pulsar:6650" + - "-t" + - "http://qdrant:6333" + "deploy": + "resources": + "limits": + "cpus": "0.5" + "memory": "128M" + "reservations": + "cpus": "0.1" + "memory": "128M" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" + "restart": "on-failure:100" "query-graph-embeddings": "command": - "ge-query-qdrant" @@ -317,7 +334,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "query-triples": "command": @@ -334,7 +351,24 @@ "reservations": "cpus": "0.1" "memory": "512M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" + "restart": "on-failure:100" + "store-doc-embeddings": + "command": + - "de-write-qdrant" + - "-p" + - "pulsar://pulsar:6650" + - "-t" + - "http://qdrant:6333" + "deploy": + "resources": + "limits": + "cpus": "0.5" + "memory": "128M" + "reservations": + "cpus": "0.1" + "memory": "128M" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "store-graph-embeddings": "command": @@ -351,7 +385,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "store-triples": "command": @@ -368,7 +402,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "text-completion": "command": @@ -391,7 +425,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "text-completion-rag": "command": @@ -418,7 +452,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "vectorize": "command": @@ -433,7 +467,7 @@ "reservations": "cpus": "0.5" "memory": "512M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "volumes": "cassandra": {} diff --git a/tg-launch-azure-neo4j.yaml b/tg-launch-azure-neo4j.yaml index 8fd788fe..87148cce 100644 --- a/tg-launch-azure-neo4j.yaml +++ b/tg-launch-azure-neo4j.yaml @@ -16,7 +16,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "embeddings": "command": @@ -33,7 +33,7 @@ "reservations": "cpus": "0.5" "memory": "256M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "grafana": "deploy": @@ -78,7 +78,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "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.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "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.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "neo4j": "deploy": @@ -159,7 +159,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "prometheus": "deploy": @@ -218,7 +218,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "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.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "pulsar": "command": "bin/pulsar standalone" @@ -303,6 +303,23 @@ "restart": "on-failure:100" "volumes": - "qdrant:/qdrant/storage" + "query-doc-embeddings": + "command": + - "de-query-qdrant" + - "-p" + - "pulsar://pulsar:6650" + - "-t" + - "http://qdrant:6333" + "deploy": + "resources": + "limits": + "cpus": "0.5" + "memory": "128M" + "reservations": + "cpus": "0.1" + "memory": "128M" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" + "restart": "on-failure:100" "query-graph-embeddings": "command": - "ge-query-qdrant" @@ -318,7 +335,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "query-triples": "command": @@ -335,7 +352,24 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" + "restart": "on-failure:100" + "store-doc-embeddings": + "command": + - "de-write-qdrant" + - "-p" + - "pulsar://pulsar:6650" + - "-t" + - "http://qdrant:6333" + "deploy": + "resources": + "limits": + "cpus": "0.5" + "memory": "128M" + "reservations": + "cpus": "0.1" + "memory": "128M" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "store-graph-embeddings": "command": @@ -352,7 +386,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "store-triples": "command": @@ -369,7 +403,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "text-completion": "command": @@ -392,7 +426,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "text-completion-rag": "command": @@ -419,7 +453,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "vectorize": "command": @@ -434,7 +468,7 @@ "reservations": "cpus": "0.5" "memory": "512M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "volumes": "grafana-storage": {} diff --git a/tg-launch-bedrock-cassandra.yaml b/tg-launch-bedrock-cassandra.yaml index 82f04a74..ba8c78d8 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.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "embeddings": "command": @@ -50,7 +50,7 @@ "reservations": "cpus": "0.5" "memory": "256M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "grafana": "deploy": @@ -95,7 +95,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "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.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "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.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "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.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "prometheus": "deploy": @@ -217,7 +217,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "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.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "pulsar": "command": "bin/pulsar standalone" @@ -302,6 +302,23 @@ "restart": "on-failure:100" "volumes": - "qdrant:/qdrant/storage" + "query-doc-embeddings": + "command": + - "de-query-qdrant" + - "-p" + - "pulsar://pulsar:6650" + - "-t" + - "http://qdrant:6333" + "deploy": + "resources": + "limits": + "cpus": "0.5" + "memory": "128M" + "reservations": + "cpus": "0.1" + "memory": "128M" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" + "restart": "on-failure:100" "query-graph-embeddings": "command": - "ge-query-qdrant" @@ -317,7 +334,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "query-triples": "command": @@ -334,7 +351,24 @@ "reservations": "cpus": "0.1" "memory": "512M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" + "restart": "on-failure:100" + "store-doc-embeddings": + "command": + - "de-write-qdrant" + - "-p" + - "pulsar://pulsar:6650" + - "-t" + - "http://qdrant:6333" + "deploy": + "resources": + "limits": + "cpus": "0.5" + "memory": "128M" + "reservations": + "cpus": "0.1" + "memory": "128M" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "store-graph-embeddings": "command": @@ -351,7 +385,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "store-triples": "command": @@ -368,7 +402,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "text-completion": "command": @@ -395,7 +429,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "text-completion-rag": "command": @@ -426,7 +460,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "vectorize": "command": @@ -441,7 +475,7 @@ "reservations": "cpus": "0.5" "memory": "512M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "volumes": "cassandra": {} diff --git a/tg-launch-bedrock-neo4j.yaml b/tg-launch-bedrock-neo4j.yaml index a8711f42..6455ff66 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.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "embeddings": "command": @@ -33,7 +33,7 @@ "reservations": "cpus": "0.5" "memory": "256M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "grafana": "deploy": @@ -78,7 +78,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "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.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "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.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "neo4j": "deploy": @@ -159,7 +159,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "prometheus": "deploy": @@ -218,7 +218,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "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.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "pulsar": "command": "bin/pulsar standalone" @@ -303,6 +303,23 @@ "restart": "on-failure:100" "volumes": - "qdrant:/qdrant/storage" + "query-doc-embeddings": + "command": + - "de-query-qdrant" + - "-p" + - "pulsar://pulsar:6650" + - "-t" + - "http://qdrant:6333" + "deploy": + "resources": + "limits": + "cpus": "0.5" + "memory": "128M" + "reservations": + "cpus": "0.1" + "memory": "128M" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" + "restart": "on-failure:100" "query-graph-embeddings": "command": - "ge-query-qdrant" @@ -318,7 +335,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "query-triples": "command": @@ -335,7 +352,24 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" + "restart": "on-failure:100" + "store-doc-embeddings": + "command": + - "de-write-qdrant" + - "-p" + - "pulsar://pulsar:6650" + - "-t" + - "http://qdrant:6333" + "deploy": + "resources": + "limits": + "cpus": "0.5" + "memory": "128M" + "reservations": + "cpus": "0.1" + "memory": "128M" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "store-graph-embeddings": "command": @@ -352,7 +386,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "store-triples": "command": @@ -369,7 +403,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "text-completion": "command": @@ -396,7 +430,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "text-completion-rag": "command": @@ -427,7 +461,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "vectorize": "command": @@ -442,7 +476,7 @@ "reservations": "cpus": "0.5" "memory": "512M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "volumes": "grafana-storage": {} diff --git a/tg-launch-claude-cassandra.yaml b/tg-launch-claude-cassandra.yaml index bfb2e0fe..0d484600 100644 --- a/tg-launch-claude-cassandra.yaml +++ b/tg-launch-claude-cassandra.yaml @@ -33,7 +33,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "embeddings": "command": @@ -50,7 +50,7 @@ "reservations": "cpus": "0.5" "memory": "256M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "grafana": "deploy": @@ -95,7 +95,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "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.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "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.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "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.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "prometheus": "deploy": @@ -217,7 +217,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "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.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "pulsar": "command": "bin/pulsar standalone" @@ -302,6 +302,23 @@ "restart": "on-failure:100" "volumes": - "qdrant:/qdrant/storage" + "query-doc-embeddings": + "command": + - "de-query-qdrant" + - "-p" + - "pulsar://pulsar:6650" + - "-t" + - "http://qdrant:6333" + "deploy": + "resources": + "limits": + "cpus": "0.5" + "memory": "128M" + "reservations": + "cpus": "0.1" + "memory": "128M" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" + "restart": "on-failure:100" "query-graph-embeddings": "command": - "ge-query-qdrant" @@ -317,7 +334,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "query-triples": "command": @@ -334,7 +351,24 @@ "reservations": "cpus": "0.1" "memory": "512M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" + "restart": "on-failure:100" + "store-doc-embeddings": + "command": + - "de-write-qdrant" + - "-p" + - "pulsar://pulsar:6650" + - "-t" + - "http://qdrant:6333" + "deploy": + "resources": + "limits": + "cpus": "0.5" + "memory": "128M" + "reservations": + "cpus": "0.1" + "memory": "128M" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "store-graph-embeddings": "command": @@ -351,7 +385,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "store-triples": "command": @@ -368,7 +402,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "text-completion": "command": @@ -389,7 +423,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "text-completion-rag": "command": @@ -414,7 +448,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "vectorize": "command": @@ -429,7 +463,7 @@ "reservations": "cpus": "0.5" "memory": "512M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "volumes": "cassandra": {} diff --git a/tg-launch-claude-neo4j.yaml b/tg-launch-claude-neo4j.yaml index db2a0fe5..3f3be0dc 100644 --- a/tg-launch-claude-neo4j.yaml +++ b/tg-launch-claude-neo4j.yaml @@ -16,7 +16,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "embeddings": "command": @@ -33,7 +33,7 @@ "reservations": "cpus": "0.5" "memory": "256M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "grafana": "deploy": @@ -78,7 +78,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "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.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "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.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "neo4j": "deploy": @@ -159,7 +159,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "prometheus": "deploy": @@ -218,7 +218,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "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.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "pulsar": "command": "bin/pulsar standalone" @@ -303,6 +303,23 @@ "restart": "on-failure:100" "volumes": - "qdrant:/qdrant/storage" + "query-doc-embeddings": + "command": + - "de-query-qdrant" + - "-p" + - "pulsar://pulsar:6650" + - "-t" + - "http://qdrant:6333" + "deploy": + "resources": + "limits": + "cpus": "0.5" + "memory": "128M" + "reservations": + "cpus": "0.1" + "memory": "128M" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" + "restart": "on-failure:100" "query-graph-embeddings": "command": - "ge-query-qdrant" @@ -318,7 +335,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "query-triples": "command": @@ -335,7 +352,24 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" + "restart": "on-failure:100" + "store-doc-embeddings": + "command": + - "de-write-qdrant" + - "-p" + - "pulsar://pulsar:6650" + - "-t" + - "http://qdrant:6333" + "deploy": + "resources": + "limits": + "cpus": "0.5" + "memory": "128M" + "reservations": + "cpus": "0.1" + "memory": "128M" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "store-graph-embeddings": "command": @@ -352,7 +386,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "store-triples": "command": @@ -369,7 +403,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "text-completion": "command": @@ -390,7 +424,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "text-completion-rag": "command": @@ -415,7 +449,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "vectorize": "command": @@ -430,7 +464,7 @@ "reservations": "cpus": "0.5" "memory": "512M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "volumes": "grafana-storage": {} diff --git a/tg-launch-cohere-cassandra.yaml b/tg-launch-cohere-cassandra.yaml index dad0f086..17c3385e 100644 --- a/tg-launch-cohere-cassandra.yaml +++ b/tg-launch-cohere-cassandra.yaml @@ -33,7 +33,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "embeddings": "command": @@ -50,7 +50,7 @@ "reservations": "cpus": "0.5" "memory": "256M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "grafana": "deploy": @@ -95,7 +95,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "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.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "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.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "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.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "prometheus": "deploy": @@ -217,7 +217,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "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.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "pulsar": "command": "bin/pulsar standalone" @@ -302,6 +302,23 @@ "restart": "on-failure:100" "volumes": - "qdrant:/qdrant/storage" + "query-doc-embeddings": + "command": + - "de-query-qdrant" + - "-p" + - "pulsar://pulsar:6650" + - "-t" + - "http://qdrant:6333" + "deploy": + "resources": + "limits": + "cpus": "0.5" + "memory": "128M" + "reservations": + "cpus": "0.1" + "memory": "128M" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" + "restart": "on-failure:100" "query-graph-embeddings": "command": - "ge-query-qdrant" @@ -317,7 +334,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "query-triples": "command": @@ -334,7 +351,24 @@ "reservations": "cpus": "0.1" "memory": "512M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" + "restart": "on-failure:100" + "store-doc-embeddings": + "command": + - "de-write-qdrant" + - "-p" + - "pulsar://pulsar:6650" + - "-t" + - "http://qdrant:6333" + "deploy": + "resources": + "limits": + "cpus": "0.5" + "memory": "128M" + "reservations": + "cpus": "0.1" + "memory": "128M" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "store-graph-embeddings": "command": @@ -351,7 +385,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "store-triples": "command": @@ -368,7 +402,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "text-completion": "command": @@ -387,7 +421,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "text-completion-rag": "command": @@ -410,7 +444,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "vectorize": "command": @@ -425,7 +459,7 @@ "reservations": "cpus": "0.5" "memory": "512M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "volumes": "cassandra": {} diff --git a/tg-launch-cohere-neo4j.yaml b/tg-launch-cohere-neo4j.yaml index a21869d7..ede38cd3 100644 --- a/tg-launch-cohere-neo4j.yaml +++ b/tg-launch-cohere-neo4j.yaml @@ -16,7 +16,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "embeddings": "command": @@ -33,7 +33,7 @@ "reservations": "cpus": "0.5" "memory": "256M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "grafana": "deploy": @@ -78,7 +78,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "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.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "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.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "neo4j": "deploy": @@ -159,7 +159,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "prometheus": "deploy": @@ -218,7 +218,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "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.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "pulsar": "command": "bin/pulsar standalone" @@ -303,6 +303,23 @@ "restart": "on-failure:100" "volumes": - "qdrant:/qdrant/storage" + "query-doc-embeddings": + "command": + - "de-query-qdrant" + - "-p" + - "pulsar://pulsar:6650" + - "-t" + - "http://qdrant:6333" + "deploy": + "resources": + "limits": + "cpus": "0.5" + "memory": "128M" + "reservations": + "cpus": "0.1" + "memory": "128M" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" + "restart": "on-failure:100" "query-graph-embeddings": "command": - "ge-query-qdrant" @@ -318,7 +335,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "query-triples": "command": @@ -335,7 +352,24 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" + "restart": "on-failure:100" + "store-doc-embeddings": + "command": + - "de-write-qdrant" + - "-p" + - "pulsar://pulsar:6650" + - "-t" + - "http://qdrant:6333" + "deploy": + "resources": + "limits": + "cpus": "0.5" + "memory": "128M" + "reservations": + "cpus": "0.1" + "memory": "128M" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "store-graph-embeddings": "command": @@ -352,7 +386,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "store-triples": "command": @@ -369,7 +403,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "text-completion": "command": @@ -388,7 +422,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "text-completion-rag": "command": @@ -411,7 +445,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "vectorize": "command": @@ -426,7 +460,7 @@ "reservations": "cpus": "0.5" "memory": "512M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "volumes": "grafana-storage": {} diff --git a/tg-launch-ollama-cassandra.yaml b/tg-launch-ollama-cassandra.yaml index fdb601c4..d96d19d2 100644 --- a/tg-launch-ollama-cassandra.yaml +++ b/tg-launch-ollama-cassandra.yaml @@ -33,7 +33,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "embeddings": "command": @@ -50,7 +50,7 @@ "reservations": "cpus": "0.5" "memory": "256M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "grafana": "deploy": @@ -95,7 +95,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "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.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "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.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "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.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "prometheus": "deploy": @@ -193,7 +193,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "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.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "pulsar": "command": "bin/pulsar standalone" @@ -254,6 +254,23 @@ "restart": "on-failure:100" "volumes": - "qdrant:/qdrant/storage" + "query-doc-embeddings": + "command": + - "de-query-qdrant" + - "-p" + - "pulsar://pulsar:6650" + - "-t" + - "http://qdrant:6333" + "deploy": + "resources": + "limits": + "cpus": "0.5" + "memory": "128M" + "reservations": + "cpus": "0.1" + "memory": "128M" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" + "restart": "on-failure:100" "query-graph-embeddings": "command": - "ge-query-qdrant" @@ -269,7 +286,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "query-triples": "command": @@ -286,7 +303,24 @@ "reservations": "cpus": "0.1" "memory": "512M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" + "restart": "on-failure:100" + "store-doc-embeddings": + "command": + - "de-write-qdrant" + - "-p" + - "pulsar://pulsar:6650" + - "-t" + - "http://qdrant:6333" + "deploy": + "resources": + "limits": + "cpus": "0.5" + "memory": "128M" + "reservations": + "cpus": "0.1" + "memory": "128M" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "store-graph-embeddings": "command": @@ -303,7 +337,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "store-triples": "command": @@ -320,7 +354,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "text-completion": "command": @@ -339,7 +373,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "text-completion-rag": "command": @@ -362,7 +396,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "vectorize": "command": @@ -377,7 +411,7 @@ "reservations": "cpus": "0.5" "memory": "512M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "volumes": "cassandra": {} diff --git a/tg-launch-ollama-neo4j.yaml b/tg-launch-ollama-neo4j.yaml index 9644b5d6..7d9f7778 100644 --- a/tg-launch-ollama-neo4j.yaml +++ b/tg-launch-ollama-neo4j.yaml @@ -16,7 +16,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "embeddings": "command": @@ -33,7 +33,7 @@ "reservations": "cpus": "0.5" "memory": "256M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "grafana": "deploy": @@ -78,7 +78,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "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.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "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.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "neo4j": "deploy": @@ -159,7 +159,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "prometheus": "deploy": @@ -194,7 +194,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "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.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "pulsar": "command": "bin/pulsar standalone" @@ -255,6 +255,23 @@ "restart": "on-failure:100" "volumes": - "qdrant:/qdrant/storage" + "query-doc-embeddings": + "command": + - "de-query-qdrant" + - "-p" + - "pulsar://pulsar:6650" + - "-t" + - "http://qdrant:6333" + "deploy": + "resources": + "limits": + "cpus": "0.5" + "memory": "128M" + "reservations": + "cpus": "0.1" + "memory": "128M" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" + "restart": "on-failure:100" "query-graph-embeddings": "command": - "ge-query-qdrant" @@ -270,7 +287,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "query-triples": "command": @@ -287,7 +304,24 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" + "restart": "on-failure:100" + "store-doc-embeddings": + "command": + - "de-write-qdrant" + - "-p" + - "pulsar://pulsar:6650" + - "-t" + - "http://qdrant:6333" + "deploy": + "resources": + "limits": + "cpus": "0.5" + "memory": "128M" + "reservations": + "cpus": "0.1" + "memory": "128M" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "store-graph-embeddings": "command": @@ -304,7 +338,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "store-triples": "command": @@ -321,7 +355,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "text-completion": "command": @@ -340,7 +374,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "text-completion-rag": "command": @@ -363,7 +397,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "vectorize": "command": @@ -378,7 +412,7 @@ "reservations": "cpus": "0.5" "memory": "512M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "volumes": "grafana-storage": {} diff --git a/tg-launch-openai-cassandra.yaml b/tg-launch-openai-cassandra.yaml index 4df2ee97..758d8c02 100644 --- a/tg-launch-openai-cassandra.yaml +++ b/tg-launch-openai-cassandra.yaml @@ -33,7 +33,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "embeddings": "command": @@ -50,7 +50,7 @@ "reservations": "cpus": "0.5" "memory": "256M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "grafana": "deploy": @@ -95,7 +95,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "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.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "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.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "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.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "prometheus": "deploy": @@ -217,7 +217,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "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.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "pulsar": "command": "bin/pulsar standalone" @@ -302,6 +302,23 @@ "restart": "on-failure:100" "volumes": - "qdrant:/qdrant/storage" + "query-doc-embeddings": + "command": + - "de-query-qdrant" + - "-p" + - "pulsar://pulsar:6650" + - "-t" + - "http://qdrant:6333" + "deploy": + "resources": + "limits": + "cpus": "0.5" + "memory": "128M" + "reservations": + "cpus": "0.1" + "memory": "128M" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" + "restart": "on-failure:100" "query-graph-embeddings": "command": - "ge-query-qdrant" @@ -317,7 +334,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "query-triples": "command": @@ -334,7 +351,24 @@ "reservations": "cpus": "0.1" "memory": "512M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" + "restart": "on-failure:100" + "store-doc-embeddings": + "command": + - "de-write-qdrant" + - "-p" + - "pulsar://pulsar:6650" + - "-t" + - "http://qdrant:6333" + "deploy": + "resources": + "limits": + "cpus": "0.5" + "memory": "128M" + "reservations": + "cpus": "0.1" + "memory": "128M" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "store-graph-embeddings": "command": @@ -351,7 +385,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "store-triples": "command": @@ -368,7 +402,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "text-completion": "command": @@ -381,6 +415,8 @@ - "4096" - "-t" - "0" + - "-m" + - "GPT-3.5-Turbo" "deploy": "resources": "limits": @@ -389,7 +425,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "text-completion-rag": "command": @@ -402,6 +438,8 @@ - "4096" - "-t" - "0" + - "-m" + - "GPT-3.5-Turbo" - "-i" - "non-persistent://tg/request/text-completion-rag" - "-o" @@ -414,7 +452,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "vectorize": "command": @@ -429,7 +467,7 @@ "reservations": "cpus": "0.5" "memory": "512M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "volumes": "cassandra": {} diff --git a/tg-launch-openai-neo4j.yaml b/tg-launch-openai-neo4j.yaml index 7f8c8cf9..ad8098b3 100644 --- a/tg-launch-openai-neo4j.yaml +++ b/tg-launch-openai-neo4j.yaml @@ -16,7 +16,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "embeddings": "command": @@ -33,7 +33,7 @@ "reservations": "cpus": "0.5" "memory": "256M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "grafana": "deploy": @@ -78,7 +78,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "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.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "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.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "neo4j": "deploy": @@ -159,7 +159,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "prometheus": "deploy": @@ -218,7 +218,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "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.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "pulsar": "command": "bin/pulsar standalone" @@ -303,6 +303,23 @@ "restart": "on-failure:100" "volumes": - "qdrant:/qdrant/storage" + "query-doc-embeddings": + "command": + - "de-query-qdrant" + - "-p" + - "pulsar://pulsar:6650" + - "-t" + - "http://qdrant:6333" + "deploy": + "resources": + "limits": + "cpus": "0.5" + "memory": "128M" + "reservations": + "cpus": "0.1" + "memory": "128M" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" + "restart": "on-failure:100" "query-graph-embeddings": "command": - "ge-query-qdrant" @@ -318,7 +335,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "query-triples": "command": @@ -335,7 +352,24 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" + "restart": "on-failure:100" + "store-doc-embeddings": + "command": + - "de-write-qdrant" + - "-p" + - "pulsar://pulsar:6650" + - "-t" + - "http://qdrant:6333" + "deploy": + "resources": + "limits": + "cpus": "0.5" + "memory": "128M" + "reservations": + "cpus": "0.1" + "memory": "128M" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "store-graph-embeddings": "command": @@ -352,7 +386,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "store-triples": "command": @@ -369,7 +403,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "text-completion": "command": @@ -382,6 +416,8 @@ - "4096" - "-t" - "0" + - "-m" + - "GPT-3.5-Turbo" "deploy": "resources": "limits": @@ -390,7 +426,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "text-completion-rag": "command": @@ -403,6 +439,8 @@ - "4096" - "-t" - "0" + - "-m" + - "GPT-3.5-Turbo" - "-i" - "non-persistent://tg/request/text-completion-rag" - "-o" @@ -415,7 +453,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "vectorize": "command": @@ -430,7 +468,7 @@ "reservations": "cpus": "0.5" "memory": "512M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "volumes": "grafana-storage": {} diff --git a/tg-launch-vertexai-cassandra.yaml b/tg-launch-vertexai-cassandra.yaml index 9f660be3..721648e8 100644 --- a/tg-launch-vertexai-cassandra.yaml +++ b/tg-launch-vertexai-cassandra.yaml @@ -33,7 +33,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "embeddings": "command": @@ -50,7 +50,7 @@ "reservations": "cpus": "0.5" "memory": "256M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "grafana": "deploy": @@ -95,7 +95,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "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.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "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.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "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.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "prometheus": "deploy": @@ -217,7 +217,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "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.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "pulsar": "command": "bin/pulsar standalone" @@ -302,6 +302,23 @@ "restart": "on-failure:100" "volumes": - "qdrant:/qdrant/storage" + "query-doc-embeddings": + "command": + - "de-query-qdrant" + - "-p" + - "pulsar://pulsar:6650" + - "-t" + - "http://qdrant:6333" + "deploy": + "resources": + "limits": + "cpus": "0.5" + "memory": "128M" + "reservations": + "cpus": "0.1" + "memory": "128M" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" + "restart": "on-failure:100" "query-graph-embeddings": "command": - "ge-query-qdrant" @@ -317,7 +334,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "query-triples": "command": @@ -334,7 +351,24 @@ "reservations": "cpus": "0.1" "memory": "512M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" + "restart": "on-failure:100" + "store-doc-embeddings": + "command": + - "de-write-qdrant" + - "-p" + - "pulsar://pulsar:6650" + - "-t" + - "http://qdrant:6333" + "deploy": + "resources": + "limits": + "cpus": "0.5" + "memory": "128M" + "reservations": + "cpus": "0.1" + "memory": "128M" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "store-graph-embeddings": "command": @@ -351,7 +385,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "store-triples": "command": @@ -368,7 +402,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "text-completion": "command": @@ -393,7 +427,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "volumes": - "./vertexai:/vertexai" @@ -424,7 +458,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "volumes": - "./vertexai:/vertexai" @@ -441,7 +475,7 @@ "reservations": "cpus": "0.5" "memory": "512M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "volumes": "cassandra": {} diff --git a/tg-launch-vertexai-neo4j.yaml b/tg-launch-vertexai-neo4j.yaml index 8b9c54e8..c07d8349 100644 --- a/tg-launch-vertexai-neo4j.yaml +++ b/tg-launch-vertexai-neo4j.yaml @@ -16,7 +16,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "embeddings": "command": @@ -33,7 +33,7 @@ "reservations": "cpus": "0.5" "memory": "256M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "grafana": "deploy": @@ -78,7 +78,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "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.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "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.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "neo4j": "deploy": @@ -159,7 +159,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "prometheus": "deploy": @@ -218,7 +218,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "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.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "pulsar": "command": "bin/pulsar standalone" @@ -303,6 +303,23 @@ "restart": "on-failure:100" "volumes": - "qdrant:/qdrant/storage" + "query-doc-embeddings": + "command": + - "de-query-qdrant" + - "-p" + - "pulsar://pulsar:6650" + - "-t" + - "http://qdrant:6333" + "deploy": + "resources": + "limits": + "cpus": "0.5" + "memory": "128M" + "reservations": + "cpus": "0.1" + "memory": "128M" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" + "restart": "on-failure:100" "query-graph-embeddings": "command": - "ge-query-qdrant" @@ -318,7 +335,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "query-triples": "command": @@ -335,7 +352,24 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" + "restart": "on-failure:100" + "store-doc-embeddings": + "command": + - "de-write-qdrant" + - "-p" + - "pulsar://pulsar:6650" + - "-t" + - "http://qdrant:6333" + "deploy": + "resources": + "limits": + "cpus": "0.5" + "memory": "128M" + "reservations": + "cpus": "0.1" + "memory": "128M" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "store-graph-embeddings": "command": @@ -352,7 +386,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "store-triples": "command": @@ -369,7 +403,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "text-completion": "command": @@ -394,7 +428,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "volumes": - "./vertexai:/vertexai" @@ -425,7 +459,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "volumes": - "./vertexai:/vertexai" @@ -442,7 +476,7 @@ "reservations": "cpus": "0.5" "memory": "512M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "volumes": "grafana-storage": {} diff --git a/tg-storage-cassandra.yaml b/tg-storage-cassandra.yaml index 3adb2893..a3f62900 100644 --- a/tg-storage-cassandra.yaml +++ b/tg-storage-cassandra.yaml @@ -106,6 +106,23 @@ "restart": "on-failure:100" "volumes": - "qdrant:/qdrant/storage" + "query-doc-embeddings": + "command": + - "de-query-qdrant" + - "-p" + - "pulsar://pulsar:6650" + - "-t" + - "http://qdrant:6333" + "deploy": + "resources": + "limits": + "cpus": "0.5" + "memory": "128M" + "reservations": + "cpus": "0.1" + "memory": "128M" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" + "restart": "on-failure:100" "query-graph-embeddings": "command": - "ge-query-qdrant" @@ -121,7 +138,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "query-triples": "command": @@ -138,7 +155,24 @@ "reservations": "cpus": "0.1" "memory": "512M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" + "restart": "on-failure:100" + "store-doc-embeddings": + "command": + - "de-write-qdrant" + - "-p" + - "pulsar://pulsar:6650" + - "-t" + - "http://qdrant:6333" + "deploy": + "resources": + "limits": + "cpus": "0.5" + "memory": "128M" + "reservations": + "cpus": "0.1" + "memory": "128M" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "store-graph-embeddings": "command": @@ -155,7 +189,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "store-triples": "command": @@ -172,7 +206,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "volumes": "cassandra": {} diff --git a/tg-storage-neo4j.yaml b/tg-storage-neo4j.yaml index a26adba7..425b98b7 100644 --- a/tg-storage-neo4j.yaml +++ b/tg-storage-neo4j.yaml @@ -107,6 +107,23 @@ "restart": "on-failure:100" "volumes": - "qdrant:/qdrant/storage" + "query-doc-embeddings": + "command": + - "de-query-qdrant" + - "-p" + - "pulsar://pulsar:6650" + - "-t" + - "http://qdrant:6333" + "deploy": + "resources": + "limits": + "cpus": "0.5" + "memory": "128M" + "reservations": + "cpus": "0.1" + "memory": "128M" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" + "restart": "on-failure:100" "query-graph-embeddings": "command": - "ge-query-qdrant" @@ -122,7 +139,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "query-triples": "command": @@ -139,7 +156,24 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" + "restart": "on-failure:100" + "store-doc-embeddings": + "command": + - "de-write-qdrant" + - "-p" + - "pulsar://pulsar:6650" + - "-t" + - "http://qdrant:6333" + "deploy": + "resources": + "limits": + "cpus": "0.5" + "memory": "128M" + "reservations": + "cpus": "0.1" + "memory": "128M" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "store-graph-embeddings": "command": @@ -156,7 +190,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "store-triples": "command": @@ -173,7 +207,7 @@ "reservations": "cpus": "0.1" "memory": "128M" - "image": "docker.io/trustgraph/trustgraph-flow:0.8.1" + "image": "docker.io/trustgraph/trustgraph-flow:0.8.2" "restart": "on-failure:100" "volumes": "grafana-storage": {} diff --git a/trustgraph/query/doc_embeddings/qdrant/__main__.py b/trustgraph/query/doc_embeddings/qdrant/__main__.py new file mode 100755 index 00000000..89684e3e --- /dev/null +++ b/trustgraph/query/doc_embeddings/qdrant/__main__.py @@ -0,0 +1,7 @@ +#!/usr/bin/env python3 + +from . hf import run + +if __name__ == '__main__': + run() + diff --git a/trustgraph/query/doc_embeddings/qdrant/service.py b/trustgraph/query/doc_embeddings/qdrant/service.py new file mode 100755 index 00000000..5cc41437 --- /dev/null +++ b/trustgraph/query/doc_embeddings/qdrant/service.py @@ -0,0 +1,117 @@ + +""" +Document embeddings query service. Input is vector, output is an array +of chunks +""" + +from qdrant_client import QdrantClient +from qdrant_client.models import PointStruct +from qdrant_client.models import Distance, VectorParams +import uuid + +from .... schema import DocumentEmbeddingsRequest, DocumentEmbeddingsResponse +from .... schema import Error, Value +from .... schema import document_embeddings_request_queue +from .... schema import document_embeddings_response_queue +from .... base import ConsumerProducer + +module = ".".join(__name__.split(".")[1:-1]) + +default_input_queue = document_embeddings_request_queue +default_output_queue = document_embeddings_response_queue +default_subscriber = module +default_store_uri = 'http://localhost:6333' + +class Processor(ConsumerProducer): + + def __init__(self, **params): + + input_queue = params.get("input_queue", default_input_queue) + output_queue = params.get("output_queue", default_output_queue) + subscriber = params.get("subscriber", default_subscriber) + store_uri = params.get("store_uri", default_store_uri) + + super(Processor, self).__init__( + **params | { + "input_queue": input_queue, + "output_queue": output_queue, + "subscriber": subscriber, + "input_schema": DocumentEmbeddingsRequest, + "output_schema": DocumentEmbeddingsResponse, + "store_uri": store_uri, + } + ) + + self.client = QdrantClient(url=store_uri) + + def handle(self, msg): + + try: + + v = msg.value() + + # Sender-produced ID + id = msg.properties()["id"] + + print(f"Handling input {id}...", flush=True) + + chunks = [] + + for vec in v.vectors: + + dim = len(vec) + collection = "doc_" + str(dim) + + search_result = self.client.query_points( + collection_name=collection, + query=vec, + limit=v.limit, + with_payload=True, + ).points + + for r in search_result: + ent = r.payload["doc"] + chunks.append(ent) + + print("Send response...", flush=True) + r = DocumentEmbeddingsResponse(documents=chunks, error=None) + self.producer.send(r, properties={"id": id}) + + print("Done.", flush=True) + + except Exception as e: + + print(f"Exception: {e}") + + print("Send error response...", flush=True) + + r = DocumentEmbeddingsResponse( + error=Error( + type = "llm-error", + message = str(e), + ), + documents=None, + ) + + self.producer.send(r, properties={"id": id}) + + self.consumer.acknowledge(msg) + + @staticmethod + def add_args(parser): + + ConsumerProducer.add_args( + parser, default_input_queue, default_subscriber, + default_output_queue, + ) + + parser.add_argument( + '-t', '--store-uri', + default=default_store_uri, + help=f'Milvus store URI (default: {default_store_uri})' + ) + +def run(): + + Processor.start(module, __doc__) + diff --git a/trustgraph/retrieval/document_rag/rag.py b/trustgraph/retrieval/document_rag/rag.py index e26cb86e..4310cdbd 100755 --- a/trustgraph/retrieval/document_rag/rag.py +++ b/trustgraph/retrieval/document_rag/rag.py @@ -29,8 +29,6 @@ class Processor(ConsumerProducer): input_queue = params.get("input_queue", default_input_queue) output_queue = params.get("output_queue", default_output_queue) subscriber = params.get("subscriber", default_subscriber) - entity_limit = params.get("entity_limit", 50) - triple_limit = params.get("triple_limit", 30) pr_request_queue = params.get( "prompt_request_queue", prompt_request_queue ) @@ -105,7 +103,7 @@ class Processor(ConsumerProducer): print("Send error response...", flush=True) - r = GraphRagResponse( + r = DocumentRagResponse( error=Error( type = "llm-error", message = str(e), @@ -125,33 +123,6 @@ class Processor(ConsumerProducer): default_output_queue, ) - parser.add_argument( - '-v', '--vector-store', - default='http://milvus:19530', - help=f'Vector host (default: http://milvus:19530)' - ) - - parser.add_argument( - '-e', '--entity-limit', - type=int, - default=50, - help=f'Entity vector fetch limit (default: 50)' - ) - - parser.add_argument( - '-t', '--triple-limit', - type=int, - default=30, - help=f'Triple query limit, per query (default: 30)' - ) - - parser.add_argument( - '-u', '--max-subgraph-size', - type=int, - default=3000, - help=f'Max subgraph size (default: 3000)' - ) - parser.add_argument( '--prompt-request-queue', default=prompt_request_queue, diff --git a/trustgraph/retrieval/graph_rag/rag.py b/trustgraph/retrieval/graph_rag/rag.py index c155011b..87f8d24f 100755 --- a/trustgraph/retrieval/graph_rag/rag.py +++ b/trustgraph/retrieval/graph_rag/rag.py @@ -142,18 +142,6 @@ class Processor(ConsumerProducer): default_output_queue, ) - parser.add_argument( - '-g', '--graph-hosts', - default='cassandra', - help=f'Graph hosts, comma separated (default: cassandra)' - ) - - parser.add_argument( - '-v', '--vector-store', - default='http://milvus:19530', - help=f'Vector host (default: http://milvus:19530)' - ) - parser.add_argument( '-e', '--entity-limit', type=int, diff --git a/trustgraph/storage/doc_embeddings/qdrant/__init__.py b/trustgraph/storage/doc_embeddings/qdrant/__init__.py new file mode 100644 index 00000000..d891d55f --- /dev/null +++ b/trustgraph/storage/doc_embeddings/qdrant/__init__.py @@ -0,0 +1,3 @@ + +from . write import * + diff --git a/trustgraph/storage/doc_embeddings/qdrant/__main__.py b/trustgraph/storage/doc_embeddings/qdrant/__main__.py new file mode 100644 index 00000000..c05d8c6d --- /dev/null +++ b/trustgraph/storage/doc_embeddings/qdrant/__main__.py @@ -0,0 +1,7 @@ +#!/usr/bin/env python3 + +from . write import run + +if __name__ == '__main__': + run() + diff --git a/trustgraph/storage/doc_embeddings/qdrant/write.py b/trustgraph/storage/doc_embeddings/qdrant/write.py new file mode 100644 index 00000000..f22ae74a --- /dev/null +++ b/trustgraph/storage/doc_embeddings/qdrant/write.py @@ -0,0 +1,104 @@ + +""" +Accepts entity/vector pairs and writes them to a Qdrant store. +""" + +from qdrant_client import QdrantClient +from qdrant_client.models import PointStruct +from qdrant_client.models import Distance, VectorParams +import uuid + +from .... schema import ChunkEmbeddings +from .... schema import chunk_embeddings_ingest_queue +from .... log_level import LogLevel +from .... base import Consumer + +module = ".".join(__name__.split(".")[1:-1]) + +default_input_queue = chunk_embeddings_ingest_queue +default_subscriber = module +default_store_uri = 'http://localhost:6333' + +class Processor(Consumer): + + def __init__(self, **params): + + input_queue = params.get("input_queue", default_input_queue) + subscriber = params.get("subscriber", default_subscriber) + store_uri = params.get("store_uri", default_store_uri) + + super(Processor, self).__init__( + **params | { + "input_queue": input_queue, + "subscriber": subscriber, + "input_schema": ChunkEmbeddings, + "store_uri": store_uri, + } + ) + + self.last_collection = None + self.last_dim = None + + self.client = QdrantClient(url=store_uri) + + def handle(self, msg): + + v = msg.value() + + chunk = v.chunk.decode("utf-8") + + if chunk == "": return + + for vec in v.vectors: + + dim = len(vec) + collection = "doc_" + str(dim) + + if dim != self.last_dim: + + if not self.client.collection_exists(collection): + + try: + self.client.create_collection( + collection_name=collection, + vectors_config=VectorParams( + size=dim, distance=Distance.DOT + ), + ) + except Exception as e: + print("Qdrant collection creation failed") + raise e + + self.last_collection = collection + self.last_dim = dim + + self.client.upsert( + collection_name=collection, + points=[ + PointStruct( + id=str(uuid.uuid4()), + vector=vec, + payload={ + "doc": chunk, + } + ) + ] + ) + + @staticmethod + def add_args(parser): + + Consumer.add_args( + parser, default_input_queue, default_subscriber, + ) + + parser.add_argument( + '-t', '--store-uri', + default=default_store_uri, + help=f'Qdrant store URI (default: {default_store_uri})' + ) + +def run(): + + Processor.start(module, __doc__) +