Update app.py

app.py

@@ -32,7 +32,7 @@ HF_TOKEN_WRITE = os.getenv("HF_TOKEN")
 HF_TOKEN_READ = os.getenv("HF_TOKEN_READ")
 GOOGLE_API_KEY = os.getenv("GOOGLE_API_KEY")
 
-STORE_ADDRESS = "Рынок Кербент, 6 ряд , 43 контейнер "
+STORE_ADDRESS = "Рынок Кербен, 6 ряд , 43 контейнер "
 WHATSAPP_NUMBER = "+996701202013"
 
 CURRENCY_CODE = 'KGS'
@@ -76,7 +76,7 @@ def download_db_from_hf(specific_file=None, retries=DOWNLOAD_RETRIES, delay=DOWN
                         try:
                             if file_name == DATA_FILE:
                                 with open(file_name, 'w', encoding='utf-8') as f:
-                                    json.dump({'products': [], 'categories': [], 'orders': {}, 'organization_info': {}, 'chat_sessions': {}}, f)
+                                    json.dump({'products': [], 'categories': [], 'orders': {}, 'organization_info': {}, 'chats': {}}, f)
                         except Exception as create_e:
                             pass
                     success = False
@@ -134,7 +134,7 @@ def load_data():
         "returns": "Возврат и обмен товара возможен в течение 14 дней с момента покупки, при условии сохранения товарного вида, упаковки и чека. Некоторые категории товаров могут иметь особые условия возврата. Пожалуйста, свяжитесь с нами для оформления возврата или обмена.",
         "contact": f"Наш магазин находится по адресу: {STORE_ADDRESS}. Связаться с нами можно по телефону: {WHATSAPP_NUMBER} или через WhatsApp по этому же номеру. Мы работаем ежедневно с 9:00 до 18:00."
     }
-    default_data = {'products': [], 'categories': [], 'orders': {}, 'organization_info': default_organization_info, 'chat_sessions': {}}
+    default_data = {'products': [], 'categories': [], 'orders': {}, 'organization_info': default_organization_info, 'chats': {}}
     data = default_data
     try:
         with open(DATA_FILE, 'r', encoding='utf-8') as file:
@@ -145,7 +145,7 @@ def load_data():
         if 'categories' not in data: data['categories'] = []
         if 'orders' not in data: data['orders'] = {}
         if 'organization_info' not in data: data['organization_info'] = default_organization_info
-        if 'chat_sessions' not in data: data['chat_sessions'] = {}
+        if 'chats' not in data: data['chats'] = {}
     except FileNotFoundError:
         if download_db_from_hf(specific_file=DATA_FILE):
             try:
@@ -157,7 +157,7 @@ def load_data():
                 if 'categories' not in data: data['categories'] = []
                 if 'orders' not in data: data['orders'] = {}
                 if 'organization_info' not in data: data['organization_info'] = default_organization_info
-                if 'chat_sessions' not in data: data['chat_sessions'] = {}
+                if 'chats' not in data: data['chats'] = {}
             except (FileNotFoundError, json.JSONDecodeError, Exception) as e:
                 data = default_data
         else:
@@ -173,7 +173,7 @@ def load_data():
                 if 'categories' not in data: data['categories'] = []
                 if 'orders' not in data: data['orders'] = {}
                 if 'organization_info' not in data: data['organization_info'] = default_organization_info
-                if 'chat_sessions' not in data: data['chat_sessions'] = {}
+                if 'chats' not in data: data['chats'] = {}
             except (FileNotFoundError, json.JSONDecodeError, Exception) as e:
                 data = default_data
         else:
@@ -203,7 +203,7 @@ def save_data(data):
         if 'categories' not in data: data['categories'] = []
         if 'orders' not in data: data['orders'] = {}
         if 'organization_info' not in data: data['organization_info'] = {}
-        if 'chat_sessions' not in data: data['chat_sessions'] = {}
+        if 'chats' not in data: data['chats'] = {}
 
         with open(DATA_FILE, 'w', encoding='utf-8') as file:
             json.dump(data, file, ensure_ascii=False, indent=4)
@@ -247,7 +247,7 @@ def generate_ai_description_from_image(image_data, language):
     final_prompt = f"{base_prompt}{lang_suffix}"
 
     try:
-        model = genai.GenerativeModel('gemini-1.5-flash')
+        model = genai.GenerativeModel('gemma-2-27b-it')
 
         response = model.generate_content([final_prompt, image])
 
