mirror of
https://github.com/infiniflow/ragflow.git
synced 2025-12-21 05:16:54 +08:00
Fix IDE warnings (#12010)
### What problem does this PR solve? As title ### Type of change - [x] Refactoring Signed-off-by: Jin Hai <haijin.chn@gmail.com>
This commit is contained in:
@ -25,7 +25,8 @@ def add_sessions_with_chat_assistant(request: FixtureRequest, add_chat_assistant
|
||||
for chat_assistant in chat_assistants:
|
||||
try:
|
||||
chat_assistant.delete_sessions(ids=None)
|
||||
except Exception:
|
||||
except Exception as e:
|
||||
print(f"Exception: {e}")
|
||||
pass
|
||||
|
||||
request.addfinalizer(cleanup)
|
||||
@ -40,8 +41,8 @@ def add_sessions_with_chat_assistant_func(request: FixtureRequest, add_chat_assi
|
||||
for chat_assistant in chat_assistants:
|
||||
try:
|
||||
chat_assistant.delete_sessions(ids=None)
|
||||
except Exception:
|
||||
pass
|
||||
except Exception as e:
|
||||
print(f"Exception: {e}")
|
||||
|
||||
request.addfinalizer(cleanup)
|
||||
|
||||
|
||||
@ -43,9 +43,9 @@ class TestSessionWithChatAssistantCreate:
|
||||
chat_assistant.create_session(name=name.upper())
|
||||
|
||||
if expected_message:
|
||||
with pytest.raises(Exception) as excinfo:
|
||||
with pytest.raises(Exception) as exception_info:
|
||||
chat_assistant.create_session(name=name)
|
||||
assert expected_message in str(excinfo.value)
|
||||
assert expected_message in str(exception_info.value)
|
||||
else:
|
||||
session = chat_assistant.create_session(name=name)
|
||||
assert session.name == name, str(session)
|
||||
@ -71,6 +71,6 @@ class TestSessionWithChatAssistantCreate:
|
||||
chat_assistant = chat_assistants[0]
|
||||
|
||||
client.delete_chats(ids=[chat_assistant.id])
|
||||
with pytest.raises(Exception) as excinfo:
|
||||
with pytest.raises(Exception) as exception_info:
|
||||
chat_assistant.create_session(name="valid_name")
|
||||
assert "You do not own the assistant" in str(excinfo.value)
|
||||
assert "You do not own the assistant" in str(exception_info.value)
|
||||
|
||||
@ -46,9 +46,9 @@ class TestSessionWithChatAssistantDelete:
|
||||
|
||||
chat_assistant.delete_sessions(**session_ids)
|
||||
|
||||
with pytest.raises(Exception) as excinfo:
|
||||
with pytest.raises(Exception) as exception_info:
|
||||
chat_assistant.delete_sessions(**session_ids)
|
||||
assert "The chat doesn't own the session" in str(excinfo.value)
|
||||
assert "The chat doesn't own the session" in str(exception_info.value)
|
||||
|
||||
@pytest.mark.p3
|
||||
def test_duplicate_deletion(self, add_sessions_with_chat_assistant_func):
|
||||
@ -98,9 +98,9 @@ class TestSessionWithChatAssistantDelete:
|
||||
payload = payload([session.id for session in sessions])
|
||||
|
||||
if expected_message:
|
||||
with pytest.raises(Exception) as excinfo:
|
||||
with pytest.raises(Exception) as exception_info:
|
||||
chat_assistant.delete_sessions(**payload)
|
||||
assert expected_message in str(excinfo.value)
|
||||
assert expected_message in str(exception_info.value)
|
||||
else:
|
||||
chat_assistant.delete_sessions(**payload)
|
||||
|
||||
|
||||
@ -34,9 +34,9 @@ class TestSessionsWithChatAssistantList:
|
||||
def test_page(self, add_sessions_with_chat_assistant, params, expected_page_size, expected_message):
|
||||
chat_assistant, _ = add_sessions_with_chat_assistant
|
||||
if expected_message:
|
||||
with pytest.raises(Exception) as excinfo:
|
||||
with pytest.raises(Exception) as exception_info:
|
||||
chat_assistant.list_sessions(**params)
|
||||
assert expected_message in str(excinfo.value)
|
||||
assert expected_message in str(exception_info.value)
|
||||
else:
|
||||
sessions = chat_assistant.list_sessions(**params)
|
||||
assert len(sessions) == expected_page_size
|
||||
@ -57,9 +57,9 @@ class TestSessionsWithChatAssistantList:
|
||||
def test_page_size(self, add_sessions_with_chat_assistant, params, expected_page_size, expected_message):
|
||||
chat_assistant, _ = add_sessions_with_chat_assistant
|
||||
if expected_message:
|
||||
with pytest.raises(Exception) as excinfo:
|
||||
with pytest.raises(Exception) as exception_info:
|
||||
chat_assistant.list_sessions(**params)
|
||||
assert expected_message in str(excinfo.value)
|
||||
assert expected_message in str(exception_info.value)
|
||||
else:
|
||||
sessions = chat_assistant.list_sessions(**params)
|
||||
assert len(sessions) == expected_page_size
|
||||
@ -78,9 +78,9 @@ class TestSessionsWithChatAssistantList:
|
||||
def test_orderby(self, add_sessions_with_chat_assistant, params, expected_message):
|
||||
chat_assistant, _ = add_sessions_with_chat_assistant
|
||||
if expected_message:
|
||||
with pytest.raises(Exception) as excinfo:
|
||||
with pytest.raises(Exception) as exception_info:
|
||||
chat_assistant.list_sessions(**params)
|
||||
assert expected_message in str(excinfo.value)
|
||||
assert expected_message in str(exception_info.value)
|
||||
else:
|
||||
chat_assistant.list_sessions(**params)
|
||||
|
||||
@ -102,9 +102,9 @@ class TestSessionsWithChatAssistantList:
|
||||
def test_desc(self, add_sessions_with_chat_assistant, params, expected_message):
|
||||
chat_assistant, _ = add_sessions_with_chat_assistant
|
||||
if expected_message:
|
||||
with pytest.raises(Exception) as excinfo:
|
||||
with pytest.raises(Exception) as exception_info:
|
||||
chat_assistant.list_sessions(**params)
|
||||
assert expected_message in str(excinfo.value)
|
||||
assert expected_message in str(exception_info.value)
|
||||
else:
|
||||
chat_assistant.list_sessions(**params)
|
||||
|
||||
@ -121,9 +121,9 @@ class TestSessionsWithChatAssistantList:
|
||||
def test_name(self, add_sessions_with_chat_assistant, params, expected_num, expected_message):
|
||||
chat_assistant, _ = add_sessions_with_chat_assistant
|
||||
if expected_message:
|
||||
with pytest.raises(Exception) as excinfo:
|
||||
with pytest.raises(Exception) as exception_info:
|
||||
chat_assistant.list_sessions(**params)
|
||||
assert expected_message in str(excinfo.value)
|
||||
assert expected_message in str(exception_info.value)
|
||||
else:
|
||||
sessions = chat_assistant.list_sessions(**params)
|
||||
if params["name"] == "session_with_chat_assistant_1":
|
||||
@ -149,9 +149,9 @@ class TestSessionsWithChatAssistantList:
|
||||
params = {"id": session_id}
|
||||
|
||||
if expected_message:
|
||||
with pytest.raises(Exception) as excinfo:
|
||||
with pytest.raises(Exception) as exception_info:
|
||||
chat_assistant.list_sessions(**params)
|
||||
assert expected_message in str(excinfo.value)
|
||||
assert expected_message in str(exception_info.value)
|
||||
else:
|
||||
list_sessions = chat_assistant.list_sessions(**params)
|
||||
if "id" in params and params["id"] == sessions[0].id:
|
||||
@ -177,9 +177,9 @@ class TestSessionsWithChatAssistantList:
|
||||
params = {"id": session_id, "name": name}
|
||||
|
||||
if expected_message:
|
||||
with pytest.raises(Exception) as excinfo:
|
||||
with pytest.raises(Exception) as exception_info:
|
||||
chat_assistant.list_sessions(**params)
|
||||
assert expected_message in str(excinfo.value)
|
||||
assert expected_message in str(exception_info.value)
|
||||
else:
|
||||
list_sessions = chat_assistant.list_sessions(**params)
|
||||
assert len(list_sessions) == expected_num
|
||||
@ -189,7 +189,7 @@ class TestSessionsWithChatAssistantList:
|
||||
count = 100
|
||||
chat_assistant, _ = add_sessions_with_chat_assistant
|
||||
with ThreadPoolExecutor(max_workers=5) as executor:
|
||||
futures = [executor.submit(chat_assistant.list_sessions) for i in range(count)]
|
||||
futures = [executor.submit(chat_assistant.list_sessions) for _ in range(count)]
|
||||
responses = list(as_completed(futures))
|
||||
assert len(responses) == count, responses
|
||||
|
||||
@ -198,6 +198,6 @@ class TestSessionsWithChatAssistantList:
|
||||
chat_assistant, _ = add_sessions_with_chat_assistant
|
||||
client.delete_chats(ids=[chat_assistant.id])
|
||||
|
||||
with pytest.raises(Exception) as excinfo:
|
||||
with pytest.raises(Exception) as exception_info:
|
||||
chat_assistant.list_sessions()
|
||||
assert "You don't own the assistant" in str(excinfo.value)
|
||||
assert "You don't own the assistant" in str(exception_info.value)
|
||||
|
||||
@ -42,9 +42,9 @@ class TestSessionWithChatAssistantUpdate:
|
||||
session.update({"name": payload["name"].upper()})
|
||||
|
||||
if expected_message:
|
||||
with pytest.raises(Exception) as excinfo:
|
||||
with pytest.raises(Exception) as exception_info:
|
||||
session.update(payload)
|
||||
assert expected_message in str(excinfo.value)
|
||||
assert expected_message in str(exception_info.value)
|
||||
else:
|
||||
session.update(payload)
|
||||
updated_session = chat_assistant.list_sessions(id=session.id)[0]
|
||||
@ -72,9 +72,9 @@ class TestSessionWithChatAssistantUpdate:
|
||||
session = sessions[0]
|
||||
|
||||
if expected_message:
|
||||
with pytest.raises(Exception) as excinfo:
|
||||
with pytest.raises(Exception) as exception_info:
|
||||
session.update(payload)
|
||||
assert expected_message in str(excinfo.value)
|
||||
assert expected_message in str(exception_info.value)
|
||||
else:
|
||||
session.update(payload)
|
||||
|
||||
@ -93,6 +93,6 @@ class TestSessionWithChatAssistantUpdate:
|
||||
chat_assistant, sessions = add_sessions_with_chat_assistant_func
|
||||
client.delete_chats(ids=[chat_assistant.id])
|
||||
|
||||
with pytest.raises(Exception) as excinfo:
|
||||
with pytest.raises(Exception) as exception_info:
|
||||
sessions[0].update({"name": "valid_name"})
|
||||
assert "You do not own the session" in str(excinfo.value)
|
||||
assert "You do not own the session" in str(exception_info.value)
|
||||
|
||||
Reference in New Issue
Block a user