Update app.py

app.py

@@ -79,30 +79,22 @@ ACTIVE_LOCK = threading.Lock()
 
 # ================ db_signals reader helper ================
 # If you already have an official reader, replace this function with it.
-def read_user_json_file(authenticity_token: str, commit_oid: str) -> Dict[str, Any]:
+def read_user_json_file(authenticity_token: str, commit_oid: str):
     """
-    Reads the current JSON from the GitHub file the same way update_user_json_file writes it.
-    Your db_signals module can implement this properly. Here we show a pattern:
-    - It likely needs the file URL or the API route you already use in update_user_json_file.
+    Returns parsed JSON: list or dict, or [] if empty/unparseable.
     """
-    # You should implement inside db_signals a function that fetches the raw file content.
-    # For demonstration, we assume you can call a function db_signals.get_user_json_file()
-    # that returns {"success": True, "content": "..."} (JSON string).
-    # If you don't have it, implement it there and call it here.
-    from db_signals import get_user_json_file  # implement this helper in your module
+    from db_signals import get_user_json_file
     res = get_user_json_file(authenticity_token, commit_oid)
     if not res.get("success"):
         raise RuntimeError(f"Failed to read user json file: {res}")
     content = res.get("content", "")
+    if not content:
+        return []
     try:
-        return json.loads(content) if content else {}
+        return json.loads(content)
     except Exception:
-        # If file is a list [] or other structure, return parsed content or an empty dict
-        try:
-            parsed = json.loads(content)
-            return parsed
-        except Exception:
-            return {}
+        logger.warning("[GITHUB] JSON parse failed; treating as empty []")
+        return []
 
 # ================ Utilities ================
 def safe_float_join(whole, decimal):
@@ -263,19 +255,21 @@ def call_analysis_now(text: str):
 # ================ GitHub signal writers/readers ================
 def write_active_scenario_to_github(pair: str, side: str, entry: str, sl: str, tp: str, dt_utc: datetime.datetime, preserve_timestamps: Optional[Dict[str, Any]] = None) -> Dict[str, Any]:
     """
-    Writes a single-element array as the active trade. If preserve_timestamps provided, use it;
-    otherwise compute fresh timestamps from dt_utc.
+    Always writes signals.json as a single-element array [ { active_trade } ].
+    If preserve_timestamps provided, keep it; else compute fresh timestamps.
     """
     timestamps = preserve_timestamps if preserve_timestamps else format_zone_times(dt_utc)
-    payload_obj = [{
+    active_obj = {
         "pair": pair,
         "type": side,
         "entry": str(entry),
         "stop_loss": str(sl),
         "take_profit": str(tp),
         "timestamps": timestamps
-    }]
-    new_content = json.dumps(payload_obj, ensure_ascii=False)
+    }
+    payload_array = [active_obj]
+    new_content = json.dumps(payload_array, ensure_ascii=False)
+
     try:
         authenticity_token, commit_oid = fetch_authenticity_token_and_commit_oid()
         if not authenticity_token or not commit_oid:
@@ -284,7 +278,7 @@ def write_active_scenario_to_github(pair: str, side: str, entry: str, sl: str, t
             return {"success": False, "message": msg}
         result = update_user_json_file(authenticity_token, commit_oid, new_content)
         if result.get("success"):
-            logger.info("[GITHUB] signals updated with active scenario.")
+            logger.info("[GITHUB] signals updated with active scenario (array).")
             return {"success": True}
         else:
             logger.error(f"[GITHUB] Update failed: {result}")
@@ -312,30 +306,45 @@ def clear_github_signals_to_empty_list() -> Dict[str, Any]:
 
 def read_current_scenario_from_github() -> Optional[Dict[str, Any]]:
     """
-    Reads the pre-activation scenario JSON structure:
-    {
-      "scenario": {
-        "Buy":  {"at": "...", "SL": "...", "TP": "..."},
-        "Sell": {"at": "...", "SL": "...", "TP": "..."},
-        "timestamps": {...}
+    Reads the pre-activation scenario JSON when signals.json is an array, e.g.:
+    [
+      {
+        "scenario": {
+          "Buy":  {"at": "...", "SL": "...", "TP": "..."},
+          "Sell": {"at": "...", "SL": "...", "TP": "..."},
+          "timestamps": {...}
+        }
       }
-    }
+    ]
+    Returns {"scenario": {...}} or None if not found.
     """
     try:
         authenticity_token, commit_oid = fetch_authenticity_token_and_commit_oid()
         if not authenticity_token or not commit_oid:
             logger.error("[GITHUB] Missing auth tokens to read scenario")
             return None
+
         content = read_user_json_file(authenticity_token, commit_oid)
-        # content might be dict (scenario object) or list (active array) or empty
+
+        # Handle [] formats
+        if isinstance(content, list):
+            if not content:
+                return None
+            first = content[0]
+            if isinstance(first, dict) and "scenario" in first:
+                return first  # {"scenario": {...}}
+            else:
+                return None
+
+        # Fallback for older dict format
         if isinstance(content, dict) and "scenario" in content:
             return content
-        else:
-            # Not in pre-activation mode
-            return None
+
+        return None
     except Exception as e:
         logger.warning(f"[SCENARIO] fetch failed: {e}")
         return None
+        
 
 # ================ Activation helpers ================
 class CancelToken: