tradedangerous 12.0.5__py3-none-any.whl → 12.0.6__py3-none-any.whl

tradedangerous/db/lifecycle.py

@@ -79,13 +79,13 @@ def _create_sqlite_from_legacy(engine: Engine, sql_path: Optional[Path] = None)
 def reset_sqlite(engine: Engine, db_path: Path, sql_path: Optional[Path] = None) -> None:
     """
     Reset the SQLite schema by rotating the DB file and recreating from legacy SQL.
-
+    
     Steps:
       1) Dispose the SQLAlchemy engine to release pooled sqlite file handles.
       2) Rotate the on-disk database file to a .old sibling (idempotent; cross-device safe).
       3) Ensure the target directory exists.
       4) Recreate the schema using the provided canonical SQL file (or fallback discovery).
-
+    
     Notes:
       - Rotation naming preserves your historic convention:
             TradeDangerous.db  →  TradeDangerous.old
@@ -96,7 +96,7 @@ def reset_sqlite(engine: Engine, db_path: Path, sql_path: Optional[Path] = None)
         engine.dispose()
     except Exception:
         pass  # best-effort
-
+    
     # 2) Rotate DB → .old (idempotent, cross-device safe)
     db_path = db_path.resolve()
     old_path = db_path.with_suffix(".old")
@@ -108,7 +108,7 @@ def reset_sqlite(engine: Engine, db_path: Path, sql_path: Optional[Path] = None)
             except Exception:
                 # If removal of old backup fails, continue and let rename/copy raise if necessary
                 pass
-
+            
             try:
                 db_path.rename(old_path)
             except OSError:
@@ -123,13 +123,13 @@ def reset_sqlite(engine: Engine, db_path: Path, sql_path: Optional[Path] = None)
     except Exception:
         # Rotation shouldn't prevent schema recreation; continue
         pass
-
+    
     # 3) Make sure parent directory exists
     try:
         db_path.parent.mkdir(parents=True, exist_ok=True)
     except Exception:
         pass
-
+    
     # 4) Recreate schema from canonical SQL
     _create_sqlite_from_legacy(engine, sql_path=sql_path)
 
@@ -137,7 +137,7 @@ def reset_mariadb(engine: Engine, metadata: MetaData) -> None:
     """
     Drop all tables and recreate using ORM metadata (MariaDB/MySQL),
     with FOREIGN_KEY_CHECKS disabled during the operation.
-
+    
     This avoids FK-ordering issues and makes resets deterministic.
     """
     # Use a transactional connection for the whole reset
@@ -160,24 +160,24 @@ def reset_mariadb(engine: Engine, metadata: MetaData) -> None:
 def reset_db(engine: Engine, *, db_path: Path, sql_path: Optional[Path] = None) -> str:
     """
     Reset the database schema for the given engine in a dialect-appropriate way.
-
+    
     Caller MUST pass the canonical on-disk `db_path` for SQLite and SHOULD pass `sql_path`.
     (No path deduction is attempted here beyond optional SQL discovery.)
-
+    
     Returns a short action string for logs/tests.
     """
     dialect = engine.dialect.name.lower()
-
+    
     if dialect == "sqlite":
         reset_sqlite(engine, db_path=db_path, sql_path=sql_path)
         return "sqlite:rotated+recreated"
-
+    
     if dialect in ("mysql", "mariadb"):
         # Resolve ORM metadata internally to avoid dialect branching at call sites.
         from tradedangerous.db import orm_models
         reset_mariadb(engine, orm_models.Base.metadata)
         return f"{dialect}:reset"
-
+    
     raise RuntimeError(f"Unsupported database backend: {engine.dialect.name}")
 
 
@@ -201,19 +201,19 @@ def _core_tables_and_pks_ok(engine: Engine) -> Tuple[bool, List[str]]:
     """
     problems: List[str] = []
     insp = inspect(engine)
-
+    
     existing = set(insp.get_table_names())
     missing = [t for t in _CORE_TABLES if t not in existing]
     if missing:
         problems.append(f"missing tables: {', '.join(missing)}")
         return False, problems
-
+    
     for t in _CORE_TABLES:
         pk = insp.get_pk_constraint(t) or {}
         cols = pk.get("constrained_columns") or []
         if not cols:
             problems.append(f"missing primary key on {t}")
