Add Start/End Day toggle, Manual/Automatic mode with schedule-based auto-trading

- Merge Start of Day / End of Day into single toggle button (green→Start, orange→End)
- Add Manual/Automatic toggle button; Automatic mode disables manual day control
- Add shared_data/market_schedule.txt (Start 10:00, End 17:00)
- Backend: schedule_runner thread auto-starts at 10:00, auto-ends at 17:00
- Backend: POST /session/mode endpoint; broadcasts mode via SSE
- Fix scheduler logic: end check takes priority, nothing fires before 10:00

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

dashboard/dashboard.py

@@ -2,7 +2,7 @@ import sys
 sys.path.insert(0, "/app")
 
 from flask import Flask, render_template, jsonify, Response, request
-import threading, json, os, time, requests, sqlite3
+import threading, json, os, time, requests, sqlite3, datetime
 from queue import Queue, Empty
 
 from shared.config import Config
@@ -20,7 +20,9 @@ sse_clients = []
 sse_clients_lock = threading.Lock()
 
 # Session state
-session_state = {"active": False, "start_time": None, "suspended": False}
+session_state = {"active": False, "start_time": None, "suspended": False, "mode": "manual"}
+
+SCHEDULE_FILE = os.getenv("SCHEDULE_FILE", "/app/shared_data/market_schedule.txt")
 
 # ── OHLCV History ──────────────────────────────────────────────────────────────
 HISTORY_DB = os.getenv("HISTORY_DB", "/app/data/dashboard_history.db")
@@ -287,27 +289,94 @@ def amend_order():
         return jsonify({"status": "error", "error": str(e)}), 500
 
 
+# ── Market schedule ─────────────────────────────────────────────────────────────
+
+def load_market_schedule():
+    schedule = {}
+    try:
+        with open(SCHEDULE_FILE) as f:
+            for line in f:
+                line = line.strip()
+                if not line or line.startswith("#"):
+                    continue
+                parts = line.split()
+                if len(parts) == 2:
+                    schedule[parts[0].lower()] = parts[1]
+    except Exception:
+        pass
+    return schedule
+
+
+def _do_session_start():
+    securities = load_securities_file()
+    if securities:
+        for sym in securities:
+            securities[sym]["current"] = securities[sym]["start"]
+        save_securities_file(securities)
+    p = get_producer()
+    p.send(Config.CONTROL_TOPIC, {"action": "start"})
+    p.flush()
+    session_state["active"] = True
+    session_state["suspended"] = False
+    session_state["start_time"] = time.time()
+    broadcast_event("session", {"status": "started", "time": session_state["start_time"]})
+
+
+def _do_session_end():
+    securities = load_securities_file()
+    for sym in list(securities.keys()):
+        try:
+            r = requests.get(f"{Config.MATCHER_URL}/orderbook/{sym}", timeout=2)
+            book = r.json()
+            bids = book.get("bids", [])
+            asks = book.get("asks", [])
+            if bids and asks:
+                best_bid = max(b["price"] for b in bids)
+                best_ask = min(a["price"] for a in asks)
+                securities[sym]["current"] = round((best_bid + best_ask) / 2, 2)
+        except Exception:
+            pass
+    if securities:
+        save_securities_file(securities)
+    p = get_producer()
+    p.send(Config.CONTROL_TOPIC, {"action": "stop"})
+    p.flush()
+    session_state["active"] = False
+    session_state["suspended"] = False
+    broadcast_event("session", {"status": "ended", "time": time.time()})
+
+
+def schedule_runner():
+    """Background thread: auto start/end session based on market_schedule.txt."""
+    while True:
+        try:
+            if session_state.get("mode") == "automatic":
+                sched = load_market_schedule()
+                start_str = sched.get("start")
+                end_str = sched.get("end")
+                if start_str and end_str:
+                    now = datetime.datetime.now()
+                    sh, sm = int(start_str.split(":")[0]), int(start_str.split(":")[1])
+                    eh, em = int(end_str.split(":")[0]), int(end_str.split(":")[1])
+                    start_t = now.replace(hour=sh, minute=sm, second=0, microsecond=0)
+                    end_t   = now.replace(hour=eh, minute=em, second=0, microsecond=0)
+                    if now >= end_t and session_state["active"]:
+                        print("[Scheduler] Auto end of day")
+                        _do_session_end()
+                    elif now >= start_t and not session_state["active"]:
+                        print("[Scheduler] Auto start of day")
+                        _do_session_start()
+        except Exception as e:
+            print(f"[Scheduler] Error: {e}")
+        time.sleep(30)
+
+
 # ── Session endpoints ──────────────────────────────────────────────────────────
 
 @app.route("/session/start", methods=["POST"])
 def session_start():
     try:
-        # Reset current prices to start prices
-        securities = load_securities_file()
-        if securities:
-            for sym in securities:
-                securities[sym]["current"] = securities[sym]["start"]
-            save_securities_file(securities)
-
-        # Signal md_feeder to start
-        p = get_producer()
-        p.send(Config.CONTROL_TOPIC, {"action": "start"})
-        p.flush()
-
-        session_state["active"] = True
-        session_state["suspended"] = False
-        session_state["start_time"] = time.time()
-        broadcast_event("session", {"status": "started", "time": session_state["start_time"]})
+        _do_session_start()
         return jsonify({"status": "ok", "message": "Day started"})
     except Exception as e:
         return jsonify({"status": "error", "error": str(e)}), 500
@@ -316,31 +385,7 @@ def session_start():
 @app.route("/session/end", methods=["POST"])
 def session_end():
     try:
-        securities = load_securities_file()
-        # Update current prices from BBO mid where available
-        for sym in list(securities.keys()):
-            try:
-                r = requests.get(f"{Config.MATCHER_URL}/orderbook/{sym}", timeout=2)
-                book = r.json()
-                bids = book.get("bids", [])
-                asks = book.get("asks", [])
-                if bids and asks:
-                    best_bid = max(b["price"] for b in bids)
-                    best_ask = min(a["price"] for a in asks)
-                    securities[sym]["current"] = round((best_bid + best_ask) / 2, 2)
-            except Exception:
-                pass
-        if securities:
-            save_securities_file(securities)
-
-        # Signal md_feeder to stop
-        p = get_producer()
-        p.send(Config.CONTROL_TOPIC, {"action": "stop"})
-        p.flush()
-
-        session_state["active"] = False
-        session_state["suspended"] = False
-        broadcast_event("session", {"status": "ended", "time": time.time()})
+        _do_session_end()
         return jsonify({"status": "ok", "message": "Day ended, closing prices saved"})
     except Exception as e:
         return jsonify({"status": "error", "error": str(e)}), 500
@@ -376,6 +421,18 @@ def session_resume():
         return jsonify({"status": "error", "error": str(e)}), 500
 
 
+@app.route("/session/mode", methods=["POST"])
+def session_mode():
+    try:
+        current = session_state.get("mode", "manual")
+        new_mode = "automatic" if current == "manual" else "manual"
+        session_state["mode"] = new_mode
+        broadcast_event("mode", {"mode": new_mode})
+        return jsonify({"status": "ok", "mode": new_mode})
+    except Exception as e:
+        return jsonify({"status": "error", "error": str(e)}), 500
+
+
 @app.route("/session/status")
 def session_status():
     return jsonify(session_state)
@@ -443,6 +500,7 @@ def stream():
             else:
                 _sess_status = "started"
             yield f"event: session\ndata: {json.dumps({'status': _sess_status})}\n\n"
+            yield f"event: mode\ndata: {json.dumps({'mode': session_state.get('mode', 'manual')})}\n\n"
             while True:
                 try:
                     message = q.get(timeout=30)
