From 742fca8e44374d20da07bc0ba908a4fbb178b684 Mon Sep 17 00:00:00 2001 From: Cyber MacGeddon Date: Mon, 15 Jul 2024 19:42:16 +0100 Subject: [PATCH] Up version number --- Makefile | 5 +++-- docker-compose-azure.yaml | 18 +++++++++--------- docker-compose-claude.yaml | 18 +++++++++--------- docker-compose-ollama.yaml | 20 ++++++++++---------- docker-compose-vertexai.yaml | 18 +++++++++--------- processing.yaml | 3 ++- setup.py | 1 + 7 files changed, 43 insertions(+), 40 deletions(-) diff --git a/Makefile b/Makefile index f7fbdc72..c3204439 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ # VERSION=$(shell git describe | sed 's/^v//') -VERSION=0.1.16 +VERSION=0.2.0 all: container @@ -27,4 +27,5 @@ stop: clean: rm -rf wheels/ -# sed -i 's/0.1.15/0.1.16/' docker-compose*.yaml +set-version: + sed -i 's/trustgraph-flow:[0-9]*\.[0-9]*\.[0-9]*/trustgraph-flow:'${VERSION}'/' docker-compose*.yaml diff --git a/docker-compose-azure.yaml b/docker-compose-azure.yaml index 1a86ed9e..a65f7c03 100644 --- a/docker-compose-azure.yaml +++ b/docker-compose-azure.yaml @@ -91,7 +91,7 @@ services: restart: on-failure:100 pdf-decoder: - image: docker.io/trustgraph/trustgraph-flow:0.1.16 + image: docker.io/trustgraph/trustgraph-flow:0.2.0 command: - "pdf-decoder" - "-p" @@ -99,7 +99,7 @@ services: restart: on-failure:100 chunker: - image: docker.io/trustgraph/trustgraph-flow:0.1.16 + image: docker.io/trustgraph/trustgraph-flow:0.2.0 command: - "chunker-recursive" - "-p" @@ -107,7 +107,7 @@ services: restart: on-failure:100 vectorize: - image: docker.io/trustgraph/trustgraph-flow:0.1.16 + image: docker.io/trustgraph/trustgraph-flow:0.2.0 command: - "embeddings-vectorize" - "-p" @@ -115,7 +115,7 @@ services: restart: on-failure:100 embeddings: - image: docker.io/trustgraph/trustgraph-flow:0.1.16 + image: docker.io/trustgraph/trustgraph-flow:0.2.0 command: - "embeddings-hf" - "-p" @@ -123,7 +123,7 @@ services: restart: on-failure:100 kg-extract-definitions: - image: docker.io/trustgraph/trustgraph-flow:0.1.16 + image: docker.io/trustgraph/trustgraph-flow:0.2.0 command: - "kg-extract-definitions" - "-p" @@ -131,7 +131,7 @@ services: restart: on-failure:100 kg-extract-relationships: - image: docker.io/trustgraph/trustgraph-flow:0.1.16 + image: docker.io/trustgraph/trustgraph-flow:0.2.0 command: - "kg-extract-relationships" - "-p" @@ -139,7 +139,7 @@ services: restart: on-failure:100 vector-write: - image: docker.io/trustgraph/trustgraph-flow:0.1.16 + image: docker.io/trustgraph/trustgraph-flow:0.2.0 command: - "vector-write-milvus" - "-p" @@ -149,7 +149,7 @@ services: restart: on-failure:100 graph-write: - image: docker.io/trustgraph/trustgraph-flow:0.1.16 + image: docker.io/trustgraph/trustgraph-flow:0.2.0 command: - "graph-write-cassandra" - "-p" @@ -159,7 +159,7 @@ services: restart: on-failure:100 llm: - image: docker.io/trustgraph/trustgraph-flow:0.1.16 + image: docker.io/trustgraph/trustgraph-flow:0.2.0 command: - "llm-azure-text" - "-p" diff --git a/docker-compose-claude.yaml b/docker-compose-claude.yaml index 5999725e..db091e18 100644 --- a/docker-compose-claude.yaml +++ b/docker-compose-claude.yaml @@ -91,7 +91,7 @@ services: restart: on-failure:100 pdf-decoder: - image: docker.io/trustgraph/trustgraph-flow:0.1.16 + image: docker.io/trustgraph/trustgraph-flow:0.2.0 command: - "pdf-decoder" - "-p" @@ -99,7 +99,7 @@ services: restart: on-failure:100 chunker: - image: docker.io/trustgraph/trustgraph-flow:0.1.16 + image: docker.io/trustgraph/trustgraph-flow:0.2.0 command: - "chunker-recursive" - "-p" @@ -107,7 +107,7 @@ services: restart: on-failure:100 vectorize: - image: docker.io/trustgraph/trustgraph-flow:0.1.16 + image: docker.io/trustgraph/trustgraph-flow:0.2.0 command: - "embeddings-vectorize" - "-p" @@ -115,7 +115,7 @@ services: restart: on-failure:100 embeddings: - image: docker.io/trustgraph/trustgraph-flow:0.1.16 + image: docker.io/trustgraph/trustgraph-flow:0.2.0 command: - "embeddings-hf" - "-p" @@ -123,7 +123,7 @@ services: restart: on-failure:100 kg-extract-definitions: - image: docker.io/trustgraph/trustgraph-flow:0.1.16 + image: docker.io/trustgraph/trustgraph-flow:0.2.0 command: - "kg-extract-definitions" - "-p" @@ -131,7 +131,7 @@ services: restart: on-failure:100 kg-extract-relationships: - image: docker.io/trustgraph/trustgraph-flow:0.1.16 + image: docker.io/trustgraph/trustgraph-flow:0.2.0 command: - "kg-extract-relationships" - "-p" @@ -139,7 +139,7 @@ services: restart: on-failure:100 vector-write: - image: docker.io/trustgraph/trustgraph-flow:0.1.16 + image: docker.io/trustgraph/trustgraph-flow:0.2.0 command: - "vector-write-milvus" - "-p" @@ -149,7 +149,7 @@ services: restart: on-failure:100 graph-write: - image: docker.io/trustgraph/trustgraph-flow:0.1.16 + image: docker.io/trustgraph/trustgraph-flow:0.2.0 command: - "graph-write-cassandra" - "-p" @@ -159,7 +159,7 @@ services: restart: on-failure:100 llm: - image: docker.io/trustgraph/trustgraph-flow:0.1.16 + image: docker.io/trustgraph/trustgraph-flow:0.2.0 command: - "llm-claude-text" - "-p" diff --git a/docker-compose-ollama.yaml b/docker-compose-ollama.yaml index d7d0f36f..f79bc60c 100644 --- a/docker-compose-ollama.yaml +++ b/docker-compose-ollama.yaml @@ -91,7 +91,7 @@ services: restart: on-failure:100 pdf-decoder: - image: docker.io/trustgraph/trustgraph-flow:0.1.16 + image: docker.io/trustgraph/trustgraph-flow:0.2.0 command: - "pdf-decoder" - "-p" @@ -99,7 +99,7 @@ services: restart: on-failure:100 chunker: - image: docker.io/trustgraph/trustgraph-flow:0.1.16 + image: docker.io/trustgraph/trustgraph-flow:0.2.0 command: - "chunker-recursive" - "-p" @@ -107,7 +107,7 @@ services: restart: on-failure:100 vectorize: - image: docker.io/trustgraph/trustgraph-flow:0.1.16 + image: docker.io/trustgraph/trustgraph-flow:0.2.0 command: - "embeddings-vectorize" - "-p" @@ -115,7 +115,7 @@ services: restart: on-failure:100 embeddings: - image: docker.io/trustgraph/trustgraph-flow:0.1.16 + image: docker.io/trustgraph/trustgraph-flow:0.2.0 command: - "embeddings-hf" - "-p" @@ -123,7 +123,7 @@ services: restart: on-failure:100 kg-extract-definitions: - image: docker.io/trustgraph/trustgraph-flow:0.1.16 + image: docker.io/trustgraph/trustgraph-flow:0.2.0 command: - "kg-extract-definitions" - "-p" @@ -131,7 +131,7 @@ services: restart: on-failure:100 kg-extract-relationships: - image: docker.io/trustgraph/trustgraph-flow:0.1.16 + image: docker.io/trustgraph/trustgraph-flow:0.2.0 command: - "kg-extract-relationships" - "-p" @@ -139,7 +139,7 @@ services: restart: on-failure:100 vector-write: - image: docker.io/trustgraph/trustgraph-flow:0.1.16 + image: docker.io/trustgraph/trustgraph-flow:0.2.0 command: - "vector-write-milvus" - "-p" @@ -149,7 +149,7 @@ services: restart: on-failure:100 graph-write: - image: docker.io/trustgraph/trustgraph-flow:0.1.16 + image: docker.io/trustgraph/trustgraph-flow:0.2.0 command: - "graph-write-cassandra" - "-p" @@ -159,7 +159,7 @@ services: restart: on-failure:100 llm: - image: docker.io/trustgraph/trustgraph-flow:0.1.16 + image: docker.io/trustgraph/trustgraph-flow:0.2.0 command: - "llm-ollama-text" - "-p" @@ -169,7 +169,7 @@ services: restart: on-failure:100 graph-rag: - image: docker.io/trustgraph/trustgraph-flow:0.1.16 + image: docker.io/trustgraph/trustgraph-flow:0.2.0 command: - "graph-rag" - "-p" diff --git a/docker-compose-vertexai.yaml b/docker-compose-vertexai.yaml index e7e14be2..6681fa22 100644 --- a/docker-compose-vertexai.yaml +++ b/docker-compose-vertexai.yaml @@ -91,7 +91,7 @@ services: restart: on-failure:100 pdf-decoder: - image: docker.io/trustgraph/trustgraph-flow:0.1.16 + image: docker.io/trustgraph/trustgraph-flow:0.2.0 command: - "pdf-decoder" - "-p" @@ -99,7 +99,7 @@ services: restart: on-failure:100 chunker: - image: docker.io/trustgraph/trustgraph-flow:0.1.16 + image: docker.io/trustgraph/trustgraph-flow:0.2.0 command: - "chunker-recursive" - "-p" @@ -107,7 +107,7 @@ services: restart: on-failure:100 vectorize: - image: docker.io/trustgraph/trustgraph-flow:0.1.16 + image: docker.io/trustgraph/trustgraph-flow:0.2.0 command: - "embeddings-vectorize" - "-p" @@ -115,7 +115,7 @@ services: restart: on-failure:100 embeddings: - image: docker.io/trustgraph/trustgraph-flow:0.1.16 + image: docker.io/trustgraph/trustgraph-flow:0.2.0 command: - "embeddings-hf" - "-p" @@ -123,7 +123,7 @@ services: restart: on-failure:100 kg-extract-definitions: - image: docker.io/trustgraph/trustgraph-flow:0.1.16 + image: docker.io/trustgraph/trustgraph-flow:0.2.0 command: - "kg-extract-definitions" - "-p" @@ -131,7 +131,7 @@ services: restart: on-failure:100 kg-extract-relationships: - image: docker.io/trustgraph/trustgraph-flow:0.1.16 + image: docker.io/trustgraph/trustgraph-flow:0.2.0 command: - "kg-extract-relationships" - "-p" @@ -139,7 +139,7 @@ services: restart: on-failure:100 vector-write: - image: docker.io/trustgraph/trustgraph-flow:0.1.16 + image: docker.io/trustgraph/trustgraph-flow:0.2.0 command: - "vector-write-milvus" - "-p" @@ -149,7 +149,7 @@ services: restart: on-failure:100 graph-write: - image: docker.io/trustgraph/trustgraph-flow:0.1.16 + image: docker.io/trustgraph/trustgraph-flow:0.2.0 command: - "graph-write-cassandra" - "-p" @@ -159,7 +159,7 @@ services: restart: on-failure:100 llm: - image: docker.io/trustgraph/trustgraph-flow:0.1.16 + image: docker.io/trustgraph/trustgraph-flow:0.2.0 command: - "llm-vertexai-text" - "-p" diff --git a/processing.yaml b/processing.yaml index 3ad01eb2..d2fc1bf9 100644 --- a/processing.yaml +++ b/processing.yaml @@ -28,7 +28,8 @@ services: llm: module: trustgraph.llm.ollama_text parameters: - ollama: http://monster:11434 + ollama: http://ollama:11434 + graph-rag: module: trustgraph.rag.graph diff --git a/setup.py b/setup.py index fdd4c7d3..583eedd2 100644 --- a/setup.py +++ b/setup.py @@ -55,6 +55,7 @@ setuptools.setup( "scripts/llm-vertexai-text", "scripts/llm-claude-text", "scripts/llm-azure-text", + "scripts/run-processing", "scripts/loader", "scripts/pdf-decoder", "scripts/query",