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

tradedangerous/commands/run_cmd.py

@@ -386,9 +386,9 @@ def expandForJumps(tdb, cmdenv, calc, origin, jumps, srcName, purpose):
     Find all the stations you could reach if you made a given
     number of jumps away from the origin list.
     """
-
+    
     assert jumps
-
+    
     maxLyPer = cmdenv.emptyLyPer or cmdenv.maxLyPer
     avoidPlaces = cmdenv.avoidPlaces
     cmdenv.DEBUG0(
@@ -398,7 +398,7 @@ def expandForJumps(tdb, cmdenv, calc, origin, jumps, srcName, purpose):
         jumps,
         maxLyPer,
     )
-
+    
     # Preserve original behavior: --to uses stationsSelling, --from uses stationsBuying
     if srcName == "--to":
         tradingList = calc.stationsSelling
@@ -406,13 +406,13 @@ def expandForJumps(tdb, cmdenv, calc, origin, jumps, srcName, purpose):
         tradingList = calc.stationsBuying
     else:
         raise Exception("Unknown src")
-
+    
     # Ensure O(1) membership checks regardless of the underlying container type.
     trading_ids = tradingList if isinstance(tradingList, set) else set(tradingList)
-
+    
     stations = set()
     origins, avoid = set((origin,)), set(place for place in avoidPlaces)
-
+    
     for jump in range(jumps):
         if not origins:
             break
@@ -449,14 +449,14 @@ def expandForJumps(tdb, cmdenv, calc, origin, jumps, srcName, purpose):
             for dest, dist in tdb.genSystemsInRange(system, maxLyPer):
                 if dest not in avoid:
                     origins.add(dest)
-
+    
     if getattr(cmdenv, "debug", False):
         cmdenv.DEBUG0(
             "Expanded {} stations: {}",
             srcName,
             [stn.name() for stn in stations]
         )
-
+    
     if not stations:
         if not cmdenv.emptyLyPer:
             extra = (
@@ -475,10 +475,10 @@ def expandForJumps(tdb, cmdenv, calc, origin, jumps, srcName, purpose):
                 extra,
             )
         )
-
+    
     stations = list(stations)
     stations.sort(key=lambda stn: stn.ID)
-
+    
     return stations
 
 def checkForEmptyStationList(category, focusPlace, stationList, jumps):
@@ -692,7 +692,7 @@ def filterStationSet(src, cmdenv, calc, stnList):
 def checkOrigins(tdb, cmdenv, calc):
     # Compute eligibility once: stations must both sell and buy (same as suitability with src=None).
     eligible_ids = set(calc.stationsSelling) & set(calc.stationsBuying)
-
+    
     if cmdenv.origPlace:
         if cmdenv.startJumps and cmdenv.startJumps > 0:
             cmdenv.origins = expandForJumps(
@@ -732,12 +732,12 @@ def checkOrigins(tdb, cmdenv, calc):
             for station in tdb.stationByID.values()
             if station.ID in eligible_ids and checkStationSuitability(cmdenv, calc, station)
         )
-
+    
     if not cmdenv.startJumps and isinstance(cmdenv.origPlace, System):
         cmdenv.origins = filterStationSet(
             '--from', cmdenv, calc, cmdenv.origins
         )
-
+    
     cmdenv.origSystems = tuple(set(
         stn.system for stn in cmdenv.origins
     ))
@@ -749,7 +749,7 @@ def checkDestinations(tdb, cmdenv, calc):
     last_hb = 0.0
     spinner = ("|", "/", "-", "\\")
     spin_i = 0
-
+    
     def heartbeat(seen, kept):
         nonlocal last_hb, spin_i
         if not showProgress:
@@ -764,7 +764,7 @@ def checkDestinations(tdb, cmdenv, calc):
             f"\r{s} Scanning stations…  examined {seen:n}  kept {kept:n}"
         )
         sys.stdout.flush()
-
+    
     if cmdenv.destPlace:
         if cmdenv.endJumps and cmdenv.endJumps > 0:
             cmdenv.destinations = expandForJumps(
@@ -802,17 +802,17 @@ def checkDestinations(tdb, cmdenv, calc):
         if cmdenv.goalSystem:
             dest = tdb.lookupPlace(cmdenv.goalSystem)
             cmdenv.goalSystem = dest.system
-
+        
         if cmdenv.origPlace and cmdenv.maxJumpsPer == 0:
             stationSrc = chain.from_iterable(
                 system.stations for system in cmdenv.origSystems
             )
         else:
             stationSrc = tdb.stationByID.values()
-
+        
         # Pre-filter by eligibility to skip obviously ineligible stations
         eligible_ids = set(calc.stationsSelling) & set(calc.stationsBuying)
-
+        
         # Iterate with heartbeat
         dests, seen, kept = [], 0, 0
         for station in stationSrc:
@@ -824,12 +824,12 @@ def checkDestinations(tdb, cmdenv, calc):
         cmdenv.destinations = tuple(dests)
         if showProgress:
             sys.stdout.write("\n"); sys.stdout.flush()
-
+    
     if not cmdenv.endJumps and isinstance(cmdenv.destPlace, System):
         cmdenv.destinations = filterStationSet(
             '--to', cmdenv, calc, cmdenv.destinations
         )
-
+    
     cmdenv.destSystems = tuple(set(
         stn.system for stn in cmdenv.destinations
     ))
@@ -1189,7 +1189,7 @@ def run(results, cmdenv, tdb):
     
     if tdb.tradingCount == 0:
         raise NoDataError("Database does not contain any profitable trades.")
-
+    
     # Always show a friendly heads-up before heavy work begins.
     print("Searching for quality trades. This may take a few minutes. Please be patient.", flush=True)
     

tradedangerous/commands/sell_cmd.py

@@ -89,7 +89,7 @@ def run(results, cmdenv, tdb: TradeDB):
         to avoid closed-cursor errors when iterating later.
       - Preserve all existing filters, sorting, and output fields.
     """
