seals and charms

src/config/profile_models.py

@@ -9,6 +9,7 @@
 from src.config.helper import check_greater_than_zero, validate_percent
 from src.item.data.item_type import ItemType  # noqa: TC001
 from src.item.data.rarity import ItemRarity
+from src.scripts import correct_name
 
 MODULE_LOGGER = logging.getLogger(__name__)
 
@@ -19,6 +20,40 @@ def _parse_item_type_or_rarities(data: str | list[str]) -> list[str]:
     return data
 
 
+def _is_item_rarity(data: str) -> bool:
+    return any(rarity.value.lower() == data.lower() for rarity in ItemRarity)
+
+
+def _parse_name_or_rarities(data: str | list[str] | dict[str, str | list[str]]) -> dict[str, str | list[str]]:
+    if isinstance(data, dict):
+        return data
+    if isinstance(data, str):
+        if _is_item_rarity(data):
+            return {"rarities": [data]}
+        return {"name": data}
+    if isinstance(data, list):
+        if not data:
+            msg = "list cannot be empty"
+            raise ValueError(msg)
+        return {"rarities": data}
+    msg = "must be str or list"
+    raise ValueError(msg)
+
+
+def _normalize_existing_set_name(name: str | None, field_name: str) -> str | None:
+    if not name:
+        return None
+
+    # This on module level would be a circular import, so we do it lazy for now
+    from src.dataloader import Dataloader  # noqa: PLC0415
+
+    name = correct_name(name)
+    if name not in Dataloader().set_list:
+        msg = f"{field_name} {name} does not exist"
+        raise ValueError(msg)
+    return name
+
+
 class AffixAspectFilterModel(BaseModel):
     model_config = ConfigDict(extra="forbid")
     name: str
@@ -207,6 +242,64 @@ def unique_aspect_names_must_be_unique(self) -> ItemFilterModel:
 DynamicItemFilterModel = RootModel[dict[str, ItemFilterModel]]
 
 
+class SpellcraftFilterModel(BaseModel):
+    model_config = ConfigDict(extra="forbid", populate_by_name=True)
+    affix_pool: list[AffixFilterCountModel] = Field(default=[], alias="affixPool")
+    min_greater_affix_count: int = Field(default=0, alias="minGreaterAffixCount")
+    rarities: list[ItemRarity] = []
+
+    @field_validator("min_greater_affix_count")
+    @classmethod
+    def min_greater_affix_in_range(cls, v: int) -> int:
+        if not 0 <= v <= 4:
+            msg = "must be in [0, 4]"
+            raise ValueError(msg)
+        return v
+
+    @field_validator("rarities", mode="before")
+    @classmethod
+    def parse_rarities(cls, data: str | list[str]) -> list[str]:
+        return _parse_item_type_or_rarities(data)
+
+
+class CharmFilterModel(SpellcraftFilterModel):
+    set_name: str | None = Field(default=None, alias="set")
+    unique_aspect: str | None = Field(default=None, alias="uniqueAspect")
+
+    @field_validator("set_name")
+    @classmethod
+    def set_must_exist(cls, name: str | None) -> str | None:
+        return _normalize_existing_set_name(name, "set")
+
+    @field_validator("unique_aspect")
+    @classmethod
+    def normalize_unique_aspect(cls, name: str | None) -> str | None:
+        return correct_name(name)
+
+
+class SealFilterModel(SpellcraftFilterModel):
+    boosted_set: str | None = Field(default=None, alias="boostedSet")
+    slot_count: int = Field(default=0, alias="slotCount")
+
+    @field_validator("boosted_set")
+    @classmethod
+    def boosted_set_must_exist(cls, name: str | None) -> str | None:
+        return _normalize_existing_set_name(name, "boostedSet")
+
+    @field_validator("slot_count")
+    @classmethod
+    def slot_count_in_range(cls, v: int) -> int:
+        if not 0 <= v <= 4:
+            msg = "must be in [0, 4]"
+            raise ValueError(msg)
+        return v
+
+
+DynamicSpellcraftFilterModel = RootModel[dict[str, SpellcraftFilterModel]]
+DynamicCharmFilterModel = RootModel[dict[str, CharmFilterModel]]
+DynamicSealFilterModel = RootModel[dict[str, SealFilterModel]]
+
+
 class SigilPriority(enum.StrEnum):
     blacklist = enum.auto()
     whitelist = enum.auto()
