diff --git a/.gitignore b/.gitignore index 580f074..e6ea77e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,8 @@ venv/ desktop.ini -static/ +data/ __pycache__/ *.pyc *.pyo *.pyd +.claude/ \ No newline at end of file diff --git a/PLANNING.md b/PLANNING.md deleted file mode 100644 index 1640d40..0000000 --- a/PLANNING.md +++ /dev/null @@ -1,55 +0,0 @@ -# Project Planning and Code Guidelines - -## General Code Guidelines - -* **Modular Design:** Use Object-Oriented Programming (OOP) where possible to separate concerns and promote code reuse. -* **File Size Limit:** No single Python file should exceed **600 lines** to improve readability and maintainability. -* **Commenting:** - - * Use clear, concise comments to explain complex logic. - * Include function and class docstrings where appropriate. - * Use in-line comments sparingly and only when the logic is not immediately obvious. -* **Code Structure:** - - * Follow the Model-View-Controller (MVC) pattern where applicable. - * Group related classes and functions into separate modules for clarity. -* **Error Handling:** Implement robust error handling with meaningful messages and fallback behavior where possible. -* **Readability:** - - * Use meaningful variable and function names. - * Avoid deeply nested loops and conditionals where possible. - -## API Design Guidelines - -* **RESTful Endpoints:** Use RESTful conventions for all API endpoints. -* **Status Codes:** Return appropriate HTTP status codes (e.g., 200 for success, 404 for not found, 500 for server error). -* **Error Responses:** Provide consistent and descriptive error messages. -* **Data Validation:** Validate all incoming data to prevent unexpected behavior and security issues. -* **Unified API and UI:** For demo purposes, both the API endpoints and admin UI should be served by the same Flask application. - -## File Organization - -* **Static Files:** Store images in the `static/images/` directory. -* **Product Data:** Store product metadata in `products.json`. -* **Configuration Files:** Use a dedicated `config/` directory for environment-specific settings. -* **Templates:** Store HTML templates in the `templates/` directory, with admin-specific templates in `templates/admin/`. - -## Documentation Guidelines - -* **Keep Documentation Updated:** Update TASK.md as features are implemented to track progress. -* **Readme First:** README.md should always reflect the current state of the project and provide clear setup instructions. -* **Code Comments:** Keep code comments in sync with implementation changes. -* **API Documentation:** Document all API endpoints, including request/response formats. - -## Security Guidelines - -* **No Hardcoded Credentials:** Avoid hardcoding sensitive information like passwords or API keys. -* **Input Sanitization:** Validate and sanitize all user input to prevent injection attacks. -* **Minimal Permissions:** Run the application with the least required privileges. - -## Future Considerations - -* **Scalability:** Plan for the potential migration to a database if the product catalog grows. -* **API Rate Limiting:** Consider adding rate limiting for public APIs. -* **Monitoring and Logging:** Implement basic logging for audit trails and error diagnosis. -* **Deployment Automation:** Use Docker or other containerization for easy deployment and scaling. diff --git a/TASK.md b/TASK.md deleted file mode 100644 index 6368793..0000000 --- a/TASK.md +++ /dev/null @@ -1,50 +0,0 @@ -# Task List - Flask AR API Demo - -## Phase 1: Basic Admin UI ✅ - -* [x] Create a simple admin UI (no authentication required for demo purposes). -* [x] Allow adding, updating, and deleting products. -* [x] Store all product data in a `products.json` file for persistence. -* [x] Store images in the `static/images/` directory. -* [x] Implement basic form validation for product fields (ID, price, image). -* [x] Add a file upload feature for product images. - -## Phase 2: API Improvements - -* [x] Update the `/arinfo` endpoint to read from `products.json` instead of the in-memory dictionary. -* [ ] Add support for updating product attributes via the API. -* [x] Implement error handling and input validation. -* [ ] Optimize image loading for better performance. - -## Phase 3: UI Enhancements - -* [x] Add a responsive design for mobile and tablet support. -* [x] Include image previews in the admin UI. -* [ ] Add sorting and search capabilities for the product list. -* [x] Add barcode and QR code generation for products. - -## Implementation Notes - -* The APIs and admin UI have been implemented as a single server for demonstration purposes. -* The API endpoints and admin interface are now served by the same Flask application. -* Bootstrap 5 has been used for responsive UI design. -* Basic validation has been implemented for product forms. -* Flash messages provide user feedback for actions. -* Barcode generation features support three formats: - * QR Code: Links directly to the product's AR information endpoint - * EAN-13: Standard barcode format for retail products - * Code 128: High-density alphanumeric barcode -* Generated barcodes can be previewed, downloaded individually, or printed all at once. -* Barcodes are dynamically generated and stored in the `static/barcodes/` directory. - -## Future Ideas - -* [ ] Write basic unit tests for the API. -* [ ] Dockerize the application for easier deployment. -* [ ] Add a basic CI/CD pipeline (e.g., GitHub Actions or GitLab CI). -* [ ] Add user authentication for the admin UI. -* [ ] Implement role-based access control (RBAC). -* [ ] Add analytics for product views and updates. -* [ ] Integrate with a database for larger product catalogs. -* [ ] Add bulk import/export functionality for products. -* [ ] Implement a mobile-friendly scanner interface for testing the AR functionality. diff --git a/admin.py b/admin.py deleted file mode 100644 index 5d316a5..0000000 --- a/admin.py +++ /dev/null @@ -1,284 +0,0 @@ -from flask import Blueprint, render_template, request, redirect, url_for, flash, jsonify, send_file -import os -import json -import uuid -import io -from werkzeug.utils import secure_filename - -# Import barcode generator class, but handle the case if it fails -try: - from barcode_generator import BarcodeGenerator - BARCODE_GENERATOR_AVAILABLE = True -except ImportError: - BARCODE_GENERATOR_AVAILABLE = False - # Create a stub class for graceful degradation - class BarcodeGenerator: - @staticmethod - def check_dependencies(): - return {'qrcode': False, 'barcode': False, 'pillow': False} - -admin_bp = Blueprint('admin', __name__, url_prefix='/admin') - -PRODUCTS_FILE = 'static/products.json' -UPLOAD_FOLDER = 'static/images' -BARCODE_FOLDER = 'static/barcodes' -ALLOWED_EXTENSIONS = {'png', 'jpg', 'jpeg', 'gif'} - -def allowed_file(filename): - return '.' in filename and filename.rsplit('.', 1)[1].lower() in ALLOWED_EXTENSIONS - -def load_products(): - try: - with open(PRODUCTS_FILE, 'r') as f: - return json.load(f) - except (FileNotFoundError, json.JSONDecodeError): - return {} - -def save_products(products): - with open(PRODUCTS_FILE, 'w') as f: - json.dump(products, f, indent=2) - -@admin_bp.route('/') -def index(): - products = load_products() - return render_template('admin/index.html', products=products) - -@admin_bp.route('/add', methods=['GET', 'POST']) -def add_product(): - if request.method == 'POST': - # Get form data - product_id = request.form.get('product_id') - name = request.form.get('name') - price = request.form.get('price') - - # Basic validation - if not product_id or not name or not price: - flash('Product ID, Name, and Price are required fields.') - return render_template('admin/add_product.html') - - # Check if product ID already exists - products = load_products() - if product_id in products: - flash('Product ID already exists.') - return render_template('admin/add_product.html') - - # Handle image upload - image_filename = f"{product_id}.png" # Default name - image_path = f"/images/{image_filename}" - - if 'image' in request.files: - file = request.files['image'] - if file and file.filename and allowed_file(file.filename): - extension = file.filename.rsplit('.', 1)[1].lower() - image_filename = f"{product_id}.{extension}" - image_path = f"/images/{image_filename}" - file.save(os.path.join(UPLOAD_FOLDER, image_filename)) - - # Create product data structure - product_data = [ - {"fieldName": "_id", "label": "Item ID", "value": product_id, "editable": "false", "fieldType": "TEXT"}, - {"fieldName": "_name", "label": "Product Name", "value": name, "editable": "true", "fieldType": "TEXT"}, - {"fieldName": "_price", "label": "Sale Price", "value": f"${price}", "editable": "true", "fieldType": "TEXT"}, - {"fieldName": "_image", "label": "Image", "value": image_path, "editable": "false", "fieldType": "IMAGE_URI"} - ] - - # Save to products.json - products[product_id] = product_data - save_products(products) - - flash('Product added successfully!') - return redirect(url_for('admin.index')) - - return render_template('admin/add_product.html') - -@admin_bp.route('/edit/', methods=['GET', 'POST']) -def edit_product(product_id): - products = load_products() - - if product_id not in products: - flash('Product not found.') - return redirect(url_for('admin.index')) - - if request.method == 'POST': - # Get form data - name = request.form.get('name') - price = request.form.get('price') - - # Basic validation - if not name or not price: - flash('Name and Price are required fields.') - return render_template('admin/edit_product.html', product_id=product_id, product=products[product_id]) - - # Update name and price - for field in products[product_id]: - if field["fieldName"] == "_name": - field["value"] = name - elif field["fieldName"] == "_price": - field["value"] = f"${price}" - - # Handle image upload - if 'image' in request.files and request.files['image'].filename: - file = request.files['image'] - if allowed_file(file.filename): - # Find current image path - current_image = None - for field in products[product_id]: - if field["fieldName"] == "_image": - current_image = field["value"] - - if current_image: - # Get current filename - current_filename = os.path.basename(current_image) - # Delete old file if it exists and is different - old_path = os.path.join(UPLOAD_FOLDER, current_filename) - if os.path.exists(old_path): - os.remove(old_path) - - # Save new image - extension = file.filename.rsplit('.', 1)[1].lower() - image_filename = f"{product_id}.{extension}" - image_path = f"/images/{image_filename}" - file.save(os.path.join(UPLOAD_FOLDER, image_filename)) - - # Update image path - for field in products[product_id]: - if field["fieldName"] == "_image": - field["value"] = image_path - - # Save to products.json - save_products(products) - - flash('Product updated successfully!') - return redirect(url_for('admin.index')) - - return render_template('admin/edit_product.html', product_id=product_id, product=products[product_id]) - -@admin_bp.route('/delete/', methods=['POST']) -def delete_product(product_id): - products = load_products() - - if product_id not in products: - flash('Product not found.') - return redirect(url_for('admin.index')) - - # Find image path - image_path = None - for field in products[product_id]: - if field["fieldName"] == "_image": - image_path = field["value"] - - # Delete image file - if image_path: - image_filename = os.path.basename(image_path) - image_file_path = os.path.join(UPLOAD_FOLDER, image_filename) - if os.path.exists(image_file_path): - os.remove(image_file_path) - - # Delete product from dict - del products[product_id] - - # Save updated products - save_products(products) - - flash('Product deleted successfully!') - return redirect(url_for('admin.index')) - -@admin_bp.route('/view/') -def view_product(product_id): - products = load_products() - - if product_id not in products: - flash('Product not found.') - return redirect(url_for('admin.index')) - - return render_template('admin/view_product.html', product_id=product_id, product=products[product_id]) - -@admin_bp.route('/generate_barcode//') -def generate_barcode(product_id, code_type): - """Generate and serve a barcode or QR code for a product""" - # Make sure the barcodes directory exists - os.makedirs(BARCODE_FOLDER, exist_ok=True) - - products = load_products() - if product_id not in products: - return jsonify({"error": "Product not found"}), 404 - - # Check if barcode generator is available - if not BARCODE_GENERATOR_AVAILABLE: - # Create a simple error image - from PIL import Image, ImageDraw, ImageFont - img = Image.new('RGB', (300, 150), color=(255, 255, 255)) - d = ImageDraw.Draw(img) - d.rectangle([0, 0, 299, 149], outline=(0, 0, 0), width=2) - d.text((25, 65), "Barcode generation unavailable", fill=(0, 0, 0)) - - # Save and serve the error image - image_path = os.path.join(BARCODE_FOLDER, f"{product_id}_{code_type}_error.png") - img.save(image_path) - return send_file(image_path, mimetype='image/png') - - generator = BarcodeGenerator() - - # Content for the code - use the product ID - data = product_id - - # Base filename for the saved code - base_filename = f"{product_id}_{code_type}" - image_path = os.path.join(BARCODE_FOLDER, f"{base_filename}.png") - - # Generate the requested code type - if code_type == 'qrcode': - # Generate QR code with product URL - product_url = request.host_url.rstrip('/') + f"/arinfo?barcode={product_id}" - img = generator.generate_qr_code(product_url) - generator.save_image(img, image_path) - - elif code_type == 'ean13': - # For EAN-13, make sure the product ID is numeric - numeric_id = ''.join(filter(str.isdigit, product_id)) - img = generator.generate_ean13_barcode(numeric_id) - generator.save_image(img, image_path) - - elif code_type == 'code128': - img = generator.generate_code128_barcode(data) - generator.save_image(img, image_path) - - else: - return jsonify({"error": "Invalid code type"}), 400 - - # Return the image directly - return send_file(image_path, mimetype='image/png') - -@admin_bp.route('/generate_barcode_page/') -def generate_barcode_page(product_id): - """Show a page with different barcode options for a product""" - products = load_products() - - if product_id not in products: - flash('Product not found.') - return redirect(url_for('admin.index')) - - # Extract product data - product_data = {} - for field in products[product_id]: - field_name = field["fieldName"][1:] if field["fieldName"].startswith('_') else field["fieldName"] - product_data[field_name] = field["value"] - - # Add product ID - product_data['id'] = product_id - - # Check if barcode generation is available - dependency_status = {} - if BARCODE_GENERATOR_AVAILABLE: - dependency_status = BarcodeGenerator.check_dependencies() - else: - dependency_status = { - 'qrcode': False, - 'barcode': False, - 'pillow': False - } - - return render_template('admin/generate_barcode.html', - product_id=product_id, - product=product_data, - dependencies=dependency_status) diff --git a/app.py b/app.py deleted file mode 100644 index 5c09c3d..0000000 --- a/app.py +++ /dev/null @@ -1,85 +0,0 @@ -from flask import Flask, jsonify, request, send_file, render_template, flash -import os -import json -from admin import admin_bp - -app = Flask(__name__) -app.config['STATIC_FOLDER'] = './static' -app.config['SECRET_KEY'] = 'dev-key-for-demo-only' - -# Register blueprints -app.register_blueprint(admin_bp) - -# Load product data from products.json -def load_products(): - try: - with open('static/products.json', 'r') as f: - return json.load(f) - except (FileNotFoundError, json.JSONDecodeError): - return {} - -@app.route('/') -def index(): - return render_template('index.html') - -@app.route('/login', methods=['GET']) -def login(): - # Just return 200 for this example, assuming no auth needed - return '', 200 - -@app.route('/arcontentfields', methods=['GET']) -def get_ar_content_fields(): - # Return a fixed set of attributes - fields = [ - {"fieldName": "_id", "label": "Item ID", "editable": "false", "fieldType": "TEXT"}, - {"fieldName": "_price", "label": "Sale Price", "editable": "true", "fieldType": "TEXT"}, - {"fieldName": "_image", "label": "Image", "editable": "false", "fieldType": "IMAGE_URI"} - ] - return jsonify(fields), 200 - -@app.route('/arinfo', methods=['GET']) -def get_ar_info(): - barcode = request.args.get('barcode') - products = load_products() - if not barcode or barcode not in products: - return jsonify({"error": "Item not found"}), 404 - return jsonify(products[barcode]), 200 - -@app.route('/images/', methods=['GET']) -def serve_image(filename): - image_path = os.path.join(app.config['STATIC_FOLDER'], 'images', filename) - if os.path.exists(image_path): - return send_file(image_path) - return jsonify({"error": "Image not found"}), 404 - -@app.route('/barcodes/', methods=['GET']) -def serve_barcode(filename): - barcode_path = os.path.join(app.config['STATIC_FOLDER'], 'barcodes', filename) - if os.path.exists(barcode_path): - return send_file(barcode_path) - return jsonify({"error": "Barcode not found"}), 404 - -if __name__ == '__main__': - # Ensure the required directories exist - os.makedirs(os.path.join(app.config['STATIC_FOLDER'], 'images'), exist_ok=True) - os.makedirs(os.path.join(app.config['STATIC_FOLDER'], 'barcodes'), exist_ok=True) - - # If products.json doesn't exist, create it with initial data - products_file = os.path.join(app.config['STATIC_FOLDER'], 'products.json') - if not os.path.exists(products_file): - initial_data = { - "123456": [ - {"fieldName": "_id", "label": "Item ID", "value": "123456", "editable": "false", "fieldType": "TEXT"}, - {"fieldName": "_price", "label": "Sale Price", "value": "$49.99", "editable": "true", "fieldType": "TEXT"}, - {"fieldName": "_image", "label": "Image", "value": "/images/123456.png", "editable": "false", "fieldType": "IMAGE_URI"} - ], - "789012": [ - {"fieldName": "_id", "label": "Item ID", "value": "789012", "editable": "false", "fieldType": "TEXT"}, - {"fieldName": "_price", "label": "Sale Price", "value": "$59.99", "editable": "true", "fieldType": "TEXT"}, - {"fieldName": "_image", "label": "Image", "value": "/images/789012.png", "editable": "false", "fieldType": "IMAGE_URI"} - ] - } - with open(products_file, 'w') as f: - json.dump(initial_data, f, indent=2) - - app.run(port=5555, host="0.0.0.0", debug=True) diff --git a/app_compatibility.py b/app_compatibility.py deleted file mode 100644 index 8dcbdc5..0000000 --- a/app_compatibility.py +++ /dev/null @@ -1,112 +0,0 @@ -""" -This file is a compatibility wrapper for the main app.py -It addresses the Werkzeug import issue by patching the necessary functions -""" -import sys - -# Add compatibility for url_quote before importing Flask -try: - # First try normal import - from werkzeug.urls import url_quote -except ImportError: - # If it fails, create a shim for the missing function - import werkzeug - from werkzeug.urls import quote as url_quote - # Patch the werkzeug.urls module - werkzeug.urls.url_quote = url_quote - sys.modules['werkzeug.urls'].url_quote = url_quote - -# Now import Flask normally -from flask import Flask, jsonify, request, send_file, render_template, flash -import os -import json -from admin import admin_bp - -app = Flask(__name__) -app.config['STATIC_FOLDER'] = './static' -app.config['SECRET_KEY'] = 'dev-key-for-demo-only' - -# Register blueprints -app.register_blueprint(admin_bp) - -# Load product data from products.json -def load_products(): - try: - with open('static/products.json', 'r') as f: - return json.load(f) - except (FileNotFoundError, json.JSONDecodeError): - return {} - -@app.route('/') -def index(): - return render_template('index.html') - -@app.route('/login', methods=['GET']) -def login(): - # Just return 200 for this example, assuming no auth needed - return '', 200 - -@app.route('/arcontentfields', methods=['GET']) -def get_ar_content_fields(): - # Return a fixed set of attributes - fields = [ - {"fieldName": "_id", "label": "Item ID", "editable": "false", "fieldType": "TEXT"}, - {"fieldName": "_price", "label": "Sale Price", "editable": "true", "fieldType": "TEXT"}, - {"fieldName": "_image", "label": "Image", "editable": "false", "fieldType": "IMAGE_URI"} - ] - return jsonify(fields), 200 - -@app.route('/arinfo', methods=['GET']) -def get_ar_info(): - barcode = request.args.get('barcode') - products = load_products() - if not barcode or barcode not in products: - return jsonify({"error": "Item not found"}), 404 - return jsonify(products[barcode]), 200 - -@app.route('/images/', methods=['GET']) -def serve_image(filename): - image_path = os.path.join(app.config['STATIC_FOLDER'], 'images', filename) - if os.path.exists(image_path): - return send_file(image_path) - return jsonify({"error": "Image not found"}), 404 - -@app.route('/barcodes/', methods=['GET']) -def serve_barcode(filename): - barcode_path = os.path.join(app.config['STATIC_FOLDER'], 'barcodes', filename) - if os.path.exists(barcode_path): - return send_file(barcode_path) - return jsonify({"error": "Barcode not found"}), 404 - -if __name__ == '__main__': - # Print helpful information - print("=" * 80) - print("KCAP Demo Server") - print("=" * 80) - print("This version includes compatibility fixes for Werkzeug/Flask version mismatches.") - print("If you encounter dependency errors, please run: pip install -r requirements.txt") - print("=" * 80) - - # Ensure the required directories exist - os.makedirs(os.path.join(app.config['STATIC_FOLDER'], 'images'), exist_ok=True) - os.makedirs(os.path.join(app.config['STATIC_FOLDER'], 'barcodes'), exist_ok=True) - - # If products.json doesn't exist, create it with initial data - products_file = os.path.join(app.config['STATIC_FOLDER'], 'products.json') - if not os.path.exists(products_file): - initial_data = { - "123456": [ - {"fieldName": "_id", "label": "Item ID", "value": "123456", "editable": "false", "fieldType": "TEXT"}, - {"fieldName": "_price", "label": "Sale Price", "value": "$49.99", "editable": "true", "fieldType": "TEXT"}, - {"fieldName": "_image", "label": "Image", "value": "/images/123456.png", "editable": "false", "fieldType": "IMAGE_URI"} - ], - "789012": [ - {"fieldName": "_id", "label": "Item ID", "value": "789012", "editable": "false", "fieldType": "TEXT"}, - {"fieldName": "_price", "label": "Sale Price", "value": "$59.99", "editable": "true", "fieldType": "TEXT"}, - {"fieldName": "_image", "label": "Image", "value": "/images/789012.png", "editable": "false", "fieldType": "IMAGE_URI"} - ] - } - with open(products_file, 'w') as f: - json.dump(initial_data, f, indent=2) - - app.run(port=5555, host="0.0.0.0", debug=True) diff --git a/barcode_generator.py b/barcode_generator.py deleted file mode 100644 index 3235960..0000000 --- a/barcode_generator.py +++ /dev/null @@ -1,185 +0,0 @@ -import os -import io -from PIL import Image, ImageDraw, ImageFont - -# Try to import barcode libraries, provide fallback if not available -try: - import qrcode - QRCODE_AVAILABLE = True -except ImportError: - QRCODE_AVAILABLE = False - -try: - from barcode import EAN13, Code128 - from barcode.writer import ImageWriter - BARCODE_AVAILABLE = True -except ImportError: - BARCODE_AVAILABLE = False - -class BarcodeGenerator: - """ - A utility class for generating QR codes and barcodes. - """ - - @staticmethod - def check_dependencies(): - """ - Check if all required dependencies are installed. - - Returns: - dict: Status of each dependency - """ - return { - 'qrcode': QRCODE_AVAILABLE, - 'barcode': BARCODE_AVAILABLE, - 'pillow': True # PIL/Pillow is imported directly at the top level - } - - @staticmethod - def generate_qr_code(data, size=10, border=4): - """ - Generates a QR code as a PIL Image object. - - Args: - data (str): The data to encode in the QR code - size (int): The size of the QR code (1-40) - border (int): The border size of the QR code - - Returns: - PIL.Image: The generated QR code image or a placeholder image if qrcode is not available - """ - if not QRCODE_AVAILABLE: - return BarcodeGenerator._generate_placeholder("QR Code Unavailable\nPlease install 'qrcode' package") - - qr = qrcode.QRCode( - version=size, - error_correction=qrcode.constants.ERROR_CORRECT_L, - box_size=10, - border=border, - ) - qr.add_data(data) - qr.make(fit=True) - - img = qr.make_image(fill_color="black", back_color="white") - return img - - @staticmethod - def generate_ean13_barcode(data): - """ - Generates an EAN-13 barcode as a PIL Image object. - - Args: - data (str): The data to encode in the barcode (must be 12 digits) - - Returns: - PIL.Image: The generated barcode image or a placeholder image if barcode is not available - """ - if not BARCODE_AVAILABLE: - return BarcodeGenerator._generate_placeholder("EAN-13 Unavailable\nPlease install 'python-barcode' package") - - # Pad data to 12 digits if needed - if len(data) < 12: - data = data.zfill(12) - elif len(data) > 12: - data = data[:12] - - # Create a BytesIO object to temporarily store the image - buffer = io.BytesIO() - EAN13(data, writer=ImageWriter()).write(buffer) - - # Create a PIL Image from the BytesIO object - buffer.seek(0) - image = Image.open(buffer) - - return image - - @staticmethod - def generate_code128_barcode(data): - """ - Generates a Code 128 barcode as a PIL Image object. - - Args: - data (str): The data to encode in the barcode - - Returns: - PIL.Image: The generated barcode image or a placeholder image if barcode is not available - """ - if not BARCODE_AVAILABLE: - return BarcodeGenerator._generate_placeholder("Code 128 Unavailable\nPlease install 'python-barcode' package") - - # Create a BytesIO object to temporarily store the image - buffer = io.BytesIO() - Code128(data, writer=ImageWriter()).write(buffer) - - # Create a PIL Image from the BytesIO object - buffer.seek(0) - image = Image.open(buffer) - - return image - - @staticmethod - def _generate_placeholder(message): - """ - Generates a placeholder image with a message. - - Args: - message (str): Message to display on the placeholder - - Returns: - PIL.Image: The generated placeholder image - """ - # Create a placeholder image - img = Image.new('RGB', (300, 150), color=(255, 255, 255)) - d = ImageDraw.Draw(img) - - # Draw a border - d.rectangle([0, 0, 299, 149], outline=(0, 0, 0), width=2) - - # Add text - try: - # Try to use a default font - font = ImageFont.truetype("arial.ttf", 20) - except IOError: - # Fallback to default font - font = ImageFont.load_default() - - # Center the text - lines = message.split('\n') - y_offset = 40 - for line in lines: - text_width = d.textlength(line, font=font) - d.text(((300 - text_width) // 2, y_offset), line, font=font, fill=(0, 0, 0)) - y_offset += 30 - - return img - - @staticmethod - def save_image(image, path): - """ - Saves a PIL Image to the specified path. - - Args: - image (PIL.Image): The image to save - path (str): The path to save the image to - - Returns: - str: The path where the image was saved - """ - image.save(path) - return path - - @staticmethod - def get_image_as_bytes(image, format='PNG'): - """ - Converts a PIL Image to bytes. - - Args: - image (PIL.Image): The image to convert - format (str): The format to save the image as - - Returns: - bytes: The image as bytes - """ - buffer = io.BytesIO() - image.save(buffer, format=format) - return buffer.getvalue() diff --git a/src/app/__init__.py b/src/app/__init__.py new file mode 100644 index 0000000..fbf2ea3 --- /dev/null +++ b/src/app/__init__.py @@ -0,0 +1,49 @@ +import os +from flask import Flask, redirect +from werkzeug.routing import BaseConverter + +def create_app(config_name='development'): + """Application factory pattern""" + app = Flask(__name__) + + # Load configuration + from app.config import config + app.config.from_object(config[config_name]) + + # Ensure data folder exists + os.makedirs(app.config['DATA_FOLDER'], exist_ok=True) + + # Custom converter for tenant IDs + class TenantConverter(BaseConverter): + regex = '[a-zA-Z0-9_-]+' + + def to_python(self, value): + # Convert to lowercase when parsing from URL + return value.lower() + + def to_url(self, value): + # Convert to lowercase when generating URLs + return value.lower() + + app.url_map.converters['tenant'] = TenantConverter + + # Initialize database + with app.app_context(): + from app.models.base import init_database + init_database() + + # Register blueprints + from app.blueprints import main_bp, tenant_bp, admin_bp, api_bp + + app.register_blueprint(main_bp) + app.register_blueprint(tenant_bp) + app.register_blueprint(admin_bp) + app.register_blueprint(api_bp) + + # Catch-all route for admin without tenant - redirect to home + @app.route('/admin/') + @app.route('/admin/') + def redirect_admin_to_home(path=None): + return redirect('/') + + return app diff --git a/src/app/blueprints/__init__.py b/src/app/blueprints/__init__.py new file mode 100644 index 0000000..c82d1f5 --- /dev/null +++ b/src/app/blueprints/__init__.py @@ -0,0 +1,6 @@ +from .main import main_bp +from .tenant import tenant_bp +from .admin import admin_bp +from .api import api_bp + +__all__ = ['main_bp', 'tenant_bp', 'admin_bp', 'api_bp'] diff --git a/src/app/blueprints/admin/__init__.py b/src/app/blueprints/admin/__init__.py new file mode 100644 index 0000000..27197e0 --- /dev/null +++ b/src/app/blueprints/admin/__init__.py @@ -0,0 +1,5 @@ +from flask import Blueprint + +admin_bp = Blueprint('admin', __name__, url_prefix='/') + +from . import routes diff --git a/src/app/blueprints/admin/routes.py b/src/app/blueprints/admin/routes.py new file mode 100644 index 0000000..8ad63d1 --- /dev/null +++ b/src/app/blueprints/admin/routes.py @@ -0,0 +1,357 @@ +from flask import render_template, request, redirect, url_for, flash, jsonify, current_app +from . import admin_bp +from app.models import TenantModel, ProductModel, ARFieldModel +from app.services import ProductService + +@admin_bp.route('/add', methods=['GET', 'POST']) +def add_product(tenant_id): + """Add a new product""" + custom_fields = ARFieldModel.get_all(tenant_id) + + if request.method == 'POST': + product_id = request.form.get('product_id') + + if not product_id: + flash('Product ID is required.') + return render_template('admin/add_product.html', tenant_id=tenant_id, custom_fields=custom_fields) + + # Check if product ID already exists + products = ProductModel.get_all(tenant_id) + if product_id in products: + flash('Product ID already exists.') + return render_template('admin/add_product.html', tenant_id=tenant_id, custom_fields=custom_fields) + + # Handle backward compatibility image upload + image_data = None + image_mime_type = None + + # Create product data structure based on custom fields + product_data = [] + + # Always include _id field + product_data.append({ + "fieldName": "_id", + "label": "Item ID", + "value": product_id, + "editable": "false", + "fieldType": "TEXT" + }) + + # Process images after product is saved + images_to_save = [] + + # Add other fields based on custom configuration + for field in custom_fields: + field_name = field['fieldName'] + if field_name == '_id': + continue + + if field['fieldType'] == 'IMAGE_URI': + image_field_name = f'image_{field_name}' + if image_field_name in request.files: + file = request.files[image_field_name] + allowed_extensions = current_app.config['ALLOWED_EXTENSIONS'] + if file and file.filename and ProductService.allowed_file(file.filename, allowed_extensions): + file.seek(0) + img_data = file.read() + + extension = file.filename.rsplit('.', 1)[1].lower() + mime_types = { + 'jpg': 'image/jpeg', + 'jpeg': 'image/jpeg', + 'png': 'image/png', + 'gif': 'image/gif' + } + mime_type = mime_types.get(extension, 'image/jpeg') + + images_to_save.append({ + 'field_name': field_name, + 'data': img_data, + 'mime_type': mime_type + }) + + field_suffix = field_name[1:] if field_name.startswith('_') else field_name + image_path = f"/images/{product_id}_{field_suffix}.{extension}" + + if field_name == '_image': + image_data = img_data + image_mime_type = mime_type + else: + image_path = "" + else: + image_path = "" + + product_data.append({ + "fieldName": field_name, + "label": field['label'], + "value": image_path, + "editable": field['editable'], + "fieldType": field['fieldType'] + }) + else: + value = request.form.get(f'field_{field_name}', '') + product_data.append({ + "fieldName": field_name, + "label": field['label'], + "value": value, + "editable": field['editable'], + "fieldType": field['fieldType'] + }) + + # Handle backward compatibility fields + if '_name' not in [f['fieldName'] for f in custom_fields]: + name = request.form.get('name', '') + if name: + product_data.append({ + "fieldName": "_name", + "label": "Product Name", + "value": name, + "editable": "true", + "fieldType": "TEXT" + }) + + if '_price' not in [f['fieldName'] for f in custom_fields]: + price = request.form.get('price', '') + if price: + product_data.append({ + "fieldName": "_price", + "label": "Sale Price", + "value": f"${price}", + "editable": "true", + "fieldType": "TEXT" + }) + + # Save to database + ProductModel.save(product_id, tenant_id, product_data, image_data, image_mime_type) + + # Save additional images + for img in images_to_save: + ProductModel.save_image(product_id, tenant_id, img['field_name'], img['data'], img['mime_type']) + + flash('Product added successfully!') + return redirect(f'/{tenant_id}/') + + return render_template('admin/add_product.html', tenant_id=tenant_id, custom_fields=custom_fields) + +@admin_bp.route('/edit/', methods=['GET', 'POST']) +def edit_product(tenant_id, product_id): + """Edit an existing product""" + products = ProductModel.get_all(tenant_id) + custom_fields = ARFieldModel.get_all(tenant_id) + + if product_id not in products: + flash('Product not found.') + return redirect(f'/{tenant_id}/') + + if request.method == 'POST': + image_data = None + image_mime_type = None + images_to_save = [] + + # Update fields based on form data + updated_product = [] + + # Always include _id field + for field in products[product_id]: + if field["fieldName"] == "_id": + updated_product.append(field) + break + + # Process each custom field + for custom_field in custom_fields: + field_name = custom_field['fieldName'] + if field_name == '_id': + continue + + # Find existing field data + existing_field = None + for field in products[product_id]: + if field["fieldName"] == field_name: + existing_field = field.copy() + break + + if not existing_field: + existing_field = { + "fieldName": field_name, + "label": custom_field['label'], + "value": "", + "editable": custom_field['editable'], + "fieldType": custom_field['fieldType'] + } + + if custom_field['fieldType'] == 'IMAGE_URI': + image_field_name = f'image_{field_name}' + if image_field_name in request.files and request.files[image_field_name].filename: + file = request.files[image_field_name] + allowed_extensions = current_app.config['ALLOWED_EXTENSIONS'] + if ProductService.allowed_file(file.filename, allowed_extensions): + file.seek(0) + img_data = file.read() + + extension = file.filename.rsplit('.', 1)[1].lower() + mime_types = { + 'jpg': 'image/jpeg', + 'jpeg': 'image/jpeg', + 'png': 'image/png', + 'gif': 'image/gif' + } + mime_type = mime_types.get(extension, 'image/jpeg') + + images_to_save.append({ + 'field_name': field_name, + 'data': img_data, + 'mime_type': mime_type + }) + + field_suffix = field_name[1:] if field_name.startswith('_') else field_name + existing_field["value"] = f"/images/{product_id}_{field_suffix}.{extension}" + + if field_name == '_image': + image_data = img_data + image_mime_type = mime_type + else: + value = request.form.get(f'field_{field_name}', '') + if field_name == '_price' and value and not value.startswith('$'): + value = f"${value}" + existing_field["value"] = value + + updated_product.append(existing_field) + + # Handle backward compatibility fields + if '_name' not in [f['fieldName'] for f in custom_fields]: + name = request.form.get('name', '') + if name: + for field in products[product_id]: + if field["fieldName"] == "_name": + field["value"] = name + updated_product.append(field) + break + + if '_price' not in [f['fieldName'] for f in custom_fields]: + price = request.form.get('price', '') + if price: + for field in products[product_id]: + if field["fieldName"] == "_price": + field["value"] = f"${price}" + updated_product.append(field) + break + + # Save to database + ProductModel.save(product_id, tenant_id, updated_product, image_data, image_mime_type) + + # Save additional images + for img in images_to_save: + ProductModel.save_image(product_id, tenant_id, img['field_name'], img['data'], img['mime_type']) + + flash('Product updated successfully!') + return redirect(f'/{tenant_id}/') + + return render_template('admin/edit_product.html', + product_id=product_id, + product=products[product_id], + tenant_id=tenant_id, + custom_fields=custom_fields) + +@admin_bp.route('/delete/', methods=['POST']) +def delete_product(tenant_id, product_id): + """Delete a product""" + products = ProductModel.get_all(tenant_id) + + if product_id not in products: + flash('Product not found.') + return redirect(f'/{tenant_id}/') + + ProductModel.delete(product_id, tenant_id) + flash('Product deleted successfully!') + return redirect(f'/{tenant_id}/') + +@admin_bp.route('/generate_barcode//') +def generate_barcode(tenant_id, product_id, code_type): + """Redirect to the main barcode generation endpoint""" + products = ProductModel.get_all(tenant_id) + if product_id not in products: + return jsonify({"error": "Product not found"}), 404 + + type_mapping = { + 'qrcode': 'qr', + 'ean13': 'ean13', + 'code128': 'code128' + } + + barcode_type = type_mapping.get(code_type, code_type) + return redirect(f'/{tenant_id}/barcodes/{product_id}_{barcode_type}.png') + +@admin_bp.route('/barcodes', methods=['GET']) +def view_all_barcodes(tenant_id): + """Display all product barcodes for printing""" + products = ProductModel.get_all(tenant_id) + tenant = TenantModel.get_or_create(tenant_id) + + barcode_type = tenant.get('barcode_type', 'qr') + + return render_template('admin/all_barcodes.html', + products=products, + tenant=tenant, + barcode_type=barcode_type) + +@admin_bp.route('/ar_fields', methods=['GET', 'POST']) +def manage_ar_fields(tenant_id): + """Manage custom AR content fields""" + tenant = TenantModel.get_or_create(tenant_id) + + if request.method == 'POST': + action = request.form.get('action') + + if action == 'add': + field_data = { + 'fieldName': request.form.get('fieldName'), + 'label': request.form.get('label'), + 'fieldType': request.form.get('fieldType'), + 'editable': request.form.get('editable', 'true'), + 'displayOrder': int(request.form.get('displayOrder', 0)) + } + + if field_data['fieldName'] and field_data['label']: + ARFieldModel.save(tenant_id, field_data) + flash('Custom field added successfully!') + else: + flash('Field name and label are required.') + + elif action == 'delete': + field_id = request.form.get('field_id') + if field_id: + ARFieldModel.delete(tenant_id, int(field_id)) + flash('Custom field deleted successfully!') + + elif action == 'update': + field_data = { + 'id': int(request.form.get('field_id')), + 'fieldName': request.form.get('fieldName'), + 'label': request.form.get('label'), + 'fieldType': request.form.get('fieldType'), + 'editable': request.form.get('editable', 'true'), + 'displayOrder': int(request.form.get('displayOrder', 0)) + } + + if field_data['fieldName'] and field_data['label']: + ARFieldModel.save(tenant_id, field_data) + flash('Custom field updated successfully!') + else: + flash('Field name and label are required.') + + return redirect(url_for('admin.manage_ar_fields', tenant_id=tenant_id)) + + # Get existing custom fields + custom_fields = ARFieldModel.get_all(tenant_id) + + # Available field types + field_types = [ + 'TEXT', + 'IMAGE_URI' + ] + + return render_template('admin/ar_fields.html', + tenant=tenant, + tenant_id=tenant_id, + custom_fields=custom_fields, + field_types=field_types) diff --git a/src/app/blueprints/api/__init__.py b/src/app/blueprints/api/__init__.py new file mode 100644 index 0000000..2e6eae8 --- /dev/null +++ b/src/app/blueprints/api/__init__.py @@ -0,0 +1,5 @@ +from flask import Blueprint + +api_bp = Blueprint('api', __name__, url_prefix='//api') + +from . import routes diff --git a/src/app/blueprints/api/routes.py b/src/app/blueprints/api/routes.py new file mode 100644 index 0000000..1dad439 --- /dev/null +++ b/src/app/blueprints/api/routes.py @@ -0,0 +1,7 @@ +from flask import jsonify +from . import api_bp + +@api_bp.route('/') +def api_index(tenant_id): + """API home endpoint""" + return jsonify({'message': 'API Home', 'tenant': tenant_id}) diff --git a/src/app/blueprints/main/__init__.py b/src/app/blueprints/main/__init__.py new file mode 100644 index 0000000..d4dcf69 --- /dev/null +++ b/src/app/blueprints/main/__init__.py @@ -0,0 +1,5 @@ +from flask import Blueprint + +main_bp = Blueprint('main', __name__) + +from . import routes diff --git a/src/app/blueprints/main/routes.py b/src/app/blueprints/main/routes.py new file mode 100644 index 0000000..5c6b186 --- /dev/null +++ b/src/app/blueprints/main/routes.py @@ -0,0 +1,27 @@ +from flask import render_template, request, redirect, flash +from . import main_bp +from app.models import TenantModel, SettingsModel + +@main_bp.route('/') +def index(): + """Tenant selection page""" + tenants = TenantModel.get_all() + server_url = SettingsModel.get_server_url() + return render_template('tenant_selection.html', tenants=tenants, server_url=server_url) + +@main_bp.route('/settings', methods=['GET', 'POST']) +def settings(): + """Global settings page""" + if request.method == 'POST': + server_url = request.form.get('server_url', '').strip() + if server_url: + # Remove trailing slash for consistency + server_url = server_url.rstrip('/') + SettingsModel.set('server_url', server_url) + flash('Server settings updated successfully.', 'success') + else: + flash('Please provide a valid server URL.', 'error') + return redirect('/settings') + + server_url = SettingsModel.get_server_url() + return render_template('settings.html', server_url=server_url) diff --git a/src/app/blueprints/tenant/__init__.py b/src/app/blueprints/tenant/__init__.py new file mode 100644 index 0000000..9af6a7b --- /dev/null +++ b/src/app/blueprints/tenant/__init__.py @@ -0,0 +1,5 @@ +from flask import Blueprint + +tenant_bp = Blueprint('tenant', __name__, url_prefix='/') + +from . import routes diff --git a/src/app/blueprints/tenant/routes.py b/src/app/blueprints/tenant/routes.py new file mode 100644 index 0000000..87698e8 --- /dev/null +++ b/src/app/blueprints/tenant/routes.py @@ -0,0 +1,224 @@ +from flask import render_template, request, redirect, flash, jsonify, Response, current_app +from . import tenant_bp +from app.models import TenantModel, ProductModel, ARFieldModel, SettingsModel +from app.services import AuthService, ProductService, BarcodeService +import os + +@tenant_bp.route('/') +def index(tenant_id): + """Tenant home page - product listing""" + tenant = TenantModel.get_or_create(tenant_id) + if tenant is None: + return jsonify({"error": f"'{tenant_id}' is a reserved name and cannot be used as a tenant ID"}), 404 + + products = ProductModel.get_all(tenant_id) + custom_fields = ARFieldModel.get_all(tenant_id) + + return render_template('index.html', tenant=tenant, products=products, custom_fields=custom_fields) + +@tenant_bp.route('/delete', methods=['POST']) +def delete_tenant(tenant_id): + """Delete a tenant and all its data""" + TenantModel.delete(tenant_id) + flash(f'Tenant "{tenant_id}" has been deleted successfully.', 'success') + return redirect('/') + +@tenant_bp.route('/settings') +def settings(tenant_id): + """Tenant settings page""" + tenant = TenantModel.get_or_create(tenant_id) + if tenant is None: + return jsonify({"error": f"'{tenant_id}' is a reserved name and cannot be used as a tenant ID"}), 404 + + custom_fields = ARFieldModel.get_all(tenant_id) + server_url = SettingsModel.get_server_url() + + return render_template('tenant_settings.html', tenant=tenant, custom_fields=custom_fields, server_url=server_url) + +@tenant_bp.route('/settings/credentials', methods=['POST']) +def update_credentials(tenant_id): + """Update tenant credentials""" + tenant = TenantModel.get_by_id(tenant_id) + if tenant is None: + return jsonify({"error": "Tenant not found"}), 404 + + username = request.form.get('username', '').strip() + password = request.form.get('password', '').strip() + + if not username: + flash('Username is required.', 'error') + return redirect(f'/{tenant_id}/settings') + + TenantModel.update_credentials(tenant_id, username, password if password else None) + flash('Credentials updated successfully.', 'success') + return redirect(f'/{tenant_id}/settings') + +@tenant_bp.route('/settings/barcode', methods=['POST']) +def update_barcode_type(tenant_id): + """Update tenant barcode type""" + tenant = TenantModel.get_by_id(tenant_id) + if tenant is None: + return jsonify({"error": "Tenant not found"}), 404 + + barcode_type = request.form.get('barcode_type', '').strip() + + if not barcode_type: + flash('Barcode type is required.', 'error') + return redirect(f'/{tenant_id}/settings') + + TenantModel.update_barcode_type(tenant_id, barcode_type) + flash('Barcode type updated successfully.', 'success') + return redirect(f'/{tenant_id}/settings') + +@tenant_bp.route('/login', methods=['GET']) +def login(tenant_id): + """Login endpoint for API authentication""" + auth_header = request.headers.get('Authorization') + + if AuthService.check_basic_auth(auth_header, tenant_id): + return jsonify({"status": "success", "message": "Authentication successful"}), 200 + + return jsonify({"error": "Unauthorized"}), 401 + +@tenant_bp.route('/arcontentfields', methods=['GET']) +def get_ar_content_fields(tenant_id): + """Get custom AR fields for tenant""" + fields = ARFieldModel.get_all(tenant_id) + return jsonify(fields), 200 + +@tenant_bp.route('/arinfo', methods=['GET', 'POST']) +def get_ar_info(tenant_id): + """Get or update AR product information""" + barcode = request.args.get('barcode') + + # Handle POST request - update product fields + if request.method == 'POST': + if not barcode: + return jsonify({"error": "Barcode parameter required"}), 400 + + product = ProductModel.get_by_id(barcode, tenant_id) + if not product: + return jsonify({"error": "Product not found"}), 404 + + try: + updated_fields = request.get_json() + if not isinstance(updated_fields, list): + return jsonify({"error": "Request body must be an array of fields"}), 400 + + # Update only the editable fields + for updated_field in updated_fields: + field_name = updated_field.get('fieldName') + new_value = updated_field.get('value') + + for field in product: + if field['fieldName'] == field_name: + if field.get('editable') == 'true': + field['value'] = new_value + break + + # Save the updated product + ProductModel.save(barcode, tenant_id, product) + current_app.logger.info(f"Updated product {barcode} for tenant {tenant_id}") + return jsonify({"success": True}), 200 + + except Exception as e: + current_app.logger.error(f"Error updating product: {str(e)}") + return jsonify({"error": "Failed to update product"}), 500 + + # Handle GET request - return product data + if barcode: + product_data = ProductService.get_product_filtered(barcode, tenant_id) + if product_data: + response = jsonify(product_data) + response.headers['Access-Control-Allow-Origin'] = '*' + return response, 200 + return jsonify({"error": "Product not found"}), 404 + + # Return all products if no barcode specified + all_products = ProductService.get_all_products_filtered(tenant_id) + response = jsonify(all_products) + response.headers['Access-Control-Allow-Origin'] = '*' + return response, 200 + +@tenant_bp.route('/images/', methods=['GET']) +def serve_image(tenant_id, filename): + """Serve product images""" + current_app.logger.info(f"Image requested for tenant {tenant_id}: {filename}") + + # Check if filename contains field name (e.g., "123456_thumbnail.jpg") + base_name = os.path.splitext(filename)[0] + + if '_' in base_name: + parts = base_name.split('_', 1) + product_id = parts[0] + field_name = '_' + parts[1] if len(parts) > 1 else '_image' + + # Try to get field-specific image + image_data = ProductModel.get_image_by_field(product_id, tenant_id, field_name) + if image_data: + image_bytes, mime_type = image_data + response = Response(image_bytes, mimetype=mime_type) + response.headers['Access-Control-Allow-Origin'] = '*' + response.headers['Cache-Control'] = 'public, max-age=3600' + current_app.logger.info(f"Serving field-specific image: {product_id}/{field_name} ({len(image_bytes)} bytes)") + return response + + # Try standard image lookup (backward compatibility) + product_id = os.path.splitext(filename)[0] + image_data = ProductModel.get_image(product_id, tenant_id) + if image_data: + image_bytes, mime_type = image_data + response = Response(image_bytes, mimetype=mime_type) + response.headers['Access-Control-Allow-Origin'] = '*' + response.headers['Cache-Control'] = 'public, max-age=3600' + current_app.logger.info(f"Serving image from database: {product_id} ({len(image_bytes)} bytes)") + return response + + current_app.logger.warning(f"Image not found: {filename}") + return jsonify({"error": "Image not found"}), 404 + +@tenant_bp.route('/qrcode/template', methods=['GET']) +def generate_template_qr_code(tenant_id): + """Generate QR code for the AR Template URL""" + try: + server_url = SettingsModel.get_server_url() + template_url = f"{server_url}/{tenant_id}/" + buffer = BarcodeService.generate_qr_code(template_url) + return Response(buffer.getvalue(), mimetype='image/png') + except Exception as e: + current_app.logger.error(f"QR code generation error: {str(e)}") + return jsonify({"error": "Failed to generate QR code"}), 500 + +@tenant_bp.route('/qrcode/arinfo', methods=['GET']) +def generate_ar_qr_code(tenant_id): + """Generate QR code for the AR API endpoint""" + try: + server_url = SettingsModel.get_server_url() + ar_url = f"{server_url}/{tenant_id}/arinfo" + buffer = BarcodeService.generate_qr_code(ar_url) + return Response(buffer.getvalue(), mimetype='image/png') + except Exception as e: + current_app.logger.error(f"QR code generation error: {str(e)}") + return jsonify({"error": "Failed to generate QR code"}), 500 + +@tenant_bp.route('/barcodes/', methods=['GET']) +def serve_barcode(tenant_id, filename): + """Serve dynamically generated barcodes""" + name_parts = os.path.splitext(filename)[0].split('_') + if len(name_parts) < 2: + return jsonify({"error": "Invalid barcode filename format"}), 400 + + product_id = '_'.join(name_parts[:-1]) + code_type = name_parts[-1].lower() + + try: + url = None + if code_type == 'qr': + url = f'http://{request.host}/{tenant_id}/arinfo?barcode={product_id}' + + buffer = BarcodeService.generate_barcode(product_id, code_type, url) + return Response(buffer.getvalue(), mimetype='image/png') + + except Exception as e: + current_app.logger.error(f"Barcode generation error: {str(e)}") + return jsonify({"error": "Failed to generate barcode"}), 500 diff --git a/src/app/config.py b/src/app/config.py new file mode 100644 index 0000000..0f22651 --- /dev/null +++ b/src/app/config.py @@ -0,0 +1,43 @@ +import os + +class Config: + """Base configuration""" + SECRET_KEY = os.environ.get('SECRET_KEY') or 'dev-key-for-demo-only' + BASE_DIR = os.path.dirname(os.path.abspath(__file__)) + DATA_FOLDER = os.path.join(BASE_DIR, 'data') + DATABASE_PATH = os.path.join(DATA_FOLDER, 'products.db') + + # Reserved tenant IDs that cannot be used + RESERVED_TENANT_IDS = { + 'admin', 'api', 'login', 'logout', 'arcontentfields', 'arinfo', + 'images', 'barcodes', 'static', 'assets', 'js', 'css', 'tenant', + 'auth', 'oauth', 'callback', 'webhook', 'health', 'status' + } + + # File upload settings + ALLOWED_EXTENSIONS = {'png', 'jpg', 'jpeg', 'gif'} + MAX_CONTENT_LENGTH = 16 * 1024 * 1024 # 16MB max file size + +class DevelopmentConfig(Config): + """Development configuration""" + DEBUG = True + TESTING = False + +class ProductionConfig(Config): + """Production configuration""" + DEBUG = False + TESTING = False + +class TestingConfig(Config): + """Testing configuration""" + DEBUG = True + TESTING = True + DATABASE_PATH = ':memory:' + +# Configuration dictionary +config = { + 'development': DevelopmentConfig, + 'production': ProductionConfig, + 'testing': TestingConfig, + 'default': DevelopmentConfig +} diff --git a/src/app/models/__init__.py b/src/app/models/__init__.py new file mode 100644 index 0000000..868b479 --- /dev/null +++ b/src/app/models/__init__.py @@ -0,0 +1,6 @@ +from .tenant import TenantModel +from .product import ProductModel +from .ar_field import ARFieldModel +from .settings import SettingsModel + +__all__ = ['TenantModel', 'ProductModel', 'ARFieldModel', 'SettingsModel'] diff --git a/src/app/models/ar_field.py b/src/app/models/ar_field.py new file mode 100644 index 0000000..8e63f7c --- /dev/null +++ b/src/app/models/ar_field.py @@ -0,0 +1,84 @@ +from typing import Dict, List, Any +from .base import get_db + +class ARFieldModel: + """Model for custom AR field operations""" + + @staticmethod + def get_all(tenant_id: str) -> List[Dict[str, Any]]: + """Get all custom AR fields for a tenant""" + tenant_id = tenant_id.lower() + + with get_db() as conn: + cursor = conn.cursor() + cursor.execute(''' + SELECT id, field_name, label, field_type, editable, display_order + FROM custom_ar_fields + WHERE tenant_id = ? + ORDER BY display_order, id + ''', (tenant_id,)) + + fields = [] + for row in cursor.fetchall(): + fields.append({ + 'id': row['id'], + 'fieldName': row['field_name'], + 'label': row['label'], + 'fieldType': row['field_type'], + 'editable': row['editable'], + 'displayOrder': row['display_order'] + }) + + return fields + + @staticmethod + def save(tenant_id: str, field_data: Dict[str, Any]): + """Save or update a custom AR field""" + tenant_id = tenant_id.lower() + + with get_db() as conn: + cursor = conn.cursor() + + if 'id' in field_data and field_data['id']: + # Update existing field + cursor.execute(''' + UPDATE custom_ar_fields + SET field_name = ?, label = ?, field_type = ?, editable = ?, + display_order = ?, updated_at = CURRENT_TIMESTAMP + WHERE id = ? AND tenant_id = ? + ''', ( + field_data['fieldName'], + field_data['label'], + field_data['fieldType'], + field_data['editable'], + field_data['displayOrder'], + field_data['id'], + tenant_id + )) + else: + # Insert new field + cursor.execute(''' + INSERT INTO custom_ar_fields + (tenant_id, field_name, label, field_type, editable, display_order) + VALUES (?, ?, ?, ?, ?, ?) + ''', ( + tenant_id, + field_data['fieldName'], + field_data['label'], + field_data['fieldType'], + field_data['editable'], + field_data['displayOrder'] + )) + + conn.commit() + + @staticmethod + def delete(tenant_id: str, field_id: int): + """Delete a custom AR field""" + tenant_id = tenant_id.lower() + + with get_db() as conn: + cursor = conn.cursor() + cursor.execute('DELETE FROM custom_ar_fields WHERE id = ? AND tenant_id = ?', + (field_id, tenant_id)) + conn.commit() diff --git a/src/app/models/base.py b/src/app/models/base.py new file mode 100644 index 0000000..6aa7ff6 --- /dev/null +++ b/src/app/models/base.py @@ -0,0 +1,111 @@ +import sqlite3 +from contextlib import contextmanager +from flask import current_app + +@contextmanager +def get_db(): + """Context manager for database connections""" + db_path = current_app.config['DATABASE_PATH'] + conn = sqlite3.connect(db_path) + conn.row_factory = sqlite3.Row + try: + yield conn + finally: + conn.close() + +def init_database(): + """Initialize the database with required tables""" + import os + db_path = current_app.config['DATABASE_PATH'] + os.makedirs(os.path.dirname(db_path), exist_ok=True) + + with get_db() as conn: + cursor = conn.cursor() + + # Create tenants table + cursor.execute(''' + CREATE TABLE IF NOT EXISTS tenants ( + id TEXT PRIMARY KEY, + name TEXT NOT NULL, + username TEXT, + password TEXT, + barcode_type TEXT DEFAULT 'qr', + created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP, + updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP + ) + ''') + + # Create products table with tenant_id + cursor.execute(''' + CREATE TABLE IF NOT EXISTS products ( + id TEXT, + tenant_id TEXT NOT NULL, + name TEXT NOT NULL, + price TEXT, + inventory INTEGER, + image_data BLOB, + image_mime_type TEXT, + created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP, + updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP, + PRIMARY KEY (id, tenant_id), + FOREIGN KEY (tenant_id) REFERENCES tenants(id) ON DELETE CASCADE + ) + ''') + + # Create product_fields table with tenant_id + cursor.execute(''' + CREATE TABLE IF NOT EXISTS product_fields ( + product_id TEXT, + tenant_id TEXT, + field_name TEXT, + label TEXT, + value TEXT, + editable TEXT, + field_type TEXT, + FOREIGN KEY (product_id, tenant_id) REFERENCES products(id, tenant_id) ON DELETE CASCADE, + PRIMARY KEY (product_id, tenant_id, field_name) + ) + ''') + + # Create custom_ar_fields table for tenant-specific AR field definitions + cursor.execute(''' + CREATE TABLE IF NOT EXISTS custom_ar_fields ( + id INTEGER PRIMARY KEY AUTOINCREMENT, + tenant_id TEXT NOT NULL, + field_name TEXT NOT NULL, + label TEXT NOT NULL, + field_type TEXT NOT NULL, + editable TEXT DEFAULT 'true', + display_order INTEGER DEFAULT 0, + created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP, + updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP, + FOREIGN KEY (tenant_id) REFERENCES tenants(id) ON DELETE CASCADE, + UNIQUE(tenant_id, field_name) + ) + ''') + + # Create product_images table for storing multiple images per product + cursor.execute(''' + CREATE TABLE IF NOT EXISTS product_images ( + id INTEGER PRIMARY KEY AUTOINCREMENT, + product_id TEXT NOT NULL, + tenant_id TEXT NOT NULL, + field_name TEXT NOT NULL, + image_data BLOB NOT NULL, + image_mime_type TEXT NOT NULL, + created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP, + FOREIGN KEY (product_id, tenant_id) REFERENCES products(id, tenant_id) ON DELETE CASCADE, + UNIQUE(product_id, tenant_id, field_name) + ) + ''') + + # Create settings table + cursor.execute(''' + CREATE TABLE IF NOT EXISTS settings ( + key TEXT PRIMARY KEY, + value TEXT NOT NULL, + updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP + ) + ''') + + conn.commit() diff --git a/src/app/models/product.py b/src/app/models/product.py new file mode 100644 index 0000000..5d5be8b --- /dev/null +++ b/src/app/models/product.py @@ -0,0 +1,192 @@ +from typing import Dict, List, Optional, Any, Tuple +from .base import get_db + +class ProductModel: + """Model for product operations""" + + @staticmethod + def get_all(tenant_id: str) -> Dict[str, List[Dict[str, Any]]]: + """Get all products for a tenant in the legacy format""" + tenant_id = tenant_id.lower() + + with get_db() as conn: + cursor = conn.cursor() + + cursor.execute('SELECT id FROM products WHERE tenant_id = ?', (tenant_id,)) + product_ids = [row['id'] for row in cursor.fetchall()] + + result = {} + for product_id in product_ids: + cursor.execute(''' + SELECT field_name, label, value, editable, field_type + FROM product_fields + WHERE product_id = ? AND tenant_id = ? + ORDER BY field_name + ''', (product_id, tenant_id)) + + fields = [] + for row in cursor.fetchall(): + fields.append({ + 'fieldName': row['field_name'], + 'label': row['label'], + 'value': row['value'], + 'editable': row['editable'], + 'fieldType': row['field_type'] + }) + + result[product_id] = fields + + return result + + @staticmethod + def get_by_id(product_id: str, tenant_id: str) -> Optional[List[Dict[str, Any]]]: + """Get a single product by ID and tenant""" + tenant_id = tenant_id.lower() + + with get_db() as conn: + cursor = conn.cursor() + + cursor.execute(''' + SELECT field_name, label, value, editable, field_type + FROM product_fields + WHERE product_id = ? AND tenant_id = ? + ORDER BY field_name + ''', (product_id, tenant_id)) + + fields = [] + for row in cursor.fetchall(): + fields.append({ + 'fieldName': row['field_name'], + 'label': row['label'], + 'value': row['value'], + 'editable': row['editable'], + 'fieldType': row['field_type'] + }) + + return fields if fields else None + + @staticmethod + def save(product_id: str, tenant_id: str, fields: List[Dict[str, Any]], + image_data: Optional[bytes] = None, image_mime_type: Optional[str] = None): + """Save or update a product for a tenant""" + tenant_id = tenant_id.lower() + + with get_db() as conn: + cursor = conn.cursor() + + # Extract core fields + name = '' + price = '' + inventory = None + + for field in fields: + if field['fieldName'] == '_name': + name = field['value'] + elif field['fieldName'] == '_price': + price = field['value'] + elif field['fieldName'] == '_inventory': + inventory = int(field['value']) if field['value'] else None + + # Check if product exists + cursor.execute('SELECT id FROM products WHERE id = ? AND tenant_id = ?', (product_id, tenant_id)) + exists = cursor.fetchone() is not None + + if exists: + # Update existing product + if image_data is not None: + cursor.execute(''' + UPDATE products + SET name = ?, price = ?, inventory = ?, image_data = ?, image_mime_type = ?, updated_at = CURRENT_TIMESTAMP + WHERE id = ? AND tenant_id = ? + ''', (name, price, inventory, image_data, image_mime_type, product_id, tenant_id)) + else: + cursor.execute(''' + UPDATE products + SET name = ?, price = ?, inventory = ?, updated_at = CURRENT_TIMESTAMP + WHERE id = ? AND tenant_id = ? + ''', (name, price, inventory, product_id, tenant_id)) + else: + # Insert new product + cursor.execute(''' + INSERT INTO products (id, tenant_id, name, price, inventory, image_data, image_mime_type) + VALUES (?, ?, ?, ?, ?, ?, ?) + ''', (product_id, tenant_id, name, price, inventory, image_data, image_mime_type)) + + # Delete existing fields + cursor.execute('DELETE FROM product_fields WHERE product_id = ? AND tenant_id = ?', (product_id, tenant_id)) + + # Insert all fields + for field in fields: + cursor.execute(''' + INSERT INTO product_fields + (product_id, tenant_id, field_name, label, value, editable, field_type) + VALUES (?, ?, ?, ?, ?, ?, ?) + ''', ( + product_id, + tenant_id, + field['fieldName'], + field['label'], + field['value'], + field.get('editable', 'true'), + field.get('fieldType', 'TEXT') + )) + + conn.commit() + + @staticmethod + def delete(product_id: str, tenant_id: str): + """Delete a product for a tenant""" + tenant_id = tenant_id.lower() + + with get_db() as conn: + cursor = conn.cursor() + cursor.execute('DELETE FROM products WHERE id = ? AND tenant_id = ?', (product_id, tenant_id)) + conn.commit() + + @staticmethod + def get_image(product_id: str, tenant_id: str) -> Optional[Tuple[bytes, str]]: + """Get product image data and mime type for a tenant""" + tenant_id = tenant_id.lower() + + with get_db() as conn: + cursor = conn.cursor() + cursor.execute('SELECT image_data, image_mime_type FROM products WHERE id = ? AND tenant_id = ?', + (product_id, tenant_id)) + row = cursor.fetchone() + + if row and row['image_data']: + return row['image_data'], row['image_mime_type'] + return None + + @staticmethod + def save_image(product_id: str, tenant_id: str, field_name: str, + image_data: bytes, image_mime_type: str): + """Save an image for a specific product field""" + tenant_id = tenant_id.lower() + + with get_db() as conn: + cursor = conn.cursor() + cursor.execute(''' + INSERT OR REPLACE INTO product_images + (product_id, tenant_id, field_name, image_data, image_mime_type) + VALUES (?, ?, ?, ?, ?) + ''', (product_id, tenant_id, field_name, image_data, image_mime_type)) + conn.commit() + + @staticmethod + def get_image_by_field(product_id: str, tenant_id: str, field_name: str) -> Optional[Tuple[bytes, str]]: + """Get image for a specific product field""" + tenant_id = tenant_id.lower() + + with get_db() as conn: + cursor = conn.cursor() + cursor.execute(''' + SELECT image_data, image_mime_type + FROM product_images + WHERE product_id = ? AND tenant_id = ? AND field_name = ? + ''', (product_id, tenant_id, field_name)) + row = cursor.fetchone() + + if row: + return row['image_data'], row['image_mime_type'] + return None diff --git a/src/app/models/settings.py b/src/app/models/settings.py new file mode 100644 index 0000000..18dcc9f --- /dev/null +++ b/src/app/models/settings.py @@ -0,0 +1,30 @@ +from typing import Optional +from .base import get_db + +class SettingsModel: + """Model for application settings""" + + @staticmethod + def get(key: str, default: Optional[str] = None) -> Optional[str]: + """Get a setting value by key""" + with get_db() as conn: + cursor = conn.cursor() + cursor.execute('SELECT value FROM settings WHERE key = ?', (key,)) + row = cursor.fetchone() + return row['value'] if row else default + + @staticmethod + def set(key: str, value: str): + """Set a setting value""" + with get_db() as conn: + cursor = conn.cursor() + cursor.execute(''' + INSERT OR REPLACE INTO settings (key, value, updated_at) + VALUES (?, ?, CURRENT_TIMESTAMP) + ''', (key, value)) + conn.commit() + + @staticmethod + def get_server_url() -> str: + """Get server URL setting""" + return SettingsModel.get('server_url', 'http://localhost:5555') diff --git a/src/app/models/tenant.py b/src/app/models/tenant.py new file mode 100644 index 0000000..d8f92ee --- /dev/null +++ b/src/app/models/tenant.py @@ -0,0 +1,98 @@ +from .base import get_db +from flask import current_app + +class TenantModel: + """Model for tenant operations""" + + @staticmethod + def get_all(): + """Get all tenants""" + with get_db() as conn: + cursor = conn.cursor() + cursor.execute('SELECT * FROM tenants ORDER BY created_at DESC') + rows = cursor.fetchall() + return [dict(row) for row in rows] + + @staticmethod + def get_by_id(tenant_id): + """Get tenant by ID""" + with get_db() as conn: + cursor = conn.cursor() + cursor.execute('SELECT * FROM tenants WHERE id = ?', (tenant_id,)) + row = cursor.fetchone() + return dict(row) if row else None + + @staticmethod + def create(tenant_id, name=None): + """Create a new tenant""" + # Check if tenant_id is reserved + if tenant_id.lower() in current_app.config['RESERVED_TENANT_IDS']: + return None + + if name is None: + name = tenant_id + + with get_db() as conn: + cursor = conn.cursor() + try: + cursor.execute( + 'INSERT INTO tenants (id, name, username, password) VALUES (?, ?, ?, ?)', + (tenant_id, name, 'admin', 'password') + ) + conn.commit() + return TenantModel.get_by_id(tenant_id) + except Exception: + return None + + @staticmethod + def get_or_create(tenant_id): + """Get existing tenant or create new one""" + tenant = TenantModel.get_by_id(tenant_id) + if tenant: + return tenant + return TenantModel.create(tenant_id) + + @staticmethod + def update_credentials(tenant_id, username, password): + """Update tenant credentials""" + with get_db() as conn: + cursor = conn.cursor() + cursor.execute( + 'UPDATE tenants SET username = ?, password = ?, updated_at = CURRENT_TIMESTAMP WHERE id = ?', + (username, password, tenant_id) + ) + conn.commit() + + @staticmethod + def update_barcode_type(tenant_id, barcode_type): + """Update tenant barcode type preference""" + with get_db() as conn: + cursor = conn.cursor() + cursor.execute( + 'UPDATE tenants SET barcode_type = ?, updated_at = CURRENT_TIMESTAMP WHERE id = ?', + (barcode_type, tenant_id) + ) + conn.commit() + + @staticmethod + def delete(tenant_id): + """Delete a tenant and all associated data""" + with get_db() as conn: + cursor = conn.cursor() + cursor.execute('DELETE FROM tenants WHERE id = ?', (tenant_id,)) + conn.commit() + + @staticmethod + def cleanup_reserved(): + """Clean up any accidentally created reserved tenants""" + reserved = current_app.config['RESERVED_TENANT_IDS'] + with get_db() as conn: + cursor = conn.cursor() + placeholders = ','.join('?' * len(reserved)) + cursor.execute( + f'DELETE FROM tenants WHERE LOWER(id) IN ({placeholders})', + tuple(reserved) + ) + deleted_count = cursor.rowcount + conn.commit() + return deleted_count diff --git a/src/app/services/__init__.py b/src/app/services/__init__.py new file mode 100644 index 0000000..f103c73 --- /dev/null +++ b/src/app/services/__init__.py @@ -0,0 +1,5 @@ +from .auth_service import AuthService +from .product_service import ProductService +from .barcode_service import BarcodeService + +__all__ = ['AuthService', 'ProductService', 'BarcodeService'] diff --git a/src/app/services/auth_service.py b/src/app/services/auth_service.py new file mode 100644 index 0000000..e92c59f --- /dev/null +++ b/src/app/services/auth_service.py @@ -0,0 +1,25 @@ +import base64 +from app.models import TenantModel + +class AuthService: + """Service for authentication logic""" + + @staticmethod + def check_basic_auth(auth_header: str, tenant_id: str) -> bool: + """Validate Basic authentication credentials for a tenant""" + if not auth_header or not auth_header.startswith('Basic '): + return False + + try: + # Decode the base64 credentials + credentials = base64.b64decode(auth_header[6:]).decode('utf-8') + username, password = credentials.split(':', 1) + + # Get tenant credentials from database (without creating) + tenant = TenantModel.get_by_id(tenant_id) + if tenant and username == tenant['username'] and password == tenant['password']: + return True + except Exception: + pass + + return False diff --git a/src/app/services/barcode_service.py b/src/app/services/barcode_service.py new file mode 100644 index 0000000..9369c0f --- /dev/null +++ b/src/app/services/barcode_service.py @@ -0,0 +1,58 @@ +import qrcode +import barcode +from barcode.writer import ImageWriter +from io import BytesIO + +class BarcodeService: + """Service for barcode generation""" + + @staticmethod + def generate_qr_code(data: str) -> BytesIO: + """Generate QR code image""" + buffer = BytesIO() + qr = qrcode.QRCode(version=1, box_size=10, border=5) + qr.add_data(data) + qr.make(fit=True) + img = qr.make_image(fill_color="black", back_color="white") + img.save(buffer, format='PNG') + buffer.seek(0) + return buffer + + @staticmethod + def generate_ean13(product_id: str) -> BytesIO: + """Generate EAN-13 barcode""" + buffer = BytesIO() + # Convert product_id to numeric format if needed + numeric_id = ''.join(filter(str.isdigit, product_id)) + if not numeric_id: + numeric_id = str(abs(hash(product_id)) % 1000000000000)[:12] + else: + numeric_id = numeric_id[:12].zfill(12) + + EAN = barcode.get_barcode_class('ean13') + ean = EAN(numeric_id, writer=ImageWriter()) + ean.write(buffer) + buffer.seek(0) + return buffer + + @staticmethod + def generate_code128(product_id: str) -> BytesIO: + """Generate Code 128 barcode""" + buffer = BytesIO() + CODE128 = barcode.get_barcode_class('code128') + code = CODE128(product_id, writer=ImageWriter()) + code.write(buffer) + buffer.seek(0) + return buffer + + @staticmethod + def generate_barcode(product_id: str, code_type: str, url: str = None) -> BytesIO: + """Generate barcode based on type""" + if code_type == 'qr': + return BarcodeService.generate_qr_code(url or product_id) + elif code_type == 'ean13': + return BarcodeService.generate_ean13(product_id) + elif code_type == 'code128': + return BarcodeService.generate_code128(product_id) + else: + raise ValueError(f"Unsupported barcode type: {code_type}") diff --git a/src/app/services/product_service.py b/src/app/services/product_service.py new file mode 100644 index 0000000..9a40ea8 --- /dev/null +++ b/src/app/services/product_service.py @@ -0,0 +1,56 @@ +from typing import Dict, List, Any +from app.models import ProductModel, ARFieldModel +from flask import request + +class ProductService: + """Service for product business logic""" + + @staticmethod + def filter_and_process_fields(product_fields: List[Dict[str, Any]], + tenant_id: str, + custom_fields: List[Dict[str, Any]]) -> List[Dict[str, Any]]: + """Filter product fields to only include defined AR fields and process image URLs""" + custom_field_names = [f['fieldName'] for f in custom_fields] + field_types = {f['fieldName']: f['fieldType'] for f in custom_fields} + filtered_fields = [] + + for field in product_fields: + if field['fieldName'] in custom_field_names: + # Create absolute URL for IMAGE_URI fields + if field_types.get(field['fieldName']) == 'IMAGE_URI' and field['value']: + # If it's already an absolute URL, leave it as is + if not field['value'].startswith('http'): + # Build absolute URL using request host with tenant + field['value'] = f"{request.url_root.rstrip('/')}/{tenant_id}{field['value']}" + filtered_fields.append(field) + + return filtered_fields + + @staticmethod + def get_all_products_filtered(tenant_id: str) -> Dict[str, List[Dict[str, Any]]]: + """Get all products with filtered fields""" + products = ProductModel.get_all(tenant_id) + custom_fields = ARFieldModel.get_all(tenant_id) + + all_products = {} + for product_id, fields in products.items(): + all_products[product_id] = ProductService.filter_and_process_fields( + fields, tenant_id, custom_fields + ) + + return all_products + + @staticmethod + def get_product_filtered(product_id: str, tenant_id: str) -> List[Dict[str, Any]]: + """Get a single product with filtered fields""" + product = ProductModel.get_by_id(product_id, tenant_id) + if not product: + return None + + custom_fields = ARFieldModel.get_all(tenant_id) + return ProductService.filter_and_process_fields(product, tenant_id, custom_fields) + + @staticmethod + def allowed_file(filename: str, allowed_extensions: set) -> bool: + """Check if file extension is allowed""" + return '.' in filename and filename.rsplit('.', 1)[1].lower() in allowed_extensions diff --git a/templates/admin/add_product.html b/src/app/templates/admin/add_product.html similarity index 53% rename from templates/admin/add_product.html rename to src/app/templates/admin/add_product.html index 41a2c7d..d38843b 100644 --- a/templates/admin/add_product.html +++ b/src/app/templates/admin/add_product.html @@ -10,7 +10,7 @@

