refactor: update config in tests

unixcrh · Mar 11, 2024 · 59c4af1 · 59c4af1
1 parent 3bf371b
commit 59c4af1
Show file tree

Hide file tree

Showing 17 changed files with 36 additions and 32 deletions.
diff --git a/backend/tests/common/utils.py b/backend/tests/common/utils.py
@@ -1,8 +1,8 @@
 import requests
 from typing import Dict
 
-from tests.settings import HOST, WEB_SERVICE_PORT, API_SERVICE_PORT
-from config import CONFIG
+from tests.settings import HOST, WEB_SERVICE_PORT
+from app.config import CONFIG
 
 
 class ResponseWrapper:
@@ -22,20 +22,20 @@ def get_token():
     app_base_url = f"{HOST}:{WEB_SERVICE_PORT}{CONFIG.WEB_ROUTE_PREFIX}"
     login_data = {"username": CONFIG.DEFAULT_ADMIN_USERNAME, "password": CONFIG.DEFAULT_ADMIN_PASSWORD}
     response = requests.post(f"{app_base_url}/admins/login", json=login_data)
-    return response.json()['data']['token']
+    return response.json()["data"]["token"]
 
 
 Token = get_token()
 
 
 def get_apikey():
     app_base_url = f"{HOST}:{WEB_SERVICE_PORT}{CONFIG.WEB_ROUTE_PREFIX}"
-    create_apikey_res = requests.post(f"{app_base_url}/apikeys", headers=get_headers(Token),
-                                      json={"name": "test_apikey"})
-    apikey_id = create_apikey_res.json()['data']['apikey_id']
-    apikey_res = requests.get(f"{app_base_url}/apikeys/{apikey_id}", headers=get_headers(Token),
-                              params={"plain": True})
-    return apikey_res.json()['data']['apikey']
+    create_apikey_res = requests.post(
+        f"{app_base_url}/apikeys", headers=get_headers(Token), json={"name": "test_apikey"}
+    )
+    apikey_id = create_apikey_res.json()["data"]["apikey_id"]
+    apikey_res = requests.get(f"{app_base_url}/apikeys/{apikey_id}", headers=get_headers(Token), params={"plain": True})
+    return apikey_res.json()["data"]["apikey"]
 
 
 if CONFIG.API:

diff --git a/backend/tests/services_api/admin/admin.py b/backend/tests/services_api/admin/admin.py
@@ -3,7 +3,7 @@
 from typing import Dict
 from tests.common.utils import ResponseWrapper, get_headers
 from tests.settings import HOST, WEB_SERVICE_PORT
-from config import CONFIG
+from app.config import CONFIG
 
 BASE_URL = f"{HOST}:{WEB_SERVICE_PORT}{CONFIG.WEB_ROUTE_PREFIX}"
 

diff --git a/backend/tests/services_api/apikey/apikey.py b/backend/tests/services_api/apikey/apikey.py
@@ -2,7 +2,7 @@
 from typing import Dict
 from tests.common.utils import ResponseWrapper, get_headers, Token
 from tests.settings import HOST, WEB_SERVICE_PORT
-from config import CONFIG
+from app.config import CONFIG
 
 BASE_URL = f"{HOST}:{WEB_SERVICE_PORT}{CONFIG.WEB_ROUTE_PREFIX}"
 

diff --git a/backend/tests/services_api/assistant/assistant.py b/backend/tests/services_api/assistant/assistant.py
@@ -3,13 +3,14 @@
 
 from tests.common.utils import ResponseWrapper, get_headers, Token
 from tests.settings import HOST
-from config import CONFIG
+from app.config import CONFIG
 
 if CONFIG.WEB:
     BASE_URL = f"{HOST}:{CONFIG.SERVICE_PORT}{CONFIG.WEB_ROUTE_PREFIX}"
 elif CONFIG.API:
     BASE_URL = f"{HOST}:{CONFIG.SERVICE_PORT}{CONFIG.API_ROUTE_PREFIX}"
     from tests.common.utils import APIKEY
+
     Token = APIKEY
 
 

diff --git a/backend/tests/services_api/assistant/chat.py b/backend/tests/services_api/assistant/chat.py
@@ -3,13 +3,14 @@
 
 from tests.common.utils import ResponseWrapper, get_headers, Token
 from tests.settings import HOST
-from config import CONFIG
+from app.config import CONFIG
 
 if CONFIG.WEB:
     BASE_URL = f"{HOST}:{CONFIG.SERVICE_PORT}{CONFIG.WEB_ROUTE_PREFIX}"
 elif CONFIG.API:
     BASE_URL = f"{HOST}:{CONFIG.SERVICE_PORT}{CONFIG.API_ROUTE_PREFIX}"
     from tests.common.utils import APIKEY
+
     Token = APIKEY
 
 

diff --git a/backend/tests/services_api/assistant/message.py b/backend/tests/services_api/assistant/message.py
@@ -3,17 +3,18 @@
 
 from tests.common.utils import ResponseWrapper, get_headers, Token
 from tests.settings import HOST
-from config import CONFIG
+from app.config import CONFIG
 
 if CONFIG.WEB:
     BASE_URL = f"{HOST}:{CONFIG.SERVICE_PORT}{CONFIG.WEB_ROUTE_PREFIX}"
 elif CONFIG.API:
     BASE_URL = f"{HOST}:{CONFIG.SERVICE_PORT}{CONFIG.API_ROUTE_PREFIX}"
     from tests.common.utils import APIKEY
+
     Token = APIKEY
 
 
-async def create_message(assistant_id: str,  chat_id: str, payload: Dict):
+async def create_message(assistant_id: str, chat_id: str, payload: Dict):
     headers = get_headers(Token)
     async with aiohttp.ClientSession(headers=headers) as session:
         request_url = f"{BASE_URL}/assistants/{assistant_id}/chats/{chat_id}/messages"
@@ -25,7 +26,7 @@ async def list_messages(assistant_id: str, chat_id: str, payload: Dict = None):
     headers = get_headers(Token)
     async with aiohttp.ClientSession(headers=headers) as session:
         request_url = f"{BASE_URL}/assistants/{assistant_id}/chats/{chat_id}/messages"
-        response = await session.get(url=request_url,  params=payload)
+        response = await session.get(url=request_url, params=payload)
         return ResponseWrapper(response.status, await response.json())
 
 

diff --git a/backend/tests/services_api/inference/chat_completion.py b/backend/tests/services_api/inference/chat_completion.py
@@ -3,13 +3,14 @@
 
 from tests.common.utils import ResponseWrapper, get_headers, Token
 from tests.settings import HOST
-from config import CONFIG
+from app.config import CONFIG
 
 if CONFIG.WEB:
     BASE_URL = f"{HOST}:{CONFIG.SERVICE_PORT}{CONFIG.WEB_ROUTE_PREFIX}"
 elif CONFIG.API:
     BASE_URL = f"{HOST}:{CONFIG.SERVICE_PORT}{CONFIG.API_ROUTE_PREFIX}"
     from tests.common.utils import APIKEY
+
     Token = APIKEY
 
 

diff --git a/backend/tests/services_api/inference/text_embedding.py b/backend/tests/services_api/inference/text_embedding.py
@@ -3,13 +3,14 @@
 
 from tests.common.utils import ResponseWrapper, get_headers, Token
 from tests.settings import HOST
-from config import CONFIG
+from app.config import CONFIG
 
 if CONFIG.WEB:
     BASE_URL = f"{HOST}:{CONFIG.SERVICE_PORT}{CONFIG.WEB_ROUTE_PREFIX}"
 elif CONFIG.API:
     BASE_URL = f"{HOST}:{CONFIG.SERVICE_PORT}{CONFIG.API_ROUTE_PREFIX}"
     from tests.common.utils import APIKEY
+
     Token = APIKEY
 
 

diff --git a/backend/tests/services_api/model/model.py b/backend/tests/services_api/model/model.py
@@ -3,7 +3,7 @@
 
 from tests.common.utils import ResponseWrapper, get_headers, Token
 from tests.settings import HOST, WEB_SERVICE_PORT
-from config import CONFIG
+from app.config import CONFIG
 
 BASE_URL = f"{HOST}:{WEB_SERVICE_PORT}{CONFIG.WEB_ROUTE_PREFIX}"
 

diff --git a/backend/tests/services_api/model/model_schemas.py b/backend/tests/services_api/model/model_schemas.py
@@ -3,7 +3,7 @@
 
 from tests.common.utils import ResponseWrapper, get_headers, Token
 from tests.settings import HOST, WEB_SERVICE_PORT
-from config import CONFIG
+from app.config import CONFIG
 
 BASE_URL = f"{HOST}:{WEB_SERVICE_PORT}{CONFIG.WEB_ROUTE_PREFIX}"
 

diff --git a/backend/tests/services_api/model/provider.py b/backend/tests/services_api/model/provider.py
@@ -1,7 +1,7 @@
 import aiohttp
 from tests.common.utils import ResponseWrapper, get_headers, Token
 from tests.settings import HOST, WEB_SERVICE_PORT
-from config import CONFIG
+from app.config import CONFIG
 
 BASE_URL = f"{HOST}:{WEB_SERVICE_PORT}{CONFIG.WEB_ROUTE_PREFIX}"
 

diff --git a/backend/tests/services_api/retrieval/chunk.py b/backend/tests/services_api/retrieval/chunk.py
@@ -2,13 +2,14 @@
 from typing import Dict
 from tests.common.utils import ResponseWrapper, get_headers, Token
 from tests.settings import HOST
