Update app.py

app.py

@@ -1,5 +1,3 @@
-
-
 import os
 import io
 import base64
@@ -37,6 +35,8 @@ DOWNLOAD_RETRIES = 3
 DOWNLOAD_DELAY = 5
 ALMATY_TZ = timezone(timedelta(hours=6))
 
+db_lock = threading.RLock()
+
 CURRENCIES = {
     'KGS': 'Кыргызский сом',
     'KZT': 'Казахстанский тенге',
@@ -154,112 +154,116 @@ def periodic_backup():
         upload_db_to_hf()
 
 def load_data():
-    try:
-        with open(DATA_FILE, 'r', encoding='utf-8') as f:
-            data = json.load(f)
-        if not isinstance(data, dict):
-            data = {}
-    except (FileNotFoundError, json.JSONDecodeError):
-        if download_db_from_hf(specific_file=DATA_FILE):
-            try:
-                with open(DATA_FILE, 'r', encoding='utf-8') as f:
-                    data = json.load(f)
-                if not isinstance(data, dict):
+    with db_lock:
+        try:
+            with open(DATA_FILE, 'r', encoding='utf-8') as f:
+                data = json.load(f)
+            if not isinstance(data, dict):
+                data = {}
+        except (FileNotFoundError, json.JSONDecodeError):
+            if download_db_from_hf(specific_file=DATA_FILE):
+                try:
+                    with open(DATA_FILE, 'r', encoding='utf-8') as f:
+                        data = json.load(f)
+                    if not isinstance(data, dict):
+                        data = {}
+                except (FileNotFoundError, json.JSONDecodeError):
                     data = {}
-            except (FileNotFoundError, json.JSONDecodeError):
+            else:
                 data = {}
-        else:
-            data = {}
-    return data
+        return data
 
 def save_data(data):
-    try:
-        with open(DATA_FILE, 'w', encoding='utf-8') as file:
-            json.dump(data, file, ensure_ascii=False, indent=4)
-        upload_db_to_hf(specific_file=DATA_FILE)
-    except Exception:
-        pass
+    with db_lock:
+        try:
+            with open(DATA_FILE, 'w', encoding='utf-8') as file:
+                json.dump(data, file, ensure_ascii=False, indent=4)
+        except Exception:
+            pass
+    upload_db_to_hf(specific_file=DATA_FILE)
 
 def get_env_data(env_id):
-    all_data = load_data()
-    default_organization_info = {
-        "about_us": "Мы — надежный партнер в мире уникальных товаров.",
-        "shipping": "Доставка осуществляется по всему Кыргызстану.",
-        "returns": "Возврат и обмен товара возможен в течение 14 дней.",
-        "contact": "Наш магазин находится по адресу: Рынок Кербен. Мы работаем ежедневно с 9:00 до 18:00."
-    }
-    default_settings = {
-        "organization_name": "Gippo312",
-        "whatsapp_number": "+996701202013",
-        "currency_code": "KGS",
-        "chat_name": "EVA",
-        "chat_avatar": None,
-        "color_scheme": "default",
-        "business_type": "retail",
-        "env_mode": "external",
-        "welcome_message_enabled": False,
-        "welcome_message_text": "Добро пожаловать в наш магазин!",
-        "inventory_tracking": False,
-        "admin_password_enabled": False,
-        "admin_password": "",
-        "checkout_fields_enabled": False,
-        "checkout_fields": {"name": False, "phone": False, "city": False, "address": False, "zip": False},
-        "categories_as_lines": False
-    }
-
-    env_data = all_data.get(env_id, {})
-    if not env_data:
-        env_data = {
-            'products': [], 'categories':[], 'orders': {}, 'employees':[], 'blocks':[],
-            'organization_info': default_organization_info,
-            'settings': default_settings,
-            'inventory_history':[]
+    with db_lock:
+        all_data = load_data()
+        default_organization_info = {
+            "about_us": "Мы — надежный партнер в мире уникальных товаров.",
+            "shipping": "Доставка осуществляется по всему Кыргызстану.",
+            "returns": "Возврат и обмен товара возможен в течение 14 дней.",
+            "contact": "Наш магазин находится по адресу: Рынок Кербен. Мы работаем ежедневно с 9:00 до 18:00."
+        }
+        default_settings = {
+            "organization_name": "Gippo312",
+            "whatsapp_number": "+996701202013",
+            "currency_code": "KGS",
+            "chat_name": "EVA",
+            "chat_avatar": None,
+            "color_scheme": "default",
+            "business_type": "retail",
+            "env_mode": "external",
+            "welcome_message_enabled": False,
+            "welcome_message_text": "Добро пожаловать в наш магазин!",
+            "inventory_tracking": False,
+            "admin_password_enabled": False,
+            "admin_password": "",
+            "checkout_fields_enabled": False,
+            "checkout_fields": {"name": False, "phone": False, "city": False, "address": False, "zip": False},
+            "categories_as_lines": False
         }
 
-    if 'products' not in env_data: env_data['products'] =[]
-    if 'categories' not in env_data: env_data['categories'] =[]
-    if 'orders' not in env_data: env_data['orders'] = {}
-    if 'organization_info' not in env_data: env_data['organization_info'] = default_organization_info
-    if 'settings' not in env_data: env_data['settings'] = default_settings
-    if 'employees' not in env_data: env_data['employees'] =[]
-    if 'blocks' not in env_data: env_data['blocks'] =[]
-    if 'inventory_history' not in env_data: env_data['inventory_history'] =[]
-    
-    settings_changed = False
-    for key, value in default_settings.items():
-        if key not in env_data['settings']:
-            env_data['settings'][key] = value
-            settings_changed = True
-
-    products_changed = False
-    for product in env_data['products']:
-        if 'product_id' not in product:
-            product['product_id'] = uuid4().hex
-            products_changed = True
-        if 'views' not in product:
-            product['views'] = 0
-            products_changed = True
-        if 'tags' not in product:
-            product['tags'] =[]
-            products_changed = True
-        else:
-            for tag in product['tags']:
-                if 'stock' not in tag:
-                    tag['stock'] = 0
-                    products_changed = True
-                if 'stock_batches' not in tag:
-                    tag['stock_batches'] = [{"qty": tag['stock'], "price": tag.get('price', 0), "box_price": tag.get('box_price', 0)}]
-                    products_changed = True
+        env_data = all_data.get(env_id, {})
+        if not env_data:
+            env_data = {
+                'products': [], 'categories':[], 'orders': {}, 'employees':[], 'blocks':[],
+                'organization_info': default_organization_info,
+                'settings': default_settings,
+                'inventory_history':[]
+            }
+
+        if 'products' not in env_data: env_data['products'] =[]
+        if 'categories' not in env_data: env_data['categories'] =[]
+        if 'orders' not in env_data: env_data['orders'] = {}
+        if 'organization_info' not in env_data: env_data['organization_info'] = default_organization_info
+        if 'settings' not in env_data: env_data['settings'] = default_settings
+        if 'employees' not in env_data: env_data['employees'] =[]
+        if 'blocks' not in env_data: env_data['blocks'] =[]
+        if 'inventory_history' not in env_data: env_data['inventory_history'] =[]
+        
+        settings_changed = False
+        for key, value in default_settings.items():
+            if key not in env_data['settings']:
+                env_data['settings'][key] = value
+                settings_changed = True
+
+        products_changed = False
+        for product in env_data['products']:
+            if 'product_id' not in product:
+                product['product_id'] = uuid4().hex
+                products_changed = True
+            if 'views' not in product:
+                product['views'] = 0
+                products_changed = True
+            if 'tags' not in product:
+                product['tags'] =[]
+                products_changed = True
+            else:
+                for tag in product['tags']:
+                    if 'stock' not in tag:
+                        tag['stock'] = 0
+                        products_changed = True
+                    if 'stock_batches' not in tag:
+                        tag['stock_batches'] = [{"qty": tag['stock'], "price": tag.get('price', 0), "box_price": tag.get('box_price', 0)}]
+                        products_changed = True
 
-    if products_changed or settings_changed:
-        save_env_data(env_id, env_data)
+        if products_changed or settings_changed:
+            save_env_data(env_id, env_data)
 
-    return env_data
+        return env_data
 
 def save_env_data(env_id, env_data):
-    all_data = load_data()
-    all_data[env_id] = env_data
-    save_data(all_data)
+    with db_lock:
+        all_data = load_data()
+        all_data[env_id] = env_data
+        save_data(all_data)
 
 def configure_gemini():
     if not GOOGLE_API_KEY:
@@ -435,7 +439,7 @@ ADMHOSTO_TEMPLATE = '''
                         <div class="env-actions">
                             <a href="{{ url_for('admin', env_id=env.id) }}" class="button" target="_blank"><i class="fas fa-tools"></i> Админ</a>
                             <a href="{{ url_for('catalog', env_id=env.id) }}" class="button" target="_blank"><i class="fas fa-store"></i> Каталог</a>
-                            <form method="POST" action="{{ url_for('delete_environment', env_id=env.id) }}" style="display:inline;" onsubmit="return confirm('Вы уверены, что хотите удалить среду {{ env.id }}? Это действие необратимо.');">
+                            <form method="POST" action="{{ url_for('delete_environment', env_id=env.id) }}" style="display:inline;" onsubmit="if(!confirm('Вы уверены, что хотите удалить среду {{ env.id }}? Это действие необратимо.')) return false;">
                                 <button type="submit" class="button delete-button"><i class="fas fa-trash-alt"></i></button>
                             </form>
                         </div>
@@ -944,13 +948,12 @@ CATALOG_TEMPLATE = '''
         }
 
         function getProductById(productId) { return allProducts.find(p => p.product_id === productId); }
-        function getProductIndexById(productId) { return allProducts.findIndex(p => p.product_id === productId); }
 
         function openModalById(productId) {
-            const productIndex = getProductIndexById(productId);
-            if (productIndex === -1) { alert("Ошибка: товар не найден."); return; }
+            const product = getProductById(productId);
+            if (!product) { alert("Ошибка: товар не найден."); return; }
             fetch(`/${envId}/track_view/${productId}`, {method: 'POST'}).catch(e=>{});
-            loadProductDetails(productIndex);
+            loadProductDetails(productId);
             const modal = document.getElementById('productModal');
             if (modal) { modal.style.display = "block"; document.body.style.overflow = 'hidden'; }
         }
@@ -961,11 +964,11 @@ CATALOG_TEMPLATE = '''
              if (!document.querySelector('.modal[style*="display: block"]')) { document.body.style.overflow = 'auto'; }
         }
 
-        function loadProductDetails(index) {
+        function loadProductDetails(productId) {
             const modalContent = document.getElementById('modalContent');
             if (!modalContent) return;
             modalContent.innerHTML = '<p style="text-align:center; padding: 40px; font-weight: 600;">Загрузка данных...</p>';
-            fetch(`/${envId}/product/${index}`)
+            fetch(`/${envId}/product/${productId}`)
                 .then(response => {
                     if (!response.ok) throw new Error(`Ошибка ${response.status}`);
                     return response.text();
@@ -1619,7 +1622,7 @@ HISTORY_TEMPLATE = '''
                         <td>{{ "%.2f"|format(order.total_price) }} {{ currency_code }}</td>
                         <td>
                             <a href="{{ url_for('view_order', env_id=env_id, order_id=order.id) }}" style="color: var(--bg-medium); margin-right: 15px; padding: 10px; display: inline-block;"><i class="fas fa-eye fa-lg"></i></a>
-                            <form method="POST" action="{{ url_for('delete_order', env_id=env_id, order_id=order.id) }}" style="display:inline;" onsubmit="return confirm('Вы уверены, что хотите удалить заказ навсегда?');">
+                            <form method="POST" action="{{ url_for('delete_order', env_id=env_id, order_id=order.id) }}" style="display:inline;" onsubmit="if(!confirm('Вы уверены, что хотите удалить заказ навсегда?')) return false;">
                                 <button type="submit" class="delete-btn"><i class="fas fa-trash-alt"></i></button>
                             </form>
                         </td>
@@ -2575,7 +2578,7 @@ ADMIN_TEMPLATE = '''
                              {% if settings.env_mode == '2in1' %}
                              <a href="{{ url_for('pos_page', env_id=env_id) }}?emp={{ emp.id }}" class="button" style="background-color: #28a745; font-size: 0.9rem;" target="_blank"><i class="fas fa-desktop"></i> Ссылка на кассу</a>
                              {% endif %}
-                             <form method="POST" action="{{ url_for('admin', env_id=env_id, p=page, q=search_q) }}" style="margin: 0;" onsubmit="return confirm('Удалить сотрудника?');">
+                             <form method="POST" action="{{ url_for('admin', env_id=env_id, p=page, q=search_q) }}" style="margin: 0;" onsubmit="if(!confirm('Удалить сотрудника?')) return false;">
                                  <input type="hidden" name="action" value="delete_employee">
                                  <input type="hidden" name="emp_id" value="{{ emp.id }}">
                                  <button type="submit" class="delete-button" style="margin: 0;"><i class="fas fa-trash-alt"></i></button>
@@ -2634,7 +2637,7 @@ ADMIN_TEMPLATE = '''
                                      <input type="hidden" name="block_id" value="{{ block.id }}">
                                      <button type="submit" class="button btn-small" style="background: #6c757d;" {% if loop.last %}disabled{% endif %}><i class="fas fa-arrow-down"></i></button>
                                  </form>
-                                 <form method="POST" action="{{ url_for('admin', env_id=env_id, p=page, q=search_q) }}" style="margin: 0;" onsubmit="return confirm('Удалить блок?');">
+                                 <form method="POST" action="{{ url_for('admin', env_id=env_id, p=page, q=search_q) }}" style="margin: 0;" onsubmit="if(!confirm('Удалить блок?')) return false;">
                                      <input type="hidden" name="action" value="delete_block">
                                      <input type="hidden" name="block_id" value="{{ block.id }}">
                                      <button type="submit" class="button delete-button btn-small"><i class="fas fa-trash-alt"></i></button>
@@ -2750,7 +2753,7 @@ ADMIN_TEMPLATE = '''
                              {% for category in categories %}
                              <div class="item" style="display: flex; justify-content: space-between; align-items: center;">
                                  <span style="font-size: 1.05rem; font-weight: 500;">{{ category }}</span>
-                                 <form method="POST" action="{{ url_for('admin', env_id=env_id, p=page, q=search_q) }}" style="margin: 0;" onsubmit="return confirm('Вы уверены? Товары этой категории будут помечены как \'Без категории\'.');">
+                                 <form method="POST" action="{{ url_for('admin', env_id=env_id, p=page, q=search_q) }}" style="margin: 0;" onsubmit="if(!confirm('Вы уверены? Товары этой категории будут помечены как \\'Без категории\\'.')) return false;">
                                      <input type="hidden" name="action" value="delete_category">
                                      <input type="hidden" name="category_name" value="{{ category }}">
                                      <button type="submit" class="delete-button" style="margin: 0;"><i class="fas fa-trash-alt"></i></button>
@@ -2889,15 +2892,15 @@ ADMIN_TEMPLATE = '''
                         </div>
 
                         <div class="item-actions">
-                             <button type="button" class="button" onclick="toggleEditForm('edit-form-{{ loop.index0 }}', {{ loop.index0 }})"><i class="fas fa-edit"></i> Редактировать</button>
-                            <form method="POST" action="{{ url_for('admin', env_id=env_id, p=page, q=search_q) }}" style="margin:0;" onsubmit="return confirm('Удалить товар?'); showLoadingOverlay();">
+                             <button type="button" class="button" onclick="toggleEditForm('edit-form-{{ product.product_id }}', '{{ product.product_id }}')"><i class="fas fa-edit"></i> Редактировать</button>
+                            <form method="POST" action="{{ url_for('admin', env_id=env_id, p=page, q=search_q) }}" style="margin:0;" onsubmit="if(!confirm('Удалить товар?')) return false; showLoadingOverlay(); return true;">
                                 <input type="hidden" name="action" value="delete_product">
                                 <input type="hidden" name="product_id" value="{{ product.get('product_id', '') }}">
                                 <button type="submit" class="delete-button"><i class="fas fa-trash-alt"></i> Удалить</button>
                             </form>
                         </div>
 
-                        <div id="edit-form-{{ loop.index0 }}" class="edit-form-container">
+                        <div id="edit-form-{{ product.product_id }}" class="edit-form-container">
                             <h4 style="margin-top: 0; font-size: 1.1rem;"><i class="fas fa-edit"></i> Редактирование</h4>
                             <form method="POST" action="{{ url_for('admin', env_id=env_id, p=page, q=search_q) }}" enctype="multipart/form-data" onsubmit="showLoadingOverlay()">
                                 <input type="hidden" name="action" value="edit_product">
@@ -2906,21 +2909,21 @@ ADMIN_TEMPLATE = '''
                                 <input type="text" name="name" value="{{ product['name'] }}" required>
 
                                 <label>Заменить фотографии (выбор новых удалит старые):</label>
-                                <input type="file" id="edit_photos_{{ loop.index0 }}" name="photos" accept="image/*" multiple onchange="handleFileSelect(event, 'edit_{{ loop.index0 }}')">
+                                <input type="file" id="edit_photos_{{ product.product_id }}" name="photos" accept="image/*" multiple onchange="handleFileSelect(event, 'edit_{{ product.product_id }}')">
                                 
                                 <div style="margin-top: 20px; border: 1px solid #ccc; padding: 15px; border-radius: 8px; background: #fafafa;">
                                      <h4 style="margin-top: 0;"><i class="fas fa-tags"></i> Отметки товаров на фото</h4>
-                                     <div id="thumbs-edit_{{ loop.index0 }}" class="thumbnail-row"></div>
-                                     <input type="hidden" name="tags_json" id="tags_json_edit_{{ loop.index0 }}" value='{{ product.get("tags",[])|tojson|safe }}'>
-                                     <div id="tagging-container-edit_{{ loop.index0 }}" class="tagging-container">
-                                         <img id="tagging-img-edit_{{ loop.index0 }}" class="tagging-img" onclick="handleTagClick(event, 'edit_{{ loop.index0 }}')">
-                                         <div id="tag-markers-edit_{{ loop.index0 }}"></div>
+                                     <div id="thumbs-edit_{{ product.product_id }}" class="thumbnail-row"></div>
+                                     <input type="hidden" name="tags_json" id="tags_json_edit_{{ product.product_id }}" value='{{ product.get("tags",[])|tojson|safe }}'>
+                                     <div id="tagging-container-edit_{{ product.product_id }}" class="tagging-container">
+                                         <img id="tagging-img-edit_{{ product.product_id }}" class="tagging-img" onclick="handleTagClick(event, 'edit_{{ product.product_id }}')">
+                                         <div id="tag-markers-edit_{{ product.product_id }}"></div>
                                      </div>
-                                     <div id="tags-list-edit_{{ loop.index0 }}" style="margin-top: 15px;"></div>
+                                     <div id="tags-list-edit_{{ product.product_id }}" style="margin-top: 15px;"></div>
                                 </div>
 
                                 <label>Описание:</label>
-                                <textarea id="edit_description_{{ loop.index0 }}" name="description" rows="4">{{ product.get('description', '') }}</textarea>
+                                <textarea id="edit_description_{{ product.product_id }}" name="description" rows="4">{{ product.get('description', '') }}</textarea>
                                 
                                 <label>Категория:</label>
                                 <select name="category">
@@ -2931,12 +2934,12 @@ ADMIN_TEMPLATE = '''
                                 </select>
 
                                 <div style="margin-top: 20px; display: flex; align-items: center; gap: 8px;">
-                                     <input type="checkbox" id="edit_in_stock_{{ loop.index0 }}" name="in_stock" {% if product.get('in_stock', True) %}checked{% endif %}>
-                                     <label for="edit_in_stock_{{ loop.index0 }}" class="inline-label" style="margin: 0;">В наличии</label>
+                                     <input type="checkbox" id="edit_in_stock_{{ product.product_id }}" name="in_stock" {% if product.get('in_stock', True) %}checked{% endif %}>
+                                     <label for="edit_in_stock_{{ product.product_id }}" class="inline-label" style="margin: 0;">В наличии</label>
                                 </div>
                                 <div style="margin-top: 10px; display: flex; align-items: center; gap: 8px;">
-                                     <input type="checkbox" id="edit_is_top_{{ loop.index0 }}" name="is_top" {% if product.get('is_top', False) %}checked{% endif %}>
-                                     <label for="edit_is_top_{{ loop.index0 }}" class="inline-label" style="margin: 0;">Топ товар</label>
+                                     <input type="checkbox" id="edit_is_top_{{ product.product_id }}" name="is_top" {% if product.get('is_top', False) %}checked{% endif %}>
+                                     <label for="edit_is_top_{{ product.product_id }}" class="inline-label" style="margin: 0;">Топ товар</label>
                                 </div>
                                 <br>
                                 <button type="submit" class="add-button" style="margin-top: 25px;"><i class="fas fa-save"></i> Сохранить</button>
@@ -3034,14 +3037,14 @@ ADMIN_TEMPLATE = '''
                 if(!formStates[scope]) formStates[scope] = { tags:[], fileUrls:[], currentIdx: 0, isEdit: scope.startsWith('edit_') };
             }
 
-            function toggleEditForm(formId, index) {
+            function toggleEditForm(formId, productId) {
                 const formContainer = document.getElementById(formId);
                 if (formContainer) {
                     const isOpening = formContainer.style.display === 'none' || formContainer.style.display === '';
                     formContainer.style.display = isOpening ? 'block' : 'none';
                     if (isOpening) {
-                        const scope = `edit_${index}`;
-                        const product = allProductsForAdmin[index];
+                        const scope = `edit_${productId}`;
+                        const product = allProductsForAdmin.find(p => p.product_id === productId);
                         initScope(scope);
                         
                         let tags =[];
@@ -3278,14 +3281,11 @@ ADMIN_TEMPLATE = '''
              }
 
              window.openAdminPost = function(pid) {
-                 const index = allProductsForAdmin.findIndex(p => p.product_id === pid);
-                 if (index !== -1) {
-                     const el = document.getElementById(`edit-form-${index}`);
-                     if (el && (el.style.display === 'none' || el.style.display === '')) {
-                         toggleEditForm(`edit-form-${index}`, index);
-                     }
-                     if (el) el.scrollIntoView({behavior: 'smooth', block: 'center'});
+                 const el = document.getElementById(`edit-form-${pid}`);
+                 if (el && (el.style.display === 'none' || el.style.display === '')) {
+                     toggleEditForm(`edit-form-${pid}`, pid);
                  }
+                 if (el) el.scrollIntoView({behavior: 'smooth', block: 'center'});
              };
 
              async function sendAdminAi(predefinedText) {
@@ -3318,7 +3318,6 @@ ADMIN_TEMPLATE = '''
     </body>
     </html>
 '''
-
 @app.route('/')
 def index():
     return render_template_string(LANDING_PAGE_TEMPLATE)
@@ -3350,7 +3349,7 @@ def create_environment():
         if new_id not in all_data:
             break
     all_data[new_id] = {
-        'products': [], 'categories': [], 'orders': {}, 'employees':[], 'blocks':[],
+        'products': [], 'categories':[], 'orders': {}, 'employees':[], 'blocks':[],
         'organization_info': {
             "about_us": "Мы — Gippo312, ваш надежный партнер в мире уникальных товаров.",
             "shipping": "Доставка осуществляется по всему Кыргызстану.",
@@ -3700,8 +3699,8 @@ def track_view(env_id, product_id):
     save_env_data(env_id, data)
     return jsonify({"status": "ok"})
 
-@app.route('/<env_id>/product/<int:index>')
-def product_detail(env_id, index):
+@app.route('/<env_id>/product/<product_id>')
+def product_detail(env_id, product_id):
     data = get_env_data(env_id)
     all_products_raw = data.get('products',[])
     settings = data.get('settings', {})
@@ -3722,10 +3721,11 @@ def product_detail(env_id, index):
             products_in_stock.append(p)
             
     products_sorted = sorted(products_in_stock, key=lambda p: (not p.get('is_top', False), p.get('name', '').lower()))
-    try:
-        product = products_sorted[index]
-    except IndexError:
+    
+    product = next((p for p in products_sorted if p.get('product_id') == product_id), None)
+    if not product:
         return "Товар не найден или отсутствует в наличии.", 404
+        
     return render_template_string(
         PRODUCT_DETAIL_TEMPLATE, product=product, repo_id=REPO_ID,
         currency_code=settings.get('currency_code', 'KGS'), settings=settings, env_id=env_id