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

tradedangerous/commands/buildcache_cmd.py

@@ -55,12 +55,12 @@ switches = [
 def run(results, cmdenv, tdb: TradeDB):
     """
     BRUTE-FORCE rebuild of the cache/database.
-
+    
     Semantics preserved:
       - If DB exists and --force not given => error
       - SQL file must exist
       - Performs a full destructive rebuild
-
+    
     Implementation change:
       - Delegates to tradedangerous.db.lifecycle.ensure_fresh_db with mode='force'
         so all backend-specific checks and rebuild steps run via the central path.
@@ -68,21 +68,21 @@ def run(results, cmdenv, tdb: TradeDB):
     # Deprecation note: keep short and visible but non-fatal.
     print("NOTE: 'buildcache' is deprecated. Prefer 'update' or importer plugins. "
           "Proceeding with a forced rebuild via db.lifecycle.ensure_fresh_db().")
-
+    
     # Honor legacy safety: require --force to overwrite an existing DB file.
     if not cmdenv.force and tdb.dbPath.exists():
         raise CommandLineError(
             f"SQLite3 database '{tdb.dbFilename}' already exists.\n"
             "Either remove the file first or use the '-f/--force' option."
         )
-
+    
     # Ensure the SQL source exists (buildCache ultimately relies on this path).
     if not tdb.sqlPath.exists():
         raise CommandLineError(f"SQL File does not exist: {tdb.sqlFilename}")
-
+    
     # Force a rebuild through the lifecycle helper (works for both backends).
     from tradedangerous.db.lifecycle import ensure_fresh_db
-
+    
     ensure_fresh_db(
         backend=tdb.engine.dialect.name if getattr(tdb, "engine", None) else "sqlite",
         engine=getattr(tdb, "engine", None),
@@ -93,6 +93,6 @@ def run(results, cmdenv, tdb: TradeDB):
         tdenv=cmdenv,
         rebuild=True,
     )
-
+    
     return None
 

tradedangerous/commands/buy_cmd.py

@@ -186,7 +186,7 @@ def sql_query(cmdenv, tdb, queries, mode):
         * Item:   (item_id, station_id, supply_price, supply_units)
     """
     ids = list(queries.keys())
-
+    
     # Build a stable, named-parameter IN(...) list
     params = {}
     placeholders = []
@@ -195,7 +195,7 @@ def sql_query(cmdenv, tdb, queries, mode):
         placeholders.append(f":{key}")
         params[key] = val
     id_list_sql = ",".join(placeholders)
-
+    
     if mode is SHIP_MODE:
         columns = "s.ship_id, s.station_id, sh.cost, 1"
         tables = "ShipVendor AS s JOIN Ship AS sh ON sh.ship_id = s.ship_id"
@@ -216,11 +216,11 @@ def sql_query(cmdenv, tdb, queries, mode):
         if cmdenv.gt:
             constraints.append("(s.supply_price > :gt)")
             params["gt"] = cmdenv.gt
-
+    
     where_clause = " AND ".join(constraints)
     stmt = f"SELECT DISTINCT {columns} FROM {tables} WHERE {where_clause}"
     cmdenv.DEBUG0('SQL: {} ; params={}', stmt, params)
-
+    
     # Eagerly fetch to avoid closed cursor when iterating later.
     with tdb.engine.connect() as conn:
         result = conn.execute(text(stmt), params)

tradedangerous/commands/export_cmd.py

@@ -63,7 +63,7 @@ switches = [
 def run(results, cmdenv, tdb):
     """
     Backend-neutral export of DB tables to CSV.
-
+    
     Changes:
       * Use tradedangerous.db.lifecycle.ensure_fresh_db(rebuild=False) to verify a usable DB
         without rebuilding (works for SQLite and MariaDB).
@@ -86,13 +86,13 @@ def run(results, cmdenv, tdb):
             f"Database is not initialized/healthy (reason: {reason}). "
             "Use 'buildcache' or an importer to (re)build it."
         )
-
+    
     # --- Determine export target directory (same behavior as before) ---
     from pathlib import Path
     exportPath = Path(cmdenv.path) if cmdenv.path else Path(tdb.dataDir)
     if not exportPath.is_dir():
         raise CommandLineError("Save location '{}' not found.".format(str(exportPath)))
-
+    
     # --- Announce which DB we will read from, backend-aware ---
     try:
         dialect = tdb.engine.dialect.name
@@ -104,17 +104,17 @@ def run(results, cmdenv, tdb):
     except Exception:
         source_label = str(getattr(tdb, "dbPath", "Unknown DB"))
     cmdenv.NOTE("Using database {}", source_label)
-
+    
     # --- Enumerate tables using SQLAlchemy inspector (backend-neutral) ---
     from sqlalchemy import inspect
     inspector = inspect(tdb.engine)
     all_tables = inspector.get_table_names()  # current schema / database
-
+    
     # Optional ignore list (preserve legacy default: skip StationItem unless --all-tables)
     ignoreList = []
     if not getattr(cmdenv, "allTables", False):
         ignoreList.append("StationItem")
-
+    
     # --tables filtering (case-insensitive, like old COLLATE NOCASE)
     if getattr(cmdenv, "tables", None):
         requested = [t.strip() for t in cmdenv.tables.split(",") if t.strip()]
@@ -129,17 +129,17 @@ def run(results, cmdenv, tdb):
         table_list = sorted(set(resolved))
     else:
         table_list = sorted(set(all_tables))
-
+    
     # --- Export each table via csvexport (already refactored elsewhere) ---
     for tableName in table_list:
         if tableName in ignoreList:
             cmdenv.NOTE("Ignore Table '{table}'", table=tableName)
             continue
-
+        
         cmdenv.NOTE("Export Table '{table}'", table=tableName)
-
+        
         lineCount, filePath = exportTableToFile(tdb, cmdenv, tableName, exportPath)
-
+        
         # Optionally delete empty CSVs
         if getattr(cmdenv, "deleteEmpty", False) and lineCount == 0:
             try:
@@ -147,5 +147,5 @@ def run(results, cmdenv, tdb):
                 cmdenv.DEBUG0("Delete empty file {file}", file=filePath)
             except Exception as e:
                 cmdenv.DEBUG0("Failed to delete empty file {file}: {err}", file=filePath, err=e)
-
+    
     return None

tradedangerous/commands/import_cmd.py

@@ -121,7 +121,7 @@ def run(results, cmdenv, tdb):
       • If a plugin (-P) is specified: load it and run it (no deprecation banner).
       • Otherwise: proceed with legacy .prices/.url flow and show a deprecation notice.
     """
-
+    
     # --- Plugin path (preferred; no banner) ---
     if cmdenv.plug:
         if cmdenv.pluginOptions:
@@ -132,16 +132,16 @@ def run(results, cmdenv, tdb):
             pluginClass = plugins.load(cmdenv.plug, "ImportPlugin")
         except plugins.PluginException as e:
             raise CommandLineError("Plugin Error: " + str(e))
-
+        
         plugin = pluginClass(tdb, cmdenv)
-
+        
         # If plugin returns False, it fully handled the run → stop here.
         if not plugin.run():
             return None
-
+        
         # If plugin returns True, it’s handing control back to legacy flow below.
         # Fall through intentionally (still no banner, as user invoked a plugin).
-
+    
     # --- Legacy .prices path (deprecated; show banner once) ---
     # Only warn when the user is *not* using a plugin. Keep functionality intact.
     if not cmdenv.plug:
@@ -155,23 +155,23 @@ def run(results, cmdenv, tdb):
             "Solo/offline: TradeDangerous DB-Update for EDMC → https://github.com/bgol/UpdateTD\n"
             "===================================================================\n"
         )
-
+    
     # Refresh/close any cached handles before file ops (kept from original)
     tdb.reloadCache()
     tdb.close()
-
+    
     # Treat a bare http(s) string in 'filename' as a URL
     if cmdenv.filename:
         if re.match(r"^https?://", cmdenv.filename, re.IGNORECASE):
             cmdenv.url, cmdenv.filename = cmdenv.filename, None
-
+    
     # Optional download step
     if cmdenv.url:
         cmdenv.filename = cmdenv.filename or "import.prices"
         transfers.download(cmdenv, cmdenv.url, cmdenv.filename)
         if cmdenv.download:
             return None
-
+    
     # No filename? If Tk is available, prompt user (legacy behavior)
     fh = None
     if not cmdenv.filename and hasTkInter:
@@ -190,7 +190,7 @@ def run(results, cmdenv, tdb):
         if not filename:
             raise SystemExit("Aborted")
         cmdenv.filename = filename
-
+    
     # Validate path or use stdin
     if cmdenv.filename != "-":
         filePath = Path(cmdenv.filename)
@@ -199,7 +199,7 @@ def run(results, cmdenv, tdb):
     else:
         filePath = "stdin"
         fh = sys.stdin
-
+    
     # If a plugin was also involved and wants to finish with default flow,
     # honour that (unchanged behavior).
     if cmdenv.plug:
@@ -208,7 +208,7 @@ def run(results, cmdenv, tdb):
         if not plugin.finish():
             cache.regeneratePricesFile()
             return None
-
+    
     # Legacy .prices import
     cache.importDataFromFile(tdb, cmdenv, filePath, pricesFh=fh, reset=cmdenv.reset)
     return None

tradedangerous/commands/market_cmd.py

@@ -54,24 +54,24 @@ def render_units(units, level):
 def run(results, cmdenv, tdb):
     # Lazy import to avoid any import-time tangles elsewhere.
     from tradedangerous.db.utils import age_in_days
-
+    
     origin = cmdenv.startStation
     if not origin.itemCount:
         raise CommandLineError(
             "No trade data available for {}".format(origin.name())
         )
-
+    
     buying, selling = cmdenv.buying, cmdenv.selling
-
+    
     results.summary = ResultRow()
     results.summary.origin = origin
     results.summary.buying = cmdenv.buying
     results.summary.selling = cmdenv.selling
-
+    
     # Precompute averages (unchanged)
     tdb.getAverageSelling()
     tdb.getAverageBuying()
-
+    
     # --- Backend-neutral query using SQLAlchemy Core + age_in_days ---
     si = table(
         "StationItem",
@@ -85,10 +85,10 @@ def run(results, cmdenv, tdb):
         column("supply_level"),
         column("modified"),
     )
-
+    
     # Build session bound to current engine (needed by age_in_days)
     session = Session(bind=tdb.engine)
-
+    
     stmt = (
         select(
             si.c.item_id,
@@ -98,17 +98,17 @@ def run(results, cmdenv, tdb):
         )
         .where(si.c.station_id == origin.ID)
     )
-
+    
     rows = session.execute(stmt).fetchall()
     session.close()
-
+    
     for r in rows:
         it = iter(r)
         item = tdb.itemByID[next(it)]
-
+        
         row = ResultRow()
         row.item = item
-
+        
         row.buyCr = int(next(it) or 0)
         row.avgBuy = tdb.avgBuying.get(item.ID, 0)
         units, level = int(next(it) or 0), int(next(it) or 0)
@@ -119,7 +119,7 @@ def run(results, cmdenv, tdb):
             hasBuy = (row.buyCr or units or level)
         else:
             hasBuy = False
-
+        
         row.sellCr = int(next(it) or 0)
         row.avgSell = tdb.avgSelling.get(item.ID, 0)
         units, level = int(next(it) or 0), int(next(it) or 0)
@@ -130,19 +130,19 @@ def run(results, cmdenv, tdb):
             hasSell = (row.sellCr or units or level)
         else:
             hasSell = False
-
+        
         age_days = next(it)
         row.age = float(age_days or 0.0)
-
+        
         if hasBuy or hasSell:
             results.rows.append(row)
-
+    
     if not results.rows:
         raise CommandLineError("No items found")
-
+    
     results.rows.sort(key=lambda row: row.item.dbname)
     results.rows.sort(key=lambda row: row.item.category.dbname)
-
+    
     return results
 
 #######################################################################

tradedangerous/commands/olddata_cmd.py

@@ -73,13 +73,13 @@ def run(results, cmdenv, tdb):
     """
     from .commandenv import ResultRow
     from tradedangerous.db.utils import age_in_days
-
+    
     cmdenv = results.cmdenv
     tdb = cmdenv.tdb
-
+    
     results.summary = ResultRow()
     results.limit = cmdenv.limit
-
+    
     # SQLAlchemy lightweight table defs
     si = table(
         "StationItem",
@@ -100,13 +100,13 @@ def run(results, cmdenv, tdb):
         column("pos_y"),
         column("pos_z"),
     )
-
+    
     # Build session bound to current engine (age_in_days needs the session)
     session = Session(bind=tdb.engine)
-
+    
     # Base SELECT: station_id, ls_from_star, age_days
     age_expr = age_in_days(session, func.max(si.c.modified)).label("age_days")
-
+    
     # Optional near-system distance²
     nearSys = cmdenv.nearSystem
     join_sys = False
@@ -117,7 +117,7 @@ def run(results, cmdenv, tdb):
         dist2_expr = (dx * dx + dy * dy + dz * dz).label("d2")
     else:
         dist2_expr = literal(0.0).label("d2")
-
+    
     stmt = (
         select(
             si.c.station_id,
@@ -133,7 +133,7 @@ def run(results, cmdenv, tdb):
         .group_by(si.c.station_id, stn.c.ls_from_star, dist2_expr)
         .order_by(age_expr.desc())
     )
-
+    
     # Bounding box for near (keeps scan small, mirrors original)
     if nearSys:
         maxLy = cmdenv.maxLyPer or tdb.maxSystemLinkLy
@@ -145,15 +145,15 @@ def run(results, cmdenv, tdb):
         )
         # Radius filter: HAVING dist2 <= maxLy^2
         stmt = stmt.having(dist2_expr <= (maxLy * maxLy))
-
+    
     # Min-age filter (apply to aggregated age of MAX(modified))
     if cmdenv.minAge:
         stmt = stmt.having(age_expr >= float(cmdenv.minAge))
-
+    
     # Execute and materialize rows
     rows = session.execute(stmt).fetchall()
     session.close()
-
+    
     # Downstream filters (unchanged)
     padSize = cmdenv.padSize
     planetary = cmdenv.planetary
@@ -161,7 +161,7 @@ def run(results, cmdenv, tdb):
     odyssey = cmdenv.odyssey
     noPlanet = cmdenv.noPlanet
     mls = cmdenv.maxLs
-
+    
     for (stnID, age, ls, dist2) in rows:
         cmdenv.DEBUG2("{}:{}:{}", stnID, age, ls)
         row = ResultRow()
@@ -169,7 +169,7 @@ def run(results, cmdenv, tdb):
         row.age = float(age or 0.0)
         row.ls = "{:n}".format(ls) if ls else "?"
         row.dist = (float(dist2) ** 0.5) if dist2 else 0.0
-
+        
         if padSize and not row.station.checkPadSize(padSize):
             continue
         if planetary and not row.station.checkPlanetary(planetary):
@@ -182,9 +182,9 @@ def run(results, cmdenv, tdb):
             continue
         if mls and row.station.lsFromStar > mls:
             continue
-
+        
         results.rows.append(row)
-
+    
     # Route optimization and limiting (unchanged)
     if cmdenv.route and len(results.rows) > 1:
         def walk(start_idx, dist):
@@ -201,7 +201,7 @@ def run(results, cmdenv, tdb):
                 path.append(nearest)
                 dist += distFn(nearest.station.system)
             return (path, dist)
-
+        
         if cmdenv.near:
             bestPath = walk(0, results.rows[0].dist)
         else:
@@ -211,10 +211,10 @@ def run(results, cmdenv, tdb):
                 if candidate[1] < bestPath[1]:
                     bestPath = candidate
         results.rows[:] = bestPath[0]
-
+    
     if cmdenv.limit:
         results.rows[:] = results.rows[:cmdenv.limit]
-
+    
     return results
 
 

tradedangerous/commands/rares_cmd.py

@@ -103,14 +103,14 @@ def run(results, cmdenv, tdb):
     odyssey = cmdenv.odyssey
     # How far we're want to cast our net.
     maxLy = float(cmdenv.maxLyPer or 0.0)
-
+    
     if cmdenv.illegal:
         wantIllegality = 'Y'
     elif cmdenv.legal:
         wantIllegality = 'N'
     else:
         wantIllegality = 'YN?'
-
+    
     awaySystems = set()
     if cmdenv.away or cmdenv.awayFrom:
         if not cmdenv.away or not cmdenv.awayFrom:
@@ -119,15 +119,15 @@ def run(results, cmdenv, tdb):
         for sysName in cmdenv.awayFrom:
             system = tdb.lookupPlace(sysName).system
             awaySystems.add(system)
-
+    
     # Start to build up the results data.
     results.summary = ResultRow()
     results.summary.near = start
     results.summary.ly = maxLy
     results.summary.awaySystems = awaySystems
-
+    
     distCheckFn = start.distanceTo
-
+    
     # Look through the rares list.
     for rare in tdb.rareItemByID.values():
         if rare.illegal not in wantIllegality:
@@ -143,45 +143,45 @@ def run(results, cmdenv, tdb):
             continue
         if noPlanet and stn.planetary != 'N':
             continue
-
+        
         rareSys = stn.system
         dist = distCheckFn(rareSys)
         if maxLy > 0.0 and dist > maxLy:
             continue
-
+        
         if awaySystems:
             awayCheck = rareSys.distanceTo
             if any(awayCheck(away) < minAwayDist for away in awaySystems):
                 continue
-
+        
         row = ResultRow()
         row.rare = rare
         row.station = stn            # <-- IMPORTANT: used by render()
         row.dist = dist
         results.rows.append(row)
-
+    
     # Was anything matched?
     if not results.rows:
         print("No matches found.")
         return None
-
+    
     # Sort safely even if rare.costCr is None (treat None as 0)
     price_key = lambda row: (row.rare.costCr or 0)
-
+    
     if cmdenv.sortByPrice:
         results.rows.sort(key=lambda row: row.dist)
         results.rows.sort(key=price_key, reverse=True)
     else:
         results.rows.sort(key=price_key, reverse=True)
         results.rows.sort(key=lambda row: row.dist)
-
+    
     if cmdenv.reverse:
         results.rows.reverse()
-
+    
     limit = cmdenv.limit or 0
     if limit > 0:
         results.rows = results.rows[:limit]
-
+    
     return results
 
 
@@ -196,11 +196,11 @@ def render(results, cmdenv, tdb):
     Keeps existing column order/labels.
     """
     from ..formatting import RowFormat, max_len
-
+    
     rows = results.rows
     if not rows:
         return
-
+    
     # Helpers to coalesce possibly-missing attributes
     def _cost(row):
         try:
@@ -208,59 +208,59 @@ def render(results, cmdenv, tdb):
             return int(v) if v is not None else 0
         except Exception:
             return 0
-
+    
     def _rare_name(row):
         try:
             n = row.rare.name()
             return n or "?"
         except Exception:
             return "?"
-
+    
     def _alloc(row):
         val = getattr(row.rare, "allocation", None)
         return str(val) if val not in (None, "") else "?"
-
+    
     def _rare_illegal(row):
         val = getattr(row.rare, "illegal", None)
         return val if val in ("Y", "N", "?") else "?"
-
+    
     def _stn_ls(row):
         try:
             v = row.station.distFromStar()
             return v if v is not None else "?"
         except Exception:
             return "?"
-
+    
     def _dist(row):
         try:
             return float(getattr(row, "dist", 0.0) or 0.0)
         except Exception:
             return 0.0
-
+    
     def _stn_bm(row):
         key = getattr(row.station, "blackMarket", "?")
         return TradeDB.marketStates.get(key, key or "?")
-
+    
     def _pad(row):
         key = getattr(row.station, "maxPadSize", "?")
         return TradeDB.padSizes.get(key, key or "?")
-
+    
     def _plt(row):
         key = getattr(row.station, "planetary", "?")
         return TradeDB.planetStates.get(key, key or "?")
-
+    
     def _flc(row):
         key = getattr(row.station, "fleet", "?")
         return TradeDB.fleetStates.get(key, key or "?")
-
+    
     def _ody(row):
         key = getattr(row.station, "odyssey", "?")
         return TradeDB.odysseyStates.get(key, key or "?")
-
+    
     # Column widths based on safe key functions
     max_stn = max_len(rows, key=lambda r: r.station.name())
     max_rare = max_len(rows, key=lambda r: _rare_name(r))
-
+    
     rowFmt = RowFormat()
     rowFmt.addColumn('Station', '<', max_stn, key=lambda r: r.station.name())
     rowFmt.addColumn('Rare', '<', max_rare, key=lambda r: _rare_name(r))
@@ -276,10 +276,10 @@ def render(results, cmdenv, tdb):
     rowFmt.addColumn('Plt', '>', 3, key=lambda r: _plt(r))
     rowFmt.addColumn('Flc', '>', 3, key=lambda r: _flc(r))
     rowFmt.addColumn('Ody', '>', 3, key=lambda r: _ody(r))
-
+    
     if not cmdenv.quiet:
         heading, underline = rowFmt.heading()
         print(heading, underline, sep='\n')
-
+    
     for row in rows:
         print(rowFmt.format(row))