remove spell-npc relationships and spell prices

Author: Galarzaa90

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 8.0.0 (Unreleased)
+
+- Remove `npc_spell` table.
+- Remove spell teacher relations from API models (`Npc.teaches`, `Spell.taught_by`).
+- Remove spell purchase price (`spell.price`) from parser, schema and models.
+- Remove spell-offer generation from `Module:ItemPrices/spelldata`.
+
 ## 7.0.3 (2025-07-28)
 
 - Fix SQL generation not working on Docker due to not having the `CONCAT` SQLite extension.

docs/schema.md

@@ -37,7 +37,6 @@ The generated database has the following tables.
 | `npcofferbuy`       | Contains all the NPCs’ buy offers.                                                  |
 | `npcoffersell`      | Contains all the NPCs’ sell offers.                                                 |
 | `npcrace`           | Contains all the NPCs’ races.                                                       |
-| `npcspell`          | Contains all the spells NPCs teach.                                                 |
 | `outfit`            | Contains information for all outfits.                                               |
 | `outfitimage`       | Contains images for all outfits.                                                    |
 | `outfitquest`       | Contains outfit and addon rewards for quests.                                       |
@@ -801,29 +800,6 @@ npc_race
 | name   | ``TEXT``    | The name of the race.               |
 +--------+-------------+-------------------------------------+
 
-npc_spell
-~~~~~~~~~
-+----------+-------------+--------------------------------------------+
-|  Column  |    Type     |                Description                 |
-+==========+=============+============================================+
-| npc_id   | ``INTEGER`` | The id of the NPC that teaches this spell. |
-+----------+-------------+--------------------------------------------+
-| spell_id | ``INTEGER`` | The id of the spell this NPC teaches.      |
-+----------+-------------+--------------------------------------------+
-| knight   | ``BOOLEAN`` | Whether this NPC teaches this spell to     |
-|          |             | knights.                                   |
-+----------+-------------+--------------------------------------------+
-| sorcerer | ``BOOLEAN`` | Whether this NPC teaches this spell to     |
-|          |             | sorcerers.                                 |
-+----------+-------------+--------------------------------------------+
-| druid    | ``BOOLEAN`` | Whether this NPC teaches this spell to     |
-|          |             | druids.                                    |
-+----------+-------------+--------------------------------------------+
-| paladin  | ``BOOLEAN`` | Whether this NPC teaches this spell to     |
-|          |             | paladins.                                  |
-+----------+-------------+--------------------------------------------+
-
-
 outfit
 ~~~~~~
 +-------------+-------------+------------------------------------------------------------+
@@ -1011,9 +987,6 @@ spell
 |                          |             | a promotion or not. ``0`` or                          |
 |                          |             | ``1``.                                                |
 +--------------------------+-------------+-------------------------------------------------------+
-| price                    | ``INTEGER`` | Price in gold coins of this spell                     |
-|                          |             |                                                       |
-+--------------------------+-------------+-------------------------------------------------------+
 | cooldown                 | ``INTEGER`` | The individual cooldown in seconds of this spell      |
 |                          |             |                                                       |
 +--------------------------+-------------+-------------------------------------------------------+

tests/models/test_npc.py

@@ -4,7 +4,7 @@
 
 from tibiawikisql.models import Npc
 from tibiawikisql.schema import ItemTable, NpcBuyingTable, NpcDestinationTable, NpcJobTable, NpcRaceTable, \
-    NpcSellingTable, NpcSpellTable, \
+    NpcSellingTable, \
     NpcTable, \
     SpellTable
 
@@ -13,7 +13,6 @@ class TestNpc(unittest.TestCase):
     def setUp(self):
         self.conn = sqlite3.connect(":memory:")
         self.conn.executescript(NpcTable.get_create_table_statement())
-        self.conn.executescript(NpcSpellTable.get_create_table_statement())
         self.conn.executescript(NpcJobTable.get_create_table_statement())
         self.conn.executescript(NpcRaceTable.get_create_table_statement())
         self.conn.executescript(NpcBuyingTable.get_create_table_statement())
@@ -58,18 +57,14 @@ def test_npc_with_spells(self):
             level=14,
             mana=120,
             soul=1,
-            price=300,
             is_premium=False,
             is_promotion=False,
             status="active",
             timestamp=datetime.datetime.fromisoformat("2024-07-29T16:37:09+00:00"),
         )
-        NpcSpellTable.insert(self.conn, npc_id=1, spell_id=1, druid=True)
 
         npc = Npc.get_one_by_field(self.conn, "name", "Azalea")
 
         self.assertIsInstance(npc, Npc)
         self.assertEqual(5, len(npc.jobs))
         self.assertEqual("Human", npc.race)
-        self.assertEqual(1, len(npc.teaches))
-        self.assertEqual("Food (Spell)", npc.teaches[0].spell_title)

tests/test_generation.py

@@ -4,4 +4,4 @@
 __copyright__ = "Copyright 2025 Allan Galarza"
 
 __license__ = "Apache 2.0"
-__version__ = "7.0.3"
+__version__ = "8.0.0"

tibiawikisql/__init__.py

@@ -8,7 +8,7 @@
 import sqlite3
 from collections import defaultdict
 import platform
-from typing import Any, TYPE_CHECKING, TypeVar
+from typing import TYPE_CHECKING, TypeVar
 
 import click
 import requests
@@ -432,82 +432,6 @@ def fetch_images(conn: sqlite3.Connection) -> None:
         save_maps(conn)
 
 
-def parse_spell_data(lua_content: str) -> list[tuple[str, str, bool, bool, bool, bool, bool]]:
-    data = lua.execute(lua_content)
-    offers = []
-    for name, table in list(data.items()):
-        spell_title = name
-        spell_vocations = list(table["vocation"].values())
-        for npc, vocation in table["sellers"].items():
-            if isinstance(vocation, bool):
-                npc_vocations = spell_vocations[:]
-            elif isinstance(vocation, str):
-                npc_vocations = [vocation]
-            else:
-                npc_vocations = list(vocation.values())
-            offers.append((
-                npc,
-                spell_title,
-                "Knight" in npc_vocations,
-                "Paladin" in npc_vocations,
-                "Druid" in npc_vocations,
-                "Sorcerer" in npc_vocations,
-                "Monk" in npc_vocations,
-            ))
-    return offers
-
-
-def generate_spell_offers(conn: sqlite3.Connection, data_store: dict[str, Any]) -> None:
-    """Fetch and save the spell offers from the spell data module.
-
-    Args:
-        conn: A connection to the database.
-        data_store: The data store containing information about generated articles.
-
-    """
-    if "npcs_map" not in data_store or "spells_map" not in data_store:
-        return
-    article = wiki_client.get_article("Module:ItemPrices/spelldata")
-    spell_offers = parse_spell_data(article.content)
-    rows = []
-    not_found_store = defaultdict(set)
-    with (
-        timed() as t,
-        progress_bar(spell_offers, len(spell_offers), "Processing spell offers") as bar,
-    ):
-        for npc, spell, knight, paladin, druid, sorcerer, monk in bar:
-            spell_id = data_store["spells_map"].get(spell.lower())
-            if spell_id is None:
-                not_found_store["spell"].add(spell)
-                continue
-            npc_id = data_store["npcs_map"].get(npc.lower())
-            if npc_id is None:
-                not_found_store["npc"].add(npc)
-                continue
-            rows.append((
-                npc_id,
-                spell_id,
-                knight,
-                sorcerer,
-                paladin,
-                druid,
-                monk,
-            ))
-        with conn:
-            conn.execute("DELETE FROM npc_spell")
-            conn.executemany(
-                "INSERT INTO npc_spell(npc_id, spell_id, knight, sorcerer, paladin, druid, monk) VALUES(?, ?, ?, ?, ?, ?, ?)",
-                rows)
-        if not_found_store["spell"]:
-            unknonw_spells = not_found_store["spell"]
-            click.echo(f"{Fore.RED}Could not parse offers for {len(unknonw_spells):,} spell.{Style.RESET_ALL}")
-            click.echo(f"\t-> {Fore.RED}{f'{Style.RESET_ALL},{Fore.RED}'.join(unknonw_spells)}{Style.RESET_ALL}")
-        if not_found_store["npc"]:
-            unknown_npcs = not_found_store["npc"]
-            click.echo(f"{Fore.RED}Could not parse offers of {len(unknown_npcs):,} npcs.{Style.RESET_ALL}")
-            click.echo(f"\t-> {Fore.RED}{f'{Style.RESET_ALL},{Fore.RED}'.join(unknown_npcs)}{Style.RESET_ALL}")
-
-
 def generate_item_offers(conn: sqlite3.Connection, data_store):
     if "npcs_map" not in data_store or "items_map" not in data_store:
         return
@@ -670,7 +594,6 @@ def generate(conn, skip_images, skip_deprecated):
         RashidPositionTable.insert(conn, **position.model_dump())
 
     generate_item_offers(conn, data_store)
-    generate_spell_offers(conn, data_store)
     generate_loot_statistics(conn, data_store)
 
     if not skip_images:

tibiawikisql/generation.py

@@ -7,7 +7,7 @@
 from tibiawikisql.models.imbuement import Imbuement, ImbuementMaterial
 from tibiawikisql.models.item import Book, Item, ItemAttribute, ItemStoreOffer, Key
 from tibiawikisql.models.mount import Mount
-from tibiawikisql.models.npc import Npc, NpcDestination, NpcOffer, NpcSpell, RashidPosition
+from tibiawikisql.models.npc import Npc, NpcDestination, NpcOffer, RashidPosition
 from tibiawikisql.models.outfit import Outfit, OutfitImage, OutfitQuest
 from tibiawikisql.models.quest import Quest, QuestDanger, QuestReward
 from tibiawikisql.models.spell import Spell