From 08707640921524c126243afcb460f1f86b14011b Mon Sep 17 00:00:00 2001 From: Cyber MacGeddon Date: Mon, 30 Sep 2024 22:18:53 +0100 Subject: [PATCH] Rename trustgraph-utils -> trustgraph-cli --- .gitignore | 2 +- Containerfile | 6 +++--- Makefile | 10 +++++----- {trustgraph-utils => trustgraph-cli}/README.md | 0 .../scripts/tg-graph-show | 0 .../scripts/tg-graph-to-turtle | 0 .../scripts/tg-init-pulsar | 0 .../scripts/tg-init-pulsar-manager | 0 .../scripts/tg-load-pdf | 0 .../scripts/tg-load-text | 0 .../scripts/tg-processor-state | 0 .../scripts/tg-query-document-rag | 0 .../scripts/tg-query-graph-rag | 0 {trustgraph-utils => trustgraph-cli}/setup.py | 4 ++-- 14 files changed, 11 insertions(+), 11 deletions(-) rename {trustgraph-utils => trustgraph-cli}/README.md (100%) rename {trustgraph-utils => trustgraph-cli}/scripts/tg-graph-show (100%) rename {trustgraph-utils => trustgraph-cli}/scripts/tg-graph-to-turtle (100%) rename {trustgraph-utils => trustgraph-cli}/scripts/tg-init-pulsar (100%) rename {trustgraph-utils => trustgraph-cli}/scripts/tg-init-pulsar-manager (100%) rename {trustgraph-utils => trustgraph-cli}/scripts/tg-load-pdf (100%) rename {trustgraph-utils => trustgraph-cli}/scripts/tg-load-text (100%) rename {trustgraph-utils => trustgraph-cli}/scripts/tg-processor-state (100%) rename {trustgraph-utils => trustgraph-cli}/scripts/tg-query-document-rag (100%) rename {trustgraph-utils => trustgraph-cli}/scripts/tg-query-graph-rag (100%) rename {trustgraph-utils => trustgraph-cli}/setup.py (95%) diff --git a/.gitignore b/.gitignore index 1377a864..357ecf1e 100644 --- a/.gitignore +++ b/.gitignore @@ -11,5 +11,5 @@ trustgraph-embeddings-hf/trustgraph/embeddings_hf_version.py trustgraph-flow/trustgraph/flow_version.py trustgraph-parquet/trustgraph/parquet_version.py trustgraph-vertexai/trustgraph/vertexai_version.py -trustgraph-utils/trustgraph/ +trustgraph-cli/trustgraph/ vertexai/ \ No newline at end of file diff --git a/Containerfile b/Containerfile index 05bfe087..e8daa861 100644 --- a/Containerfile +++ b/Containerfile @@ -34,7 +34,7 @@ COPY trustgraph-vertexai/ /root/build/trustgraph-vertexai/ COPY trustgraph-bedrock/ /root/build/trustgraph-bedrock/ COPY trustgraph-parquet/ /root/build/trustgraph-parquet/ COPY trustgraph-embeddings-hf/ /root/build/trustgraph-embeddings-hf/ -COPY trustgraph-utils/ /root/build/trustgraph-utils/ +COPY trustgraph-cli/ /root/build/trustgraph-cli/ WORKDIR /root/build/ @@ -44,7 +44,7 @@ RUN pip3 wheel -w /root/wheels/ --no-deps ./trustgraph-vertexai/ RUN pip3 wheel -w /root/wheels/ --no-deps ./trustgraph-bedrock/ RUN pip3 wheel -w /root/wheels/ --no-deps ./trustgraph-parquet/ RUN pip3 wheel -w /root/wheels/ --no-deps ./trustgraph-embeddings-hf/ -RUN pip3 wheel -w /root/wheels/ --no-deps ./trustgraph-utils/ +RUN pip3 wheel -w /root/wheels/ --no-deps ./trustgraph-cli/ RUN ls /root/wheels @@ -63,7 +63,7 @@ RUN \ pip3 install /root/wheels/trustgraph_bedrock-* && \ pip3 install /root/wheels/trustgraph_parquet-* && \ pip3 install /root/wheels/trustgraph_embeddings_hf-* && \ - pip3 install /root/wheels/trustgraph_utils-* && \ + pip3 install /root/wheels/trustgraph_cli-* && \ pip3 cache purge && \ rm -rf /root/wheels diff --git a/Makefile b/Makefile index 2d450130..65db5817 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ # VERSION=$(shell git describe | sed 's/^v//') -VERSION=0.11.12 +VERSION=0.11.13 DOCKER=podman @@ -14,7 +14,7 @@ wheels: pip3 wheel --no-deps --wheel-dir dist trustgraph-bedrock/ pip3 wheel --no-deps --wheel-dir dist trustgraph-parquet/ pip3 wheel --no-deps --wheel-dir dist trustgraph-embeddings-hf/ - pip3 wheel --no-deps --wheel-dir dist trustgraph-utils/ + pip3 wheel --no-deps --wheel-dir dist trustgraph-cli/ packages: rm -rf dist/ @@ -24,7 +24,7 @@ packages: cd trustgraph-bedrock && python3 setup.py sdist --dist-dir ../dist/ cd trustgraph-parquet && python3 setup.py sdist --dist-dir ../dist/ cd trustgraph-embeddings-hf && python3 setup.py sdist --dist-dir ../dist/ - cd trustgraph-utils && python3 setup.py sdist --dist-dir ../dist/ + cd trustgraph-cli && python3 setup.py sdist --dist-dir ../dist/ pypi-upload: twine upload dist/*-${VERSION}.* @@ -32,14 +32,14 @@ pypi-upload: CONTAINER=docker.io/trustgraph/trustgraph-flow update-package-versions: - mkdir -p trustgraph-utils/trustgraph + mkdir -p trustgraph-cli/trustgraph echo __version__ = \"${VERSION}\" > trustgraph-base/trustgraph/base_version.py echo __version__ = \"${VERSION}\" > trustgraph-flow/trustgraph/flow_version.py echo __version__ = \"${VERSION}\" > trustgraph-vertexai/trustgraph/vertexai_version.py echo __version__ = \"${VERSION}\" > trustgraph-bedrock/trustgraph/bedrock_version.py echo __version__ = \"${VERSION}\" > trustgraph-parquet/trustgraph/parquet_version.py echo __version__ = \"${VERSION}\" > trustgraph-embeddings-hf/trustgraph/embeddings_hf_version.py - echo __version__ = \"${VERSION}\" > trustgraph-utils/trustgraph/utils_version.py + echo __version__ = \"${VERSION}\" > trustgraph-cli/trustgraph/cli_version.py container: update-package-versions ${DOCKER} build -f Containerfile -t ${CONTAINER}:${VERSION} \ diff --git a/trustgraph-utils/README.md b/trustgraph-cli/README.md similarity index 100% rename from trustgraph-utils/README.md rename to trustgraph-cli/README.md diff --git a/trustgraph-utils/scripts/tg-graph-show b/trustgraph-cli/scripts/tg-graph-show similarity index 100% rename from trustgraph-utils/scripts/tg-graph-show rename to trustgraph-cli/scripts/tg-graph-show diff --git a/trustgraph-utils/scripts/tg-graph-to-turtle b/trustgraph-cli/scripts/tg-graph-to-turtle similarity index 100% rename from trustgraph-utils/scripts/tg-graph-to-turtle rename to trustgraph-cli/scripts/tg-graph-to-turtle diff --git a/trustgraph-utils/scripts/tg-init-pulsar b/trustgraph-cli/scripts/tg-init-pulsar similarity index 100% rename from trustgraph-utils/scripts/tg-init-pulsar rename to trustgraph-cli/scripts/tg-init-pulsar diff --git a/trustgraph-utils/scripts/tg-init-pulsar-manager b/trustgraph-cli/scripts/tg-init-pulsar-manager similarity index 100% rename from trustgraph-utils/scripts/tg-init-pulsar-manager rename to trustgraph-cli/scripts/tg-init-pulsar-manager diff --git a/trustgraph-utils/scripts/tg-load-pdf b/trustgraph-cli/scripts/tg-load-pdf similarity index 100% rename from trustgraph-utils/scripts/tg-load-pdf rename to trustgraph-cli/scripts/tg-load-pdf diff --git a/trustgraph-utils/scripts/tg-load-text b/trustgraph-cli/scripts/tg-load-text similarity index 100% rename from trustgraph-utils/scripts/tg-load-text rename to trustgraph-cli/scripts/tg-load-text diff --git a/trustgraph-utils/scripts/tg-processor-state b/trustgraph-cli/scripts/tg-processor-state similarity index 100% rename from trustgraph-utils/scripts/tg-processor-state rename to trustgraph-cli/scripts/tg-processor-state diff --git a/trustgraph-utils/scripts/tg-query-document-rag b/trustgraph-cli/scripts/tg-query-document-rag similarity index 100% rename from trustgraph-utils/scripts/tg-query-document-rag rename to trustgraph-cli/scripts/tg-query-document-rag diff --git a/trustgraph-utils/scripts/tg-query-graph-rag b/trustgraph-cli/scripts/tg-query-graph-rag similarity index 100% rename from trustgraph-utils/scripts/tg-query-graph-rag rename to trustgraph-cli/scripts/tg-query-graph-rag diff --git a/trustgraph-utils/setup.py b/trustgraph-cli/setup.py similarity index 95% rename from trustgraph-utils/setup.py rename to trustgraph-cli/setup.py index 553d8aa5..d2ba7b3b 100644 --- a/trustgraph-utils/setup.py +++ b/trustgraph-cli/setup.py @@ -7,7 +7,7 @@ with open("README.md", "r") as fh: # Load a version number module spec = importlib.util.spec_from_file_location( - 'version', 'trustgraph/utils_version.py' + 'version', 'trustgraph/cli_version.py' ) version_module = importlib.util.module_from_spec(spec) spec.loader.exec_module(version_module) @@ -15,7 +15,7 @@ spec.loader.exec_module(version_module) version = version_module.__version__ setuptools.setup( - name="trustgraph-utils", + name="trustgraph-cli", version=version, author="trustgraph.ai", author_email="security@trustgraph.ai",