Skip to content

Commit d057067

Browse files
authored
fix: remove ruff ignore SIM300 (#11810)
1 parent 560d375 commit d057067

File tree

6 files changed

+12
-13
lines changed

6 files changed

+12
-13
lines changed

api/.ruff.toml

-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ ignore = [
7070
"SIM113", # eumerate-for-loop
7171
"SIM117", # multiple-with-statements
7272
"SIM210", # if-expr-with-true-false
73-
"SIM300", # yoda-conditions,
7473
]
7574

7675
[lint.per-file-ignores]

api/controllers/console/admin.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ def decorated(*args, **kwargs):
3131
if auth_scheme != "bearer":
3232
raise Unauthorized("Invalid Authorization header format. Expected 'Bearer <api-key>' format.")
3333

34-
if dify_config.ADMIN_API_KEY != auth_token:
34+
if auth_token != dify_config.ADMIN_API_KEY:
3535
raise Unauthorized("API key is invalid.")
3636

3737
return view(*args, **kwargs)

api/core/model_runtime/model_providers/replicate/text_embedding/text_embedding.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ def _generate_embeddings_by_text_input_key(
119119
embeddings.append(result[0].get("embedding"))
120120

121121
return [list(map(float, e)) for e in embeddings]
122-
elif "texts" == text_input_key:
122+
elif text_input_key == "texts":
123123
result = client.run(
124124
replicate_model_version,
125125
input={

api/tests/integration_tests/model_runtime/__mock/xinference.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ def get_chat_model(self: Client, model_uid: str) -> Union[RESTfulGenerateModelHa
2121
if not re.match(r"https?:\/\/[^\s\/$.?#].[^\s]*$", self.base_url):
2222
raise RuntimeError("404 Not Found")
2323

24-
if "generate" == model_uid:
24+
if model_uid == "generate":
2525
return RESTfulGenerateModelHandle(model_uid, base_url=self.base_url, auth_headers={})
26-
if "chat" == model_uid:
26+
if model_uid == "chat":
2727
return RESTfulChatModelHandle(model_uid, base_url=self.base_url, auth_headers={})
28-
if "embedding" == model_uid:
28+
if model_uid == "embedding":
2929
return RESTfulEmbeddingModelHandle(model_uid, base_url=self.base_url, auth_headers={})
30-
if "rerank" == model_uid:
30+
if model_uid == "rerank":
3131
return RESTfulRerankModelHandle(model_uid, base_url=self.base_url, auth_headers={})
3232
raise RuntimeError("404 Not Found")
3333

api/tests/integration_tests/tools/api_tool/test_api_tool.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ def test_api_tool(setup_http_mock):
3434
response = tool.do_http_request(tool.api_bundle.server_url, tool.api_bundle.method, headers, parameters)
3535

3636
assert response.status_code == 200
37-
assert "/p_param" == response.request.url.path
38-
assert b"query_param=q_param" == response.request.url.query
39-
assert "h_param" == response.request.headers.get("header_param")
40-
assert "application/json" == response.request.headers.get("content-type")
41-
assert "cookie_param=c_param" == response.request.headers.get("cookie")
37+
assert response.request.url.path == "/p_param"
38+
assert response.request.url.query == b"query_param=q_param"
39+
assert response.request.headers.get("header_param") == "h_param"
40+
assert response.request.headers.get("content-type") == "application/json"
41+
assert response.request.headers.get("cookie") == "cookie_param=c_param"
4242
assert "b_param" in response.content.decode()

api/tests/integration_tests/workflow/nodes/test_http.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@ def test_mock_404(setup_http_mock):
384384
assert result.outputs is not None
385385
resp = result.outputs
386386

387-
assert 404 == resp.get("status_code")
387+
assert resp.get("status_code") == 404
388388
assert "Not Found" in resp.get("body", "")
389389

390390

0 commit comments

Comments
 (0)