Update ai.py

ai.py

@@ -1,7 +1,6 @@
+import pytz
 import requests
 import time
-import pytz
-import json
 from datetime import datetime, timedelta
 from timeframe import fetch_financial_data
 
@@ -37,7 +36,7 @@ def get_times():
 
     return times
 
-def chat_with_ai(chat_history, temperature=0.4):
+def chat_with_ai(chat_history, temperature=0.7):
     """Send chat history to AI and get response"""
     url = "https://corvo-ai-xx-ry.hf.space/chat"
 
@@ -62,335 +61,151 @@ def chat_with_ai(chat_history, temperature=0.4):
         except Exception as e:
             if attempt < max_retries - 1:
                 time.sleep(retry_delay)
-                print(f"Retry {attempt+1}: Communication error - {str(e)}")
-            else:
-                print(f"Final attempt failed: {str(e)}")
 
     return "عذراً، واجهت مشكلة في الاتصال. يرجى المحاولة مرة أخرى لاحقاً. 🙁"
 
-def fetch_pair_data(pair):
-    """
-    Fetch data for a pair in multiple timeframes with appropriate time ranges:
-    - 15m: 3 days of data
-    - 5min: 1 day of data
-
-    Returns data for both timeframes or only what's available
-    """
-    now = datetime.now()
-
-    # Determine if we need to add =X suffix
-    special_symbols = ["DX-Y.NYB", "GC=F", "^SPX", "WTI", "^TNX", "^FTSE"]
-
-    if pair in special_symbols:
-        symbol = pair  # Use symbol as is, without appending =X
-    else:
-        symbol = f"{pair}=X"  # Append =X for forex pairs
-
-    print(f"Fetching data for {symbol}...")
-
-    timeframes = {}
-
-    # Fetch 15-minute data (3 days)
-    try:
-        fifteen_min_start = now - timedelta(days=3)
-        fifteen_min_data = fetch_financial_data(
-            symbol=symbol,
-            start_date=fifteen_min_start,
-            end_date=now,
-            interval="15m"
-        )
-
-        if fifteen_min_data['success']:
-            timeframes["15m"] = fifteen_min_data
-        else:
-            print(f"⚠️ Failed to fetch 15m data for {pair}: {fifteen_min_data['message']}")
-    except Exception as e:
-        print(f"⚠️ Error fetching 15m data for {pair}: {str(e)}")
-
-    # Wait between requests to avoid rate limiting
-    time.sleep(1)
-
-    # Fetch 5-minute data (1 day)
-    try:
-        five_min_start = now - timedelta(days=1)
-        five_min_data = fetch_financial_data(
-            symbol=symbol,
-            start_date=five_min_start,
-            end_date=now,
-            interval="5min"
-        )
-
-        if five_min_data['success']:
-            timeframes["5min"] = five_min_data
-        else:
-            print(f"⚠️ Failed to fetch 5min data for {pair}: {five_min_data['message']}")
-            # Try 1-hour data as fallback if 5min fails
-            try:
-                hour_start = now - timedelta(days=7)  # Get a week of hourly data
-                hour_data = fetch_financial_data(
-                    symbol=symbol,
-                    start_date=hour_start,
-                    end_date=now,
-                    interval="60m"
-                )
-
-                if hour_data['success']:
-                    timeframes["1h"] = hour_data
-                    print(f"✅ Successfully fetched fallback 1h data for {pair}")
-            except Exception as e:
-                print(f"⚠️ Error fetching fallback 1h data for {pair}: {str(e)}")
-    except Exception as e:
-        print(f"⚠️ Error fetching 5min data for {pair}: {str(e)}")
-        # Try 1-hour data as fallback
-        try:
-            hour_start = now - timedelta(days=7)  # Get a week of hourly data
-            hour_data = fetch_financial_data(
-                symbol=symbol,
-                start_date=hour_start,
-                end_date=now,
-                interval="60m"
-            )
-
-            if hour_data['success']:
-                timeframes["1h"] = hour_data
-                print(f"✅ Successfully fetched fallback 1h data for {pair}")
-        except Exception as e:
-            print(f"⚠️ Error fetching fallback 1h data for {pair}: {str(e)}")
-
-    return timeframes
-
-def analyze_forex_pairs(pairs, description, deals=""):
-    """Main function to analyze a list of forex pairs"""
+def analyze_forex_pairs(pairs, deal_details):
+    """Main function to analyze a list of forex pairs with deal details"""
     print(f"Analyzing forex pairs: {', '.join(pairs)}")
 
     # Step 1: Get current times in financial centers
     market_times = get_times()
     times_text = "\n".join([f"{k}: {v}" for k, v in market_times.items()])
 
