test: reorganize folder

Harry Le · Harry Le · commit 24c3f2d42a92 · 2025-02-20T13:07:40.000+07:00
diff --git a/engine/e2e-test/api/engines/test_api_engine.py b/engine/e2e-test/api/engines/test_api_engine.py
@@ -0,0 +1,100 @@
+import pytest
+import requests
+import time
+from utils.test_runner import (
+    start_server,
+    stop_server,
+    wait_for_websocket_download_success_event,
+)
+
+class TestApiEngine:
+
+    @pytest.fixture(autouse=True)
+    def setup_and_teardown(self):
+        # Setup
+        success = start_server()
+        if not success:
+            raise Exception("Failed to start server")
+
+        yield
+
+        # Teardown
+        stop_server()
+    
+    # engines get
+    def test_engines_get_llamacpp_should_be_successful(self):
+        response = requests.get("http://localhost:3928/engines/llama-cpp")
+        assert response.status_code == 200
+        
+    # engines install
+    def test_engines_install_llamacpp_specific_version_and_variant(self):
+        data = {"version": "v0.1.40-b4354", "variant": "linux-amd64-avx-cuda-11-7"}
+        response = requests.post(
+            "http://localhost:3928/v1/engines/llama-cpp/install", json=data
+        )
+        assert response.status_code == 200
+
+    def test_engines_install_llamacpp_specific_version_and_null_variant(self):
+        data = {"version": "v0.1.40-b4354"}
+        response = requests.post(
+            "http://localhost:3928/v1/engines/llama-cpp/install", json=data
+        )
+        assert response.status_code == 200
+    
+    # engines uninstall
+    @pytest.mark.asyncio
+    async def test_engines_install_uninstall_llamacpp_should_be_successful(self):
+        response = requests.post("http://localhost:3928/v1/engines/llama-cpp/install")
+        assert response.status_code == 200
+        await wait_for_websocket_download_success_event(timeout=None)
+        time.sleep(30)
+
+        response = requests.delete("http://localhost:3928/v1/engines/llama-cpp/install")
+        assert response.status_code == 200
+
+    @pytest.mark.asyncio
+    async def test_engines_install_uninstall_llamacpp_with_only_version_should_be_failed(self):
+        # install first
+        data = {"variant": "mac-arm64"}
+        install_response = requests.post(
+            "http://127.0.0.1:3928/v1/engines/llama-cpp/install", json=data
+        )
+        await wait_for_websocket_download_success_event(timeout=120)
+        assert install_response.status_code == 200
+
+        data = {"version": "v0.1.35"}
+        response = requests.delete(
+            "http://localhost:3928/v1/engines/llama-cpp/install", json=data
+        )
+        assert response.status_code == 400
+        assert response.json()["message"] == "No variant provided"
+
+    @pytest.mark.asyncio
+    async def test_engines_install_uninstall_llamacpp_with_variant_should_be_successful(self):
+        # install first
+        data = {"variant": "mac-arm64"}
+        install_response = requests.post(
+            "http://127.0.0.1:3928/v1/engines/llama-cpp/install", json=data
+        )
+        await wait_for_websocket_download_success_event(timeout=120)
+        assert install_response.status_code == 200
+
+        response = requests.delete("http://127.0.0.1:3928/v1/engines/llama-cpp/install")
+        assert response.status_code == 200
+
+    def test_engines_install_uninstall_llamacpp_with_specific_variant_and_version_should_be_successful(
+        self,
+    ):
+        data = {"variant": "mac-arm64", "version": "v0.1.35"}
+        # install first
+        install_response = requests.post(
+            "http://localhost:3928/v1/engines/llama-cpp/install", json=data
+        )
+        assert install_response.status_code == 200
+
+        response = requests.delete(
+            "http://localhost:3928/v1/engines/llama-cpp/install", json=data
+        )
+        assert response.status_code == 200
+
+    
diff --git a/engine/e2e-test/api/engines/test_api_engine_install_nightly.py b/engine/e2e-test/api/engines/test_api_engine_install_nightly.py
@@ -1,6 +1,6 @@
 import pytest
 import requests
-from test_runner import start_server, stop_server, get_latest_pre_release_tag
+from utils.test_runner import start_server, stop_server, get_latest_pre_release_tag
 
 latest_pre_release_tag = get_latest_pre_release_tag("janhq", "cortex.llamacpp")
 
diff --git a/engine/e2e-test/api/engines/test_api_engine_list.py b/engine/e2e-test/api/engines/test_api_engine_list.py
@@ -1,6 +1,6 @@
 import pytest
 import requests
-from test_runner import start_server, stop_server
+from utils.test_runner import start_server, stop_server
 
 
 class TestApiEngineList:
diff --git a/engine/e2e-test/api/engines/test_api_engine_update.py b/engine/e2e-test/api/engines/test_api_engine_update.py
@@ -1,6 +1,6 @@
 import pytest
 import requests
-from test_runner import (
+from utils.test_runner import (
     start_server,
     stop_server,
     wait_for_websocket_download_success_event,
diff --git a/engine/e2e-test/api/hub/test_api_cortexso_hub_llamacpp_engine.py b/engine/e2e-test/api/hub/test_api_cortexso_hub_llamacpp_engine.py
@@ -4,7 +4,7 @@
 import yaml
 
 from pathlib import Path
-from test_runner import (
+from utils.test_runner import (
     run,
     start_server,
     stop_server,
diff --git a/engine/e2e-test/api/model/test_api_docker.py b/engine/e2e-test/api/model/test_api_docker.py
@@ -1,6 +1,6 @@
 import pytest
 import requests
-from test_runner import wait_for_websocket_download_success_event
+from utils.test_runner import wait_for_websocket_download_success_event
 
 repo_branches = ["tinyllama:1b-gguf"]
 
diff --git a/engine/e2e-test/api/model/test_api_model.py b/engine/e2e-test/api/model/test_api_model.py
@@ -1,7 +1,7 @@
 import pytest
 import requests
 import time
-from test_runner import (
+from utils.test_runner import (
     run,
     start_server,
     stop_server,
diff --git a/engine/e2e-test/api/model/test_api_model_import.py b/engine/e2e-test/api/model/test_api_model_import.py
@@ -1,6 +1,6 @@
 import pytest
 import requests
-from test_runner import start_server, stop_server
+from utils.test_runner import start_server, stop_server
 
 class TestApiModelImport:
     @pytest.fixture(autouse=True)
diff --git a/engine/e2e-test/cli/common/test_cli_server_start.py b/engine/e2e-test/cli/common/test_cli_server_start.py
@@ -1,8 +1,8 @@
 import platform
 import os
 import pytest, requests
-from test_runner import run
-from test_runner import start_server, stop_server
+from utils.test_runner import run
+from utils.test_runner import start_server, stop_server
 
 
 class TestCliServerStart:
diff --git a/engine/e2e-test/cli/common/test_cortex_update.py b/engine/e2e-test/cli/common/test_cortex_update.py
@@ -2,7 +2,7 @@
 import tempfile
 
 import pytest
-from test_runner import run
+from utils.test_runner import run
 
 
 class TestCortexUpdate:
diff --git a/engine/e2e-test/cli/common/test_create_log_folder.py b/engine/e2e-test/cli/common/test_create_log_folder.py
@@ -2,8 +2,8 @@
 import os
 from pathlib import Path
 import pytest, requests, shutil
-from test_runner import run
-from test_runner import start_server, stop_server
+from utils.test_runner import run
+from utils.test_runner import start_server, stop_server
 
 
 class TestCreateLogFolder:
diff --git a/engine/e2e-test/cli/engines/test_cli_engine_get.py b/engine/e2e-test/cli/engines/test_cli_engine_get.py
@@ -1,7 +1,7 @@
 import platform
 
 import pytest
-from test_runner import run, start_server, stop_server
+from utils.test_runner import run, start_server, stop_server
 
 
 class TestCliEngineGet:
diff --git a/engine/e2e-test/cli/engines/test_cli_engine_install.py b/engine/e2e-test/cli/engines/test_cli_engine_install.py
@@ -3,7 +3,7 @@
 
 import pytest
 import requests
-from test_runner import run, start_server, stop_server
+from utils.test_runner import run, start_server, stop_server
 
 
 class TestCliEngineInstall:
diff --git a/engine/e2e-test/cli/engines/test_cli_engine_install_nightly.py b/engine/e2e-test/cli/engines/test_cli_engine_install_nightly.py
@@ -3,7 +3,7 @@
 
 import pytest
 import requests
-from test_runner import run, start_server, stop_server, get_latest_pre_release_tag
+from utils.test_runner import run, start_server, stop_server, get_latest_pre_release_tag
 
 latest_pre_release_tag = get_latest_pre_release_tag("janhq", "cortex.llamacpp")
 
diff --git a/engine/e2e-test/cli/engines/test_cli_engine_list.py b/engine/e2e-test/cli/engines/test_cli_engine_list.py
@@ -1,7 +1,7 @@
 import platform
 
 import pytest
-from test_runner import run, start_server, stop_server
+from utils.test_runner import run, start_server, stop_server
 
 
 class TestCliEngineList:
diff --git a/engine/e2e-test/cli/engines/test_cli_engine_uninstall.py b/engine/e2e-test/cli/engines/test_cli_engine_uninstall.py
@@ -1,6 +1,6 @@
 import pytest
 import requests
-from test_runner import (
+from utils.test_runner import (
     run,
     start_server,
     stop_server,
diff --git a/engine/e2e-test/cli/model/test_cli_model.py b/engine/e2e-test/cli/model/test_cli_model.py
@@ -2,7 +2,7 @@
 import requests
 import os
 from pathlib import Path
-from test_runner import (
+from utils.test_runner import (
     run,
     start_server,
     stop_server,
diff --git a/engine/e2e-test/cli/model/test_cli_model_import.py b/engine/e2e-test/cli/model/test_cli_model_import.py
@@ -1,6 +1,6 @@
 import pytest
-from test_runner import run
-from test_runner import start_server, stop_server
+from utils.test_runner import run
+from utils.test_runner import start_server, stop_server
 
 class TestCliModelImport:
     
diff --git a/engine/e2e-test/cli/model/test_cli_model_pull_cortexso_with_selection.py b/engine/e2e-test/cli/model/test_cli_model_pull_cortexso_with_selection.py
@@ -1,4 +1,4 @@
-from test_runner import popen
+from utils.test_runner import popen
 import os
 from pathlib import Path
 
diff --git a/engine/e2e-test/cli/model/test_cli_model_pull_from_cortexso.py b/engine/e2e-test/cli/model/test_cli_model_pull_from_cortexso.py
@@ -1,5 +1,5 @@
 import pytest
-from test_runner import run
+from utils.test_runner import run
 
 
 class TestCliModelPullCortexso:
diff --git a/engine/e2e-test/cli/model/test_cli_model_pull_hugging_face_repository.py b/engine/e2e-test/cli/model/test_cli_model_pull_hugging_face_repository.py
@@ -1,5 +1,5 @@
 import pytest
-from test_runner import popen
+from utils.test_runner import popen
 
 
 class TestCliModelPullHuggingFaceRepository:
diff --git a/engine/e2e-test/cortex-llamacpp-e2e-nightly.py b/engine/e2e-test/cortex-llamacpp-e2e-nightly.py
diff --git a/engine/e2e-test/main-harry.py b/engine/e2e-test/main-harry.py
diff --git a/engine/e2e-test/main.py b/engine/e2e-test/main.py
diff --git a/engine/e2e-test/runner/cortex-llamacpp-e2e-nightly.py b/engine/e2e-test/runner/cortex-llamacpp-e2e-nightly.py
@@ -0,0 +1,36 @@
+import pytest
+import sys
+import os
+
+# Add the project root to sys.path
+PROJECT_ROOT = os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))
+
+
+# Add all necessary paths
+sys.path.append(PROJECT_ROOT)               
+sys.path.append(os.path.join(PROJECT_ROOT, "api/engines"))  
+sys.path.append(os.path.join(PROJECT_ROOT, "api/hub"))  
+sys.path.append(os.path.join(PROJECT_ROOT, "api/model"))  
+sys.path.append(os.path.join(PROJECT_ROOT, "cli/engines"))  
+sys.path.append(os.path.join(PROJECT_ROOT, "cli/model"))  
+sys.path.append(os.path.join(PROJECT_ROOT, "cli/common"))  
+
+### e2e tests are expensive, have to keep engines tests in order
+from api.engines.test_api_engine_list import TestApiEngineList
+from api.engines.test_api_engine_install_nightly import TestApiEngineInstall
+from api.model.test_api_model import TestApiModel
+from api.model.test_api_model_import import TestApiModelImport
+
+###
+from cli.engines.test_cli_engine_get import TestCliEngineGet
+from cli.engines.test_cli_engine_install_nightly import TestCliEngineInstall
+from cli.engines.test_cli_engine_list import TestCliEngineList
+from cli.engines.test_cli_engine_uninstall import TestCliEngineUninstall
+from cli.model.test_cli_model import TestCliModel
+from cli.model.test_cli_model_import import TestCliModelImport
+from cli.common.test_cli_server_start import TestCliServerStart
+from cli.common.test_cortex_update import TestCortexUpdate
+from cli.common.test_create_log_folder import TestCreateLogFolder
+
+if __name__ == "__main__":
+    sys.exit(pytest.main([__file__, "-v"]))
diff --git a/engine/e2e-test/runner/main.py b/engine/e2e-test/runner/main.py
@@ -0,0 +1,36 @@
+import pytest
+import sys
+import os
+
+# Add the project root to sys.path
+PROJECT_ROOT = os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))
+
+
+# Add all necessary paths
+sys.path.append(PROJECT_ROOT)               
+sys.path.append(os.path.join(PROJECT_ROOT, "api/engines"))  
+sys.path.append(os.path.join(PROJECT_ROOT, "api/hub"))  
+sys.path.append(os.path.join(PROJECT_ROOT, "api/model"))  
+sys.path.append(os.path.join(PROJECT_ROOT, "cli/engines"))  
+sys.path.append(os.path.join(PROJECT_ROOT, "cli/model"))  
+sys.path.append(os.path.join(PROJECT_ROOT, "cli/common"))  
+
+### e2e tests are expensive, have to keep engines tests in order
+from api.engines.test_api_engine_list import TestApiEngineList
+from api.engines.test_api_engine import TestApiEngine
+from api.model.test_api_model import TestApiModel
+from api.model.test_api_model_import import TestApiModelImport
+
+###
+from cli.engines.test_cli_engine_get import TestCliEngineGet
+from cli.engines.test_cli_engine_install import TestCliEngineInstall
+from cli.engines.test_cli_engine_list import TestCliEngineList
+from cli.engines.test_cli_engine_uninstall import TestCliEngineUninstall
+from cli.model.test_cli_model import TestCliModel
+from cli.model.test_cli_model_import import TestCliModelImport
+from cli.common.test_cli_server_start import TestCliServerStart
+from cli.common.test_cortex_update import TestCortexUpdate
+from cli.common.test_create_log_folder import TestCreateLogFolder
+
+if __name__ == "__main__":
+    sys.exit(pytest.main([__file__, "-v"]))
diff --git a/engine/e2e-test/test_api_engine.py b/engine/e2e-test/test_api_engine.py
diff --git a/engine/e2e-test/utils/logger.py b/engine/e2e-test/utils/logger.py
diff --git a/engine/e2e-test/utils/test_runner.py b/engine/e2e-test/utils/test_runner.py
