diff --git "a/app.py" "b/app.py" deleted file mode 100644--- "a/app.py" +++ /dev/null @@ -1,2327 +0,0 @@ - -from flask import Flask, render_template_string, request, redirect, url_for, send_file, flash, jsonify -import json -import os -import logging -import threading -import time -from datetime import datetime -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 -import imghdr # To check image type - -load_dotenv() - -app = Flask(__name__) -app.secret_key = 'your_unique_secret_key_meka_shop_12345_no_login' -DATA_FILE = 'data.json' - -SYNC_FILES = [DATA_FILE] - -REPO_ID = "Kgshop/testsystem" -HF_TOKEN_WRITE = os.getenv("HF_TOKEN") -HF_TOKEN_READ = os.getenv("HF_TOKEN_READ") - -STORE_ADDRESS = "Рынок Кербент, 6 ряд , 3 контейнер / 5 ряд 25 контейнер " - -CURRENCY_CODE = 'KGS' -CURRENCY_NAME = 'Кыргызский сом' - -DOWNLOAD_RETRIES = 3 -DOWNLOAD_DELAY = 5 -UPLOAD_RETRIES = 3 -UPLOAD_DELAY = 5 - -logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s') - -def download_db_from_hf(specific_file=None, retries=DOWNLOAD_RETRIES, delay=DOWNLOAD_DELAY): - if not HF_TOKEN_READ and not HF_TOKEN_WRITE: - logging.warning("HF_TOKEN_READ/HF_TOKEN_WRITE not set. Download might fail for private repos.") - if specific_file is None or not os.path.exists(specific_file): - logging.warning(f"Cannot download {specific_file if specific_file else 'files'} from HF without token, and local file doesn't exist.") - return False # Cannot proceed without token or local file - - 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, - repo_type="dataset", - token=token_to_use, - local_dir=".", - local_dir_use_symlinks=False, - 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.") - all_successful = False - return False # Cannot proceed if repo is not found - 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: - default_data = {'products': [], 'categories': [], 'orders': {}, 'transactions': []} - with open(file_name, 'w', encoding='utf-8') as f: - json.dump(default_data, f) - logging.info(f"Created empty local file {file_name} because it was not found on HF.") - success = True # Treat as successful download of an empty file - else: - success = False # Other files not found are just skipped/failed - logging.warning(f"File {file_name} not found on HF and no local default exists. Skipping.") - except Exception as create_e: - logging.error(f"Failed to create empty local file {file_name}: {create_e}") - success = False - else: - success = False # File not found after first attempt, keep it as failure unless default was created - break - else: - logging.error(f"HTTP error downloading {file_name} (Attempt {attempt + 1}): {e}. Retrying in {delay}s...") - except requests.exceptions.RequestException as e: - logging.error(f"Network error downloading {file_name} (Attempt {attempt + 1}): {e}. Retrying in {delay}s...") - except Exception as e: - logging.error(f"Unexpected error downloading {file_name} (Attempt {attempt + 1}): {e}. Retrying in {delay}s...", exc_info=True) - - 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, retries=UPLOAD_RETRIES, delay=UPLOAD_DELAY): - if not HF_TOKEN_WRITE: - logging.warning("HF_TOKEN (for writing) not set. Skipping upload to Hugging Face.") - return False - 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}...") - all_successful = True - - for file_name in files_to_upload: - if os.path.exists(file_name): - success = False - for attempt in range(retries + 1): - try: - logging.info(f"Uploading {file_name} (Attempt {attempt + 1}/{retries + 1})...") - api.upload_file( - path_or_fileobj=file_name, - path_in_repo=file_name, - repo_id=REPO_ID, - repo_type="dataset", - 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.") - success = True - break - except Exception as e: - logging.error(f"Error uploading file {file_name} (Attempt {attempt + 1}): {e}. Retrying in {delay}s...") - if attempt < retries: - time.sleep(delay) - - if not success: - logging.error(f"Failed to upload {file_name} after {retries + 1} attempts.") - all_successful = False - else: - logging.warning(f"File {file_name} not found locally, skipping upload.") - logging.info("Finished uploading files to HF.") - return all_successful - except Exception as e: - logging.error(f"General error during Hugging Face upload initialization or process: {e}", exc_info=True) - return False - -def load_data(): - default_data = {'products': [], 'categories': [], 'orders': {}, 'transactions': []} - 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'] = {} - if 'transactions' not in data: data['transactions'] = [] - - for product in data['products']: - if 'id' not in product or not product['id']: - product['id'] = uuid.uuid4().hex - logging.info(f"Assigned new ID {product['id']} to product {product.get('name', 'Unnamed')}") - if 'stock' not in product or not isinstance(product['stock'], (int, float)): - product['stock'] = 0 - logging.info(f"Initialized stock for product {product['id']} ({product.get('name', 'Unnamed')}) to 0.") - if 'barcode' not in product: - product['barcode'] = '' - - return data - except FileNotFoundError: - logging.warning(f"Local file {DATA_FILE} not found. Attempting download from HF.") - 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'] = {} - if 'transactions' not in data: data['transactions'] = [] - - for product in data['products']: - if 'id' not in product or not product['id']: - product['id'] = uuid.uuid4().hex - logging.info(f"Assigned new ID {product['id']} to product {product.get('name', 'Unnamed')}") - if 'stock' not in product or not isinstance(product['stock'], (int, float)): - product['stock'] = 0 - logging.info(f"Initialized stock for product {product['id']} ({product.get('name', 'Unnamed')}) to 0.") - if 'barcode' not in product: - product['barcode'] = '' - - 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): - 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 - - -def save_data(data): - try: - if not isinstance(data, dict): - logging.error("Attempted to save invalid data structure (not a dict). Aborting save.") - return False - if 'products' not in data: data['products'] = [] - if 'categories' not in data: data['categories'] = [] - if 'orders' not in data: data['orders'] = {} - if 'transactions' not in data: data['transactions'] = [] - - - 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) - return True - except Exception as e: - logging.error(f"Error saving data to {DATA_FILE}: {e}", exc_info=True) - return False - -def get_product_by_id(product_id, data): - for product in data.get('products', []): - if product.get('id') == product_id: - return product - return None - -def record_transaction(data, product_id, quantity, transaction_type, details=""): - transaction = { - 'id': uuid.uuid4().hex, - 'timestamp': datetime.now().strftime('%Y-%m-%d %H:%M:%S'), - 'product_id': product_id, - 'quantity': quantity, # Positive for arrival/adjustment+, negative for sale/adjustment- - 'type': transaction_type, # 'sale', 'arrival', 'adjustment' - 'details': details - } - if 'transactions' not in data or not isinstance(data['transactions'], list): - data['transactions'] = [] - data['transactions'].append(transaction) - logging.info(f"Recorded transaction: Type={transaction_type}, Product ID={product_id}, Quantity={quantity}, Details={details}") - - -CATALOG_TEMPLATE = ''' - - - - - - Meka Shop - Каталог - - - - - - -
-
-
-

Meka Shop

-
-
- -
Наш адрес: {{ store_address }}
- -
- - {% for category in categories %} - - {% endfor %} -
- -
- -
- -
- {% 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 %}

-
- На складе: {{ product.get('stock', 0) }} -
-
-
- - -
-
- {% endfor %} - {% if not products %} -

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

- {% endif %} -
-
- - - - - - - - - -
- - - - - -''' - -PRODUCT_DETAIL_TEMPLATE = ''' -
-

{{ product['name'] }}

-
-
- {% if product.get('photos') and product['photos']|length > 0 %} - {% for photo in product['photos'] %} -
-
- {{ product['name'] }} - фото {{ loop.index }} -
-
- {% endfor %} - {% else %} -
- Изображение отсутствует -
- {% endif %} -
- {% if product.get('photos') and product['photos']|length > 1 %} -
-
-
- {% endif %} -
- -
-

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

-

На складе: {{ product.get('stock', 0) }}

-

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

-

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

- {% set colors = product.get('colors', []) %} - {% set valid_colors = colors|select('ne', '')|list %} - {% if valid_colors|length > 0 %} -

Доступные цвета/варианты: {{ valid_colors|join(', ') }}

- {% endif %} -
-
-''' - -ORDER_TEMPLATE = ''' - - - - - - Заказ №{{ order.id }} - Meka Shop - - - - - -
- {% if order %} -

Ваш Заказ №{{ order.id }}

-

Дата создания: {{ order.created_at }}

- -

Товары в заказе

-
- {% for item in order.cart %} -
- {{ item.name }} -
- {{ item.name }} {% if item.color and item.color != 'N/A' %}({{ item.color }}){% endif %} - {{ "%.2f"|format(item.price) }} {{ currency_code }} × {{ item.quantity }} -
-
- {{ "%.2f"|format(item.price * item.quantity) }} {{ currency_code }} -
-
- {% endfor %} -
- -
-

Общая сумма товаров: {{ "%.2f"|format(order.total_price) }} {{ currency_code }}

-

ИТОГО К ОПЛАТЕ: {{ "%.2f"|format(order.total_price) }} {{ currency_code }}

-
- -
-

Статус заказа

-

Этот заказ был оформлен без входа в систему.

-

Пожалуйста, свяжитесь с нами по WhatsApp для подтверждения и уточнения деталей.

-
- -
- -
- - ← Вернуться в каталог - - - - {% else %} -

Ошибка

-

Заказ с таким ID не найден.

- ← Вернуться в каталог - {% endif %} -
- - -''' - -ADMIN_TEMPLATE = ''' - - - - - - Админ-панель - Meka Shop - - - - - -
-
-
-

Админ-панель Meka Shop

-
- Перейти в каталог -
- - {% with messages = get_flashed_messages(with_categories=true) %} - {% if messages %} - {% for category, message in messages %} -
{{ message }}
- {% endfor %} - {% endif %} - {% endwith %} - -
-

Синхронизация с Датацентром

-
-
- -
-
- -
-
- {% if not hf_token_write %} -

Внимание: Переменная окружения HF_TOKEN (для записи) не настроена. Загрузка на Hugging Face и периодическое резервное копирование отключены. Изменения будут храниться только локально.

- {% endif %} - {% if not hf_token_read and not hf_token_write %} -

Внимание: Переменные окружения HF_TOKEN_READ и HF_TOKEN (для записи) не настроены. Скачивание с Hugging Face может быть недоступно для приватных репозиториев. Если локальный файл отсутствует, данные не будут загружены.

- {% endif %} -

Резервное копирование происходит автоматически каждые 30 минут, а также после каждого сохранения данных (при настроенном токене на запись).

-
- -
-
-
-

Управление категориями

-
- Добавить новую категорию -
-
- - - - -
-
-
- -

Существующие категории:

- {% if categories %} -
- {% for category in categories %} -
- {{ category }} -
- - - -
-
- {% endfor %} -
- {% else %} -

Категорий пока нет.

- {% endif %} -
-
- -
-
-

Продажи и остатки

-
- Найти товар по штрихкоду -
-
- - -
- -
-
- -
- Зафиксировать приход товара -
-
- - - - - - - - -
-
-
- -
- Скорректировать остаток -
-
- - - - - - - - -
-
-
- -

Последние операции с остатками:

-
- {% if transactions %} - {% for transaction in transactions|reverse %} -
- {{ transaction.timestamp }} - - {% set product = get_product_by_id(transaction.product_id, data) %} - {{ product.name if product else 'Неизвестный товар' }}: - {% if transaction.type == 'sale' %} - Продажа - - -{{ transaction.quantity|abs }} шт. - - ({% if transaction.details %}{{ transaction.details }}{% else %}Заказ{% endif %}) - {% elif transaction.type == 'arrival' %} - Приход - - +{{ transaction.quantity|abs }} шт. - - ({% if transaction.details %}{{ transaction.details }}{% else %}Накладная{% endif %}) - {% elif transaction.type == 'adjustment' %} - Корректировка - - {% if transaction.quantity > 0 %}+{% endif %}{{ transaction.quantity }} шт. - - ({% if transaction.details %}{{ transaction.details }}{% else %}Без причины{% endif %}) - {% endif %} -
- {% endfor %} - {% else %} -

Операций пока нет.

- {% endif %} -
-
-
- -
-
-

Последние заказы

-
- {% if orders %} - {% for order_id, order in orders|dictsort('created_at', reverse=true) %} -
-

Заказ №{{ order.id }} от {{ order.created_at }}

-

Всего: {{ "%.2f"|format(order.total_price) }} {{ currency_code }}

- {% for item in order.cart %} -
- {{ item.name }} -
- {{ item.name }} {% if item.color and item.color != 'N/A' %}({{ item.color }}){% endif %} - {{ "%.2f"|format(item.price) }} {{ currency_code }} × {{ item.quantity }} -
- {{ "%.2f"|format(item.price * item.quantity) }} {{ currency_code }} -
- {% endfor %} -
- Открыть -
-
- {% endfor %} - {% else %} -

Заказов пока нет.

- {% endif %} -
-
-
-
- - -
-

Управление товарами

-
- Добавить новый товар -
-
- - - - - - - - - - - - - - - - -
-
- - -
-
- -
-
- - -
-
- -
-
-
- -

Список товаров:

- {% if products %} -
- {% for product in products %} -
-
-
- {% if product.get('photos') %} - - Фото - - {% else %} - Нет фото - {% endif %} -
-
-

- {{ product['name'] }} - {% if product.get('stock', 0) > 0 %} - В наличии ({{ product.get('stock', 0) }}) - {% else %} - Нет в наличии ({{ product.get('stock', 0) }}) - {% endif %} - {% if product.get('is_top', False) %} - Топ - {% endif %} -

- {% if product.get('barcode') %} -

Штрихкод: {{ product.get('barcode') }}

- {% endif %} -

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

-

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

-

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

- {% set colors = product.get('colors', []) %} - {% set valid_colors = colors|select('ne', '')|list %} -

Цвета/Вар-ты: {{ valid_colors|join(', ') if valid_colors|length > 0 else 'Нет' }}

- {% if product.get('photos') and product['photos']|length > 1 %} -

(Всего фото: {{ product['photos']|length }})

- {% endif %} -
-
- -
- -
- - - -
-
- -
-

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

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

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

-
- {% for photo in product['photos'] %} - Фото {{ loop.index }} - {% endfor %} -
- {% endif %} - -
- {% set current_colors = product.get('colors', []) %} - {% set valid_current_colors = current_colors|select('ne', '')|list %} - {% if valid_current_colors|length > 0 %} - {% for color in valid_current_colors %} -
- - -
- {% endfor %} - {% else %} -
- - -
- {% endif %} -
- -
-
- - -
-
- -
-
-
- {% endfor %} -
- {% else %} -

Товаров пока нет.

- {% endif %} -
- -
- - - - -''' - - -@app.route('/') -def catalog(): - data = load_data() - all_products = data.get('products', []) - - products_in_stock = [p for p in all_products if p.get('stock', 0) > 0] - products_sorted = sorted(products_in_stock, key=lambda p: (not p.get('is_top', False), p.get('name', '').lower())) - - categories = sorted(data.get('categories', [])) - - return render_template_string( - CATALOG_TEMPLATE, - products=products_sorted, - categories=categories, - repo_id=REPO_ID, - store_address=STORE_ADDRESS, - currency_code=CURRENCY_CODE - ) - -@app.route('/product_detail/') -def product_detail(product_id): - data = load_data() - product = get_product_by_id(product_id, data) - - if not product or product.get('stock', 0) <= 0: - logging.warning(f"Attempted access to non-existent or out-of-stock product with id {product_id}") - return "Товар не найден или отсутствует в наличии.", 404 - - return render_template_string( - PRODUCT_DETAIL_TEMPLATE, - product=product, - repo_id=REPO_ID, - currency_code=CURRENCY_CODE - ) - -@app.route('/create_order', methods=['POST']) -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 - - data = load_data() # Load fresh data before processing order - products = data.get('products', []) - cart_items = order_data['cart'] - - processed_cart = [] - total_price = 0 - stock_changes = {} # {product_id: quantity_sold} - - for item in cart_items: - if not all(k in item for k in ('product_id', 'name', 'price', 'quantity')): - logging.error(f"Invalid cart item structure received: {item}") - return jsonify({"error": "Неверный формат товара в корзине."}), 400 - - product = get_product_by_id(item['product_id'], data) - if not product: - logging.error(f"Product ID {item['product_id']} not found in database for order.") - return jsonify({"error": f"Товар '{item.get('name', 'ID: '+item['product_id'])}' не найден в каталоге."}), 400 - - try: - # Use price and other details *from the product* in the current database state - # OR use the snapshot from the cart if we trust the client price? - # Let's use the snapshot from the client for simplicity, but validate quantity against current stock - price = float(item['price']) # Use price snapshot from cart - quantity_ordered = int(item['quantity']) - current_stock = product.get('stock', 0) - - if price < 0 or quantity_ordered <= 0: - raise ValueError("Invalid price or quantity") - - if quantity_ordered > current_stock: - logging.warning(f"Insufficient stock for product {product.get('name', item['product_id'])}. Ordered: {quantity_ordered}, Available: {current_stock}") - return jsonify({"error": f"Недостаточно товара '{product.get('name', 'ID: '+item['product_id'])}' на складе. Доступно: {current_stock}"}), 409 # 409 Conflict - - total_price += price * quantity_ordered - stock_changes[product['id']] = stock_changes.get(product['id'], 0) + quantity_ordered # Sum quantities for the same product (if cart had same product/color combo logic flawed) - - # Capture snapshot of item details for the order record - processed_cart.append({ - "product_id": product['id'], - "name": item.get('name', product['name']), # Use name snapshot from cart, fallback to current product name - "price": price, # Use price snapshot from cart - "quantity": quantity_ordered, - "color": item.get('color', 'N/A'), - "photo": item.get('photo', product.get('photos', [None])[0]), # Use photo snapshot, fallback to current product photo - "photo_url": f"https://huggingface.co/datasets/{REPO_ID}/resolve/main/photos/{item['photo']}" if item.get('photo') else (f"https://huggingface.co/datasets/{REPO_ID}/resolve/main/photos/{product['photos'][0]}" if product.get('photos') else "https://via.placeholder.com/60x60.png?text=N/A") - }) - except (ValueError, TypeError) as e: - logging.error(f"Invalid price/quantity in cart item: {item}. Error: {e}") - return jsonify({"error": "Неверная цена или количество в товаре."}), 400 - - # Double check stock before finalizing if any item is duplicated in cart (unlikely with cartItemId logic but safe) - for product_id, quantity_ordered_total in stock_changes.items(): - product = get_product_by_id(product_id, data) - if not product or quantity_ordered_total > product.get('stock', 0): - logging.error(f"Stock inconsistency detected before finalizing order for product {product_id}. Required: {quantity_ordered_total}, Available: {product.get('stock', 0) if product else 'N/A'}") - return jsonify({"error": f"Ошибка подтверждения заказа: Недостаточно товара на складе."}), 500 # Should not happen if first check passes, but safety - - - # Apply stock changes and record transactions - for product_id, quantity_sold in stock_changes.items(): - product = get_product_by_id(product_id, data) - if product: - product['stock'] = max(0, product.get('stock', 0) - quantity_sold) - record_transaction(data, product_id, -quantity_sold, 'sale', details=f"Order pending confirmation") # Mark as pending until confirmed? Or just 'sale'? 'sale' for now. - - order_id = f"{datetime.now().strftime('%Y%m%d%H%M%S')}-{uuid.uuid4().hex[:6]}" - order_timestamp = datetime.now().strftime('%Y-%m-%d %H:%M:%S') - - new_order = { - "id": order_id, - "created_at": order_timestamp, - "cart": processed_cart, # This includes snapshot details - "total_price": round(total_price, 2), - "user_info": None, # Anonymous order - "status": "new" # Or 'pending' - } - - try: - if 'orders' not in data or not isinstance(data.get('orders'), dict): - data['orders'] = {} - - data['orders'][order_id] = new_order - save_data(data) - logging.info(f"Order {order_id} created successfully (anonymously). Stock updated.") - return jsonify({"order_id": order_id}), 201 - - except Exception as e: - logging.error(f"Failed to save order {order_id} or update stock: {e}", exc_info=True) - # TODO: Rollback stock changes if save fails? Complex with flat file. For now, log error and accept potential temporary inconsistency. - return jsonify({"error": "Ошибка сервера при сохранении заказа."}), 500 - - -@app.route('/order/') -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) - - -@app.route('/admin', methods=['GET', 'POST']) -def admin(): - data = load_data() - products = data.get('products', []) - categories = data.get('categories', []) - orders = data.get('orders', {}) - transactions = data.get('transactions', []) - - if request.method == 'POST': - action = request.form.get('action') - logging.info(f"Admin action received: {action}") - - try: - if action == 'add_category': - category_name = request.form.get('category_name', '').strip() - if category_name and category_name not in categories: - categories.append(category_name) - data['categories'] = categories - if save_data(data): - logging.info(f"Category '{category_name}' added.") - flash(f"Категория '{category_name}' успешно добавлена.", 'success') - else: - flash(f"Ошибка при сохранении категории '{category_name}'.", 'error') - 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': - category_to_delete = request.form.get('category_name') - if category_to_delete and category_to_delete in categories: - categories.remove(category_to_delete) - updated_count = 0 - for product in products: - if product.get('category') == category_to_delete: - product['category'] = 'Без категории' - updated_count += 1 - data['categories'] = categories - data['products'] = products - if save_data(data): - logging.info(f"Category '{category_to_delete}' deleted. Updated products: {updated_count}.") - flash(f"Категория '{category_to_delete}' удалена. {updated_count} товаров обновлено.", 'success') - else: - flash(f"Ошибка при сохранении изменений после удаления категории '{category_to_delete}'.", 'error') - else: - logging.warning(f"Attempted to delete non-existent or empty category: {category_to_delete}") - flash(f"Не удалось удалить категорию '{category_to_delete}'.", 'error') - - elif action == 'add_product': - if not HF_TOKEN_WRITE: - flash("Ошибка: HF_TOKEN (для записи) не настроен. Добавление товара невозможно.", 'error') - return redirect(url_for('admin')) - - name = request.form.get('name', '').strip() - barcode = request.form.get('barcode', '').strip() - price_str = request.form.get('price', '').replace(',', '.') - stock_str = request.form.get('stock', '0') - description = request.form.get('description', '').strip() - category = request.form.get('category') - photos_files = request.files.getlist('photos') - colors = [c.strip() for c in request.form.getlist('colors') if c.strip()] - is_top = 'is_top' in request.form - - if not name or not price_str or stock_str is None: - flash("Название, цена и начальный остаток товара обязательны.", 'error') - return redirect(url_for('admin')) - - try: - price = round(float(price_str), 2) - if price < 0: price = 0 - except ValueError: - flash("Неверный формат цены.", 'error') - return redirect(url_for('admin')) - try: - stock = int(stock_str) - if stock < 0: stock = 0 - except ValueError: - flash("Неверный формат остатка на складе.", 'error') - return redirect(url_for('admin')) - - photos_list = [] - uploads_dir = 'uploads_temp' - os.makedirs(uploads_dir, exist_ok=True) - api = HfApi() - photo_limit = 10 - 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: - filename = secure_filename(photo.filename) - temp_path = os.path.join(uploads_dir, filename) - photo.save(temp_path) - - img_type = imghdr.what(temp_path) - if not img_type and os.path.splitext(filename)[1].lower() not in ['.webp']: # imghdr might not detect webp - logging.warning(f"Skipping non-image file upload: {photo.filename}") - flash(f"Файл {photo.filename} не является изображением и был пропущен.", "warning") - os.remove(temp_path) - continue - - ext = os.path.splitext(filename)[1].lower() - safe_name = secure_filename(name.replace(' ', '_'))[:50] - photo_filename = f"{safe_name}_{datetime.now().strftime('%Y%m%d%H%M%S%f')}{ext}" - final_temp_path = os.path.join(uploads_dir, photo_filename) - os.rename(temp_path, final_temp_path) # Rename to avoid conflicts - - logging.info(f"Uploading photo {photo_filename} to HF for product {name}...") - api.upload_file( - path_or_fileobj=final_temp_path, - path_in_repo=f"photos/{photo_filename}", - repo_id=REPO_ID, - repo_type="dataset", - token=HF_TOKEN_WRITE, - commit_message=f"Add photo for product {name}" - ) - photos_list.append(photo_filename) - logging.info(f"Photo {photo_filename} uploaded successfully.") - os.remove(final_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') - temp_file_to_clean = os.path.join(uploads_dir, secure_filename(photo.filename)) - final_temp_file_to_clean = os.path.join(uploads_dir, photo_filename) - if os.path.exists(temp_file_to_clean): try: os.remove(temp_file_to_clean) except OSError: pass - if os.path.exists(final_temp_file_to_clean): try: os.remove(final_temp_file_to_clean) except OSError: 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}") - - new_product = { - 'id': uuid.uuid4().hex, - 'name': name, - 'barcode': barcode, - 'price': price, - 'stock': stock, - 'description': description, - 'category': category if category in categories else 'Без категории', - 'photos': photos_list, - 'colors': colors, - 'is_top': is_top - } - products.append(new_product) - data['products'] = products - - if save_data(data): - logging.info(f"Product '{name}' added with ID {new_product['id']}.") - flash(f"Товар '{name}' успешно добавлен.", 'success') - else: - flash(f"Ошибка при сохранении товара '{name}'.", 'error') - # TODO: Attempt to remove uploaded photos if save fails? Complex. - - - elif action == 'edit_product': - if not HF_TOKEN_WRITE: - flash("Ошибка: HF_TOKEN (для записи) не настроен. Редактирование товара невозможно.", 'error') - return redirect(url_for('admin')) - - product_id = request.form.get('product_id') - product_to_edit = get_product_by_id(product_id, data) - - if not product_to_edit: - flash(f"Ошибка редактирования: товар с ID '{product_id}' не найден.", 'error') - logging.error(f"Attempted to edit non-existent product ID: {product_id}") - return redirect(url_for('admin')) - - original_name = product_to_edit.get('name', 'N/A') - original_photos = product_to_edit.get('photos', []) - - product_to_edit['name'] = request.form.get('name', product_to_edit['name']).strip() - product_to_edit['barcode'] = request.form.get('barcode', product_to_edit.get('barcode', '')).strip() - price_str = request.form.get('price', str(product_to_edit['price'])).replace(',', '.') - stock_str = request.form.get('stock', str(product_to_edit.get('stock', 0))) - product_to_edit['description'] = request.form.get('description', product_to_edit.get('description', '')).strip() - category = request.form.get('category') - product_to_edit['category'] = category if category in categories else 'Без категории' - product_to_edit['colors'] = [c.strip() for c in request.form.getlist('colors') if c.strip()] - product_to_edit['is_top'] = 'is_top' in request.form - - try: - price = round(float(price_str), 2) - 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') - - stock_before = product_to_edit.get('stock', 0) - try: - stock_after = int(stock_str) - if stock_after < 0: stock_after = 0 - product_to_edit['stock'] = stock_after - stock_change = stock_after - stock_before - if stock_change != 0: - record_transaction(data, product_to_edit['id'], stock_change, 'adjustment', details="Manual admin adjustment") - except ValueError: - logging.warning(f"Invalid stock format '{stock_str}' during edit of product {original_name}. Stock not changed.") - flash(f"Не��ерный формат остатка на складе для товара '{original_name}'. Остаток не изменен.", 'warning') - - - photos_files = request.files.getlist('photos') - if photos_files and any(f.filename for f in photos_files): - uploads_dir = 'uploads_temp' - os.makedirs(uploads_dir, exist_ok=True) - api = HfApi() - new_photos_list = [] - photo_limit = 10 - uploaded_count = 0 - logging.info(f"Uploading new photos for product {product_to_edit['name']}...") - temp_uploaded_files = [] - 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: - filename = secure_filename(photo.filename) - temp_path = os.path.join(uploads_dir, filename) - photo.save(temp_path) - - img_type = imghdr.what(temp_path) - if not img_type and os.path.splitext(filename)[1].lower() not in ['.webp']: - logging.warning(f"Skipping non-image file upload during edit: {photo.filename}") - flash(f"Файл {photo.filename} не является изображением и был пропущен.", "warning") - os.remove(temp_path) - continue - - - ext = os.path.splitext(filename)[1].lower() - safe_name = secure_filename(product_to_edit['name'].replace(' ', '_'))[:50] - photo_filename = f"{safe_name}_{datetime.now().strftime('%Y%m%d%H%M%S%f')}{ext}" - final_temp_path = os.path.join(uploads_dir, photo_filename) - os.rename(temp_path, final_temp_path) - - logging.info(f"Uploading new photo {photo_filename} to HF...") - api.upload_file(path_or_fileobj=final_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(final_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') - temp_file_to_clean = os.path.join(uploads_dir, secure_filename(photo.filename)) - final_temp_file_to_clean = os.path.join(uploads_dir, photo_filename) - if os.path.exists(temp_file_to_clean): try: os.remove(temp_file_to_clean) except OSError: pass - if os.path.exists(final_temp_file_to_clean): try: os.remove(final_temp_file_to_clean) except OSError: 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}") - - - if new_photos_list: - logging.info(f"New photo list for product {product_to_edit['name']} generated.") - if original_photos: - logging.info(f"Attempting to delete old photos: {original_photos}") - try: - api.delete_files( - repo_id=REPO_ID, - paths_in_repo=[f"photos/{p}" for p in original_photos], - repo_type="dataset", - 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 {original_photos} from HF: {e}", exc_info=True) - flash("Не удалось удалить старые фотографии с сервера. Новые фото загружены.", "warning") - product_to_edit['photos'] = new_photos_list - flash("Фотографии товара успешно обновлены.", "success") - elif uploaded_count == 0 and any(f.filename for f in photos_files): - flash("Не удалось загрузить новые фотографии (возможно, неверный формат).", "error") - - # Find the index of the modified product and update it in the list - try: - product_index_in_list = next(i for i, p in enumerate(data.get('products', [])) if p.get('id') == product_id) - data['products'][product_index_in_list] = product_to_edit - if save_data(data): - logging.info(f"Product '{original_name}' (ID {product_id}) updated to '{product_to_edit['name']}'.") - flash(f"Товар '{product_to_edit['name']}' успешно обновлен.", 'success') - else: - flash(f"Ошибка при сохранении обновлений для товара '{product_to_edit['name']}'.", 'error') - - except StopIteration: - logging.error(f"Product ID {product_id} not found in data['products'] list during edit save.") - flash(f"Ошибка сохранения: товар с ID '{product_id}' не найден.", 'error') - - - elif action == 'delete_product': - if not HF_TOKEN_WRITE: - flash("Ошибка: HF_TOKEN (для записи) не настроен. Удаление товара невозможно.", 'error') - return redirect(url_for('admin')) - - product_id = request.form.get('product_id') - product_to_delete = get_product_by_id(product_id, data) - - if not product_to_delete: - flash(f"Ошибка удаления: товар с ID '{product_id}' не найден.", 'error') - logging.error(f"Attempted to delete non-existent product ID: {product_id}") - return redirect(url_for('admin')) - - product_name = product_to_delete.get('name', 'N/A') - photos_to_delete = product_to_delete.get('photos', []) - - # Remove product from the list - data['products'] = [p for p in data.get('products', []) if p.get('id') != product_id] - - # Delete associated transactions - data['transactions'] = [t for t in data.get('transactions', []) if t.get('product_id') != product_id] - # Note: Orders still contain snapshot of deleted product. - - if save_data(data): - logging.info(f"Product '{product_name}' (ID {product_id}) deleted.") - flash(f"Товар '{product_name}' удален.", 'success') - - # Attempt to delete photos from HF after successful data save - if photos_to_delete: - 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") - else: - flash(f"Ошибка при сохранении изменений после удаления товара '{product_name}'.", 'error') - - elif action == 'record_arrival': - product_id = request.form.get('product_id') - quantity_str = request.form.get('quantity') - details = request.form.get('details', '').strip() - - product = get_product_by_id(product_id, data) - if not product: - flash(f"Ошибка прихода: товар с ID '{product_id}' не найден.", 'error') - return redirect(url_for('admin')) - - try: - quantity = int(quantity_str) - if quantity <= 0: raise ValueError("Quantity must be positive") - except (ValueError, TypeError): - flash("Неверное количество для прихода.", 'error') - return redirect(url_for('admin')) - - product['stock'] = product.get('stock', 0) + quantity - record_transaction(data, product_id, quantity, 'arrival', details) - - if save_data(data): - flash(f"Приход товара '{product['name']}' ({quantity} шт.) зафиксирован.", 'success') - logging.info(f"Recorded arrival for product {product['id']}: +{quantity}") - else: - flash(f"Ошибка при сохранении прихода товара '{product['name']}'.", 'error') - - elif action == 'record_adjustment': - product_id = request.form.get('product_id') - quantity_str = request.form.get('quantity') - details = request.form.get('details', '').strip() - - product = get_product_by_id(product_id, data) - if not product: - flash(f"Ошибка корректировки: товар с ID '{product_id}' не найден.", 'error') - return redirect(url_for('admin')) - - try: - quantity_change = int(quantity_str) - except (ValueError, TypeError): - flash("Неверное значение изменения остатка.", 'error') - return redirect(url_for('admin')) - - new_stock = product.get('stock', 0) + quantity_change - if new_stock < 0: - flash(f"Ошибка корректировки: Остаток не может быть отрицательным. Попытка установить: {new_stock}", 'error') - return redirect(url_for('admin')) - - product['stock'] = new_stock - record_transaction(data, product_id, quantity_change, 'adjustment', details) - - if save_data(data): - flash(f"Остаток товара '{product['name']}' скорректирован ({quantity_change} шт.). Новый остаток: {new_stock}.", 'success') - logging.info(f"Recorded adjustment for product {product['id']}: {quantity_change}. New stock: {new_stock}") - else: - flash(f"Ошибка при сохранении корректировки остатка товара '{product['name']}'.", 'error') - - 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() - # Sort products for admin display by name, then by stock (in_stock first) - display_products = sorted(current_data.get('products', []), key=lambda p: (p.get('stock', 0) <= 0, p.get('name', '').lower())) - - display_categories = sorted(current_data.get('categories', [])) - display_orders = current_data.get('orders', {}) - display_transactions = current_data.get('transactions', []) - - return render_template_string( - ADMIN_TEMPLATE, - products=display_products, - categories=display_categories, - orders=display_orders, - transactions=display_transactions, - repo_id=REPO_ID, - currency_code=CURRENCY_CODE, - get_product_by_id=get_product_by_id, # Pass function to template - data=current_data, # Pass entire data for lookup in template - hf_token_write=HF_TOKEN_WRITE, # Pass token status to template for disabling buttons - hf_token_read=HF_TOKEN_READ - ) - -@app.route('/admin/lookup_barcode', methods=['POST']) -def lookup_barcode(): - barcode_data = request.get_json() - barcode = barcode_data.get('barcode', '').strip() - - if not barcode: - return jsonify({"error": "Штрихкод не предоставлен."}), 400 - - data = load_data() - found_product = None - for product in data.get('products', []): - if product.get('barcode', '').strip() == barcode: - found_product = product - break - - if found_product: - # Return only necessary data for the lookup result display - return jsonify({ - "product": { - "id": found_product['id'], - "name": found_product['name'], - "barcode": found_product.get('barcode', ''), - "stock": found_product.get('stock', 0), - "price": found_product['price'], - "category": found_product.get('category', 'Без категории') - } - }), 200 - else: - return jsonify({"message": "Товар не найден."}), 404 - - -@app.route('/force_upload', methods=['POST']) -def force_upload(): - logging.info("Forcing upload to Hugging Face...") - if upload_db_to_hf(): - flash("Данные успешно загружены на Hugging Face.", 'success') - else: - flash("Ошибка при загрузке на Hugging Face. Проверьте логи.", 'error') - return redirect(url_for('admin')) - -@app.route('/force_download', methods=['POST']) -def force_download(): - logging.info("Forcing download from Hugging Face...") - if download_db_from_hf(): - flash("Данные успешно скачаны с Hugging Face. Локальные файлы обновлены.", 'success') - load_data() # Reload data into memory after download - else: - flash("Не удалось скачать данные с Hugging Face после нескольких попыток. Проверьте логи.", 'error') - return redirect(url_for('admin')) - - -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.") - -if __name__ == '__main__': - logging.info("Application starting up. Performing initial data load/download...") - download_db_from_hf() - data_on_startup = load_data() # Load data and assign IDs if needed - - # Re-save immediately on startup if IDs were assigned to ensure consistency - needs_save_on_startup = any('id' not in p or not p['id'] for p in data_on_startup.get('products', [])) - if needs_save_on_startup: - logging.info("Some products were missing IDs. Saving data on startup.") - save_data(data_on_startup) # This will also trigger HF upload if token is set - else: - logging.info("All products have IDs. No immediate save needed after load.") - - - 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).") - - 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) -