apunkt/trustgraph
1
0
Fork 0
mirror of https://github.com/trustgraph-ai/trustgraph.git synced 2026-04-25 00:16:23 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

- Change flawed _client timeout logic which was causing major lags

Browse source 
- Moved clients to trustgraph.clients to tidy the parent directory
- Version bump
This commit is contained in:
Cyber MacGeddon 2024-08-20 17:54:11 +01:00
parent bdf4bc2bf5
commit 20f983eec9
34 changed files with 232 additions and 238 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -1,6 +1,6 @@
# VERSION=$(shell git describe | sed 's/^v//')
VERSION=0.6.3
VERSION=0.6.4
DOCKER=podman

30
docker-compose-azure.yaml
View file

@ -11,14 +11,14 @@
- "chunker-recursive"
- "-p"
- "pulsar://pulsar:6650"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"restart": "on-failure:100"
"embeddings":
"command":
- "embeddings-hf"
- "-p"
- "pulsar://pulsar:6650"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"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.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"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.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"restart": "on-failure:100"
"kg-extract-relationships":
"command":
- "kg-extract-relationships"
- "-p"
- "pulsar://pulsar:6650"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"restart": "on-failure:100"
"milvus":
"command":
@ -122,7 +122,7 @@
- "pdf-decoder"
- "-p"
- "pulsar://pulsar:6650"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"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.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"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.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"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.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"restart": "on-failure:100"
"query-triples":
"command":
@ -192,7 +192,7 @@
- "pulsar://pulsar:6650"
- "-g"
- "cassandra"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"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.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"restart": "on-failure:100"
"store-triples":
"command":
@ -210,7 +210,7 @@
- "pulsar://pulsar:6650"
- "-g"
- "cassandra"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"restart": "on-failure:100"
"text-completion":
"command":
@ -221,7 +221,7 @@
- "${AZURE_TOKEN}"
- "-e"
- "${AZURE_ENDPOINT}"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"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.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"restart": "on-failure:100"
"vectorize":
"command":
- "embeddings-vectorize"
- "-p"
- "pulsar://pulsar:6650"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"restart": "on-failure:100"
"volumes":
"cassandra": {}

30
docker-compose-bedrock.yaml
View file

@ -15,14 +15,14 @@
- "2000"
- "--chunk-overlap"
- "100"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"restart": "on-failure:100"
"embeddings":
"command":
- "embeddings-hf"
- "-p"
- "pulsar://pulsar:6650"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"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.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"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.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"restart": "on-failure:100"
"kg-extract-relationships":
"command":
- "kg-extract-relationships"
- "-p"
- "pulsar://pulsar:6650"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"restart": "on-failure:100"
"milvus":
"command":
@ -126,7 +126,7 @@
- "pdf-decoder"
- "-p"
- "pulsar://pulsar:6650"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"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.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"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.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"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.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"restart": "on-failure:100"
"query-triples":
"command":
@ -196,7 +196,7 @@
- "pulsar://pulsar:6650"
- "-g"
- "cassandra"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"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.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"restart": "on-failure:100"
"store-triples":
"command":
@ -214,7 +214,7 @@
- "pulsar://pulsar:6650"
- "-g"
- "cassandra"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"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.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"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.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"restart": "on-failure:100"
"vectorize":
"command":
- "embeddings-vectorize"
- "-p"
- "pulsar://pulsar:6650"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"restart": "on-failure:100"
"volumes":
"cassandra": {}

30
docker-compose-claude.yaml
View file

