From 4d05e1e836713b58fc1e01caa1df9d65d88dd83c Mon Sep 17 00:00:00 2001 From: Cyber MacGeddon Date: Wed, 14 Aug 2024 00:43:40 +0100 Subject: [PATCH] Neo4j RAG working in docker compose --- Makefile | 4 +- docker-compose-azure.yaml | 256 ------------------ docker-compose-bedrock.yaml | 30 +- docker-compose-claude.yaml | 30 +- docker-compose-cohere.yaml | 30 +- docker-compose-mix.yaml | 30 +- docker-compose-ollama.yaml | 30 +- docker-compose-openai-neo4j.yaml | 37 +-- docker-compose-openai.yaml | 30 +- docker-compose-vertexai.yaml | 30 +- setup.py | 5 +- templates/components/neo4j.jsonnet | 3 + templates/components/version.jsonnet | 1 - templates/docker-compose-openai-neo4j.jsonnet | 4 +- trustgraph/query/triples/neo4j/service.py | 2 +- trustgraph/storage/triples/neo4j/write.py | 2 +- 16 files changed, 138 insertions(+), 386 deletions(-) delete mode 100644 templates/components/version.jsonnet diff --git a/Makefile b/Makefile index 75ae1308..6951087b 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ # VERSION=$(shell git describe | sed 's/^v//') -VERSION=0.6.0 +VERSION=0.6.1 DOCKER=podman @@ -31,7 +31,7 @@ clean: set-version: # sed -i 's/trustgraph-flow:[0-9]*\.[0-9]*\.[0-9]*/trustgraph-flow:'${VERSION}'/' docker-compose*.yaml - echo '"${VERSION}"' > templates/version.jsonnet + echo '"${VERSION}"' > templates/components/version.jsonnet TEMPLATES=azure bedrock claude cohere mix ollama openai vertexai openai-neo4j DCS=$(foreach template,${TEMPLATES},${template:%=docker-compose-%.yaml}) diff --git a/docker-compose-azure.yaml b/docker-compose-azure.yaml index b1f21c64..e69de29b 100644 --- a/docker-compose-azure.yaml +++ b/docker-compose-azure.yaml @@ -1,256 +0,0 @@ -"services": - "cassandra": - "image": "docker.io/cassandra:4.1.5" - "ports": - - "9042:9042" - "restart": "on-failure:100" - "volumes": - - "cassandra:/var/lib/cassandra" - "chunker": - "command": - - "chunker-recursive" - - "-p" - - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" - "restart": "on-failure:100" - "embeddings": - "command": - - "embeddings-hf" - - "-p" - - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" - "restart": "on-failure:100" - "etcd": - "command": - - "etcd" - - "-advertise-client-urls=http://127.0.0.1:2379" - - "-listen-client-urls" - - "http://0.0.0.0:2379" - - "--data-dir" - - "/etcd" - "environment": - "ETCD_AUTO_COMPACTION_MODE": "revision" - "ETCD_AUTO_COMPACTION_RETENTION": "1000" - "ETCD_QUOTA_BACKEND_BYTES": "4294967296" - "ETCD_SNAPSHOT_COUNT": "50000" - "image": "quay.io/coreos/etcd:v3.5.5" - "ports": - - "2379:2379" - "restart": "on-failure:100" - "volumes": - - "etcd:/etcd" - "grafana": - "environment": - "GF_ORG_NAME": "trustgraph.ai" - "image": "docker.io/grafana/grafana:10.0.0" - "ports": - - "3000:3000" - "restart": "on-failure:100" - "volumes": - - "grafana-storage:/var/lib/grafana" - - "./grafana/dashboard.yml:/etc/grafana/provisioning/dashboards/dashboard.yml" - - "./grafana/datasource.yml:/etc/grafana/provisioning/datasources/datasource.yml" - - "./grafana/dashboard.json:/var/lib/grafana/dashboards/dashboard.json" - "graph-rag": - "command": - - "graph-rag" - - "-p" - - "pulsar://pulsar:6650" - - "--prompt-request-queue" - - "non-persistent://tg/request/prompt-rag" - - "--prompt-response-queue" - - "non-persistent://tg/response/prompt-rag-response" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" - "restart": "on-failure:100" - "init-pulsar": - "command": - - "sh" - - "-c" - - "pulsar-admin --admin-url http://pulsar:8080 tenants create tg && pulsar-admin --admin-url http://pulsar:8080 namespaces create tg/flow && pulsar-admin --admin-url http://pulsar:8080 namespaces create tg/request && pulsar-admin --admin-url http://pulsar:8080 namespaces create tg/response && pulsar-admin --admin-url http://pulsar:8080 namespaces set-retention --size -1 --time 3m tg/response" - "depends_on": - "pulsar": - "condition": "service_started" - "image": "docker.io/apachepulsar/pulsar:3.3.0" - "restart": "on-failure:100" - "kg-extract-definitions": - "command": - - "kg-extract-definitions" - - "-p" - - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" - "restart": "on-failure:100" - "kg-extract-relationships": - "command": - - "kg-extract-relationships" - - "-p" - - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" - "restart": "on-failure:100" - "milvus": - "command": - - "milvus" - - "run" - - "standalone" - "environment": - "ETCD_ENDPOINTS": "etcd:2379" - "MINIO_ADDRESS": "minio:9000" - "image": "docker.io/milvusdb/milvus:v2.4.5" - "ports": - - "9091:9091" - - "19530:19530" - "restart": "on-failure:100" - "volumes": - - "milvus:/var/lib/milvus" - "minio": - "command": - - "minio" - - "server" - - "/minio_data" - - "--console-address" - - ":9001" - "environment": - "MINIO_ROOT_PASSWORD": "minioadmin" - "MINIO_ROOT_USER": "minioadmin" - "image": "docker.io/minio/minio:RELEASE.2024-07-04T14-25-45Z" - "ports": - - "9001:9001" - "restart": "on-failure:100" - "volumes": - - "minio-data:/minio_data" - "pdf-decoder": - "command": - - "pdf-decoder" - - "-p" - - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" - "restart": "on-failure:100" - "prometheus": - "image": "docker.io/prom/prometheus:v2.53.1" - "ports": - - "9090:9090" - "restart": "on-failure:100" - "volumes": - - "./prometheus:/etc/prometheus" - - "prometheus-data:/prometheus" - "prompt": - "command": - - "prompt-generic" - - "-p" - - "pulsar://pulsar:6650" - - "--text-completion-request-queue" - - "non-persistent://tg/request/text-completion" - - "--text-completion-response-queue" - - "non-persistent://tg/response/text-completion-response" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" - "restart": "on-failure:100" - "prompt-rag": - "command": - - "prompt-generic" - - "-p" - - "pulsar://pulsar:6650" - - "-i" - - "non-persistent://tg/request/prompt-rag" - - "-o" - - "non-persistent://tg/response/prompt-rag-response" - - "--text-completion-request-queue" - - "non-persistent://tg/request/text-completion-rag" - - "--text-completion-response-queue" - - "non-persistent://tg/response/text-completion-rag-response" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" - "restart": "on-failure:100" - "pulsar": - "command": "bin/pulsar standalone" - "image": "docker.io/apachepulsar/pulsar:3.3.0" - "ports": - - "6650:6650" - - "8080:8080" - "restart": "on-failure:100" - "volumes": - - "pulsar-conf:/pulsar/conf" - - "pulsar-data:/pulsar/data" - "pulsar-manager": - "environment": - "SPRING_CONFIGURATION_FILE": "/pulsar-manager/pulsar-manager/application.properties" - "image": "docker.io/apachepulsar/pulsar-manager:v0.3.0" - "ports": - - "9527:9527" - - "7750:7750" - "restart": "on-failure:100" - "query-graph-embeddings": - "command": - - "ge-query-milvus" - - "-p" - - "pulsar://pulsar:6650" - - "-t" - - "http://milvus:19530" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" - "restart": "on-failure:100" - "query-triples": - "command": - - "triples-query-cassandra" - - "-p" - - "pulsar://pulsar:6650" - - "-g" - - "cassandra" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" - "restart": "on-failure:100" - "store-graph-embeddings": - "command": - - "ge-write-milvus" - - "-p" - - "pulsar://pulsar:6650" - - "-t" - - "http://milvus:19530" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" - "restart": "on-failure:100" - "store-triples": - "command": - - "triples-write-cassandra" - - "-p" - - "pulsar://pulsar:6650" - - "-g" - - "cassandra" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" - "restart": "on-failure:100" - "text-completion": - "command": - - "text-completion-azure" - - "-p" - - "pulsar://pulsar:6650" - - "-k" - - "${AZURE_TOKEN}" - - "-e" - - "${AZURE_ENDPOINT}" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" - "restart": "on-failure:100" - "text-completion-rag": - "command": - - "text-completion-azure" - - "-p" - - "pulsar://pulsar:6650" - - "-k" - - "${AZURE_TOKEN}" - - "-e" - - "${AZURE_ENDPOINT}" - - "-i" - - "non-persistent://tg/request/text-completion-rag" - - "-o" - - "non-persistent://tg/response/text-completion-rag-response" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" - "restart": "on-failure:100" - "vectorize": - "command": - - "embeddings-vectorize" - - "-p" - - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" - "restart": "on-failure:100" -"volumes": - "cassandra": {} - "etcd": {} - "grafana-storage": {} - "milvus": {} - "minio-data": {} - "prometheus-data": {} - "pulsar-conf": {} - "pulsar-data": {} diff --git a/docker-compose-bedrock.yaml b/docker-compose-bedrock.yaml index ab7b82c7..fa6edfa4 100644 --- a/docker-compose-bedrock.yaml +++ b/docker-compose-bedrock.yaml @@ -15,14 +15,14 @@ - "2000" - "--chunk-overlap" - "100" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "embeddings": "command": - "embeddings-hf" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "etcd": "command": @@ -64,7 +64,7 @@ - "non-persistent://tg/request/prompt-rag" - "--prompt-response-queue" - "non-persistent://tg/response/prompt-rag-response" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "init-pulsar": "command": @@ -81,14 +81,14 @@ - "kg-extract-definitions" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "kg-extract-relationships": "command": - "kg-extract-relationships" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "milvus": "command": @@ -126,7 +126,7 @@ - "pdf-decoder" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "prometheus": "image": "docker.io/prom/prometheus:v2.53.1" @@ -145,7 +145,7 @@ - "non-persistent://tg/request/text-completion" - "--text-completion-response-queue" - "non-persistent://tg/response/text-completion-response" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "prompt-rag": "command": @@ -160,7 +160,7 @@ - "non-persistent://tg/request/text-completion-rag" - "--text-completion-response-queue" - "non-persistent://tg/response/text-completion-rag-response" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "pulsar": "command": "bin/pulsar standalone" @@ -187,7 +187,7 @@ - "pulsar://pulsar:6650" - "-t" - "http://milvus:19530" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "query-triples": "command": @@ -196,7 +196,7 @@ - "pulsar://pulsar:6650" - "-g" - "cassandra" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "store-graph-embeddings": "command": @@ -205,7 +205,7 @@ - "pulsar://pulsar:6650" - "-t" - "http://milvus:19530" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "store-triples": "command": @@ -214,7 +214,7 @@ - "pulsar://pulsar:6650" - "-g" - "cassandra" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "text-completion": "command": @@ -227,7 +227,7 @@ - "${AWS_SECRET_KEY}" - "-r" - "us-west-2" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "text-completion-rag": "command": @@ -244,14 +244,14 @@ - "non-persistent://tg/request/text-completion-rag" - "-o" - "non-persistent://tg/response/text-completion-rag-response" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "vectorize": "command": - "embeddings-vectorize" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "volumes": "cassandra": {} diff --git a/docker-compose-claude.yaml b/docker-compose-claude.yaml index a7498f41..635cd368 100644 --- a/docker-compose-claude.yaml +++ b/docker-compose-claude.yaml @@ -11,14 +11,14 @@ - "chunker-recursive" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "embeddings": "command": - "embeddings-hf" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "etcd": "command": @@ -60,7 +60,7 @@ - "non-persistent://tg/request/prompt-rag" - "--prompt-response-queue" - "non-persistent://tg/response/prompt-rag-response" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "init-pulsar": "command": @@ -77,14 +77,14 @@ - "kg-extract-definitions" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "kg-extract-relationships": "command": - "kg-extract-relationships" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "milvus": "command": @@ -122,7 +122,7 @@ - "pdf-decoder" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "prometheus": "image": "docker.io/prom/prometheus:v2.53.1" @@ -141,7 +141,7 @@ - "non-persistent://tg/request/text-completion" - "--text-completion-response-queue" - "non-persistent://tg/response/text-completion-response" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "prompt-rag": "command": @@ -156,7 +156,7 @@ - "non-persistent://tg/request/text-completion-rag" - "--text-completion-response-queue" - "non-persistent://tg/response/text-completion-rag-response" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "pulsar": "command": "bin/pulsar standalone" @@ -183,7 +183,7 @@ - "pulsar://pulsar:6650" - "-t" - "http://milvus:19530" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "query-triples": "command": @@ -192,7 +192,7 @@ - "pulsar://pulsar:6650" - "-g" - "cassandra" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "store-graph-embeddings": "command": @@ -201,7 +201,7 @@ - "pulsar://pulsar:6650" - "-t" - "http://milvus:19530" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "store-triples": "command": @@ -210,7 +210,7 @@ - "pulsar://pulsar:6650" - "-g" - "cassandra" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "text-completion": "command": @@ -219,7 +219,7 @@ - "pulsar://pulsar:6650" - "-k" - "${CLAUDE_KEY}" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "text-completion-rag": "command": @@ -232,14 +232,14 @@ - "non-persistent://tg/request/text-completion-rag" - "-o" - "non-persistent://tg/response/text-completion-rag-response" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "vectorize": "command": - "embeddings-vectorize" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "volumes": "cassandra": {} diff --git a/docker-compose-cohere.yaml b/docker-compose-cohere.yaml index b2d3f4cb..2f01fc0f 100644 --- a/docker-compose-cohere.yaml +++ b/docker-compose-cohere.yaml @@ -15,14 +15,14 @@ - "1000" - "--chunk-overlap" - "50" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "embeddings": "command": - "embeddings-hf" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "etcd": "command": @@ -64,7 +64,7 @@ - "non-persistent://tg/request/prompt-rag" - "--prompt-response-queue" - "non-persistent://tg/response/prompt-rag-response" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "init-pulsar": "command": @@ -81,14 +81,14 @@ - "kg-extract-definitions" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "kg-extract-relationships": "command": - "kg-extract-relationships" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "milvus": "command": @@ -126,7 +126,7 @@ - "pdf-decoder" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "prometheus": "image": "docker.io/prom/prometheus:v2.53.1" @@ -145,7 +145,7 @@ - "non-persistent://tg/request/text-completion" - "--text-completion-response-queue" - "non-persistent://tg/response/text-completion-response" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "prompt-rag": "command": @@ -160,7 +160,7 @@ - "non-persistent://tg/request/text-completion-rag" - "--text-completion-response-queue" - "non-persistent://tg/response/text-completion-rag-response" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "pulsar": "command": "bin/pulsar standalone" @@ -187,7 +187,7 @@ - "pulsar://pulsar:6650" - "-t" - "http://milvus:19530" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "query-triples": "command": @@ -196,7 +196,7 @@ - "pulsar://pulsar:6650" - "-g" - "cassandra" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "store-graph-embeddings": "command": @@ -205,7 +205,7 @@ - "pulsar://pulsar:6650" - "-t" - "http://milvus:19530" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "store-triples": "command": @@ -214,7 +214,7 @@ - "pulsar://pulsar:6650" - "-g" - "cassandra" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "text-completion": "command": @@ -223,7 +223,7 @@ - "pulsar://pulsar:6650" - "-k" - "${COHERE_KEY}" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "text-completion-rag": "command": @@ -236,14 +236,14 @@ - "non-persistent://tg/request/text-completion-rag" - "-o" - "non-persistent://tg/response/text-completion-rag-response" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "vectorize": "command": - "embeddings-vectorize" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "volumes": "cassandra": {} diff --git a/docker-compose-mix.yaml b/docker-compose-mix.yaml index 7090b1ad..0bcd76ad 100644 --- a/docker-compose-mix.yaml +++ b/docker-compose-mix.yaml @@ -15,14 +15,14 @@ - "4000" - "--chunk-overlap" - "120" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "embeddings": "command": - "embeddings-hf" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "etcd": "command": @@ -64,7 +64,7 @@ - "non-persistent://tg/request/prompt-rag" - "--prompt-response-queue" - "non-persistent://tg/response/prompt-rag-response" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "init-pulsar": "command": @@ -81,14 +81,14 @@ - "kg-extract-definitions" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "kg-extract-relationships": "command": - "kg-extract-relationships" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "milvus": "command": @@ -126,7 +126,7 @@ - "pdf-decoder" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "prometheus": "image": "docker.io/prom/prometheus:v2.53.1" @@ -145,7 +145,7 @@ - "non-persistent://tg/request/text-completion" - "--text-completion-response-queue" - "non-persistent://tg/response/text-completion-response" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "prompt-rag": "command": @@ -160,7 +160,7 @@ - "non-persistent://tg/request/text-completion-rag" - "--text-completion-response-queue" - "non-persistent://tg/response/text-completion-rag-response" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "pulsar": "command": "bin/pulsar standalone" @@ -187,7 +187,7 @@ - "pulsar://pulsar:6650" - "-t" - "http://milvus:19530" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "query-triples": "command": @@ -196,7 +196,7 @@ - "pulsar://pulsar:6650" - "-g" - "cassandra" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "store-graph-embeddings": "command": @@ -205,7 +205,7 @@ - "pulsar://pulsar:6650" - "-t" - "http://milvus:19530" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "store-triples": "command": @@ -214,7 +214,7 @@ - "pulsar://pulsar:6650" - "-g" - "cassandra" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "text-completion": "command": @@ -225,7 +225,7 @@ - "${COHERE_KEY}" - "-m" - "c4ai-aya-23-35b" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "text-completion-rag": "command": @@ -240,14 +240,14 @@ - "non-persistent://tg/response/text-completion-rag-response" - "-m" - "c4ai-aya-23-8b" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "vectorize": "command": - "embeddings-vectorize" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "volumes": "cassandra": {} diff --git a/docker-compose-ollama.yaml b/docker-compose-ollama.yaml index dc7abf9e..3450c875 100644 --- a/docker-compose-ollama.yaml +++ b/docker-compose-ollama.yaml @@ -11,14 +11,14 @@ - "chunker-recursive" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "embeddings": "command": - "embeddings-hf" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "etcd": "command": @@ -60,7 +60,7 @@ - "non-persistent://tg/request/prompt-rag" - "--prompt-response-queue" - "non-persistent://tg/response/prompt-rag-response" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "init-pulsar": "command": @@ -77,14 +77,14 @@ - "kg-extract-definitions" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "kg-extract-relationships": "command": - "kg-extract-relationships" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "milvus": "command": @@ -122,7 +122,7 @@ - "pdf-decoder" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "prometheus": "image": "docker.io/prom/prometheus:v2.53.1" @@ -141,7 +141,7 @@ - "non-persistent://tg/request/text-completion" - "--text-completion-response-queue" - "non-persistent://tg/response/text-completion-response" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "prompt-rag": "command": @@ -156,7 +156,7 @@ - "non-persistent://tg/request/text-completion-rag" - "--text-completion-response-queue" - "non-persistent://tg/response/text-completion-rag-response" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "pulsar": "command": "bin/pulsar standalone" @@ -183,7 +183,7 @@ - "pulsar://pulsar:6650" - "-t" - "http://milvus:19530" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "query-triples": "command": @@ -192,7 +192,7 @@ - "pulsar://pulsar:6650" - "-g" - "cassandra" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "store-graph-embeddings": "command": @@ -201,7 +201,7 @@ - "pulsar://pulsar:6650" - "-t" - "http://milvus:19530" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "store-triples": "command": @@ -210,7 +210,7 @@ - "pulsar://pulsar:6650" - "-g" - "cassandra" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "text-completion": "command": @@ -219,7 +219,7 @@ - "pulsar://pulsar:6650" - "-r" - "${OLLAMA_HOST}" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "text-completion-rag": "command": @@ -232,14 +232,14 @@ - "non-persistent://tg/request/text-completion-rag" - "-o" - "non-persistent://tg/response/text-completion-rag-response" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "vectorize": "command": - "embeddings-vectorize" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "volumes": "cassandra": {} diff --git a/docker-compose-openai-neo4j.yaml b/docker-compose-openai-neo4j.yaml index 9f2459c7..7b901c1e 100644 --- a/docker-compose-openai-neo4j.yaml +++ b/docker-compose-openai-neo4j.yaml @@ -4,14 +4,14 @@ - "chunker-recursive" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "embeddings": "command": - "embeddings-hf" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "etcd": "command": @@ -53,7 +53,7 @@ - "non-persistent://tg/request/prompt-rag" - "--prompt-response-queue" - "non-persistent://tg/response/prompt-rag-response" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "init-pulsar": "command": @@ -70,14 +70,14 @@ - "kg-extract-definitions" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "kg-extract-relationships": "command": - "kg-extract-relationships" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "milvus": "command": @@ -113,6 +113,9 @@ "neo4j": "environment": "NEO4J_AUTH": "neo4j/password" + "NEO4J_server_bolt_listen__address": "0.0.0.0:7687" + "NEO4J_server_default__listen__address": "0.0.0.0" + "NEO4J_server_http_listen__address": "0.0.0.0:7474" "image": "docker.io/neo4j:5.22.0-community-bullseye" "ports": - "7474:7474" @@ -125,7 +128,7 @@ - "pdf-decoder" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "prometheus": "image": "docker.io/prom/prometheus:v2.53.1" @@ -144,7 +147,7 @@ - "non-persistent://tg/request/text-completion" - "--text-completion-response-queue" - "non-persistent://tg/response/text-completion-response" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "prompt-rag": "command": @@ -159,7 +162,7 @@ - "non-persistent://tg/request/text-completion-rag" - "--text-completion-response-queue" - "non-persistent://tg/response/text-completion-rag-response" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "pulsar": "command": "bin/pulsar standalone" @@ -186,7 +189,7 @@ - "pulsar://pulsar:6650" - "-t" - "http://milvus:19530" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "query-triples": "command": @@ -194,8 +197,8 @@ - "-p" - "pulsar://pulsar:6650" - "-g" - - "http://neo4j:7474" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + - "bolt://neo4j:7687" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "store-graph-embeddings": "command": @@ -204,7 +207,7 @@ - "pulsar://pulsar:6650" - "-t" - "http://milvus:19530" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "store-triples": "command": @@ -212,8 +215,8 @@ - "-p" - "pulsar://pulsar:6650" - "-g" - - "http://neo4j:7474" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + - "bolt://neo4j:7687" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "text-completion": "command": @@ -222,7 +225,7 @@ - "pulsar://pulsar:6650" - "-k" - "${OPENAI_KEY}" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "text-completion-rag": "command": @@ -235,14 +238,14 @@ - "non-persistent://tg/request/text-completion-rag" - "-o" - "non-persistent://tg/response/text-completion-rag-response" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "vectorize": "command": - "embeddings-vectorize" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "volumes": "etcd": {} diff --git a/docker-compose-openai.yaml b/docker-compose-openai.yaml index 56c1d869..8a6e03ee 100644 --- a/docker-compose-openai.yaml +++ b/docker-compose-openai.yaml @@ -11,14 +11,14 @@ - "chunker-recursive" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "embeddings": "command": - "embeddings-hf" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "etcd": "command": @@ -60,7 +60,7 @@ - "non-persistent://tg/request/prompt-rag" - "--prompt-response-queue" - "non-persistent://tg/response/prompt-rag-response" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "init-pulsar": "command": @@ -77,14 +77,14 @@ - "kg-extract-definitions" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "kg-extract-relationships": "command": - "kg-extract-relationships" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "milvus": "command": @@ -122,7 +122,7 @@ - "pdf-decoder" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "prometheus": "image": "docker.io/prom/prometheus:v2.53.1" @@ -141,7 +141,7 @@ - "non-persistent://tg/request/text-completion" - "--text-completion-response-queue" - "non-persistent://tg/response/text-completion-response" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "prompt-rag": "command": @@ -156,7 +156,7 @@ - "non-persistent://tg/request/text-completion-rag" - "--text-completion-response-queue" - "non-persistent://tg/response/text-completion-rag-response" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "pulsar": "command": "bin/pulsar standalone" @@ -183,7 +183,7 @@ - "pulsar://pulsar:6650" - "-t" - "http://milvus:19530" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "query-triples": "command": @@ -192,7 +192,7 @@ - "pulsar://pulsar:6650" - "-g" - "cassandra" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "store-graph-embeddings": "command": @@ -201,7 +201,7 @@ - "pulsar://pulsar:6650" - "-t" - "http://milvus:19530" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "store-triples": "command": @@ -210,7 +210,7 @@ - "pulsar://pulsar:6650" - "-g" - "cassandra" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "text-completion": "command": @@ -219,7 +219,7 @@ - "pulsar://pulsar:6650" - "-k" - "${OPENAI_KEY}" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "text-completion-rag": "command": @@ -232,14 +232,14 @@ - "non-persistent://tg/request/text-completion-rag" - "-o" - "non-persistent://tg/response/text-completion-rag-response" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "vectorize": "command": - "embeddings-vectorize" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "volumes": "cassandra": {} diff --git a/docker-compose-vertexai.yaml b/docker-compose-vertexai.yaml index 2c468ba9..424e6942 100644 --- a/docker-compose-vertexai.yaml +++ b/docker-compose-vertexai.yaml @@ -11,14 +11,14 @@ - "chunker-recursive" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "embeddings": "command": - "embeddings-hf" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "etcd": "command": @@ -60,7 +60,7 @@ - "non-persistent://tg/request/prompt-rag" - "--prompt-response-queue" - "non-persistent://tg/response/prompt-rag-response" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "init-pulsar": "command": @@ -77,14 +77,14 @@ - "kg-extract-definitions" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "kg-extract-relationships": "command": - "kg-extract-relationships" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "milvus": "command": @@ -122,7 +122,7 @@ - "pdf-decoder" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "prometheus": "image": "docker.io/prom/prometheus:v2.53.1" @@ -141,7 +141,7 @@ - "non-persistent://tg/request/text-completion" - "--text-completion-response-queue" - "non-persistent://tg/response/text-completion-response" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "prompt-rag": "command": @@ -156,7 +156,7 @@ - "non-persistent://tg/request/text-completion-rag" - "--text-completion-response-queue" - "non-persistent://tg/response/text-completion-rag-response" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "pulsar": "command": "bin/pulsar standalone" @@ -183,7 +183,7 @@ - "pulsar://pulsar:6650" - "-t" - "http://milvus:19530" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "query-triples": "command": @@ -192,7 +192,7 @@ - "pulsar://pulsar:6650" - "-g" - "cassandra" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "store-graph-embeddings": "command": @@ -201,7 +201,7 @@ - "pulsar://pulsar:6650" - "-t" - "http://milvus:19530" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "store-triples": "command": @@ -210,7 +210,7 @@ - "pulsar://pulsar:6650" - "-g" - "cassandra" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "text-completion": "command": @@ -221,7 +221,7 @@ - "/vertexai/private.json" - "-r" - "us-west1" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "volumes": - "./vertexai:/vertexai" @@ -238,7 +238,7 @@ - "non-persistent://tg/request/text-completion-rag" - "-o" - "non-persistent://tg/response/text-completion-rag-response" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "volumes": - "./vertexai:/vertexai" @@ -247,7 +247,7 @@ - "embeddings-vectorize" - "-p" - "pulsar://pulsar:6650" - "image": "docker.io/trustgraph/trustgraph-flow:0.6.0" + "image": "docker.io/trustgraph/trustgraph-flow:0.6.1" "restart": "on-failure:100" "volumes": "cassandra": {} diff --git a/setup.py b/setup.py index 41cdf5e3..2963cc61 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.6.0" +version = "0.6.1" setuptools.setup( name="trustgraph", @@ -48,6 +48,7 @@ setuptools.setup( "cohere", "boto3", "openai", + "neo4j", ], scripts=[ "scripts/chunker-recursive", @@ -82,5 +83,7 @@ setuptools.setup( "scripts/triples-dump-parquet", "scripts/triples-query-cassandra", "scripts/triples-write-cassandra", + "scripts/triples-query-neo4j", + "scripts/triples-write-neo4j", ] ) diff --git a/templates/components/neo4j.jsonnet b/templates/components/neo4j.jsonnet index 47f23989..47f42394 100644 --- a/templates/components/neo4j.jsonnet +++ b/templates/components/neo4j.jsonnet @@ -13,6 +13,9 @@ local images = import "images.jsonnet"; ], environment: { NEO4J_AUTH: "neo4j/password", +// NEO4J_server_bolt_listen__address: "0.0.0.0:7687", +// NEO4J_server_default__listen__address: "0.0.0.0", +// NEO4J_server_http_listen__address: "0.0.0.0:7474", }, volumes: [ "neo4j:/data" diff --git a/templates/components/version.jsonnet b/templates/components/version.jsonnet deleted file mode 100644 index 675381e4..00000000 --- a/templates/components/version.jsonnet +++ /dev/null @@ -1 +0,0 @@ -"0.6.0" diff --git a/templates/docker-compose-openai-neo4j.jsonnet b/templates/docker-compose-openai-neo4j.jsonnet index db8c4725..391dcbf9 100644 --- a/templates/docker-compose-openai-neo4j.jsonnet +++ b/templates/docker-compose-openai-neo4j.jsonnet @@ -46,7 +46,7 @@ local config = neo4j + pulsar + milvus + grafana + trustgraph + { "-p", url.pulsar, "-g", - "http://neo4j:7474", + "bolt://neo4j:7687", ], }, @@ -57,7 +57,7 @@ local config = neo4j + pulsar + milvus + grafana + trustgraph + { "-p", url.pulsar, "-g", - "http://neo4j:7474", + "bolt://neo4j:7687", ], } diff --git a/trustgraph/query/triples/neo4j/service.py b/trustgraph/query/triples/neo4j/service.py index c43ad629..5fca61c3 100755 --- a/trustgraph/query/triples/neo4j/service.py +++ b/trustgraph/query/triples/neo4j/service.py @@ -18,7 +18,7 @@ default_input_queue = triples_request_queue default_output_queue = triples_response_queue default_subscriber = module -default_graph_host = 'bolt://localhost:7687' +default_graph_host = 'bolt://neo4j:7687' default_username = 'neo4j' default_password = 'password' diff --git a/trustgraph/storage/triples/neo4j/write.py b/trustgraph/storage/triples/neo4j/write.py index c2ea497d..d20ecdd2 100755 --- a/trustgraph/storage/triples/neo4j/write.py +++ b/trustgraph/storage/triples/neo4j/write.py @@ -21,7 +21,7 @@ module = ".".join(__name__.split(".")[1:-1]) default_input_queue = triples_store_queue default_subscriber = module -default_graph_host = 'bolt://localhost:7687' +default_graph_host = 'bolt://neo4j:7687' default_username = 'neo4j' default_password = 'password'