tradedangerous 11.5.3__py3-none-any.whl → 12.0.1__py3-none-any.whl

tradedangerous/prices.py

@@ -1,7 +1,8 @@
 # --------------------------------------------------------------------
 # Copyright (C) Oliver 'kfsone' Smith 2014 <oliver@kfs.org>:
 # Copyright (C) Bernd 'Gazelle' Gollesch 2016, 2017
-# Copyright (C) Jonathan 'eyeonus' Jones 2018, 2019
+# Copyright (C) Stefan 'Tromador' Morrell 2025
+# Copyright (C) Jonathan 'eyeonus' Jones 2018-2025
 #
 # You are free to use, redistribute, or even print and eat a copy of
 # this software so long as you include this copyright notice.
@@ -10,7 +11,9 @@
 # TradeDangerous :: Modules :: Generate TradeDangerous.prices
 
 import sys
-import sqlite3
+from sqlalchemy.orm import Session
+from .db import orm_models as SA
+from .tradeexcept import TradeException
 
 
 class Element:      # TODO: enum?
@@ -18,118 +21,101 @@ class Element:      # TODO: enum?
     supply    = 1 << 1
     timestamp = 1 << 2
     full      = basic | supply | timestamp
-    blanks    = 1 <<31
+    blanks    = 1 << 31
 
 
 ######################################################################
 # Main
 
 def dumpPrices(
-            dbPath,             # Path() or str
-            elementMask,        # which columns to output
-            stationID=None,     # limits to one station
-            file=None,          # file handle to write to
-            defaultZero=False,
-            debug=0
-    ):
+    session: Session,      # SQLAlchemy session
+    elementMask,           # which columns to output
+    stationID=None,        # limits to one station
+    file=None,             # file handle to write to
+    defaultZero=False,
+    debug=0,
+):
     """
-        Generate a prices list using data from the DB.
-        If stationID is not none, only the specified station is dumped.
-        If file is not none, outputs to the given file handle.
+    Generate a prices list using data from the DB.
+    If stationID is not None, only the specified station is dumped.
+    If file is not None, outputs to the given file handle.
     """
-    
-    withTimes  = elementMask & Element.timestamp
-    getBlanks  = elementMask & Element.blanks
-    
-    conn = sqlite3.connect(str(dbPath))
-    conn.execute("PRAGMA foreign_keys=ON")
-    cur  = conn.cursor()
-    
-    systems = dict(cur.execute("SELECT system_id, name FROM System"))
+
+    withTimes = elementMask & Element.timestamp
+    getBlanks = elementMask & Element.blanks
+
+    # ORM queries to build lookup dicts
+    systems = dict(
+        session.query(SA.System.system_id, SA.System.name).all()
+    )
+
     stations = {
-        ID: [ name, systems[sysID] ]
-        for (ID, name, sysID)
-        in cur.execute("SELECT station_id, name, system_id FROM Station")
+        ID: [name, systems.get(sysID)]
+        for ID, name, sysID in session.query(
+            SA.Station.station_id, SA.Station.name, SA.Station.system_id
+        ).all()
     }
-    categories = dict(cur.execute("SELECT category_id, name FROM Category"))
+
+    categories = dict(
+        session.query(SA.Category.category_id, SA.Category.name).all()
+    )
+
     items = {
-        ID: [ name, catID, categories[catID] ]
-        for (ID, name, catID)
-        in cur.execute("SELECT item_id, name, category_id FROM Item")
+        ID: [name, catID, categories[catID]]
+        for ID, name, catID in session.query(
+            SA.Item.item_id, SA.Item.name, SA.Item.category_id
+        ).all()
     }
-    
-    # find longest item name
+
+    # find longest item name (for formatting)
     longestName = max(items.values(), key=lambda ent: len(ent[0]))
     longestNameLen = len(longestName[0])
-    
-    if stationID:
-        # check if there are prices for the station
-        cur.execute("""
-            SELECT  COUNT(*)
-              FROM  StationItem
-             WHERE station_id = {}
-        """.format(stationID))
-        if not cur.fetchone()[0]:
-            getBlanks = True
-    
+
     defaultDemandVal = 0 if defaultZero else -1