@ -11,14 +11,14 @@
- "chunker-recursive"
- "-p"
- "pulsar://pulsar:6650"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"restart": "on-failure:100"
"embeddings":
"command":
- "embeddings-hf"
- "-p"
- "pulsar://pulsar:6650"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"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.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"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.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"restart": "on-failure:100"
"kg-extract-relationships":
"command":
- "kg-extract-relationships"
- "-p"
- "pulsar://pulsar:6650"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"restart": "on-failure:100"
"milvus":
"command":
@ -122,7 +122,7 @@
- "pdf-decoder"
- "-p"
- "pulsar://pulsar:6650"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"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.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"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.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"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.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"restart": "on-failure:100"
"query-triples":
"command":
@ -192,7 +192,7 @@
- "pulsar://pulsar:6650"
- "-g"
- "cassandra"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"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.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"restart": "on-failure:100"
"store-triples":
"command":
@ -210,7 +210,7 @@
- "pulsar://pulsar:6650"
- "-g"
- "cassandra"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"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.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"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.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"restart": "on-failure:100"
"vectorize":
"command":
- "embeddings-vectorize"
- "-p"
- "pulsar://pulsar:6650"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"restart": "on-failure:100"
"volumes":
"cassandra": {}

30
docker-compose-cohere.yaml
View file

@ -15,14 +15,14 @@
- "1000"
- "--chunk-overlap"
- "50"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"restart": "on-failure:100"
"embeddings":
"command":
- "embeddings-hf"
- "-p"
- "pulsar://pulsar:6650"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"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.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"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.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"restart": "on-failure:100"
"kg-extract-relationships":
"command":
- "kg-extract-relationships"
- "-p"
- "pulsar://pulsar:6650"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"restart": "on-failure:100"
"milvus":
"command":
@ -126,7 +126,7 @@
- "pdf-decoder"
- "-p"
- "pulsar://pulsar:6650"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"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.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"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.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"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.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"restart": "on-failure:100"
"query-triples":
"command":
@ -196,7 +196,7 @@
- "pulsar://pulsar:6650"
- "-g"
- "cassandra"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"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.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"restart": "on-failure:100"
"store-triples":
"command":
@ -214,7 +214,7 @@
- "pulsar://pulsar:6650"
- "-g"
- "cassandra"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"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.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"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.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"restart": "on-failure:100"
"vectorize":
"command":
- "embeddings-vectorize"
- "-p"
- "pulsar://pulsar:6650"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"restart": "on-failure:100"
"volumes":
"cassandra": {}

30
docker-compose-mix.yaml
View file

@ -15,14 +15,14 @@
- "4000"
- "--chunk-overlap"
- "120"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"restart": "on-failure:100"
"embeddings":
"command":
- "embeddings-hf"
- "-p"
- "pulsar://pulsar:6650"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"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.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"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.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"restart": "on-failure:100"
"kg-extract-relationships":
"command":
- "kg-extract-relationships"
- "-p"
- "pulsar://pulsar:6650"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"restart": "on-failure:100"
"milvus":
"command":
@ -126,7 +126,7 @@
- "pdf-decoder"
- "-p"
- "pulsar://pulsar:6650"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"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.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"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.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"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.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"restart": "on-failure:100"
"query-triples":
"command":
@ -196,7 +196,7 @@
- "pulsar://pulsar:6650"
- "-g"
- "cassandra"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"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.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"restart": "on-failure:100"
"store-triples":
"command":
@ -214,7 +214,7 @@
- "pulsar://pulsar:6650"
- "-g"
- "cassandra"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"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.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"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.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"restart": "on-failure:100"
"vectorize":
"command":
- "embeddings-vectorize"
- "-p"
- "pulsar://pulsar:6650"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"restart": "on-failure:100"
"volumes":
"cassandra": {}

30
docker-compose-ollama.yaml
View file

@ -11,14 +11,14 @@
- "chunker-recursive"
- "-p"
- "pulsar://pulsar:6650"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"restart": "on-failure:100"
"embeddings":
"command":
- "embeddings-hf"
- "-p"
- "pulsar://pulsar:6650"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"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.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"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.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"restart": "on-failure:100"
"kg-extract-relationships":
"command":
- "kg-extract-relationships"
- "-p"
- "pulsar://pulsar:6650"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"restart": "on-failure:100"
"milvus":
"command":
@ -122,7 +122,7 @@
- "pdf-decoder"
- "-p"
- "pulsar://pulsar:6650"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"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.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"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.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"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.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"restart": "on-failure:100"
"query-triples":
"command":
@ -192,7 +192,7 @@
- "pulsar://pulsar:6650"
- "-g"
- "cassandra"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"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.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"restart": "on-failure:100"
"store-triples":
"command":
@ -210,7 +210,7 @@
- "pulsar://pulsar:6650"
- "-g"
- "cassandra"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"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.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"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.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"restart": "on-failure:100"
"vectorize":
"command":
- "embeddings-vectorize"
- "-p"
- "pulsar://pulsar:6650"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"restart": "on-failure:100"
"volumes":
"cassandra": {}

