diff --git "a/app.py" "b/app.py" --- "a/app.py" +++ "b/app.py" @@ -1,17 +1,23 @@ -from flask import Flask, render_template_string, request, redirect, url_for, send_file, flash, jsonify -import json import os +import io +import base64 +import json import logging import threading import time from datetime import datetime +from uuid import uuid4 + +from flask import Flask, render_template_string, request, redirect, url_for, flash, jsonify, Response +from PIL import Image +import google.generativeai as genai +import numpy as np from huggingface_hub import HfApi, hf_hub_download from huggingface_hub.utils import RepositoryNotFoundError, HfHubHTTPError from werkzeug.utils import secure_filename from dotenv import load_dotenv import requests -import uuid load_dotenv() @@ -24,8 +30,10 @@ SYNC_FILES = [DATA_FILE] REPO_ID = "Kgshop/oco" 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 контейнер " +WHATSAPP_NUMBER = "+996779075126" CURRENCY_CODE = 'KGS' CURRENCY_NAME = 'Кыргызский сом' @@ -42,14 +50,12 @@ def download_db_from_hf(specific_file=None, retries=DOWNLOAD_RETRIES, delay=DOWN token_to_use = HF_TOKEN_READ if HF_TOKEN_READ else HF_TOKEN_WRITE files_to_download = [specific_file] if specific_file else SYNC_FILES - logging.info(f"Attempting download for {files_to_download} from {REPO_ID}...") all_successful = True for file_name in files_to_download: success = False for attempt in range(retries + 1): try: - logging.info(f"Downloading {file_name} (Attempt {attempt + 1}/{retries + 1})...") local_path = hf_hub_download( repo_id=REPO_ID, filename=file_name, @@ -60,50 +66,42 @@ def download_db_from_hf(specific_file=None, retries=DOWNLOAD_RETRIES, delay=DOWN force_download=True, resume_download=False ) - logging.info(f"Successfully downloaded {file_name} to {local_path}.") success = True break except RepositoryNotFoundError: - logging.error(f"Repository {REPO_ID} not found. Download cancelled for all files.") return False except HfHubHTTPError as e: if e.response.status_code == 404: - logging.warning(f"File {file_name} not found in repo {REPO_ID} (404). Skipping this file.") if attempt == 0 and not os.path.exists(file_name): try: if file_name == DATA_FILE: with open(file_name, 'w', encoding='utf-8') as f: - json.dump({'products': [], 'categories': [], 'orders': {}}, f) - logging.info(f"Created empty local file {file_name} because it was not found on HF.") + json.dump({'products': [], 'categories': [], 'orders': {}, 'organization_info': {}}, f) except Exception as create_e: - logging.error(f"Failed to create empty local file {file_name}: {create_e}") + pass success = False break else: - logging.error(f"HTTP error downloading {file_name} (Attempt {attempt + 1}): {e}. Retrying in {delay}s...") + pass except requests.exceptions.RequestException as e: - logging.error(f"Network error downloading {file_name} (Attempt {attempt + 1}): {e}. Retrying in {delay}s...") + pass except Exception as e: - logging.error(f"Unexpected error downloading {file_name} (Attempt {attempt + 1}): {e}. Retrying in {delay}s...", exc_info=True) + pass if attempt < retries: time.sleep(delay) if not success: - logging.error(f"Failed to download {file_name} after {retries + 1} attempts.") all_successful = False - logging.info(f"Download process finished. Overall success: {all_successful}") return all_successful def upload_db_to_hf(specific_file=None): if not HF_TOKEN_WRITE: - logging.warning("HF_TOKEN (for writing) not set. Skipping upload to Hugging Face.") return try: api = HfApi() files_to_upload = [specific_file] if specific_file else SYNC_FILES - logging.info(f"Starting upload of {files_to_upload} to HF repo {REPO_ID}...") for file_name in files_to_upload: if os.path.exists(file_name): @@ -116,647 +114,1096 @@ def upload_db_to_hf(specific_file=None): token=HF_TOKEN_WRITE, commit_message=f"Sync {file_name} {datetime.now().strftime('%Y-%m-%d %H:%M:%S')}" ) - logging.info(f"File {file_name} successfully uploaded to Hugging Face.") except Exception as e: - logging.error(f"Error uploading file {file_name} to Hugging Face: {e}") + pass else: - logging.warning(f"File {file_name} not found locally, skipping upload.") - logging.info("Finished uploading files to HF.") + pass except Exception as e: - logging.error(f"General error during Hugging Face upload initialization or process: {e}", exc_info=True) + pass def periodic_backup(): backup_interval = 1800 - logging.info(f"Setting up periodic backup every {backup_interval} seconds.") while True: time.sleep(backup_interval) - logging.info("Starting periodic backup...") upload_db_to_hf() - logging.info("Periodic backup finished.") def load_data(): - default_data = {'products': [], 'categories': [], 'orders': {}} + default_organization_info = { + "about_us": "Мы — O&CO, ваш надежный партнер в мире уникальных товаров. Мы предлагаем широкий ассортимент продукции, от электроники до товаров для дома, всегда стремясь к качеству и доступности. Наша миссия — сделать ваш шопинг приятным и удобным, предлагая только лучшие товары, тщательно отобранные для вас.", + "shipping": "Доставка осуществляется по всему Кыргызстану. Стоимость и сроки доставки зависят от региона и веса товара. По Бишкеку доставка возможна в течение 1-2 рабочих дней, в регионы — от 3 до 7 дней. Для уточнения деталей свяжитесь с нами.", + "returns": "Возврат и обмен товара возможен в течение 14 дней с момента покупки, при условии сохранения товарного вида, упаковки и чека. Некоторые категории товаров могут иметь особые условия возврата. Пожалуйста, свяжитесь с нами для оформления возврата или обмена.", + "contact": f"Наш магазин находится по адресу: {STORE_ADDRESS}. Связаться с нами можно по телефону: {WHATSAPP_NUMBER} или через WhatsApp по этому же номеру. Мы работаем ежедневно с 9:00 до 18:00." + } + default_data = {'products': [], 'categories': [], 'orders': {}, 'organization_info': default_organization_info} + data = default_data try: with open(DATA_FILE, 'r', encoding='utf-8') as file: data = json.load(file) - logging.info(f"Local data loaded successfully from {DATA_FILE}") if not isinstance(data, dict): - logging.warning(f"Local {DATA_FILE} is not a dictionary. Attempting download.") raise FileNotFoundError if 'products' not in data: data['products'] = [] if 'categories' not in data: data['categories'] = [] if 'orders' not in data: data['orders'] = {} - return data + if 'organization_info' not in data: data['organization_info'] = default_organization_info except FileNotFoundError: - logging.warning(f"Local file {DATA_FILE} not found. Attempting download from HF.") + if download_db_from_hf(specific_file=DATA_FILE): + try: + with open(DATA_FILE, 'r', encoding='utf-8') as file: + data = json.load(file) + if not isinstance(data, dict): + data = default_data + if 'products' not in data: data['products'] = [] + 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 + except (FileNotFoundError, json.JSONDecodeError, Exception) as e: + data = default_data + else: + data = default_data except json.JSONDecodeError: - logging.error(f"Error decoding JSON in local {DATA_FILE}. File might be corrupt. Attempting download.") - - if download_db_from_hf(specific_file=DATA_FILE): - try: - with open(DATA_FILE, 'r', encoding='utf-8') as file: - data = json.load(file) - logging.info(f"Data loaded successfully from {DATA_FILE} after download.") - if not isinstance(data, dict): - logging.error(f"Downloaded {DATA_FILE} is not a dictionary. Using default.") - return default_data - if 'products' not in data: data['products'] = [] - if 'categories' not in data: data['categories'] = [] - if 'orders' not in data: data['orders'] = {} - return data - except FileNotFoundError: - logging.error(f"File {DATA_FILE} still not found even after download reported success. Using default.") - return default_data - except json.JSONDecodeError: - logging.error(f"Error decoding JSON in downloaded {DATA_FILE}. Using default.") - return default_data - except Exception as e: - logging.error(f"Unknown error loading downloaded {DATA_FILE}: {e}. Using default.", exc_info=True) - return default_data - else: - logging.error(f"Failed to download {DATA_FILE} from HF after retries. Using empty default data structure.") - if not os.path.exists(DATA_FILE): + if download_db_from_hf(specific_file=DATA_FILE): try: - with open(DATA_FILE, 'w', encoding='utf-8') as f: - json.dump(default_data, f) - logging.info(f"Created empty local file {DATA_FILE} after failed download.") - except Exception as create_e: - logging.error(f"Failed to create empty local file {DATA_FILE}: {create_e}") - return default_data + with open(DATA_FILE, 'r', encoding='utf-8') as file: + data = json.load(file) + if not isinstance(data, dict): + data = default_data + if 'products' not in data: data['products'] = [] + 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 + except (FileNotFoundError, json.JSONDecodeError, Exception) as e: + data = default_data + else: + data = default_data + except Exception as e: + data = default_data + for product in data['products']: + if 'product_id' not in product: + product['product_id'] = uuid4().hex + if any('product_id' not in p for p in data['products']): + save_data(data) + + if not os.path.exists(DATA_FILE): + try: + with open(DATA_FILE, 'w', encoding='utf-8') as f: + json.dump(default_data, f) + except Exception as create_e: + pass + return data def save_data(data): try: if not isinstance(data, dict): - logging.error("Attempted to save invalid data structure (not a dict). Aborting save.") return if 'products' not in data: data['products'] = [] if 'categories' not in data: data['categories'] = [] if 'orders' not in data: data['orders'] = {} + if 'organization_info' not in data: data['organization_info'] = {} with open(DATA_FILE, 'w', encoding='utf-8') as file: json.dump(data, file, ensure_ascii=False, indent=4) - logging.info(f"Data successfully saved to {DATA_FILE}") upload_db_to_hf(specific_file=DATA_FILE) except Exception as e: - logging.error(f"Error saving data to {DATA_FILE}: {e}", exc_info=True) + pass +def configure_gemini(): + if not GOOGLE_API_KEY: + return False + try: + genai.configure(api_key=GOOGLE_API_KEY) + return True + except Exception as e: + return False -CATALOG_TEMPLATE = ''' - - - - - - O&CO - Каталог - - - - - - -
-
-
- O&CO Logo -

O&CO

-
-
+def generate_ai_description_from_image(image_data, language): + if not configure_gemini(): + raise ValueError("Google AI API не настроен.") -
Наш адрес: {{ store_address }}
+ try: + if not image_data: + raise ValueError("Файл изображения не найден.") + image_stream = io.BytesBytesIO(image_data) + image = Image.open(image_stream).convert('RGB') + except Exception as e: + raise ValueError(f"Не удалось обработать изображение. Убедитесь, что это действительный файл изображения.") -
- - {% for category in categories %} - - {% endfor %} -
+ base_prompt = "Напиши большой и красивый, содержательный рекламный пост минимум на 1000 символов со смайликами и 25 тематических хэштегов с ключевыми словами разных вариантов, чтобы мои клиенты могли найти меня в поиске Instagram, Google и т.д. по ключевым словам. Пост пиши исключительно под товар, который на фото, без адресов и номеров телефона." -
- -
+ lang_suffix = "" + if language == "Русский": + lang_suffix = " Пиш�� на русском языке." + elif language == "Кыргызский": + lang_suffix = " Пиши на кыргызском языке." + elif language == "Казахский": + lang_suffix = " Пиши на казахском языке." + elif language == "Узбекский": + lang_suffix = " Пиши на узбекском языке." -
- {% for product in products %} -
- {% if product.get('is_top', False) %} - Топ - {% endif %} -
- {% if product.get('photos') and product['photos']|length > 0 %} - {{ product['name'] }} - {% else %} - No Image - {% endif %} -
-
-

{{ product['name'] }}

-
{{ "%.2f"|format(product['price']) }} {{ currency_code }}
-

{{ product.get('description', '')[:50] }}{% if product.get('description', '')|length > 50 %}...{% endif %}

-
-
- - -
-
- {% endfor %} - {% if not products %} -

Товары пока не добавлены.

- {% endif %} -
-
+ final_prompt = f"{base_prompt}{lang_suffix}" - + try: + model = genai.GenerativeModel('learnlm-2.0-flash-experimental') - + response = model.generate_content([final_prompt, image]) - + if hasattr(response, 'text'): + return response.text + else: + if response.parts: + return "".join(part.text for part in response.parts if hasattr(part, 'text')) + else: + response.resolve() + return response.text - + except Exception as e: + if "API key not valid" in str(e): + raise ValueError("Внутренняя ошибка конфигурации API.") + elif " Billing account not found" in str(e): + raise ValueError("Проблема с биллингом аккаунта Google Cloud. Проверьте ваш аккаунт.") + elif "Could not find model" in str(e): + raise ValueError(f"Модель 'learnlm-2.0-flash-experimental' не найдена или недоступна.") + elif "resource has been exhausted" in str(e).lower(): + raise ValueError("Квота запросов исчерпана. Попробуйте позже.") + elif "content has been blocked" in str(e).lower(): + reason = "неизвестна" + if hasattr(e, 'response') and hasattr(e.response, 'prompt_feedback') and e.response.prompt_feedback.block_reason: + reason = e.response.prompt_feedback.block_reason + raise ValueError(f"Генерация контента заблокирована из-за политики безопасности (причина: {reason}). Попробуйте другое изображение или запрос.") + else: + raise ValueError(f"Ошибка при генерации контента: {e}") -
+def generate_chat_response(message, chat_history_from_client): + if not configure_gemini(): + return "Извините, сервис чата временно недоступен. Пожалуйста, попробуйте позже." - - + - - + } + + async function sendMessage() { + const chatInput = document.getElementById('chat-input'); + const chatSendButton = document.getElementById('chat-send-button'); + const message = chatInput.value.trim(); + if (!message) return; + 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 }) + }); + const result = await response.json(); + if (!response.ok) { + throw new Error(result.error || 'Ошибка при получении ответа от ИИ.'); + } + addMessageToChat(result.text, 'ai'); + } catch (error) { + console.error("Chat AI Error:", error); + addMessageToChat(`Извините, произошла ошибка: ${error.message}`, 'ai', false); + } finally { + chatSendButton.disabled = false; + } + } + + function clearChatHistory() { + if (confirm("Вы уверены, что хотите очистить историю чата?")) { + chatHistory = []; + localStorage.removeItem('evaChatHistory'); + displayChatHistory(); + showNotification("История чата очищена."); + } + } + + document.addEventListener('DOMContentLoaded', () => { + updateCartButton(); + document.getElementById('search-input').addEventListener('input', filterProducts); + document.getElementById('chat-send-button').addEventListener('click', sendMessage); + document.getElementById('chat-input').addEventListener('keypress', function(e) { + if (e.key === 'Enter') { sendMessage(); } + }); + document.getElementById('clear-chat-button').addEventListener('click', clearChatHistory); + window.addEventListener('click', function(event) { + if (event.target.classList.contains('modal')) { closeModal(event.target.id); } + }); + window.addEventListener('keydown', function(event) { + if (event.key === 'Escape') { + document.querySelectorAll('.modal[style*="display: block"]').forEach(modal => { + closeModal(modal.id); + }); + } + }); + }); + + + ''' PRODUCT_DETAIL_TEMPLATE = '''
-

{{ product['name'] }}

+

{{ product['name'] }}

{% if product.get('photos') and product['photos']|length > 0 %} @@ -777,14 +1224,20 @@ PRODUCT_DETAIL_TEMPLATE = '''
{% if product.get('photos') and product['photos']|length > 1 %}
-
-
+
+
{% endif %}
-
+
+

Цена: {{ "%.2f"|format(product.price) }} {{ currency_code }}

+ +
+ +

Категория: {{ product.get('category', 'Без категории') }}

-

Цена: {{ "%.2f"|format(product['price']) }} {{ currency_code }}

Описание:
{{ product.get('description', 'Описание отсутствует.')|replace('\\n', '
')|safe }}

{% set colors = product.get('colors', []) %} {% if colors and colors|select('ne', '')|list|length > 0 %} @@ -804,29 +1257,29 @@ ORDER_TEMPLATE = ''' @@ -874,7 +1327,7 @@ ORDER_TEMPLATE = ''' function sendOrderViaWhatsApp() { const orderId = '{{ order.id }}'; const orderUrl = `{{ request.url }}`; - const whatsappNumber = "996779075126"; + const whatsappNumber = "{{ whatsapp_number }}"; let message = `Здравствуйте! Хочу подтвердить свой заказ на OCO:%0A%0A`; message += `*Номер заказа:* ${orderId}%0A`; @@ -906,7 +1359,7 @@ ADMIN_TEMPLATE = ''' @@ -1038,9 +1493,25 @@ ADMIN_TEMPLATE = '''
-

Информация

-

Управление пользователями отключено, так как сайт не требует входа.

-

Заказы создаются анонимно и должны быть подтверждены через WhatsApp.

+

Информация о магазине

+
+ Развернуть/Свернуть +
+
+ + + + + + + + + + +
+

Эта информация будет использоваться ИИ-ассистентом для ответов на вопросы о вашем магазине.

+
+
@@ -1050,14 +1521,24 @@ ADMIN_TEMPLATE = '''
Добавить новый товар
-
+ + + + + + - -
@@ -1118,7 +1597,7 @@ ADMIN_TEMPLATE = ''' {% endif %}

Категория: {{ product.get('category', 'Без категории') }}

-

Цена: {{ "%.2f"|format(product['price']) }} {{ currency_code }}

+

Цена: {{ "%.2f"|format(product.price) }} {{ currency_code }}

Описание: {{ product.get('description', 'N/A')[:150] }}{% if product.get('description', '')|length > 150 %}...{% endif %}

{% set colors = product.get('colors', []) %}

Цвета/Вар-ts: {{ colors|select('ne', '')|join(', ') if colors|select('ne', '')|list|length > 0 else 'Нет' }}

@@ -1132,7 +1611,7 @@ ADMIN_TEMPLATE = ''' - +
@@ -1141,22 +1620,13 @@ ADMIN_TEMPLATE = '''

Редактирование: {{ product['name'] }}

- + - - - - - + {% if product.get('photos') %}

Текущие фото:

@@ -1165,6 +1635,23 @@ ADMIN_TEMPLATE = ''' {% endfor %}
{% endif %} + + + + + + +
{% set current_colors = product.get('colors', []) %} @@ -1251,41 +1738,119 @@ ADMIN_TEMPLATE = ''' console.warn("Could not find parent .color-input-group for remove button"); } } + + async function generateDescription(photoInputId, descriptionTextareaId, languageSelectId) { + const photoInput = document.getElementById(photoInputId); + const descriptionTextarea = document.getElementById(descriptionTextareaId); + const languageSelect = document.getElementById(languageSelectId); + const generateButton = descriptionTextarea.nextElementSibling; + + if (!photoInput || !descriptionTextarea || !languageSelect || !generateButton) { + alert("Ошибка: Не найдены элементы формы для генерации."); + return; + } + + if (!photoInput.files || photoInput.files.length === 0) { + alert("Пожалуйста, сначала загрузите фотографию товара."); + return; + } + + const file = photoInput.files[0]; + if (!file.type.startsWith('image/')) { + alert("Выбранный файл не является изображением."); + return; + } + + generateButton.disabled = true; + const originalText = generateButton.innerHTML; + generateButton.innerHTML = ' Генерация...'; + descriptionTextarea.value = 'Генерация описания, пожалуйста подож��ите...'; + descriptionTextarea.disabled = true; + + const reader = new FileReader(); + reader.onload = async (e) => { + const base64Image = e.target.result.split(',')[1]; + const language = languageSelect.value; + + try { + const response = await fetch('/generate_description_ai', { + method: 'POST', + headers: { 'Content-Type': 'application/json' }, + body: JSON.stringify({ image: base64Image, language: language }) + }); + const result = await response.json(); + + if (!response.ok) { + throw new Error(result.error || `Ошибка сервера: ${response.status}`); + } + descriptionTextarea.value = result.text; + } catch (error) { + console.error("AI Generation Error:", error); + descriptionTextarea.value = `Ошибка генерации: ${error.message}`; + alert(`Ошибка генерации: ${error.message}`); + } finally { + generateButton.disabled = false; + generateButton.innerHTML = originalText; + descriptionTextarea.disabled = false; + } + }; + reader.onerror = (e) => { + console.error("FileReader error:", e); + descriptionTextarea.value = "Ошибка чтения файла изображения."; + generateButton.disabled = false; + generateButton.innerHTML = originalText; + descriptionTextarea.disabled = false; + }; + reader.readAsDataURL(file); + } ''' - @app.route('/') def catalog(): data = load_data() - all_products = data.get('products', []) - categories = sorted(data.get('categories', [])) + all_products_raw = data.get('products', []) + + product_categories = set(p.get('category', 'Без категории') for p in all_products_raw) + admin_categories = set(data.get('categories', [])) + all_cat_names = sorted(list(product_categories.union(admin_categories))) - products_in_stock = [p for p in all_products if p.get('in_stock', True)] - products_sorted = sorted(products_in_stock, key=lambda p: (not p.get('is_top', False), p.get('name', '').lower())) + 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())) + + products_by_category = {cat: [] for cat in all_cat_names} + for product in products_in_stock: + products_by_category[product.get('category', 'Без категории')].append(product) + + for category in products_by_category: + products_by_category[category].sort(key=lambda p: (not p.get('is_top', False), p.get('name', '').lower())) + + ordered_categories = [cat for cat in all_cat_names if products_by_category.get(cat)] return render_template_string( CATALOG_TEMPLATE, - products=products_sorted, - categories=categories, + products_by_category=products_by_category, + ordered_categories=ordered_categories, + products_json=json.dumps(products_sorted_for_js), repo_id=REPO_ID, store_address=STORE_ADDRESS, currency_code=CURRENCY_CODE ) + @app.route('/product/') def product_detail(index): data = load_data() - all_products = data.get('products', []) - products_in_stock = [p for p in all_products if p.get('in_stock', True)] + all_products_raw = data.get('products', []) + products_in_stock = [p for p in all_products_raw if p.get('in_stock', True)] 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: - logging.warning(f"Attempted access to non-existent or out-of-stock product with index {index}") return "Товар не найден или отсутствует в наличии.", 404 return render_template_string( @@ -1300,7 +1865,6 @@ def create_order(): order_data = request.get_json() if not order_data or 'cart' not in order_data or not order_data['cart']: - logging.warning("Create order request missing cart data or cart is empty.") return jsonify({"error": "Корзина пуста или не передана."}), 400 cart_items = order_data['cart'] @@ -1309,15 +1873,14 @@ def create_order(): processed_cart = [] for item in cart_items: if not all(k in item for k in ('name', 'price', 'quantity')): - logging.error(f"Invalid cart item structure received: {item}") return jsonify({"error": "Неверный формат товара в корзине."}), 400 try: price = float(item['price']) quantity = int(item['quantity']) if price < 0 or quantity <= 0: raise ValueError("Invalid price or quantity") - total_price += price * quantity processed_cart.append({ + "product_id": item.get('product_id', 'N/A'), "name": item['name'], "price": price, "quantity": quantity, @@ -1325,11 +1888,11 @@ def create_order(): "photo": item.get('photo'), "photo_url": f"https://huggingface.co/datasets/{REPO_ID}/resolve/main/photos/{item['photo']}" if item.get('photo') else "https://via.placeholder.com/60x60.png?text=N/A" }) + total_price += price * quantity except (ValueError, TypeError) as e: - logging.error(f"Invalid price/quantity in cart item: {item}. Error: {e}") return jsonify({"error": "Неверная цена или количество в товаре."}), 400 - order_id = f"{datetime.now().strftime('%Y%m%d%H%M%S')}-{uuid.uuid4().hex[:6]}" + order_id = f"{datetime.now().strftime('%Y%m%d%H%M%S')}-{uuid4().hex[:6]}" order_timestamp = datetime.now().strftime('%Y-%m-%d %H:%M:%S') new_order = { @@ -1348,11 +1911,9 @@ def create_order(): data['orders'][order_id] = new_order save_data(data) - logging.info(f"Order {order_id} created successfully (anonymously).") return jsonify({"order_id": order_id}), 201 except Exception as e: - logging.error(f"Failed to save order {order_id}: {e}", exc_info=True) return jsonify({"error": "Ошибка сервера при сохранении заказа."}), 500 @@ -1361,15 +1922,11 @@ def view_order(order_id): data = load_data() order = data.get('orders', {}).get(order_id) - if order: - logging.info(f"Displaying order {order_id}") - else: - logging.warning(f"Order {order_id} not found.") - return render_template_string(ORDER_TEMPLATE, order=order, repo_id=REPO_ID, - currency_code=CURRENCY_CODE) + currency_code=CURRENCY_CODE, + whatsapp_number=WHATSAPP_NUMBER) @app.route('/admin', methods=['GET', 'POST']) @@ -1377,12 +1934,13 @@ def admin(): data = load_data() products = data.get('products', []) categories = data.get('categories', []) + organization_info = data.get('organization_info', {}) + if 'orders' not in data or not isinstance(data.get('orders'), dict): data['orders'] = {} if request.method == 'POST': action = request.form.get('action') - logging.info(f"Admin action received: {action}") try: if action == 'add_category': @@ -1391,13 +1949,10 @@ def admin(): categories.append(category_name) data['categories'] = categories save_data(data) - logging.info(f"Category '{category_name}' added.") flash(f"Категория '{category_name}' успешно добавлена.", 'success') elif not category_name: - logging.warning("Attempted to add empty category.") flash("Название категории не может быть пустым.", 'error') else: - logging.warning(f"Category '{category_name}' already exists.") flash(f"Категория '{category_name}' уже существует.", 'error') elif action == 'delete_category': @@ -1412,12 +1967,19 @@ def admin(): data['categories'] = categories data['products'] = products save_data(data) - logging.info(f"Category '{category_to_delete}' deleted. Updated products: {updated_count}.") flash(f"Категория '{category_to_delete}' удалена. {updated_count} товаров обновлено.", 'success') else: - logging.warning(f"Attempted to delete non-existent or empty category: {category_to_delete}") flash(f"Не удалось удалить категорию '{category_to_delete}'.", 'error') + elif action == 'update_org_info': + organization_info['about_us'] = request.form.get('about_us', '').strip() + organization_info['shipping'] = request.form.get('shipping', '').strip() + organization_info['returns'] = request.form.get('returns', '').strip() + organization_info['contact'] = request.form.get('contact', '').strip() + data['organization_info'] = organization_info + save_data(data) + flash("Информация о магазине успешно обновлена.", 'success') + elif action == 'add_product': name = request.form.get('name', '').strip() price_str = request.form.get('price', '').replace(',', '.') @@ -1448,14 +2010,12 @@ def admin(): uploaded_count = 0 for photo in photos_files: if uploaded_count >= photo_limit: - logging.warning(f"Photo limit ({photo_limit}) reached, ignoring remaining photos.") flash(f"Загружено только первые {photo_limit} фото.", "warning") break if photo and photo.filename: try: ext = os.path.splitext(photo.filename)[1].lower() if ext not in ['.jpg', '.jpeg', '.png', '.gif', '.webp']: - logging.warning(f"Skipping non-image file upload: {photo.filename}") flash(f"Файл {photo.filename} не является изображением и был пропущен.", "warning") continue @@ -1463,7 +2023,6 @@ def admin(): photo_filename = f"{safe_name}_{datetime.now().strftime('%Y%m%d%H%M%S%f')}{ext}" temp_path = os.path.join(uploads_dir, photo_filename) photo.save(temp_path) - logging.info(f"Uploading photo {photo_filename} to HF for product {name}...") api.upload_file( path_or_fileobj=temp_path, path_in_repo=f"photos/{photo_filename}", @@ -1473,27 +2032,26 @@ def admin(): commit_message=f"Add photo for product {name}" ) photos_list.append(photo_filename) - logging.info(f"Photo {photo_filename} uploaded successfully.") os.remove(temp_path) uploaded_count += 1 except Exception as e: - logging.error(f"Error uploading photo {photo.filename} to HF: {e}", exc_info=True) flash(f"Ошибка при загрузке фото {photo.filename}.", 'error') if os.path.exists(temp_path): try: os.remove(temp_path) except OSError: pass elif photo and not photo.filename: - logging.warning("Received an empty photo file object when adding product.") + pass try: if os.path.exists(uploads_dir) and not os.listdir(uploads_dir): os.rmdir(uploads_dir) except OSError as e: - logging.warning(f"Could not remove temporary upload directory {uploads_dir}: {e}") + pass elif not HF_TOKEN_WRITE and photos_files and any(f.filename for f in photos_files): flash("HF_TOKEN (write) не настроен. Фотографии не были загружены.", "warning") new_product = { + 'product_id': uuid4().hex, 'name': name, 'price': price, 'description': description, 'category': category if category in categories else 'Без категории', 'photos': photos_list, 'colors': colors, @@ -1502,27 +2060,18 @@ def admin(): products.append(new_product) data['products'] = products save_data(data) - logging.info(f"Product '{name}' added.") flash(f"Товар '{name}' успешно добавлен.", 'success') elif action == 'edit_product': - index_str = request.form.get('index') - if index_str is None: - flash("Ошибка редактирования: индекс товара не передан.", 'error') - return redirect(url_for('admin')) + product_id = request.form.get('product_id') + product_to_edit = next((p for p in products if p.get('product_id') == product_id), None) - try: - index = int(index_str) - if not (0 <= index < len(products)): - raise IndexError("Product index out of range") - product_to_edit = products[index] - original_name = product_to_edit.get('name', 'N/A') - - except (ValueError, IndexError): - flash(f"Ошибка редактирования: неверный индекс товара '{index_str}'.", 'error') - logging.error(f"Invalid index '{index_str}' for editing. Product list length: {len(products)}") + if product_to_edit is None: + flash(f"Ошибка редактирования: товар с ID '{product_id}' не найден.", 'error') return redirect(url_for('admin')) + original_name = product_to_edit.get('name', 'N/A') + product_to_edit['name'] = request.form.get('name', product_to_edit['name']).strip() price_str = request.form.get('price', str(product_to_edit['price'])).replace(',', '.') product_to_edit['description'] = request.form.get('description', product_to_edit.get('description', '')).strip() @@ -1537,7 +2086,6 @@ def admin(): if price < 0: price = 0 product_to_edit['price'] = price except ValueError: - logging.warning(f"Invalid price format '{price_str}' during edit of product {original_name}. Price not changed.") flash(f"Неверный формат цены для товара '{original_name}'. Цена не изменена.", 'warning') photos_files = request.files.getlist('photos') @@ -1548,17 +2096,14 @@ def admin(): new_photos_list = [] photo_limit = 10 uploaded_count = 0 - logging.info(f"Uploading new photos for product {product_to_edit['name']}...") for photo in photos_files: if uploaded_count >= photo_limit: - logging.warning(f"Photo limit ({photo_limit}) reached, ignoring remaining photos.") flash(f"Загружено только первые {photo_limit} фото.", "warning") break if photo and photo.filename: try: ext = os.path.splitext(photo.filename)[1].lower() if ext not in ['.jpg', '.jpeg', '.png', '.gif', '.webp']: - logging.warning(f"Skipping non-image file upload during edit: {photo.filename}") flash(f"Файл {photo.filename} не является изображением и был пропущен.", "warning") continue @@ -1566,16 +2111,13 @@ def admin(): photo_filename = f"{safe_name}_{datetime.now().strftime('%Y%m%d%H%M%S%f')}{ext}" temp_path = os.path.join(uploads_dir, photo_filename) photo.save(temp_path) - logging.info(f"Uploading new photo {photo_filename} to HF...") api.upload_file(path_or_fileobj=temp_path, path_in_repo=f"photos/{photo_filename}", repo_id=REPO_ID, repo_type="dataset", token=HF_TOKEN_WRITE, commit_message=f"Update photo for product {product_to_edit['name']}") new_photos_list.append(photo_filename) - logging.info(f"New photo {photo_filename} uploaded successfully.") os.remove(temp_path) uploaded_count += 1 except Exception as e: - logging.error(f"Error uploading new photo {photo.filename}: {e}", exc_info=True) flash(f"Ошибка при загрузке нового фото {photo.filename}.", 'error') if os.path.exists(temp_path): try: os.remove(temp_path) @@ -1584,13 +2126,11 @@ def admin(): if os.path.exists(uploads_dir) and not os.listdir(uploads_dir): os.rmdir(uploads_dir) except OSError as e: - logging.warning(f"Could not remove temporary upload directory {uploads_dir}: {e}") + pass if new_photos_list: - logging.info(f"New photo list for product {product_to_edit['name']} generated.") old_photos = product_to_edit.get('photos', []) if old_photos: - logging.info(f"Attempting to delete old photos: {old_photos}") try: api = HfApi() api.delete_files( @@ -1600,9 +2140,7 @@ def admin(): token=HF_TOKEN_WRITE, commit_message=f"Delete old photos for product {product_to_edit['name']}" ) - logging.info(f"Old photos for product {product_to_edit['name']} deleted from HF.") except Exception as e: - logging.error(f"Error deleting old photos {old_photos} from HF: {e}", exc_info=True) flash("Не удалось удалить старые фотографии с сервера. Новые фото загружены.", "warning") product_to_edit['photos'] = new_photos_list flash("Фотографии товара успешно обновлены.", "success") @@ -1611,89 +2149,107 @@ def admin(): elif not HF_TOKEN_WRITE and photos_files and any(f.filename for f in photos_files): flash("HF_TOKEN (write) не настроен. Фотографии не были обновлены.", "warning") - products[index] = product_to_edit - data['products'] = products save_data(data) - logging.info(f"Product '{original_name}' (index {index}) updated to '{product_to_edit['name']}'.") flash(f"Товар '{product_to_edit['name']}' успешно обновлен.", 'success') elif action == 'delete_product': - index_str = request.form.get('index') - if index_str is None: - flash("Ошибка удаления: индекс товара не передан.", 'error') + product_id = request.form.get('product_id') + product_index = next((i for i, p in enumerate(products) if p.get('product_id') == product_id), -1) + + if product_index == -1: + flash(f"Ошибка удаления: товар с ID '{product_id}' не найден.", 'error') return redirect(url_for('admin')) - try: - index = int(index_str) - if not (0 <= index < len(products)): raise IndexError("Product index out of range") - deleted_product = products.pop(index) - product_name = deleted_product.get('name', 'N/A') - - photos_to_delete = deleted_product.get('photos', []) - if photos_to_delete and HF_TOKEN_WRITE: - logging.info(f"Attempting to delete photos for product '{product_name}' from HF: {photos_to_delete}") - try: - api = HfApi() - api.delete_files( - repo_id=REPO_ID, - paths_in_repo=[f"photos/{p}" for p in photos_to_delete], - repo_type="dataset", - token=HF_TOKEN_WRITE, - commit_message=f"Delete photos for deleted product {product_name}" - ) - logging.info(f"Photos for product '{product_name}' deleted from HF.") - except Exception as e: - logging.error(f"Error deleting photos {photos_to_delete} for product '{product_name}' from HF: {e}", exc_info=True) - flash(f"Не удалось удалить фото для товара '{product_name}' с сервера. Товар удален локально.", "warning") - elif photos_to_delete and not HF_TOKEN_WRITE: - logging.warning(f"HF_TOKEN (write) not set. Cannot delete photos {photos_to_delete} for deleted product '{product_name}'.") - flash(f"Товар '{product_name}' удален локально, но фото не удалены с сервера (токен не задан).", "warning") + deleted_product = products.pop(product_index) + product_name = deleted_product.get('name', 'N/A') - data['products'] = products - save_data(data) - logging.info(f"Product '{product_name}' (original index {index}) deleted.") - flash(f"Товар '{product_name}' удален.", 'success') - except (ValueError, IndexError): - flash(f"Ошибка удаления: неверный индекс товара '{index_str}'.", 'error') - logging.error(f"Invalid index '{index_str}' for deletion. Product list length: {len(products)}") + photos_to_delete = deleted_product.get('photos', []) + if photos_to_delete and HF_TOKEN_WRITE: + try: + api = HfApi() + api.delete_files( + repo_id=REPO_ID, + paths_in_repo=[f"photos/{p}" for p in photos_to_delete], + repo_type="dataset", + token=HF_TOKEN_WRITE, + commit_message=f"Delete photos for deleted product {product_name}" + ) + except Exception as e: + flash(f"Не удалось удалить фото для товара '{product_name}' с сервера. Товар удален локально.", "warning") + elif photos_to_delete and not HF_TOKEN_WRITE: + flash(f"Товар '{product_name}' удален локально, но фото не удалены с сервера (токен не задан).", "warning") + + data['products'] = products + save_data(data) + flash(f"Товар '{product_name}' удален.", 'success') else: - logging.warning(f"Received unknown admin action: {action}") flash(f"Неизвестное действие: {action}", 'warning') return redirect(url_for('admin')) except Exception as e: - logging.error(f"Произошла внутренняя ошибка при выполнении действия '{action}': {e}", exc_info=True) flash(f"Произошла внутренняя ошибка при выполнении действия '{action}'. Подробности в логе сервера.", 'error') return redirect(url_for('admin')) current_data = load_data() 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', {}) return render_template_string( ADMIN_TEMPLATE, products=display_products, categories=display_categories, + organization_info=display_organization_info, repo_id=REPO_ID, currency_code=CURRENCY_CODE ) +@app.route('/generate_description_ai', methods=['POST']) +def handle_generate_description_ai(): + request_data = request.get_json() + base64_image = request_data.get('image') + language = request_data.get('language', 'Русский') + + if not base64_image: + return jsonify({"error": "Изображение не найдено в запросе."}), 400 + + try: + image_data = base64.b64decode(base64_image) + result_text = generate_ai_description_from_image(image_data, language) + return jsonify({"text": result_text}) + except ValueError as ve: + return jsonify({"error": str(ve)}), 400 + except Exception as e: + return jsonify({"error": f"Внутренняя ошибка сервера: {e}"}), 500 + +@app.route('/chat_with_ai', methods=['POST']) +def handle_chat_with_ai(): + request_data = request.get_json() + user_message = request_data.get('message') + chat_history_from_client = request_data.get('history', []) + + if not user_message: + return jsonify({"error": "Сообщение не может быть пустым."}), 400 + + try: + ai_response_text = generate_chat_response(user_message, chat_history_from_client) + return jsonify({"text": ai_response_text}) + except Exception as e: + return jsonify({"error": f"Ошибка чата: {e}"}), 500 + @app.route('/force_upload', methods=['POST']) def force_upload(): - logging.info("Forcing upload to Hugging Face...") try: upload_db_to_hf() flash("Данные успешно загружены на Hugging Face.", 'success') except Exception as e: - logging.error(f"Error during forced upload: {e}", exc_info=True) flash(f"Ошибка при загрузке на Hugging Face: {e}", 'error') return redirect(url_for('admin')) @app.route('/force_download', methods=['POST']) def force_download(): - logging.info("Forcing download from Hugging Face...") try: if download_db_from_hf(): flash("Данные успешно скачаны с Hugging Face. Локальные файлы обновлены.", 'success') @@ -1701,24 +2257,19 @@ def force_download(): else: flash("Не удалось скачать данные с Hugging Face после нескольких попыток. Проверьте логи.", 'error') except Exception as e: - logging.error(f"Error during forced download: {e}", exc_info=True) flash(f"Ошибка при скачивании с Hugging Face: {e}", 'error') return redirect(url_for('admin')) - if __name__ == '__main__': - logging.info("Application starting up. Performing initial data load/download...") + configure_gemini() download_db_from_hf() load_data() - logging.info("Initial data load complete.") if HF_TOKEN_WRITE: backup_thread = threading.Thread(target=periodic_backup, daemon=True) backup_thread.start() - logging.info("Periodic backup thread started.") else: - logging.warning("Periodic backup will NOT run (HF_TOKEN for writing not set).") + pass port = int(os.environ.get('PORT', 7860)) - logging.info(f"Starting Flask app on host 0.0.0.0 and port {port}") app.run(debug=False, host='0.0.0.0', port=port)