fix: Lint Python code with ruff (#3799)

tests/integration_tests/admin_tests/test_admin_about.py

@@ -26,7 +26,7 @@ def test_public_about_get_app_info(api_client: TestClient, is_private_group: boo
     assert as_dict["allowSignup"] == settings.ALLOW_SIGNUP
 
     if is_private_group:
-        assert as_dict["defaultGroupSlug"] == None
+        assert as_dict["defaultGroupSlug"] is None
     else:
         assert as_dict["defaultGroupSlug"] == group.slug
 

tests/integration_tests/recipe_migration_tests/test_recipe_migrations.py

@@ -104,7 +104,7 @@ def test_bad_mealie_alpha_data_is_ignored(api_client: TestClient, unique_user: T
             with open(invalid_json_path, "w"):
                 pass  # write nothing to the file, which is invalid JSON
         except Exception:
-            raise Exception(os.listdir(tmpdir))
+            raise Exception(os.listdir(tmpdir))  # noqa: B904
 
         modified_test_data = os.path.join(tmpdir, "modified-test-data.zip")
         with ZipFile(modified_test_data, "w") as zf:

tests/integration_tests/user_group_tests/test_group_recipe_actions.py

@@ -49,7 +49,7 @@ def test_group_recipe_actions_get_all(api_client: TestClient, unique_user: TestU
 
     response = api_client.get(api_routes.groups_recipe_actions, headers=unique_user.token)
     data = assert_deserialize(response, 200)
-    fetched_ids = set(item["id"] for item in data["items"])
+    fetched_ids = {item["id"] for item in data["items"]}
     for expected_id in expected_ids:
         assert expected_id in fetched_ids
 

tests/integration_tests/user_recipe_tests/test_recipe_bulk_action.py

@@ -1,5 +1,5 @@
+from collections.abc import Generator
 from pathlib import Path
-from typing import Generator
 
 import pytest
 import sqlalchemy

tests/integration_tests/user_recipe_tests/test_recipe_crud.py

@@ -4,8 +4,8 @@ import os
 import random
 import shutil
 import tempfile
+from collections.abc import Generator
 from pathlib import Path
-from typing import Generator
 from uuid import uuid4
 from zipfile import ZipFile
 
@@ -489,9 +489,9 @@ def test_duplicate(api_client: TestClient, recipe_data: RecipeSiteTestCase, uniq
 
     # Ingredients should have the same texts, but different ids
     assert duplicate_recipe["recipeIngredient"] != initial_recipe["recipeIngredient"]
-    assert list(map(lambda i: i["note"], duplicate_recipe["recipeIngredient"])) == list(
-        map(lambda i: i["note"], initial_recipe["recipeIngredient"])
-    )
+    assert [i["note"] for i in duplicate_recipe["recipeIngredient"]] == [
+        i["note"] for i in initial_recipe["recipeIngredient"]
+    ]
 
     previous_categories = initial_recipe["recipeCategory"]
     assert duplicate_recipe["recipeCategory"] == previous_categories
@@ -748,21 +748,21 @@ def test_get_recipes_organizer_filter(
     # get recipes by organizer
     if organizer_type == "tags":
         organizer = random.choice(tags)
-        expected_recipe_ids = set(
+        expected_recipe_ids = {
             str(recipe.id) for recipe in recipes if organizer.id in [tag.id for tag in recipe.tags or []]
-        )
+        }
     elif organizer_type == "categories":
         organizer = random.choice(categories)
-        expected_recipe_ids = set(
+        expected_recipe_ids = {
             str(recipe.id)
             for recipe in recipes
             if organizer.id in [category.id for category in recipe.recipe_category or []]
-        )
+        }
     elif organizer_type == "tools":
         organizer = random.choice(tools)
-        expected_recipe_ids = set(
+        expected_recipe_ids = {
             str(recipe.id) for recipe in recipes if organizer.id in [tool.id for tool in recipe.tools or []]
-        )
+        }
     else:
         raise ValueError(f"Unknown organizer type: {organizer_type}")
 

tests/integration_tests/user_recipe_tests/test_recipe_export_as.py

@@ -1,6 +1,6 @@
-from io import BytesIO
 import json
 import zipfile
+from io import BytesIO
 
 from fastapi.testclient import TestClient
 

tests/integration_tests/user_recipe_tests/test_recipe_ingredient_parser.py

@@ -29,7 +29,7 @@ def test_recipe_ingredients_parser_nlp(api_client: TestClient, unique_user: Test
     response = api_client.post(api_routes.parser_ingredients, json=payload, headers=unique_user.token)
     assert response.status_code == 200
 
-    for api_ingredient, test_ingredient in zip(response.json(), test_ingredients):
+    for api_ingredient, test_ingredient in zip(response.json(), test_ingredients, strict=False):
         assert_ingredient(api_ingredient, test_ingredient)
 
 

tests/integration_tests/user_recipe_tests/test_recipe_ratings.py

@@ -1,5 +1,5 @@
 import random
-from typing import Generator
+from collections.abc import Generator
 from uuid import UUID
 
 import pytest
@@ -71,8 +71,8 @@ def test_user_recipe_favorites(
     ratings = response.json()["ratings"]
 
     assert len(ratings) == len(recipes_to_favorite)
-    fetched_recipe_ids = set(rating["recipeId"] for rating in ratings)
-    favorited_recipe_ids = set(str(recipe.id) for recipe in recipes_to_favorite)
+    fetched_recipe_ids = {rating["recipeId"] for rating in ratings}
+    favorited_recipe_ids = {str(recipe.id) for recipe in recipes_to_favorite}
     assert fetched_recipe_ids == favorited_recipe_ids
 
     # remove favorites
@@ -87,8 +87,8 @@ def test_user_recipe_favorites(
     ratings = response.json()["ratings"]
 
     assert len(ratings) == len(recipes_to_favorite) - len(recipe_favorites_to_remove)
-    fetched_recipe_ids = set(rating["recipeId"] for rating in ratings)
-    removed_recipe_ids = set(str(recipe.id) for recipe in recipe_favorites_to_remove)
+    fetched_recipe_ids = {rating["recipeId"] for rating in ratings}
+    removed_recipe_ids = {str(recipe.id) for recipe in recipe_favorites_to_remove}
     assert fetched_recipe_ids == favorited_recipe_ids - removed_recipe_ids
 
 

tests/integration_tests/user_recipe_tests/test_recipe_share_tokens.py

@@ -1,4 +1,4 @@
-from typing import Generator
+from collections.abc import Generator
 
 import pytest
 import sqlalchemy

tests/integration_tests/user_tests/test_user_crud.py

@@ -40,7 +40,7 @@ def test_get_all_users_admin(
     assert response.status_code == 200
 
     # assert all users from all groups are returned
-    response_user_ids = set(user["id"] for user in response.json()["items"])
+    response_user_ids = {user["id"] for user in response.json()["items"]}
     for user_id in user_ids:
         assert user_id in response_user_ids
 
@@ -73,7 +73,7 @@ def test_get_all_group_users(
 
     user_group = database.groups.get_by_slug_or_id(user.group_id)
     assert user_group
-    same_group_user_ids: set[str] = set([str(user.user_id)])
+    same_group_user_ids: set[str] = {user.user_id}
     for _ in range(random_int(2, 5)):
         new_user = database.users.create(
             {
@@ -89,7 +89,7 @@ def test_get_all_group_users(
 
     response = api_client.get(api_routes.users_group_users, params={"perPage": -1}, headers=user.token)
     assert response.status_code == 200
-    response_user_ids = set(user["id"] for user in response.json()["items"])
+    response_user_ids = {user["id"] for user in response.json()["items"]}
 
     # assert only users from the same group are returned
     for user_id in other_group_user_ids:

tests/integration_tests/user_tests/test_user_login.py

@@ -234,7 +234,10 @@ def test_ldap_user_login_simple_filter(api_client: TestClient):
 @pytest.mark.skipif(not os.environ.get("GITHUB_ACTIONS", False), reason="requires ldap service in github actions")
 def test_ldap_user_login_complex_filter(api_client: TestClient):
     settings = get_app_settings()
-    settings.LDAP_USER_FILTER = "(&(objectClass=inetOrgPerson)(|(memberOf=cn=ship_crew,ou=people,dc=planetexpress,dc=com)(memberOf=cn=admin_staff,ou=people,dc=planetexpress,dc=com)))"
+    settings.LDAP_USER_FILTER = (
+        "(&(objectClass=inetOrgPerson)(|(memberOf=cn=ship_crew,ou=people,dc=planetexpress,dc=com)"
+        "(memberOf=cn=admin_staff,ou=people,dc=planetexpress,dc=com)))"
+    )
 
     form_data = {"username": "professor", "password": "professor"}
     response = api_client.post(api_routes.auth_token, data=form_data)

tests/integration_tests/user_tests/test_user_password_services.py

@@ -3,14 +3,11 @@ import json
 import pytest
 from fastapi.testclient import TestClient
 
-from mealie.core.config import get_app_settings
 from mealie.db.db_setup import session_context
-from mealie.repos.repository_factory import AllRepositories
-from mealie.schema.response.pagination import PaginationQuery
-from mealie.schema.user.user import ChangePassword, PrivateUser
+from mealie.schema.user.user import PrivateUser
 from mealie.services.user_services.password_reset_service import PasswordResetService
 from tests.utils import api_routes
-from tests.utils.factories import random_email, random_string
+from tests.utils.factories import random_string
 from tests.utils.fixture_schemas import TestUser
 
 
@@ -27,7 +24,7 @@ def test_password_reset(api_client: TestClient, unique_user: TestUser, casing: s
                 cased_email += letter.upper()
             else:
                 cased_email += letter.lower()
-        cased_email
+        assert cased_email
 
     with session_context() as session:
         service = PasswordResetService(session)
@@ -75,7 +72,7 @@ def test_password_reset_ldap(ldap_user: PrivateUser, casing: str):
                 cased_email += letter.upper()
             else:
                 cased_email += letter.lower()
-        cased_email
+        assert cased_email
 
     with session_context() as session:
         service = PasswordResetService(session)