30
docker-compose-openai-neo4j.yaml
View file

@ -4,14 +4,14 @@
- "chunker-recursive"
- "-p"
- "pulsar://pulsar:6650"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"restart": "on-failure:100"
"embeddings":
"command":
- "embeddings-hf"
- "-p"
- "pulsar://pulsar:6650"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"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.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"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.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"restart": "on-failure:100"
"kg-extract-relationships":
"command":
- "kg-extract-relationships"
- "-p"
- "pulsar://pulsar:6650"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"restart": "on-failure:100"
"milvus":
"command":
@ -125,7 +125,7 @@
- "pdf-decoder"
- "-p"
- "pulsar://pulsar:6650"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"restart": "on-failure:100"
"prometheus":
"image": "docker.io/prom/prometheus:v2.53.1"
@ -144,7 +144,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.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"restart": "on-failure:100"
"prompt-rag":
"command":
@ -159,7 +159,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.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"restart": "on-failure:100"
"pulsar":
"command": "bin/pulsar standalone"
@ -186,7 +186,7 @@
- "pulsar://pulsar:6650"
- "-t"
- "http://milvus:19530"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"restart": "on-failure:100"
"query-triples":
"command":
@ -195,7 +195,7 @@
- "pulsar://pulsar:6650"
- "-g"
- "bolt://neo4j:7687"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"restart": "on-failure:100"
"store-graph-embeddings":
"command":
@ -204,7 +204,7 @@
- "pulsar://pulsar:6650"
- "-t"
- "http://milvus:19530"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"restart": "on-failure:100"
"store-triples":
"command":
@ -213,7 +213,7 @@
- "pulsar://pulsar:6650"
- "-g"
- "bolt://neo4j:7687"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"restart": "on-failure:100"
"text-completion":
"command":
@ -222,7 +222,7 @@
- "pulsar://pulsar:6650"
- "-k"
- "${OPENAI_KEY}"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"restart": "on-failure:100"
"text-completion-rag":
"command":
@ -235,14 +235,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.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"restart": "on-failure:100"
"vectorize":
"command":
- "embeddings-vectorize"
- "-p"
- "pulsar://pulsar:6650"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"restart": "on-failure:100"
"volumes":
"etcd": {}

30
docker-compose-openai.yaml
View file

@ -11,14 +11,14 @@
- "chunker-recursive"
- "-p"
- "pulsar://pulsar:6650"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"restart": "on-failure:100"
"embeddings":
"command":
- "embeddings-hf"
- "-p"
- "pulsar://pulsar:6650"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"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.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"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.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"restart": "on-failure:100"
"kg-extract-relationships":
"command":
- "kg-extract-relationships"
- "-p"
- "pulsar://pulsar:6650"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"restart": "on-failure:100"
"milvus":
"command":
@ -122,7 +122,7 @@
- "pdf-decoder"
- "-p"
- "pulsar://pulsar:6650"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"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.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"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.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"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.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"restart": "on-failure:100"
"query-triples":
"command":
@ -192,7 +192,7 @@
- "pulsar://pulsar:6650"
- "-g"
- "cassandra"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"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.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"restart": "on-failure:100"
"store-triples":
"command":
@ -210,7 +210,7 @@
- "pulsar://pulsar:6650"
- "-g"
- "cassandra"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"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.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"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.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"restart": "on-failure:100"
"vectorize":
"command":
- "embeddings-vectorize"
- "-p"
- "pulsar://pulsar:6650"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"restart": "on-failure:100"
"volumes":
"cassandra": {}

30
docker-compose-vertexai.yaml
View file

@ -11,14 +11,14 @@
- "chunker-recursive"
- "-p"
- "pulsar://pulsar:6650"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"restart": "on-failure:100"
"embeddings":
"command":
- "embeddings-hf"
- "-p"
- "pulsar://pulsar:6650"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"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.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"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.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"restart": "on-failure:100"
"kg-extract-relationships":
"command":
- "kg-extract-relationships"
- "-p"
- "pulsar://pulsar:6650"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"restart": "on-failure:100"
"milvus":
"command":
@ -122,7 +122,7 @@
- "pdf-decoder"
- "-p"
- "pulsar://pulsar:6650"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"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.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"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.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"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.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"restart": "on-failure:100"
"query-triples":
"command":
@ -192,7 +192,7 @@
- "pulsar://pulsar:6650"
- "-g"
- "cassandra"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"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.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"restart": "on-failure:100"
"store-triples":
"command":
@ -210,7 +210,7 @@
- "pulsar://pulsar:6650"
- "-g"
- "cassandra"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"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.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"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.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"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.3"
"image": "docker.io/trustgraph/trustgraph-flow:0.6.4"
"restart": "on-failure:100"
"volumes":
"cassandra": {}

2
scripts/graph-show
View file

@ -6,7 +6,7 @@ Connects to the graph query service and dumps all graph edges.
import argparse
import os
from trustgraph.triples_query_client import TriplesQueryClient
from trustgraph.clients.triples_query_client import TriplesQueryClient
default_pulsar_host = os.getenv("PULSAR_HOST", 'pulsar://pulsar:6650')

2
setup.py
View file

@ -4,7 +4,7 @@ import os
with open("README.md", "r") as fh:
long_description = fh.read()
version = "0.6.3"
version = "0.6.4"
setuptools.setup(
name="trustgraph",

2
tests/test-embeddings
View file

@ -1,7 +1,7 @@
#!/usr/bin/env python3
import pulsar
from trustgraph.embeddings_client import EmbeddingsClient
from trustgraph.clients.embeddings_client import EmbeddingsClient
embed = EmbeddingsClient(pulsar_host="pulsar://localhost:6650")

4
tests/test-graph-embeddings
View file

@ -1,8 +1,8 @@
#!/usr/bin/env python3
import pulsar
from trustgraph.graph_embeddings_client import GraphEmbeddingsClient
from trustgraph.embeddings_client import EmbeddingsClient
from trustgraph.clients.graph_embeddings_client import GraphEmbeddingsClient
from trustgraph.clients.embeddings_client import EmbeddingsClient
ec = EmbeddingsClient(pulsar_host="pulsar://localhost:6650")

2
tests/test-graph-rag
View file

@ -1,7 +1,7 @@
#!/usr/bin/env python3
import pulsar
from trustgraph.graph_rag_client import GraphRagClient
from trustgraph.clients.graph_rag_client import GraphRagClient
rag = GraphRagClient(pulsar_host="pulsar://localhost:6650")

2
tests/test-graph-rag2
View file

@ -1,7 +1,7 @@
#!/usr/bin/env python3
import pulsar
from trustgraph.graph_rag_client import GraphRagClient
from trustgraph.clients.graph_rag_client import GraphRagClient
rag = GraphRagClient(pulsar_host="pulsar://localhost:6650")

2
tests/test-lang-definition
View file

@ -1,7 +1,7 @@
#!/usr/bin/env python3
import pulsar
from trustgraph.prompt_client import PromptClient
from trustgraph.clients.prompt_client import PromptClient
p = PromptClient(pulsar_host="pulsar://localhost:6650")

2
tests/test-lang-kg-prompt
View file

@ -1,7 +1,7 @@
#!/usr/bin/env python3
import pulsar
from trustgraph.prompt_client import PromptClient
from trustgraph.clients.prompt_client import PromptClient
p = PromptClient(pulsar_host="pulsar://localhost:6650")

2
tests/test-lang-relationships
View file

@ -1,7 +1,7 @@
#!/usr/bin/env python3
import pulsar
from trustgraph.prompt_client import PromptClient
from trustgraph.clients.prompt_client import PromptClient
p = PromptClient(pulsar_host="pulsar://localhost:6650")

2
tests/test-llm
View file

@ -1,7 +1,7 @@
#!/usr/bin/env python3
import pulsar
from trustgraph.llm_client import LlmClient
from trustgraph.clients.llm_client import LlmClient
llm = LlmClient(pulsar_host="pulsar://localhost:6650")

2
tests/test-triples
View file

@ -1,7 +1,7 @@
#!/usr/bin/env python3
import pulsar
from trustgraph.triples_query_client import TriplesQueryClient
from trustgraph.clients.triples_query_client import TriplesQueryClient
tq = TriplesQueryClient(pulsar_host="pulsar://localhost:6650")

49
trustgraph/base/consumer_producer.py
View file

@ -126,52 +126,3 @@ class ConsumerProducer(BaseProcessor):
help=f'Output queue (default: {default_output_queue})'
)
class Producer(BaseProcessor):
def __init__(self, **params):
output_queue = params.get("output_queue")
output_schema = params.get("output_schema")
if not hasattr(__class__, "output_metric"):
__class__.output_metric = Counter(
'output_count', 'Output items created'
)
if not hasattr(__class__, "pubsub_metric"):
__class__.pubsub_metric = Info(
'pubsub', 'Pub/sub configuration'
)
__class__.pubsub_metric.info({
"output_queue": output_queue,
"output_schema": output_schema.__name__,
})
super(Producer, self).__init__(**params)
if output_schema == None:
raise RuntimeError("output_schema must be specified")
self.producer = self.client.create_producer(
topic=output_queue,
schema=JsonSchema(output_schema),
)
def send(self, msg, properties={}):
self.producer.send(msg, properties)
__class__.output_metric.inc()
@staticmethod
def add_args(
parser, default_input_queue, default_subscriber,
default_output_queue,
):
BaseProcessor.add_args(parser)
parser.add_argument(
'-o', '--output-queue',
default=default_output_queue,
help=f'Output queue (default: {default_output_queue})'
)

0
trustgraph/clients/__init__.py Normal file
View file

17
trustgraph/embeddings_client.py → trustgraph/clients/embeddings_client.py
View file

@ -1,12 +1,12 @@
#!/usr/bin/env python3
import pulsar
import _pulsar
from pulsar.schema import JsonSchema
from . schema import EmbeddingsRequest, EmbeddingsResponse
from . schema import embeddings_request_queue, embeddings_response_queue
from .. schema import EmbeddingsRequest, EmbeddingsResponse
from .. schema import embeddings_request_queue, embeddings_response_queue
import hashlib
import uuid
import time
# Ugly
ERROR=_pulsar.LoggerLevel.Error
@ -60,9 +60,14 @@ class EmbeddingsClient:
)
self.producer.send(r, properties={ "id": id })
while True:
end_time = time.time() + timeout
msg = self.consumer.receive(timeout_millis=timeout * 1000)
while time.time() < end_time:
try:
msg = self.consumer.receive(timeout_millis=5000)
except pulsar.exceptions.Timeout:
continue
mid = msg.properties()["id"]
@ -74,6 +79,8 @@ class EmbeddingsClient:
# Ignore messages with wrong ID
self.consumer.acknowledge(msg)
raise TimeoutError("Timed out waiting for response")
def __del__(self):
if hasattr(self, "consumer"):

19
trustgraph/graph_embeddings_client.py → trustgraph/clients/graph_embeddings_client.py
View file

@ -1,14 +1,14 @@
#!/usr/bin/env python3
import pulsar
import _pulsar
from pulsar.schema import JsonSchema
import hashlib
import uuid
import time
from . schema import GraphEmbeddingsRequest, GraphEmbeddingsResponse
from . schema import graph_embeddings_request_queue
from . schema import graph_embeddings_response_queue
from .. schema import GraphEmbeddingsRequest, GraphEmbeddingsResponse
from .. schema import graph_embeddings_request_queue
from .. schema import graph_embeddings_response_queue
# Ugly
ERROR=_pulsar.LoggerLevel.Error
@ -62,9 +62,14 @@ class GraphEmbeddingsClient:
self.producer.send(r, properties={ "id": id })
while True:
end_time = time.time() + timeout
msg = self.consumer.receive(timeout_millis=timeout * 1000)
while time.time() < end_time:
try:
msg = self.consumer.receive(timeout_millis=5000)
except pulsar.exceptions.Timeout:
continue
mid = msg.properties()["id"]
@ -76,6 +81,8 @@ class GraphEmbeddingsClient:
# Ignore messages with wrong ID
self.consumer.acknowledge(msg)
raise TimeoutError("Timed out waiting for response")
def __del__(self):
if hasattr(self, "consumer"):

17
trustgraph/graph_rag_client.py → trustgraph/clients/graph_rag_client.py
View file

@ -1,13 +1,13 @@
#!/usr/bin/env python3
import pulsar
import _pulsar
from pulsar.schema import JsonSchema
from . schema import GraphRagQuery, GraphRagResponse
from . schema import graph_rag_request_queue, graph_rag_response_queue
from .. schema import GraphRagQuery, GraphRagResponse
from .. schema import graph_rag_request_queue, graph_rag_response_queue
import hashlib
import uuid
import time
# Ugly
ERROR=_pulsar.LoggerLevel.Error
@ -50,9 +50,14 @@ class GraphRagClient:
)
self.producer.send(r, properties={ "id": id })
while True:
end_time = time.time() + timeout
msg = self.consumer.receive(timeout_millis=timeout * 1000)
while time.time() < end_time:
try:
msg = self.consumer.receive(timeout_millis=5000)
except pulsar.exceptions.Timeout:
continue
mid = msg.properties()["id"]
@ -64,6 +69,8 @@ class GraphRagClient:
# Ignore messages with wrong ID
self.consumer.acknowledge(msg)
raise TimeoutError("Timed out waiting for response")
def __del__(self):
if hasattr(self, "consumer"):

19
trustgraph/llm_client.py → trustgraph/clients/llm_client.py
View file

@ -1,14 +1,14 @@
#!/usr/bin/env python3
import pulsar
import _pulsar
from pulsar.schema import JsonSchema
import hashlib
import uuid
import time
from . schema import TextCompletionRequest, TextCompletionResponse
from . schema import text_completion_request_queue
from . schema import text_completion_response_queue
from .. schema import TextCompletionRequest, TextCompletionResponse
from .. schema import text_completion_request_queue
from .. schema import text_completion_response_queue
# Ugly
ERROR=_pulsar.LoggerLevel.Error
@ -59,11 +59,16 @@ class LlmClient:
prompt=prompt
)
end_time = time.time() + timeout
self.producer.send(r, properties={ "id": id })
while True:
while time.time() < end_time:
msg = self.consumer.receive(timeout_millis=timeout * 1000)
try:
msg = self.consumer.receive(timeout_millis=5000)
except pulsar.exceptions.Timeout:
continue
mid = msg.properties()["id"]
@ -75,6 +80,8 @@ class LlmClient:
# Ignore messages with wrong ID
self.consumer.acknowledge(msg)
raise TimeoutError("Timed out waiting for response")
def __del__(self):
if hasattr(self, "consumer"):

19
trustgraph/prompt_client.py → trustgraph/clients/prompt_client.py
View file

@ -1,14 +1,14 @@
#!/usr/bin/env python3
import pulsar
import _pulsar
from pulsar.schema import JsonSchema
import hashlib
import uuid
import time
from . schema import PromptRequest, PromptResponse, Fact
from . schema import prompt_request_queue
from . schema import prompt_response_queue
from .. schema import PromptRequest, PromptResponse, Fact
from .. schema import prompt_request_queue
from .. schema import prompt_response_queue
# Ugly
ERROR=_pulsar.LoggerLevel.Error
@ -62,9 +62,14 @@ class PromptClient:
self.producer.send(r, properties={ "id": id })
while True:
end_time = time.time() + timeout
msg = self.consumer.receive(timeout_millis=timeout * 1000)
while time.time() < end_time:
try:
msg = self.consumer.receive(timeout_millis=5000)
except pulsar.exceptions.Timeout:
continue
mid = msg.properties()["id"]
@ -76,6 +81,8 @@ class PromptClient:
# Ignore messages with wrong ID
self.consumer.acknowledge(msg)
raise TimeoutError("Timed out waiting for response")
def request_relationships(self, chunk, timeout=500):
id = str(uuid.uuid4())

