Skip to content

Commit cc9546b

Browse files
JinHai-CNJinHai-CN
authored
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>
1 parent a63dcfe commit cc9546b

25 files changed

+283
-279
lines changed

‎download_deps.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,10 @@ def get_urls(use_china_mirrors=False) -> list[Union[str, list[str]]]:
4949
]
5050

5151

52-
def download_model(repo_id):
53-
local_dir = os.path.abspath(os.path.join("huggingface.co", repo_id))
54-
os.makedirs(local_dir, exist_ok=True)
55-
snapshot_download(repo_id=repo_id, local_dir=local_dir)
52+
def download_model(repository_id):
53+
local_directory = os.path.abspath(os.path.join("huggingface.co", repository_id))
54+
os.makedirs(local_directory, exist_ok=True)
55+
snapshot_download(repo_id=repository_id, local_dir=local_directory)
5656

5757

5858
if __name__ == "__main__":

‎test/testcases/conftest.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@ def get_tenant_info(auth):
131131

132132
@pytest.fixture(scope="session", autouse=True)
133133
def set_tenant_info(auth):
134+
tenant_id = None
134135
try:
135136
add_models(auth)
136137
tenant_id = get_tenant_info(auth)

‎test/testcases/test_sdk_api/test_chat_assistant_management/test_create_chat_assistant.py‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ def test_name(self, client, name, expected_message):
4545
client.create_chat(name=name.upper())
4646

4747
if expected_message:
48-
with pytest.raises(Exception) as excinfo:
48+
with pytest.raises(Exception) as exception_info:
4949
client.create_chat(name=name)
50-
assert expected_message in str(excinfo.value)
50+
assert expected_message in str(exception_info.value)
5151
else:
5252
chat_assistant = client.create_chat(name=name)
5353
assert chat_assistant.name == name
@@ -68,9 +68,9 @@ def test_dataset_ids(self, client, add_chunks, dataset_ids, expected_message):
6868
dataset_ids = dataset_ids(dataset.id)
6969

7070
if expected_message:
71-
with pytest.raises(Exception) as excinfo:
71+
with pytest.raises(Exception) as exception_info:
7272
client.create_chat(name="ragflow test", dataset_ids=dataset_ids)
73-
assert expected_message in str(excinfo.value)
73+
assert expected_message in str(exception_info.value)
7474
else:
7575
chat_assistant = client.create_chat(name="ragflow test", dataset_ids=dataset_ids)
7676
assert chat_assistant.name == "ragflow test"
@@ -121,9 +121,9 @@ def test_llm(self, client, add_chunks, llm, expected_message):
121121
llm_o = Chat.LLM(client, llm)
122122

123123
if expected_message:
124-
with pytest.raises(Exception) as excinfo:
124+
with pytest.raises(Exception) as exception_info:
125125
client.create_chat(name="llm_test", dataset_ids=[dataset.id], llm=llm_o)
126-
assert expected_message in str(excinfo.value)
126+
assert expected_message in str(exception_info.value)
127127
else:
128128
chat_assistant = client.create_chat(name="llm_test", dataset_ids=[dataset.id], llm=llm_o)
129129
if llm:
@@ -189,9 +189,9 @@ def test_prompt(self, client, add_chunks, prompt, expected_message):
189189
prompt_o = Chat.Prompt(client, prompt)
190190

191191
if expected_message:
192-
with pytest.raises(Exception) as excinfo:
192+
with pytest.raises(Exception) as exception_info:
193193
client.create_chat(name="prompt_test", dataset_ids=[dataset.id], prompt=prompt_o)
194-
assert expected_message in str(excinfo.value)
194+
assert expected_message in str(exception_info.value)
195195
else:
196196
chat_assistant = client.create_chat(name="prompt_test", dataset_ids=[dataset.id], prompt=prompt_o)
197197
if prompt:
@@ -219,6 +219,6 @@ class TestChatAssistantCreate2:
219219
@pytest.mark.p2
220220
def test_unparsed_document(self, client, add_document):
221221
dataset, _ = add_document
222-
with pytest.raises(Exception) as excinfo:
222+
with pytest.raises(Exception) as exception_info:
223223
client.create_chat(name="prompt_test", dataset_ids=[dataset.id])
224-
assert "doesn't own parsed file" in str(excinfo.value)
224+
assert "doesn't own parsed file" in str(exception_info.value)

‎test/testcases/test_sdk_api/test_chat_assistant_management/test_delete_chat_assistants.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ def test_basic_scenarios(self, client, add_chat_assistants_func, payload, expect
3737
payload = payload([chat_assistant.id for chat_assistant in chat_assistants])
3838

3939
if expected_message:
40-
with pytest.raises(Exception) as excinfo:
40+
with pytest.raises(Exception) as exception_info:
4141
client.delete_chats(**payload)
42-
assert expected_message in str(excinfo.value)
42+
assert expected_message in str(exception_info.value)
4343
else:
4444
if payload is None:
4545
client.delete_chats(payload)
@@ -71,9 +71,9 @@ def test_repeated_deletion(self, client, add_chat_assistants_func):
7171
chat_ids = [chat.id for chat in chat_assistants]
7272
client.delete_chats(ids=chat_ids)
7373

74-
with pytest.raises(Exception) as excinfo:
74+
with pytest.raises(Exception) as exception_info:
7575
client.delete_chats(ids=chat_ids)
76-
assert "not found" in str(excinfo.value)
76+
assert "not found" in str(exception_info.value)
7777

7878
@pytest.mark.p3
7979
def test_duplicate_deletion(self, client, add_chat_assistants_func):

‎test/testcases/test_sdk_api/test_chat_assistant_management/test_list_chat_assistants.py‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@ def test_default(self, client):
4949
)
5050
def test_page(self, client, params, expected_page_size, expected_message):
5151
if expected_message:
52-
with pytest.raises(Exception) as excinfo:
52+
with pytest.raises(Exception) as exception_info:
5353
client.list_chats(**params)
54-
assert expected_message in str(excinfo.value)
54+
assert expected_message in str(exception_info.value)
5555
else:
5656
assistants = client.list_chats(**params)
5757
assert len(assistants) == expected_page_size
@@ -80,9 +80,9 @@ def test_page(self, client, params, expected_page_size, expected_message):
8080
)
8181
def test_page_size(self, client, params, expected_page_size, expected_message):
8282
if expected_message:
83-
with pytest.raises(Exception) as excinfo:
83+
with pytest.raises(Exception) as exception_info:
8484
client.list_chats(**params)
85-
assert expected_message in str(excinfo.value)
85+
assert expected_message in str(exception_info.value)
8686
else:
8787
assistants = client.list_chats(**params)
8888
assert len(assistants) == expected_page_size
@@ -99,9 +99,9 @@ def test_page_size(self, client, params, expected_page_size, expected_message):
9999
)
100100
def test_orderby(self, client, params, expected_message):
101101
if expected_message:
102-
with pytest.raises(Exception) as excinfo:
102+
with pytest.raises(Exception) as exception_info:
103103
client.list_chats(**params)
104-
assert expected_message in str(excinfo.value)
104+
assert expected_message in str(exception_info.value)
105105
else:
106106
client.list_chats(**params)
107107

@@ -126,9 +126,9 @@ def test_orderby(self, client, params, expected_message):
126126
)
127127
def test_desc(self, client, params, expected_message):
128128
if expected_message:
129-
with pytest.raises(Exception) as excinfo:
129+
with pytest.raises(Exception) as exception_info:
130130
client.list_chats(**params)
131-
assert expected_message in str(excinfo.value)
131+
assert expected_message in str(exception_info.value)
132132
else:
133133
client.list_chats(**params)
134134

