From 9a6f9b2ce7da24ad1282161150b1ec45b03a5f78 Mon Sep 17 00:00:00 2001 From: Platform Engineering Bot Date: Tue, 18 Jun 2024 00:55:51 +0000 Subject: [PATCH] Update Auto merged updates Signed-off-by: Platform Engineering Bot --- .github/workflows/chatbot.yaml | 2 +- .github/workflows/codegen.yaml | 2 +- .github/workflows/instructlab.yaml | 2 +- .github/workflows/manual_build_trigger.yaml | 16 ++++++++-------- .github/workflows/mirror_repository.yaml | 2 +- .github/workflows/model_converter.yaml | 2 +- .github/workflows/model_servers.yaml | 2 +- .github/workflows/models.yaml | 2 +- .github/workflows/object_detection.yaml | 2 +- .github/workflows/rag.yaml | 2 +- .github/workflows/summarizer.yaml | 2 +- .github/workflows/testing_framework.yaml | 6 +++--- .github/workflows/training-e2e.yaml | 4 ++-- .github/workflows/training_bootc.yaml | 6 +++--- convert_models/Containerfile | 2 +- eval/promptfoo/base/Containerfile | 2 +- model_servers/llamacpp_python/base/Containerfile | 2 +- .../llamacpp_python/src/requirements.txt | 2 +- .../llamacpp_python/vulkan/amd64/Containerfile | 2 +- .../llamacpp_python/vulkan/arm64/Containerfile | 2 +- .../object_detection_python/base/Containerfile | 2 +- .../object_detection_python/src/requirements.txt | 12 ++++++------ models/Containerfile | 2 +- recipes/audio/audio_to_text/app/Containerfile | 2 +- .../object_detection/app/Containerfile | 2 +- .../object_detection/app/requirements.txt | 4 ++-- .../image_understanding/app/Containerfile | 2 +- .../chatbot/app/Containerfile | 2 +- .../codegen/app/Containerfile | 2 +- .../rag/app/Containerfile | 2 +- .../rag/app/requirements.txt | 2 +- .../summarizer/app/Containerfile | 2 +- .../summarizer/app/requirements.txt | 2 +- requirements-test.txt | 2 +- 34 files changed, 52 insertions(+), 52 deletions(-) diff --git a/.github/workflows/chatbot.yaml b/.github/workflows/chatbot.yaml index 89db73e9..947e7cd3 100644 --- a/.github/workflows/chatbot.yaml +++ b/.github/workflows/chatbot.yaml @@ -37,7 +37,7 @@ jobs: ports: - 5000:5000 steps: - - uses: actions/checkout@v4.1.6 + - uses: actions/checkout@v4.1.7 - name: Install qemu dependency run: | diff --git a/.github/workflows/codegen.yaml b/.github/workflows/codegen.yaml index a3b4bcaf..772690f2 100644 --- a/.github/workflows/codegen.yaml +++ b/.github/workflows/codegen.yaml @@ -35,7 +35,7 @@ jobs: ports: - 5000:5000 steps: - - uses: actions/checkout@v4.1.6 + - uses: actions/checkout@v4.1.7 - name: Install qemu dependency run: | diff --git a/.github/workflows/instructlab.yaml b/.github/workflows/instructlab.yaml index 7305afc0..485a3f9b 100644 --- a/.github/workflows/instructlab.yaml +++ b/.github/workflows/instructlab.yaml @@ -43,7 +43,7 @@ jobs: sudo rm -rf /usr/share/dotnet sudo rm -rf "$AGENT_TOOLSDIRECTORY" - - uses: actions/checkout@v4.1.6 + - uses: actions/checkout@v4.1.7 - name: Build Image id: build_image diff --git a/.github/workflows/manual_build_trigger.yaml b/.github/workflows/manual_build_trigger.yaml index 9e1606ea..01da2087 100644 --- a/.github/workflows/manual_build_trigger.yaml +++ b/.github/workflows/manual_build_trigger.yaml @@ -26,7 +26,7 @@ jobs: run: | sudo rm -rf /usr/share/dotnet sudo rm -rf "$AGENT_TOOLSDIRECTORY" - - uses: actions/checkout@v4.1.6 + - uses: actions/checkout@v4.1.7 - name: Build llamacpp_python cuda id: build_llamacpp_python_cuda @@ -64,7 +64,7 @@ jobs: run: | sudo rm -rf /usr/share/dotnet sudo rm -rf "$AGENT_TOOLSDIRECTORY" - - uses: actions/checkout@v4.1.6 + - uses: actions/checkout@v4.1.7 # required for multi-arch builds - name: Install qemu dependency @@ -108,7 +108,7 @@ jobs: run: | sudo rm -rf /usr/share/dotnet sudo rm -rf "$AGENT_TOOLSDIRECTORY" - - uses: actions/checkout@v4.1.6 + - uses: actions/checkout@v4.1.7 # required for multi-arch builds - name: Install qemu dependency run: | @@ -151,7 +151,7 @@ jobs: run: | sudo rm -rf /usr/share/dotnet sudo rm -rf "$AGENT_TOOLSDIRECTORY" - - uses: actions/checkout@v4.1.6 + - uses: actions/checkout@v4.1.7 # required for multi-arch builds - name: Install qemu dependency run: | @@ -190,7 +190,7 @@ jobs: packages: write steps: - - uses: actions/checkout@v4.1.6 + - uses: actions/checkout@v4.1.7 # required for multi-arch builds - name: Install qemu dependency run: | @@ -229,7 +229,7 @@ jobs: packages: write steps: - - uses: actions/checkout@v4.1.6 + - uses: actions/checkout@v4.1.7 # required for multi-arch builds - name: Install qemu dependency @@ -269,7 +269,7 @@ jobs: packages: write steps: - - uses: actions/checkout@v4.1.6 + - uses: actions/checkout@v4.1.7 # required for multi-arch builds - name: Install qemu dependency @@ -309,7 +309,7 @@ jobs: packages: write steps: - - uses: actions/checkout@v4.1.6 + - uses: actions/checkout@v4.1.7 # required for multi-arch builds - name: Install qemu dependency diff --git a/.github/workflows/mirror_repository.yaml b/.github/workflows/mirror_repository.yaml index d3cb9b7b..b135ce5d 100644 --- a/.github/workflows/mirror_repository.yaml +++ b/.github/workflows/mirror_repository.yaml @@ -16,7 +16,7 @@ jobs: if: github.repository == 'containers/ai-lab-recipes' runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v4.1.6 + - uses: actions/checkout@v4.1.7 with: fetch-depth: 0 diff --git a/.github/workflows/model_converter.yaml b/.github/workflows/model_converter.yaml index c63b0106..f4c98fed 100644 --- a/.github/workflows/model_converter.yaml +++ b/.github/workflows/model_converter.yaml @@ -39,7 +39,7 @@ jobs: sudo rm -rf /usr/share/dotnet sudo rm -rf "$AGENT_TOOLSDIRECTORY" - - uses: actions/checkout@v4.1.6 + - uses: actions/checkout@v4.1.7 - name: Install qemu dependency run: | diff --git a/.github/workflows/model_servers.yaml b/.github/workflows/model_servers.yaml index ade93324..a47280a1 100644 --- a/.github/workflows/model_servers.yaml +++ b/.github/workflows/model_servers.yaml @@ -77,7 +77,7 @@ jobs: sudo rm -rf /usr/share/dotnet sudo rm -rf "$AGENT_TOOLSDIRECTORY" - - uses: actions/checkout@v4.1.6 + - uses: actions/checkout@v4.1.7 - name: Install qemu dependency run: | diff --git a/.github/workflows/models.yaml b/.github/workflows/models.yaml index a39b2dc6..04f2c080 100644 --- a/.github/workflows/models.yaml +++ b/.github/workflows/models.yaml @@ -56,7 +56,7 @@ jobs: sudo rm -rf /usr/share/dotnet sudo rm -rf "$AGENT_TOOLSDIRECTORY" - - uses: actions/checkout@v4.1.6 + - uses: actions/checkout@v4.1.7 - name: Install qemu dependency run: | diff --git a/.github/workflows/object_detection.yaml b/.github/workflows/object_detection.yaml index 17143644..d225ef7f 100644 --- a/.github/workflows/object_detection.yaml +++ b/.github/workflows/object_detection.yaml @@ -36,7 +36,7 @@ jobs: ports: - 5000:5000 steps: - - uses: actions/checkout@v4.1.6 + - uses: actions/checkout@v4.1.7 - name: Install qemu dependency run: | diff --git a/.github/workflows/rag.yaml b/.github/workflows/rag.yaml index 4ca5d6c4..1644a768 100644 --- a/.github/workflows/rag.yaml +++ b/.github/workflows/rag.yaml @@ -40,7 +40,7 @@ jobs: sudo rm -rf /usr/share/dotnet sudo rm -rf "$AGENT_TOOLSDIRECTORY" - - uses: actions/checkout@v4.1.6 + - uses: actions/checkout@v4.1.7 - name: Install qemu dependency run: | diff --git a/.github/workflows/summarizer.yaml b/.github/workflows/summarizer.yaml index f629ccf1..21c8c4d3 100644 --- a/.github/workflows/summarizer.yaml +++ b/.github/workflows/summarizer.yaml @@ -35,7 +35,7 @@ jobs: ports: - 5000:5000 steps: - - uses: actions/checkout@v4.1.6 + - uses: actions/checkout@v4.1.7 - name: Install qemu dependency run: | diff --git a/.github/workflows/testing_framework.yaml b/.github/workflows/testing_framework.yaml index 16316950..01b76ea7 100644 --- a/.github/workflows/testing_framework.yaml +++ b/.github/workflows/testing_framework.yaml @@ -44,13 +44,13 @@ jobs: aws_ami_architecture: x86_64 steps: - name: Checkout - uses: actions/checkout@v4.1.6 + uses: actions/checkout@v4.1.7 with: path: main - name: Checkout terraform module id: checkout-module - uses: actions/checkout@v4.1.6 + uses: actions/checkout@v4.1.7 with: repository: containers/terraform-test-environment-module path: terraform-test-environment-module @@ -171,7 +171,7 @@ jobs: if: github.repository == 'containers-mirror/ai-lab-recipes' runs-on: ubuntu-22.04-2core steps: - - uses: actions/checkout@v4.1.6 + - uses: actions/checkout@v4.1.7 - name: chatbot working-directory: ./recipes/natural_language_processing/chatbot diff --git a/.github/workflows/training-e2e.yaml b/.github/workflows/training-e2e.yaml index 2a54bc36..60e12348 100644 --- a/.github/workflows/training-e2e.yaml +++ b/.github/workflows/training-e2e.yaml @@ -41,13 +41,13 @@ jobs: aws_ami_architecture: x86_64 steps: - name: Checkout - uses: actions/checkout@v4.1.6 + uses: actions/checkout@v4.1.7 with: path: main - name: Checkout terraform module id: checkout-module - uses: actions/checkout@v4.1.6 + uses: actions/checkout@v4.1.7 with: repository: containers/terraform-test-environment-module path: terraform-test-environment-module diff --git a/.github/workflows/training_bootc.yaml b/.github/workflows/training_bootc.yaml index ec4d4d87..dce50a9d 100644 --- a/.github/workflows/training_bootc.yaml +++ b/.github/workflows/training_bootc.yaml @@ -46,7 +46,7 @@ jobs: sudo rm -rf /usr/share/dotnet sudo rm -rf "$AGENT_TOOLSDIRECTORY" - - uses: actions/checkout@v4.1.6 + - uses: actions/checkout@v4.1.7 - name: Install qemu dependency run: | @@ -103,7 +103,7 @@ jobs: sudo rm -rf /usr/share/dotnet sudo rm -rf "$AGENT_TOOLSDIRECTORY" - - uses: actions/checkout@v4.1.6 + - uses: actions/checkout@v4.1.7 - name: Build Image id: build_image @@ -159,7 +159,7 @@ jobs: sudo rm -rf /usr/share/dotnet sudo rm -rf "$AGENT_TOOLSDIRECTORY" - - uses: actions/checkout@v4.1.6 + - uses: actions/checkout@v4.1.7 - name: Login to Container Registry uses: redhat-actions/podman-login@v1.7 diff --git a/convert_models/Containerfile b/convert_models/Containerfile index 3e9a58c8..39c3b522 100644 --- a/convert_models/Containerfile +++ b/convert_models/Containerfile @@ -1,4 +1,4 @@ -FROM registry.access.redhat.com/ubi9/python-311:1-62.1716478620 +FROM registry.access.redhat.com/ubi9/python-311:1-66 WORKDIR /opt/app-root/src/converter USER root RUN chown -R default:root /opt/app-root/src/converter diff --git a/eval/promptfoo/base/Containerfile b/eval/promptfoo/base/Containerfile index b4cbb270..c0e2126a 100644 --- a/eval/promptfoo/base/Containerfile +++ b/eval/promptfoo/base/Containerfile @@ -1,4 +1,4 @@ -FROM registry.access.redhat.com/ubi9/nodejs-20-minimal:1-47.1716472878 +FROM registry.access.redhat.com/ubi9/nodejs-20-minimal:1-51 WORKDIR /promptfoo RUN npm install promptfoo ENV PROMPTFOO_DISABLE_TELEMETRY=1 diff --git a/model_servers/llamacpp_python/base/Containerfile b/model_servers/llamacpp_python/base/Containerfile index e1a1516a..ce1d1587 100644 --- a/model_servers/llamacpp_python/base/Containerfile +++ b/model_servers/llamacpp_python/base/Containerfile @@ -1,4 +1,4 @@ -FROM registry.access.redhat.com/ubi9/python-311:1-62.1716478620 +FROM registry.access.redhat.com/ubi9/python-311:1-66 WORKDIR /locallm COPY src . USER root diff --git a/model_servers/llamacpp_python/src/requirements.txt b/model_servers/llamacpp_python/src/requirements.txt index 28ca6806..8ec01572 100644 --- a/model_servers/llamacpp_python/src/requirements.txt +++ b/model_servers/llamacpp_python/src/requirements.txt @@ -1,2 +1,2 @@ -llama-cpp-python[server]==0.2.76 +llama-cpp-python[server]==0.2.78 pip==24.0 diff --git a/model_servers/llamacpp_python/vulkan/amd64/Containerfile b/model_servers/llamacpp_python/vulkan/amd64/Containerfile index 1231472e..f9fec104 100644 --- a/model_servers/llamacpp_python/vulkan/amd64/Containerfile +++ b/model_servers/llamacpp_python/vulkan/amd64/Containerfile @@ -1,4 +1,4 @@ -FROM registry.access.redhat.com/ubi9/python-311:1-62.1716478620 +FROM registry.access.redhat.com/ubi9/python-311:1-66 USER 0 RUN dnf install -y python3-dnf-plugin-versionlock RUN dnf install -y mesa-vulkan-drivers-23.3.3-1.el9.x86_64 diff --git a/model_servers/llamacpp_python/vulkan/arm64/Containerfile b/model_servers/llamacpp_python/vulkan/arm64/Containerfile index 147dc2d3..63008e0c 100644 --- a/model_servers/llamacpp_python/vulkan/arm64/Containerfile +++ b/model_servers/llamacpp_python/vulkan/arm64/Containerfile @@ -1,4 +1,4 @@ -FROM registry.access.redhat.com/ubi9/python-311:1-62.1716478620 +FROM registry.access.redhat.com/ubi9/python-311:1-66 USER 0 RUN dnf install -y python3-dnf-plugin-versionlock && \ dnf install -y \ diff --git a/model_servers/object_detection_python/base/Containerfile b/model_servers/object_detection_python/base/Containerfile index c1897ddc..af7b3f87 100644 --- a/model_servers/object_detection_python/base/Containerfile +++ b/model_servers/object_detection_python/base/Containerfile @@ -1,4 +1,4 @@ -FROM registry.access.redhat.com/ubi9/python-311:1-62.1716478620 +FROM registry.access.redhat.com/ubi9/python-311:1-66 ARG PORT=8000 WORKDIR /app COPY src . diff --git a/model_servers/object_detection_python/src/requirements.txt b/model_servers/object_detection_python/src/requirements.txt index 7edf84ef..b690dcf0 100644 --- a/model_servers/object_detection_python/src/requirements.txt +++ b/model_servers/object_detection_python/src/requirements.txt @@ -7,7 +7,7 @@ fastapi==0.111.0 filelock==3.14.0 fsspec==2024.3.1 h11==0.14.0 -huggingface-hub==0.23.2 +huggingface-hub==0.23.4 idna==3.7 Jinja2==3.1.4 MarkupSafe==2.1.5 @@ -16,7 +16,7 @@ networkx==3.3 numpy==1.26.4 packaging==24.0 pillow==10.3.0 -pydantic==2.7.2 +pydantic==2.7.4 pydantic_core==2.18.3 PyYAML==6.0.1 regex==2024.4.28 @@ -24,13 +24,13 @@ requests==2.31.0 safetensors==0.4.3 sniffio==1.3.1 starlette==0.37.2 -sympy==1.12 +sympy==1.12.1 timm==0.9.16 tokenizers==0.19.1 -torch==2.3.0 -torchvision==0.18.0 +torch==2.3.1 +torchvision==0.18.1 tqdm==4.66.4 transformers==4.40.2 typing_extensions==4.11.0 -urllib3==2.2.1 +urllib3==2.2.2 uvicorn==0.29.0 diff --git a/models/Containerfile b/models/Containerfile index 1a372211..566adbcf 100644 --- a/models/Containerfile +++ b/models/Containerfile @@ -7,7 +7,7 @@ # https://huggingface.co/ggerganov/whisper.cpp/resolve/main/ggml-small.bin # podman build --build-arg="MODEL_URL=https://..." -t quay.io/yourimage . # -FROM registry.access.redhat.com/ubi9/ubi-micro:9.4-6.1716471860 +FROM registry.access.redhat.com/ubi9/ubi-micro:9.4-9 # Can be substituted using the --build-arg defined above ARG MODEL_URL=https://huggingface.co/instructlab/granite-7b-lab-GGUF/resolve/main/granite-7b-lab-Q4_K_M.gguf diff --git a/recipes/audio/audio_to_text/app/Containerfile b/recipes/audio/audio_to_text/app/Containerfile index aada0938..c48dcc2c 100644 --- a/recipes/audio/audio_to_text/app/Containerfile +++ b/recipes/audio/audio_to_text/app/Containerfile @@ -1,4 +1,4 @@ -FROM registry.access.redhat.com/ubi9/python-311:1-62.1716478620 +FROM registry.access.redhat.com/ubi9/python-311:1-66 WORKDIR /locallm COPY requirements.txt /locallm/requirements.txt RUN pip install --upgrade pip && \ diff --git a/recipes/computer_vision/object_detection/app/Containerfile b/recipes/computer_vision/object_detection/app/Containerfile index 9a6e97de..6638c49a 100644 --- a/recipes/computer_vision/object_detection/app/Containerfile +++ b/recipes/computer_vision/object_detection/app/Containerfile @@ -1,4 +1,4 @@ -FROM registry.access.redhat.com/ubi9/python-311:1-62.1716478620 +FROM registry.access.redhat.com/ubi9/python-311:1-66 WORKDIR /locallm COPY requirements.txt /locallm/requirements.txt RUN pip install --upgrade pip && \ diff --git a/recipes/computer_vision/object_detection/app/requirements.txt b/recipes/computer_vision/object_detection/app/requirements.txt index 5c452c6e..ad64d16b 100644 --- a/recipes/computer_vision/object_detection/app/requirements.txt +++ b/recipes/computer_vision/object_detection/app/requirements.txt @@ -34,7 +34,7 @@ streamlit==1.33.0 tenacity==8.2.3 toml==0.10.2 toolz==0.12.1 -tornado==6.4 +tornado==6.4.1 typing_extensions==4.11.0 tzdata==2024.1 -urllib3==2.2.1 +urllib3==2.2.2 diff --git a/recipes/multimodal/image_understanding/app/Containerfile b/recipes/multimodal/image_understanding/app/Containerfile index f0a4412c..0c071dd8 100644 --- a/recipes/multimodal/image_understanding/app/Containerfile +++ b/recipes/multimodal/image_understanding/app/Containerfile @@ -1,4 +1,4 @@ -FROM registry.access.redhat.com/ubi9/python-311:1-62.1716478620 +FROM registry.access.redhat.com/ubi9/python-311:1-66 WORKDIR /image_understanding COPY requirements.txt . RUN pip install --upgrade pip && \ diff --git a/recipes/natural_language_processing/chatbot/app/Containerfile b/recipes/natural_language_processing/chatbot/app/Containerfile index e919757a..863fcd98 100644 --- a/recipes/natural_language_processing/chatbot/app/Containerfile +++ b/recipes/natural_language_processing/chatbot/app/Containerfile @@ -1,4 +1,4 @@ -FROM registry.access.redhat.com/ubi9/python-311:1-62.1716478620 +FROM registry.access.redhat.com/ubi9/python-311:1-66 WORKDIR /chat COPY requirements.txt . RUN pip install --upgrade pip diff --git a/recipes/natural_language_processing/codegen/app/Containerfile b/recipes/natural_language_processing/codegen/app/Containerfile index ae076b73..70cd2e3e 100644 --- a/recipes/natural_language_processing/codegen/app/Containerfile +++ b/recipes/natural_language_processing/codegen/app/Containerfile @@ -1,4 +1,4 @@ -FROM registry.access.redhat.com/ubi9/python-311:1-62.1716478620 +FROM registry.access.redhat.com/ubi9/python-311:1-66 WORKDIR /codegen COPY requirements.txt . RUN pip install --upgrade pip diff --git a/recipes/natural_language_processing/rag/app/Containerfile b/recipes/natural_language_processing/rag/app/Containerfile index fd130a7a..a7badbe3 100644 --- a/recipes/natural_language_processing/rag/app/Containerfile +++ b/recipes/natural_language_processing/rag/app/Containerfile @@ -1,4 +1,4 @@ -FROM registry.access.redhat.com/ubi9/python-311:1-62.1716478620 +FROM registry.access.redhat.com/ubi9/python-311:1-66 ### Update sqlite for chroma USER root RUN dnf remove sqlite3 -y diff --git a/recipes/natural_language_processing/rag/app/requirements.txt b/recipes/natural_language_processing/rag/app/requirements.txt index 70907349..9f430424 100644 --- a/recipes/natural_language_processing/rag/app/requirements.txt +++ b/recipes/natural_language_processing/rag/app/requirements.txt @@ -1,6 +1,6 @@ langchain-openai==0.1.7 langchain==0.1.20 -chromadb==0.5.0 +chromadb==0.5.1 sentence-transformers==2.7.0 streamlit==1.34.0 pypdf==4.2.0 diff --git a/recipes/natural_language_processing/summarizer/app/Containerfile b/recipes/natural_language_processing/summarizer/app/Containerfile index 09ff583d..4e344240 100644 --- a/recipes/natural_language_processing/summarizer/app/Containerfile +++ b/recipes/natural_language_processing/summarizer/app/Containerfile @@ -1,4 +1,4 @@ -FROM registry.access.redhat.com/ubi9/python-311:1-62.1716478620 +FROM registry.access.redhat.com/ubi9/python-311:1-66 WORKDIR /summarizer COPY requirements.txt . RUN pip install --upgrade pip diff --git a/recipes/natural_language_processing/summarizer/app/requirements.txt b/recipes/natural_language_processing/summarizer/app/requirements.txt index b870e681..964c12eb 100644 --- a/recipes/natural_language_processing/summarizer/app/requirements.txt +++ b/recipes/natural_language_processing/summarizer/app/requirements.txt @@ -1,5 +1,5 @@ langchain==0.1.20 langchain-openai==0.1.7 streamlit==1.34.0 -PyMuPDF==1.24.4 +PyMuPDF==1.24.5 rouge_score==0.1.2 diff --git a/requirements-test.txt b/requirements-test.txt index 0b86a7d5..66d120f4 100644 --- a/requirements-test.txt +++ b/requirements-test.txt @@ -2,7 +2,7 @@ pip==24.0 pytest-container==0.4.2 pytest-selenium==4.1.0 pytest-testinfra==10.1.1 -pytest==8.2.1 +pytest==8.2.2 requests==2.31.0 selenium==4.20.0 tenacity==8.2.3