-
+    
     if cmdenv.lt and cmdenv.gt:
         if cmdenv.lt <= cmdenv.gt:
             raise CommandLineError("--gt must be lower than --lt")
@@ -122,7 +122,7 @@ def run(results, cmdenv, tdb: TradeDB):
     columns = "si.station_id, si.demand_price, si.demand_units"
     where = ["si.item_id = :item_id", "si.demand_price > 0"]
     params = {"item_id": item.ID}
-
+    
     if cmdenv.demand:
         where.append("si.demand_units >= :demand")
         params["demand"] = cmdenv.demand
@@ -132,14 +132,14 @@ def run(results, cmdenv, tdb: TradeDB):
     if cmdenv.gt:
         where.append("si.demand_price > :gt")
         params["gt"] = cmdenv.gt
-
+    
     stmt = f"""
         SELECT DISTINCT {columns}
           FROM StationItem AS si
          WHERE {' AND '.join(where)}
     """
     cmdenv.DEBUG0('SQL: {} ; params={}', stmt, params)
-
+    
     # Execute and eagerly fetch rows
     with tdb.engine.connect() as conn:
         cur_rows = conn.execute(text(stmt), params).fetchall()
@@ -151,7 +151,7 @@ def run(results, cmdenv, tdb: TradeDB):
     odyssey = cmdenv.odyssey
     wantNoPlanet = cmdenv.noPlanet
     wantBlackMarket = cmdenv.blackMarket
-
+    
     # System-based search
     nearSystem = cmdenv.nearSystem
     if nearSystem:

tradedangerous/corrections.py

@@ -27,7 +27,7 @@ items = {
     'SALVAGEABLE WRECKAGE': 'Wreckage Components',
     'POLITICAL PRISONER': 'Political Prisoners',
     'HOSTAGE': 'Hostages',
-    "VOID OPAL": "Void Opals",
+    "VOID OPALS": "Void Opal",
 }
 
 def correctSystem(oldName):

tradedangerous/csvexport.py

@@ -69,14 +69,14 @@ def buildFKeyStmt(session, tableName, key):
     """
     Resolve the FK constraint against the UNIQUE index of the
     referenced table.
-
+    
     Multicolumn UNIQUEs are allowed, but only the last column
     may be treated as a single-column join target.
     """
     unqIndex = getUniqueIndex(session, key["table"])
     keyList = getFKeyList(session, key["table"])
     keyStmt = []