@@ -144,9 +144,9 @@ def test_desc(self, client, params, expected_message):
144144
)
145145
def test_name(self, client, params, expected_num, expected_message):
146146
if expected_message:
147-
with pytest.raises(Exception) as excinfo:
147+
with pytest.raises(Exception) as exception_info:
148148
client.list_chats(**params)
149-
assert expected_message in str(excinfo.value)
149+
assert expected_message in str(exception_info.value)
150150
else:
151151
assistants = client.list_chats(**params)
152152
if params["name"] in [None, ""]:
@@ -172,9 +172,9 @@ def test_id(self, client, add_chat_assistants, chat_assistant_id, expected_num,
172172
params = {"id": chat_assistant_id}
173173

174174
if expected_message:
175-
with pytest.raises(Exception) as excinfo:
175+
with pytest.raises(Exception) as exception_info:
176176
client.list_chats(**params)
177-
assert expected_message in str(excinfo.value)
177+
assert expected_message in str(exception_info.value)
178178
else:
179179
assistants = client.list_chats(**params)
180180
if params["id"] in [None, ""]:
@@ -200,9 +200,9 @@ def test_name_and_id(self, client, add_chat_assistants, chat_assistant_id, name,
200200
params = {"id": chat_assistant_id, "name": name}
201201

202202
if expected_message:
203-
with pytest.raises(Exception) as excinfo:
203+
with pytest.raises(Exception) as exception_info:
204204
client.list_chats(**params)
205-
assert expected_message in str(excinfo.value)
205+
assert expected_message in str(exception_info.value)
206206
else:
207207
assistants = client.list_chats(**params)
208208
assert len(assistants) == expected_num

‎test/testcases/test_sdk_api/test_chat_assistant_management/test_update_chat_assistant.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ def test_name(self, client, add_chat_assistants_func, payload, expected_message)
3939
chat_assistant = chat_assistants[0]
4040

4141
if expected_message:
42-
with pytest.raises(Exception) as excinfo:
42+
with pytest.raises(Exception) as exception_info:
4343
chat_assistant.update(payload)
44-
assert expected_message in str(excinfo.value)
44+
assert expected_message in str(exception_info.value)
4545
else:
4646
chat_assistant.update(payload)
4747
updated_chat = client.list_chats(id=chat_assistant.id)[0]
@@ -101,9 +101,9 @@ def test_llm(self, client, add_chat_assistants_func, llm, expected_message):
101101
payload = {"name": "llm_test", "llm": llm, "dataset_ids": [dataset.id]}
102102

103103
if expected_message:
104-
with pytest.raises(Exception) as excinfo:
104+
with pytest.raises(Exception) as exception_info:
105105
chat_assistant.update(payload)
106-
assert expected_message in str(excinfo.value)
106+
assert expected_message in str(exception_info.value)
107107
else:
108108
chat_assistant.update(payload)
109109
updated_chat = client.list_chats(id=chat_assistant.id)[0]
@@ -178,9 +178,9 @@ def test_prompt(self, client, add_chat_assistants_func, prompt, expected_message
178178
payload = {"name": "prompt_test", "prompt": prompt, "dataset_ids": [dataset.id]}
179179

180180
if expected_message:
181-
with pytest.raises(Exception) as excinfo:
181+
with pytest.raises(Exception) as exception_info:
182182
chat_assistant.update(payload)
183-
assert expected_message in str(excinfo.value)
183+
assert expected_message in str(exception_info.value)
184184
else:
185185
chat_assistant.update(payload)
186186
updated_chat = client.list_chats(id=chat_assistant.id)[0]

‎test/testcases/test_sdk_api/test_chunk_management_within_dataset/test_add_chunk.py‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@ def test_content(self, add_document, payload, expected_message):
4848
chunks_count = len(document.list_chunks())
4949

5050
if expected_message:
51-
with pytest.raises(Exception) as excinfo:
51+
with pytest.raises(Exception) as exception_info:
5252
document.add_chunk(**payload)
53-
assert expected_message in str(excinfo.value), str(excinfo.value)
53+
assert expected_message in str(exception_info.value), str(exception_info.value)
5454
else:
5555
chunk = document.add_chunk(**payload)
5656
validate_chunk_details(dataset.id, document.id, payload, chunk)
@@ -76,9 +76,9 @@ def test_important_keywords(self, add_document, payload, expected_message):
7676
chunks_count = len(document.list_chunks())
7777

7878
if expected_message:
79-
with pytest.raises(Exception) as excinfo:
79+
with pytest.raises(Exception) as exception_info:
8080
document.add_chunk(**payload)
81-
assert expected_message in str(excinfo.value), str(excinfo.value)
81+
assert expected_message in str(exception_info.value), str(exception_info.value)
8282
else:
8383
chunk = document.add_chunk(**payload)
8484
validate_chunk_details(dataset.id, document.id, payload, chunk)
@@ -104,9 +104,9 @@ def test_questions(self, add_document, payload, expected_message):
104104
chunks_count = len(document.list_chunks())
105105

106106
if expected_message:
107-
with pytest.raises(Exception) as excinfo:
107+
with pytest.raises(Exception) as exception_info:
108108
document.add_chunk(**payload)
109-
assert expected_message in str(excinfo.value), str(excinfo.value)
109+
assert expected_message in str(exception_info.value), str(exception_info.value)
110110
else:
111111
chunk = document.add_chunk(**payload)
112112
validate_chunk_details(dataset.id, document.id, payload, chunk)
@@ -138,9 +138,9 @@ def test_add_chunk_to_deleted_document(self, add_document):
138138
dataset, document = add_document
139139
dataset.delete_documents(ids=[document.id])
140140

141-
with pytest.raises(Exception) as excinfo:
141+
with pytest.raises(Exception) as exception_info:
142142
document.add_chunk(content="chunk test")
143-
assert f"You don't own the document {document.id}" in str(excinfo.value), str(excinfo.value)
143+
assert f"You don't own the document {document.id}" in str(exception_info.value), str(exception_info.value)
144144

145145
@pytest.mark.skip(reason="issues/6411")
146146
@pytest.mark.p3

‎test/testcases/test_sdk_api/test_chunk_management_within_dataset/test_delete_chunks.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ def test_delete_partial_invalid_id(self, add_chunks_func, payload):
3333
chunk_ids = [chunk.id for chunk in chunks]
3434
payload = payload(chunk_ids)
3535

36-
with pytest.raises(Exception) as excinfo:
36+
with pytest.raises(Exception) as exception_info:
3737
document.delete_chunks(**payload)
38-
assert "rm_chunk deleted chunks" in str(excinfo.value), str(excinfo.value)
38+
assert "rm_chunk deleted chunks" in str(exception_info.value), str(exception_info.value)
3939

4040
remaining_chunks = document.list_chunks()
4141
assert len(remaining_chunks) == 1, str(remaining_chunks)
@@ -46,9 +46,9 @@ def test_repeated_deletion(self, add_chunks_func):
4646
chunk_ids = [chunk.id for chunk in chunks]
4747
document.delete_chunks(ids=chunk_ids)
4848

49-
with pytest.raises(Exception) as excinfo:
49+
with pytest.raises(Exception) as exception_info:
5050
document.delete_chunks(ids=chunk_ids)
51-
assert "rm_chunk deleted chunks 0, expect" in str(excinfo.value), str(excinfo.value)
51+
assert "rm_chunk deleted chunks 0, expect" in str(exception_info.value), str(exception_info.value)
5252

5353
@pytest.mark.p3
5454
def test_duplicate_deletion(self, add_chunks_func):
@@ -103,9 +103,9 @@ def test_basic_scenarios(self, add_chunks_func, payload, expected_message, remai
103103
payload = payload(chunk_ids)
104104

105105
if expected_message:
106-
with pytest.raises(Exception) as excinfo:
106+
with pytest.raises(Exception) as exception_info:
107107
document.delete_chunks(**payload)
108-
assert expected_message in str(excinfo.value), str(excinfo.value)
108+
assert expected_message in str(exception_info.value), str(exception_info.value)
109109
else:
110110
document.delete_chunks(**payload)
111111

‎test/testcases/test_sdk_api/test_chunk_management_within_dataset/test_list_chunks.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ def test_page(self, add_chunks, params, expected_page_size, expected_message):
3838
_, document, _ = add_chunks
3939

4040
if expected_message:
41-
with pytest.raises(Exception) as excinfo:
41+
with pytest.raises(Exception) as exception_info:
4242
document.list_chunks(**params)
43-
assert expected_message in str(excinfo.value), str(excinfo.value)
43+
assert expected_message in str(exception_info.value), str(exception_info.value)
4444
else:
4545
chunks = document.list_chunks(**params)
4646
assert len(chunks) == expected_page_size, str(chunks)
@@ -62,9 +62,9 @@ def test_page_size(self, add_chunks, params, expected_page_size, expected_messag
6262
_, document, _ = add_chunks
6363

6464
if expected_message:
65-
with pytest.raises(Exception) as excinfo:
65+
with pytest.raises(Exception) as exception_info:
6666
document.list_chunks(**params)
67-
assert expected_message in str(excinfo.value), str(excinfo.value)
67+
assert expected_message in str(exception_info.value), str(exception_info.value)
6868
else:
6969
chunks = document.list_chunks(**params)
7070
assert len(chunks) == expected_page_size, str(chunks)
@@ -106,9 +106,9 @@ def test_id(self, add_chunks, chunk_id, expected_page_size, expected_message):
106106
params = {"id": chunk_id}
107107

108108
if expected_message:
109-
with pytest.raises(Exception) as excinfo:
109+
with pytest.raises(Exception) as exception_info:
110110
document.list_chunks(**params)
111-
assert expected_message in str(excinfo.value), str(excinfo.value)
111+
assert expected_message in str(exception_info.value), str(exception_info.value)
112112
else:
113113
chunks = document.list_chunks(**params)
114114
if params["id"] in [None, ""]:

0 commit comments

Comments
 (0)