@@ -465,6 +523,9 @@ def stream():
     )
 
 
+_scheduler = threading.Thread(target=schedule_runner, daemon=True)
+_scheduler.start()
+
 if __name__ == "__main__":
     port = int(os.getenv("PORT", "5000"))
     app.run(host="0.0.0.0", port=port, debug=True, use_reloader=False)

dashboard/templates/index.html

@@ -140,12 +140,16 @@
     }
     .btn-start { background: #28a745; color: #fff; }
     .btn-start:hover { background: #218838; }
+    .btn-end { background: #ff9800; color: #fff; }
+    .btn-end:hover { background: #e68900; }
     .btn-suspend { background: #607d8b; color: #fff; }
     .btn-suspend:hover { background: #455a64; }
     .btn-resume { background: #4caf50; color: #fff; }
     .btn-resume:hover { background: #388e3c; }
-    .btn-end { background: #ff9800; color: #fff; }
-    .btn-end:hover { background: #e68900; }
+    .btn-manual { background: #607d8b; color: #fff; }
+    .btn-manual:hover { background: #455a64; }
+    .btn-automatic { background: #1565c0; color: #fff; }
+    .btn-automatic:hover { background: #0d47a1; }
     .btn-day:disabled { background: #ccc !important; color: #999; cursor: not-allowed; }
     .status.active { background: #d4edda; color: #155724; }
     .status.active .dot { background: #28a745; }
@@ -197,9 +201,9 @@
     Trading Dashboard
     <span id="status" class="status connecting"><span class="dot"></span><span id="status-text">Connecting...</span></span>
     <span id="session-badge" class="status idle"><span class="dot"></span><span id="session-text">IDLE</span></span>
-    <button onclick="startDay()" class="btn-day btn-start">Start of Day</button>
+    <button id="day-btn" onclick="toggleDay()" class="btn-day btn-start">Start of Day</button>
     <button id="suspend-btn" onclick="toggleSuspend()" class="btn-day btn-suspend" disabled>Suspend</button>
-    <button onclick="endDay()" class="btn-day btn-end">End of Day</button>
+    <button id="mode-btn" onclick="toggleMode()" class="btn-day btn-manual">Manual</button>
     <a href="/fix/" style="margin-left:auto; padding:4px 14px; background:#6c757d; color:#fff; border-radius:20px; font-size:12px; font-weight:bold; text-decoration:none;">FIX UI</a>
   </h1>
   <div class="container">
@@ -1012,6 +1016,11 @@
         updateSessionBadge(active, suspended);
       });
 
+      eventSource.addEventListener("mode", (e) => {
+        const data = JSON.parse(e.data);
+        updateModeBtn(data.mode);
+      });
+
       eventSource.onerror = () => {
         setStatus("disconnected", "Disconnected");
         state.connected = false;
@@ -1041,31 +1050,80 @@
 
     // ── Session control ────────────────────────────────────────────────────────
 
+    let _sessionActive = false;
     let _sessionSuspended = false;
+    let _sessionMode = "manual";
 
     function updateSessionBadge(active, suspended) {
-      const badge = document.getElementById("session-badge");
-      const text  = document.getElementById("session-text");
-      const btn   = document.getElementById("suspend-btn");
+      const badge  = document.getElementById("session-badge");
+      const text   = document.getElementById("session-text");
+      const btn    = document.getElementById("suspend-btn");
+      const dayBtn = document.getElementById("day-btn");
+      _sessionActive = !!active;
       _sessionSuspended = !!suspended;
+      const isAuto = _sessionMode === "automatic";
       if (!active) {
         badge.className = "status idle";
         text.textContent = "IDLE";
         btn.disabled = true;
         btn.textContent = "Suspend";
         btn.className = "btn-day btn-suspend";
+        dayBtn.textContent = "Start of Day";
+        dayBtn.className = "btn-day btn-start";
+        dayBtn.disabled = isAuto;
       } else if (suspended) {
         badge.className = "status suspended";
         text.textContent = "PAUSED";
         btn.disabled = false;
         btn.textContent = "Resume";
         btn.className = "btn-day btn-resume";
+        dayBtn.textContent = "End of Day";
+        dayBtn.className = "btn-day btn-end";
+        dayBtn.disabled = isAuto;
       } else {
         badge.className = "status active";
         text.textContent = "ACTIVE";
         btn.disabled = false;
         btn.textContent = "Suspend";
         btn.className = "btn-day btn-suspend";
+        dayBtn.textContent = "End of Day";
+        dayBtn.className = "btn-day btn-end";
+        dayBtn.disabled = isAuto;
+      }
+    }
+
+    function updateModeBtn(mode) {
+      const modeBtn = document.getElementById("mode-btn");
+      _sessionMode = mode;
+      if (mode === "automatic") {
+        modeBtn.textContent = "Automatic";
+        modeBtn.className = "btn-day btn-automatic";
+      } else {
+        modeBtn.textContent = "Manual";
+        modeBtn.className = "btn-day btn-manual";
+      }
+      updateSessionBadge(_sessionActive, _sessionSuspended);
+    }
+
+    async function toggleDay() {
+      if (_sessionActive) {
+        if (!confirm("End of Day: stop simulation and save closing prices?")) return;
+        try {
+          const r = await fetch("/session/end", { method: "POST" });
+          const result = await r.json();
+          if (result.status !== "ok") alert("Error: " + (result.error || "Unknown error"));
+        } catch (e) {
+          alert("Error: " + e.message);
+        }
+      } else {
+        if (!confirm("Start of Day: reset all security prices to their opening values and begin simulation?")) return;
+        try {
+          const r = await fetch("/session/start", { method: "POST" });
+          const result = await r.json();
+          if (result.status !== "ok") alert("Error: " + (result.error || "Unknown error"));
+        } catch (e) {
+          alert("Error: " + e.message);
+        }
       }
     }
 
@@ -1080,32 +1138,11 @@
       }
     }
 
-    async function startDay() {
-      if (!confirm("Start of Day: reset all security prices to their opening values and begin simulation?")) return;
+    async function toggleMode() {
       try {
-        const r = await fetch("/session/start", { method: "POST" });
+        const r = await fetch("/session/mode", { method: "POST" });
         const result = await r.json();
-        if (result.status === "ok") {
-          updateSessionBadge(true, false);
-        } else {
-          alert("Error: " + (result.error || "Unknown error"));
-        }
-      } catch (e) {
-        alert("Error: " + e.message);
-      }
-    }
-
-    async function endDay() {
-      if (!confirm("End of Day: stop simulation and save closing prices?")) return;
-      try {
-        const r = await fetch("/session/end", { method: "POST" });
-        const result = await r.json();
-        if (result.status === "ok") {
-          updateSessionBadge(false, false);
-          alert("Day ended. Closing prices saved.");
-        } else {
-          alert("Error: " + (result.error || "Unknown error"));
-        }
+        if (result.status !== "ok") alert("Error: " + (result.error || "Unknown error"));
       } catch (e) {
         alert("Error: " + e.message);
       }

shared_data/market_schedule.txt

@@ -0,0 +1,2 @@
+Start 10:00
+End 17:00

shared_data/securities.txt

@@ -1,11 +1,6 @@
 #SYMBOL	<start_price>	<current_price>
-ALPHA	24.95	25.55
+ALPHA	24.95	25.65
 PEIR	18.05	18.35
-EXAE	42.05	41.85
-QUEST	12.60	13.00
-NBG	18.05	18.10
-ATTIKA	3.95	3.95
-INTKA	3.95	3.95
-LAMDA	3.95	3.95
-AEG	3.95	3.95
-AAAK	3.95	3.95
+EXAE	42.05	41.90
+QUEST	12.60	13.35
+NBG	18.05	18.00