Spin Model Server in chatbot recipe

Signed-off-by: Liora Milbaum <[email protected]>
containers · Mar 31, 2024 · e72be5b · e72be5b
1 parent 36c6389
commit e72be5b
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 13 deletions.
diff --git a/.github/workflows/chatbot.yaml b/.github/workflows/chatbot.yaml
@@ -4,15 +4,9 @@ on:
   pull_request:
     branches:
       - main
-    paths:
-      - ./recipes/natural_language_processing/chatbot/**
-      - .github/workflows/chatbot.yaml
   push:
     branches:
       - main
-    paths:
-      - ./recipes/natural_language_processing/chatbot/**
-      - .github/workflows/chatbot.yaml
 
 env:
   REGISTRY: ghcr.io

diff --git a/.github/workflows/model_servers.yaml b/.github/workflows/model_servers.yaml
@@ -4,15 +4,9 @@ on:
   pull_request:
     branches:
       - main
-    paths:
-      - ./model_servers/llamacpp_python/**
-      - .github/workflows/model_servers.yaml
   push:
     branches:
       - main
-    paths:
-      - ./model_servers/llamacpp_python/**
-      - .github/workflows/model_servers.yaml
 
 env:
   REGISTRY: ghcr.io

diff --git a/recipes/natural_language_processing/chatbot/Makefile b/recipes/natural_language_processing/chatbot/Makefile
@@ -30,11 +30,12 @@ quadlet:
 .PHONY: install
 install:
 	pip install -r tests/requirements-test.txt
+	sudo snap install firefox
 
 .PHONY: run
 run: 
 	podman run -it -p 8501:8501 -e MODEL_SERVICE_ENDPOINT=http://10.88.0.1:8001/v1 ghcr.io/ai-lab-recipes/${APP}
 
 .PHONY: test
 test:
-	pytest --log-cli-level NOTSET
+	pytest --driver Firefox
diff --git a/recipes/natural_language_processing/chatbot/tests/conftest.py b/recipes/natural_language_processing/chatbot/tests/conftest.py
@@ -1,7 +1,31 @@
 import pytest_container
 import os
+import pytest
 
 
+MS = pytest_container.Container(
+        url=f"containers-storage:{os.environ['REGISTRY']}/model_servers",
+        volume_mounts=[
+            pytest_container.container.BindMount(
+                container_path="/locallm/models",
+                host_path="./",
+                flags=["ro"]
+            )
+        ],
+        extra_environment_variables={
+            "MODEL_PATH": "models/mistral-7b-instruct-v0.1.Q4_K_M.gguf",
+            "HOST": "0.0.0.0",
+            "PORT": "8001"
+        },
+        forwarded_ports=[
+            pytest_container.PortForwarding(
+                container_port=8001,
+                host_port=8001
+            )
+        ],
+        extra_launch_args=["--net=host"]
+    )
+
 CB = pytest_container.Container(
         url=f"containers-storage:{os.environ['REGISTRY']}/{os.environ['IMAGE_NAME']}",
         extra_environment_variables={
@@ -21,3 +45,8 @@ def pytest_generate_tests(metafunc):
 
 def pytest_addoption(parser):
     pytest_container.add_logging_level_options(parser)
+
+@pytest.fixture
+def firefox_options(firefox_options):
+    firefox_options.headless = True
+    return firefox_options
diff --git a/recipes/natural_language_processing/chatbot/tests/test_alive.py b/recipes/natural_language_processing/chatbot/tests/test_alive.py
@@ -10,3 +10,7 @@ def test_etc_os_release_present(auto_container: pytest_container.container.Conta
 @tenacity.retry(stop=tenacity.stop_after_attempt(5), wait=tenacity.wait_exponential())
 def test_alive(auto_container: pytest_container.container.ContainerData, host):
     host.run_expect([0],f"curl http://localhost:{auto_container.forwarded_ports[0].host_port}",).stdout.strip()
+
+@tenacity.retry(stop=tenacity.stop_after_attempt(5), wait=tenacity.wait_exponential())
+def test_ui(auto_container: pytest_container.container.ContainerData, selenium):
+    selenium.get("http://localhost:{auto_container.forwarded_ports[0].host_port}")
diff --git a/requirements-test.txt b/requirements-test.txt
@@ -1,5 +1,6 @@
 pip==24.0
 pytest-container==0.4.0
+pytest-selenium==4.1.0
 pytest-testinfra==10.1.0
 pytest==8.1.1
 requests==2.31.0