Add New Product

-
+
@@ -22,32 +22,52 @@
Must be unique. This will be used as the barcode for AR content.
-
- - -
Enter a descriptive name for the product.
-
+ {% for field in custom_fields %} + {% if field.fieldName != '_id' %} +
+ + {% if field.fieldType == 'IMAGE_URI' %} + +
Supported formats: .png, .jpg, .jpeg, .gif
+
+ +
+ {% elif field.fieldType == 'TEXT' %} + {% if field.fieldName == '_price' %} +
+ $ + +
+ {% else %} + + {% endif %} + {% else %} + + {% endif %} +
+ {% endif %} + {% endfor %} + + {% if not custom_fields|selectattr('fieldName', 'equalto', '_name')|list %}
- + + +
+ {% endif %} + + {% if not custom_fields|selectattr('fieldName', 'equalto', '_price')|list %} +
+
$ - -
-
Enter the price in decimal format (e.g., 49.99)
-
- -
- - -
Supported formats: .png, .jpg, .jpeg, .gif
-
- +
+ {% endif %}
- Cancel + Cancel
@@ -59,8 +79,8 @@ {% block extra_js %} -{% endblock %} +{% endblock %} \ No newline at end of file diff --git a/src/app/templates/admin/all_barcodes.html b/src/app/templates/admin/all_barcodes.html new file mode 100644 index 0000000..87476f0 --- /dev/null +++ b/src/app/templates/admin/all_barcodes.html @@ -0,0 +1,149 @@ +{% extends "layout.html" %} + +{% block title %}All Barcodes - {{ tenant.name }} - KCAP Demo Server{% endblock %} + +{% block extra_css %} + +{% endblock %} + +{% block content %} +
+
+
+ Current Tenant: {{ tenant.name }} (ID: {{ tenant.id }}) +
+ Back to Dashboard +
+
+ +
+

