diff --git a/Makefile b/Makefile index ef182fe4..348aa2aa 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ # VERSION=$(shell git describe | sed 's/^v//') -VERSION=0.5.3 +VERSION=0.5.5 all: container diff --git a/docker-compose-azure.yaml b/docker-compose-azure.yaml index 7b474841..3dc3653b 100644 --- a/docker-compose-azure.yaml +++ b/docker-compose-azure.yaml @@ -30,6 +30,17 @@ services: - "pulsar-data:/pulsar/data" restart: on-failure:100 + init-pulsar: + image: docker.io/apachepulsar/pulsar:3.3.0 + command: + - "sh" + - "-c" + - "pulsar-admin --admin-url http://pulsar:8080 tenants create tg && pulsar-admin --admin-url http://pulsar:8080 namespaces create tg/flow && pulsar-admin --admin-url http://pulsar:8080 namespaces create tg/request && pulsar-admin --admin-url http://pulsar:8080 namespaces create tg/response && pulsar-admin --admin-url http://pulsar:8080 namespaces set-retention --size -1 --time 3m tg/response" + depends_on: + pulsar: + condition: service_started + restart: on-failure:100 + pulsar-manager: image: docker.io/apachepulsar/pulsar-manager:v0.3.0 ports: @@ -119,7 +130,7 @@ services: restart: on-failure:100 pdf-decoder: - image: docker.io/trustgraph/trustgraph-flow:0.5.3 + image: docker.io/trustgraph/trustgraph-flow:0.5.5 command: - "pdf-decoder" - "-p" @@ -127,7 +138,7 @@ services: restart: on-failure:100 chunker: - image: docker.io/trustgraph/trustgraph-flow:0.5.3 + image: docker.io/trustgraph/trustgraph-flow:0.5.5 command: - "chunker-recursive" - "-p" @@ -135,7 +146,7 @@ services: restart: on-failure:100 vectorize: - image: docker.io/trustgraph/trustgraph-flow:0.5.3 + image: docker.io/trustgraph/trustgraph-flow:0.5.5 command: - "embeddings-vectorize" - "-p" @@ -143,7 +154,7 @@ services: restart: on-failure:100 embeddings: - image: docker.io/trustgraph/trustgraph-flow:0.5.3 + image: docker.io/trustgraph/trustgraph-flow:0.5.5 command: - "embeddings-hf" - "-p" @@ -153,7 +164,7 @@ services: restart: on-failure:100 kg-extract-definitions: - image: docker.io/trustgraph/trustgraph-flow:0.5.3 + image: docker.io/trustgraph/trustgraph-flow:0.5.5 command: - "kg-extract-definitions" - "-p" @@ -161,7 +172,7 @@ services: restart: on-failure:100 kg-extract-relationships: - image: docker.io/trustgraph/trustgraph-flow:0.5.3 + image: docker.io/trustgraph/trustgraph-flow:0.5.5 command: - "kg-extract-relationships" - "-p" @@ -169,7 +180,7 @@ services: restart: on-failure:100 store-graph-embeddings: - image: docker.io/trustgraph/trustgraph-flow:0.5.3 + image: docker.io/trustgraph/trustgraph-flow:0.5.5 command: - "ge-write-milvus" - "-p" @@ -179,7 +190,7 @@ services: restart: on-failure:100 store-triples: - image: docker.io/trustgraph/trustgraph-flow:0.5.3 + image: docker.io/trustgraph/trustgraph-flow:0.5.5 command: - "triples-write-cassandra" - "-p" @@ -189,7 +200,7 @@ services: restart: on-failure:100 text-completion: - image: docker.io/trustgraph/trustgraph-flow:0.5.3 + image: docker.io/trustgraph/trustgraph-flow:0.5.5 command: - "text-completion-azure" - "-p" @@ -201,7 +212,7 @@ services: restart: on-failure:100 graph-rag: - image: docker.io/trustgraph/trustgraph-flow:0.5.3 + image: docker.io/trustgraph/trustgraph-flow:0.5.5 command: - "graph-rag" - "-p" diff --git a/docker-compose-claude.yaml b/docker-compose-claude.yaml index 26f24f3b..26e205ea 100644 --- a/docker-compose-claude.yaml +++ b/docker-compose-claude.yaml @@ -30,6 +30,17 @@ services: - "pulsar-data:/pulsar/data" restart: on-failure:100 + init-pulsar: + image: docker.io/apachepulsar/pulsar:3.3.0 + command: + - "sh" + - "-c" + - "pulsar-admin --admin-url http://pulsar:8080 tenants create tg && pulsar-admin --admin-url http://pulsar:8080 namespaces create tg/flow && pulsar-admin --admin-url http://pulsar:8080 namespaces create tg/request && pulsar-admin --admin-url http://pulsar:8080 namespaces create tg/response && pulsar-admin --admin-url http://pulsar:8080 namespaces set-retention --size -1 --time 3m tg/response" + depends_on: + pulsar: + condition: service_started + restart: on-failure:100 + pulsar-manager: image: docker.io/apachepulsar/pulsar-manager:v0.3.0 ports: @@ -119,7 +130,7 @@ services: restart: on-failure:100 pdf-decoder: - image: docker.io/trustgraph/trustgraph-flow:0.5.3 + image: docker.io/trustgraph/trustgraph-flow:0.5.5 command: - "pdf-decoder" - "-p" @@ -127,7 +138,7 @@ services: restart: on-failure:100 chunker: - image: docker.io/trustgraph/trustgraph-flow:0.5.3 + image: docker.io/trustgraph/trustgraph-flow:0.5.5 command: - "chunker-recursive" - "-p" @@ -135,7 +146,7 @@ services: restart: on-failure:100 vectorize: - image: docker.io/trustgraph/trustgraph-flow:0.5.3 + image: docker.io/trustgraph/trustgraph-flow:0.5.5 command: - "embeddings-vectorize" - "-p" @@ -143,7 +154,7 @@ services: restart: on-failure:100 embeddings: - image: docker.io/trustgraph/trustgraph-flow:0.5.3 + image: docker.io/trustgraph/trustgraph-flow:0.5.5 command: - "embeddings-hf" - "-p" @@ -153,7 +164,7 @@ services: restart: on-failure:100 kg-extract-definitions: - image: docker.io/trustgraph/trustgraph-flow:0.5.3 + image: docker.io/trustgraph/trustgraph-flow:0.5.5 command: - "kg-extract-definitions" - "-p" @@ -161,7 +172,7 @@ services: restart: on-failure:100 kg-extract-relationships: - image: docker.io/trustgraph/trustgraph-flow:0.5.3 + image: docker.io/trustgraph/trustgraph-flow:0.5.5 command: - "kg-extract-relationships" - "-p" @@ -169,7 +180,7 @@ services: restart: on-failure:100 store-graph-embeddings: - image: docker.io/trustgraph/trustgraph-flow:0.5.3 + image: docker.io/trustgraph/trustgraph-flow:0.5.5 command: - "ge-write-milvus" - "-p" @@ -179,7 +190,7 @@ services: restart: on-failure:100 store-triples: - image: docker.io/trustgraph/trustgraph-flow:0.5.3 + image: docker.io/trustgraph/trustgraph-flow:0.5.5 command: - "triples-write-cassandra" - "-p" @@ -189,7 +200,7 @@ services: restart: on-failure:100 text-completion: - image: docker.io/trustgraph/trustgraph-flow:0.5.3 + image: docker.io/trustgraph/trustgraph-flow:0.5.5 command: - "text-completion-claude" - "-p" @@ -199,7 +210,7 @@ services: restart: on-failure:100 graph-rag: - image: docker.io/trustgraph/trustgraph-flow:0.5.3 + image: docker.io/trustgraph/trustgraph-flow:0.5.5 command: - "graph-rag" - "-p" diff --git a/docker-compose-ollama.yaml b/docker-compose-ollama.yaml index 56ab9431..a2ec6f1a 100644 --- a/docker-compose-ollama.yaml +++ b/docker-compose-ollama.yaml @@ -130,7 +130,7 @@ services: restart: on-failure:100 pdf-decoder: - image: docker.io/trustgraph/trustgraph-flow:0.5.4 + image: docker.io/trustgraph/trustgraph-flow:0.5.5 command: - "pdf-decoder" - "-p" @@ -138,7 +138,7 @@ services: restart: on-failure:100 chunker: - image: docker.io/trustgraph/trustgraph-flow:0.5.4 + image: docker.io/trustgraph/trustgraph-flow:0.5.5 command: - "chunker-recursive" - "-p" @@ -146,7 +146,7 @@ services: restart: on-failure:100 vectorize: - image: docker.io/trustgraph/trustgraph-flow:0.5.4 + image: docker.io/trustgraph/trustgraph-flow:0.5.5 command: - "embeddings-vectorize" - "-p" @@ -154,7 +154,7 @@ services: restart: on-failure:100 embeddings: - image: docker.io/trustgraph/trustgraph-flow:0.5.4 + image: docker.io/trustgraph/trustgraph-flow:0.5.5 command: - "embeddings-hf" - "-p" @@ -164,7 +164,7 @@ services: restart: on-failure:100 kg-extract-definitions: - image: docker.io/trustgraph/trustgraph-flow:0.5.4 + image: docker.io/trustgraph/trustgraph-flow:0.5.5 command: - "kg-extract-definitions" - "-p" @@ -172,7 +172,7 @@ services: restart: on-failure:100 kg-extract-relationships: - image: docker.io/trustgraph/trustgraph-flow:0.5.4 + image: docker.io/trustgraph/trustgraph-flow:0.5.5 command: - "kg-extract-relationships" - "-p" @@ -180,7 +180,7 @@ services: restart: on-failure:100 store-graph-embeddings: - image: docker.io/trustgraph/trustgraph-flow:0.5.4 + image: docker.io/trustgraph/trustgraph-flow:0.5.5 command: - "ge-write-milvus" - "-p" @@ -190,7 +190,7 @@ services: restart: on-failure:100 store-triples: - image: docker.io/trustgraph/trustgraph-flow:0.5.4 + image: docker.io/trustgraph/trustgraph-flow:0.5.5 command: - "triples-write-cassandra" - "-p" @@ -200,7 +200,7 @@ services: restart: on-failure:100 text-completion: - image: docker.io/trustgraph/trustgraph-flow:0.5.4 + image: docker.io/trustgraph/trustgraph-flow:0.5.5 command: - "text-completion-ollama" - "-p" @@ -212,7 +212,7 @@ services: restart: on-failure:100 graph-rag: - image: docker.io/trustgraph/trustgraph-flow:0.5.4 + image: docker.io/trustgraph/trustgraph-flow:0.5.5 command: - "graph-rag" - "-p" diff --git a/docker-compose-vertexai.yaml b/docker-compose-vertexai.yaml index b3767b7a..c55a04b5 100644 --- a/docker-compose-vertexai.yaml +++ b/docker-compose-vertexai.yaml @@ -30,6 +30,17 @@ services: - "pulsar-data:/pulsar/data" restart: on-failure:100 + init-pulsar: + image: docker.io/apachepulsar/pulsar:3.3.0 + command: + - "sh" + - "-c" + - "pulsar-admin --admin-url http://pulsar:8080 tenants create tg && pulsar-admin --admin-url http://pulsar:8080 namespaces create tg/flow && pulsar-admin --admin-url http://pulsar:8080 namespaces create tg/request && pulsar-admin --admin-url http://pulsar:8080 namespaces create tg/response && pulsar-admin --admin-url http://pulsar:8080 namespaces set-retention --size -1 --time 3m tg/response" + depends_on: + pulsar: + condition: service_started + restart: on-failure:100 + pulsar-manager: image: docker.io/apachepulsar/pulsar-manager:v0.3.0 ports: @@ -119,7 +130,7 @@ services: restart: on-failure:100 pdf-decoder: - image: docker.io/trustgraph/trustgraph-flow:0.5.3 + image: docker.io/trustgraph/trustgraph-flow:0.5.5 command: - "pdf-decoder" - "-p" @@ -127,7 +138,7 @@ services: restart: on-failure:100 chunker: - image: docker.io/trustgraph/trustgraph-flow:0.5.3 + image: docker.io/trustgraph/trustgraph-flow:0.5.5 command: - "chunker-recursive" - "-p" @@ -135,7 +146,7 @@ services: restart: on-failure:100 vectorize: - image: docker.io/trustgraph/trustgraph-flow:0.5.3 + image: docker.io/trustgraph/trustgraph-flow:0.5.5 command: - "embeddings-vectorize" - "-p" @@ -143,7 +154,7 @@ services: restart: on-failure:100 embeddings: - image: docker.io/trustgraph/trustgraph-flow:0.5.3 + image: docker.io/trustgraph/trustgraph-flow:0.5.5 command: - "embeddings-hf" - "-p" @@ -153,7 +164,7 @@ services: restart: on-failure:100 kg-extract-definitions: - image: docker.io/trustgraph/trustgraph-flow:0.5.3 + image: docker.io/trustgraph/trustgraph-flow:0.5.5 command: - "kg-extract-definitions" - "-p" @@ -161,7 +172,7 @@ services: restart: on-failure:100 kg-extract-relationships: - image: docker.io/trustgraph/trustgraph-flow:0.5.3 + image: docker.io/trustgraph/trustgraph-flow:0.5.5 command: - "kg-extract-relationships" - "-p" @@ -169,7 +180,7 @@ services: restart: on-failure:100 store-graph-embeddings: - image: docker.io/trustgraph/trustgraph-flow:0.5.3 + image: docker.io/trustgraph/trustgraph-flow:0.5.5 command: - "ge-write-milvus" - "-p" @@ -179,7 +190,7 @@ services: restart: on-failure:100 store-triples: - image: docker.io/trustgraph/trustgraph-flow:0.5.3 + image: docker.io/trustgraph/trustgraph-flow:0.5.5 command: - "triples-write-cassandra" - "-p" @@ -189,7 +200,7 @@ services: restart: on-failure:100 text-completion: - image: docker.io/trustgraph/trustgraph-flow:0.5.3 + image: docker.io/trustgraph/trustgraph-flow:0.5.5 command: - "text-completion-ollama" - "-p" @@ -203,7 +214,7 @@ services: restart: on-failure:100 graph-rag: - image: docker.io/trustgraph/trustgraph-flow:0.5.3 + image: docker.io/trustgraph/trustgraph-flow:0.5.5 command: - "graph-rag" - "-p" diff --git a/setup.py b/setup.py index b25b165d..6e9c8b9e 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.5.3" +version = "0.5.5" setuptools.setup( name="trustgraph",