-    if stationID:
-        stationWhere = "WHERE stn.station_id = {}".format(stationID)
-    else:
-        stationWhere = ""
-    
-    if getBlanks:
-        itemJoin = "LEFT OUTER"
-    else:
-        itemJoin = "INNER"
-    
-    cur.execute("SELECT CURRENT_TIMESTAMP")
-    now = cur.fetchone()[0]
-    
-    stmt = """
-        SELECT  stn.station_id, itm.item_id
-                , IFNULL(si.demand_price, 0)
-                , IFNULL(si.supply_price, 0)
-                , IFNULL(si.demand_units, {defDemand})
-                , IFNULL(si.demand_level, {defDemand})
-                , IFNULL(si.supply_units, {defDemand})
-                , IFNULL(si.supply_level, {defDemand})
-                , si.modified
-          FROM  Station stn,
-                Category AS cat
-                INNER JOIN Item AS itm USING (category_id)
-                {itemJoin} JOIN StationItem AS si
-                    ON (si.station_id = stn.station_id
-                        AND si.item_id = itm.item_id)
-                {stationWhere}
-         ORDER  BY stn.station_id, cat.name, itm.ui_order
-    """
-    
-    sql = stmt.format(
-        stationWhere=stationWhere,
-        defDemand=defaultDemandVal,
-        itemJoin=itemJoin,
+
+    # Build the main query
+    q = (
+        session.query(
+            SA.StationItem.station_id,
+            SA.Item.item_id,
+            SA.StationItem.demand_price,
+            SA.StationItem.supply_price,
+            SA.StationItem.demand_units,
+            SA.StationItem.demand_level,
+            SA.StationItem.supply_units,
+            SA.StationItem.supply_level,
+            SA.StationItem.modified,
+            SA.Item.name,
+            SA.Item.category_id,
+            SA.Category.name.label("category_name"),
+            SA.Station.name.label("station_name"),
+            SA.System.name.label("system_name"),
+        )
+        .join(SA.Item, SA.Item.item_id == SA.StationItem.item_id)
+        .join(SA.Category, SA.Category.category_id == SA.Item.category_id)
+        .join(SA.Station, SA.Station.station_id == SA.StationItem.station_id)
+        .join(SA.System, SA.System.system_id == SA.Station.system_id)
+        .order_by(SA.Station.station_id, SA.Category.name, SA.Item.ui_order)
     )
-    if debug:
-        print(sql)
-    cur.execute(sql)
-    
-    lastStn, lastCat = None, None
-    
+
+    if stationID:
+        q = q.filter(SA.StationItem.station_id == stationID)
+
+    # Set up output
     if not file:
         file = sys.stdout
-    
+
     if stationID:
         stationSet = str(stations[stationID])
     else:
         stationSet = "ALL Systems/Stations"
-    
+
     file.write(
         "# TradeDangerous prices for {}\n"
         "\n"
         "# REMOVE ITEMS THAT DON'T APPEAR IN THE UI\n"
         "# ORDER IS REMEMBERED: Move items around within categories "
-            "to match the game UI\n"
+        "to match the game UI\n"
         "\n"
         "# File syntax:\n"
         "# <item name> <sell> <buy> [<demand> <supply> [<timestamp>]]\n"
@@ -138,15 +124,14 @@ def dumpPrices(
         "#   Otherwise use a number followed by L, M or H, e.g.\n"
         "#     1L, 23M or 30000H\n"
         "# If you omit the timestamp, the current time will be used when "
-            "the file is loaded.\n"
-        "\n".format(
-            stationSet
-    ))
-    
+        "the file is loaded.\n"
+        "\n".format(stationSet)
+    )
+
     levelDesc = "?0LMH"
     maxCrWidth = 7
     levelWidth = 9
-    
+
     outFmt = (
         "      {{:<{width}}}"
         " {{:>{crwidth}}}"
@@ -161,71 +146,68 @@ def dumpPrices(
     if withTimes:
         outFmt += "  {}"
     outFmt += "\n"
-    output = outFmt.format(
+    header = outFmt.format(
         "Item Name",
         "SellCr", "BuyCr",
         "Demand", "Supply",
         "Timestamp",
     )
-    file.write('#' + output[1:])
-    
+    file.write('#' + header[1:])
+
     naIQL = "-"
     unkIQL = "?"
     defIQL = "?" if not defaultZero else "-"
-    
+
+    # Main loop — stream results instead of preloading
     output = ""
-    for (stnID, itemID, fromStn, toStn, demand, demandLevel, supply, supplyLevel, modified) in cur:
-        modified = modified or now
-        station, system = stations[stnID]
-        item, catID, category = items[itemID]
+    lastStn, lastCat = None, None
+    for row in q.yield_per(1000).execution_options(stream_results=True):
+        stnID = row.station_id
+        itemID = row.item_id
+        station = row.station_name
+        system = row.system_name
+        item = row.name
+        catID = row.category_id
+        category = row.category_name
+        
+        # Guard against bad system names
+        if not system:
+            raise TradeException(
+                f"Station {station} (ID {stnID}) is linked to a system with no name."
+            )
+
         if stnID != lastStn:
             file.write(output)
-            output = "\n\n@ {}/{}\n".format(system.upper(), station)
+            output = f"\n\n@ {system.upper()}/{station}\n"
             lastStn = stnID
             lastCat = None
-        
-        if catID is not lastCat:
-            output += "   + {}\n".format(category)
+
+        if catID != lastCat:
+            output += f"   + {category}\n"
             lastCat = catID
+
+        demandCr = row.demand_price or 0
+        supplyCr = row.supply_price or 0
+        demandUnits = row.demand_units or defaultDemandVal
+        demandLevel = row.demand_level or defaultDemandVal
+        supplyUnits = row.supply_units or defaultDemandVal
+        supplyLevel = row.supply_level or defaultDemandVal
         
-        # Is this item on sale?
-        if toStn > 0:
-            # Zero demand-price gets default demand, which will
-            # be either unknown or zero depending on -0.
-            # If there is a price, always default to unknown
-            # because it can be sold here but the demand is just
-            # not useful as data.
-            demandStr = defIQL if fromStn <= 0 else unkIQL
-            if supplyLevel == 0:
-                supplyStr = naIQL
-            elif supplyLevel < 0 and supply <= 0:
-                supplyStr = defIQL
-            else:
-                units = "?" if supply < 0 else str(supply)
-                level = levelDesc[supplyLevel + 1]
-                supplyStr = units + level
+        # Demand/supply formatting
+        if supplyCr > 0:
+            demandStr = defIQL if demandCr <= 0 else unkIQL
+            supplyStr = (
+                naIQL if supplyLevel == 0
+                else (f"{supplyUnits if supplyUnits >= 0 else '?'}{levelDesc[supplyLevel+1]}")
+            )
         else:
-            if fromStn == 0 or demandLevel == 0:
-                demandStr = naIQL
-            elif demandLevel < 0 and demand <= 0:
-                demandStr = defIQL
-            else:
-                units = "?" if demand < 0 else str(demand)
-                level = levelDesc[demandLevel + 1]
-                demandStr = units + level
+            demandStr = (
+                naIQL if demandCr == 0 or demandLevel == 0
+                else (f"{demandUnits if demandUnits >= 0 else '?'}{levelDesc[demandLevel+1]}")
+            )
             supplyStr = naIQL
-        output += outFmt.format(
-                    item,
-                    fromStn, toStn,
-                    demandStr, supplyStr,
-                    modified
-                )
-    
-    file.write(output)
 
+        modified = row.modified or ""
+        output += outFmt.format(item, demandCr, supplyCr, demandStr, supplyStr, modified)
 
-# if __name__ == "__main__":
-#     import tradedb
-# 
-#     tdb = tradedb.TradeDB(load=False)
-#     dumpPrices(tdb.dbPath, elementMask=Element.full)
+    file.write(output)

tradedangerous/templates/TradeDangerous.sql

@@ -44,7 +44,7 @@ CREATE TABLE Added
 
 CREATE TABLE System
  (
-   system_id INTEGER PRIMARY KEY,
+   system_id BIGINT PRIMARY KEY,
    name VARCHAR(40) COLLATE nocase,
    pos_x DOUBLE NOT NULL,
    pos_y DOUBLE NOT NULL,
@@ -63,9 +63,9 @@ CREATE INDEX idx_system_by_pos ON System (pos_x, pos_y, pos_z, system_id);
 
 CREATE TABLE Station
  (
-   station_id INTEGER PRIMARY KEY,
+   station_id BIGINT PRIMARY KEY,
    name VARCHAR(40) COLLATE nocase,
-   system_id INTEGER NOT NULL,
+   system_id BIGINT NOT NULL,
    ls_from_star INTEGER NOT NULL DEFAULT 0
        CHECK (ls_from_star >= 0),
    blackmarket TEXT(1) NOT NULL DEFAULT '?'
@@ -111,7 +111,7 @@ CREATE TABLE Ship
 CREATE TABLE ShipVendor
  (
    ship_id INTEGER NOT NULL,
-   station_id INTEGER NOT NULL,
+   station_id BIGINT NOT NULL,
    modified DATETIME DEFAULT CURRENT_TIMESTAMP NOT NULL,
 
    PRIMARY KEY (ship_id, station_id),
@@ -141,7 +141,7 @@ CREATE TABLE Upgrade
 CREATE TABLE UpgradeVendor
  (
    upgrade_id INTEGER NOT NULL,
-   station_id INTEGER NOT NULL,
+   station_id BIGINT NOT NULL,
    modified DATETIME NOT NULL,
 
    PRIMARY KEY (upgrade_id, station_id),
@@ -209,7 +209,7 @@ CREATE TABLE Item
 
 CREATE TABLE StationItem
  (
-  station_id INTEGER NOT NULL,
+  station_id BIGINT NOT NULL,
   item_id INTEGER NOT NULL,
   demand_price INT NOT NULL,
   demand_units INT NOT NULL,