Speed up live lookup and keep optimize actions visible

app.py

@@ -8617,7 +8617,7 @@ def _sm_cached_leaderboard_row_for_username(username: str):
                 return dict(row)
     return None
 
-def _sm_live_lookup_bulk(usernames: list[str]):
+def _sm_live_lookup_bulk(usernames: list[str], *, include_ranks: bool = True):
     unique = []
     original_by_key = {}
     for username in usernames:
@@ -8724,12 +8724,13 @@ def _sm_live_lookup_bulk(usernames: list[str]):
                 by_key[key] = output_result
                 if result.get("ok"):
                     _SM_LOOKUP_CACHE[key] = {"stamp": time.monotonic(), "result": dict(result)}
-        rank_map = {
-            _sm_live_username_key(username): by_key.get(_sm_live_username_key(username))
-            for username in unique
-            if by_key.get(_sm_live_username_key(username)) is not None
-        }
-        _sm_attach_level_ranks_unlocked(rank_map, unique)
+        if include_ranks:
+            rank_map = {
+                _sm_live_username_key(username): by_key.get(_sm_live_username_key(username))
+                for username in unique
+                if by_key.get(_sm_live_username_key(username)) is not None
+            }
+            _sm_attach_level_ranks_unlocked(rank_map, unique)
         try:
             _sm_leaderboard_upsert_lookup_results(by_key.values(), source="lookup")
         except Exception as exc:
@@ -9156,12 +9157,30 @@ def _discord_slot_failover(exc, slot: int):
 
 @app.get("/live-lookup")
 @app.get("/discord-lookup")
-def discord_lookup(username: str):
-    result = _sm_live_lookup_bulk([username]).get(username)
+def discord_lookup(username: str, include_rank: bool = True):
+    result = _sm_live_lookup_bulk([username], include_ranks=include_rank).get(username)
     if not result or not result.get("ok"):
         raise HTTPException(502, (result or {}).get("error") or f"No live stats found for '{username}'.")
     return result
 
+
+@app.get("/live-rank")
+def live_rank(username: str):
+    clean = str(username or "").strip()
+    if not clean:
+        raise HTTPException(400, "Username is required.")
+    result = _sm_live_lookup_bulk([clean], include_ranks=False).get(clean)
+    if not result or not result.get("ok"):
+        raise HTTPException(502, (result or {}).get("error") or f"No live stats found for '{clean}'.")
+
+    rank_map = {_sm_live_username_key(clean): result}
+    _sm_attach_level_ranks_unlocked(rank_map, [clean])
+    try:
+        _sm_leaderboard_upsert_lookup_results([result], source="lookup")
+    except Exception as exc:
+        print(f"[SwordMasters leaderboard rank upsert failed] {type(exc).__name__}: {str(exc)[:240]}")
+    return result
+
 # ─────────────────────────────────────────────────────────────────
 # /get-tokens  — gibt nur Status ans Frontend, keine Secrets
 # ─────────────────────────────────────────────────────────────────
@@ -9178,6 +9197,7 @@ def get_tokens():
 
 class BulkLookupRequest(BaseModel):
     usernames: list[str]
+    include_rank: bool = True
 
 class ClanLookupRequest(BaseModel):
     clan_name: str
@@ -9214,7 +9234,10 @@ def discord_lookup_bulk(data: BulkLookupRequest):
     usernames = [str(u).strip() for u in (data.usernames or []) if str(u).strip()]
     if not usernames:
         return {"results": {}}