-
+    
     return (len(problems) == 0), problems
 
 
@@ -229,7 +229,7 @@ def _seed_counts_ok(engine: Engine) -> Tuple[bool, List[str]]:
             cnt = conn.execute(text(f"SELECT COUNT(*) FROM {tbl}")).scalar() or 0
             if cnt <= 0:
                 problems.append(f"{tbl} is empty")
-
+    
     return (len(problems) == 0), problems
 
 
@@ -260,21 +260,21 @@ def ensure_fresh_db(
 ) -> Dict[str, str]:
     """
     Ensure a *sane, populated* database exists (seconds-only checks).
-
+      
       Checks:
         - T0: connectivity
         - T1/T2: core tables exist and have PKs
         - T4: seed rows exist in Category and System
-
+    
     Actions:
       - mode == "force"                      → rebuild via buildCache(...) (if rebuild=True)
       - mode == "auto" and not sane         → rebuild via buildCache(...) (if rebuild=True)
       - not sane and rebuild == False       → action = "needs_rebuild" (NEVER rebuild)
       - sane and mode != "force"            → action = "kept"
-
+    
     Returns a summary dict including:
       - backend, mode, action, sane (Y/N), and optional reason.
-
+    
     NOTE:
       - When a rebuild is required but rebuild=True and (tdb/tdenv) are missing,
         a ValueError is raised (preserves current semantics).
@@ -287,14 +287,14 @@ def ensure_fresh_db(
         "action": "kept",
         "sane": "Y",
     }
-
+    
     # T0: cheap connectivity
     if not _connectivity_ok(engine):
         summary["reason"] = "connectivity-failed"
         summary["sane"] = "N"
         if mode == "auto":
             mode = "force"
-
+    
     # T1+T2: structure; T4: seeds
     if summary["sane"] == "Y":
         structure_ok, struct_problems = _core_tables_and_pks_ok(engine)
@@ -307,26 +307,26 @@ def ensure_fresh_db(
                 summary["sane"] = "N"
                 reason = "; ".join(seed_problems) or "seeds-missing"
                 summary["reason"] = f"{summary.get('reason','')}; {reason}".strip("; ").strip()
-
+    
     sane = (summary["sane"] == "Y")
     must_rebuild = (mode == "force") or (not sane)
-
+    
     # If nothing to do, return immediately.
     if not must_rebuild:
         summary["action"] = "kept"
         return summary
-
+    
     # Caller explicitly requested no rebuild: report and exit.
     if not rebuild:
         summary["action"] = "needs_rebuild"
         return summary
-
+    
     # From here on, behavior matches the original: rebuild via buildCache.
     if tdb is None or tdenv is None:
         raise ValueError("ensure_fresh_db needs `tdb` and `tdenv` to rebuild via buildCache")
-        
+    
     from tradedangerous.cache import buildCache
-
+    
     buildCache(tdb, tdenv)
     summary["action"] = "rebuilt"
     return summary

tradedangerous/db/orm_models.py

@@ -46,7 +46,7 @@ class DateTime6(TypeDecorator):
     """DATETIME that is DATETIME(6) on MySQL/MariaDB, generic DateTime elsewhere."""
     impl = DateTime
     cache_ok = True
-
+    
     def load_dialect_impl(self, dialect):
         if dialect.name in ("mysql", "mariadb"):
             from sqlalchemy.dialects.mysql import DATETIME as _MYSQL_DATETIME
@@ -64,10 +64,10 @@ class CIString(TypeDecorator):
     """
     impl = String
     cache_ok = True
-
+    
     def __init__(self, length, **kwargs):
         super().__init__(length=length, **kwargs)
-
+    
     def load_dialect_impl(self, dialect):
         if dialect.name == "sqlite":
             return dialect.type_descriptor(String(self.impl.length, collation="NOCASE"))
