fix: Lint Python code with ruff (#3799)

tests/unit_tests/repository_tests/test_pagination.py

@@ -308,7 +308,7 @@ def test_pagination_filter_in_advanced(database: AllRepositories, unique_user: T
         TagSave(group_id=unique_user.group_id, name=slug2, slug=slug2),
     ]
 
-    tag_1, tag_2 = [database.tags.create(tag) for tag in tags]
+    tag_1, tag_2 = (database.tags.create(tag) for tag in tags)
 
     # Bootstrap the database with recipes
     slug = random_string()
@@ -472,7 +472,7 @@ def test_pagination_filter_logical_namespace_conflict(database: AllRepositories,
         CategorySave(group_id=unique_user.group_id, name=random_string(10)),
         CategorySave(group_id=unique_user.group_id, name=random_string(10)),
     ]
-    category_1, category_2 = [database.categories.create(category) for category in categories]
+    category_1, category_2 = (database.categories.create(category) for category in categories)
 
     # Bootstrap the database with recipes
     slug = random_string()
@@ -528,7 +528,7 @@ def test_pagination_filter_datetimes(
     dt = past_dt.isoformat()
     query = PaginationQuery(page=1, per_page=-1, query_filter=f'createdAt>"{dt}"')
     unit_results = units_repo.page_all(query).items
-    unit_ids = set(unit.id for unit in unit_results)
+    unit_ids = {unit.id for unit in unit_results}
     assert len(unit_ids) == 3
     assert unit_1.id in unit_ids
     assert unit_2.id in unit_ids
@@ -537,7 +537,7 @@ def test_pagination_filter_datetimes(
     dt = unit_1.created_at.isoformat()  # type: ignore
     query = PaginationQuery(page=1, per_page=-1, query_filter=f'createdAt>"{dt}"')
     unit_results = units_repo.page_all(query).items
-    unit_ids = set(unit.id for unit in unit_results)
+    unit_ids = {unit.id for unit in unit_results}
     assert len(unit_ids) == 2
     assert unit_1.id not in unit_ids
     assert unit_2.id in unit_ids
@@ -546,7 +546,7 @@ def test_pagination_filter_datetimes(
     dt = unit_2.created_at.isoformat()  # type: ignore
     query = PaginationQuery(page=1, per_page=-1, query_filter=f'createdAt>"{dt}"')
     unit_results = units_repo.page_all(query).items
-    unit_ids = set(unit.id for unit in unit_results)
+    unit_ids = {unit.id for unit in unit_results}
     assert len(unit_ids) == 1
     assert unit_1.id not in unit_ids
     assert unit_2.id not in unit_ids
@@ -555,14 +555,14 @@ def test_pagination_filter_datetimes(
     dt = unit_3.created_at.isoformat()  # type: ignore
     query = PaginationQuery(page=1, per_page=-1, query_filter=f'createdAt>"{dt}"')
     unit_results = units_repo.page_all(query).items
-    unit_ids = set(unit.id for unit in unit_results)
+    unit_ids = {unit.id for unit in unit_results}
     assert len(unit_ids) == 0
 
     future_dt: datetime = unit_3.created_at + timedelta(seconds=1)  # type: ignore
     dt = future_dt.isoformat()
     query = PaginationQuery(page=1, per_page=-1, query_filter=f'createdAt>"{dt}"')
     unit_results = units_repo.page_all(query).items
-    unit_ids = set(unit.id for unit in unit_results)
+    unit_ids = {unit.id for unit in unit_results}
     assert len(unit_ids) == 0
 
     ## GTE
@@ -570,7 +570,7 @@ def test_pagination_filter_datetimes(
     dt = past_dt.isoformat()
     query = PaginationQuery(page=1, per_page=-1, query_filter=f'createdAt>="{dt}"')
     unit_results = units_repo.page_all(query).items
-    unit_ids = set(unit.id for unit in unit_results)
+    unit_ids = {unit.id for unit in unit_results}
     assert len(unit_ids) == 3
     assert unit_1.id in unit_ids
     assert unit_2.id in unit_ids
@@ -579,7 +579,7 @@ def test_pagination_filter_datetimes(
     dt = unit_1.created_at.isoformat()  # type: ignore
     query = PaginationQuery(page=1, per_page=-1, query_filter=f'createdAt>="{dt}"')
     unit_results = units_repo.page_all(query).items
-    unit_ids = set(unit.id for unit in unit_results)
+    unit_ids = {unit.id for unit in unit_results}
     assert len(unit_ids) == 3
     assert unit_1.id in unit_ids
     assert unit_2.id in unit_ids
@@ -588,7 +588,7 @@ def test_pagination_filter_datetimes(
     dt = unit_2.created_at.isoformat()  # type: ignore
     query = PaginationQuery(page=1, per_page=-1, query_filter=f'createdAt>="{dt}"')
     unit_results = units_repo.page_all(query).items
-    unit_ids = set(unit.id for unit in unit_results)
+    unit_ids = {unit.id for unit in unit_results}
     assert len(unit_ids) == 2
     assert unit_1.id not in unit_ids
     assert unit_2.id in unit_ids
@@ -597,7 +597,7 @@ def test_pagination_filter_datetimes(
     dt = unit_3.created_at.isoformat()  # type: ignore
     query = PaginationQuery(page=1, per_page=-1, query_filter=f'createdAt>="{dt}"')
     unit_results = units_repo.page_all(query).items
-    unit_ids = set(unit.id for unit in unit_results)
+    unit_ids = {unit.id for unit in unit_results}
     assert len(unit_ids) == 1
     assert unit_1.id not in unit_ids
     assert unit_2.id not in unit_ids
@@ -607,7 +607,7 @@ def test_pagination_filter_datetimes(
     dt = future_dt.isoformat()
     query = PaginationQuery(page=1, per_page=-1, query_filter=f'createdAt>="{dt}"')
     unit_results = units_repo.page_all(query).items
-    unit_ids = set(unit.id for unit in unit_results)
+    unit_ids = {unit.id for unit in unit_results}
     assert len(unit_ids) == 0
 
 
@@ -931,7 +931,7 @@ def test_pagination_filter_dates(api_client: TestClient, unique_user: TestUser):
 
     ## Yesterday
     params = {
-        f"page": 1,
+        "page": 1,
         "perPage": -1,
         "queryFilter": f"date >= {yesterday.strftime('%Y-%m-%d')}",
     }
@@ -940,12 +940,12 @@ def test_pagination_filter_dates(api_client: TestClient, unique_user: TestUser):
     response_json = response.json()
 
     assert len(response_json["items"]) == 2
-    fetched_mealplan_titles = set(mp["title"] for mp in response_json["items"])
+    fetched_mealplan_titles = {mp["title"] for mp in response_json["items"]}
     assert mealplan_today.title in fetched_mealplan_titles
     assert mealplan_tomorrow.title in fetched_mealplan_titles
 
     params = {
-        f"page": 1,
+        "page": 1,
         "perPage": -1,
         "queryFilter": f"date > {yesterday.strftime('%Y-%m-%d')}",
     }
@@ -954,13 +954,13 @@ def test_pagination_filter_dates(api_client: TestClient, unique_user: TestUser):
     response_json = response.json()
 
     assert len(response_json["items"]) == 2
-    fetched_mealplan_titles = set(mp["title"] for mp in response_json["items"])
+    fetched_mealplan_titles = {mp["title"] for mp in response_json["items"]}
     assert mealplan_today.title in fetched_mealplan_titles
     assert mealplan_tomorrow.title in fetched_mealplan_titles
 
     ## Today
     params = {
-        f"page": 1,
+        "page": 1,
         "perPage": -1,
         "queryFilter": f"date >= {today.strftime('%Y-%m-%d')}",
     }
@@ -969,12 +969,12 @@ def test_pagination_filter_dates(api_client: TestClient, unique_user: TestUser):
     response_json = response.json()
 
     assert len(response_json["items"]) == 2
-    fetched_mealplan_titles = set(mp["title"] for mp in response_json["items"])
+    fetched_mealplan_titles = {mp["title"] for mp in response_json["items"]}
     assert mealplan_today.title in fetched_mealplan_titles
     assert mealplan_tomorrow.title in fetched_mealplan_titles
 
     params = {
-        f"page": 1,
+        "page": 1,
         "perPage": -1,
         "queryFilter": f"date > {today.strftime('%Y-%m-%d')}",
     }
@@ -983,13 +983,13 @@ def test_pagination_filter_dates(api_client: TestClient, unique_user: TestUser):
     response_json = response.json()
 
     assert len(response_json["items"]) == 1
-    fetched_mealplan_titles = set(mp["title"] for mp in response_json["items"])
+    fetched_mealplan_titles = {mp["title"] for mp in response_json["items"]}
     assert mealplan_today.title not in fetched_mealplan_titles
     assert mealplan_tomorrow.title in fetched_mealplan_titles
 
     ## Tomorrow
     params = {
-        f"page": 1,
+        "page": 1,
         "perPage": -1,
         "queryFilter": f"date >= {tomorrow.strftime('%Y-%m-%d')}",
     }
@@ -998,12 +998,12 @@ def test_pagination_filter_dates(api_client: TestClient, unique_user: TestUser):
     response_json = response.json()
 
     assert len(response_json["items"]) == 1
-    fetched_mealplan_titles = set(mp["title"] for mp in response_json["items"])
+    fetched_mealplan_titles = {mp["title"] for mp in response_json["items"]}
     assert mealplan_today.title not in fetched_mealplan_titles
     assert mealplan_tomorrow.title in fetched_mealplan_titles
 
     params = {
-        f"page": 1,
+        "page": 1,
         "perPage": -1,
         "queryFilter": f"date > {tomorrow.strftime('%Y-%m-%d')}",
     }
@@ -1015,7 +1015,7 @@ def test_pagination_filter_dates(api_client: TestClient, unique_user: TestUser):
 
     ## Day After Tomorrow
     params = {
-        f"page": 1,
+        "page": 1,
         "perPage": -1,
         "queryFilter": f"date >= {day_after_tomorrow.strftime('%Y-%m-%d')}",
     }
@@ -1025,7 +1025,7 @@ def test_pagination_filter_dates(api_client: TestClient, unique_user: TestUser):
     assert len(response_json["items"]) == 0
 
     params = {
-        f"page": 1,
+        "page": 1,
         "perPage": -1,
         "queryFilter": f"date > {day_after_tomorrow.strftime('%Y-%m-%d')}",
     }
@@ -1077,20 +1077,20 @@ def test_pagination_filter_advanced_frontend_sort(database: AllRepositories, uni
         CategorySave(group_id=unique_user.group_id, name=random_string(10)),
         CategorySave(group_id=unique_user.group_id, name=random_string(10)),
     ]
-    category_1, category_2 = [database.categories.create(category) for category in categories]
+    category_1, category_2 = (database.categories.create(category) for category in categories)
 
     slug1, slug2 = (random_string(10) for _ in range(2))
     tags = [
         TagSave(group_id=unique_user.group_id, name=slug1, slug=slug1),
         TagSave(group_id=unique_user.group_id, name=slug2, slug=slug2),
     ]
-    tag_1, tag_2 = [database.tags.create(tag) for tag in tags]
+    tag_1, tag_2 = (database.tags.create(tag) for tag in tags)
 
     tools = [
         RecipeToolSave(group_id=unique_user.group_id, name=random_string(10)),
         RecipeToolSave(group_id=unique_user.group_id, name=random_string(10)),
     ]
-    tool_1, tool_2 = [database.tools.create(tool) for tool in tools]
+    tool_1, tool_2 = (database.tools.create(tool) for tool in tools)
 
     # Bootstrap the database with recipes
     slug = random_string()

tests/unit_tests/repository_tests/test_recipe_repository.py

@@ -44,7 +44,7 @@ def search_recipes(database: AllRepositories, unique_local_group_id: str, unique
             user_id=unique_local_user_id,
             group_id=unique_local_group_id,
             name="Steinbock Sloop",
-            description=f"My favorite horns are delicious",
+            description="My favorite horns are delicious",
             recipe_ingredient=[
                 RecipeIngredient(note="alpine animal"),
             ],
@@ -302,7 +302,7 @@ def test_recipe_repo_pagination_by_categories(database: AllRepositories, unique_
         order_direction=OrderDirection.asc,
     )
     random_ordered = []
-    for i in range(5):
+    for _ in range(5):
         pagination_query.pagination_seed = str(datetime.now(timezone.utc))
         random_ordered.append(database.recipes.page_all(pagination_query, categories=[category_slug]).items)
     assert not all(i == random_ordered[0] for i in random_ordered)
@@ -395,7 +395,7 @@ def test_recipe_repo_pagination_by_tags(database: AllRepositories, unique_user:
         order_direction=OrderDirection.asc,
     )
     random_ordered = []
-    for i in range(5):
+    for _ in range(5):
         pagination_query.pagination_seed = str(datetime.now(timezone.utc))
         random_ordered.append(database.recipes.page_all(pagination_query, tags=[tag_slug]).items)
     assert len(random_ordered[0]) == 15
@@ -491,7 +491,7 @@ def test_recipe_repo_pagination_by_tools(database: AllRepositories, unique_user:
         order_direction=OrderDirection.asc,
     )
     random_ordered = []
-    for i in range(5):
+    for _ in range(5):
         pagination_query.pagination_seed = str(datetime.now(timezone.utc))
         random_ordered.append(database.recipes.page_all(pagination_query, tools=[tool_id]).items)
     assert len(random_ordered[0]) == 15
@@ -575,7 +575,7 @@ def test_recipe_repo_pagination_by_foods(database: AllRepositories, unique_user:
         order_direction=OrderDirection.asc,
     )
     random_ordered = []
-    for i in range(5):
+    for _ in range(5):
         pagination_query.pagination_seed = str(datetime.now(timezone.utc))
         random_ordered.append(database.recipes.page_all(pagination_query, foods=[food_id]).items)
     assert len(random_ordered[0]) == 15

tests/unit_tests/services_tests/backup_v2_tests/test_backup_v2.py

@@ -25,7 +25,7 @@ from mealie.services.backups_v2.backup_v2 import BackupV2
 def dict_sorter(d: dict) -> Any:
     possible_keys = {"created_at", "id"}
 
-    return next((d[key] for key in possible_keys if key in d and d[key]), 1)
+    return next((d[key] for key in possible_keys if d.get(key)), 1)
 
 
 # For Future Use
@@ -68,7 +68,7 @@ def test_database_restore():
     new_exporter = AlchemyExporter(settings.DB_URL)
     snapshop_2 = new_exporter.dump()
 
-    for s1, s2 in zip(snapshop_1, snapshop_2):
+    for s1, s2 in zip(snapshop_1, snapshop_2, strict=False):
         assert snapshop_1[s1].sort(key=dict_sorter) == snapshop_2[s2].sort(key=dict_sorter)
 
 

tests/unit_tests/services_tests/user_services/test_user_service.py

@@ -34,7 +34,7 @@ def test_get_locked_users(database: AllRepositories, user_tuple: list[TestUser])
         elif locked_user.id == user_2.id:
             assert locked_user.locked_at == user_2.locked_at
         else:
-            assert False
+            raise AssertionError()
 
     # Cleanup
     user_service.unlock_user(user_1)

tests/unit_tests/test_ingredient_parser.py

@@ -145,7 +145,7 @@ def test_nlp_parser() -> None:
     models: list[CRFIngredient] = convert_list_to_crf_model([x.input for x in test_ingredients])
 
     # Iterate over models and test_ingredients to gather
-    for model, test_ingredient in zip(models, test_ingredients):
+    for model, test_ingredient in zip(models, test_ingredients, strict=False):
         assert round(float(sum(Fraction(s) for s in model.qty.split())), 3) == pytest.approx(test_ingredient.quantity)
 
         assert model.comment == test_ingredient.comments

tests/unit_tests/test_security.py

@@ -27,9 +27,9 @@ class LdapConnMock:
         self.name = name
 
     def simple_bind_s(self, dn, bind_pw):
-        if dn == "cn={}, {}".format(self.user, self.app_settings.LDAP_BASE_DN):
+        if dn == f"cn={self.user}, {self.app_settings.LDAP_BASE_DN}":
             valid_password = self.password
-        elif "cn={}, {}".format(self.query_bind, self.app_settings.LDAP_BASE_DN):
+        elif f"cn={self.query_bind}, {self.app_settings.LDAP_BASE_DN}":
             valid_password = self.query_password
 
         if bind_pw == valid_password:
@@ -42,7 +42,7 @@ class LdapConnMock:
         if filter == self.app_settings.LDAP_ADMIN_FILTER:
             assert attrlist == []
             assert filter == self.app_settings.LDAP_ADMIN_FILTER
-            assert dn == "cn={}, {}".format(self.user, self.app_settings.LDAP_BASE_DN)
+            assert dn == f"cn={self.user}, {self.app_settings.LDAP_BASE_DN}"
             assert scope == ldap.SCOPE_BASE
 
             if not self.admin:
@@ -60,11 +60,9 @@ class LdapConnMock:
             mail_attribute=self.app_settings.LDAP_MAIL_ATTRIBUTE,
             input=self.user,
         )
-        search_filter = "(&(|({id_attribute}={input})({mail_attribute}={input})){filter})".format(
-            id_attribute=self.app_settings.LDAP_ID_ATTRIBUTE,
-            mail_attribute=self.app_settings.LDAP_MAIL_ATTRIBUTE,
-            input=self.user,
-            filter=user_filter,
+        search_filter = (
+            f"(&(|({self.app_settings.LDAP_ID_ATTRIBUTE}={self.user})"
+            f"({self.app_settings.LDAP_MAIL_ATTRIBUTE}={self.user})){user_filter})"
         )
         assert filter == search_filter
         assert dn == self.app_settings.LDAP_BASE_DN
@@ -72,7 +70,7 @@ class LdapConnMock:
 
         return [
             (
-                "cn={}, {}".format(self.user, self.app_settings.LDAP_BASE_DN),
+                f"cn={self.user}, {self.app_settings.LDAP_BASE_DN}",
                 {
                     self.app_settings.LDAP_ID_ATTRIBUTE: [self.user.encode()],
                     self.app_settings.LDAP_NAME_ATTRIBUTE: [self.name.encode()],