diff --git a/Makefile b/Makefile index 3edd87ab..3e3ba808 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ # VERSION=$(shell git describe | sed 's/^v//') -VERSION=0.2.5 +VERSION=0.3.0 all: container diff --git a/docker-compose-azure.yaml b/docker-compose-azure.yaml index 2a36a339..41586cab 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.2.5 + image: docker.io/trustgraph/trustgraph-flow:0.3.0 command: - "pdf-decoder" - "-p" @@ -99,7 +99,7 @@ services: restart: on-failure:100 chunker: - image: docker.io/trustgraph/trustgraph-flow:0.2.5 + image: docker.io/trustgraph/trustgraph-flow:0.3.0 command: - "chunker-recursive" - "-p" @@ -107,7 +107,7 @@ services: restart: on-failure:100 vectorize: - image: docker.io/trustgraph/trustgraph-flow:0.2.5 + image: docker.io/trustgraph/trustgraph-flow:0.3.0 command: - "embeddings-vectorize" - "-p" @@ -115,7 +115,7 @@ services: restart: on-failure:100 embeddings: - image: docker.io/trustgraph/trustgraph-flow:0.2.5 + image: docker.io/trustgraph/trustgraph-flow:0.3.0 command: - "embeddings-hf" - "-p" @@ -123,7 +123,7 @@ services: restart: on-failure:100 kg-extract-definitions: - image: docker.io/trustgraph/trustgraph-flow:0.2.5 + image: docker.io/trustgraph/trustgraph-flow:0.3.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.2.5 + image: docker.io/trustgraph/trustgraph-flow:0.3.0 command: - "kg-extract-relationships" - "-p" @@ -139,7 +139,7 @@ services: restart: on-failure:100 vector-write: - image: docker.io/trustgraph/trustgraph-flow:0.2.5 + image: docker.io/trustgraph/trustgraph-flow:0.3.0 command: - "vector-write-milvus" - "-p" @@ -149,7 +149,7 @@ services: restart: on-failure:100 graph-write: - image: docker.io/trustgraph/trustgraph-flow:0.2.5 + image: docker.io/trustgraph/trustgraph-flow:0.3.0 command: - "graph-write-cassandra" - "-p" @@ -159,7 +159,7 @@ services: restart: on-failure:100 llm: - image: docker.io/trustgraph/trustgraph-flow:0.2.5 + image: docker.io/trustgraph/trustgraph-flow:0.3.0 command: - "llm-azure-text" - "-p" @@ -171,7 +171,7 @@ services: restart: on-failure:100 graph-rag: - image: docker.io/trustgraph/trustgraph-flow:0.2.5 + image: docker.io/trustgraph/trustgraph-flow:0.3.0 command: - "graph-rag" - "-p" diff --git a/docker-compose-claude.yaml b/docker-compose-claude.yaml index 58132986..c1abd37e 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.2.5 + image: docker.io/trustgraph/trustgraph-flow:0.3.0 command: - "pdf-decoder" - "-p" @@ -99,7 +99,7 @@ services: restart: on-failure:100 chunker: - image: docker.io/trustgraph/trustgraph-flow:0.2.5 + image: docker.io/trustgraph/trustgraph-flow:0.3.0 command: - "chunker-recursive" - "-p" @@ -107,7 +107,7 @@ services: restart: on-failure:100 vectorize: - image: docker.io/trustgraph/trustgraph-flow:0.2.5 + image: docker.io/trustgraph/trustgraph-flow:0.3.0 command: - "embeddings-vectorize" - "-p" @@ -115,7 +115,7 @@ services: restart: on-failure:100 embeddings: - image: docker.io/trustgraph/trustgraph-flow:0.2.5 + image: docker.io/trustgraph/trustgraph-flow:0.3.0 command: - "embeddings-hf" - "-p" @@ -123,7 +123,7 @@ services: restart: on-failure:100 kg-extract-definitions: - image: docker.io/trustgraph/trustgraph-flow:0.2.5 + image: docker.io/trustgraph/trustgraph-flow:0.3.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.2.5 + image: docker.io/trustgraph/trustgraph-flow:0.3.0 command: - "kg-extract-relationships" - "-p" @@ -139,7 +139,7 @@ services: restart: on-failure:100 vector-write: - image: docker.io/trustgraph/trustgraph-flow:0.2.5 + image: docker.io/trustgraph/trustgraph-flow:0.3.0 command: - "vector-write-milvus" - "-p" @@ -149,7 +149,7 @@ services: restart: on-failure:100 graph-write: - image: docker.io/trustgraph/trustgraph-flow:0.2.5 + image: docker.io/trustgraph/trustgraph-flow:0.3.0 command: - "graph-write-cassandra" - "-p" @@ -159,7 +159,7 @@ services: restart: on-failure:100 llm: - image: docker.io/trustgraph/trustgraph-flow:0.2.5 + image: docker.io/trustgraph/trustgraph-flow:0.3.0 command: - "llm-claude-text" - "-p" @@ -169,7 +169,7 @@ services: restart: on-failure:100 graph-rag: - image: docker.io/trustgraph/trustgraph-flow:0.2.5 + image: docker.io/trustgraph/trustgraph-flow:0.3.0 command: - "graph-rag" - "-p" diff --git a/docker-compose-ollama.yaml b/docker-compose-ollama.yaml index 7db0e4d0..84de45d7 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.2.5 + image: docker.io/trustgraph/trustgraph-flow:0.3.0 command: - "pdf-decoder" - "-p" @@ -99,7 +99,7 @@ services: restart: on-failure:100 chunker: - image: docker.io/trustgraph/trustgraph-flow:0.2.5 + image: docker.io/trustgraph/trustgraph-flow:0.3.0 command: - "chunker-recursive" - "-p" @@ -107,7 +107,7 @@ services: restart: on-failure:100 vectorize: - image: docker.io/trustgraph/trustgraph-flow:0.2.5 + image: docker.io/trustgraph/trustgraph-flow:0.3.0 command: - "embeddings-vectorize" - "-p" @@ -115,7 +115,7 @@ services: restart: on-failure:100 embeddings: - image: docker.io/trustgraph/trustgraph-flow:0.2.5 + image: docker.io/trustgraph/trustgraph-flow:0.3.0 command: - "embeddings-hf" - "-p" @@ -125,7 +125,7 @@ services: restart: on-failure:100 kg-extract-definitions: - image: docker.io/trustgraph/trustgraph-flow:0.2.5 + image: docker.io/trustgraph/trustgraph-flow:0.3.0 command: - "kg-extract-definitions" - "-p" @@ -133,7 +133,7 @@ services: restart: on-failure:100 kg-extract-relationships: - image: docker.io/trustgraph/trustgraph-flow:0.2.5 + image: docker.io/trustgraph/trustgraph-flow:0.3.0 command: - "kg-extract-relationships" - "-p" @@ -141,7 +141,7 @@ services: restart: on-failure:100 vector-write: - image: docker.io/trustgraph/trustgraph-flow:0.2.5 + image: docker.io/trustgraph/trustgraph-flow:0.3.0 command: - "vector-write-milvus" - "-p" @@ -151,7 +151,7 @@ services: restart: on-failure:100 graph-write: - image: docker.io/trustgraph/trustgraph-flow:0.2.5 + image: docker.io/trustgraph/trustgraph-flow:0.3.0 command: - "graph-write-cassandra" - "-p" @@ -161,7 +161,7 @@ services: restart: on-failure:100 llm: - image: docker.io/trustgraph/trustgraph-flow:0.2.5 + image: docker.io/trustgraph/trustgraph-flow:0.3.0 command: - "llm-ollama-text" - "-p" @@ -171,7 +171,7 @@ services: restart: on-failure:100 graph-rag: - image: docker.io/trustgraph/trustgraph-flow:0.2.5 + image: docker.io/trustgraph/trustgraph-flow:0.3.0 command: - "graph-rag" - "-p" diff --git a/docker-compose-vertexai.yaml b/docker-compose-vertexai.yaml index 62a44f3c..5c04b2c7 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.2.5 + image: docker.io/trustgraph/trustgraph-flow:0.3.0 command: - "pdf-decoder" - "-p" @@ -99,7 +99,7 @@ services: restart: on-failure:100 chunker: - image: docker.io/trustgraph/trustgraph-flow:0.2.5 + image: docker.io/trustgraph/trustgraph-flow:0.3.0 command: - "chunker-recursive" - "-p" @@ -107,7 +107,7 @@ services: restart: on-failure:100 vectorize: - image: docker.io/trustgraph/trustgraph-flow:0.2.5 + image: docker.io/trustgraph/trustgraph-flow:0.3.0 command: - "embeddings-vectorize" - "-p" @@ -115,7 +115,7 @@ services: restart: on-failure:100 embeddings: - image: docker.io/trustgraph/trustgraph-flow:0.2.5 + image: docker.io/trustgraph/trustgraph-flow:0.3.0 command: - "embeddings-hf" - "-p" @@ -123,7 +123,7 @@ services: restart: on-failure:100 kg-extract-definitions: - image: docker.io/trustgraph/trustgraph-flow:0.2.5 + image: docker.io/trustgraph/trustgraph-flow:0.3.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.2.5 + image: docker.io/trustgraph/trustgraph-flow:0.3.0 command: - "kg-extract-relationships" - "-p" @@ -139,7 +139,7 @@ services: restart: on-failure:100 vector-write: - image: docker.io/trustgraph/trustgraph-flow:0.2.5 + image: docker.io/trustgraph/trustgraph-flow:0.3.0 command: - "vector-write-milvus" - "-p" @@ -149,7 +149,7 @@ services: restart: on-failure:100 graph-write: - image: docker.io/trustgraph/trustgraph-flow:0.2.5 + image: docker.io/trustgraph/trustgraph-flow:0.3.0 command: - "graph-write-cassandra" - "-p" @@ -159,7 +159,7 @@ services: restart: on-failure:100 llm: - image: docker.io/trustgraph/trustgraph-flow:0.2.5 + image: docker.io/trustgraph/trustgraph-flow:0.3.0 command: - "llm-vertexai-text" - "-p" @@ -173,7 +173,7 @@ services: restart: on-failure:100 graph-rag: - image: docker.io/trustgraph/trustgraph-flow:0.2.5 + image: docker.io/trustgraph/trustgraph-flow:0.3.0 command: - "graph-rag" - "-p" diff --git a/processing-just-llm.yaml b/processing-just-llm.yaml new file mode 100644 index 00000000..817d6594 --- /dev/null +++ b/processing-just-llm.yaml @@ -0,0 +1,45 @@ + +services: + + pdf-decoder: + module: trustgraph.decoder.pdf + + chunker: + module: trustgraph.chunker.recursive + + vectorize: + module: trustgraph.embeddings.vectorize + +# embeddings: +# module: trustgraph.embeddings.hf + + # embeddings: + # module: trustgraph.embeddings.ollama + # parameters: + # ollama: http://ollama:11434 + + embeddings: + module: trustgraph.embeddings.hf + parameters: + model: mixedbread-ai/mxbai-embed-large-v1 + + kg-extract-definitions: + module: trustgraph.kg.extract_definitions + + kg-extract-relationships: + module: trustgraph.kg.extract_relationships + + vector-write: + module: trustgraph.vector.milvus_write + + graph-write: + module: trustgraph.graph.cassandra_write + + llm: + module: trustgraph.llm.ollama_text + parameters: + ollama: http://ollama:11434 + + graph-rag: + module: trustgraph.rag.graph + diff --git a/setup.py b/setup.py index 43494d06..d40ce093 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.2.5" +version = "0.3.0" setuptools.setup( name="trustgraph",