Fixes remaining ruff 0.15 issues (StrEnum, formatting).

Author: aaronstevenwhite

bead/behavioral/merging.py

@@ -175,8 +175,10 @@ def filter_flagged_judgments(
         df_with_flag = judgments_df.with_columns(
             pl.struct([item_id_column, participant_id_column])
             .map_elements(
-                lambda row: (str(row[item_id_column]), str(row[participant_id_column]))
-                in flagged_pairs,
+                lambda row: (
+                    (str(row[item_id_column]), str(row[participant_id_column]))
+                    in flagged_pairs
+                ),
                 return_dtype=pl.Boolean,
             )
             .alias("_is_flagged")
@@ -194,8 +196,10 @@ def filter_flagged_judgments(
 
         # Create mask
         mask = judgments_df.apply(
-            lambda row: (str(row[item_id_column]), str(row[participant_id_column]))
-            in flagged_pairs,
+            lambda row: (
+                (str(row[item_id_column]), str(row[participant_id_column]))
+                in flagged_pairs
+            ),
             axis=1,
         )
 

bead/deployment/distribution.py

@@ -7,15 +7,15 @@
 
 from __future__ import annotations
 
-from enum import Enum
+from enum import StrEnum
 from typing import Any
 
 from pydantic import Field, field_validator, model_validator
 
 from bead.data.base import BeadBaseModel
 
 
-class DistributionStrategyType(str, Enum):
+class DistributionStrategyType(StrEnum):
     """Available distribution strategies for list assignment.
 
     Attributes

bead/resources/lexicon.py

@@ -314,8 +314,9 @@ def filter_by_pos(self, pos: str) -> Lexicon:
         1
         """
         return self.filter(
-            lambda item: item.features.get("pos") is not None
-            and item.features.get("pos") == pos
+            lambda item: (
+                item.features.get("pos") is not None and item.features.get("pos") == pos
+            )
         )
 
     def filter_by_lemma(self, lemma: str) -> Lexicon:
@@ -367,8 +368,10 @@ def filter_by_feature(self, feature_name: str, feature_value: Any) -> Lexicon:
         1
         """
         return self.filter(
-            lambda item: feature_name in item.features
-            and item.features[feature_name] == feature_value
+            lambda item: (
+                feature_name in item.features
+                and item.features[feature_name] == feature_value
+            )
         )
 
     def filter_by_attribute(self, attr_name: str, attr_value: Any) -> Lexicon:
@@ -400,8 +403,9 @@ def filter_by_attribute(self, attr_name: str, attr_value: Any) -> Lexicon:
         1
         """
         return self.filter(
-            lambda item: attr_name in item.features
-            and item.features[attr_name] == attr_value
+            lambda item: (
+                attr_name in item.features and item.features[attr_name] == attr_value
+            )
         )
 
     def search(self, query: str, field: str = "lemma") -> Lexicon:
@@ -439,8 +443,10 @@ def search(self, query: str, field: str = "lemma") -> Lexicon:
             return self.filter(lambda item: query_lower in item.lemma.lower())
         elif field == "pos":
             return self.filter(
-                lambda item: item.features.get("pos") is not None
-                and query_lower in str(item.features.get("pos")).lower()
+                lambda item: (
+                    item.features.get("pos") is not None
+                    and query_lower in str(item.features.get("pos")).lower()
+                )
             )
         elif field == "form":
             return self.filter(