diff --git a/Containerfile b/Containerfile deleted file mode 100644 index 7283a06b..00000000 --- a/Containerfile +++ /dev/null @@ -1,84 +0,0 @@ - -# ---------------------------------------------------------------------------- -# Build an AI container. This does the torch install which is huge, and I -# like to avoid re-doing this. -# ---------------------------------------------------------------------------- - -FROM docker.io/fedora:40 AS ai - -ENV PIP_BREAK_SYSTEM_PACKAGES=1 - -RUN dnf install -y python3 python3-pip python3-wheel python3-aiohttp \ - python3-rdflib - -RUN pip3 install torch==2.5.1+cpu \ - --index-url https://download.pytorch.org/whl/cpu - -RUN pip3 install \ - anthropic boto3 cohere mistralai openai google-cloud-aiplatform \ - ollama google-generativeai \ - langchain==0.3.13 langchain-core==0.3.28 langchain-huggingface==0.1.2 \ - langchain-text-splitters==0.3.4 \ - langchain-community==0.3.13 \ - sentence-transformers==3.4.0 transformers==4.47.1 \ - huggingface-hub==0.27.0 \ - pymilvus \ - pulsar-client==3.5.0 cassandra-driver pyyaml \ - neo4j tiktoken falkordb && \ - pip3 cache purge - -# Most commonly used embeddings model, just build it into the container -# image -RUN huggingface-cli download sentence-transformers/all-MiniLM-L6-v2 - -# ---------------------------------------------------------------------------- -# Build a container which contains the built Python packages. The build -# creates a bunch of left-over cruft, a separate phase means this is only -# needed to support package build -# ---------------------------------------------------------------------------- - -FROM ai AS build - -COPY trustgraph-base/ /root/build/trustgraph-base/ -COPY trustgraph-flow/ /root/build/trustgraph-flow/ -COPY trustgraph-vertexai/ /root/build/trustgraph-vertexai/ -COPY trustgraph-bedrock/ /root/build/trustgraph-bedrock/ -COPY trustgraph-embeddings-hf/ /root/build/trustgraph-embeddings-hf/ -COPY trustgraph-cli/ /root/build/trustgraph-cli/ -COPY trustgraph-ocr/ /root/build/trustgraph-ocr/ - -WORKDIR /root/build/ - -RUN pip3 wheel -w /root/wheels/ --no-deps ./trustgraph-base/ -RUN pip3 wheel -w /root/wheels/ --no-deps ./trustgraph-flow/ -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-embeddings-hf/ -RUN pip3 wheel -w /root/wheels/ --no-deps ./trustgraph-cli/ -RUN pip3 wheel -w /root/wheels/ --no-deps ./trustgraph-ocr/ - -RUN ls /root/wheels - -# ---------------------------------------------------------------------------- -# Finally, the target container. Start with base and add the package. -# ---------------------------------------------------------------------------- - -FROM ai - -COPY --from=build /root/wheels /root/wheels - -RUN \ - pip3 install /root/wheels/trustgraph_base-* && \ - pip3 install /root/wheels/trustgraph_flow-* && \ - pip3 install /root/wheels/trustgraph_vertexai-* && \ - pip3 install /root/wheels/trustgraph_bedrock-* && \ - pip3 install /root/wheels/trustgraph_embeddings_hf-* && \ - pip3 install /root/wheels/trustgraph_cli-* && \ - pip3 install /root/wheels/trustgraph_ocr-* && \ - pip3 cache purge && \ - rm -rf /root/wheels - -WORKDIR / - -CMD sleep 1000000 - diff --git a/containers/Containerfile.base b/containers/Containerfile.base index 067b4c2c..fa5d653c 100644 --- a/containers/Containerfile.base +++ b/containers/Containerfile.base @@ -8,8 +8,8 @@ FROM docker.io/fedora:42 AS base ENV PIP_BREAK_SYSTEM_PACKAGES=1 -RUN dnf install -y python3.12 && \ - alternatives --install /usr/bin/python python /usr/bin/python3.12 1 && \ +RUN dnf install -y python3.13 && \ + alternatives --install /usr/bin/python python /usr/bin/python3.13 1 && \ python -m ensurepip --upgrade && \ pip3 install --no-cache-dir build wheel aiohttp && \ pip3 install --no-cache-dir pulsar-client==3.7.0 && \ diff --git a/containers/Containerfile.bedrock b/containers/Containerfile.bedrock index a35d12ad..b9ab99ac 100644 --- a/containers/Containerfile.bedrock +++ b/containers/Containerfile.bedrock @@ -8,8 +8,8 @@ FROM docker.io/fedora:42 AS base ENV PIP_BREAK_SYSTEM_PACKAGES=1 -RUN dnf install -y python3.12 && \ - alternatives --install /usr/bin/python python /usr/bin/python3.12 1 && \ +RUN dnf install -y python3.13 && \ + alternatives --install /usr/bin/python python /usr/bin/python3.13 1 && \ python -m ensurepip --upgrade && \ pip3 install --no-cache-dir build wheel aiohttp && \ pip3 install --no-cache-dir pulsar-client==3.7.0 && \ diff --git a/containers/Containerfile.flow b/containers/Containerfile.flow index 2ffa17d3..8b20050d 100644 --- a/containers/Containerfile.flow +++ b/containers/Containerfile.flow @@ -8,8 +8,8 @@ FROM docker.io/fedora:42 AS base ENV PIP_BREAK_SYSTEM_PACKAGES=1 -RUN dnf install -y python3.12 && \ - alternatives --install /usr/bin/python python /usr/bin/python3.12 1 && \ +RUN dnf install -y python3.13 && \ + alternatives --install /usr/bin/python python /usr/bin/python3.13 1 && \ python -m ensurepip --upgrade && \ pip3 install --no-cache-dir build wheel aiohttp rdflib && \ pip3 install --no-cache-dir pulsar-client==3.7.0 && \ @@ -22,7 +22,7 @@ RUN pip3 install --no-cache-dir \ langchain-text-splitters==0.3.8 \ langchain-community==0.3.24 \ pymilvus \ - pulsar-client==3.7.0 cassandra-driver pyyaml \ + pulsar-client==3.7.0 scylla-driver pyyaml \ neo4j tiktoken falkordb && \ pip3 cache purge diff --git a/containers/Containerfile.hf b/containers/Containerfile.hf index b76179ff..351300ae 100644 --- a/containers/Containerfile.hf +++ b/containers/Containerfile.hf @@ -8,8 +8,8 @@ FROM docker.io/fedora:42 AS ai ENV PIP_BREAK_SYSTEM_PACKAGES=1 -RUN dnf install -y python3.12 && \ - alternatives --install /usr/bin/python python /usr/bin/python3.12 1 && \ +RUN dnf install -y python3.13 && \ + alternatives --install /usr/bin/python python /usr/bin/python3.13 1 && \ python -m ensurepip --upgrade && \ pip3 install --no-cache-dir build wheel aiohttp && \ pip3 install --no-cache-dir pulsar-client==3.7.0 && \ diff --git a/containers/Containerfile.mcp b/containers/Containerfile.mcp index 2377a663..389b919e 100644 --- a/containers/Containerfile.mcp +++ b/containers/Containerfile.mcp @@ -8,8 +8,8 @@ FROM docker.io/fedora:42 AS base ENV PIP_BREAK_SYSTEM_PACKAGES=1 -RUN dnf install -y python3.12 && \ - alternatives --install /usr/bin/python python /usr/bin/python3.12 1 && \ +RUN dnf install -y python3.13 && \ + alternatives --install /usr/bin/python python /usr/bin/python3.13 1 && \ python -m ensurepip --upgrade && \ pip3 install --no-cache-dir mcp websockets && \ dnf clean all diff --git a/containers/Containerfile.ocr b/containers/Containerfile.ocr index bb1f3ae2..41655e42 100644 --- a/containers/Containerfile.ocr +++ b/containers/Containerfile.ocr @@ -8,9 +8,9 @@ FROM docker.io/fedora:42 AS base ENV PIP_BREAK_SYSTEM_PACKAGES=1 -RUN dnf install -y python3.12 && \ +RUN dnf install -y python3.13 && \ dnf install -y tesseract poppler-utils && \ - alternatives --install /usr/bin/python python /usr/bin/python3.12 1 && \ + alternatives --install /usr/bin/python python /usr/bin/python3.13 1 && \ python -m ensurepip --upgrade && \ pip3 install --no-cache-dir build wheel aiohttp && \ pip3 install --no-cache-dir pulsar-client==3.7.0 && \ diff --git a/containers/Containerfile.vertexai b/containers/Containerfile.vertexai index 9a4bd15f..bf0e55da 100644 --- a/containers/Containerfile.vertexai +++ b/containers/Containerfile.vertexai @@ -8,8 +8,8 @@ FROM docker.io/fedora:42 AS base ENV PIP_BREAK_SYSTEM_PACKAGES=1 -RUN dnf install -y python3.12 && \ - alternatives --install /usr/bin/python python /usr/bin/python3.12 1 && \ +RUN dnf install -y python3.13 && \ + alternatives --install /usr/bin/python python /usr/bin/python3.13 1 && \ python -m ensurepip --upgrade && \ pip3 install --no-cache-dir build wheel aiohttp && \ pip3 install --no-cache-dir pulsar-client==3.7.0 && \ diff --git a/requirements.txt b/requirements.txt index 0d269066..68c21e1d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -11,7 +11,7 @@ langchain-text-splitters langchain-community huggingface-hub requests -cassandra-driver +scylla-driver pulsar-client pypdf anthropic diff --git a/trustgraph-flow/pyproject.toml b/trustgraph-flow/pyproject.toml index 8e62565e..be555668 100644 --- a/trustgraph-flow/pyproject.toml +++ b/trustgraph-flow/pyproject.toml @@ -13,7 +13,7 @@ dependencies = [ "trustgraph-base>=1.5,<1.6", "aiohttp", "anthropic", - "cassandra-driver", + "scylla-driver", "cohere", "cryptography", "falkordb",