-
+    
     for colName in unqIndex:
         # If this unique column is itself a foreign key, recurse
         keyKey = search_keyList(keyList, colName)
@@ -89,7 +89,7 @@ def buildFKeyStmt(session, tableName, key):
                 "joinTable": key["table"],
                 "joinColumn": key["to"],
             })
-
+    
     return keyStmt
 
 
@@ -101,19 +101,19 @@ def exportTableToFile(tdb_or_session, tdenv, tableName, csvPath=None):
     """
     Generate the CSV file for tableName in csvPath.
     Returns (lineCount, exportPath).
-
+    
     Behaviour:
     - Prefix unique columns with "unq:".
     - Foreign keys are exported as "<col>@<joinTable>.<uniqueCol>".
     - Datetime-like values for 'modified' columns are exported as
       "YYYY-MM-DD HH:MM:SS" (no microseconds).
-
+    
     Compatible with either:
       * a SQLAlchemy Session
       * a TradeDB wrapper exposing .engine
     """
     from sqlalchemy.orm import Session
-
+    
     # --- Resolve a SQLAlchemy session ---
     if hasattr(tdb_or_session, "engine"):
         # Likely a TradeDB instance
@@ -126,15 +126,15 @@ def exportTableToFile(tdb_or_session, tdenv, tableName, csvPath=None):
         raise TradeException(
             f"Unsupported DB object passed to exportTableToFile: {type(tdb_or_session)}"
         )
-
+    
     csvPath = csvPath or Path(tdenv.csvDir)
     if not Path(csvPath).is_dir():
         raise TradeException(f"Save location '{csvPath}' not found.")
-
+    
     uniquePfx = "unq:"
     exportPath = (Path(csvPath) / Path(tableName)).with_suffix(".csv")
     tdenv.DEBUG0(f"Export Table '{tableName}' to '{exportPath}'")
-
+    
     def _fmt_ts(val):
         if hasattr(val, "strftime"):
             try:
@@ -148,7 +148,7 @@ def exportTableToFile(tdb_or_session, tdenv, tableName, csvPath=None):
             if len(s) >= 19 and s[4] == "-" and s[7] == "-" and s[10] == " " and s[13] == ":" and s[16] == ":":
                 return s[:19]
         return val
-
+    
     lineCount = 0
     with exportPath.open("w", encoding="utf-8", newline="\n") as exportFile:
         exportOut = csv.writer(
@@ -159,22 +159,22 @@ def exportTableToFile(tdb_or_session, tdenv, tableName, csvPath=None):
             quoting=csv.QUOTE_NONNUMERIC,
             lineterminator="\n",
         )
-
+        
         bind = session.get_bind()
         inspector = inspect(bind)
-
+        
         try:
             unique_cols = db_utils.get_unique_columns(session, tableName)
             fk_list = db_utils.get_foreign_keys(session, tableName)
         except Exception as e:
             raise TradeException(f"Failed to introspect table '{tableName}': {e!r}")
-
+        
         csvHead = []
         stmtColumn = []
         stmtTable = [tableName]
         stmtOrder = []
         is_modified_col = []
-
+        
         for col in inspector.get_columns(tableName):
             col_name = col["name"]
             fk = next((fk for fk in fk_list if fk["from"] == col_name), None)
@@ -205,14 +205,14 @@ def exportTableToFile(tdb_or_session, tdenv, tableName, csvPath=None):
                     csvHead.append(col_name)
                 stmtColumn.append(f"{tableName}.{col_name}")
                 is_modified_col.append(col_name == "modified")
-
+        
         sqlStmt = f"SELECT {','.join(stmtColumn)} FROM {' '.join(stmtTable)}"
         if stmtOrder:
             sqlStmt += f" ORDER BY {','.join(stmtOrder)}"
         tdenv.DEBUG1(f"SQL: {sqlStmt}")
-
+        
         exportFile.write(f"{','.join(csvHead)}\n")
-
+        
         for row in session.execute(text(sqlStmt)):
             lineCount += 1
             row_out = [
@@ -221,11 +221,11 @@ def exportTableToFile(tdb_or_session, tdenv, tableName, csvPath=None):
             ]
             tdenv.DEBUG2(f"{lineCount}: {row_out}")
             exportOut.writerow(row_out)
