Update app.py

app.py

@@ -214,12 +214,17 @@ def count_xml_tags(ai_response):
     return counts
 
 def save_latest_final_analysis(final_text):
+    """
+    Save ONLY the latest final analysis to db_analysis as an array: [ { ... } ]
+    """
     try:
         record = {
             "timestamp_utc": datetime.now(timezone.utc).isoformat(),
             "response": final_text
         }
-        payload_text = json.dumps(record, ensure_ascii=False)
+        # Wrap as array for saving
+        payload_list = [record]
+        payload_text = json.dumps(payload_list, ensure_ascii=False)
         auth_token, commit_oid = db_analysis.fetch_authenticity_token_and_commit_oid()
         if auth_token and commit_oid:
             result = db_analysis.update_user_json_file(auth_token, commit_oid, payload_text)
@@ -248,10 +253,41 @@ def get_chart_screenshot(symbol="XAUUSD", exchange="OANDA", interval="15m", indi
     resp.raise_for_status()
     return resp.json()
 
+def load_system_prompt_from_files(has_active_signal: bool, has_scenario: bool):
+    """
+    Returns system prompt string based on current state:
+    - If has_active_signal: use prompt_signal.txt
+    - Else (no active signal): use prompt_scenario.txt
+    If files are missing, fall back to a minimal default in Arabic.
+    """
+    prompt_file = "prompt_signal.txt" if has_active_signal else "prompt_scenario.txt"
+    try:
+        with open(prompt_file, "r", encoding="utf-8") as f:
+            text = f.read().strip()
+            if text:
+                return text
+    except Exception as e:
+        logger.warning(f"Failed to load system prompt from {prompt_file}: {e}")
+
+    # Fallbacks
+    if has_active_signal:
+        return "وضع متابعة الصفقة: لا تنشئ سيناريو جديد. حلّل الصفقة الحالية فقط ويمكنك استخدام <Edit> و<send_group> و<Alert>."
+    else:
+        return "وضع بناء السيناريو: حلّل وأنشئ سيناريو داخل <final> يتضمن <scenario> مع Buy/Sell و(@/SL/TP)."
+    
+
 def fetch_signals_raw():
-    # Returns dict with shape:
-    # { "has_active_signal": bool, "active_signal": [... or None],
-    #   "has_scenario": bool, "scenario": {... or None}, "raw": original }
+    """
+    Returns:
+      {
+        "has_active_signal": bool,
+        "active_signal": list or None,     # when active, it's a list with 1 object (normalized)
+        "has_scenario": bool,
+        "scenario": dict or None,
+        "raw": original
+      }
+    Accepts both legacy object and new array shapes, but normalizes in-memory to arrays when needed.
+    """
     out = {
         "has_active_signal": False,
         "active_signal": None,
@@ -264,28 +300,32 @@ def fetch_signals_raw():
         if res["success"] and res["data"]:
             raw = res["data"][0]
             out["raw"] = raw
-            # Determine if active signal (list with an object containing pair/type)
+
+            # If array and first element has pair/type => active signal
             if isinstance(raw, list) and raw and isinstance(raw[0], dict) and "pair" in raw[0] and "type" in raw[0]:
                 out["has_active_signal"] = True
                 out["active_signal"] = raw
-            # Determine if scenario (object with key "scenario")
+
+            # If object with "scenario" => scenario mode
             elif isinstance(raw, dict) and "scenario" in raw:
                 out["has_scenario"] = True
                 out["scenario"] = raw["scenario"]
+
+            # Legacy: single signal object (not array) => treat as active signal
+            elif isinstance(raw, dict) and "pair" in raw and "type" in raw:
+                out["has_active_signal"] = True
+                out["active_signal"] = [raw]
     except Exception as e:
         logger.error(f"Error fetching signals/scenario: {e}")
     return out
 
 def save_scenario_object(scenario_obj):
-    # scenario_obj expected shape:
-    # {
-    #   "Buy": {"at": "...", "SL": "...", "TP": "..."},
-    #   "Sell": {"at": "...", "SL": "...", "TP": "..."},
-    #   "timestamps": {...}
-    # }
+    """
+    Save scenario to db_signals as an array: [ { "scenario": {...} } ]
+    """
     try:
-        payload = {"scenario": scenario_obj}
-        payload_text = json.dumps(payload, ensure_ascii=False)
+        payload_list = [{"scenario": scenario_obj}]
+        payload_text = json.dumps(payload_list, ensure_ascii=False)
         auth_token, commit_oid = db_signals.fetch_authenticity_token_and_commit_oid()
         if auth_token and commit_oid:
             result = db_signals.update_user_json_file(auth_token, commit_oid, payload_text)
@@ -308,252 +348,126 @@ def post_scenario_to_tracker(buy_at, sell_at):
 def build_initial_chat_history(alert_message=None):
     chat_history = []
 
-    # System content with new scenario-first instructions
+    # Determine current state (active signal vs scenario/no state)
+    try:
+        state = fetch_signals_raw()
+    except Exception as e:
+        logger.error(f"Error determining state for system prompt: {e}")
+        state = {"has_active_signal": False, "has_scenario": False}
+
+    has_active = state.get("has_active_signal", False)
+    has_scen = state.get("has_scenario", False)
+
+    # Load system prompt from files based on state
+    try:
+        system_base_prompt = load_system_prompt_from_files(has_active, has_scen)
+    except Exception as e:
+        logger.error(f"Error loading system prompt: {e}")
+        system_base_prompt = "ابدأ التحليل وفق حالتك (صفقة نشطة أو سيناريو)."
+
+    # Fetch news summary from db_system and name it 'news'
+    news = ""
     try:
         system_data = db_system.fetch_json_from_github()
-        system_content = ""
         if system_data["success"] and system_data["data"]:
-            system_content = system_data["data"][0]["response"]
-
-        standard_instruction = (
-            "أنت تعمل بتحليل متعدد المراحل بالصور ثم تُنهي بـ <final>.\n"
-            "لطلب صورة استخدم:\n"
-            "<img><XAUUSD><QQE>//يمكن إضافة مؤشرات مثل <Zerp_Lag>...</QQE><15m></img>\n"
-            "لا تُنشئ <signal> بعد الآن. بدلاً من ذلك، عندما تُنهي التحليل أرسل:\n"
-            "<final>\n"
-            "<Analysis>ملخص</Analysis>\n"
-            "<wait>سبب</wait>\n"
-            "<scenario>\n"
-            "<Buy><@>شرط الدخول/المستوى</@><SL>...</SL><TP>...</TP></Buy>\n"
-            "<Sell><@>شرط الدخول/المستوى</@><SL>...</SL><TP>...</TP></Sell>\n"
-            "</scenario>\n"
-            "<Edit>للتحديث (SL/TP) إذا وُجدت صفقة مفتوحة</Edit>\n"
-            "<send_group>رسالة قصيرة</send_group>\n"
-            "<Alert>إن رغبت بمنبه الأسعار بصيغته الجديدة</Alert>\n"
-            "</final>\n"
-            "إن كان هناك صفقة مفتوحة بالفعل فلا تُنشئ سيناريو جديد؛ فقط حلّل وتتبع الصفقة وقدّم خطة.\n"
-            "بعد كل صورة سيتم تزويدك بسعر السوق الحالي ليساعدك على فهم الحركة أثناء المحادثة."
-        )
+            news = system_data["data"][0].get("response", "") or ""
+    except Exception as e:
+        logger.error(f"Error fetching news from db_system: {e}")
+        news = ""
 
+    # Build system turn (system prompt + time zones + news)
+    try:
         times = get_time_zones()
         time_info = "\n".join([f"{city}: {time}" for city, time in times.items()])
-
+        parts = [system_base_prompt, f"[Time Zones]\n{time_info}"]
+        if news.strip():
+            parts.append(f"[News]\n{news.strip()}")
+        system_full = "\n\n".join(parts)
         chat_history.append({
             "role": "system",
-            "content": f'''
-
-time :
-{time_info}
-You are AI trading system working in tele group for trade on XAUUSD
-
-GOAL :
-
-Your goal is get is day about 500 pip which is 50$ in GOLD system
-not 500 pip in one trade but in alot of trades with 
-
-TP about 50 - 70 - 100 pip 
-SL about 10 - 30 - 50 pip
-
-NOTE : in gold every 10 pip 1 $
-
-you can manage it based on your mind
-
-you can not start trade directly NO , your task is analysis and create scenario BUY / SELL each other we need
-
-now i will start conversation with you in this conversation you will request images for the chart with Indicators , timeframes You need .
-
-you can request 1 image chart in message with 1 timeframe and MAX 3 indicators (for make the chart more clear)
-
-Also you can make the chat like you want , request images and i will fast pring it to you .
-
-How you gonna request the image you want ?
-
-it is easy just use this :
-<img><XAUUSD><id_for_IND><id_for_IND><id_for_IND>// you can use maxumum 3 indecators in same image<timeframe></img>
-Here All Timeframe :
-
-"1m"
-"3m"
-"5m"
-"15m"
-"30m"
-"1h"
-"2h"
-"4h"
-"1D"
-"1W"
-"1M"
-
-Here All indicators id :
-
-1 . ADX - <ADX>
-2 . VWAP - <VWAP>
-3 . Fibonacci - <FIBO>
-4 . RSI with Divergence - <RSI>
-5 . EMA 20/50/100/200 - <EMA>
-6 . Breakout channle - <BRCH>
-maybe num 6 you don't know it here :
-This tool draws areas called "Smart Money Breakout Channels" based on the analysis of adjusted price volatility. These channels are identified when price volatility reaches a local low and then rises, indicating the potential presence of smart money activity in that area. A channel is drawn between the highest and lowest prices during that period and continues until the price breaks through the defined boundaries, either by closing a strong candle or by touching the boundaries.
-
-Okay what if you think that is enough images then you will response with <final></final> Action 
-
-what is <final> Action ?
-you will use the final xml response when you get enough images from the chart and then you will response with final and into it the settings
-<final>
-<Analysis>here put your summrasion of the chat analysis</Analysis>
-<wait>this is just using when you are Acually added a scenario and you don't want to change it, put here the reason about why you don't want to change the scenario</wait>
-Now the important one (optional):
-
-<scenario>
-<Buy><@>...</@><SL>...</SL><TP>...</TP></Buy> // make sure just put price number no text 
-<Sell><@>...</@><SL>...</SL><TP>...</TP></Sell> // make sure just put price number no text 
-</scenario>
-we need scalping plans
-
-TP about 50 - 70 - 100 pip 
-SL about 10 - 30 - 50 pip
-
-NOTE : if one of scenarios running mean there trade active don't create new scnario just response without it
-
-
-
-after analysis complete from the chat you will decide finally the scenario and we will save it until one of scenario HIT and then gonna tell you what heppen to start new chat with you for maybe we need to 
-
-📊 Dynamic Trade Editing Feature
-<Edit><stop_lose>...</stop_lose><take_profit>...</take_profit></Edit>
-
-Here Another tool optional using just if you acully need it 
-that will chage the SL TP for the active trade not the (SCENARIO)
-Also you just can change one them like :
-
-<Edit><take_profit>...</take_profit></Edit>
-that will make it just change for TP only (you can use it also for SL like you want)
-
-Okay to here everything clear but i don't want to manual create message for the tele group and send it , i want you to send message to them using :
-
-<send_group>what you put here gonna send to the tele group and it is not optional you need to use it every time you use final , to make the group in clear(need to be in arabic becasue all of members Arabic)</send_group>
-
-okay now the important question How many chats gonna chat with you or how and when you want me back to you to create new chat ?
-
-Good Q and i have the Good answer we gonna use Alert by time and price also saved messages in the price here we go :
-
-<Alert>
-<price>3...<message>here.......</message></price> //put more than 1 price as you want for next analysis , for messages put the saved messages in the prices for Auto send to user just if the price hit as + 50 pips ....etc of messages  (all in arabic)
-..... may more than one price 
-<duration_min>10(EXP)</duration_min> // that using for if the price still in same place and don't moving alot so the duration if end gonna back to you 
-</Alert>
-
-I think it’s very clear. Let me explain only the structure:
-
-<price>3...<message>here.......</message></price>
-
-
-price → the price level at which you want the next analysis to be triggered.
-
-message → the auto message that will be sent to the group when that price is hit.
-
-If the group already has an active trade, you should use the alert as your main tool to track what’s happening with the trade. You can set it at 10, 30, or 50 pips (or however you prefer), but keep it close enough so the group can clearly see how the trade is moving.
-
-This is your main engine that reactivates you after finishing your current analysis. You use it to create an alert for your next analysis, where you set the upper and lower target prices at which you want to analyze again. This applies regardless of whether you’re reviewing an existing trade or creating a new one — it will notify the group when your requested price is reached.
-
-You can also give it a time limit (in minutes) in case neither target is reached and the price keeps fluctuating in between.
-
-⚠️ Keep in mind: the price fields are extremely sensitive. You must enter the price as if you’re entering it in a numeric-only field.
-</final>
-
-NOTE : All XML need to be in the final to work
-
-Now for the how to request image you will find it in the chat with full IDs for indicators 
-GOOD LUCK
-
-i created a summary of news maybe you will find it helpful 
-
-{system_content}
-
-
-
-
-'''
+            "content": system_full
         })
     except Exception as e:
-        logger.error(f"Error fetching system data: {e}")
+        logger.error(f"Error building system turn: {e}")
         chat_history.append({
             "role": "system",
-            "content": "ابدأ التحليل بالصيغ الجديدة. استخدم <img> لطلب الصور ثم اختم بـ <final> وضمنه <scenario>."
+            "content": system_base_prompt
         })
 
     multipart_content = []
 
-    # Previous analysis (optional)
+    # Previous analysis (optional) - Read from db_analysis; supports array and legacy object
     try:
         analysis_data = db_analysis.fetch_json_from_github()
         prev_text = ""
         if analysis_data["success"] and analysis_data["data"]:
-            raw_text = analysis_data["data"][0]["response"]
+            raw_obj = analysis_data["data"][0]
+            if isinstance(raw_obj, list) and raw_obj:
+                raw_text = raw_obj[-1].get("response", "")
+            elif isinstance(raw_obj, dict):
+                raw_text = raw_obj.get("response", "")
+            else:
+                raw_text = ""
             prev_text = str(raw_text)[:1500]
         if prev_text:
-            multipart_content.append({"type": "text", "text": f"التحليلات السابقة (أقرب سجل محفوظ):\n{prev_text}"})
+            multipart_content.append({"type": "text", "text": f"LAST ANALYSIS HAPPEN :\n{prev_text}"})
     except Exception as e:
         logger.error(f"Error fetching previous analysis: {e}")
 
     # Alert + current context (active signal or scenario or none)
     try:
-        state = fetch_signals_raw()
         times = get_time_zones()
         time_info = "\n".join([f"{city}: {time}" for city, time in times.items()])
+        prices_text = format_live_prices_text(get_live_prices_for_pairs())
 
         message_content = ""
         if alert_message:
-            message_content += f"رسالة المنبه: {alert_message}\n\n"
+            message_content += f" ALERT MESSAGE: {alert_message}\n\n"
         else:
-            message_content += "لا توجد رسالة من المنبه (أول تشغيل)\n\n"
-
-        # Compose context for AI based on state
-        prices_text = format_live_prices_text(get_live_prices_for_pairs())
+            message_content += "NO Any Message from ALERT\n\n"
 
-        if state["has_active_signal"]:
+        if has_active:
             sig = state["active_signal"][0]
             message_content += (
-        "The user is currently in an active trade (one of the scenarios has been triggered):\n"
-        f"- Pair: {sig.get('pair','N/A')}\n"
-        f"- Type: {sig.get('type','N/A')}\n"
-        f"- Entry: {sig.get('entry','N/A')}\n"
-        f"- Stop Loss: {sig.get('stop_loss','N/A')}\n"
-        f"- Take Profit: {sig.get('take_profit','N/A')}\n"
-        "AI Guidance: Do NOT create any new scenario. Only analyze and track the current trade, providing a plan and instructions.\n\n"
-        "Important Instructions:\n"
-        "- Provide only **ONE <img>** at a time in the format:\n"
-        "  <img><XAUUSD><id_for_IND><id_for_IND><id_for_IND>// you can use maxumum 3 indecators in same image<timeframe></img>\n"
-        "- Use <final> **only** if you think the conversation already has enough information to conclude.\n\n"
-        f"Current Time:\n{time_info}\n\n"
-        f"Live Prices:\n{prices_text}"
-    )
-        elif state["has_scenario"]:
+                "The user is currently in an active trade (one of the scenarios has been triggered):\n"
+                f"- Pair: {sig.get('pair','N/A')}\n"
+                f"- Type: {sig.get('type','N/A')}\n"
+                f"- Entry: {sig.get('entry','N/A')}\n"
+                f"- Stop Loss: {sig.get('stop_loss','N/A')}\n"
+                f"- Take Profit: {sig.get('take_profit','N/A')}\n"
+                "Important Instructions:\n"
+                "- Provide only ONE <img> at a time in the format:\n"
+                "  <img><XAUUSD><id_for_IND><id_for_IND><id_for_IND>// you can use maxumum 3 indecators in same image<timeframe></img>\n"
+                "- Use <final> only if you think the conversation already has enough information to conclude.\n\n"
+                f"Current Time:\n{time_info}\n\n"
+                f"Live Prices:\n{prices_text}"
+            )
+        elif has_scen:
             sc = state["scenario"]
             buy = sc.get("Buy", {})
             sell = sc.get("Sell", {})
             message_content += (
-        "There is a previously saved scenario that hasn’t been triggered yet. Creating a new scenario will replace the old one:\n"
-        f"- Buy: @={buy.get('at','N/A')}, SL={buy.get('SL','N/A')}, TP={buy.get('TP','N/A')}\n"
-        f"- Sell: @={sell.get('at','N/A')}, SL={sell.get('SL','N/A')}, TP={sell.get('TP','N/A')}\n\n"
-        "AI Guidance: Continue analyzing. If you want to update the scenario, send a <final> with a new <scenario> to replace it. If no new scenario is created, we will wait for one of the scenarios to be triggered.\n\n"
-        "Important Instructions:\n"
-        "- Provide only **ONE <img>** at a time:\n"
-        "  <img><XAUUSD><id_for_IND><id_for_IND><id_for_IND>// you can use maxumum 3 indecators in same image<timeframe></img>\n"
-        "- Use <final> **only** if you believe there is enough information in the conversation.\n\n"
-        f"Current Time:\n{time_info}\n\n"
-        f"Live Prices:\n{prices_text}"
-    )
+                "There is a previously saved scenario that hasn’t been triggered yet. Creating a new scenario will replace the old one:\n"
+                f"- Buy: @={buy.get('at','N/A')}, SL={buy.get('SL','N/A')}, TP={buy.get('TP','N/A')}\n"
+                f"- Sell: @={sell.get('at','N/A')}, SL={sell.get('SL','N/A')}, TP={sell.get('TP','N/A')}\n\n"
+                "AI Guidance: Continue analyzing. If you want to update the scenario, send a <final> with a new <scenario> to replace it. If no new scenario is created, we will wait for one of the scenarios to be triggered.\n\n"
+                "Important Instructions:\n"
+                "- Provide only ONE <img> at a time:\n"
+                "  <img><XAUUSD><id_for_IND><id_for_IND><id_for_IND>// you can use maxumum 3 indecators in same image<timeframe></img>\n"
+                "- Use <final> only if you believe there is enough information in the conversation.\n\n"
+                f"Current Time:\n{time_info}\n\n"
+                f"Live Prices:\n{prices_text}"
+            )
         else:
             message_content += (
-        "No scenario or active trade exists (first run). Please analyze and create the first scenario within <final> when done.\n\n"
-        "Important Instructions:\n"
-        "- Provide only **ONE <img>** at a time:\n"
-        "  <img><XAUUSD><id_for_IND><id_for_IND><id_for_IND>// you can use maxumum 3 indecators in same image<timeframe></img>>\n"
-        "- Use <final> **only** if you believe there is enough information in the conversation to conclude.\n\n"
-        f"Current Time:\n{time_info}\n\n"
-        f"Live Prices:\n{prices_text}"
-    )
+                "No scenario or active trade exists (first run). Please analyze and create the first scenario within <final> when done.\n\n"
+                "Important Instructions:\n"
+                "- Provide only ONE <img> at a time:\n"
+                "  <img><XAUUSD><id_for_IND><id_for_IND><id_for_IND>// you can use maxumum 3 indecators in same image<timeframe></img>\n"
+                "- Use <final> only if you believe there is enough information in the conversation to conclude.\n\n"
+                f"Current Time:\n{time_info}\n\n"
+                f"Live Prices:\n{prices_text}"
+            )
 
         multipart_content.append({"type": "text", "text": message_content})
     except Exception as e:
@@ -687,8 +601,8 @@ def build_image_reply_user_turn(png_url):
     {"type": "text", "text": (
         "Your image is ready for analysis.\n"
         "- Request **only ONE <img>** at a time for each chart.\n <img><XAUUSD><id_for_IND><id_for_IND><id_for_IND>// you can use maxumum 3 indecators in same image<timeframe></img>\n"
-        "- Use <final> **only** if you think the conversation already has enough information to conclude.\n"
-        "Do not send multiple images at once. \n\n look i want you to be smart analysis andd choose image and indicators like pro not idiot okay ? go ahead and tell me what next"
+        "- Use <final> **only** if you think the conversation already has enough information to conclude. ELSE request new image\n"
+        "Do not send multiple images at once. \n\n look i want you to be smart analysis and choose image and indicators like pro not idiot okay ? go ahead and tell me what next"
     )},
     {"type": "text", "text": f"Current Time:\n{time_info}"},
     {"type": "text", "text": f"Live Prices:\n{prices_text}"}
@@ -868,15 +782,24 @@ def parse_and_execute_final(final_xml_full, final_inner):
     return actions_performed
 
 def edit_existing_signal(edit_data):
+    """
+    Edit the active signal (assumed stored as an array with a single signal object) and save back as an array.
+    """
     try:
         signals_data = db_signals.fetch_json_from_github()
         if not (signals_data["success"] and signals_data["data"]):
             return {"success": False, "error": "No active signal found to edit"}
 