@@ -295,19 +388,28 @@ def name_must_exist(cls, name: str) -> str:
     @model_validator(mode="before")
     @classmethod
     def parse_data(cls, data: str | list[str] | dict[str, str | list[str]]) -> dict[str, str | list[str]]:
-        if isinstance(data, dict):
-            return data
-        if isinstance(data, str):
-            if any(rarity.value.lower() == data.lower() for rarity in ItemRarity):
-                return {"rarities": [data]}
-            return {"name": data}
-        if isinstance(data, list):
-            if not data:
-                msg = "list cannot be empty"
-                raise ValueError(msg)
-            return {"rarities": data}
-        msg = "must be str or list"
-        raise ValueError(msg)
+        return _parse_name_or_rarities(data)
+
+    @field_validator("rarities", mode="before")
+    @classmethod
+    def parse_rarities(cls, data: str | list[str]) -> list[str]:
+        return _parse_item_type_or_rarities(data)
+
+
+class NameRarityFilterModel(BaseModel):
+    model_config = ConfigDict(extra="forbid")
+    name: str | None = None
+    rarities: list[ItemRarity] = []
+
+    @field_validator("name")
+    @classmethod
+    def normalize_name(cls, name: str | None) -> str | None:
+        return correct_name(name)
+
+    @model_validator(mode="before")
+    @classmethod
+    def parse_data(cls, data: str | list[str] | dict[str, str | list[str]]) -> dict[str, str | list[str]]:
+        return _parse_name_or_rarities(data)
 
     @field_validator("rarities", mode="before")
     @classmethod
@@ -319,8 +421,10 @@ class ProfileModel(BaseModel):
     model_config = ConfigDict(extra="forbid", populate_by_name=True)
     affixes: list[DynamicItemFilterModel] = Field(default=[], alias="Affixes")
     aspect_upgrades: list[str] = Field(default=[], alias="AspectUpgrades")
+    charms: list[DynamicCharmFilterModel] = Field(default=[], alias="Charms")
     global_uniques: list[GlobalUniqueModel] = Field(default=[], alias="GlobalUniques")
     name: str
+    seals: list[DynamicSealFilterModel] = Field(default=[], alias="Seals")
     sigils: SigilFilterModel = Field(
         default=SigilFilterModel(blacklist=[], whitelist=[], priority=SigilPriority.blacklist), alias="Sigils"
     )

src/dataloader.py

@@ -23,6 +23,7 @@ class Dataloader:
     filter_after_keyword = []
     filter_words = []
     item_types_dict = {}
+    set_list = []
     tooltips = {}
     tribute_dict = {}
 
@@ -95,3 +96,8 @@ def load_data(self):
             encoding="utf-8"
         ) as f:
             self.aspect_unique_dict = json.load(f)
+
+        with pathlib.Path(BASE_DIR / f"assets/lang/{IniConfigLoader().general.language}/sets.json").open(
+            encoding="utf-8"
+        ) as f:
+            self.set_list = json.load(f)

src/gui/importer/d4builds.py

@@ -13,14 +13,17 @@
     AffixFilterCountModel,
     AffixFilterModel,
     AspectUniqueFilterModel,
+    CharmFilterModel,
     ItemFilterModel,
     ProfileModel,
+    SealFilterModel,
 )
 from src.dataloader import Dataloader
 from src.gui.importer.gui_common import (
     add_mythics_to_filters,
     add_to_profiles,
     build_default_profile_file_name,
+    create_spellcraft_filter,
     fix_offhand_type,
     fix_weapon_type,
     get_class_name,
@@ -95,6 +98,8 @@ def import_d4builds(config: ImportConfig, driver: ChromiumDriver = None):
         raise D4BuildsError(msg)
     slot_to_unique_name_map = _get_item_slots(data=data)
     finished_filters = []
+    charm_filters = []
+    seal_filters = []
     mythic_names = []
     aspect_upgrade_filters = _get_legendary_aspects(data=data)
     for item in items[0]:
@@ -177,6 +182,20 @@ def import_d4builds(config: ImportConfig, driver: ChromiumDriver = None):
         else:
             item_filter.item_type = [item_type]
 
+        if item_type in [ItemType.HoradricSeal, ItemType.Charm]:
+            spellcraft_filters = charm_filters if item_type == ItemType.Charm else seal_filters
+            filter_name = _unique_filter_name(item_type.name, spellcraft_filters)
+            spellcraft_model = CharmFilterModel if item_type == ItemType.Charm else SealFilterModel
+            spellcraft_filters.append({
+                filter_name: create_spellcraft_filter(
+                    affixes=affixes,
+                    rarity=rarity,
+                    require_gas=config.require_greater_affixes,
+                    model_type=spellcraft_model,
+                )
+            })
+            continue
+
         # We don't bother importing affixes for mythics
         if rarity != ItemRarity.Mythic:
             item_filter.affix_pool = [
@@ -192,15 +211,16 @@ def import_d4builds(config: ImportConfig, driver: ChromiumDriver = None):
                 ]
         item_filter.min_power = 100
         filter_name_template = item_filter.item_type[0].name if item_type else slot.replace(" ", "")
-        filter_name = filter_name_template
-        i = 2
-        while any(filter_name == next(iter(x)) for x in finished_filters):
-            filter_name = f"{filter_name_template}{i}"
-            i += 1
+        filter_name = _unique_filter_name(filter_name_template, finished_filters)
         finished_filters.append({filter_name: item_filter})
     # Place all mythics in a single filter
     add_mythics_to_filters(mythic_names, finished_filters)
-    profile = ProfileModel(name="imported profile", Affixes=sort_profile_filters(finished_filters))
+    profile = ProfileModel(
+        name="imported profile",
+        Affixes=sort_profile_filters(finished_filters),
+        Charms=sort_profile_filters(charm_filters),
+        Seals=sort_profile_filters(seal_filters),
+    )
     if config.import_aspect_upgrades and aspect_upgrade_filters:
         profile.aspect_upgrades = aspect_upgrade_filters
 
@@ -324,6 +344,15 @@ def _get_affix_name(stat: lxml.html.HtmlElement) -> str:
     return ""
 
 
+def _unique_filter_name(filter_name_template: str, filters: list[dict]) -> str:
+    filter_name = filter_name_template
+    i = 2
+    while any(filter_name == next(iter(existing_filter)) for existing_filter in filters):
+        filter_name = f"{filter_name_template}{i}"
+        i += 1
+    return filter_name
+
+
 if __name__ == "__main__":
     src.logger.setup()
     URLS = ["https://d4builds.gg/builds/whirlwind-barbarian-endgame/?var=4"]

src/gui/importer/gui_common.py

@@ -18,8 +18,16 @@
 
 from src import __version__
 from src.config.loader import IniConfigLoader
-from src.config.profile_models import AspectUniqueFilterModel, ItemFilterModel, ProfileModel
+from src.config.profile_models import (
+    AffixFilterCountModel,
+    AffixFilterModel,
+    AspectUniqueFilterModel,
+    ItemFilterModel,
+    ProfileModel,
+    SpellcraftFilterModel,
+)
 from src.config.settings_models import BrowserType
+from src.item.data.affix import Affix, AffixType
 from src.item.data.item_type import ItemType
 
 if TYPE_CHECKING:
@@ -188,6 +196,25 @@ def update_mingreateraffixcount(item_filter: ItemFilterModel, require_gas: bool)
         item_filter.min_greater_affix_count = 0
 
 
+def create_spellcraft_filter(
+    affixes: list[Affix], rarity, require_gas: bool, model_type: type[SpellcraftFilterModel] = SpellcraftFilterModel
+) -> SpellcraftFilterModel:
+    spellcraft_filter = model_type(
+        affix_pool=[
+            AffixFilterCountModel(
+                count=[
+                    AffixFilterModel(name=affix.name, want_greater=affix.type == AffixType.greater) for affix in affixes
+                ],
+                min_count=min(3, len(affixes)),
+            )
+        ],
+        rarities=[rarity] if rarity is not None else [],
+    )
+    if require_gas:
+        spellcraft_filter.min_greater_affix_count = len([affix for affix in affixes if affix.type == AffixType.greater])
+    return spellcraft_filter
+
+
 def add_mythics_to_filters(mythic_names, finished_filters):
     if mythic_names:
         mythic_filter = ItemFilterModel()