From 26a17e6250c4f27838777ad09dbf9182d64c2144 Mon Sep 17 00:00:00 2001 From: Hetavi Shah Date: Tue, 18 Nov 2025 14:05:38 +0530 Subject: [PATCH] [OND211-2329]: Updated conftest files, fixed typings. --- test/testcases/test_http_api/conftest.py | 50 +++++++++---------- .../test_user_management/conftest.py | 8 +-- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/test/testcases/test_http_api/conftest.py b/test/testcases/test_http_api/conftest.py index 98767c73a..a780858ea 100644 --- a/test/testcases/test_http_api/conftest.py +++ b/test/testcases/test_http_api/conftest.py @@ -82,37 +82,37 @@ def ragflow_tmp_dir(request, tmp_path_factory): @pytest.fixture(scope="session") -def HttpApiAuth(token): +def http_api_auth(token): return RAGFlowHttpApiAuth(token) @pytest.fixture(scope="session") -def WebApiAuth(auth): +def web_api_auth(auth): """Fixture for endpoints that use @login_required (JWT token, not API token).""" return RAGFlowWebApiAuth(auth) @pytest.fixture(scope="function") -def clear_datasets(request, HttpApiAuth): +def clear_datasets(request, http_api_auth): def cleanup(): - delete_datasets(HttpApiAuth, {"ids": None}) + delete_datasets(http_api_auth, {"ids": None}) request.addfinalizer(cleanup) @pytest.fixture(scope="function") -def clear_chat_assistants(request, HttpApiAuth): +def clear_chat_assistants(request, http_api_auth): def cleanup(): - delete_chat_assistants(HttpApiAuth) + delete_chat_assistants(http_api_auth) request.addfinalizer(cleanup) @pytest.fixture(scope="function") -def clear_session_with_chat_assistants(request, HttpApiAuth, add_chat_assistants): +def clear_session_with_chat_assistants(request, http_api_auth, add_chat_assistants): def cleanup(): for chat_assistant_id in chat_assistant_ids: - delete_session_with_chat_assistants(HttpApiAuth, chat_assistant_id) + delete_session_with_chat_assistants(http_api_auth, chat_assistant_id) request.addfinalizer(cleanup) @@ -120,51 +120,51 @@ def clear_session_with_chat_assistants(request, HttpApiAuth, add_chat_assistants @pytest.fixture(scope="class") -def add_dataset(request, HttpApiAuth): +def add_dataset(request, http_api_auth): def cleanup(): - delete_datasets(HttpApiAuth, {"ids": None}) + delete_datasets(http_api_auth, {"ids": None}) request.addfinalizer(cleanup) - dataset_ids = batch_create_datasets(HttpApiAuth, 1) + dataset_ids = batch_create_datasets(http_api_auth, 1) return dataset_ids[0] @pytest.fixture(scope="function") -def add_dataset_func(request, HttpApiAuth): +def add_dataset_func(request, http_api_auth): def cleanup(): - delete_datasets(HttpApiAuth, {"ids": None}) + delete_datasets(http_api_auth, {"ids": None}) request.addfinalizer(cleanup) - return batch_create_datasets(HttpApiAuth, 1)[0] + return batch_create_datasets(http_api_auth, 1)[0] @pytest.fixture(scope="class") -def add_document(HttpApiAuth, add_dataset, ragflow_tmp_dir): +def add_document(http_api_auth, add_dataset, ragflow_tmp_dir): dataset_id = add_dataset - document_ids = bulk_upload_documents(HttpApiAuth, dataset_id, 1, ragflow_tmp_dir) + document_ids = bulk_upload_documents(http_api_auth, dataset_id, 1, ragflow_tmp_dir) return dataset_id, document_ids[0] @pytest.fixture(scope="class") -def add_chunks(HttpApiAuth, add_document): +def add_chunks(http_api_auth, add_document): dataset_id, document_id = add_document - parse_documents(HttpApiAuth, dataset_id, {"document_ids": [document_id]}) - condition(HttpApiAuth, dataset_id) - chunk_ids = batch_add_chunks(HttpApiAuth, dataset_id, document_id, 4) + parse_documents(http_api_auth, dataset_id, {"document_ids": [document_id]}) + condition(http_api_auth, dataset_id) + chunk_ids = batch_add_chunks(http_api_auth, dataset_id, document_id, 4) sleep(1) # issues/6487 return dataset_id, document_id, chunk_ids @pytest.fixture(scope="class") -def add_chat_assistants(request, HttpApiAuth, add_document): +def add_chat_assistants(request, http_api_auth, add_document): def cleanup(): - delete_chat_assistants(HttpApiAuth) + delete_chat_assistants(http_api_auth) request.addfinalizer(cleanup) dataset_id, document_id = add_document - parse_documents(HttpApiAuth, dataset_id, {"document_ids": [document_id]}) - condition(HttpApiAuth, dataset_id) - return dataset_id, document_id, batch_create_chat_assistants(HttpApiAuth, 5) + parse_documents(http_api_auth, dataset_id, {"document_ids": [document_id]}) + condition(http_api_auth, dataset_id) + return dataset_id, document_id, batch_create_chat_assistants(http_api_auth, 5) diff --git a/test/testcases/test_http_api/test_user_management/conftest.py b/test/testcases/test_http_api/test_user_management/conftest.py index 5e26eedd2..7bdbf3167 100644 --- a/test/testcases/test_http_api/test_user_management/conftest.py +++ b/test/testcases/test_http_api/test_user_management/conftest.py @@ -81,7 +81,7 @@ def generate_unique_email(prefix: str = "test") -> str: @pytest.fixture(scope="function") -def clear_users(request, HttpApiAuth): +def clear_users(request, http_api_auth): """Fixture to clean up users created during tests.""" created_user_ids: list[str] = [] @@ -95,19 +95,19 @@ def clear_users(request, HttpApiAuth): @pytest.fixture(name="test_user") -def fixture_test_user(WebApiAuth: RAGFlowWebApiAuth) -> dict[str, Any]: +def fixture_test_user(web_api_auth: RAGFlowWebApiAuth) -> dict[str, Any]: """Get the current authenticated user's information for update tests. Since users can only update their own account, we use the authenticated user's information instead of creating a new user. Args: - WebApiAuth: Authenticated user's auth object. + web_api_auth: Authenticated user's auth object. Returns: Dictionary containing user_id, email, and original_nickname. """ - res: dict[str, Any] = get_user_info(WebApiAuth) + res: dict[str, Any] = get_user_info(web_api_auth) assert res["code"] == 0, f"Failed to get user info: {res}" user_data: dict[str, Any] = res["data"]