-        current_signal = None
         raw = signals_data["data"][0]
+        # Expecting current storage shape to be an array; ensure we handle both array and object safely
         if isinstance(raw, list) and raw and isinstance(raw[0], dict):
             current_signal = raw[0]
+            container_is_list = True
+        elif isinstance(raw, dict):
+            # Legacy/object format, normalize to a single-element list
+            current_signal = raw
+            container_is_list = False
+            logger.warning("Signals DB returned an object; normalizing to array on save.")
         else:
             return {"success": False, "error": "No active signal found to edit"}
 
@@ -897,9 +820,11 @@ def edit_existing_signal(edit_data):
 
         auth_token, commit_oid = db_signals.fetch_authenticity_token_and_commit_oid()
         if auth_token and commit_oid:
-            updated_signal = json.dumps([current_signal])
-            result = db_signals.update_user_json_file(auth_token, commit_oid, updated_signal)
-            if result["success"]:
+            # Always save as array
+            updated_signal_list = [current_signal]
+            updated_json = json.dumps(updated_signal_list, ensure_ascii=False)
+            result = db_signals.update_user_json_file(auth_token, commit_oid, updated_json)
+            if result.get("success"):
                 return {"success": True, "updates": updates_made}
             else:
                 return {"success": False, "error": "Failed to update signal"}