new structure for the overall part

ai_integration.py

@@ -0,0 +1,78 @@
+
+import datetime
+import google.generativeai as genai
+import os
+
+
+genai.configure(api_key=os.environ.get('GOOGLE_API_KEY'))
+model = genai.GenerativeModel('gemini-2.5-flash')
+
+def get_counter_debuts(opponent_debuts, user_color, user_repertoire):
+    if not opponent_debuts or not opponent_debuts.strip():
+        return "❌ Iltimos, kamida bitta debyt kiriting!"
+    
+    color_context = "Siz oq rangli o'ynaysiz." if user_color == "Oq" else "Siz qora rangli o'ynaysiz."
+    
+    repertoire_context = ""
+    if user_repertoire and user_repertoire.strip():
+        repertoire_context = f"\n\nFOYDALANUVCHI REPERTUARI:\n{user_repertoire}\n\nIltimos, bu repertuarni hisobga olib tavsiyalar bering."
+
+    prompt = f"""
+    Siz professional shaxmat murabbiyisiz. {color_context}
+    
+    Raqib quyidagi debyutlarni o'ynaydi:
+    {opponent_debuts}
+    {repertoire_context}
+    
+    Har bir raqib debyuti uchun quyidagilarni bering:
+    
+    ## DEBYT NOMI
+    
+    **Qarshi Debyt:** [Eng yaxshi qarshi debyt]
+    
+    **Asosiy G'oya:**
+    [2-3 jumlada tushuntirish]
+    
+    **Strategik Rejalar:**
+    - [Reja 1]
+    - [Reja 2]
+    - [Reja 3]
+    
+    **Muhim Yurishlar:**
+    [Boshlanish yurishlari ketma-ketligi]
+    
+    **Tuzoqlar va Ehtiyot Choralari:**
+    [Diqqat qilish kerak bo'lgan narsalar]
+    
+    ---
+    
+    Javobni o'zbek tilida, toza markdown formatida bering.
+    """
+    
+    try:
+        response = model.generate_content(prompt)
+        fixed_response = response.text.strip()
+        
+        result = f"""# 🏆 SHAXMAT TAHLILI NATIJALARI
+
+**Sana:** {datetime.now().strftime("%Y-%m-%d %H:%M")}  
+**Sizning Rangingiz:** {user_color}  
+---
+
+{fixed_response}
+
+---
+
+## 💡 QO'SHIMCHA MASLAHATLAR
+
+1. **O'rganish:** Har bir debyutni lichess.org/learn yoki chess.com da mashq qiling
+2. **Tahlil:** O'yinlaringizni tahlil qiling va xatolarni toping
+3. **Mashq:** Turli holatlarni mashq qiling
+4. **Vaqt:** Har bir debyutga kamida 30 daqiqa ajrating
+
+✅ **Omad tilaymiz! Yaxshi o'ynang!** ♟️
+"""
+        return result
+        
+    except Exception as e:
+        return f"❌ Xatolik yuz berdi: {str(e)}\n\nIltimos, GOOGLE_API_KEY to'g'ri o'rnatilganligini tekshiring."

app.py

@@ -1,256 +1,15 @@
-import google.generativeai as genai
-import os
+
 import gradio as gr
-from datetime import datetime
 import logging
-import requests
-import time
-import pandas as pd
-import re
-from collections import Counter
+
+from ai_integration import get_counter_debuts
+from chess_api import get_user_games_from_chess_com, analyze_chess_com_user
+import os
+from core import load_eco_data
 
 logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
 logger = logging.getLogger(__name__)
 