-from config import CONFIG
+from app.config import CONFIG
 
 if CONFIG.WEB:
     BASE_URL = f"{HOST}:{CONFIG.SERVICE_PORT}{CONFIG.WEB_ROUTE_PREFIX}"
 elif CONFIG.API:
     BASE_URL = f"{HOST}:{CONFIG.SERVICE_PORT}{CONFIG.API_ROUTE_PREFIX}"
     from tests.common.utils import APIKEY
+
     Token = APIKEY
 
 

diff --git a/backend/tests/services_api/retrieval/collection.py b/backend/tests/services_api/retrieval/collection.py
@@ -2,13 +2,14 @@
 from typing import Dict
 from tests.common.utils import ResponseWrapper, get_headers, Token
 from tests.settings import HOST
-from config import CONFIG
+from app.config import CONFIG
 
 if CONFIG.WEB:
     BASE_URL = f"{HOST}:{CONFIG.SERVICE_PORT}{CONFIG.WEB_ROUTE_PREFIX}"
 elif CONFIG.API:
     BASE_URL = f"{HOST}:{CONFIG.SERVICE_PORT}{CONFIG.API_ROUTE_PREFIX}"
     from tests.common.utils import APIKEY
+
     Token = APIKEY
 
 

diff --git a/backend/tests/services_api/retrieval/record.py b/backend/tests/services_api/retrieval/record.py
@@ -2,13 +2,14 @@
 from typing import Dict
 from tests.common.utils import ResponseWrapper, get_headers, Token
 from tests.settings import HOST
-from config import CONFIG
+from app.config import CONFIG
 
 if CONFIG.WEB:
     BASE_URL = f"{HOST}:{CONFIG.SERVICE_PORT}{CONFIG.WEB_ROUTE_PREFIX}"
 elif CONFIG.API:
     BASE_URL = f"{HOST}:{CONFIG.SERVICE_PORT}{CONFIG.API_ROUTE_PREFIX}"
     from tests.common.utils import APIKEY
+
     Token = APIKEY
 
 

diff --git a/backend/tests/services_api/tool/action.py b/backend/tests/services_api/tool/action.py
@@ -3,13 +3,14 @@
 
 from tests.common.utils import ResponseWrapper, get_headers, Token
 from tests.settings import HOST
-from config import CONFIG
+from app.config import CONFIG
 
 if CONFIG.WEB:
     BASE_URL = f"{HOST}:{CONFIG.SERVICE_PORT}{CONFIG.WEB_ROUTE_PREFIX}"
 elif CONFIG.API:
     BASE_URL = f"{HOST}:{CONFIG.SERVICE_PORT}{CONFIG.API_ROUTE_PREFIX}"
     from tests.common.utils import APIKEY
+
     Token = APIKEY
 
 

diff --git a/backend/tests/services_tests/admin/test_admin.py b/backend/tests/services_tests/admin/test_admin.py
@@ -2,19 +2,17 @@
 import pytest
 
 from tests.services_api.admin.admin import login, verify_token, refresh_token, logout
-from config import CONFIG
+from app.config import CONFIG
 
 
 class TestAdmin:
-
     admin_list = ["object", "admin_id", "username", "token", "created_timestamp", "updated_timestamp"]
     admin_keys = set(admin_list)
     token = None
 
     @pytest.mark.asyncio
     @pytest.mark.run(order=101)
     async def test_login(self):
-
         login_data = {"username": CONFIG.DEFAULT_ADMIN_USERNAME, "password": CONFIG.DEFAULT_ADMIN_PASSWORD}
         res = await login(login_data)
         res_json = res.json()
@@ -27,7 +25,6 @@ async def test_login(self):
     @pytest.mark.run(order=102)
     @pytest.mark.asyncio
     async def test_verify_token(self):
-
         res = await verify_token(TestAdmin.token)
         res_json = res.json()
         assert res.status_code == 200
@@ -37,7 +34,6 @@ async def test_verify_token(self):
     @pytest.mark.run(order=103)
     @pytest.mark.asyncio
     async def test_refresh_token(self):
-
         res = await refresh_token(TestAdmin.token)
         res_json = res.json()
         assert res.status_code == 200
@@ -63,7 +59,6 @@ async def test_refresh_token(self):
     @pytest.mark.run(order=104)
     @pytest.mark.asyncio
     async def test_logout(self):
-
         res = await logout(TestAdmin.token)
         res_json = res.json()
         assert res.status_code == 200

diff --git a/backend/tests/settings.py b/backend/tests/settings.py
@@ -1,5 +1,5 @@
 import os
-from config import CONFIG, load_str_env
+from app.config import CONFIG, load_str_env
 
 HOST = "http://127.0.0.1"
 WEB_SERVICE_PORT = os.environ.get("WEB_SERVICE_PORT", CONFIG.SERVICE_PORT)