feat: move python env setup to full UV flow (#185)

Author: rjtokenring

.licenses/arduino-app-bricks/pip/langsmith.dep.yml

@@ -1,11 +1,13 @@
 ---
 name: langsmith
-version: 0.7.38
+version: 0.8.0
 type: pip
 summary: Client library to connect to the LangSmith Observability and Evaluation Platform.
 homepage: https://smith.langchain.com/
 license: mit
-licenses: |
+licenses:
+- sources: LICENSE
+  text: |
     MIT License
 
     Copyright (c) 2023 LangChain

Taskfile.dist.yml

@@ -44,8 +44,8 @@ tasks:
       - apt-get install -y --no-install-recommends --no-install-suggests libavcodec-dev libavformat-dev libavutil-dev libswscale-dev
       - apt-get install -y --no-install-recommends --no-install-suggests libjpeg62-turbo-dev libpng-dev libtiff-dev libwebp-dev libopenblas-dev liblapacke-dev
       - apt-get install -y --no-install-recommends --no-install-suggests libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev
-      - pip install build
-      - pip install -e ".[dev]"
+      - pip install --no-cache-dir build
+      - pip install --no-cache-dir -e ".[dev]"
 
   doc:
     desc: Generate documentation

containers/python-apps-base/Dockerfile

@@ -12,7 +12,7 @@ COPY ./streamlit/config.toml /home/app/.streamlit/config.toml
 COPY ./*.sh /
 COPY ./arduino*.whl /app/
 RUN bash -c 'WHL_FILES=(/app/*.whl) && uv pip install --system --no-cache-dir "${WHL_FILES[@]}"[all]'; \
-    rm /app/*.whl; \
+    rm /app/*.whl; \    
     # fix permissions for /home/app
     chown arduino:arduino -R /home/app; \
     chmod 777 -R /home/app; \

containers/python-apps-base/run.sh

@@ -123,6 +123,10 @@ if [ "$1" = "provision" ]; then
   arduino-bricks-list-modules --provision-compose
 else
   if grep -q "arduino:streamlit_ui" "$APP_YAML"; then
+    if ! uv pip show streamlit > /dev/null 2>&1; then
+      echo "streamlit not found, installing..."
+      uv pip install --no-cache-dir --link-mode=copy pyarrow==20.0.0 streamlit
+    fi
     exec streamlit run --server.port 7000 "$PYTHON_SCRIPT"
   else
     echo "======== App is starting ============================"

containers/python-base/requirements-base.txt

@@ -1,11 +1,8 @@
-uv
 pandas==2.3.2
 pillow
 pyyaml
 requests
 pyalsaaudio==0.11.0
-pyarrow==20.0.0
-streamlit
 pyzbar
 cryptography
 pyaudio

pyproject.toml

@@ -64,7 +64,7 @@ web_ui = [
     "cryptography",
 ]
 streamlit_ui = [
-    "streamlit",
+    # Deps are a pre-requirement
 ]
 mood_detector = [
     "nltk",

src/arduino/app_internal/core/module.py

@@ -337,8 +337,8 @@ def _update_compose_release_version(
         substitution = "-runner:" + release_version
         # First replace branch-name style tags (e.g. dev-next, feature-foo); branch names start with a letter
         updated_content = re.sub(r"-runner:[a-zA-Z][a-zA-Z0-9._/-]*", substitution, updated_content)
-        # Then replace semver style tags (e.g. 1.2.3)
-        updated_content = re.sub(r"-runner:[0-9]+\.[0-9]+\.[0-9]+", substitution, updated_content)
+        # Then replace semver style tags (e.g. 1.2.3, 1.2.3rc1)
+        updated_content = re.sub(r"-runner:[0-9]+\.[0-9]+\.[0-9]+(rc[0-9]+)?", substitution, updated_content)
 
     substitution = release_version
     updated_content = re.sub(r"\${APPSLAB_VERSION:\-([^}]+)?}", substitution, updated_content)

tests/arduino/app_core/brick_compose_ai_rc.yaml

@@ -0,0 +1,5 @@
+services:
+  models-runner:
+    image: ${DOCKER_REGISTRY_BASE:-ghcr.io/arduino/}app-bricks/ei-models-runner:0.10.0rc1
+    ports:
+      - "${BIND_ADDRESS:-127.0.0.1}:${BIND_PORT:-8100}:8100"

tests/arduino/app_core/test_docker_compose_utils.py

@@ -198,6 +198,28 @@ def test_release_branch_tag_to_branch_tag_ai():
     os.remove(new_path)
 
 
+def test_release_rc_semver_to_semver_ai():
+    """Test that an rc semver tag (e.g. 0.10.0rc1) is fully replaced, leaving no rc suffix behind."""
+    compose_file_path = "tests/arduino/app_core/brick_compose_ai_rc.yaml"
+    release_version = "1.0.0"
+    with open(compose_file_path, "r") as file:
+        content = file.read()
+        assert "ei-models-runner:0.10.0rc1" in content
+    new_path = _update_compose_release_version(
+        compose_file_path=compose_file_path,
+        release_version=release_version,
+        append_suffix=True,
+        only_ai_containers=True,
+    )
+    with open(new_path, "r") as file:
+        content = file.read()
+        assert "ei-models-runner:1.0.0" in content
+        assert "rc1" not in content
+    import os
+
+    os.remove(new_path)
+
+
 def test_release_no_runner_skipped():
     """Test that a compose file without any -runner image is left untouched when only_ai_containers=True."""
     compose_file_path = "tests/arduino/app_core/brick_compose_test_data.yaml"