-    return {"results": _sm_live_lookup_bulk(usernames), "token_warnings": []}
+    return {
+        "results": _sm_live_lookup_bulk(usernames, include_ranks=data.include_rank),
+        "token_warnings": [],
+    }
 
 @app.get("/leaderboard")
 def leaderboard(

static/index.html

@@ -184,7 +184,7 @@ input::placeholder{color:var(--text3);}
 .market-panel.market-collapsed .market-body{display:none;}
 .market-panel.market-collapsed{max-width:none;margin-left:0;}
 .market-panel.market-collapsed .collapse-btn{transform:rotate(-90deg);}
-.opt-action-bar{display:grid;grid-template-columns:minmax(0,1.7fr) auto minmax(130px,.8fr);gap:8px;margin-bottom:12px;align-items:stretch;}
+.opt-action-bar{position:sticky;top:8px;z-index:30;display:grid;grid-template-columns:minmax(0,1.7fr) auto minmax(130px,.8fr);gap:8px;margin-bottom:12px;padding:8px;border:1px solid rgba(0,200,255,.28);border-radius:9px;background:rgba(8,11,16,.94);box-shadow:0 10px 32px rgba(0,0,0,.52),0 0 20px rgba(0,200,255,.08);backdrop-filter:blur(10px);align-items:stretch;}
 .opt-action-bar .btn{justify-content:center;border-radius:7px;min-height:44px;}
 .opt-action-bar .mini-toggle{justify-content:center;min-height:44px;}
 .opt-plan-shell{display:flex;flex-direction:column;gap:12px;}
@@ -449,6 +449,7 @@ input::placeholder{color:var(--text3);}
 .trade-cta{width:100%;justify-content:center;margin-top:12px;padding:10px;font-size:12px;border-radius:5px;}
 @media(max-width:1180px){.opt-plan-head,.opt-plan-actions{grid-template-columns:1fr}.opt-summary-grid{grid-template-columns:repeat(2,minmax(135px,1fr));}.opt-room-head{grid-template-columns:1fr}.opt-room-stats{grid-template-columns:repeat(3,minmax(70px,1fr));}.opt-market-grid{grid-template-columns:repeat(2,minmax(100px,1fr));}}
 @media(max-width:650px){.account-add-row,.account-base-grid,.opt-action-bar,.opt-rec-actions,.trade-lab,.trade-actions,.opt-summary-grid,.opt-room-stats,.opt-account-grid,.opt-market-grid,.opt-market-columns{grid-template-columns:1fr}.opt-plan-head,.opt-plan-actions{grid-template-columns:1fr}.opt-gear-row{grid-template-columns:1fr}.opt-pets{grid-template-columns:1fr}.opt-account-stats{grid-template-columns:repeat(2,minmax(0,1fr));}.opt-market-card .market-head{grid-template-columns:1fr auto}.opt-market-brief{grid-column:1 / -1;justify-content:flex-start}.opt-market-meta{grid-column:1 / -1;text-align:left}.opt-period-control{grid-template-columns:auto 1fr 1fr;}.opt-market-row{grid-template-columns:42px minmax(0,1fr)}.opt-market-side{grid-column:2 / -1;align-items:flex-start}.opt-market-price{text-align:left}.opt-section-head{align-items:flex-start;flex-direction:column}.opt-section-head>span{text-align:left}}
+@media(max-width:650px){.opt-action-bar{grid-template-columns:minmax(0,1fr) minmax(0,1fr)}.opt-action-bar #run-btn{grid-column:1 / -1}}
 .account-lookup-panel{overflow:visible;}
 .ai-avatar-card{width:94px;height:94px;margin:7px auto 3px;padding:3px;overflow:visible;border:1px solid rgba(0,200,255,.24);background:#657b91;border-radius:3px;display:flex;align-items:center;justify-content:center;box-shadow:inset 0 0 14px rgba(0,0,0,.18);}
 .ai-avatar-card canvas{width:86px!important;height:86px!important;display:block;image-rendering:auto;filter:drop-shadow(0 4px 7px rgba(0,0,0,.42));}
@@ -996,6 +997,15 @@ input::placeholder{color:var(--text3);}
     </div>
   </div>
 
+  <div class="opt-action-bar">
+    <button class="btn btn-p" id="run-btn" style="font-size:14px;padding:11px" onclick="runOpt()">OPTIMIZE</button>
+    <label class="mini-toggle" title="Disable market buy/sell search and only optimize current setup power and rooms">
+      <input type="checkbox" id="use-market-optimum" checked>
+      MARKET
+    </label>
+    <button class="btn btn-s" id="check-btn" style="font-size:13px;padding:11px" onclick="runCheck()">CHECK SETUP</button>
+  </div>
+
   <!-- ACCOUNTS -->
   <div class="panel opt-accounts-panel" id="panel-accounts">
     <div class="ph"><h2>Accounts</h2>
@@ -1027,15 +1037,6 @@ input::placeholder{color:var(--text3);}
     </div>
   </div>
 
-  <div class="opt-action-bar">
-    <button class="btn btn-p" id="run-btn" style="font-size:14px;padding:11px" onclick="runOpt()">OPTIMIZE</button>
-    <label class="mini-toggle" title="Disable market buy/sell search and only optimize current setup power and rooms">
-      <input type="checkbox" id="use-market-optimum" checked>
-      MARKET
-    </label>
-    <button class="btn btn-s" id="check-btn" style="font-size:13px;padding:11px" onclick="runCheck()">CHECK SETUP</button>
-  </div>
-
 </div><!-- end left -->
 
 <div><!-- RIGHT COLUMN -->
@@ -3263,7 +3264,7 @@ async function upgradeLoadAccount(){
   if(!name){if(status){status.style.color='var(--red)';status.textContent='Enter an account name first.';}return;}
   if(status){status.style.color='var(--accent)';status.textContent=`Loading ${name} inventory...`;}
   try{
-    const resp=await fetch(`${base()}/live-lookup-bulk`,{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({usernames:[name]})});
+    const resp=await fetch(`${base()}/live-lookup-bulk`,{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({usernames:[name],include_rank:false})});
     if(!resp.ok){const e=await resp.json().catch(()=>{});throw new Error(e?.detail||`HTTP ${resp.status}`);}
     const bulk=await resp.json();
     const d=bulk.results?.[name]||Object.values(bulk.results||{})[0];
@@ -4078,7 +4079,7 @@ async function discordLookup(id){
   if(!username){if(statusEl){statusEl.style.color='var(--red)';statusEl.textContent='⚠ Enter name first';setTimeout(()=>statusEl.textContent='',3000);}return;}
   if(statusEl){statusEl.style.color='var(--accent)';statusEl.textContent='⟳ Loading...';}
   try{
-    const resp=await fetch(`${base()}/live-lookup?username=${encodeURIComponent(username)}`);
+    const resp=await fetch(`${base()}/live-lookup?username=${encodeURIComponent(username)}&include_rank=false`);
     if(!resp.ok){const e=await resp.json().catch(()=>{});throw new Error(e?.detail||`HTTP ${resp.status}`);}
     const data=await resp.json();
     const applied=applyDiscordAccountData(card,data);
@@ -4108,7 +4109,7 @@ async function refreshAllAccounts(){
   const entries=toRefresh.map(card=>({id:parseInt(card.dataset.id),name:card.querySelector('.iname').value.trim()}));
   entries.forEach(entry=>setAccountStatus(entry.id,'loading','updating'));
   try{
-    const resp=await fetch(`${base()}/live-lookup-bulk`,{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({usernames:entries.map(e=>e.name)})});
+    const resp=await fetch(`${base()}/live-lookup-bulk`,{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({usernames:entries.map(e=>e.name),include_rank:false})});
     if(!resp.ok){const e=await resp.json().catch(()=>{});throw new Error(e?.detail||`HTTP ${resp.status}`);}
     const data=await resp.json();
     let done=0,okCount=0,failCount=0,changedCount=0;
@@ -5822,6 +5823,7 @@ function _dynamicResultView(data,roomKey,tab='opt'){
 
 // Stored live data for the details panel
 let _aiDiscordData = null;
+let _aiRankLookupSeq = 0;
 
 function _detailChip(label,active=false){
   return `<span class="detail-chip${active?' active':''}">${_escHtml(label)}</span>`;
@@ -6965,7 +6967,7 @@ function updateAiProfileSummary({dmgHit=null,dps=null}={}){
   const level=document.getElementById('ai-level')?.value||_aiDiscordData?.level||'';
   set('ai-profile-level',level?`Lv ${Number(level).toLocaleString('en-US')}`:'-');
   const rank=_levelRankDetail(_aiDiscordData||{});
-  set('ai-profile-rank',rank||'rank after lookup',true);
+  set('ai-profile-rank',rank||(_aiDiscordData?.rank_loading?'rank loading...':'rank unavailable'),true);
   set('ai-profile-dmg',Number.isFinite(dmgHit)?fmtAI(dmgHit):'-');
   set('ai-profile-dps',Number.isFinite(dps)?`${fmtAI(dps)}/s`:'DPS after setup');
   tip('ai-profile-power-card','Power',powStr?powVal:NaN,powStr);
@@ -7219,13 +7221,39 @@ function aiLookupNameChanged(){
   }
 }
 
+async function _loadAiRank(username,lookupSeq){
+  try{
+    const resp=await fetch(`${base()}/live-rank?username=${encodeURIComponent(username)}`);
+    const rankData=await resp.json().catch(()=>({}));
+    if(!resp.ok)throw new Error(rankData?.detail||`HTTP ${resp.status}`);
+    if(lookupSeq!==_aiRankLookupSeq||!_aiDiscordData)return;
+    const currentName=String(_aiDiscordData.username||'').trim().toLowerCase();
+    const returnedName=String(rankData.username||username).trim().toLowerCase();
+    if(currentName&&returnedName&&currentName!==returnedName)return;
+    [
+      'player_id','level_rank','level_rank_page','level_rank_page_position',
+      'level_rank_total_players','level_rank_top_percent','level_rank_percentile_min_level'
+    ].forEach(key=>{
+      if(rankData[key]!==undefined&&rankData[key]!==null)_aiDiscordData[key]=rankData[key];
+    });
+    _aiDiscordData.rank_loading=false;
+    _renderSavedPlayers();
+    aiCalc();
+  }catch(e){
+    if(lookupSeq!==_aiRankLookupSeq||!_aiDiscordData)return;
+    _aiDiscordData.rank_loading=false;
+    aiCalc();
+  }
+}
+
 async function aiLive(options={}){
   const name=document.getElementById('ai-name').value.trim();if(!name)return;
   const st=document.getElementById('ai-status');
   const expectedPlayerId=String(options?.expectedPlayerId||'').trim();
+  const lookupSeq=++_aiRankLookupSeq;
   st.style.color='var(--accent)';st.textContent='⟳ Loading...';
   try{
-    const resp=await fetch(`${base()}/live-lookup-bulk`,{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({usernames:[name]})});
+    const resp=await fetch(`${base()}/live-lookup-bulk`,{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({usernames:[name],include_rank:!!expectedPlayerId})});
     if(!resp.ok){const e=await resp.json().catch(()=>{});throw new Error(e?.detail||`HTTP ${resp.status}`);}
     const bulk=await resp.json();
     const d=bulk.results[name];
@@ -7264,7 +7292,7 @@ async function aiLive(options={}){
       if(d[key]!==undefined)document.getElementById(id).value=d[key];
     });
     // Store full live data for details panel (hp, gold, kills, etc.)
-    _aiDiscordData={username:loadedName||name,player_id:d.player_id,level_rank_page:d.level_rank_page,level_rank_page_position:d.level_rank_page_position,gold:d.gold,gold_raw:d.gold_raw,hp:d.hp,hp_raw:d.hp_raw,level_rank:d.level_rank,level_rank_total_players:d.level_rank_total_players,level_rank_top_percent:d.level_rank_top_percent,level_rank_percentile_min_level:d.level_rank_percentile_min_level,pvp_kills:d.pvp_kills,pvp_loot:d.pvp_loot,register_date:d.register_date,level:d.level,experience:d.experience,experience_raw:d.experience_raw,total_experience:d.total_experience,total_power:d.total_power,enemies:d.killed_enemies||{},inventory:d.inventory||null,appearance:d.appearance||null};
+    _aiDiscordData={username:loadedName||name,player_id:d.player_id,level_rank_page:d.level_rank_page,level_rank_page_position:d.level_rank_page_position,gold:d.gold,gold_raw:d.gold_raw,hp:d.hp,hp_raw:d.hp_raw,level_rank:d.level_rank,level_rank_total_players:d.level_rank_total_players,level_rank_top_percent:d.level_rank_top_percent,level_rank_percentile_min_level:d.level_rank_percentile_min_level,pvp_kills:d.pvp_kills,pvp_loot:d.pvp_loot,register_date:d.register_date,level:d.level,experience:d.experience,experience_raw:d.experience_raw,total_experience:d.total_experience,total_power:d.total_power,enemies:d.killed_enemies||{},inventory:d.inventory||null,appearance:d.appearance||null,rank_loading:!expectedPlayerId};
     _renderSavedPlayers();
     if(expectedPlayerId&&_upsertSavedPlayerFromLive(_aiDiscordData,expectedPlayerId)){
       _savedPlayerStatus(`Verified saved player ${_aiDiscordData.username||name}.`,'var(--green)');
@@ -7274,6 +7302,7 @@ async function aiLive(options={}){
     st.style.color='var(--green)';
     st.textContent=d.lookup_alias&&loadedName!==name?`✓ Loaded as ${loadedName}`:'✓ Loaded';
     setTimeout(()=>st.textContent='',4000);
+    if(!expectedPlayerId)_loadAiRank(loadedName||name,lookupSeq);
   }catch(e){st.style.color='var(--red)';st.textContent=`✗ ${e.message}`;setTimeout(()=>st.textContent='',6000);}
 }
 

tests/test_market_optimizer_logic.py

@@ -1948,6 +1948,15 @@ class MarketOptimizerLogicTests(unittest.TestCase):
         self.assertIn("panel.classList.remove('panel-collapsed')", block)
         self.assertIn("localStorage.setItem('panel_panel-accounts','0')", block)
 
+    def test_optimizer_actions_are_visible_before_the_account_list(self):
+        html = (Path(__file__).resolve().parents[1] / "static" / "index.html").read_text(encoding="utf-8")
+        self.assertLess(
+            html.index('<div class="opt-action-bar">'),
+            html.index('id="panel-accounts"'),
+        )
+        self.assertIn(".opt-action-bar{position:sticky;top:8px", html)
+        self.assertEqual(html.count('id="run-btn"'), 1)
+
     def test_live_power_ui_keeps_raw_value_for_calculations_until_manual_edit(self):
         html = (Path(__file__).resolve().parents[1] / "static" / "index.html").read_text(encoding="utf-8")
         self.assertIn('class="ipowraw"', html)
@@ -2761,7 +2770,7 @@ class MarketOptimizerLogicTests(unittest.TestCase):
         original_lookup = self.app._sm_live_lookup_bulk
         usernames = [f"Player{i}" for i in range(10)]
         try:
-            self.app._sm_live_lookup_bulk = lambda names: {
+            self.app._sm_live_lookup_bulk = lambda names, **kwargs: {
                 username: {"username": username, "ok": True, "power": str(index)}
                 for index, username in enumerate(names)
             }
@@ -2775,6 +2784,24 @@ class MarketOptimizerLogicTests(unittest.TestCase):
             self.assertTrue(result["results"][username]["ok"])
             self.assertEqual(result["results"][username]["power"], str(index))
 
+    def test_live_bulk_can_skip_slow_rank_enrichment(self):
+        original_lookup = self.app._sm_live_lookup_bulk
+        captured = {}
+        try:
+            def fake_lookup(names, **kwargs):
+                captured.update(kwargs)
+                return {name: {"username": name, "ok": True} for name in names}
+
+            self.app._sm_live_lookup_bulk = fake_lookup
+            result = self.app.discord_lookup_bulk(
+                self.app.BulkLookupRequest(usernames=["Player"], include_rank=False)
+            )
+        finally:
+            self.app._sm_live_lookup_bulk = original_lookup
+
+        self.assertTrue(result["results"]["Player"]["ok"])
+        self.assertFalse(captured["include_ranks"])
+
     def test_live_bulk_accepts_50_accounts_and_rejects_51(self):
         original_fetch = self.app._sm_fetch_live_inventories
         original_cache = self.app._SM_LOOKUP_CACHE
@@ -2806,7 +2833,7 @@ class MarketOptimizerLogicTests(unittest.TestCase):
     def test_live_single_lookup_surfaces_short_public_error(self):
         original_lookup = self.app._sm_live_lookup_bulk
         try:
-            self.app._sm_live_lookup_bulk = lambda names: {
+            self.app._sm_live_lookup_bulk = lambda names, **kwargs: {
                 names[0]: {"username": names[0], "ok": False, "error": "Live stats unavailable."}
             }
             with self.assertRaises(self.app.HTTPException) as ctx: