diff --git a/test/testcases/test_http_api/common.py b/test/testcases/test_http_api/common.py index 4e7ec256f..123fb7667 100644 --- a/test/testcases/test_http_api/common.py +++ b/test/testcases/test_http_api/common.py @@ -14,15 +14,14 @@ # limitations under the License. # -import os from pathlib import Path import requests +from configs import HOST_ADDRESS from requests_toolbelt import MultipartEncoder from utils.file_utils import create_txt_file HEADERS = {"Content-Type": "application/json"} -HOST_ADDRESS = os.getenv("HOST_ADDRESS", "http://127.0.0.1:9380") DATASETS_API_URL = "/api/v1/datasets" FILE_API_URL = "/api/v1/datasets/{dataset_id}/documents" FILE_CHUNK_API_URL = "/api/v1/datasets/{dataset_id}/chunks" @@ -31,12 +30,6 @@ CHAT_ASSISTANT_API_URL = "/api/v1/chats" SESSION_WITH_CHAT_ASSISTANT_API_URL = "/api/v1/chats/{chat_id}/sessions" SESSION_WITH_AGENT_API_URL = "/api/v1/agents/{agent_id}/sessions" -INVALID_API_TOKEN = "invalid_key_123" -DATASET_NAME_LIMIT = 128 -DOCUMENT_NAME_LIMIT = 128 -CHAT_ASSISTANT_NAME_LIMIT = 255 -SESSION_WITH_CHAT_NAME_LIMIT = 255 - # DATASET MANAGEMENT def create_dataset(auth, payload=None, *, headers=HEADERS, data=None): diff --git a/test/testcases/test_http_api/test_chat_assistant_management/test_create_chat_assistant.py b/test/testcases/test_http_api/test_chat_assistant_management/test_create_chat_assistant.py index 7a1b69308..7e7d9c116 100644 --- a/test/testcases/test_http_api/test_chat_assistant_management/test_create_chat_assistant.py +++ b/test/testcases/test_http_api/test_chat_assistant_management/test_create_chat_assistant.py @@ -15,7 +15,8 @@ # import pytest -from common import CHAT_ASSISTANT_NAME_LIMIT, INVALID_API_TOKEN, create_chat_assistant +from common import create_chat_assistant +from configs import CHAT_ASSISTANT_NAME_LIMIT, INVALID_API_TOKEN from libs.auth import RAGFlowHttpApiAuth from utils import encode_avatar from utils.file_utils import create_image_file diff --git a/test/testcases/test_http_api/test_chat_assistant_management/test_delete_chat_assistants.py b/test/testcases/test_http_api/test_chat_assistant_management/test_delete_chat_assistants.py index c36a7c029..2a2fdc9a6 100644 --- a/test/testcases/test_http_api/test_chat_assistant_management/test_delete_chat_assistants.py +++ b/test/testcases/test_http_api/test_chat_assistant_management/test_delete_chat_assistants.py @@ -16,7 +16,8 @@ from concurrent.futures import ThreadPoolExecutor, as_completed import pytest -from common import INVALID_API_TOKEN, batch_create_chat_assistants, delete_chat_assistants, list_chat_assistants +from common import batch_create_chat_assistants, delete_chat_assistants, list_chat_assistants +from configs import INVALID_API_TOKEN from libs.auth import RAGFlowHttpApiAuth diff --git a/test/testcases/test_http_api/test_chat_assistant_management/test_list_chat_assistants.py b/test/testcases/test_http_api/test_chat_assistant_management/test_list_chat_assistants.py index ad03fa542..20bce689e 100644 --- a/test/testcases/test_http_api/test_chat_assistant_management/test_list_chat_assistants.py +++ b/test/testcases/test_http_api/test_chat_assistant_management/test_list_chat_assistants.py @@ -16,7 +16,8 @@ from concurrent.futures import ThreadPoolExecutor, as_completed import pytest -from common import INVALID_API_TOKEN, delete_datasets, list_chat_assistants +from common import delete_datasets, list_chat_assistants +from configs import INVALID_API_TOKEN from libs.auth import RAGFlowHttpApiAuth from utils import is_sorted diff --git a/test/testcases/test_http_api/test_chat_assistant_management/test_update_chat_assistant.py b/test/testcases/test_http_api/test_chat_assistant_management/test_update_chat_assistant.py index 003e71484..54a161319 100644 --- a/test/testcases/test_http_api/test_chat_assistant_management/test_update_chat_assistant.py +++ b/test/testcases/test_http_api/test_chat_assistant_management/test_update_chat_assistant.py @@ -14,7 +14,8 @@ # limitations under the License. # import pytest -from common import CHAT_ASSISTANT_NAME_LIMIT, INVALID_API_TOKEN, list_chat_assistants, update_chat_assistant +from common import list_chat_assistants, update_chat_assistant +from configs import CHAT_ASSISTANT_NAME_LIMIT, INVALID_API_TOKEN from libs.auth import RAGFlowHttpApiAuth from utils import encode_avatar from utils.file_utils import create_image_file diff --git a/test/testcases/test_http_api/test_chunk_management_within_dataset/test_add_chunk.py b/test/testcases/test_http_api/test_chunk_management_within_dataset/test_add_chunk.py index ab4739f0b..d46469d91 100644 --- a/test/testcases/test_http_api/test_chunk_management_within_dataset/test_add_chunk.py +++ b/test/testcases/test_http_api/test_chunk_management_within_dataset/test_add_chunk.py @@ -16,7 +16,8 @@ from concurrent.futures import ThreadPoolExecutor, as_completed import pytest -from common import INVALID_API_TOKEN, add_chunk, delete_documents, list_chunks +from common import add_chunk, delete_documents, list_chunks +from configs import INVALID_API_TOKEN from libs.auth import RAGFlowHttpApiAuth diff --git a/test/testcases/test_http_api/test_chunk_management_within_dataset/test_delete_chunks.py b/test/testcases/test_http_api/test_chunk_management_within_dataset/test_delete_chunks.py index 275632b39..69f1744e2 100644 --- a/test/testcases/test_http_api/test_chunk_management_within_dataset/test_delete_chunks.py +++ b/test/testcases/test_http_api/test_chunk_management_within_dataset/test_delete_chunks.py @@ -16,7 +16,8 @@ from concurrent.futures import ThreadPoolExecutor, as_completed import pytest -from common import INVALID_API_TOKEN, batch_add_chunks, delete_chunks, list_chunks +from common import batch_add_chunks, delete_chunks, list_chunks +from configs import INVALID_API_TOKEN from libs.auth import RAGFlowHttpApiAuth diff --git a/test/testcases/test_http_api/test_chunk_management_within_dataset/test_list_chunks.py b/test/testcases/test_http_api/test_chunk_management_within_dataset/test_list_chunks.py index ac7577190..c8134214c 100644 --- a/test/testcases/test_http_api/test_chunk_management_within_dataset/test_list_chunks.py +++ b/test/testcases/test_http_api/test_chunk_management_within_dataset/test_list_chunks.py @@ -17,7 +17,8 @@ import os from concurrent.futures import ThreadPoolExecutor, as_completed import pytest -from common import INVALID_API_TOKEN, batch_add_chunks, list_chunks +from common import batch_add_chunks, list_chunks +from configs import INVALID_API_TOKEN from libs.auth import RAGFlowHttpApiAuth diff --git a/test/testcases/test_http_api/test_chunk_management_within_dataset/test_retrieval_chunks.py b/test/testcases/test_http_api/test_chunk_management_within_dataset/test_retrieval_chunks.py index 9f35f7f1d..52421d5b1 100644 --- a/test/testcases/test_http_api/test_chunk_management_within_dataset/test_retrieval_chunks.py +++ b/test/testcases/test_http_api/test_chunk_management_within_dataset/test_retrieval_chunks.py @@ -17,10 +17,8 @@ import os from concurrent.futures import ThreadPoolExecutor, as_completed import pytest -from common import ( - INVALID_API_TOKEN, - retrieval_chunks, -) +from common import retrieval_chunks +from configs import INVALID_API_TOKEN from libs.auth import RAGFlowHttpApiAuth diff --git a/test/testcases/test_http_api/test_chunk_management_within_dataset/test_update_chunk.py b/test/testcases/test_http_api/test_chunk_management_within_dataset/test_update_chunk.py index 3e2b86c13..d6d0278fe 100644 --- a/test/testcases/test_http_api/test_chunk_management_within_dataset/test_update_chunk.py +++ b/test/testcases/test_http_api/test_chunk_management_within_dataset/test_update_chunk.py @@ -18,7 +18,8 @@ from concurrent.futures import ThreadPoolExecutor, as_completed from random import randint import pytest -from common import INVALID_API_TOKEN, delete_documents, update_chunk +from common import delete_documents, update_chunk +from configs import INVALID_API_TOKEN from libs.auth import RAGFlowHttpApiAuth diff --git a/test/testcases/test_http_api/test_dataset_mangement/test_delete_datasets.py b/test/testcases/test_http_api/test_dataset_mangement/test_delete_datasets.py index ae7189cc8..0165633bc 100644 --- a/test/testcases/test_http_api/test_dataset_mangement/test_delete_datasets.py +++ b/test/testcases/test_http_api/test_dataset_mangement/test_delete_datasets.py @@ -18,11 +18,11 @@ from concurrent.futures import ThreadPoolExecutor, as_completed import pytest from common import ( - INVALID_API_TOKEN, batch_create_datasets, delete_datasets, list_datasets, ) +from configs import INVALID_API_TOKEN from libs.auth import RAGFlowHttpApiAuth diff --git a/test/testcases/test_http_api/test_dataset_mangement/test_list_datasets.py b/test/testcases/test_http_api/test_dataset_mangement/test_list_datasets.py index 8ce0edad1..9d81491b4 100644 --- a/test/testcases/test_http_api/test_dataset_mangement/test_list_datasets.py +++ b/test/testcases/test_http_api/test_dataset_mangement/test_list_datasets.py @@ -17,7 +17,8 @@ import uuid from concurrent.futures import ThreadPoolExecutor, as_completed import pytest -from common import INVALID_API_TOKEN, list_datasets +from common import list_datasets +from configs import INVALID_API_TOKEN from libs.auth import RAGFlowHttpApiAuth from utils import is_sorted diff --git a/test/testcases/test_http_api/test_file_management_within_dataset/test_delete_documents.py b/test/testcases/test_http_api/test_file_management_within_dataset/test_delete_documents.py index 23a54e3cd..74f5c0606 100644 --- a/test/testcases/test_http_api/test_file_management_within_dataset/test_delete_documents.py +++ b/test/testcases/test_http_api/test_file_management_within_dataset/test_delete_documents.py @@ -16,7 +16,8 @@ from concurrent.futures import ThreadPoolExecutor, as_completed import pytest -from common import INVALID_API_TOKEN, bulk_upload_documents, delete_documents, list_documents +from common import bulk_upload_documents, delete_documents, list_documents +from configs import INVALID_API_TOKEN from libs.auth import RAGFlowHttpApiAuth diff --git a/test/testcases/test_http_api/test_file_management_within_dataset/test_download_document.py b/test/testcases/test_http_api/test_file_management_within_dataset/test_download_document.py index 843f60737..2d04ae531 100644 --- a/test/testcases/test_http_api/test_file_management_within_dataset/test_download_document.py +++ b/test/testcases/test_http_api/test_file_management_within_dataset/test_download_document.py @@ -18,7 +18,8 @@ import json from concurrent.futures import ThreadPoolExecutor, as_completed import pytest -from common import INVALID_API_TOKEN, bulk_upload_documents, download_document, upload_documents +from common import bulk_upload_documents, download_document, upload_documents +from configs import INVALID_API_TOKEN from libs.auth import RAGFlowHttpApiAuth from requests import codes from utils import compare_by_hash diff --git a/test/testcases/test_http_api/test_file_management_within_dataset/test_list_documents.py b/test/testcases/test_http_api/test_file_management_within_dataset/test_list_documents.py index 6e62554f3..4fbe59b0b 100644 --- a/test/testcases/test_http_api/test_file_management_within_dataset/test_list_documents.py +++ b/test/testcases/test_http_api/test_file_management_within_dataset/test_list_documents.py @@ -16,7 +16,8 @@ from concurrent.futures import ThreadPoolExecutor, as_completed import pytest -from common import INVALID_API_TOKEN, list_documents +from common import list_documents +from configs import INVALID_API_TOKEN from libs.auth import RAGFlowHttpApiAuth from utils import is_sorted diff --git a/test/testcases/test_http_api/test_file_management_within_dataset/test_parse_documents.py b/test/testcases/test_http_api/test_file_management_within_dataset/test_parse_documents.py index 0a5b21899..e8ffa914e 100644 --- a/test/testcases/test_http_api/test_file_management_within_dataset/test_parse_documents.py +++ b/test/testcases/test_http_api/test_file_management_within_dataset/test_parse_documents.py @@ -16,7 +16,8 @@ from concurrent.futures import ThreadPoolExecutor, as_completed import pytest -from common import INVALID_API_TOKEN, bulk_upload_documents, list_documents, parse_documents +from common import bulk_upload_documents, list_documents, parse_documents +from configs import INVALID_API_TOKEN from libs.auth import RAGFlowHttpApiAuth from utils import wait_for diff --git a/test/testcases/test_http_api/test_file_management_within_dataset/test_stop_parse_documents.py b/test/testcases/test_http_api/test_file_management_within_dataset/test_stop_parse_documents.py index b98150718..4c3244878 100644 --- a/test/testcases/test_http_api/test_file_management_within_dataset/test_stop_parse_documents.py +++ b/test/testcases/test_http_api/test_file_management_within_dataset/test_stop_parse_documents.py @@ -17,7 +17,8 @@ from concurrent.futures import ThreadPoolExecutor from time import sleep import pytest -from common import INVALID_API_TOKEN, bulk_upload_documents, list_documents, parse_documents, stop_parse_documents +from common import bulk_upload_documents, list_documents, parse_documents, stop_parse_documents +from configs import INVALID_API_TOKEN from libs.auth import RAGFlowHttpApiAuth from utils import wait_for diff --git a/test/testcases/test_http_api/test_file_management_within_dataset/test_update_document.py b/test/testcases/test_http_api/test_file_management_within_dataset/test_update_document.py index cb28cf5aa..3e21f518a 100644 --- a/test/testcases/test_http_api/test_file_management_within_dataset/test_update_document.py +++ b/test/testcases/test_http_api/test_file_management_within_dataset/test_update_document.py @@ -16,7 +16,8 @@ import pytest -from common import DOCUMENT_NAME_LIMIT, INVALID_API_TOKEN, list_documents, update_document +from common import list_documents, update_document +from configs import DOCUMENT_NAME_LIMIT, INVALID_API_TOKEN from libs.auth import RAGFlowHttpApiAuth diff --git a/test/testcases/test_http_api/test_file_management_within_dataset/test_upload_documents.py b/test/testcases/test_http_api/test_file_management_within_dataset/test_upload_documents.py index 681026d1e..cbb6285f9 100644 --- a/test/testcases/test_http_api/test_file_management_within_dataset/test_upload_documents.py +++ b/test/testcases/test_http_api/test_file_management_within_dataset/test_upload_documents.py @@ -19,7 +19,8 @@ from concurrent.futures import ThreadPoolExecutor, as_completed import pytest import requests -from common import DOCUMENT_NAME_LIMIT, FILE_API_URL, HOST_ADDRESS, INVALID_API_TOKEN, list_datasets, upload_documents +from common import FILE_API_URL, list_datasets, upload_documents +from configs import DOCUMENT_NAME_LIMIT, HOST_ADDRESS, INVALID_API_TOKEN from libs.auth import RAGFlowHttpApiAuth from requests_toolbelt import MultipartEncoder from utils.file_utils import create_txt_file diff --git a/test/testcases/test_http_api/test_session_management/test_create_session_with_chat_assistant.py b/test/testcases/test_http_api/test_session_management/test_create_session_with_chat_assistant.py index d5701e7a1..322fd1b7a 100644 --- a/test/testcases/test_http_api/test_session_management/test_create_session_with_chat_assistant.py +++ b/test/testcases/test_http_api/test_session_management/test_create_session_with_chat_assistant.py @@ -16,7 +16,8 @@ from concurrent.futures import ThreadPoolExecutor, as_completed import pytest -from common import INVALID_API_TOKEN, SESSION_WITH_CHAT_NAME_LIMIT, create_session_with_chat_assistant, delete_chat_assistants, list_session_with_chat_assistants +from common import create_session_with_chat_assistant, delete_chat_assistants, list_session_with_chat_assistants +from configs import INVALID_API_TOKEN, SESSION_WITH_CHAT_NAME_LIMIT from libs.auth import RAGFlowHttpApiAuth diff --git a/test/testcases/test_http_api/test_session_management/test_delete_sessions_with_chat_assistant.py b/test/testcases/test_http_api/test_session_management/test_delete_sessions_with_chat_assistant.py index 25a4f531f..818050819 100644 --- a/test/testcases/test_http_api/test_session_management/test_delete_sessions_with_chat_assistant.py +++ b/test/testcases/test_http_api/test_session_management/test_delete_sessions_with_chat_assistant.py @@ -16,7 +16,8 @@ from concurrent.futures import ThreadPoolExecutor, as_completed import pytest -from common import INVALID_API_TOKEN, batch_add_sessions_with_chat_assistant, delete_session_with_chat_assistants, list_session_with_chat_assistants +from common import batch_add_sessions_with_chat_assistant, delete_session_with_chat_assistants, list_session_with_chat_assistants +from configs import INVALID_API_TOKEN from libs.auth import RAGFlowHttpApiAuth diff --git a/test/testcases/test_http_api/test_session_management/test_list_sessions_with_chat_assistant.py b/test/testcases/test_http_api/test_session_management/test_list_sessions_with_chat_assistant.py index 8ee95b6dc..5ff29e022 100644 --- a/test/testcases/test_http_api/test_session_management/test_list_sessions_with_chat_assistant.py +++ b/test/testcases/test_http_api/test_session_management/test_list_sessions_with_chat_assistant.py @@ -16,7 +16,8 @@ from concurrent.futures import ThreadPoolExecutor, as_completed import pytest -from common import INVALID_API_TOKEN, delete_chat_assistants, list_session_with_chat_assistants +from common import delete_chat_assistants, list_session_with_chat_assistants +from configs import INVALID_API_TOKEN from libs.auth import RAGFlowHttpApiAuth from utils import is_sorted diff --git a/test/testcases/test_http_api/test_session_management/test_update_session_with_chat_assistant.py b/test/testcases/test_http_api/test_session_management/test_update_session_with_chat_assistant.py index d6693b474..e035e876b 100644 --- a/test/testcases/test_http_api/test_session_management/test_update_session_with_chat_assistant.py +++ b/test/testcases/test_http_api/test_session_management/test_update_session_with_chat_assistant.py @@ -17,7 +17,8 @@ from concurrent.futures import ThreadPoolExecutor, as_completed from random import randint import pytest -from common import INVALID_API_TOKEN, SESSION_WITH_CHAT_NAME_LIMIT, delete_chat_assistants, list_session_with_chat_assistants, update_session_with_chat_assistant +from common import delete_chat_assistants, list_session_with_chat_assistants, update_session_with_chat_assistant +from configs import INVALID_API_TOKEN, SESSION_WITH_CHAT_NAME_LIMIT from libs.auth import RAGFlowHttpApiAuth