All Product Barcodes

+ +
+ + {% if products %} +
+ {% for product_id, product_data in products.items() %} +
+
{{ product_id }}
+ Barcode for {{ product_id }} +
+ {% endfor %} +
+ {% else %} +
+ No products available to generate barcodes. +
+ {% endif %} +
+
+{% endblock %} + +{% block extra_js %} + +{% endblock %} diff --git a/src/app/templates/admin/ar_fields.html b/src/app/templates/admin/ar_fields.html new file mode 100644 index 0000000..2b26339 --- /dev/null +++ b/src/app/templates/admin/ar_fields.html @@ -0,0 +1,170 @@ +{% extends "layout.html" %} + +{% block title %}Manage AR Fields - KCAP Admin{% endblock %} + +{% block content %} +
+
+

Manage AR Content Fields

+

Configure the fields that will be returned by the /arcontentfields and /arinfo endpoints.

+
+ Back to Settings +
+ +
+
+
Current AR Fields
+
+
+ {% if custom_fields %} + + + + + + + + + + + + + {% for field in custom_fields %} + + + + + + + + + {% endfor %} + +
Field NameLabelTypeEditableDisplay OrderActions
{{ field.fieldName }}{{ field.label }}{{ field.fieldType }}{{ field.editable }}{{ field.displayOrder }} + +
+ + + +
+
+ {% else %} +

No custom fields defined. Default fields will be used.

+ {% endif %} +
+
+ +
+
+
Add/Edit AR Field
+
+
+
+ + + +
+ + + Use underscore prefix for system fields (e.g., _id, _price) + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ + + +
+
+
+ + +{% endblock %} \ No newline at end of file diff --git a/src/app/templates/admin/credentials.html b/src/app/templates/admin/credentials.html new file mode 100644 index 0000000..63984ff --- /dev/null +++ b/src/app/templates/admin/credentials.html @@ -0,0 +1,92 @@ + + + + + + Manage Credentials - {{ tenant.name }} + + + + + +
+

Manage Login Credentials

+

These credentials will be used for KCAP authentication at /{{ tenant_id }}/login

+ + {% with messages = get_flashed_messages() %} + {% if messages %} + {% for message in messages %} + + {% endfor %} + {% endif %} + {% endwith %} + +
+
+
+
+

Current Credentials

+
+
+

Username: {{ tenant.username }}

+

Password: {{ tenant.password }}

+

Note: In production, passwords should be encrypted and not displayed.

+
+
+
+
+
+
+

Update Credentials

+
+
+
+
+ + +
+
+ + +
+ + Cancel +
+
+
+
+
+ +
+

Testing Instructions

+

To test the login endpoint with these credentials:

