From 202f4e5298cc3c6a297e8aef83a5545177bf8125 Mon Sep 17 00:00:00 2001 From: Cyber MacGeddon Date: Mon, 22 Jul 2024 19:47:21 +0100 Subject: [PATCH] Fix extract-definitions bug --- Makefile | 2 +- docker-compose-azure.yaml | 20 ++++++++++---------- docker-compose-claude.yaml | 20 ++++++++++---------- docker-compose-ollama.yaml | 20 ++++++++++---------- docker-compose-vertexai.yaml | 20 ++++++++++---------- trustgraph/kg/extract_definitions/extract.py | 2 +- 6 files changed, 42 insertions(+), 42 deletions(-) diff --git a/Makefile b/Makefile index 8fb5e284..aced52c1 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ # VERSION=$(shell git describe | sed 's/^v//') -VERSION=0.4.1 +VERSION=0.4.2 all: container diff --git a/docker-compose-azure.yaml b/docker-compose-azure.yaml index d129f384..f48df808 100644 --- a/docker-compose-azure.yaml +++ b/docker-compose-azure.yaml @@ -119,7 +119,7 @@ services: restart: on-failure:100 pdf-decoder: - image: docker.io/trustgraph/trustgraph-flow:0.4.1 + image: docker.io/trustgraph/trustgraph-flow:0.4.2 command: - "pdf-decoder" - "-p" @@ -127,7 +127,7 @@ services: restart: on-failure:100 chunker: - image: docker.io/trustgraph/trustgraph-flow:0.4.1 + image: docker.io/trustgraph/trustgraph-flow:0.4.2 command: - "chunker-recursive" - "-p" @@ -135,7 +135,7 @@ services: restart: on-failure:100 vectorize: - image: docker.io/trustgraph/trustgraph-flow:0.4.1 + image: docker.io/trustgraph/trustgraph-flow:0.4.2 command: - "embeddings-vectorize" - "-p" @@ -143,7 +143,7 @@ services: restart: on-failure:100 embeddings: - image: docker.io/trustgraph/trustgraph-flow:0.4.1 + image: docker.io/trustgraph/trustgraph-flow:0.4.2 command: - "embeddings-hf" - "-p" @@ -153,7 +153,7 @@ services: restart: on-failure:100 kg-extract-definitions: - image: docker.io/trustgraph/trustgraph-flow:0.4.1 + image: docker.io/trustgraph/trustgraph-flow:0.4.2 command: - "kg-extract-definitions" - "-p" @@ -161,7 +161,7 @@ services: restart: on-failure:100 kg-extract-relationships: - image: docker.io/trustgraph/trustgraph-flow:0.4.1 + image: docker.io/trustgraph/trustgraph-flow:0.4.2 command: - "kg-extract-relationships" - "-p" @@ -169,7 +169,7 @@ services: restart: on-failure:100 vector-write: - image: docker.io/trustgraph/trustgraph-flow:0.4.1 + image: docker.io/trustgraph/trustgraph-flow:0.4.2 command: - "vector-write-milvus" - "-p" @@ -179,7 +179,7 @@ services: restart: on-failure:100 graph-write: - image: docker.io/trustgraph/trustgraph-flow:0.4.1 + image: docker.io/trustgraph/trustgraph-flow:0.4.2 command: - "graph-write-cassandra" - "-p" @@ -189,7 +189,7 @@ services: restart: on-failure:100 llm: - image: docker.io/trustgraph/trustgraph-flow:0.4.1 + image: docker.io/trustgraph/trustgraph-flow:0.4.2 command: - "llm-azure-text" - "-p" @@ -201,7 +201,7 @@ services: restart: on-failure:100 graph-rag: - image: docker.io/trustgraph/trustgraph-flow:0.4.1 + image: docker.io/trustgraph/trustgraph-flow:0.4.2 command: - "graph-rag" - "-p" diff --git a/docker-compose-claude.yaml b/docker-compose-claude.yaml index 40a3809a..fc63ef14 100644 --- a/docker-compose-claude.yaml +++ b/docker-compose-claude.yaml @@ -119,7 +119,7 @@ services: restart: on-failure:100 pdf-decoder: - image: docker.io/trustgraph/trustgraph-flow:0.4.1 + image: docker.io/trustgraph/trustgraph-flow:0.4.2 command: - "pdf-decoder" - "-p" @@ -127,7 +127,7 @@ services: restart: on-failure:100 chunker: - image: docker.io/trustgraph/trustgraph-flow:0.4.1 + image: docker.io/trustgraph/trustgraph-flow:0.4.2 command: - "chunker-recursive" - "-p" @@ -135,7 +135,7 @@ services: restart: on-failure:100 vectorize: - image: docker.io/trustgraph/trustgraph-flow:0.4.1 + image: docker.io/trustgraph/trustgraph-flow:0.4.2 command: - "embeddings-vectorize" - "-p" @@ -143,7 +143,7 @@ services: restart: on-failure:100 embeddings: - image: docker.io/trustgraph/trustgraph-flow:0.4.1 + image: docker.io/trustgraph/trustgraph-flow:0.4.2 command: - "embeddings-hf" - "-p" @@ -153,7 +153,7 @@ services: restart: on-failure:100 kg-extract-definitions: - image: docker.io/trustgraph/trustgraph-flow:0.4.1 + image: docker.io/trustgraph/trustgraph-flow:0.4.2 command: - "kg-extract-definitions" - "-p" @@ -161,7 +161,7 @@ services: restart: on-failure:100 kg-extract-relationships: - image: docker.io/trustgraph/trustgraph-flow:0.4.1 + image: docker.io/trustgraph/trustgraph-flow:0.4.2 command: - "kg-extract-relationships" - "-p" @@ -169,7 +169,7 @@ services: restart: on-failure:100 vector-write: - image: docker.io/trustgraph/trustgraph-flow:0.4.1 + image: docker.io/trustgraph/trustgraph-flow:0.4.2 command: - "vector-write-milvus" - "-p" @@ -179,7 +179,7 @@ services: restart: on-failure:100 graph-write: - image: docker.io/trustgraph/trustgraph-flow:0.4.1 + image: docker.io/trustgraph/trustgraph-flow:0.4.2 command: - "graph-write-cassandra" - "-p" @@ -189,7 +189,7 @@ services: restart: on-failure:100 llm: - image: docker.io/trustgraph/trustgraph-flow:0.4.1 + image: docker.io/trustgraph/trustgraph-flow:0.4.2 command: - "llm-claude-text" - "-p" @@ -199,7 +199,7 @@ services: restart: on-failure:100 graph-rag: - image: docker.io/trustgraph/trustgraph-flow:0.4.1 + image: docker.io/trustgraph/trustgraph-flow:0.4.2 command: - "graph-rag" - "-p" diff --git a/docker-compose-ollama.yaml b/docker-compose-ollama.yaml index 6188e0df..2e66727b 100644 --- a/docker-compose-ollama.yaml +++ b/docker-compose-ollama.yaml @@ -119,7 +119,7 @@ services: restart: on-failure:100 pdf-decoder: - image: docker.io/trustgraph/trustgraph-flow:0.4.1 + image: docker.io/trustgraph/trustgraph-flow:0.4.2 command: - "pdf-decoder" - "-p" @@ -127,7 +127,7 @@ services: restart: on-failure:100 chunker: - image: docker.io/trustgraph/trustgraph-flow:0.4.1 + image: docker.io/trustgraph/trustgraph-flow:0.4.2 command: - "chunker-recursive" - "-p" @@ -135,7 +135,7 @@ services: restart: on-failure:100 vectorize: - image: docker.io/trustgraph/trustgraph-flow:0.4.1 + image: docker.io/trustgraph/trustgraph-flow:0.4.2 command: - "embeddings-vectorize" - "-p" @@ -143,7 +143,7 @@ services: restart: on-failure:100 embeddings: - image: docker.io/trustgraph/trustgraph-flow:0.4.1 + image: docker.io/trustgraph/trustgraph-flow:0.4.2 command: - "embeddings-hf" - "-p" @@ -153,7 +153,7 @@ services: restart: on-failure:100 kg-extract-definitions: - image: docker.io/trustgraph/trustgraph-flow:0.4.1 + image: docker.io/trustgraph/trustgraph-flow:0.4.2 command: - "kg-extract-definitions" - "-p" @@ -161,7 +161,7 @@ services: restart: on-failure:100 kg-extract-relationships: - image: docker.io/trustgraph/trustgraph-flow:0.4.1 + image: docker.io/trustgraph/trustgraph-flow:0.4.2 command: - "kg-extract-relationships" - "-p" @@ -169,7 +169,7 @@ services: restart: on-failure:100 vector-write: - image: docker.io/trustgraph/trustgraph-flow:0.4.1 + image: docker.io/trustgraph/trustgraph-flow:0.4.2 command: - "vector-write-milvus" - "-p" @@ -179,7 +179,7 @@ services: restart: on-failure:100 graph-write: - image: docker.io/trustgraph/trustgraph-flow:0.4.1 + image: docker.io/trustgraph/trustgraph-flow:0.4.2 command: - "graph-write-cassandra" - "-p" @@ -189,7 +189,7 @@ services: restart: on-failure:100 llm: - image: docker.io/trustgraph/trustgraph-flow:0.4.1 + image: docker.io/trustgraph/trustgraph-flow:0.4.2 command: - "llm-ollama-text" - "-p" @@ -199,7 +199,7 @@ services: restart: on-failure:100 graph-rag: - image: docker.io/trustgraph/trustgraph-flow:0.4.1 + image: docker.io/trustgraph/trustgraph-flow:0.4.2 command: - "graph-rag" - "-p" diff --git a/docker-compose-vertexai.yaml b/docker-compose-vertexai.yaml index 0043efe0..2a69ee69 100644 --- a/docker-compose-vertexai.yaml +++ b/docker-compose-vertexai.yaml @@ -119,7 +119,7 @@ services: restart: on-failure:100 pdf-decoder: - image: docker.io/trustgraph/trustgraph-flow:0.4.1 + image: docker.io/trustgraph/trustgraph-flow:0.4.2 command: - "pdf-decoder" - "-p" @@ -127,7 +127,7 @@ services: restart: on-failure:100 chunker: - image: docker.io/trustgraph/trustgraph-flow:0.4.1 + image: docker.io/trustgraph/trustgraph-flow:0.4.2 command: - "chunker-recursive" - "-p" @@ -135,7 +135,7 @@ services: restart: on-failure:100 vectorize: - image: docker.io/trustgraph/trustgraph-flow:0.4.1 + image: docker.io/trustgraph/trustgraph-flow:0.4.2 command: - "embeddings-vectorize" - "-p" @@ -143,7 +143,7 @@ services: restart: on-failure:100 embeddings: - image: docker.io/trustgraph/trustgraph-flow:0.4.1 + image: docker.io/trustgraph/trustgraph-flow:0.4.2 command: - "embeddings-hf" - "-p" @@ -153,7 +153,7 @@ services: restart: on-failure:100 kg-extract-definitions: - image: docker.io/trustgraph/trustgraph-flow:0.4.1 + image: docker.io/trustgraph/trustgraph-flow:0.4.2 command: - "kg-extract-definitions" - "-p" @@ -161,7 +161,7 @@ services: restart: on-failure:100 kg-extract-relationships: - image: docker.io/trustgraph/trustgraph-flow:0.4.1 + image: docker.io/trustgraph/trustgraph-flow:0.4.2 command: - "kg-extract-relationships" - "-p" @@ -169,7 +169,7 @@ services: restart: on-failure:100 vector-write: - image: docker.io/trustgraph/trustgraph-flow:0.4.1 + image: docker.io/trustgraph/trustgraph-flow:0.4.2 command: - "vector-write-milvus" - "-p" @@ -179,7 +179,7 @@ services: restart: on-failure:100 graph-write: - image: docker.io/trustgraph/trustgraph-flow:0.4.1 + image: docker.io/trustgraph/trustgraph-flow:0.4.2 command: - "graph-write-cassandra" - "-p" @@ -189,7 +189,7 @@ services: restart: on-failure:100 llm: - image: docker.io/trustgraph/trustgraph-flow:0.4.1 + image: docker.io/trustgraph/trustgraph-flow:0.4.2 command: - "llm-vertexai-text" - "-p" @@ -203,7 +203,7 @@ services: restart: on-failure:100 graph-rag: - image: docker.io/trustgraph/trustgraph-flow:0.4.1 + image: docker.io/trustgraph/trustgraph-flow:0.4.2 command: - "graph-rag" - "-p" diff --git a/trustgraph/kg/extract_definitions/extract.py b/trustgraph/kg/extract_definitions/extract.py index 9d08470d..3f6bf7b6 100755 --- a/trustgraph/kg/extract_definitions/extract.py +++ b/trustgraph/kg/extract_definitions/extract.py @@ -38,7 +38,7 @@ class Processor(ConsumerProducer): } ) - self.llm = LlmClient(pulsar_host=pulsar_host) + self.llm = LlmClient(pulsar_host=self.pulsar_host) def to_uri(self, text):