apunkt/trustgraph
1
0
Fork 0
mirror of https://github.com/trustgraph-ai/trustgraph.git synced 2026-05-01 19:32:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix graph-rag

Browse source
This commit is contained in:
Cyber MacGeddon 2024-07-17 22:10:25 +01:00
parent 816ee2038f
commit 0574eb6177
7 changed files with 44 additions and 45 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=$(shell git describe | sed 's/^v//')
VERSION=0.3.2 VERSION=0.3.3
all: container all: container

20
docker-compose-azure.yaml
View file

@ -91,7 +91,7 @@ services:
restart: on-failure:100 restart: on-failure:100
pdf-decoder: pdf-decoder:
image: docker.io/trustgraph/trustgraph-flow:0.3.1 image: docker.io/trustgraph/trustgraph-flow:0.3.3
command: command:
- "pdf-decoder" - "pdf-decoder"
- "-p" - "-p"
@ -99,7 +99,7 @@ services:
restart: on-failure:100 restart: on-failure:100
chunker: chunker:
image: docker.io/trustgraph/trustgraph-flow:0.3.1 image: docker.io/trustgraph/trustgraph-flow:0.3.3
command: command:
- "chunker-recursive" - "chunker-recursive"
- "-p" - "-p"
@ -107,7 +107,7 @@ services:
restart: on-failure:100 restart: on-failure:100
vectorize: vectorize:
image: docker.io/trustgraph/trustgraph-flow:0.3.1 image: docker.io/trustgraph/trustgraph-flow:0.3.3
command: command:
- "embeddings-vectorize" - "embeddings-vectorize"
- "-p" - "-p"
@ -115,7 +115,7 @@ services:
restart: on-failure:100 restart: on-failure:100
embeddings: embeddings:
image: docker.io/trustgraph/trustgraph-flow:0.3.1 image: docker.io/trustgraph/trustgraph-flow:0.3.3
command: command:
- "embeddings-hf" - "embeddings-hf"
- "-p" - "-p"
@ -123,7 +123,7 @@ services:
restart: on-failure:100 restart: on-failure:100
kg-extract-definitions: kg-extract-definitions:
image: docker.io/trustgraph/trustgraph-flow:0.3.1 image: docker.io/trustgraph/trustgraph-flow:0.3.3
command: command:
- "kg-extract-definitions" - "kg-extract-definitions"
- "-p" - "-p"
@ -131,7 +131,7 @@ services:
restart: on-failure:100 restart: on-failure:100
kg-extract-relationships: kg-extract-relationships:
image: docker.io/trustgraph/trustgraph-flow:0.3.1 image: docker.io/trustgraph/trustgraph-flow:0.3.3
command: command:
- "kg-extract-relationships" - "kg-extract-relationships"
- "-p" - "-p"
@ -139,7 +139,7 @@ services:
restart: on-failure:100 restart: on-failure:100
vector-write: vector-write:
image: docker.io/trustgraph/trustgraph-flow:0.3.1 image: docker.io/trustgraph/trustgraph-flow:0.3.3
command: command:
- "vector-write-milvus" - "vector-write-milvus"
- "-p" - "-p"
@ -149,7 +149,7 @@ services:
restart: on-failure:100 restart: on-failure:100
graph-write: graph-write:
image: docker.io/trustgraph/trustgraph-flow:0.3.1 image: docker.io/trustgraph/trustgraph-flow:0.3.3
command: command:
- "graph-write-cassandra" - "graph-write-cassandra"
- "-p" - "-p"
@ -159,7 +159,7 @@ services:
restart: on-failure:100 restart: on-failure:100
llm: llm:
image: docker.io/trustgraph/trustgraph-flow:0.3.1 image: docker.io/trustgraph/trustgraph-flow:0.3.3
command: command:
- "llm-azure-text" - "llm-azure-text"
- "-p" - "-p"
@ -171,7 +171,7 @@ services:
restart: on-failure:100 restart: on-failure:100
graph-rag: graph-rag:
image: docker.io/trustgraph/trustgraph-flow:0.3.1 image: docker.io/trustgraph/trustgraph-flow:0.3.3
command: command:
- "graph-rag" - "graph-rag"
- "-p" - "-p"

20
docker-compose-claude.yaml
View file

@ -91,7 +91,7 @@ services:
restart: on-failure:100 restart: on-failure:100
pdf-decoder: pdf-decoder:
image: docker.io/trustgraph/trustgraph-flow:0.3.1 image: docker.io/trustgraph/trustgraph-flow:0.3.3
command: command:
- "pdf-decoder" - "pdf-decoder"
- "-p" - "-p"
@ -99,7 +99,7 @@ services:
restart: on-failure:100 restart: on-failure:100
chunker: chunker:
image: docker.io/trustgraph/trustgraph-flow:0.3.1 image: docker.io/trustgraph/trustgraph-flow:0.3.3
command: command:
- "chunker-recursive" - "chunker-recursive"
- "-p" - "-p"
@ -107,7 +107,7 @@ services:
restart: on-failure:100 restart: on-failure:100
vectorize: vectorize:
image: docker.io/trustgraph/trustgraph-flow:0.3.1 image: docker.io/trustgraph/trustgraph-flow:0.3.3
command: command:
- "embeddings-vectorize" - "embeddings-vectorize"
- "-p" - "-p"
@ -115,7 +115,7 @@ services:
restart: on-failure:100 restart: on-failure:100
embeddings: embeddings:
image: docker.io/trustgraph/trustgraph-flow:0.3.1 image: docker.io/trustgraph/trustgraph-flow:0.3.3
command: command:
- "embeddings-hf" - "embeddings-hf"
- "-p" - "-p"
@ -123,7 +123,7 @@ services:
restart: on-failure:100 restart: on-failure:100
kg-extract-definitions: kg-extract-definitions:
image: docker.io/trustgraph/trustgraph-flow:0.3.1 image: docker.io/trustgraph/trustgraph-flow:0.3.3
command: command:
- "kg-extract-definitions" - "kg-extract-definitions"
- "-p" - "-p"
@ -131,7 +131,7 @@ services:
restart: on-failure:100 restart: on-failure:100
kg-extract-relationships: kg-extract-relationships:
image: docker.io/trustgraph/trustgraph-flow:0.3.1 image: docker.io/trustgraph/trustgraph-flow:0.3.3
command: command:
- "kg-extract-relationships" - "kg-extract-relationships"
- "-p" - "-p"
@ -139,7 +139,7 @@ services:
restart: on-failure:100 restart: on-failure:100
vector-write: vector-write:
image: docker.io/trustgraph/trustgraph-flow:0.3.1 image: docker.io/trustgraph/trustgraph-flow:0.3.3
command: command:
- "vector-write-milvus" - "vector-write-milvus"
- "-p" - "-p"
@ -149,7 +149,7 @@ services:
restart: on-failure:100 restart: on-failure:100
graph-write: graph-write:
image: docker.io/trustgraph/trustgraph-flow:0.3.1 image: docker.io/trustgraph/trustgraph-flow:0.3.3
command: command:
- "graph-write-cassandra" - "graph-write-cassandra"
- "-p" - "-p"
@ -159,7 +159,7 @@ services:
restart: on-failure:100 restart: on-failure:100
llm: llm:
image: docker.io/trustgraph/trustgraph-flow:0.3.1 image: docker.io/trustgraph/trustgraph-flow:0.3.3
command: command:
- "llm-claude-text" - "llm-claude-text"
- "-p" - "-p"
@ -169,7 +169,7 @@ services:
restart: on-failure:100 restart: on-failure:100
graph-rag: graph-rag:
image: docker.io/trustgraph/trustgraph-flow:0.3.1 image: docker.io/trustgraph/trustgraph-flow:0.3.3
command: command:
- "graph-rag" - "graph-rag"
- "-p" - "-p"

20
docker-compose-ollama.yaml
View file

@ -91,7 +91,7 @@ services:
restart: on-failure:100 restart: on-failure:100
pdf-decoder: pdf-decoder:
image: docker.io/trustgraph/trustgraph-flow:0.3.1 image: docker.io/trustgraph/trustgraph-flow:0.3.3
command: command:
- "pdf-decoder" - "pdf-decoder"
- "-p" - "-p"
@ -99,7 +99,7 @@ services:
restart: on-failure:100 restart: on-failure:100
chunker: chunker:
image: docker.io/trustgraph/trustgraph-flow:0.3.1 image: docker.io/trustgraph/trustgraph-flow:0.3.3
command: command:
- "chunker-recursive" - "chunker-recursive"
- "-p" - "-p"
@ -107,7 +107,7 @@ services:
restart: on-failure:100 restart: on-failure:100
vectorize: vectorize:
image: docker.io/trustgraph/trustgraph-flow:0.3.1 image: docker.io/trustgraph/trustgraph-flow:0.3.3
command: command:
- "embeddings-vectorize" - "embeddings-vectorize"
- "-p" - "-p"
@ -115,7 +115,7 @@ services:
restart: on-failure:100 restart: on-failure:100
embeddings: embeddings:
image: docker.io/trustgraph/trustgraph-flow:0.3.1 image: docker.io/trustgraph/trustgraph-flow:0.3.3
command: command:
- "embeddings-hf" - "embeddings-hf"
- "-p" - "-p"
@ -125,7 +125,7 @@ services:
restart: on-failure:100 restart: on-failure:100
kg-extract-definitions: kg-extract-definitions:
image: docker.io/trustgraph/trustgraph-flow:0.3.1 image: docker.io/trustgraph/trustgraph-flow:0.3.3
command: command:
- "kg-extract-definitions" - "kg-extract-definitions"
- "-p" - "-p"
@ -133,7 +133,7 @@ services:
restart: on-failure:100 restart: on-failure:100
kg-extract-relationships: kg-extract-relationships:
image: docker.io/trustgraph/trustgraph-flow:0.3.1 image: docker.io/trustgraph/trustgraph-flow:0.3.3
command: command:
- "kg-extract-relationships" - "kg-extract-relationships"
- "-p" - "-p"
@ -141,7 +141,7 @@ services:
restart: on-failure:100 restart: on-failure:100
vector-write: vector-write:
image: docker.io/trustgraph/trustgraph-flow:0.3.1 image: docker.io/trustgraph/trustgraph-flow:0.3.3
command: command:
- "vector-write-milvus" - "vector-write-milvus"
- "-p" - "-p"
@ -151,7 +151,7 @@ services:
restart: on-failure:100 restart: on-failure:100
graph-write: graph-write:
image: docker.io/trustgraph/trustgraph-flow:0.3.1 image: docker.io/trustgraph/trustgraph-flow:0.3.3
command: command:
- "graph-write-cassandra" - "graph-write-cassandra"
- "-p" - "-p"
@ -161,7 +161,7 @@ services:
restart: on-failure:100 restart: on-failure:100
llm: llm:
image: docker.io/trustgraph/trustgraph-flow:0.3.1 image: docker.io/trustgraph/trustgraph-flow:0.3.3
command: command:
- "llm-ollama-text" - "llm-ollama-text"
- "-p" - "-p"
@ -171,7 +171,7 @@ services:
restart: on-failure:100 restart: on-failure:100
graph-rag: graph-rag:
image: docker.io/trustgraph/trustgraph-flow:0.3.1 image: docker.io/trustgraph/trustgraph-flow:0.3.3
command: command:
- "graph-rag" - "graph-rag"
- "-p" - "-p"

20
docker-compose-vertexai.yaml
View file