@@ -115,17 +115,17 @@ PadSize = Enum(
 # ---------- Core Domain ----------
 class Added(Base):
     __tablename__ = "Added"
-
+    
     added_id: Mapped[int] = mapped_column(Integer, primary_key=True, autoincrement=True)
     name: Mapped[str] = mapped_column(CIString(128), nullable=False, unique=True)
-
+    
     # Relationships
     systems: Mapped[list["System"]] = relationship(back_populates="added")
 
 
 class System(Base):
     __tablename__ = "System"
-
+    
     system_id: Mapped[int] = mapped_column(BigInteger, primary_key=True)
     name: Mapped[str] = mapped_column(CIString(128), nullable=False)
     pos_x: Mapped[float] = mapped_column(nullable=False)
@@ -140,11 +140,11 @@ class System(Base):
         onupdate=now6(),
         nullable=False,
     )
-
+    
     # Relationships
     added: Mapped[Optional["Added"]] = relationship(back_populates="systems")
     stations: Mapped[list["Station"]] = relationship(back_populates="system", cascade="all, delete-orphan")
-
+    
     __table_args__ = (
         Index("idx_system_by_pos", "pos_x", "pos_y", "pos_z", "system_id"),
         Index("idx_system_by_name", "name"),
@@ -155,19 +155,19 @@ class System(Base):
 
 class Station(Base):
     __tablename__ = "Station"
-
+    
     station_id: Mapped[int] = mapped_column(BigInteger, primary_key=True)
     name: Mapped[str] = mapped_column(CIString(128), nullable=False)
-
+    
     # type widened; cascade semantics unchanged (DELETE only)
     system_id: Mapped[int] = mapped_column(
         BigInteger,
         ForeignKey("System.system_id", ondelete="CASCADE"),
         nullable=False,
     )
-
+    
     ls_from_star: Mapped[int] = mapped_column(Integer, nullable=False, server_default=text("0"))
-
+    
     blackmarket: Mapped[str] = mapped_column(TriState, nullable=False, server_default=text("'?'"))
     max_pad_size: Mapped[str] = mapped_column(PadSize, nullable=False, server_default=text("'?'"))
     market: Mapped[str] = mapped_column(TriState, nullable=False, server_default=text("'?'"))
@@ -177,16 +177,16 @@ class Station(Base):
     refuel: Mapped[str] = mapped_column(TriState, nullable=False, server_default=text("'?'"))
     repair: Mapped[str] = mapped_column(TriState, nullable=False, server_default=text("'?'"))
     planetary: Mapped[str] = mapped_column(TriState, nullable=False, server_default=text("'?'"))
-
+    
     type_id: Mapped[int] = mapped_column(Integer, nullable=False, server_default=text("0"))
     modified: Mapped[str] = mapped_column(DateTime6(), server_default=now6(), onupdate=now6(), nullable=False)
-
+    
     # Relationships
     system: Mapped["System"] = relationship(back_populates="stations")
     items: Mapped[list["StationItem"]] = relationship(back_populates="station", cascade="all, delete-orphan")
     ship_vendors: Mapped[list["ShipVendor"]] = relationship(back_populates="station", cascade="all, delete-orphan")
     upgrade_vendors: Mapped[list["UpgradeVendor"]] = relationship(back_populates="station", cascade="all, delete-orphan")
-
+    
     __table_args__ = (
         Index("idx_station_by_system", "system_id"),
         Index("idx_station_by_name", "name"),
@@ -197,19 +197,19 @@ class Station(Base):
 
 class Category(Base):
     __tablename__ = "Category"
-
+    
     category_id: Mapped[int] = mapped_column(Integer, primary_key=True)
     name: Mapped[str] = mapped_column(CIString(128), nullable=False)
-
+    
     # Relationships
     items: Mapped[list["Item"]] = relationship(back_populates="category")
-
+    
     __table_args__ = (Index("idx_category_by_name", "name"),)
 
 
 class Item(Base):
     __tablename__ = "Item"
-
+    
     item_id: Mapped[int] = mapped_column(Integer, primary_key=True)
     name: Mapped[str] = mapped_column(CIString(128), nullable=False)
     category_id: Mapped[int] = mapped_column(
@@ -219,11 +219,11 @@ class Item(Base):
     ui_order: Mapped[int] = mapped_column(Integer, nullable=False, server_default=text("0"))
     avg_price: Mapped[int | None] = mapped_column(Integer)
     fdev_id: Mapped[int | None] = mapped_column(Integer)
-
+    
     # Relationships
     category: Mapped["Category"] = relationship(back_populates="items")
     stations: Mapped[list["StationItem"]] = relationship(back_populates="item", cascade="all, delete-orphan")
-
+    
     __table_args__ = (
         Index("idx_item_by_fdevid", "fdev_id"),
         Index("idx_item_by_category", "category_id"),
@@ -233,7 +233,7 @@ class Item(Base):
 
 class StationItem(Base):
     __tablename__ = "StationItem"
-
+    
     station_id: Mapped[int] = mapped_column(
         BigInteger,
         ForeignKey("Station.station_id", ondelete="CASCADE", onupdate="CASCADE"),
@@ -251,11 +251,11 @@ class StationItem(Base):
     supply_level: Mapped[int] = mapped_column(Integer, nullable=False)
     modified: Mapped[str] = mapped_column(DateTime6(), server_default=now6(), onupdate=now6(), nullable=False)
     from_live: Mapped[int] = mapped_column(Integer, nullable=False, server_default=text("0"))
-
+    
     # Relationships
     station: Mapped["Station"] = relationship(back_populates="items")
     item: Mapped["Item"] = relationship(back_populates="stations")
-
+    
     __table_args__ = (
         Index("si_mod_stn_itm", "modified", "station_id", "item_id"),
         Index("si_itm_dmdpr", "item_id", "demand_price", sqlite_where=text("demand_price > 0")),
@@ -268,18 +268,18 @@ class StationItem(Base):
 
 class Ship(Base):
     __tablename__ = "Ship"
-
+    
     ship_id: Mapped[int] = mapped_column(Integer, primary_key=True)
     name: Mapped[str] = mapped_column(CIString(128), nullable=False)
     cost: Mapped[int | None] = mapped_column(Integer)
-
+    
     # Relationships
     vendors: Mapped[list["ShipVendor"]] = relationship(back_populates="ship")
 
 
 class ShipVendor(Base):
     __tablename__ = "ShipVendor"
-
+    
     ship_id: Mapped[int] = mapped_column(
         ForeignKey("Ship.ship_id", ondelete="CASCADE", onupdate="CASCADE"),
         primary_key=True,
@@ -290,30 +290,30 @@ class ShipVendor(Base):
         primary_key=True,
     )
     modified: Mapped[str] = mapped_column(DateTime6(), server_default=now6(), onupdate=now6(), nullable=False)
-
+    
     # Relationships
     ship: Mapped["Ship"] = relationship(back_populates="vendors")
     station: Mapped["Station"] = relationship(back_populates="ship_vendors")
-
+    
     __table_args__ = (Index("idx_shipvendor_by_station", "station_id"),)
 
 
 class Upgrade(Base):
     __tablename__ = "Upgrade"
-
+    
     upgrade_id: Mapped[int] = mapped_column(Integer, primary_key=True)
     name: Mapped[str] = mapped_column(CIString(128), nullable=False)
     class_: Mapped[int] = mapped_column("class", Integer, nullable=False)
     rating: Mapped[str] = mapped_column(CHAR(1), nullable=False)
     ship: Mapped[str | None] = mapped_column(CIString(128))
-
+    
     # Relationships
     vendors: Mapped[list["UpgradeVendor"]] = relationship(back_populates="upgrade")
 
 
 class UpgradeVendor(Base):
     __tablename__ = "UpgradeVendor"
-
+    
     upgrade_id: Mapped[int] = mapped_column(
         ForeignKey("Upgrade.upgrade_id", ondelete="CASCADE", onupdate="CASCADE"),
         primary_key=True,
@@ -324,17 +324,17 @@ class UpgradeVendor(Base):
         primary_key=True,
     )
     modified: Mapped[str] = mapped_column(DateTime6(), nullable=False, server_default=now6(), onupdate=now6())
-
+    
     # Relationships
     upgrade: Mapped["Upgrade"] = relationship(back_populates="vendors")
     station: Mapped["Station"] = relationship(back_populates="upgrade_vendors")
-
+    
     __table_args__ = (Index("idx_vendor_by_station_id", "station_id"),)
 
 
 class RareItem(Base):
     __tablename__ = "RareItem"
-
+    
     rare_id: Mapped[int] = mapped_column(Integer, primary_key=True)
     station_id: Mapped[int] = mapped_column(
         BigInteger,
@@ -350,7 +350,7 @@ class RareItem(Base):
     max_allocation: Mapped[int | None] = mapped_column(Integer)
     illegal: Mapped[str] = mapped_column(TriState, nullable=False, server_default=text("'?'"))
     suppressed: Mapped[str] = mapped_column(TriState, nullable=False, server_default=text("'?'"))
-
+    
     __table_args__ = (UniqueConstraint("name", name="uq_rareitem_name"),)
 
 
@@ -358,7 +358,7 @@ class RareItem(Base):
 
 class FDevShipyard(Base):
     __tablename__ = "FDevShipyard"
-
+    
     id = Column(Integer, primary_key=True, unique=True, nullable=False)
     symbol = Column(CIString(128))
     name = Column(CIString(128))
@@ -367,7 +367,7 @@ class FDevShipyard(Base):
 
 class FDevOutfitting(Base):
     __tablename__ = "FDevOutfitting"
-
+    
     id = Column(Integer, primary_key=True, unique=True, nullable=False)
     symbol = Column(CIString(128))
     category = Column(String(10))
@@ -378,7 +378,7 @@ class FDevOutfitting(Base):
     class_ = Column("class", String(1), nullable=False)
     rating = Column(String(1), nullable=False)
     entitlement = Column(String(50))
-
+    
     __table_args__ = (
         CheckConstraint(
             "category IN ('hardpoint','internal','standard','utility')",
@@ -404,7 +404,7 @@ class ExportControl(Base):
     - last_reset_key: optional cursor for chunked from_live resets
     """
     __tablename__ = "ExportControl"
-
+    
     id: Mapped[int] = mapped_column(Integer, primary_key=True, server_default=text("1"))
     last_full_dump_time: Mapped[str] = mapped_column(DateTime6(), nullable=False)
     last_reset_key: Mapped[int | None] = mapped_column(BigInteger, nullable=True)
@@ -415,7 +415,7 @@ class StationItemStaging(Base):
     Staging table for bulk loads (no FKs). Same columns as StationItem.
     """
     __tablename__ = "StationItem_staging"
-
+    
     station_id: Mapped[int] = mapped_column(BigInteger, primary_key=True)
     item_id: Mapped[int] = mapped_column(Integer, primary_key=True)
     demand_price: Mapped[int] = mapped_column(Integer, nullable=False)
@@ -426,7 +426,7 @@ class StationItemStaging(Base):
     supply_level: Mapped[int] = mapped_column(Integer, nullable=False)
     modified: Mapped[str] = mapped_column(DateTime6(), server_default=now6(), onupdate=now6(), nullable=False)
     from_live: Mapped[int] = mapped_column(Integer, nullable=False, server_default=text("0"))
-
+    
     __table_args__ = (Index("idx_sistaging_stn_itm", "station_id", "item_id"),)
 
 

tradedangerous/db/paths.py

@@ -71,7 +71,7 @@ def ensure_dir(pathlike: os.PathLike | str) -> Path:
 
 def resolve_data_dir(cfg: Any = None) -> Path:
     """Resolve the persistent data directory.
-
+    
     Precedence: TD_DATA env > cfg[paths|database].data_dir > ./data
     Always creates the directory.
     """
@@ -81,7 +81,7 @@ def resolve_data_dir(cfg: Any = None) -> Path:
 
 def resolve_tmp_dir(cfg: Any = None) -> Path:
     """Resolve the temporary directory.
-
+    
     Precedence: TD_TMP env > cfg[paths|database].tmp_dir > ./tmp
     Always creates the directory.
     """
@@ -91,7 +91,7 @@ def resolve_tmp_dir(cfg: Any = None) -> Path:
 
 def get_sqlite_db_path(cfg: Any = None) -> Path:
     """Return full path to the SQLite DB file (does not create the file).
-
+    
     Data dir is resolved via resolve_data_dir(cfg). Filename comes from:
     cfg[sqlite].sqlite_filename or cfg[database].sqlite_filename or legacy default 'TradeDangerous.db'.
     """