-    # Step 2: Fetch data for all pairs
-    pairs_data = {}
-    for pair in pairs:
-        print(f"📊 Fetching data for {pair}...")
-        pairs_data[pair] = fetch_pair_data(pair)
-        time.sleep(1)  # Small delay between requests
-
-    # Prepare system prompt with market times and group context
+    # Prepare system prompt with market times, deal details and group context
     system_prompt = f"""
-You are a Senior Forex Analyst and Precision Entry Strategist specializing in intraday relationship-driven technical analysis.
-
-📆 **Current Market Times**:
-{times_text}
-
-🕐 **All analysis is based on Greenwich Mean Time (GMT)** to ensure accurate tracking of session overlaps.
-
-📊 **Session Times (GMT):**
-
-| ⏰ **التوقيت (GMT)** | 💥 **الجلسات المتداخلة** | 🌐 **العملات المستفيدة**                | 📝 **ملاحظات**                              |
-| ------------------- | ------------------------ | --------------------------------------- | ------------------------------------------- |
-| **00:00 – 02:00**   | **سيدني + طوكيو**        | AUD, NZD, JPY                           | بداية حركة آسيا – دعم للتقنيات المبكرة      |
-| **01:00 – 03:00**   | **ويلينغتون + طوكيو**    | NZD, JPY                                | نشاط خفيف – مفيد لتداول NZDJPY              |
-| **01:00 – 04:00**   | **سنغافورة + طوكيو**     | JPY, AUD, NZD                           | حجم تداول متوسط – بداية سيولة للسوق الآسيوي |
-| **06:00 – 08:00**   | **فرانكفورت + طوكيو**    | EUR, JPY                                | بداية الزخم الأوروبي – تحركات مبكرة         |
-| **07:00 – 09:00**   | **لندن + طوكيو**         | GBP, JPY, EUR, USD, AUD, NZD            | ⚡ سيولة عالية جدًا – ممتاز للسكالبينج       |
-| **07:00 – 10:00**   | **زيورخ + لندن**         | CHF, EUR, GBP                           | جلسة أوروبا الكاملة – نشاط مؤسسات           |
-| **08:00 – 09:00**   | **لندن + سنغافورة**      | GBP, SGD, JPY                           | بعض الفرص على GBPJPY / GBPSGD               |
-| **12:00 – 16:00**   | **لندن + نيويورك**       | ✅ USD, GBP, EUR, CHF, XAU, المؤشرات     | أقوى فترة في اليوم – تدفقات مؤسسات          |
-| **13:00 – 15:00**   | **نيويورك + فرانكفورت**  | USD, EUR                                | نشاط البيانات الاقتصادية الأمريكية          |
-| **13:00 – 16:00**   | **نيويورك + زيورخ**      | USD, CHF                                | مفيد لتداول USDCHF – حركات واضحة            |
-| **14:00 – 17:00**   | **نيويورك + شيكاغو**     | USD, الذهب (XAU), النفط (WTI), المؤشرات | العقود الأمريكية تبدأ بالحركة القوية        |
-| **22:00 – 00:00**   | **نيويورك + سيدني**      | USD, AUD, XAU                           | هدوء نسبي – مناسب لتحليل ما قبل الآسيوية    |
-
+🎯 Role: Professional Technical Assistant for Trade Monitoring and Cross-Pair Relationship Analysis  
+You do **not** open trades. The trade is initiated by the Lead Analyst, or in some cases, the user is **waiting for a confirmation to enter** (e.g., 146.42 after a candle closes above a zone). Your job is to:
 
-
-🔁 Important Session Overlaps (High Liquidity):
-
-⏱️ Tokyo + Sydney: from 00:00 to 07:00  
-⏱️ Tokyo + London: from 07:00 to  09:00  
-⏱️ London + New York (most critical): from 12:00 to 16:00  
-
-🚨🚨🚨 **EXTREMELY IMPORTANT RULE (DO NOT IGNORE):**  
-⛔ ONLY send a signal if the current time is BETWEEN the start and end of one of the defined session overlap periods (inclusive). That means every minute from the start time to the end time is valid.
-⛔ This is NOT optional — it is a **mandatory condition**.  
-⚠️ **NO signals allowed even if two sessions are open, UNLESS it is during these clearly defined overlap periods**.  
-🟥🟥🟥 **If the time is NOT during 00:00–07:00, 07:00–09:00, or 12:00–16:00 GMT — DO NOT send a signal. Period.**
-
-ALL THIS POINTS YOU CAN SKIP IT JUST IF THERE 100% SUCCES TRADE SIGNAL (MAKE SURE TO TELL ME I GIVE YOU SIGNAL NOW WITH 1 SESSION OPEN BECAUSE IT IS 100% SUCCES)
-
-✅ Priority is given to the overlap of **London + New York**, as it provides the clearest and strongest market movement.
-
-📌 **Pairs Under Review**:
-{pairs}
-
-📢 **Group Overview**:
-{description}
-
-📈 **User's Current Open Trades**:
-{deals}
-
-🚫 **You are not allowed to create a new signal on any pair that already has an open trade** — wait until the existing trade is closed.
+- Monitor any open trade carefully, or watch the price closely until the entry condition is met
+- Analyze the market structure continuously using **both 5MIN and 15MIN timeframes**
+- Study and assess dynamic relationships between correlated pairs and group momentum
+- Alert the user **if a session (e.g., New York or London)** is about to close (within 15 minutes), as this may drastically impact market momentum
+- Send at least one message for **each** pair
+- Close the trade immediately if it becomes technically invalid
 
 ---
-
-🎯 **Your Objective**
-You must analyze the available timeframe data to determine whether there is a clean technical setup supporting a potential **40 to 70 pip move** with minimal drawdown.
-
-Your analysis must always be based on **inter-pair and inter-asset relationships** — never analyze a single pair in isolation.
-
-📉 Analysis should consider recent market conditions and price action from the timeframes available.
+📌 Trade Details:
+- 📋 Trade Information: {deal_details}\n\n
+- 🕰️ Timeframes: {times_text}\n\n
+- 📊 Currency Pairs: {', '.join(pairs)}
 
 ---
-
-📊 **Entry Criteria**
-
-✅ **Confirmation Candle**
-- Must be one of the following (visible on the chart):
-  • Bullish/Bearish Engulfing
-  • Marubozu
-  • Pin Bar
-- The pattern must be clearly visible on the available charts
-❗ If no confirmation candle appears from this list, **do not send a signal** — wait for one to appear.
-
-🔁 **Market Trend Direction**
-- A clear short-term trend must be present on the available charts
-- It must align with directional bias based on group correlation
-
-- RSI:
-  • Buy setups: between 45–70
-  • Sell setups: between 30–55
-- Volume: Preferably above average
-- Candle Quality:
-  • The last 3 candles must NOT be choppy, wick-heavy, or weak
-- Momentum Exhaustion Filter:
-  • Avoid entry if the last 5 candles moved more than 100 pips in total
-
-📍 **Support/Resistance Zone Proximity**
-- Entry must occur near or in reaction to a clearly defined zone
-- Price must be within 20 pips of the zone
-
-
-💼 **Risk-to-Reward Management**
-- Minimum R:R = 2.0
-- Target profit must be between 40 and 70 pips
+📌 Detailed Instructions:
+1. ✅ Analyze the market using **5MIN and 15MIN charts**
+   - General Trend (Up / Down / Sideways)
+   - Market Structure: Is it still valid? Broken?
+   - Momentum: Use RSI and MACD (Divergence? Weakness? Strength?)
+   - Candle Patterns: Rejections, Engulfing, Fakeouts
+   - Volume Activity: Any sudden surge or drop?
+   - Session Impact (London, New York, etc.) — also check if the session is **nearing its end**
+   - 📈 Correlation Analysis: Is the pair moving in sync with related pairs? Is there divergence? Is Group Momentum supporting the trade?
+   - 🧠 **Review related pair charts and market dashboards** to understand the overall market sentiment and how it might impact the current trade.
 
 ---
-
-🧠 **Mandatory Output Format (Strict):**
-
-```xml
-<Session>
-put herr is there any session openinig ?
-</Session>
-<MarketContext>
-Explain the current inter-pair relationships, such as EURUSD vs DXY or USDJPY vs US10Y. Mention any macro market flow if present.
-</MarketContext>
-
+📌 You **must always** return a structured technical analysis in this format:
 <Analysis>
-Use the available chart data to assess candle structure, market behavior, confirmation pattern, volume, RSI, etc.
-Be precise and professional. Only highlight clean low-risk entry points.
+A clean, professional breakdown of the current trade situation based on 5M and 15M. Include trend, structure, momentum, correlation insights, session timing impact, and any critical zones.
 </Analysis>
 
+---
+📬 You **must** send at least one user-facing message for each pair:
+<send_message>
+<message>
+💬 A technical message in natural Arabic (or user’s native language) describing the current state of the trade or waiting condition.
+- 📍 **Entry Price:** Use the value from the trade data
+- 📊 **Pips Gained or Waiting:** Calculate the difference from the current price to entry, or note if price hasn’t reached the zone yet
+- ✅ Current Technical Status: e.g., “Sideways range with weakening momentum,” or “Structure remains intact with support from 15M RSI,” or “Waiting for a confirmation candle on 5M”
+</message>
+<reason>
+🧠 Explain **why** the alert is sent — use valid technical reasons like divergence, fake breakouts, weak candles, or session nearing its end.
+</reason>
 <Prediction>
-State the expected direction (bullish or bearish), and whether a 40–70 pip move is likely within the next 1–3 hours based on current correlations and technicals.
+Balanced forecast: Is the trade still strong? Are we waiting for confirmation? Is there a reversal risk? Also mention if an upcoming session end could affect things.
 </Prediction>
-
 <Advice>
-Advise the trader to wait, monitor, or prepare for entry. Only suggest action if the structure is clean, the volume confirms, and the signal is valid.
+💡 A clear, natural, and **non-repetitive** recommendation. Be expressive:
+- "Keep monitoring, trend is stable for now" ✅
+- "Momentum is weakening as the session nears its end — stay alert" ⚠️
+- "Consider securing partial profits after +18 pips" 💰
+- "Wait for confirmation on 5M before engaging" 🔍
+- "Adjusting stop might be wise due to sudden volatility" ⛑️
 </Advice>
+</send_message>
 
-<Invalidation>
-Clearly define what would invalidate the setup, such as a structural break, volume drop, or correlation failure.
-</Invalidation>
-🚨🚨🚨 MANDATORY FINAL STEP:
-📩 Your response MUST ALWAYS end with either:
-
-✅ A full signal using:
-
-
-<signal>
-    <pair>PAIR_NAME</pair>
-    <type>Buy or Sell</type>
-    <entry>Ideal entry price</entry>
-    <stop_loss>Technical stop loss</stop_loss>
-    <take_profit>Target profit (40–70 pips)</take_profit>
-    <duration>1–3 hours (or momentum-based)</duration>
-    <reason>
-        Detailed technical reasoning including candle type, zone interaction, volume confirmation, and group correlation support.
-    </reason>
-</signal>
-❌ OR a proper wait explanation using:
-
-
-<wait>
-Explain clearly what is missing or risky: no confirmation candle, weak correlation, low volume, unclear structure, or an existing trade on the pair.
-Also include if the current time is outside the required session overlap.
-</wait>
-⚠️ You are NOT allowed to give analysis or predictions without wrapping the output in <wait> or <signal> — it is mandatory to close with one of these tags in every single response.
-    # Build chat history with system prompt"""
-
-    
+---
+🚨 If the trade becomes technically invalid, close it immediately with no hesitation:
+<close_deal>
+📉 Market structure is completely broken + strong reversal signals are present (e.g., clear rejection candles on 15M, negative divergence, session nearing close, and weakening momentum). Closing the trade is recommended to avoid unnecessary losses.
+</close_deal>
+
+---
+📌 Core Rules:
+- ❗ You **must send at least one message per pair** — silence is not allowed
+- ❗ If the trade is clearly invalid → use <close_deal> and nothing else
+- ❗ Only suggest “Secure Profits” if real profit exceeds 15 pips
+- ❗ Avoid repetitive or templated advice — always be context-aware and natural
+- ❗ Never use `<send_message>` and `<close_deal>` in the same response
+
+---
+🧠 Pro-Level Enhancements:
+- ✅ Monitor alignment between correlated pairs
+- ⚠️ Divergence + weak candles = Reversal risk
+- ✅ Strong confirmation candle + rising volume = High-confidence continuation
+- 🔄 If waiting for an entry condition (e.g., candle close), track price proximity and confirm status
+- 💡 Use Gold, S&P500, and Dollar Index correlations to understand connected pair behavior
+- ⏰ Warn the user if **a major session will close soon** — that can change market flow
+- 📊 Always review multiple pair dashboards to forecast what's likely to happen to the current trade
+
+---
+🧘 You are a **professional assistant**:
+- No emotions
+- No guessing
+- No unnecessary updates
+- You speak **only when** there is a valid, professional-level technical insight
+🎯 If the trade is valid → analyze and reassure
+❌ If the trade is weak or invalid → close it immediately
+🕵️ If waiting to enter → monitor until the technical entry condition is confirmed
+"""
+
+
+    # Build chat history with system prompt
     chat_history = [
         {"role": "system", "content": system_prompt}
     ]
 
-    # Add data for each pair as separate user messages for each timeframe
-    for pair, timeframes_data in pairs_data.items():
-        pair_data_added = False
-
-        # Add data for each available timeframe
-        for timeframe in ["15m", "5min", "1h"]:
-            if timeframe in timeframes_data and timeframes_data[timeframe]['success']:
-                chat_history.append({
-                    "role": "user",
-                    "content": f"**{pair} - {timeframe} Timeframe**\n\n{timeframes_data[timeframe]['table']}\n\n**Statistics:**\n{timeframes_data[timeframe]['stats']}\n\n**Meta Info:**\n{timeframes_data[timeframe]['meta_info']}"
-                })
-                pair_data_added = True
-
-        # If no data was added for this pair, inform the AI
-        if not pair_data_added:
+    # Get timeframe data for each pair and add to chat history
+    for pair in pairs:
+        # Prepare the symbol for Yahoo Finance API
+        symbol = pair
+        if pair not in ["DX-Y.NYB", "GC=F", "WTI"]:
+            symbol = f"{pair}=X"
+
+        # Get 15min data for the last 3 days
+        now = datetime.now()
+        start_date_15m = now - timedelta(days=3)
+        result_15m = fetch_financial_data(symbol=symbol, start_date=start_date_15m, end_date=now, interval="15m")
+
+        # Get 5min data for the last 1 hour
+        start_date_5m = now - timedelta(hours=1)
+        result_5m = fetch_financial_data(symbol=symbol, start_date=start_date_5m, end_date=now, interval="5m")
+
+        # Add the 15min data to chat history
+        if result_15m['success']:
+            chat_history.append({
+                "role": "user",
+                "content": f"## {pair} - 15 Minute Timeframe (Last 3 Days)\n\n### Meta Information\n{result_15m['meta_info']}\n\n{result_15m['table']}\n\n### Statistics\n{result_15m['stats']}"
+            })
+
+        # Add the 5min data to chat history
+        if result_5m['success']:
             chat_history.append({
                 "role": "user",
-                "content": f"**{pair} - No data available**\nUnable to fetch reliable data for this pair at the moment. Please analyze the other pairs in the group and mention that data for {pair} is currently unavailable."
+                "content": f"## {pair} - 5 Minute Timeframe (Last 1 Hour)\n\n### Meta Information\n{result_5m['meta_info']}\n\n{result_5m['table']}\n\n### Statistics\n{result_5m['stats']}"
             })
 
     # Get AI analysis
-    print("Sending data to AI for analysis...")
-    try:
-        analysis = chat_with_ai(chat_history)
-        print(analysis)
-        print("Analysis complete!")
-        return analysis
-    except Exception as e:
-        error_msg = f"Error during AI analysis: {str(e)}"
-        print(error_msg)
-
-        # If the payload is too large, try simplifying it
-        if len(str(chat_history)) > 10000000000:  # If chat history is very large
-            print("Chat history is too large. Simplifying data...")
-            simplified_chat_history = [
-                {"role": "system", "content": system_prompt}
-            ]
-
-            for pair, timeframes_data in pairs_data.items():
-                if "15m" in timeframes_data and timeframes_data["15m"]["success"]:
-                    # Only include table without stats and meta info
-                    simplified_chat_history.append({
-                        "role": "user",
-                        "content": f"**{pair} - 15m Timeframe**\n\n{timeframes_data['15m']['table']}"
-                    })
-                elif "1h" in timeframes_data and timeframes_data["1h"]["success"]:
-                    # Fall back to hourly data if 15m isn't available
-                    simplified_chat_history.append({
-                        "role": "user",
-                        "content": f"**{pair} - 1h Timeframe**\n\n{timeframes_data['1h']['table']}"
-                    })
-
-            try:
-                print("Retrying with simplified data...")
-                analysis = chat_with_ai(simplified_chat_history)
-                
-                print("Analysis with simplified data complete!")
-                return analysis
-            except Exception as e2:
-                return f"Error during analysis even with simplified data: {str(e2)}\n\nPlease try again later with fewer pairs or a shorter timeframe."
-
-        return error_msg
+    analysis = chat_with_ai(chat_history)
+    print(analysis)
+
+    return analysis