@@ -266,7 +266,7 @@ def generate_ai_description_from_image(image_data, language):
         elif " Billing account not found" in str(e):
              raise ValueError("Проблема с биллингом аккаунта Google Cloud. Проверьте ваш аккаунт.")
         elif "Could not find model" in str(e):
-             raise ValueError(f"Модель 'gemini-1.5-flash' не найдена или недоступна.")
+             raise ValueError(f"Модель 'gemma-2-27b-it' не найдена или недоступна.")
         elif "resource has been exhausted" in str(e).lower():
              raise ValueError("Квота запросов исчерпана. Попробуйте позже.")
         elif "content has been blocked" in str(e).lower():
@@ -329,12 +329,17 @@ def generate_chat_response(message, chat_history_from_client, session_id):
     response = None
 
     try:
-        model = genai.GenerativeModel('gemini-1.5-flash')
+        model = genai.GenerativeModel('gemma-2-27b-it')
 
         model_chat_history_for_gemini = [
             {'role': 'user', 'parts': [{'text': system_instruction_content}]}
         ]
-        for entry in chat_history_from_client:
+        
+        chats_data = data.get('chats', {})
+        if session_id not in chats_data:
+            chats_data[session_id] = []
+        
+        for entry in chats_data[session_id]:
             gemini_role = 'model' if entry['role'] == 'ai' else 'user'
             model_chat_history_for_gemini.append({
                 'role': gemini_role,
@@ -355,14 +360,10 @@ def generate_chat_response(message, chat_history_from_client, session_id):
                 generated_text = response.text
             else:
                 raise ValueError("AI did not return a valid text response.")
-
-        if 'chat_sessions' not in data:
-            data['chat_sessions'] = {}
-        if session_id not in data['chat_sessions']:
-            data['chat_sessions'][session_id] = {'created_at': datetime.now().strftime('%Y-%m-%d %H:%M:%S'), 'history': []}
-
-        data['chat_sessions'][session_id]['history'].append({'role': 'user', 'text': message, 'timestamp': datetime.now().isoformat()})
-        data['chat_sessions'][session_id]['history'].append({'role': 'ai', 'text': generated_text, 'timestamp': datetime.now().isoformat()})
+        
+        chats_data[session_id].append({'role': 'user', 'text': message, 'timestamp': datetime.now().isoformat()})
+        chats_data[session_id].append({'role': 'ai', 'text': generated_text, 'timestamp': datetime.now().isoformat()})
+        data['chats'] = chats_data
         save_data(data)
 
         return generated_text
@@ -381,6 +382,7 @@ def generate_chat_response(message, chat_history_from_client, session_id):
              return f"Извините, Ваш запрос был заблокирован из-за политики безопасности (причина: {reason}). Пожалуйста, переформулируйте его."
         else:
              return f"Извините, произошла ошибка: {e}"
+
 CHAT_TEMPLATE = '''
 <!DOCTYPE html>
 <html lang="ru">
@@ -401,7 +403,7 @@ CHAT_TEMPLATE = '''
             --danger: #E57373;
         }
         * { margin: 0; padding: 0; box-sizing: border-box; }
-        html, body { height: 100%; overflow: hidden; }
+        html, body { height: 100%; overflow: hidden; -webkit-tap-highlight-color: transparent; }
         body {
             font-family: 'Montserrat', sans-serif;
             background-color: var(--bg-dark);
@@ -433,38 +435,34 @@ CHAT_TEMPLATE = '''
             margin-right: 15px;
             border: 2px solid var(--accent);
         }
-        .chat-header h1 { font-size: 1.2rem; font-weight: 600; }
-        .chat-header a {
+        .chat-header h1 {
+            font-size: 1.2rem;
+            font-weight: 600;
+        }
+        .chat-header .catalog-link {
             margin-left: auto;
             color: var(--accent);
-            text-decoration: none;
             font-size: 1.5rem;
+            text-decoration: none;
         }
-        #chat-messages {
+        .chat-messages {
             flex-grow: 1;
             overflow-y: auto;
             padding: 20px;
             display: flex;
             flex-direction: column;
             gap: 12px;
+            -webkit-overflow-scrolling: touch;
         }
         .chat-message {
-            padding: 10px 15px;
-            border-radius: 18px;
+            padding: 12px 18px;
+            border-radius: 20px;
             max-width: 85%;
             word-wrap: break-word;
             line-height: 1.5;
-            animation: fadeIn 0.4s ease-out;
-            opacity: 0;
-            transform: translateY(10px);
-            animation-fill-mode: forwards;
-        }
-        @keyframes fadeIn {
-            to {
-                opacity: 1;
-                transform: translateY(0);
-            }
+            animation: fadeIn 0.3s ease-out;
         }
+        @keyframes fadeIn { from { opacity: 0; transform: translateY(10px); } to { opacity: 1; transform: translateY(0); } }
         .chat-message.user {
             align-self: flex-end;
             background-color: var(--bg-medium);
@@ -473,80 +471,55 @@ CHAT_TEMPLATE = '''
         }
         .chat-message.ai {
             align-self: flex-start;
-            background-color: #E3FEF7;
-            color: var(--text-dark);
+            background-color: #004D54;
+            color: var(--text-light);
             border-bottom-left-radius: 4px;
         }
         .chat-input-container {
             display: flex;
             gap: 10px;
-            padding: 15px 20px;
+            padding: 15px;
             background-color: var(--bg-dark);
             border-top: 1px solid var(--bg-medium);
             flex-shrink: 0;
         }
         #chat-input {
             flex-grow: 1;
-            padding: 12px 18px;
-            border: 1px solid var(--bg-medium);
+            padding: 12px 20px;
+            border: none;
             border-radius: 25px;
             font-size: 1rem;
             outline: none;
             background-color: var(--bg-medium);
             color: var(--text-light);
-            transition: border-color 0.3s;
         }
-        #chat-input:focus { border-color: var(--accent); }
+        #chat-input::placeholder { color: rgba(227, 254, 247, 0.6); }
         #chat-send-button {
             background-color: var(--accent);
             color: var(--bg-dark);
             border: none;
             border-radius: 50%;
-            width: 50px;
-            height: 50px;
+            width: 48px;
+            height: 48px;
             display: flex;
             justify-content: center;
             align-items: center;
             cursor: pointer;
-            transition: all 0.3s;
+            transition: background-color 0.3s;
             flex-shrink: 0;
             font-size: 1.2rem;
         }
-        #chat-send-button:hover { background-color: var(--accent-hover); transform: scale(1.1); }
+        #chat-send-button:hover { background-color: var(--accent-hover); }
         #chat-send-button:disabled { background-color: #cccccc; cursor: not-allowed; }
-        .chat-product-card {
-            background-color: #ffffff;
-            border-radius: 12px;
-            padding: 12px;
-            margin-top: 10px;
-            display: grid;
-            grid-template-columns: 60px 1fr;
-            gap: 12px;
-            border: 1px solid #e0e0e0;
-            box-shadow: 0 2px 8px rgba(0,0,0,0.05);
-            animation: slideInCard 0.5s ease-out;
-        }
-        @keyframes slideInCard { from { opacity: 0; transform: scale(0.95); } to { opacity: 1; transform: scale(1); } }
-        .chat-product-card img { width: 60px; height: 60px; object-fit: cover; border-radius: 8px; }
-        .chat-product-card-info { grid-column: 2; }
+        
+        .chat-product-card { background-color: #E3FEF7; border-radius: 12px; padding: 12px; margin-top: 10px; display: flex; align-items: center; gap: 15px; border: 1px solid var(--bg-medium); color: var(--text-dark); }
+        .chat-product-card img { width: 60px; height: 60px; object-fit: cover; border-radius: 8px; flex-shrink: 0; }
+        .chat-product-card-info { flex-grow: 1; }
         .chat-product-card-info strong { display: block; font-size: 1rem; color: var(--text-dark); margin-bottom: 4px; }
-        .chat-product-card-info span { font-size: 0.9rem; color: var(--bg-medium); font-weight: 600; }
-        .chat-product-card-actions { grid-column: 1 / -1; display: flex; gap: 10px; margin-top: 10px; }
-        .chat-product-link, .chat-add-to-cart {
-            flex: 1;
-            display: inline-block;
-            background-color: #E0F2F1;
-            color: var(--bg-medium);
-            padding: 8px 12px;
-            border-radius: 20px;
-            cursor: pointer;
-            font-size: 0.9rem;
-            text-decoration: none;
-            transition: all 0.2s;
-            font-weight: 500;
-            text-align: center;
-        }
-        .chat-product-link:hover, .chat-add-to-cart:hover { background-color: #B2DFDB; }
+        .chat-product-card-info span { font-size: 0.95rem; color: var(--bg-medium); font-weight: 600; }
+        .chat-product-card-actions { display: flex; flex-direction: column; gap: 8px; }
+        .chat-product-link, .chat-add-to-cart { display: flex; align-items: center; justify-content: center; background-color: #B2DFDB; color: var(--bg-medium); padding: 8px 12px; border-radius: 20px; cursor: pointer; font-size: 0.9rem; text-decoration: none; transition: background-color 0.2s; font-weight: 500; text-align: center; width: 100%; gap: 5px;}
+        .chat-product-link:hover, .chat-add-to-cart:hover { background-color: var(--accent); }
     </style>
 </head>
 <body>
@@ -554,9 +527,9 @@ CHAT_TEMPLATE = '''
         <div class="chat-header">
             <img src="https://huggingface.co/spaces/gippo312/admin/resolve/main/Picsart_25-11-04_12-02-21-390.png" alt="Gippo312 Logo">
             <h1>Чат с EVA</h1>
-            <a href="{{ url_for('catalog') }}" title="Вернуться в каталог"><i class="fas fa-store"></i></a>
+            <a href="{{ url_for('catalog') }}" class="catalog-link"><i class="fas fa-store"></i></a>
         </div>
-        <div id="chat-messages"></div>
+        <div id="chat-messages" class="chat-messages"></div>
         <div class="chat-input-container">
             <input type="text" id="chat-input" placeholder="Напишите сообщение...">
             <button id="chat-send-button"><i class="fas fa-paper-plane"></i></button>
@@ -569,7 +542,7 @@ CHAT_TEMPLATE = '''
         let chatHistory = JSON.parse(localStorage.getItem('evaChatHistory') || '[]');
         let sessionId = localStorage.getItem('chatSessionId');
         if (!sessionId) {
-            sessionId = `session_${new Date().getTime()}_${Math.random().toString(36).substr(2, 9)}`;
+            sessionId = '{{ uuid4().hex }}';
             localStorage.setItem('chatSessionId', sessionId);
         }
 
@@ -580,16 +553,14 @@ CHAT_TEMPLATE = '''
         function displayChatHistory() {
             const chatMessagesDiv = document.getElementById('chat-messages');
             chatMessagesDiv.innerHTML = '';
-            chatHistory.forEach(msg => {
-                addMessageToChat(msg.text, msg.role, false);
-            });
+            chatHistory.forEach(msg => addMessageToChat(msg.text, msg.role, false));
         }
 
         function addMessageToChat(text, role, save = true) {
             const chatMessagesDiv = document.getElementById('chat-messages');
             const messageElement = document.createElement('div');
             messageElement.className = `chat-message ${role}`;
-
+            
             const productMatchRegex = /\[ID_ТОВАРА:\s*([a-fA-F0-9]+)\s*Название:\s*([^\]]+)\]/g;
             let lastIndex = 0;
             const contentFragment = document.createDocumentFragment();
@@ -619,11 +590,15 @@ CHAT_TEMPLATE = '''
                             <span>${product.price.toFixed(2)} ${currencyCode}</span>
                         </div>
                         <div class="chat-product-card-actions">
-                            <a href="#" class="chat-product-link" data-product-id="${productId}">Обзор</a>
-                            <a href="#" class="chat-add-to-cart" data-product-id="${productId}"><i class="fas fa-cart-plus"></i> В корзину</a>
+                            <a href="#" class="chat-add-to-cart" data-product-id="${productId}"><i class="fas fa-cart-plus"></i></a>
                         </div>
                     `;
                     contentFragment.appendChild(card);
+                } else {
+                    const productName = match[2];
+                    const notFoundText = document.createElement('span');
+                    notFoundText.innerHTML = `[ID_ТОВАРА: ${productId} Название: ${productName}] (товар не найден) `;
+                    contentFragment.appendChild(notFoundText);
                 }
                 lastIndex = match.index + match[0].length;
             }
@@ -643,31 +618,22 @@ CHAT_TEMPLATE = '''
                 localStorage.setItem('evaChatHistory', JSON.stringify(chatHistory));
             }
 
-            messageElement.querySelectorAll('.chat-product-link').forEach(link => {
-                link.addEventListener('click', (e) => {
-                    e.preventDefault();
-                    const id = e.currentTarget.dataset.productId;
-                    alert('Функция просмотра деталей товара из этого чата будет реализована.');
-                });
-            });
-
             messageElement.querySelectorAll('.chat-add-to-cart').forEach(link => {
                 link.addEventListener('click', (e) => {
                     e.preventDefault();
-                    const productId = e.currentTarget.dataset.productId;
-                    addToCartFromChat(productId);
+                    const id = e.currentTarget.dataset.productId;
+                    const product = getProductById(id);
+                    if (product) {
+                        addToCart(product);
+                    }
                 });
             });
         }
         
-        function addToCartFromChat(productId) {
-            const product = getProductById(productId);
-            if (!product) return;
-
+        function addToCart(product) {
             let cart = JSON.parse(localStorage.getItem('mekaCart') || '[]');
-            const cartItemId = `${product.product_id}-N/A`; // Simplified: no color selection from chat
+            const cartItemId = `${product.product_id}-N/A`;
             const existingItemIndex = cart.findIndex(item => item.id === cartItemId);
-            
             if (existingItemIndex > -1) {
                 cart[existingItemIndex].quantity += 1;
             } else {
@@ -693,12 +659,11 @@ CHAT_TEMPLATE = '''
             addMessageToChat(message, 'user');
             chatInput.value = '';
             chatSendButton.disabled = true;
-
             try {
                 const response = await fetch('/chat_with_ai', {
                     method: 'POST',
                     headers: { 'Content-Type': 'application/json' },
-                    body: JSON.stringify({ message: message, history: chatHistory.slice(-10), session_id: sessionId })
+                    body: JSON.stringify({ message: message, history: chatHistory, session_id: sessionId })
                 });
                 const result = await response.json();
                 if (!response.ok) {
@@ -706,10 +671,10 @@ CHAT_TEMPLATE = '''
                 }
                 addMessageToChat(result.text, 'ai');
             } catch (error) {
+                console.error("Chat AI Error:", error);
                 addMessageToChat(`Извините, произошла ошибка: ${error.message}`, 'ai', false);
             } finally {
                 chatSendButton.disabled = false;
-                 chatInput.focus();
             }
         }
 
@@ -719,14 +684,12 @@ CHAT_TEMPLATE = '''
             document.getElementById('chat-input').addEventListener('keypress', function(e) {
                 if (e.key === 'Enter') { sendMessage(); }
             });
-            if(chatHistory.length === 0){
-                addMessageToChat("Здравствуйте! Я EVA, ваш виртуальный помощник. Чем могу помочь?", 'ai');
-            }
         });
     </script>
 </body>
 </html>
 '''
+
 CATALOG_TEMPLATE = '''
 <!DOCTYPE html>
 <html lang="ru">
@@ -910,7 +873,6 @@ CATALOG_TEMPLATE = '''
             justify-content: center;
             box-shadow: 0 4px 15px rgba(72, 209, 204, 0.4);
             transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
-            text-decoration: none;
         }
         .floating-button:hover {
             background-color: var(--accent-hover);
@@ -959,6 +921,54 @@ CATALOG_TEMPLATE = '''
         .formulate-order-button:hover { background-color: var(--accent-hover); }
         .notification { position: fixed; bottom: 80px; left: 50%; transform: translateX(-50%); background-color: var(--accent); color: var(--bg-dark); padding: 10px 20px; border-radius: 20px; box-shadow: 0 4px 10px rgba(0,0,0,0.2); z-index: 1002; opacity: 0; transition: opacity 0.5s ease; font-size: 0.9rem;}
         .notification.show { opacity: 1;}
+        #chatModal .modal-content { max-width: 450px; }
+        #chat-messages { height: 350px; overflow-y: auto; border: 1px solid #e0e0e0; border-radius: 8px; padding: 15px; margin-bottom: 15px; display: flex; flex-direction: column; gap: 10px; background-color: #fcfcfc; }
+        .chat-message { padding: 10px 15px; border-radius: 15px; max-width: 80%; word-wrap: break-word; line-height: 1.4;}
+        .chat-message.user { align-self: flex-end; background-color: var(--bg-medium); color: white; border-bottom-right-radius: 2px; }
+        .chat-message.ai { align-self: flex-start; background-color: #e6e6e6; color: var(--text-dark); border-bottom-left-radius: 2px; }
+        .chat-input-container { display: flex; gap: 10px; }
+        #chat-input { flex-grow: 1; padding: 10px 15px; border: 1px solid #e0e0e0; border-radius: 20px; font-size: 0.95rem; outline: none; }
+        #chat-input:focus { border-color: var(--bg-medium); box-shadow: 0 0 0 2px rgba(19, 93, 102, 0.15); }
+        #chat-send-button { background-color: var(--bg-medium); color: white; border: none; border-radius: 50%; width: 40px; height: 40px; display: flex; justify-content: center; align-items: center; cursor: pointer; transition: background-color 0.3s; flex-shrink: 0; }
+        #chat-send-button:hover { background-color: var(--bg-dark); }
+        #chat-send-button:disabled { background-color: #cccccc; cursor: not-allowed; }
+        
+        .chat-product-card { background-color: #f0f2f5; border-radius: 12px; padding: 10px; margin-top: 8px; display: flex; align-items: center; gap: 12px; border: 1px solid #e0e0e0; }
+        .chat-product-card img { width: 50px; height: 50px; object-fit: cover; border-radius: 8px; flex-shrink: 0; }
+        .chat-product-card-info { flex-grow: 1; }
+        .chat-product-card-info strong { display: block; font-size: 0.9rem; color: var(--text-dark); margin-bottom: 2px; }
+        .chat-product-card-info span { font-size: 0.85rem; color: var(--bg-medium); font-weight: 500; }
+        .chat-product-card-actions { display: flex; flex-direction: column; gap: 5px; }
+        .chat-product-link, .chat-add-to-cart { display: inline-block; background-color: #E0F2F1; color: var(--bg-medium); padding: 5px 10px; border-radius: 15px; cursor: pointer; font-size: 0.85rem; text-decoration: none; transition: background-color 0.2s; font-weight: 500; text-align: center; width: 100%; }
+        .chat-product-link:hover, .chat-add-to-cart:hover { background-color: #B2DFDB; }
+        .chat-product-card-actions .fa-cart-plus { font-size: 0.9em; }
+
+        @media (max-width: 768px) {
+            .product-card {
+                width: 150px;
+                height: 150px;
+            }
+            .category-header h2 {
+                font-size: 1.3rem;
+            }
+            .floating-buttons-container {
+                bottom: 15px;
+                right: 15px;
+            }
+            .floating-button {
+                width: 50px;
+                height: 50px;
+                font-size: 1.3rem;
+            }
+            .cart-item {
+                grid-template-columns: 50px 1fr auto;
+                gap: 10px;
+            }
+            .cart-item-details { grid-column: 2; }
+            .cart-item-quantity { grid-column: 2; grid-row: 2; }
+            .cart-item-total { grid-column: 3; grid-row: 1; }
+            .cart-item-remove { grid-column: 3; grid-row: 2; }
+        }
     </style>
 </head>
 <body>
@@ -1076,7 +1086,7 @@ CATALOG_TEMPLATE = '''
         const currencyCode = '{{ currency_code }}';
         let selectedProductId = null;
         let cart = JSON.parse(localStorage.getItem('mekaCart') || '[]');
-
+        
         function getProductById(productId) {
             return allProducts.find(p => p.product_id === productId);
         }
@@ -1509,6 +1519,14 @@ ORDER_TEMPLATE = '''
         .catalog-link { display: block; text-align: center; margin-top: 25px; color: var(--bg-medium); text-decoration: none; font-size: 0.9rem; }
         .catalog-link:hover { text-decoration: underline; }
         .not-found { text-align: center; color: #dc3545; font-size: 1.2rem; padding: 40px 0;}
+        @media (max-width: 600px) {
+            .container { padding: 20px; }
+            h1 { font-size: 1.5rem; }
+            .order-item { grid-template-columns: 50px 1fr auto; }
+            .item-details { grid-column: 2; grid-row: 1; }
+            .item-quantity { grid-column: 2; grid-row: 2; justify-self: start; }
+            .item-total { grid-column: 3; grid-row: 1 / span 2; }
+        }
     </style>
 </head>
 <body>
@@ -1714,14 +1732,44 @@ ADMIN_TEMPLATE = '''
             .status-indicator.top-product { background-color: #FFF9C4; color: #F57F17; margin-left: 5px;}
             .ai-generate-button { background-color: #8D6EC8; color: white; margin-top: 5px; margin-bottom: 10px; }
             .ai-generate-button:hover { background-color: #7B4DB5; }
-            .dialog-list .item { cursor: pointer; transition: background-color 0.2s; }
-            .dialog-list .item:hover { background-color: #f0f8ff; }
-            .modal { display: none; position: fixed; z-index: 1001; left: 0; top: 0; width: 100%; height: 100%; background-color: rgba(0,0,0,0.6); overflow-y: auto; }
-            .modal-content { background: #fff; margin: 10% auto; padding: 20px; border-radius: 8px; width: 90%; max-width: 600px; }
-            .chat-history { max-height: 400px; overflow-y: auto; }
-            .chat-message { margin-bottom: 10px; padding: 8px 12px; border-radius: 10px; }
-            .chat-message.user { background-color: #e1f5fe; text-align: right; }
-            .chat-message.ai { background-color: #f1f8e9; }
+            .chat-log-modal {
+                display: none;
+                position: fixed;
+                z-index: 1002;
+                left: 0;
+                top: 0;
+                width: 100%;
+                height: 100%;
+                overflow: auto;
+                background-color: rgba(0,0,0,0.5);
+            }
+            .chat-log-modal-content {
+                background-color: #fefefe;
+                margin: 5% auto;
+                padding: 20px;
+                border: 1px solid #888;
+                width: 80%;
+                max-width: 800px;
+                border-radius: 10px;
+            }
+            .chat-log-message {
+                padding: 8px;
+                margin-bottom: 8px;
+                border-radius: 5px;
+            }
+            .chat-log-message.user {
+                background-color: #e1f5fe;
+                text-align: right;
+            }
+            .chat-log-message.ai {
+                background-color: #f1f8e9;
+            }
+            .chat-session-item {
+                cursor: pointer;
+            }
+            .chat-session-item:hover {
+                background-color: #f0f0f0;
+            }
         </style>
     </head>
     <body>
@@ -1741,6 +1789,21 @@ ADMIN_TEMPLATE = '''
                     {% endfor %}
                 {% endif %}
             {% endwith %}
+            
+            <div class="section">
+                <h2><i class="fas fa-comments"></i> Диалоги с EVA</h2>
+                <div class="item-list">
+                    {% for session_id, messages in chats.items() %}
+                        <div class="item chat-session-item" onclick="openChatLogModal('{{ session_id }}')">
+                            <p><strong>ID сессии:</strong> {{ session_id }}</p>
+                            <p><strong>Сообщений:</strong> {{ messages|length }}</p>
+                            <p><strong>Последнее сообщение:</strong> {{ messages[-1]['timestamp'] }}</p>
+                        </div>
+                    {% else %}
+                        <p>Нет сохраненных диалогов.</p>
+                    {% endfor %}
+                </div>
+            </div>
 
             <div class="section">
                 <h2><i class="fas fa-sync-alt"></i> Синхронизация с Датацентром</h2>
@@ -1754,23 +1817,6 @@ ADMIN_TEMPLATE = '''
                 </div>
                  <p style="font-size: 0.85rem; color: #999;">Резервное копирование происходит автоматически каждые 30 минут, а также после каждого сохранения данных. Используйте эти кнопки для немедленной синхронизации.</p>
             </div>
-            
-            <div class="section">
-                <h2><i class="fas fa-comments"></i> Диалоги с EVA</h2>
-                <div class="item-list dialog-list">
-                    {% if chat_sessions %}
-                        {% for session_id, session_data in chat_sessions|dictsort(by='value.created_at', reverse=True) %}
-                            <div class="item" onclick="openDialogModal('{{ session_id }}')">
-                                <p><strong>ID сессии:</strong> {{ session_id }}</p>
-                                <p><strong>Дата:</strong> {{ session_data.created_at }}</p>
-                                <p><strong>Сообщений:</strong> {{ session_data.history|length }}</p>
-                            </div>
-                        {% endfor %}
-                    {% else %}
-                        <p>Сохраненных диалогов пока нет.</p>
-                    {% endif %}
-                </div>
-            </div>
 
             <div class="flex-container">
                  <div class="flex-item">
@@ -2009,13 +2055,14 @@ ADMIN_TEMPLATE = '''
                 <p>Товаров пока нет.</p>
                 {% endif %}
             </div>
+
         </div>
 
-        <div id="dialogModal" class="modal">
-            <div class="modal-content">
-                <span class="close" onclick="closeDialogModal()">&times;</span>
-                <h2 id="dialogModalTitle">История диалога</h2>
-                <div class="chat-history" id="dialogModalBody"></div>
+        <div id="chatLogModal" class="chat-log-modal">
+            <div class="chat-log-modal-content">
+                <span class="close" onclick="closeChatLogModal()">&times;</span>
+                <h2 id="chatLogModalTitle"></h2>
+                <div id="chatLogModalBody"></div>
             </div>
         </div>
 
@@ -2063,31 +2110,31 @@ ADMIN_TEMPLATE = '''
                 }
             }
             
-            const chatSessionsData = {{ chat_sessions|tojson|safe }};
-
-            function openDialogModal(sessionId) {
-                const session = chatSessionsData[sessionId];
-                if (!session) return;
+            const chats = {{ chats|tojson }};
+            
+            function openChatLogModal(sessionId) {
+                const modal = document.getElementById('chatLogModal');
+                const title = document.getElementById('chatLogModalTitle');
+                const body = document.getElementById('chatLogModalBody');
                 
-                const modal = document.getElementById('dialogModal');
-                const title = document.getElementById('dialogModalTitle');
-                const body = document.getElementById('dialogModalBody');
-
-                title.textContent = `Диалог от ${session.created_at}`;
+                title.innerText = `Диалог: ${sessionId}`;
                 body.innerHTML = '';
 
-                session.history.forEach(msg => {
-                    const msgDiv = document.createElement('div');
-                    msgDiv.className = `chat-message ${msg.role}`;
-                    msgDiv.textContent = msg.text;
-                    body.appendChild(msgDiv);
-                });
-
+                const messages = chats[sessionId];
+                if (messages) {
+                    messages.forEach(msg => {
+                        const msgDiv = document.createElement('div');
+                        msgDiv.className = `chat-log-message ${msg.role}`;
+                        msgDiv.innerText = `${msg.text} (${msg.timestamp})`;
+                        body.appendChild(msgDiv);
+                    });
+                }
+                
                 modal.style.display = 'block';
             }
 
-            function closeDialogModal() {
-                document.getElementById('dialogModal').style.display = 'none';
+            function closeChatLogModal() {
+                document.getElementById('chatLogModal').style.display = 'none';
             }
 
             async function generateDescription(photoInputId, descriptionTextareaId, languageSelectId) {
@@ -2286,10 +2333,13 @@ def admin():
     products = data.get('products', [])
     categories = data.get('categories', [])
     organization_info = data.get('organization_info', {})
-    chat_sessions = data.get('chat_sessions', {})
+    chats = data.get('chats', {})
 
     if 'orders' not in data or not isinstance(data.get('orders'), dict):
             data['orders'] = {}
+            
+    if 'chats' not in data or not isinstance(data.get('chats'), dict):
+        data['chats'] = {}
 
     if request.method == 'POST':
         action = request.form.get('action')
@@ -2548,17 +2598,32 @@ def admin():
     display_products = sorted(current_data.get('products', []), key=lambda p: p.get('name', '').lower())
     display_categories = sorted(current_data.get('categories', []))
     display_organization_info = current_data.get('organization_info', {})
-    display_chat_sessions = current_data.get('chat_sessions', {})
+    display_chats = current_data.get('chats', {})
 
     return render_template_string(
         ADMIN_TEMPLATE,
         products=display_products,
         categories=display_categories,
         organization_info=display_organization_info,
-        chat_sessions=display_chat_sessions,
+        chats=display_chats,
         repo_id=REPO_ID,
         currency_code=CURRENCY_CODE
     )
+    
+@app.route('/chat')
+def chat():
+    data = load_data()
+    all_products_raw = data.get('products', [])
+    products_in_stock = [p for p in all_products_raw if p.get('in_stock', True)]
+    products_sorted_for_js = sorted(products_in_stock, key=lambda p: (not p.get('is_top', False), p.get('name', '').lower()))
+    
+    return render_template_string(
+        CHAT_TEMPLATE,
+        products_json=json.dumps(products_sorted_for_js),
+        repo_id=REPO_ID,
+        currency_code=CURRENCY_CODE,
+        uuid4=uuid4
+    )
 
 @app.route('/generate_description_ai', methods=['POST'])
 def handle_generate_description_ai():
@@ -2585,8 +2650,11 @@ def handle_chat_with_ai():
     chat_history_from_client = request_data.get('history', [])
     session_id = request_data.get('session_id')
 
-    if not user_message or not session_id:
-        return jsonify({"error": "Сообщение и ID сессии обязательны."}), 400
+    if not user_message:
+        return jsonify({"error": "Сообщение не может быть пустым."}), 400
+
+    if not session_id:
+        return jsonify({"error": "ID сессии отсутствует."}), 400
 
     try:
         ai_response_text = generate_chat_response(user_message, chat_history_from_client, session_id)
@@ -2615,20 +2683,6 @@ def force_download():
         flash(f"Ошибка при скачивании с Hugging Face: {e}", 'error')
     return redirect(url_for('admin'))
 
-@app.route('/chat')
-def chat():
-    data = load_data()
-    all_products_raw = data.get('products', [])
-    products_in_stock = [p for p in all_products_raw if p.get('in_stock', True)]
-    products_sorted_for_js = sorted(products_in_stock, key=lambda p: (not p.get('is_top', False), p.get('name', '').lower()))
-
-    return render_template_string(
-        CHAT_TEMPLATE,
-        products_json=json.dumps(products_sorted_for_js),
-        repo_id=REPO_ID,
-        currency_code=CURRENCY_CODE
-    )
-
 if __name__ == '__main__':
     configure_gemini()
     download_db_from_hf()