@ -91,7 +91,7 @@ services:
restart: on-failure:100 restart: on-failure:100
pdf-decoder: pdf-decoder:
image: docker.io/trustgraph/trustgraph-flow:0.3.1 image: docker.io/trustgraph/trustgraph-flow:0.3.3
command: command:
- "pdf-decoder" - "pdf-decoder"
- "-p" - "-p"
@ -99,7 +99,7 @@ services:
restart: on-failure:100 restart: on-failure:100
chunker: chunker:
image: docker.io/trustgraph/trustgraph-flow:0.3.1 image: docker.io/trustgraph/trustgraph-flow:0.3.3
command: command:
- "chunker-recursive" - "chunker-recursive"
- "-p" - "-p"
@ -107,7 +107,7 @@ services:
restart: on-failure:100 restart: on-failure:100
vectorize: vectorize:
image: docker.io/trustgraph/trustgraph-flow:0.3.1 image: docker.io/trustgraph/trustgraph-flow:0.3.3
command: command:
- "embeddings-vectorize" - "embeddings-vectorize"
- "-p" - "-p"
@ -115,7 +115,7 @@ services:
restart: on-failure:100 restart: on-failure:100
embeddings: embeddings:
image: docker.io/trustgraph/trustgraph-flow:0.3.1 image: docker.io/trustgraph/trustgraph-flow:0.3.3
command: command:
- "embeddings-hf" - "embeddings-hf"
- "-p" - "-p"
@ -123,7 +123,7 @@ services:
restart: on-failure:100 restart: on-failure:100
kg-extract-definitions: kg-extract-definitions:
image: docker.io/trustgraph/trustgraph-flow:0.3.1 image: docker.io/trustgraph/trustgraph-flow:0.3.3
command: command:
- "kg-extract-definitions" - "kg-extract-definitions"
- "-p" - "-p"
@ -131,7 +131,7 @@ services:
restart: on-failure:100 restart: on-failure:100
kg-extract-relationships: kg-extract-relationships:
image: docker.io/trustgraph/trustgraph-flow:0.3.1 image: docker.io/trustgraph/trustgraph-flow:0.3.3
command: command:
- "kg-extract-relationships" - "kg-extract-relationships"
- "-p" - "-p"
@ -139,7 +139,7 @@ services:
restart: on-failure:100 restart: on-failure:100
vector-write: vector-write:
image: docker.io/trustgraph/trustgraph-flow:0.3.1 image: docker.io/trustgraph/trustgraph-flow:0.3.3
command: command:
- "vector-write-milvus" - "vector-write-milvus"
- "-p" - "-p"
@ -149,7 +149,7 @@ services:
restart: on-failure:100 restart: on-failure:100
graph-write: graph-write:
image: docker.io/trustgraph/trustgraph-flow:0.3.1 image: docker.io/trustgraph/trustgraph-flow:0.3.3
command: command:
- "graph-write-cassandra" - "graph-write-cassandra"
- "-p" - "-p"
@ -159,7 +159,7 @@ services:
restart: on-failure:100 restart: on-failure:100
llm: llm:
image: docker.io/trustgraph/trustgraph-flow:0.3.1 image: docker.io/trustgraph/trustgraph-flow:0.3.3
command: command:
- "llm-vertexai-text" - "llm-vertexai-text"
- "-p" - "-p"
@ -173,7 +173,7 @@ services:
restart: on-failure:100 restart: on-failure:100
graph-rag: graph-rag:
image: docker.io/trustgraph/trustgraph-flow:0.3.1 image: docker.io/trustgraph/trustgraph-flow:0.3.3
command: command:
- "graph-rag" - "graph-rag"
- "-p" - "-p"

2
setup.py
View file

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

5
trustgraph/rag/graph/rag.py
View file

@ -12,7 +12,7 @@ from ... base import ConsumerProducer
default_input_queue = 'graph-rag-query' default_input_queue = 'graph-rag-query'
default_output_queue = 'graph-rag-response' default_output_queue = 'graph-rag-response'
default_subscriber = 'graph-rag' default_subscriber = 'graph-rag'
default_graph_hosts = [ 'localhost' ] default_graph_hosts = 'localhost'
default_vector_store = 'http://localhost:19530' default_vector_store = 'http://localhost:19530'
class Processor(ConsumerProducer): class Processor(ConsumerProducer):
@ -43,7 +43,7 @@ class Processor(ConsumerProducer):
self.rag = GraphRag( self.rag = GraphRag(
pulsar_host=pulsar_host, pulsar_host=pulsar_host,
graph_hosts=graph_hosts, graph_hosts=graph_hosts.split(","),
vector_store=vector_store, vector_store=vector_store,
verbose=True, verbose=True,
entity_limit=entity_limit, entity_limit=entity_limit,
@ -114,4 +114,3 @@ def run():
Processor.start('graph-rag', __doc__) Processor.start('graph-rag', __doc__)