+ 
curl -u {{ tenant.username }}:{{ tenant.password }} http://{{ request.host }}/{{ tenant_id }}/login
+
+
+ + + + \ No newline at end of file diff --git a/src/app/templates/admin/edit_product.html b/src/app/templates/admin/edit_product.html new file mode 100644 index 0000000..a2f3680 --- /dev/null +++ b/src/app/templates/admin/edit_product.html @@ -0,0 +1,122 @@ +{% extends "layout.html" %} + +{% block title %}Edit Product - KCAP Demo Server{% endblock %} + +{% block content %} +
+
+
+
+

Edit Product

+
+
+
+
+ + +
Product ID cannot be changed.
+
+ + {% for field in custom_fields %} + {% if field.fieldName != '_id' %} +
+ + + {# Find current value using selectattr filter #} + {% set matching_fields = product|selectattr('fieldName', 'equalto', field.fieldName)|list %} + {% set current_value = matching_fields[0].value if matching_fields else '' %} + + {% if field.fieldType == 'IMAGE_URI' %} + +
Leave empty to keep the current image.
+ + {% if current_value %} +
+ +
+ Current image +
+
+ {% endif %} + +
+ + +
+ {% elif field.fieldType == 'TEXT' %} + {% if field.fieldName == '_price' %} +
+ $ + {% set price_value = current_value|replace('$', '') %} + +
+ {% else %} + + {% endif %} + {% else %} + + {% endif %} +
+ {% endif %} + {% endfor %} + + + {% if not custom_fields|selectattr('fieldName', 'equalto', '_name')|list %} + {% for field in product %} + {% if field.fieldName == '_name' %} +
+ + +
+ {% endif %} + {% endfor %} + {% endif %} + + {% if not custom_fields|selectattr('fieldName', 'equalto', '_price')|list %} + {% for field in product %} + {% if field.fieldName == '_price' %} +
+ +
+ $ + {% set price_value = field.value|replace('$', '') %} + +
+
+ {% endif %} + {% endfor %} + {% endif %} + +
+ Cancel + +
+
+
+
+
+
+{% endblock %} + +{% block extra_js %} + +{% endblock %} \ No newline at end of file diff --git a/templates/admin/index.html b/src/app/templates/admin/index.html similarity index 57% rename from templates/admin/index.html rename to src/app/templates/admin/index.html index f0b1c0b..bfac565 100644 --- a/templates/admin/index.html +++ b/src/app/templates/admin/index.html @@ -1,65 +1,74 @@ {% extends "layout.html" %} -{% block title %}Admin Dashboard - KCAP Demo Server{% endblock %} +{% block title %}Admin Dashboard - {{ tenant.name }} - KCAP Demo Server{% endblock %} {% block content %}
+
+ Current Tenant: {{ tenant.name }} (ID: {{ tenant.id }}) +
+ Manage Credentials + Manage AR Fields + + View All Barcodes + + Switch Tenant +
+

Product Management

- Add New Product + Add New Product
{% if products %} - - - - - + + {% for custom_field in custom_fields %} + {% if custom_field.fieldName != '_id' %} + + {% endif %} + {% endfor %} + {% for product_id, product_data in products.items() %} - - - + {% for custom_field in custom_fields %} + {% if custom_field.fieldName != '_id' %} + + {% endif %} + {% endfor %} diff --git a/src/app/templates/index.html b/src/app/templates/index.html new file mode 100644 index 0000000..714a997 --- /dev/null +++ b/src/app/templates/index.html @@ -0,0 +1,202 @@ +{% extends "layout.html" %} + +{% block title %}Home - KCAP Demo Server{% endblock %} + +{% block content %} +
+
+
+
+ + Settings + +
+

KCAP Demo Server{% if tenant %} - {{ tenant.name }}{% endif %}

+

Manage your product catalog and AR content for barcode scanning applications.

+
+ +
+
+

Products

+ +
+ + {% if products %} +
+
Product IDNamePriceImageActionsProduct ID{{ custom_field.label }}Actions
{{ product_id }} - {% for field in product_data %} - {% if field.fieldName == '_name' %} - {{ field.value }} - {% endif %} - {% endfor %} - - {% for field in product_data %} - {% if field.fieldName == '_price' %} - {{ field.value }} - {% endif %} - {% endfor %} - - {% for field in product_data %} - {% if field.fieldName == '_image' %} -
- Product image -
- {% endif %} - {% endfor %} - 		+ {% for field in product_data %} + {% if field.fieldName == custom_field.fieldName %} + {% if custom_field.fieldType == 'IMAGE_URI' %} + {% if field.value %} +
+ {{ custom_field.label }} +
+ {% endif %} + {% else %} + {{ field.value }} + {% endif %} + {% endif %} + {% endfor %} +
- Edit - Barcodes -
-
+ + + + {% for custom_field in custom_fields %} + {% if custom_field.fieldName != '_id' %} + + {% endif %} + {% endfor %} + + + + + {% for product_id, product_data in products.items() %} + + + {% for custom_field in custom_fields %} + {% if custom_field.fieldName != '_id' %} + + {% endif %} + {% endfor %} + + + {% endfor %} + +
Product ID{{ custom_field.label }}Actions
{{ product_id }} + {% set matching_fields = product_data|selectattr('fieldName', 'equalto', custom_field.fieldName)|list %} + {% if custom_field.fieldType == 'IMAGE_URI' %} + {% if matching_fields and matching_fields[0].value %} +
+ {{ custom_field.label }} +
+ {% endif %} + {% else %} + {{ matching_fields[0].value if matching_fields else '' }} + {% endif %} + 		+ + Edit + + + + +
+
+ {% else %} +
+ No products available yet. Click "Add New Product" to get started. +
+ {% endif %} +
+ +
+

Getting Started

+
    +
  1. Configure your AR fields to define what information is returned for products
    2. +
  2. Add products to your catalog with the configured fields
    3. +
  3. Generate barcodes for your products
    4. +
  4. Use the AR endpoints in your scanning application
    5. +
+
+
+
+ + + + + + + +{% endblock %} + +{% block extra_js %} + +{% endblock %} diff --git a/templates/layout.html b/src/app/templates/layout.html similarity index 100% rename from templates/layout.html rename to src/app/templates/layout.html diff --git a/src/app/templates/settings.html b/src/app/templates/settings.html new file mode 100644 index 0000000..0cc6697 --- /dev/null +++ b/src/app/templates/settings.html @@ -0,0 +1,52 @@ + + + + + + Server Settings - KCAP Demo Server + + + +
+

Server Settings

+ + {% with messages = get_flashed_messages(with_categories=true) %} + {% if messages %} + {% for category, message in messages %} + + {% endfor %} + {% endif %} + {% endwith %} + +
+
+
+
+

Server Configuration

+
+
+
+
+ + + + This URL will be used for generating Knox Capture AR Template URLs. + Include the protocol (http:// or https://) and port if needed. + +
+ + Back to Home +
+
+
+
+
+
+ + + + \ No newline at end of file diff --git a/src/app/templates/tenant_selection.html b/src/app/templates/tenant_selection.html new file mode 100644 index 0000000..23f5371 --- /dev/null +++ b/src/app/templates/tenant_selection.html @@ -0,0 +1,268 @@ + + + + + + Select or Create Tenant - KCAP Demo Server + + + + + + +
+ + + + +
+ +
+

KCAP Demo Server

+ + {% with messages = get_flashed_messages(with_categories=true) %} + {% if messages %} + {% for category, message in messages %} + + {% endfor %} + {% endif %} + {% endwith %} + + +
+
+
+
+ + + +
+
+
+
+ + +
+ {% if tenants %} + {% for tenant in tenants %} +
+
+ +
+
+
{{ tenant.name }}
+ {{ tenant.id }} +
+

+ {{ tenant.username }} +

+

+ {{ tenant.created_at }} +

+
+ AR Template URL: +
+ +
+
+
+ +
+ +
+ +
+
+
+
+ {% endfor %} + {% else %} +
+
+ +

No tenants exist yet. Create your first tenant!

+
+
+ {% endif %} +
+ + + +
+ + + + + + {% for tenant in tenants %} + + {% endfor %} + + + + + \ No newline at end of file diff --git a/src/app/templates/tenant_settings.html b/src/app/templates/tenant_settings.html new file mode 100644 index 0000000..97f6117 --- /dev/null +++ b/src/app/templates/tenant_settings.html @@ -0,0 +1,127 @@ +{% extends "layout.html" %} + +{% block title %}Settings - {{ tenant.name }} - KCAP Demo Server{% endblock %} + +{% block content %} +
+
+
+

Settings - {{ tenant.name }}

+ + Back to Dashboard + +
+ +
+ +
+
+
+
Device Authentication
+
+
+

Configure the username and password for device authentication.

+
+
+ + +
+
+ + +
Leave blank to keep current password
+
+ +
+
+
+ +
+
+
Barcode Settings
+
+
+

Configure the default barcode type for products.

+
+
+ + +
This will be used when displaying product barcodes
+
+ +
+
+
+
+ + +
+
+
+
Custom AR Content Fields
+
+
+

Manage the fields that are returned in the AR content API.

+ + Manage AR Fields + + + {% if custom_fields %} +
+
Current Fields:
+
    + {% for field in custom_fields %} +
  • +
    + {{ field.label }} + ({{ field.fieldName }}) +
    + {{ field.fieldType }} +
    • + {% endfor %} +
+
+ {% endif %} +
+
+
+
+ + +
+
+
+
+
Tenant Information
+
+
+
+
Tenant ID:
+
{{ tenant.id }}
+ +
Tenant Name:
+
{{ tenant.name }}
+ +
API Endpoint:
+
{{ server_url }}/{{ tenant.id }}/arinfo
+ +
Created:
+
{{ tenant.created_at }}
+
+
+
+
+
+
+
+{% endblock %} \ No newline at end of file diff --git a/src/app/utils/barcode_generator.py b/src/app/utils/barcode_generator.py new file mode 100644 index 0000000..017cf38 --- /dev/null +++ b/src/app/utils/barcode_generator.py @@ -0,0 +1,93 @@ +# Utility for barcode generation +import os +import io +from PIL import Image, ImageDraw, ImageFont + +try: + import qrcode + QRCODE_AVAILABLE = True +except ImportError: + QRCODE_AVAILABLE = False + +try: + from barcode import EAN13, Code128 + from barcode.writer import ImageWriter + BARCODE_AVAILABLE = True +except ImportError: + BARCODE_AVAILABLE = False + +class BarcodeGenerator: + @staticmethod + def check_dependencies(): + return { + 'qrcode': QRCODE_AVAILABLE, + 'barcode': BARCODE_AVAILABLE, + 'pillow': True + } + + @staticmethod + def generate_qr_code(data, size=10, border=4): + if not QRCODE_AVAILABLE: + return BarcodeGenerator._generate_placeholder("QR Code Unavailable\nPlease install 'qrcode' package") + qr = qrcode.QRCode( + version=1, + error_correction=qrcode.constants.ERROR_CORRECT_L, + box_size=size, + border=border, + ) + qr.add_data(data) + qr.make(fit=True) + img = qr.make_image(fill_color="black", back_color="white").convert('RGB') + return img + + @staticmethod + def generate_ean13_barcode(data): + if not BARCODE_AVAILABLE: + return BarcodeGenerator._generate_placeholder("EAN-13 Unavailable\nPlease install 'python-barcode' package") + # EAN-13 requires 12 digits (13th is checksum, auto-calculated) + numeric = ''.join(filter(str.isdigit, str(data))) + if len(numeric) < 12: + numeric = numeric.zfill(12) + elif len(numeric) > 12: + numeric = numeric[:12] + ean = EAN13(numeric, writer=ImageWriter()) + output = io.BytesIO() + ean.write(output) + output.seek(0) + img = Image.open(output) + return img + + @staticmethod + def generate_code128_barcode(data): + if not BARCODE_AVAILABLE: + return BarcodeGenerator._generate_placeholder("Code 128 Unavailable\nPlease install 'python-barcode' package") + code128 = Code128(str(data), writer=ImageWriter()) + output = io.BytesIO() + code128.write(output) + output.seek(0) + img = Image.open(output) + return img + + @staticmethod + def _generate_placeholder(message): + img = Image.new('RGB', (300, 150), color=(255, 255, 255)) + d = ImageDraw.Draw(img) + d.rectangle([0, 0, 299, 149], outline=(0, 0, 0), width=2) + # Optionally, add multiline text + lines = message.split('\n') + y = 60 + for line in lines: + d.text((20, y), line, fill=(0, 0, 0)) + y += 20 + return img + + @staticmethod + def save_image(image, path): + image.save(path, format='PNG') + + @staticmethod + def get_image_as_bytes(image, format='PNG'): + buf = io.BytesIO() + image.save(buf, format=format) + buf.seek(0) + return buf.read() diff --git a/src/run.py b/src/run.py new file mode 100644 index 0000000..67328b1 --- /dev/null +++ b/src/run.py @@ -0,0 +1,20 @@ +import os +import shutil +from app import create_app +from app.models import TenantModel + +# Create application +app = create_app(os.environ.get('FLASK_ENV', 'development')) + +if __name__ == '__main__': + with app.app_context(): + # Migrate existing data from JSON if needed (backward compatibility) + # Note: This is for the old database.py migration - keeping for reference + # but in the new structure, this would be handled differently + + # Clean up any accidentally created reserved tenants + deleted_count = TenantModel.cleanup_reserved() + if deleted_count > 0: + print(f"Cleaned up {deleted_count} reserved tenant(s)") + + app.run(port=5555, host="0.0.0.0", debug=True) diff --git a/templates/admin/edit_product.html b/templates/admin/edit_product.html deleted file mode 100644 index 19b9264..0000000 --- a/templates/admin/edit_product.html +++ /dev/null @@ -1,97 +0,0 @@ -{% extends "layout.html" %} - -{% block title %}Edit Product - KCAP Demo Server{% endblock %} - -{% block content %} -
-
-
-
-

Edit Product

-
-
-
-
- - -
Product ID cannot be changed.
-
- -
- - {% for field in product %} - {% if field.fieldName == '_name' %} - - {% endif %} - {% endfor %} -
Enter a descriptive name for the product.
-
- -
- -
- $ - {% for field in product %} - {% if field.fieldName == '_price' %} - {% set price_value = field.value|replace('$', '') %} - - {% endif %} - {% endfor %} -
-
Enter the price in decimal format (e.g., 49.99)
-
- -
- - -
Leave empty to keep the current image.
- -
- - {% for field in product %} - {% if field.fieldName == '_image' %} -
- Current product image -
- {% endif %} - {% endfor %} -
- -
- - -
-
- -
- Cancel - -
-
-
-
-
-
-{% endblock %} - -{% block extra_js %} - -{% endblock %} diff --git a/templates/admin/generate_barcode.html b/templates/admin/generate_barcode.html deleted file mode 100644 index db9824c..0000000 --- a/templates/admin/generate_barcode.html +++ /dev/null @@ -1,150 +0,0 @@ -{% extends "layout.html" %} - -{% block title %}Generate Barcodes - KCAP Demo Server{% endblock %} - -{% block content %} -
-
-
-
-

Generate Barcodes for Product: {{ product_id }}

- Back to Products -
-
- {% if not dependencies.qrcode or not dependencies.barcode or not dependencies.pillow %} -
-

Missing Dependencies

-

Some barcode generation features are unavailable because required packages are not installed:

-
    - {% if not dependencies.qrcode %} -
  • QR Code: The 'qrcode' package is required for QR code generation
    • - {% endif %} - {% if not dependencies.barcode %} -
  • Barcodes: The 'python-barcode' package is required for EAN-13 and Code 128 generation
    • - {% endif %} - {% if not dependencies.pillow %} -
  • Image Processing: The 'Pillow' package is required for image processing
    • - {% endif %} -
-
-

To install the required dependencies, run: pip install -r requirements.txt

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

QR Code

-
-
- QR Code -

QR Code contains a link to the product AR info.

- Download QR Code -
-
-
- -
-
-
-

EAN-13 Barcode

-
-
- EAN-13 Barcode -

Standard EAN-13 barcode format.

- Download EAN-13 -
-
-
- -
-
-
-

Code 128 Barcode

-
-
- Code 128 Barcode -

High-density alphanumeric barcode.

- Download Code 128 -
-
-
-
- -
-
-
-
-

Product Information

-
-
-
-
-

Product ID: {{ product_id }}

-

Price: {{ product.price }}

-
-
-

AR Info URL: - - {{ url_for('get_ar_info', barcode=product_id, _external=True) }} - -

-
-
- {% if product.image %} - Product Image - {% else %} -

No product image available

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

Print All Codes

-
-
-

Use the button below to open a printable version of all barcodes for this product.

- -
-
-
-
-
-
-
-
-{% endblock %} - -{% block extra_css %} - -{% endblock %} diff --git a/templates/index.html b/templates/index.html deleted file mode 100644 index ebbb744..0000000 --- a/templates/index.html +++ /dev/null @@ -1,40 +0,0 @@ -{% extends "layout.html" %} - -{% block title %}Home - KCAP Demo Server{% endblock %} - -{% block content %} -
-
-
-

KCAP Demo Server

-

A simple Flask API for demonstrating AR content retrieval for barcode scanning applications.

-
-

This server simulates the Knox Capture API for AR overlays and includes endpoints for managing product attributes.

-
-

API Endpoints

-
    -
  • - Login: GET /login -

    Simulates a simple login with a 200 response (no authentication required).

    -
    • -
  • - Content Fields: GET /arcontentfields -

    Returns a list of available attributes (e.g., item ID, price, image URI).

    -
    • -
  • - AR Info: GET /arinfo?barcode=123456 -

    Returns product details for a given barcode, including image URLs.

    -
    • -
  • - Static Image Server: GET /images/123456.png -

    Serves image files from the static/images/ directory.

    -
    • -
-
-
- Go to Admin Interface -
-
-
-
-{% endblock %}