-genai.configure(api_key=os.environ.get('GOOGLE_API_KEY'))
-model = genai.GenerativeModel('gemini-2.5-flash')
-
-eco_data = None
-
-def load_eco_data():
-    global eco_data
-    try:
-        eco_data = pd.read_csv('data/Chess Opening Reference - Sheet1.csv')
-        logger.info(f"Loaded {len(eco_data)} ECO codes")
-        return True
-    except Exception as e:
-        logger.error(f"Error loading ECO data: {str(e)}")
-        return False
-
-def get_user_games_from_chess_com(username):
-    try:
-        logger.info(f"Fetching games for: {username}")
-        username = username.strip().lower()
-        
-        user_url = f"https://api.chess.com/pub/player/{username}"
-        response = requests.get(user_url, timeout=10, headers={'User-Agent': 'Mozilla/5.0'})
-        
-        if response.status_code != 200:
-            return None, f"❌ Foydalanuvchi topilmadi: {username}"
-        
-        archives_url = f"https://api.chess.com/pub/player/{username}/games/archives"
-        response = requests.get(archives_url, timeout=10, headers={'User-Agent': 'Mozilla/5.0'})
-        
-        if response.status_code != 200:
-            return None, "❌ O'yinlar arxivi topilmadi."
-        
-        archives = response.json()['archives']
-        if not archives:
-            return None, "❌ O'yinlar topilmadi."
-        
-        all_games = []
-        for archive_url in reversed(archives[-3:]):
-            time.sleep(0.3)
-            response = requests.get(archive_url, timeout=10, headers={'User-Agent': 'Mozilla/5.0'})
-            if response.status_code == 200:
-                games = response.json()['games']
-                all_games.extend(games)
-            if len(all_games) >= 50:
-                break
-        
-        rapid_games = [g for g in all_games if g.get('time_class') in ['rapid', 'blitz']]
-        if not rapid_games:
-            rapid_games = all_games[:50]
-        
-        pgn_list = [g['pgn'] for g in rapid_games[:50] if 'pgn' in g]
-        
-        if not pgn_list:
-            return None, "❌ PGN formatdagi o'yinlar topilmadi."
-        
-        return pgn_list, None
-        
-    except Exception as e:
-        logger.error(f"Error fetching games: {str(e)}")
-        return None, f"❌ Xatolik: {str(e)}"
-
-def extract_eco_from_pgn(pgn):
-    eco_match = re.search(r'\[ECO "([A-E][0-9]{2})"\]', pgn)
-    return eco_match.group(1) if eco_match else None
-
-def get_opening_name(eco_code):
-    if eco_data is not None and eco_code:
-        match = eco_data[eco_data['ECO Code'] == eco_code]
-        if not match.empty:
-            return match.iloc[0]['Name']
-    return "Unknown Opening"
-
-def analyze_opponent_openings(pgn_list, target_username):
-    target_username = target_username.lower()
-    opponent_openings = []
-    
-    for pgn in pgn_list:
-        white_match = re.search(r'\[White "([^"]+)"\]', pgn)
-        black_match = re.search(r'\[Black "([^"]+)"\]', pgn)
-        
-        if not white_match or not black_match:
-            continue
-            
-        white_player = white_match.group(1).lower()
-        black_player = black_match.group(1).lower()
-        
-        is_white = target_username in white_player
-        is_black = target_username in black_player
-        
-        if not is_white and not is_black:
-            continue
-        
-        eco_code = extract_eco_from_pgn(pgn)
-        if eco_code:
-            opening_name = get_opening_name(eco_code)
-            
-            if is_white:
-                opponent_color = "qora"
-            else:
-                opponent_color = "oq"
-                
-            opponent_openings.append({
-                'eco': eco_code,
-                'name': opening_name,
-                'opponent_color': opponent_color,
-                'user_color': 'oq' if is_white else 'qora'
-            })
-    
-    return opponent_openings
-
-def get_counter_debuts(opponent_debuts, user_color, user_repertoire):
-    if not opponent_debuts or not opponent_debuts.strip():
-        return "❌ Iltimos, kamida bitta debyt kiriting!"
-    
-    color_context = "Siz oq rangli o'ynaysiz." if user_color == "Oq" else "Siz qora rangli o'ynaysiz."
-    
-    repertoire_context = ""
-    if user_repertoire and user_repertoire.strip():
-        repertoire_context = f"\n\nFOYDALANUVCHI REPERTUARI:\n{user_repertoire}\n\nIltimos, bu repertuarni hisobga olib tavsiyalar bering."
-
-    prompt = f"""
-    Siz professional shaxmat murabbiyisiz. {color_context}
-    
-    Raqib quyidagi debyutlarni o'ynaydi:
-    {opponent_debuts}
-    {repertoire_context}
-    
-    Har bir raqib debyuti uchun quyidagilarni bering:
-    
-    ## DEBYT NOMI
-    
-    **Qarshi Debyt:** [Eng yaxshi qarshi debyt]
-    
-    **Asosiy G'oya:**
-    [2-3 jumlada tushuntirish]
-    
-    **Strategik Rejalar:**
-    - [Reja 1]
-    - [Reja 2]
-    - [Reja 3]
-    
-    **Muhim Yurishlar:**
-    [Boshlanish yurishlari ketma-ketligi]
-    
-    **Tuzoqlar va Ehtiyot Choralari:**
-    [Diqqat qilish kerak bo'lgan narsalar]
-    
-    ---
-    
-    Javobni o'zbek tilida, toza markdown formatida bering.
-    """
-    
-    try:
-        response = model.generate_content(prompt)
-        fixed_response = response.text.strip()
-        
-        result = f"""# 🏆 SHAXMAT TAHLILI NATIJALARI
-
-**Sana:** {datetime.now().strftime("%Y-%m-%d %H:%M")}  
-**Sizning Rangingiz:** {user_color}  
----
-
-{fixed_response}
-
----
-
-## 💡 QO'SHIMCHA MASLAHATLAR
-
-1. **O'rganish:** Har bir debyutni lichess.org/learn yoki chess.com da mashq qiling
-2. **Tahlil:** O'yinlaringizni tahlil qiling va xatolarni toping
-3. **Mashq:** Turli holatlarni mashq qiling
-4. **Vaqt:** Har bir debyutga kamida 30 daqiqa ajrating
-
-✅ **Omad tilaymiz! Yaxshi o'ynang!** ♟️
-"""
-        return result
-        
-    except Exception as e:
-        return f"❌ Xatolik yuz berdi: {str(e)}\n\nIltimos, GOOGLE_API_KEY to'g'ri o'rnatilganligini tekshiring."
-
-def analyze_chess_com_user(username, user_repertoire):
-    if not username or not username.strip():
-        return "❌ Iltimos, Chess.com foydalanuvchi nomini kiriting!"
-    
-    status_msg = f"🔍 {username} foydalanuvchisi o'yinlari yuklanmoqda...\n\n"
-    
-    pgn_list, error = get_user_games_from_chess_com(username)
-    
-    if error:
-        return error
-    
-    status_msg += f"✅ {len(pgn_list)} ta o'yin topildi!\n\n"
-    status_msg += "📊 Debyutlar tahlil qilinmoqda...\n\n"
-    
-    opponent_openings = analyze_opponent_openings(pgn_list, username)
-    
-    if not opponent_openings:
-        return status_msg + "❌ Raqib debyutlari aniqlanmadi."
-    
-    white_openings = [o for o in opponent_openings if o['opponent_color'] == 'oq']
-    black_openings = [o for o in opponent_openings if o['opponent_color'] == 'qora']
-    
-    white_counter = Counter([o['name'] for o in white_openings])
-    black_counter = Counter([o['name'] for o in black_openings])
-    
-    analysis_text = "# 📈 RAQIB DEBYUTLARI TAHLILI\n\n"
-    analysis_text += f"**Foydalanuvchi:** {username}\n"
-    analysis_text += f"**Tahlil qilingan o'yinlar:** {len(pgn_list)}\n\n"
-    
-    if white_openings:
-        analysis_text += "## 🎯 Raqib OQ rang bilan o'ynaganida:\n\n"
-        for opening, count in white_counter.most_common(5):
-            analysis_text += f"- **{opening}** ({count} marta)\n"
-        analysis_text += "\n"
-    
-    if black_openings:
-        analysis_text += "## 🎯 Raqib QORA rang bilan o'ynaganida:\n\n"
-        for opening, count in black_counter.most_common(5):
-            analysis_text += f"- **{opening}** ({count} marta)\n"
-        analysis_text += "\n"
-    
-    debuts_for_ai = ""
-    if white_counter:
-        debuts_for_ai += "Raqib OQ bilan: " + ", ".join([o for o, _ in white_counter.most_common(3)]) + "\n"
-    if black_counter:
-        debuts_for_ai += "Raqib QORA bilan: " + ", ".join([o for o, _ in black_counter.most_common(3)])
-    
-    analysis_text += "\n---\n\n"
-    analysis_text += "## 🤖 AI TAVSIYALARI\n\n"
-    
-    try:
-        color_for_ai = "Oq" if white_openings else "Qora"
-        ai_response = get_counter_debuts(debuts_for_ai, color_for_ai, user_repertoire)
-        analysis_text += ai_response
-    except Exception as e:
-        analysis_text += f"❌ AI tahlil xatosi: {str(e)}"
-    
-    return analysis_text
-
 def create_interface():
     with gr.Blocks(theme=gr.themes.Soft(), title="Shaxmat AI Maslahatchi", css="""
         .gradio-container {font-family: 'Arial', sans-serif;}
@@ -306,38 +65,45 @@ def create_interface():
                     label="💡 Misollar"
                 )
             
-            with gr.Tab("🌐 Chess.com Tahlili"):
-                gr.Markdown("### Raqib Chess.com profilini tahlil qiling")
-                
-                with gr.Row():
-                    with gr.Column(scale=1):
-                        chess_com_username = gr.Textbox(
-                            label="👤 Chess.com Foydalanuvchi Nomi",
-                            placeholder="Misol: Hikaru",
-                            info="Raqibingiz Chess.com username"
-                        )
-                        
-                        user_repertoire2 = gr.Textbox(
-                            label="📚 Sizning Repertuaringiz (ixtiyoriy)",
-                            placeholder="Misol: e4 ga qarshi Sicilian, d4 ga qarshi Kings Indian",
-                            lines=4,
-                            info="Sizning afzal ko'rgan debyutlaringiz"
-                        )
-                        
-                        analyze_btn2 = gr.Button("🔍 Tahlil Qilish", variant="primary", size="lg")
+        with gr.Tab("🌐 Chess.com Tahlili"):
+            gr.Markdown("### Raqib Chess.com profilini tahlil qiling")
+            
+            with gr.Row():
+                with gr.Column(scale=1):
+                    user_color2 = gr.Radio(
+                        choices=["Oq", "Qora"],
+                        value="Oq",
+                        label="🎨 Sizning Rangingiz",
+                        info="Qaysi rang bilan o'ynaysiz?"
+                    )
                     
-                    with gr.Column(scale=2):
-                        output2 = gr.Markdown(label="📊 Tahlil Natijasi")
+                    chess_com_username = gr.Textbox(
+                        label="👤 Chess.com Foydalanuvchi Nomi",
+                        placeholder="Misol: Hikaru",
+                        info="Raqibingiz Chess.com username"
+                    )
+                    
+                    user_repertoire2 = gr.Textbox(
+                        label="📚 Sizning Repertuaringiz (ixtiyoriy)",
+                        placeholder="Misol: e4 ga qarshi Sicilian, d4 ga qarshi Kings Indian",
+                        lines=4,
+                        info="Sizning afzal ko'rgan debyutlaringiz"
+                    )
+                    
+                    analyze_btn2 = gr.Button("🔍 Tahlil Qilish", variant="primary", size="lg")
                 
-                gr.Examples(
-                    examples=[
-                        ["Hikaru", ""],
-                        ["GothamChess", "e4 ga qarshi Sicilian"],
-                    ],
-                    inputs=[chess_com_username, user_repertoire2],
-                    label="💡 Misollar"
-                )
-        
+                with gr.Column(scale=2):
+                    output2 = gr.Markdown(label="📊 Tahlil Natijasi")
+            
+            gr.Examples(
+                examples=[
+                    ["Oq", "Hikaru", ""],
+                    ["Qora", "GothamChess", "e4 ga qarshi Sicilian"],
+                ],
+                inputs=[user_color2, chess_com_username, user_repertoire2],
+                label="💡 Misollar"
+            )
+                       
         analyze_btn1.click(
             fn=get_counter_debuts,
             inputs=[opponent_debuts, user_color, user_repertoire],
@@ -345,8 +111,8 @@ def create_interface():
         )
         
         analyze_btn2.click(
-            fn=analyze_chess_com_user,
-            inputs=[chess_com_username, user_repertoire2],
+            fn=lambda username, repertoire, color: analyze_chess_com_user(username, repertoire, color),
+            inputs=[chess_com_username, user_repertoire2, user_color2],
             outputs=output2
         )
 

chess_api.py

@@ -0,0 +1,117 @@
+
+import requests
+import time
+import logging
+import pandas as pd
+from core import analyze_opponent_openings
+from ai_integration import get_counter_debuts
+from collections import Counter
+
+logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
+logger = logging.getLogger(__name__)
+
+
+def get_user_games_from_chess_com(username):
+    try:
+        logger.info(f"Fetching games for: {username}")
+        username = username.strip().lower()
+        
+        user_url = f"https://api.chess.com/pub/player/{username}"
+        response = requests.get(user_url, timeout=10, headers={'User-Agent': 'Mozilla/5.0'})
+        
+        if response.status_code != 200:
+            return None, f"❌ Foydalanuvchi topilmadi: {username}"
+        
+        archives_url = f"https://api.chess.com/pub/player/{username}/games/archives"
+        response = requests.get(archives_url, timeout=10, headers={'User-Agent': 'Mozilla/5.0'})
+        
+        if response.status_code != 200:
+            return None, "❌ O'yinlar arxivi topilmadi."
+        
+        archives = response.json()['archives']
+        if not archives:
+            return None, "❌ O'yinlar topilmadi."
+        
+        all_games = []
+        for archive_url in reversed(archives[-3:]):
+            time.sleep(0.3)
+            response = requests.get(archive_url, timeout=10, headers={'User-Agent': 'Mozilla/5.0'})
+            if response.status_code == 200:
+                games = response.json()['games']
+                all_games.extend(games)
+            if len(all_games) >= 50:
+                break
+        
+        rapid_games = [g for g in all_games if g.get('time_class') in ['rapid', 'blitz']]
+        if not rapid_games:
+            rapid_games = all_games[:50]
+        
+        pgn_list = [g['pgn'] for g in rapid_games[:50] if 'pgn' in g]
+        
+        if not pgn_list:
+            return None, "❌ PGN formatdagi o'yinlar topilmadi."
+        
+        return pgn_list, None
+        
+    except Exception as e:
+        logger.error(f"Error fetching games: {str(e)}")
+        return None, f"❌ Xatolik: {str(e)}"
+
+
+def analyze_chess_com_user(username, user_repertoire, user_color="Oq"):
+    if not username or not username.strip():
+        return "❌ Iltimos, Chess.com foydalanuvchi nomini kiriting!"
+    
+    status_msg = f"🔍 {username} foydalanuvchisi o'yinlari yuklanmoqda...\n\n"
+    
+    pgn_list, error = get_user_games_from_chess_com(username)
+    
+    if error:
+        return error
+    
+    status_msg += f"✅ {len(pgn_list)} ta o'yin topildi!\n\n"
+    status_msg += "📊 Debyutlar tahlil qilinmoqda...\n\n"
+    
+    opponent_openings = analyze_opponent_openings(pgn_list, username)
+    
+    if not opponent_openings:
+        return status_msg + "❌ Raqib debyutlari aniqlanmadi."
+    
+    white_openings = [o for o in opponent_openings if o['opponent_color'] == 'oq']
+    black_openings = [o for o in opponent_openings if o['opponent_color'] == 'qora']
+    
+    white_counter = Counter([o['name'] for o in white_openings])
+    black_counter = Counter([o['name'] for o in black_openings])
+    
+    analysis_text = "# 📈 RAQIB DEBYUTLARI TAHLILI\n\n"
+    analysis_text += f"**Foydalanuvchi:** {username}\n"
+    analysis_text += f"**Tahlil qilingan o'yinlar:** {len(pgn_list)}\n\n"
+    
+    if white_openings:
+        analysis_text += "## 🎯 Raqib OQ rang bilan o'ynaganida:\n\n"
+        for opening, count in white_counter.most_common(5):
+            analysis_text += f"- **{opening}** ({count} marta)\n"
+        analysis_text += "\n"
+    
+    if black_openings:
+        analysis_text += "## 🎯 Raqib QORA rang bilan o'ynaganida:\n\n"
+        for opening, count in black_counter.most_common(5):
+            analysis_text += f"- **{opening}** ({count} marta)\n"
+        analysis_text += "\n"
+    
+    debuts_for_ai = ""
+    if white_counter:
+        debuts_for_ai += "Raqib OQ bilan: " + ", ".join([o for o, _ in white_counter.most_common(3)]) + "\n"
+    if black_counter:
+        debuts_for_ai += "Raqib QORA bilan: " + ", ".join([o for o, _ in black_counter.most_common(3)])
+    
+    analysis_text += "\n---\n\n"
+    analysis_text += "## 🤖 AI TAVSIYALARI\n\n"
+    
+    try:
+        ai_response = get_counter_debuts(debuts_for_ai, user_color, user_repertoire)
+        analysis_text += ai_response
+    except Exception as e:
+        analysis_text += f"❌ AI tahlil xatosi: {str(e)}"
+    
+    return analysis_text

core.py

@@ -0,0 +1,71 @@
+
+
+import pandas as pd
+import re
+import logging
+
+logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
+logger = logging.getLogger(__name__)
+
+
+eco_data = None
+
+def load_eco_data():
+    global eco_data
+    try:
+        eco_data = pd.read_csv('data/Chess Opening Reference - Sheet1.csv')
+        logger.info(f"Loaded {len(eco_data)} ECO codes")
+        return True
+    except Exception as e:
+        logger.error(f"Error loading ECO data: {str(e)}")
+        return False
+
+def extract_eco_from_pgn(pgn):
+    eco_match = re.search(r'\[ECO "([A-E][0-9]{2})"\]', pgn)
+    return eco_match.group(1) if eco_match else None
+
+def get_opening_name(eco_code):
+    if eco_data is not None and eco_code:
+        match = eco_data[eco_data['ECO Code'] == eco_code]
+        if not match.empty:
+            return match.iloc[0]['Name']
+    return "Unknown Opening"
+
+
+def analyze_opponent_openings(pgn_list, target_username):
+    target_username = target_username.lower()
+    opponent_openings = []
+    
+    for pgn in pgn_list:
+        white_match = re.search(r'\[White "([^"]+)"\]', pgn)
+        black_match = re.search(r'\[Black "([^"]+)"\]', pgn)
+        
+        if not white_match or not black_match:
+            continue
+            
+        white_player = white_match.group(1).lower()
+        black_player = black_match.group(1).lower()
+        
+        is_white = target_username in white_player
+        is_black = target_username in black_player
+        
+        if not is_white and not is_black:
+            continue
+        
+        eco_code = extract_eco_from_pgn(pgn)
+        if eco_code:
+            opening_name = get_opening_name(eco_code)
+            
+            if is_white:
+                opponent_color = "qora"
+            else:
+                opponent_color = "oq"
+                
+            opponent_openings.append({
+                'eco': eco_code,
+                'name': opening_name,
+                'opponent_color': opponent_color,
+                'user_color': 'oq' if is_white else 'qora'
+            })
+    
+    return opponent_openings