-
+        
         tdenv.DEBUG1(f"{lineCount} {tableName}s exported")
-
+    
     # Close session if we created it
     if hasattr(tdb_or_session, "engine"):
         session.close()
-
+    
     return lineCount, exportPath

tradedangerous/db/adapter.py

@@ -32,7 +32,7 @@ def get_adapter_if_enabled(cfg_path: Optional[str] = None) -> "TradeDBReadAdapte
     backend = (cfg.get("database", "backend", fallback="sqlite") or "sqlite").strip().lower()
     if backend == "sqlite":
         return None
-
+    
     # Engine is created lazily via the property below to honour "no side-effects at import".
     return TradeDBReadAdapter(cfg_path)
 
@@ -50,7 +50,7 @@ class TradeDBReadAdapter:
         self._cfg_path = cfg_path
         self._engine: Optional[Engine] = None
         self._Session = None  # sessionmaker
-
+    
     # Lazy engine/session factory (no import-time work)
     @property
     def Session(self):
@@ -59,15 +59,15 @@ class TradeDBReadAdapter:
             self._engine = engine
             self._Session = get_session_factory(engine)
         return self._Session
-
+    
     @contextmanager
     def session(self) -> Generator[Session, None, None]:
         Session = self.Session
         with Session() as s:
             yield s
-
+    
     # ---- Reads mapped to ORM ------------------------------------------------
-
+    
     def list_system_rows(self) -> Iterable[Tuple[int, str, float, float, float, Optional[int]]]:
         """
         Shape matches legacy _loadSystems SELECT:
@@ -86,7 +86,7 @@ class TradeDBReadAdapter:
             )
             for r in rows:
                 yield (r.system_id, r.name, r.pos_x, r.pos_y, r.pos_z, r.added_id)
-
+    
     def system_by_name(self, name_ci: str) -> Optional[Tuple[int, str, float, float, float, Optional[int]]]:
         """
         Case-insensitive name match for System.
@@ -100,7 +100,7 @@ class TradeDBReadAdapter:
             if not row:
                 return None
             return (row.system_id, row.name, row.pos_x, row.pos_y, row.pos_z, row.added_id)
-
+    
     def station_by_system_and_name(
         self, system_id: int, station_name_ci: str
     ) -> Optional[Tuple[int, int, str, int, str, str, str, str, str, str, str, str, str, int]]:
@@ -151,7 +151,7 @@ class TradeDBReadAdapter:
                 r.planetary,
                 r.type_id,
             )
-
+    
     def average_selling(self) -> Dict[int, int]:
         """
         {item_id: avg_supply_price>0}
@@ -170,7 +170,7 @@ class TradeDBReadAdapter:
                 .group_by(Item.item_id)
             )
             return {int(item_id): int(avg_cr) for (item_id, avg_cr) in rows}
-
+    
     def average_buying(self) -> Dict[int, int]:
         """
         {item_id: avg_demand_price>0}

tradedangerous/db/config.py

@@ -85,16 +85,16 @@ def load_config(path: str | Path | None = None) -> Dict[str, Any]:
         except Exception:
             # If anything goes wrong resolving the env, fall back to defaults below
             pass
-
+        
         # Fall back to local file in CWD
         if cfg_path is None:
             p = Path.cwd() / "db_config.ini"
             if p.exists():
                 cfg_path = p
-
+    
     # start with defaults
     result: Dict[str, Any] = {k: (v.copy() if isinstance(v, dict) else v) for k, v in DEFAULTS.items()}
-
+    
     if cfg_path:
         parser = configparser.ConfigParser(**CFG_KW)
         with cfg_path.open("r", encoding="utf-8") as fh:
@@ -103,5 +103,5 @@ def load_config(path: str | Path | None = None) -> Dict[str, Any]:
             result.setdefault(section, {})
             for key, val in parser.items(section):
                 result[section][key] = val
-
+    
     return _coerce_types(result)

tradedangerous/db/engine.py

@@ -41,12 +41,12 @@ def _ensure_default_config_file(target_path: Path | None) -> Path | None:
 def _cfg_to_dict(cfg: configparser.ConfigParser | Mapping[str, Any] | str | os.PathLike) -> Dict[str, Dict[str, Any]]:
     """
     Normalise configuration input into a dict-of-sections.
-
+    
     Accepted inputs:
       * dict-like mapping → returned as {section: {key: value}}
       * ConfigParser       → converted to nested dict (sections overlay DEFAULT section)
       * str/Path           → if file exists, read it; if missing, fall back to load_config()
-
+    
     NOTE:
     - We do NOT raise on a missing path; we delegate to load_config() to honour the
       documented resolution order (ENV → CWD → DEFAULTS).
@@ -61,7 +61,7 @@ def _cfg_to_dict(cfg: configparser.ConfigParser | Mapping[str, Any] | str | os.P
         # Missing provided path → use canonical loader with fallbacks
         from .config import load_config
         return load_config(None)
-
+    
     if isinstance(cfg, configparser.ConfigParser):
         out: Dict[str, Dict[str, Any]] = {}
         defaults = dict(cfg.defaults())
@@ -72,7 +72,7 @@ def _cfg_to_dict(cfg: configparser.ConfigParser | Mapping[str, Any] | str | os.P
         for sec in ("database", "engine", "sqlite", "mariadb", "paths"):
             out.setdefault(sec, dict(defaults))
         return out
-
+    
     # Already a dict-like mapping of sections
     return {k: dict(v) if isinstance(v, Mapping) else dict() for k, v in cfg.items()}  # type: ignore[arg-type]
 
@@ -135,7 +135,7 @@ def _make_sqlite_url(cfg: Dict[str, Any]) -> str:
 def make_engine_from_config(cfg_or_path: configparser.ConfigParser | Mapping[str, Any] | str | os.PathLike | None = None) -> Engine:
     """
     Build a SQLAlchemy Engine for either MariaDB or SQLite.
-
+    
     Accepts: ConfigParser, dict-like {section:{k:v}}, path to INI file, or None.
     First-run behaviour:
       - If a path is provided but missing, or if no path is provided and no config is found,
@@ -143,7 +143,7 @@ def make_engine_from_config(cfg_or_path: configparser.ConfigParser | Mapping[str
         points elsewhere), then loaded.
     """
     ini_target: Path | None = None
-
+    
     # If caller gave a specific path, prefer to materialise a default file there.
     if isinstance(cfg_or_path, (str, os.PathLike)):
         ini_target = Path(cfg_or_path)
@@ -153,17 +153,17 @@ def make_engine_from_config(cfg_or_path: configparser.ConfigParser | Mapping[str
         # (CWD/db_config.ini by default, or the file pointed to by TD_DB_CONFIG).
         ini_target = resolve_db_config_path("db_config.ini")
         _ensure_default_config_file(ini_target)
-
+    
     cfg = _cfg_to_dict(cfg_or_path if cfg_or_path is not None else str(ini_target))
-
+    
     # Ensure dirs exist (used by various parts of the app)
     _ = resolve_data_dir(cfg)
     _ = resolve_tmp_dir(cfg)
-
+    
     backend = str(_get(cfg, "database", "backend", "sqlite")).strip().lower()
     echo = bool(_get_bool(cfg, "engine", "echo", False))
     isolation = _get(cfg, "engine", "isolation_level", None)
-
+    
     if backend == "mariadb":
         url = _make_mariadb_url(cfg)
         connect_timeout = _get_int(cfg, "engine", "connect_timeout", 10) or 10
@@ -190,7 +190,7 @@ def make_engine_from_config(cfg_or_path: configparser.ConfigParser | Mapping[str
             poolclass=NullPool,
             connect_args={"check_same_thread": False},
         )
-
+        
         @event.listens_for(engine, "connect")
         def _set_sqlite_pragmas(dbapi_conn, _):
             cur = dbapi_conn.cursor()
@@ -201,7 +201,7 @@ def make_engine_from_config(cfg_or_path: configparser.ConfigParser | Mapping[str
             cur.close()
     else:
         raise ValueError(f"Unsupported backend: {backend}")
-
+    
     try:
         engine._td_redacted_url = _redact(str(url))  # type: ignore[attr-defined]
     except Exception: