Update app.py

app.py

@@ -26,7 +26,7 @@ app = Flask(__name__)
 
 DATA_FILE = 'datatestoboto.json'
 
-REPO_ID = "Kgshop/bottest"
+REPO_ID = "Kgshop/bottest"  # Changed repository ID
 HF_TOKEN_WRITE = os.getenv("HF_TOKEN")
 HF_TOKEN_READ = os.getenv("HF_TOKEN_READ")
 
@@ -51,7 +51,32 @@ def load_data():
         return loaded_data
     except Exception as e:
         logger.error(f"Ошибка при загрузке данных: {e}")
-        return {'products': [], 'orders': [], 'categories': [], 'users': []}
+        # If download fails AND local file doesn't exist or is corrupted, return empty structure
+        if not os.path.exists(DATA_FILE) or not isinstance(load_data_from_local(), dict):
+             return {'products': [], 'orders': [], 'categories': [], 'users': []}
+        else:
+            # If download fails but local data is usable, load local data
+            logger.warning("Загрузка с HF не удалась, использую локальные данные.")
+            return load_data_from_local()
+
+def load_data_from_local():
+    try:
+         with open(DATA_FILE, 'r', encoding='utf-8') as f:
+             loaded_data = json.load(f)
+             if not (isinstance(loaded_data, dict) and 'products' in loaded_data and 'orders' in loaded_data):
+                 return {'products': [], 'orders': [], 'categories': [], 'users': []}
+             if "categories" not in loaded_data:
+                loaded_data["categories"] = []
+             if "users" not in loaded_data:
+                loaded_data["users"] = []
+             for order in loaded_data['orders']:
+                 if 'completed' not in order:
+                     order['completed'] = False
+             return loaded_data
+    except Exception as e:
+         logger.error(f"Ошибка при загрузке локальных данных: {e}")
+         return {'products': [], 'orders': [], 'categories': [], 'users': []}
+
 
 def save_data(data):
     try:
@@ -65,6 +90,10 @@ def upload_db_to_hf():
         if not HF_TOKEN_WRITE:
              logger.warning("HF_TOKEN_WRITE не установлен. Пропуск загрузки на Hugging Face.")
              return
+        if not os.path.exists(DATA_FILE):
+             logger.warning(f"Файл данных {DATA_FILE} не найден. Пропуск загрузки на Hugging Face.")
+             return
+
         api = HfApi()
         api.upload_file(
             path_or_fileobj=DATA_FILE,
@@ -95,10 +124,7 @@ def download_db_from_hf():
         logger.info("База скачана из Hugging Face")
     except Exception as e:
         logger.error(f"Ошибка при скачивании: {e}")
-        if not os.path.exists(DATA_FILE):
-             raise
-        else:
-             logger.warning(f"Продолжение работы с локальной базой ({DATA_FILE}) из-за ошибки скачивания.")
+        raise
 
 def start_periodic_backup():
     def backup_loop():
@@ -132,9 +158,10 @@ def get_product_keyboard(product_id):
 @dp.message(Command("start"))
 async def cmd_start(message: types.Message):
     user_id = message.from_user.id
-    if user_id not in data['users']:
+    if user_id not in data.get('users', []):
         data['users'].append(user_id)
         save_data(data)
+        upload_db_to_hf() # Upload after adding a new user
         logger.info(f"Новый пользователь добавлен: {user_id}")
     await message.answer("Здравствуйте ! это магазин Routine!. Выберите действие:", reply_markup=get_main_keyboard())
 
@@ -151,9 +178,10 @@ async def show_products_in_category(callback_query: types.CallbackQuery):
         cat_id = int(callback_query.data.split('_')[1])
         products_in_cat = [p for p in data['products'] if p.get('category_id') == cat_id]
 
+        await bot.answer_callback_query(callback_query.id) # Answer immediately
+
         if not products_in_cat:
             await bot.send_message(callback_query.from_user.id, "В этой категории нет товаров.")
-            await bot.answer_callback_query(callback_query.id)
             return
 
         async def send_product_batch(products_batch):
@@ -169,36 +197,39 @@ async def show_products_in_category(callback_query: types.CallbackQuery):
                                 media_group.append(InputMediaPhoto(media=photo_url, caption=caption))
                             else:
                                 media_group.append(InputMediaPhoto(media=photo_url))
-                        await bot.send_media_group(chat_id=callback_query.from_user.id, media=media_group)
+                        if media_group: # Send media group only if there are photos
+                            await bot.send_media_group(chat_id=callback_query.from_user.id, media=media_group)
+                        # Always send the keyboard separately for reliability, especially with media groups
                         await bot.send_message(callback_query.from_user.id, "Выберите действие:", reply_markup=get_product_keyboard(product['id']))
                     else:
                         await bot.send_message(callback_query.from_user.id, caption, reply_markup=get_product_keyboard(product['id']))
                 except Exception as e:
-                    logger.error(f"Ошибка при отправке медиа или сообщения: {e}")
+                    logger.error(f"Ошибка при отправке медиа или сообщения для товара {product.get('id')}: {e}")
+                    # Fallback to sending text if media fails
                     await bot.send_message(callback_query.from_user.id, caption, reply_markup=get_product_keyboard(product['id']))
 
-        batch_size = 5
+        batch_size = 3 # Adjusted batch size for potentially faster sending
         for i in range(0, len(products_in_cat), batch_size):
             batch = products_in_cat[i:i + batch_size]
             await send_product_batch(batch)
-            await asyncio.sleep(0.1)
+            await asyncio.sleep(0.5) # Increase sleep slightly
 
-        await bot.answer_callback_query(callback_query.id)
     except Exception as e:
         logger.error(f"Ошибка в show_products_in_category: {e}")
-        await bot.answer_callback_query(callback_query.id, "Ошибка при загрузке товаров")
+        await bot.send_message(callback_query.from_user.id, "Произошла ошибка при загрузке товаров.")
+
 
 @dp.message(F.text == "🛒 Корзина")
 async def show_cart(message: types.Message):
     user_id = message.from_user.id
-    cart = next((o for o in data['orders'] if o['user_id'] == user_id and not o.get('completed')), None)
+    cart = next((o for o in data.get('orders', []) if o['user_id'] == user_id and not o.get('completed')), None)
     if not cart or not cart['items']:
         await message.answer("Ваша корзина пуста.")
         return
     total = 0
     response = "Ваша корзина:\n"
     for item in cart['items']:
-        product = next((p for p in data['products'] if p['id'] == item['product_id']), None)
+        product = next((p for p in data.get('products', []) if p['id'] == item['product_id']), None)
         if product:
              response += f"🏷 {product['name']} - {product['price']} сом x {item['quantity']}\n"
              total += product['price'] * item['quantity']
@@ -229,15 +260,16 @@ async def confirm_add_to_cart(callback_query: types.CallbackQuery):
         parts = callback_query.data.split('_')
         product_id = int(parts[1])
         quantity = int(parts[2])
-        product = next((p for p in data['products'] if p['id'] == product_id), None)
+        product = next((p for p in data.get('products', []) if p['id'] == product_id), None)
         if product:
             user_id = callback_query.from_user.id
-            cart = next((o for o in data['orders'] if o['user_id'] == user_id and not o.get('completed')), None)
+            cart = next((o for o in data.get('orders', []) if o['user_id'] == user_id and not o.get('completed')), None)
             if not cart:
                 cart = {'user_id': user_id, 'items': [], 'date': datetime.now().isoformat(), 'completed': False}
                 data['orders'].append(cart)
             cart['items'].append({'product_id': product_id, 'quantity': quantity})
             save_data(data)
+            upload_db_to_hf()
             await bot.answer_callback_query(callback_query.id, "Товар добавлен в корзину!")
         else:
             await bot.answer_callback_query(callback_query.id, "Товар не найден")
@@ -249,12 +281,12 @@ async def confirm_add_to_cart(callback_query: types.CallbackQuery):
 async def complete_order(callback_query: types.CallbackQuery):
     try:
         user_id = int(callback_query.data.split('_')[1])
-        cart = next((o for o in data['orders'] if o['user_id'] == user_id and not o.get('completed')), None)
+        cart = next((o for o in data.get('orders', []) if o['user_id'] == user_id and not o.get('completed')), None)
         if cart and cart['items']:
             total = 0
             cart_text = "Привет, я хочу сделать заказ:\n"
             for item in cart['items']:
-                product = next((p for p in data['products'] if p['id'] == item['product_id']), None)
+                product = next((p for p in data.get('products', []) if p['id'] == item['product_id']), None)
                 if product:
                     cart_text += f"{product['name']} - {product['price']} сом x {item['quantity']}\n"
                     total += product['price'] * item['quantity']
@@ -265,6 +297,8 @@ async def complete_order(callback_query: types.CallbackQuery):
             cart['completed'] = True
             cart['date'] = datetime.now().isoformat()
             save_data(data)
+            upload_db_to_hf()
+
 
             await bot.send_message(user_id, f"Ваш заказ принят! Для завершения оформите его через WhatsApp:\n{whatsapp_link}")
             await bot.answer_callback_query(callback_query.id)
@@ -277,16 +311,24 @@ async def complete_order(callback_query: types.CallbackQuery):
 @dp.message(F.text == "📦 Заказы")
 async def show_orders(message: types.Message):
     user_id = message.from_user.id
-    user_orders = [o for o in data['orders'] if o.get('completed') and o['user_id'] == user_id]
+    user_orders = [o for o in data.get('orders', []) if o.get('completed') and o['user_id'] == user_id]
     if not user_orders:
         await message.answer("У вас нет оформленных заказов.")
         return
     response_list = ["Ваши оформленные заказы:\n"]
     for order in user_orders:
-        order_text = f"--- Заказ от {datetime.fromisoformat(order['date']).strftime('%Y-%m-%d %H:%M')} ---\n"
+        # Safely handle potential missing 'date' key or invalid format
+        date_str = order.get('date', 'Неизвестная дата')
+        try:
+             date_obj = datetime.fromisoformat(date_str)
+             formatted_date = date_obj.strftime('%Y-%m-%d %H:%M')
+        except ValueError:
+             formatted_date = date_str
+
+        order_text = f"--- Заказ от {formatted_date} ---\n"
         total = 0
         for item in order['items']:
-            product = next((p for p in data['products'] if p['id'] == item['product_id']), None)
+            product = next((p for p in data.get('products', []) if p['id'] == item['product_id']), None)
             if product:
                  order_text += f"🏷 {product['name']} - {product['price']} сом x {item['quantity']}\n"
                  total += product['price'] * item['quantity']
@@ -472,7 +514,7 @@ admin_html = """
                     {% for order in completed_orders %}
                     <div class="item">
                         Пользователь: {{ order.user_id }}<br>
-                        Дата: {{ order.date }}<br>
+                         Дата: {{ order.date | default('Неизвестная дата') }}<br>
                         Товары:
                         {% for item in order['items'] %}
                             {% set product = products | selectattr('id', 'equalto', item.product_id) | first %}
@@ -499,7 +541,7 @@ admin_html = """
                     {% for order in pending_orders %}
                     <div class="item">
                         Пользователь: {{ order.user_id }}<br>
-                        Дата создания: {{ order.date }}<br>
+                        Дата создания: {{ order.date | default('Неизвестная дата') }}<br>
                         Товары в корзине:
                         {% for item in order['items'] %}
                              {% set product = products | selectattr('id', 'equalto', item.product_id) | first %}
@@ -577,7 +619,7 @@ def add_product():
         description = request.form['description']
         category_id = int(request.form['category_id'])
         photos = request.files.getlist('photo')
-        product_id = max((p['id'] for p in data['products']), default=0) + 1
+        product_id = max((p['id'] for p in data.get('products', [])), default=0) + 1
 
         photos_filenames = []
         if HF_TOKEN_WRITE:
@@ -621,12 +663,13 @@ def add_product():
         return redirect("/")
     except Exception as e:
         logger.error(f"Ошибка при добавлении товара: {e}")
-        return jsonify({'status': 'error', 'message': str(e)}), 500
+        # Redirect on error instead of jsonify for better admin panel flow
+        return redirect("/")
 
 @app.route('/delete_product/<int:product_id>', methods=['POST'])
 def delete_product(product_id):
     try:
-        data['products'] = [p for p in data['products'] if p['id'] != product_id]
+        data['products'] = [p for p in data.get('products', []) if p['id'] != product_id]
         save_data(data)
         upload_db_to_hf()
         update_event.set()
@@ -639,7 +682,7 @@ def delete_product(product_id):
 def add_category():
     try:
         name = request.form['name']
-        category_id = max((c['id'] for c in data['categories']), default=0) + 1
+        category_id = max((c['id'] for c in data.get('categories', [])), default=0) + 1
         data['categories'].append({'id': category_id, 'name': name})
         save_data(data)
         upload_db_to_hf()
@@ -647,12 +690,12 @@ def add_category():
         return redirect("/")
     except Exception as e:
         logger.error(f"Ошибка при добавлении категории: {e}")
-        return jsonify({'status': 'error', 'message': str(e)}), 500
+        return redirect("/")
 
 @app.route('/delete_category/<int:category_id>', methods=['POST'])
 def delete_category(category_id):
     try:
-        data['categories'] = [c for c in data['categories'] if c['id'] != category_id]
+        data['categories'] = [c for c in data.get('categories', []) if c['id'] != category_id]
         save_data(data)
         upload_db_to_hf()
         update_event.set()
@@ -675,10 +718,12 @@ async def async_send_broadcast(bot: Bot, user_ids: list[int], text: str, media_u
             await asyncio.sleep(0.1)
         except Exception as e:
             failed_count += 1
+            # Log specific error for the user
             logger.error(f"Не удалось отправить объявление пользователю {user_id}: {e}")
             await asyncio.sleep(0.1)
     logger.info(f"Рассылка завершена. Успешно отправлено: {sent_count}, Ошибок: {failed_count}")
 
+
 @app.route('/send_announcement', methods=['POST'])
 def send_announcement():
     try:
@@ -689,14 +734,14 @@ def send_announcement():
         if not text:
             return jsonify({'status': 'error', 'message': 'Текст объявления обязателен'}), 400
 
-        # Wait briefly for the bot to be ready
-        if not bot_is_ready.wait(timeout=10): # Wait up to 10 seconds
-             logger.error("Бот не стал готов в течение 10 секунд.")
-             return jsonify({'status': 'error', 'message': 'Бот еще не готов. Попробуйте позже.'}), 503
+        # Check if the bot's asyncio loop is available and the bot is ready
+        # Increased timeout to 20 seconds as startup might take longer
+        if not bot_is_ready.wait(timeout=20) or asyncio_loop is None:
+             logger.error("Бот не стал готов в течение 20 секунд или asyncio_loop не установлен.")
+             # Redirect instead of jsonify for better admin panel UX on this specific error
+             # return jsonify({'status': 'error', 'message': 'Бот еще не готов. Попробуйте позже.'}), 503
+             return redirect("/?error=bot_not_ready") # Redirect and indicate error
 
-        if asyncio_loop is None:
-             logger.error("asyncio_loop не инициализирован после ожидания bot_is_ready.")
-             return jsonify({'status': 'error', 'message': 'Внутренняя ошибка сервера: петля событий бота не инициализирована.'}), 500
 
         if media_file and media_file.filename:
              if HF_TOKEN_WRITE:
@@ -729,22 +774,21 @@ def send_announcement():
 
         user_ids_to_send = list(data.get('users', []))
         if user_ids_to_send:
-            # Use call_soon_threadsafe to schedule the async function on the bot's event loop
             asyncio_loop.call_soon_threadsafe(
-                asyncio_loop.create_task, # Use create_task to run the coroutine
+                asyncio_loop.create_task,
                 async_send_broadcast(bot, user_ids_to_send, text, media_url)
             )
             logger.info(f"Задача рассылки поставлена в очередь для {len(user_ids_to_send)} пользователей.")
         else:
             logger.warning("Нет пользователей для отправки объявления.")
 
-        # Always redirect back to the admin page after processing
         return redirect("/")
 
     except Exception as e:
         logger.error(f"Ошибка при обработке запроса отправки объявления: {e}")
         # Redirect on unexpected errors as well
-        return redirect("/")
+        return redirect("/?error=send_failed") # Redirect and indicate error
+
 
 @app.route('/updates')
 def sse_updates():
@@ -770,6 +814,9 @@ def run_flask():
     app.run(host='0.0.0.0', port=7860, debug=True, use_reloader=False)
 
 if __name__ == '__main__':
+    # Load data initially
+    data = load_data() # Ensure data is loaded before starting Flask/bot
+
     flask_thread = threading.Thread(target=run_flask, daemon=True)
     flask_thread.start()
     logger.info("Flask запущен")