18
trustgraph/triples_query_client.py → trustgraph/clients/triples_query_client.py
View file

@ -5,10 +5,11 @@ import _pulsar
from pulsar.schema import JsonSchema
import hashlib
import uuid
import time
from . schema import TriplesQueryRequest, TriplesQueryResponse, Value
from . schema import triples_request_queue
from . schema import triples_response_queue
from .. schema import TriplesQueryRequest, TriplesQueryResponse, Value
from .. schema import triples_request_queue
from .. schema import triples_response_queue
# Ugly
ERROR=_pulsar.LoggerLevel.Error
@ -73,9 +74,14 @@ class TriplesQueryClient:
self.producer.send(r, properties={ "id": id })
while True:
end_time = time.time() + timeout
msg = self.consumer.receive(timeout_millis=timeout * 1000)
while time.time() < end_time:
try:
msg = self.consumer.receive(timeout_millis=5000)
except pulsar.exceptions.Timeout:
continue
mid = msg.properties()["id"]
@ -87,6 +93,8 @@ class TriplesQueryClient:
# Ignore messages with wrong ID
self.consumer.acknowledge(msg)
raise TimeoutError("Timed out waiting for response")
def __del__(self):
if hasattr(self, "consumer"):

2
trustgraph/embeddings/vectorize/vectorize.py
View file

@ -7,7 +7,7 @@ Input is text chunk, output is chunk and vectors.
from ... schema import Chunk, ChunkEmbeddings
from ... schema import chunk_ingest_queue, chunk_embeddings_ingest_queue
from ... schema import embeddings_request_queue, embeddings_response_queue
from ... embeddings_client import EmbeddingsClient
from ... clients.embeddings_client import EmbeddingsClient
from ... log_level import LogLevel
from ... base import ConsumerProducer

8
trustgraph/graph_rag.py
View file

@ -1,8 +1,8 @@
from . graph_embeddings_client import GraphEmbeddingsClient
from . triples_query_client import TriplesQueryClient
from . embeddings_client import EmbeddingsClient
from . prompt_client import PromptClient
from . clients.graph_embeddings_client import GraphEmbeddingsClient
from . clients.triples_query_client import TriplesQueryClient
from . clients.embeddings_client import EmbeddingsClient
from . clients.prompt_client import PromptClient
from . schema import GraphEmbeddingsRequest, GraphEmbeddingsResponse
from . schema import TriplesQueryRequest, TriplesQueryResponse

2
trustgraph/kg/extract_definitions/extract.py
View file

@ -12,7 +12,7 @@ from ... schema import chunk_embeddings_ingest_queue, triples_store_queue
from ... schema import prompt_request_queue
from ... schema import prompt_response_queue
from ... log_level import LogLevel
from ... prompt_client import PromptClient
from ... clients.prompt_client import PromptClient
from ... rdf import TRUSTGRAPH_ENTITIES, DEFINITION
from ... base import ConsumerProducer

2
trustgraph/kg/extract_relationships/extract.py
View file

@ -15,7 +15,7 @@ from ... schema import graph_embeddings_store_queue
from ... schema import prompt_request_queue
from ... schema import prompt_response_queue
from ... log_level import LogLevel
from ... prompt_client import PromptClient
from ... clients.prompt_client import PromptClient
from ... rdf import RDF_LABEL, TRUSTGRAPH_ENTITIES
from ... base import ConsumerProducer

2
trustgraph/model/prompt/generic/service.py
View file

@ -12,7 +12,7 @@ from .... schema import text_completion_request_queue
from .... schema import text_completion_response_queue
from .... schema import prompt_request_queue, prompt_response_queue
from .... base import ConsumerProducer
from .... llm_client import LlmClient
from .... clients.llm_client import LlmClient
from . prompts import to_definitions, to_relationships, to_kg_query