microweb 0.1.1__py3-none-any.whl

microweb/cli.py

@@ -0,0 +1,525 @@
+import click
+import serial.tools.list_ports
+import esptool
+import subprocess
+import time
+import os
+import re
+import pkg_resources
+from microweb.uploader import upload_file, create_directory, verify_files
+
+# ANSI color codes for enhanced terminal output
+COLORS = {
+    'reset': '\033[0m',
+    'bold': '\033[1m',
+    'red': '\033[91m',
+    'green': '\033[92m',
+    'yellow': '\033[93m',
+    'blue': '\033[94m',
+    'magenta': '\033[95m',
+    'cyan': '\033[96m'
+}
+
+STYLES = {
+    'underline': '\033[4m',
+    'blink': '\033[5m',
+}
+
+def print_colored(message, color=None, style=None):
+    """Print a message with optional color and style."""
+    prefix = ''
+    if color in COLORS:
+        prefix += COLORS[color]
+    if style in STYLES:
+        prefix += STYLES[style]
+    click.echo(f"{prefix}{message}{COLORS['reset']}")
+
+def check_micropython(port):
+    """Check if MicroPython is responding via mpremote on the given port."""
+    try:
+        cmd = ['mpremote', 'connect', port, 'eval', 'print("MicroPython detected")']
+        result = subprocess.run(cmd, capture_output=True, text=True, timeout=5)
+        if result.returncode == 0 and "MicroPython detected" in result.stdout:
+            print_colored(f"MicroPython detected on {port}", color='green')
+            return True
+        else:
+            print_colored(f"mpremote output:\n{result.stdout.strip()}\n{result.stderr.strip()}", color='yellow')
+            return False
+    except Exception as e:
+        print_colored(f"Error checking MicroPython via mpremote: {e}", color='red')
+        return False
+
+def get_remote_file_info(port):
+    """Get remote file information from ESP32 including sizes."""
+    try:
+        cmd = ['mpremote', 'connect', port, 'ls']
+        result = subprocess.run(cmd, capture_output=True, text=True, timeout=10)
+        if result.returncode != 0:
+            print_colored(f"Error getting remote file list: {result.stderr}", color='red')
+            return {}
+        file_info = {}
+        lines = result.stdout.strip().split('\n')
+        for line in lines:
+            line = line.strip()
+            if not line or line.startswith('ls :') or line == '':
+                continue
+            parts = line.split()
+            if len(parts) >= 2:
+                try:
+                    size = int(parts[0])
+                    filename = ' '.join(parts[1:])
+                    file_info[filename] = size
+                except ValueError:
+                    continue
+        return file_info
+    except Exception as e:
+        print_colored(f"Error getting remote file info: {e}", color='red')
+        return {}
+
+def should_upload_file(local_path, remote_filename, remote_files):
+    """Determine if a file should be uploaded based on size comparison."""
+    if not os.path.exists(local_path):
+        return False, f"Local file {local_path} not found"
+    local_size = os.path.getsize(local_path)
+    if remote_filename not in remote_files:
+        return True, f"New file (local: {local_size} bytes)"
+    remote_size = remote_files[remote_filename]
+    if local_size != remote_size:
+        return True, f"Size changed (local: {local_size} bytes, remote: {remote_size} bytes)"
+    return False, f"No change (both: {local_size} bytes)"
+
+def analyze_app_static_files(app_file):
+    """Analyze the app.py file to find static file and template references."""
+    static_files = set()
+    template_files = set()
+    try:
+        app_dir = os.path.dirname(app_file) or '.'
+        with open(app_file, 'r', encoding='utf-8') as f:
+            content = f.read()
+        lines = content.split('\n')
+        filtered_lines = []
+        in_multiline_string = False
+        string_delimiter = None
+        for line in lines:
+            if line.strip().startswith('#'):
+                continue
+            if '"""' in line or "'''" in line:
+                if not in_multiline_string:
+                    in_multiline_string = True
+                    string_delimiter = '"""' if '"""' in line else "'''"
+                elif string_delimiter in line:
+                    in_multiline_string = False
+                    string_delimiter = None
+                continue
+            if not in_multiline_string:
+                if '#' in line:
+                    line = line.split('#')[0]
+                filtered_lines.append(line)
+        filtered_content = '\n'.join(filtered_lines)
+        static_pattern = r'app\.add_static\s*\(\s*[\'"]([^\'"]+)[\'"]\s*,\s*[\'"]([^\'"]+)[\'"]\s*\)'
+        static_matches = re.findall(static_pattern, filtered_content)
+        for url_path, file_path in static_matches:
+            if url_path in ['/url', '/path', '/example'] or file_path in ['path', 'file', 'example']:
+                print_colored(f"⚠️  Skipping placeholder: app.add_static('{url_path}', '{file_path}')", color='yellow')
+                continue
+            if len(file_path) > 2 and not file_path.startswith('/'):
+                static_files.add((url_path, file_path))
+        template_pattern = r'app\.render_template\s*\(\s*[\'"]([^\'"]+)[\'"][^\)]*\)'
+        template_matches = re.findall(template_pattern, filtered_content)
+        for template in template_matches:
+            if template not in ['template', 'example', 'placeholder']:
+                template_path = os.path.join(app_dir, template)
+                template_files.add(template_path)
+        html_static_pattern = r'(?:href|src)\s*=\s*[\'"]([^\'"]+\.(css|js|png|jpg|jpeg|gif|ico|svg|webp))[\'"]'
+        html_matches = re.findall(html_static_pattern, filtered_content, re.IGNORECASE)
+        for url_path, ext in html_matches:
+            if url_path.startswith('/') and not url_path.startswith('//') and 'http' not in url_path:
+                guessed_path = url_path.lstrip('/')
+                if '.' in guessed_path and len(guessed_path) > 3:
+                    static_files.add((url_path, guessed_path))
+        if template_files:
+            print_colored(f"Resolved template file paths:", color='cyan')
+            for template in template_files:
+                print_colored(f"  {template} {'(exists)' if os.path.exists(template) else '(missing)'}", color='cyan')
+        return static_files, template_files
+    except Exception as e:
+        print_colored(f"Error analyzing {app_file}: {e}", color='red')
+        return set(), set()
+
+def analyze_template_static_files(template_files):
+    """Analyze template files to find additional static file references."""
+    static_files = set()
+    for template_file in template_files:
+        if not os.path.exists(template_file):
+            print_colored(f"Warning: Template file {template_file} not found", color='yellow')
+            continue
+        try:
+            with open(template_file, 'r', encoding='utf-8') as f:
+                content = f.read()
+            html_static_pattern = r'(?:href|src)\s*=\s*[\'"]([^\'"]+\.(css|js|png|jpg|jpeg|gif|ico|svg|webp))[\'"]'
+            html_matches = re.findall(html_static_pattern, content, re.IGNORECASE)
+            for url_path, ext in html_matches:
+                if url_path.startswith('/') and not url_path.startswith('//') and 'http' not in url_path:
+                    guessed_path = url_path.lstrip('/')
+                    if '.' in guessed_path and len(guessed_path) > 3:
+                        static_files.add((url_path, guessed_path))
+        except Exception as e:
+            print_colored(f"Error analyzing template {template_file}: {e}", color='red')
+    return static_files
+
+def verify_static_files_exist(static_files, static_dir):
+    """Verify that all required static files exist locally."""
+    missing_files = []
+    existing_files = []
+    for url_path, file_rel_path in static_files:
+        if os.path.isabs(file_rel_path):
+            full_path = file_rel_path
+        else:
+            full_path = os.path.join(static_dir, file_rel_path)
+        if os.path.exists(full_path):
+            existing_files.append((url_path, full_path))
+        else:
+            missing_files.append((url_path, full_path))
+    return existing_files, missing_files
+
+def upload_boot_py(port, module_name):
+    """Create and upload boot.py to import the app module."""
+    boot_content = f"import {module_name}\n"
+    import tempfile
+    with tempfile.NamedTemporaryFile('w', delete=False, encoding='utf-8') as tmp:
+        tmp.write(boot_content)
+        tmp_path = tmp.name
+    try:
+        print_colored(f"⬆️  Uploading boot.py to import {module_name}...", color='cyan')
+        upload_file(tmp_path, port, destination='boot.py')
+    finally:
+        os.unlink(tmp_path)
+
+def remove_boot_py(port):
+    """Remove boot.py from the ESP32 filesystem."""
+    try:
+        print_colored("🗑️ Removing boot.py from ESP32...", color='cyan')
+        cmd = ['mpremote', 'connect', port, 'exec', "import os; os.remove('boot.py')"]
+        result = subprocess.run(cmd, capture_output=True, text=True, timeout=10)
+        if result.returncode != 0:
+            print_colored(f"⚠️ Could not remove boot.py: {result.stderr.strip()}", color='yellow')
+        else:
+            print_colored("boot.py removed successfully.", color='green')
+    except Exception as e:
+        print_colored(f"Error removing boot.py: {e}", color='red')
+
+@click.group()
+def cli():
+    pass
+
+@cli.command()
+@click.option('--port', default=None, help='Serial port, e.g., COM10')
+@click.option('--erase', is_flag=True, help='Erase all flash before writing firmware')
+def flash(port, erase):
+    """Flash MicroPython and MicroWeb to the ESP32."""
+    if not port:
+        ports = [p.device for p in serial.tools.list_ports.comports()]
+        port = ports[0] if ports else None
+    if not port:
+        print_colored("No ESP32 found. Specify --port, e.g., --port COM10.", color='red')
+        return
+    if erase:
+        print_colored("You requested --erase. This will erase ALL data on the ESP32!", color='yellow')
+        confirm = input("Type 'erase' to continue, or anything else to cancel: ")
+        if "erase" not in confirm.lower():
+            print_colored("Erase cancelled.", color='yellow')
+            return
+        print_colored(f"Erasing all flash on {port}...", color='yellow')
+        esptool.main(['--port', port, 'erase_flash'])
+    try:
+        print_colored(f"Checking for MicroPython on {port}...", color='blue')
+        if check_micropython(port):
+            print_colored(f"MicroPython detected on {port}. Skipping firmware flash.", color='green')
+        else:
+            firmware_path = pkg_resources.resource_filename('microweb', 'firmware/ESP32_GENERIC-20250415-v1.25.0.bin')
+            if not os.path.exists(firmware_path):
+                print_colored(f"Error: Firmware file not found at {firmware_path}. Ensure it is included in the package.", color='red')
+                return
+            print_colored(f"Flashing firmware on {port}...", color='blue')
+            esptool.main(['--port', port, 'write_flash', '-z', '0x1000', firmware_path])
+        print_colored("Uploading core files...", color='blue')
+        core_files = [
+            ('firmware/boot.py', 'boot.py'),
+            ('microweb.py', 'microweb.py'),
+            ('wifi.py', 'wifi.py'),
+        ]
+        for src, dest in core_files:
+            src_path = pkg_resources.resource_filename('microweb', src)
+            print_colored(f"Uploading {dest} from {src_path}...", color='cyan')
+            if not os.path.exists(src_path):
+                print_colored(f"Error: Source file {src_path} not found.", color='red')
+                return
+            upload_file(src_path, port, destination=dest)
+        print_colored("Verifying uploaded files...", color='blue')
+        verify_files(port, [dest for _, dest in core_files])
+        print_colored("MicroWeb flashed successfully", color='green')
+    except Exception as e:
+        print_colored(f"Error during flash: {e}", color='red')
+
+@cli.command()
+@click.argument('file')
+@click.option('--port', default=None, help='Serial port, e.g., COM10')
+@click.option('--check-only', is_flag=True, help='Only check static files, don\'t upload')
+@click.option('--static', default='static', help='Local static files folder path')
+@click.option('--force', is_flag=True, help='Force upload all files regardless of changes')
+@click.option('--no-stop', is_flag=True, help='Do not reset ESP32 before running app')
+@click.option('--timeout', default=3600, show_default=True, help='Timeout seconds for running app')
+@click.option('--add-boot', is_flag=True, help='Add boot.py that imports the app to run it on boot')
+@click.option('--remove-boot', is_flag=True, help='Remove boot.py from the ESP32')
+def run(file, port, check_only, static, force, no_stop, timeout, add_boot, remove_boot):
+    """Upload and execute a file on the ESP32 (only uploads changed files)."""
+    if not file.endswith('.py'):
+        print_colored("Error: File must have a .py extension.", color='red')
+        return
+    if not os.path.exists(file):
+        print_colored(f"Error: File {file} does not exist.", color='red')
+        return
+    module_name = os.path.splitext(os.path.basename(file))[0]
+    if add_boot and remove_boot:
+        print_colored("Error: --add-boot and --remove-boot options cannot be used together.", color='red')
+        return
+    print_colored(f"Analyzing {file} for static file and template dependencies...", color='blue')
+    static_files, template_files = analyze_app_static_files(file)
+    # --- Find templates in ./ and ./static ---
+    found_templates = set()
+    for folder in [os.path.dirname(file), static]:
+        if os.path.isdir(folder):
+            for entry in os.listdir(folder):
+                if entry.endswith('.html') or entry.endswith('.htm'):
+                    found_templates.add(os.path.join(folder, entry))
+    # Add found templates if not already in template_files
+    for tfile in found_templates:
+        if tfile not in template_files:
+            template_files.add(tfile)
+    if template_files:
+        print_colored(f"Found template files: {', '.join(os.path.basename(t) for t in template_files)}", color='cyan')
+        template_static_files = analyze_template_static_files(template_files)
+        static_files.update(template_static_files)
+    # --- Find static files in ./ and ./static ---
+    found_static = set()
+    for folder in [os.path.dirname(file), static]:
+        if os.path.isdir(folder):
+            for entry in os.listdir(folder):
+                if entry.endswith(('.css', '.js', '.png', '.jpg', '.jpeg', '.gif', '.ico', '.svg', '.webp')):
+                    found_static.add(('/' + entry, entry))
+    for url_path, file_rel_path in found_static:
+        if (url_path, file_rel_path) not in static_files:
+            static_files.add((url_path, file_rel_path))
+    existing_files = []
+    missing_files = []
+    if static_files:
+        print_colored(f"Found {len(static_files)} static file references:", color='blue')
+        for url_path, file_rel_path in static_files:
+            print_colored(f"  {url_path} -> {file_rel_path}", color='cyan')
+        existing_files, missing_files = verify_static_files_exist(static_files, static)
+        if missing_files:
+            print_colored(f"\nError: Missing {len(missing_files)} static files:", color='red')
+            for url_path, file_full_path in missing_files:
+                print_colored(f"  {url_path} -> {file_full_path} (NOT FOUND)", color='red')
+            print_colored("\nPlease create these files or update your app.py file or --static folder.", color='yellow')
+            return
+        print_colored(f"\nAll {len(existing_files)} static files found locally:", color='green')
+        for url_path, file_full_path in existing_files:
+            file_size = os.path.getsize(file_full_path)
+            print_colored(f"  ✓ {url_path} -> {file_full_path} ({file_size} bytes)", color='green')
+    else:
+        print_colored("No static files found in app.", color='yellow')
+    if check_only:
+        print_colored("\nStatic file and template check complete.", color='green')
+        return
+    if not port:
+        ports = [p.device for p in serial.tools.list_ports.comports()]
+        port = ports[0] if ports else None
+    if not port:
+        print_colored("No ESP32 found. Specify --port, e.g., --port COM10.", color='red')
+        return
+    if not check_micropython(port):
+        print_colored(f"MicroPython not detected on ESP32. Please run 'microweb flash --port {port}' first.", color='red')
+        return
+    if remove_boot:
+        remove_boot_py(port)
+        return
+    try:
+        print_colored(f"\nGetting remote file information from {port}...", color='blue')
+        remote_files = get_remote_file_info(port)
+        print_colored(f"Found {len(remote_files)} files on ESP32:", color='blue')
+        for filename, size in remote_files.items():
+            print_colored(f"  {filename}: {size} bytes", color='cyan')
+        files_to_upload = []
+        files_skipped = []
+        main_filename = os.path.basename(file)
+        should_upload, reason = should_upload_file(file, main_filename, remote_files)
+        if force or should_upload:
+            files_to_upload.append(('main', file, main_filename, reason))
+        else:
+            files_skipped.append((main_filename, reason))
+        template_uploads = []
+        for template_file in template_files:
+            if os.path.exists(template_file):
+                remote_name = os.path.basename(template_file)
+                should_upload, reason = should_upload_file(template_file, remote_name, remote_files)
+                if force or should_upload:
+                    template_uploads.append((template_file, remote_name, reason))
+                else:
+                    files_skipped.append((remote_name, reason))
+            else:
+                print_colored(f"Warning: Template file {template_file} not found locally, skipping upload", color='yellow')
+        static_uploads = []
+        if existing_files:
+            for url_path, file_full_path in existing_files:
+                filename = os.path.basename(file_full_path)
+                should_upload, reason = should_upload_file(file_full_path, f"static/{filename}", remote_files)
+                if force or should_upload:
+                    static_uploads.append((file_full_path, filename, reason))
+                else:
+                    files_skipped.append((f"static/{filename}", reason))
+        total_uploads = len(files_to_upload) + len(template_uploads) + len(static_uploads)
+        if files_skipped:
+            print_colored(f"\n📋 Files skipped ({len(files_skipped)}):", color='yellow')
+            for filename, reason in files_skipped:
+                print_colored(f"  ⏭️  {filename}: {reason}", color='yellow')
+        if total_uploads == 0:
+            print_colored(f"\n✅ All files are up to date! No uploads needed.", color='green')
+            if not force:
+                print_colored("Use --force to upload all files anyway.", color='yellow')
+        else:
+            print_colored(f"\n📤 Files to upload ({total_uploads}):", color='blue')
+            for file_type, local_path, remote_name, reason in files_to_upload:
+                print_colored(f"  📁 {remote_name}: {reason}", color='cyan')
+            for template_file, remote_name, reason in template_uploads:
+                print_colored(f"  📄 {remote_name}: {reason}", color='cyan')
+            for local_path, filename, reason in static_uploads:
+                print_colored(f"  🎨 static/{filename}: {reason}", color='cyan')
+        upload_count = 0
+        for file_type, local_path, remote_name, reason in files_to_upload:
+            print_colored(f"\n⬆️  Uploading {remote_name}...", color='cyan')
+            upload_file(local_path, port, destination=remote_name)
+            upload_count += 1
+        for template_file, remote_name, reason in template_uploads:
+            print_colored(f"⬆️  Uploading template: {remote_name}...", color='cyan')
+            upload_file(template_file, port, destination=remote_name)
+            upload_count += 1
+        if static_uploads:
+            print_colored("📁 Creating static directory on ESP32...", color='blue')
+            create_directory('static', port)
+            for file_full_path, filename, reason in static_uploads:
+                print_colored(f"⬆️  Uploading static file: static/{filename}...", color='cyan')
+                upload_file(file_full_path, port, destination=f"static/{filename}")
+                upload_count += 1
+        if add_boot:
+            upload_boot_py(port, module_name)
+        if not no_stop:
+            print_colored(f"\n🔄 Resetting ESP32 to ensure clean state...", color='blue')
+            subprocess.run(['mpremote', 'connect', port, 'reset'], capture_output=True, text=True, timeout=10)
+            time.sleep(2)
+        if not add_boot:
+            print_colored(f"🚀 Starting {module_name}.run() with timeout {timeout} seconds...", color='blue')
+            cmd = ['mpremote', 'connect', port, 'exec', f'import {module_name}; {module_name}.app.run()']
+            try:
+                print_colored(f"\n✅ {file} is running on ESP32", color='green')
+                ssid = None
+                password = None
+                try:
+                    with open(file, 'r', encoding='utf-8') as f:
+                        content = f.read()
+                    ap_match = re.search(
+                        r'MicroWeb\s*\(\s*.*ap\s*=\s*{[^}]*["\']ssid["\']\s*:\s*["\']([^"\']+)["\']\s*,\s*["\']password["\']\s*:\s*["\']([^"\']+)["\']',
+                        content
+                    )
+                    if ap_match:
+                        ssid = ap_match.group(1)
+                        password = ap_match.group(2)
+                except Exception:
+                    pass
+                if ssid and password:
+                    print_colored(f"📶 Connect to SSID: {ssid}, Password: {password}", color='cyan')
+                print_colored(f"🌐 Visit: http://192.168.4.1", color='cyan')
+                result = subprocess.run(cmd, capture_output=True, text=True, timeout=timeout)
+                if result.returncode != 0:
+                    print_colored(f"❌ Error running {file}: return code {result.returncode}", color='red')
+                    print_colored(f"stdout:\n{result.stdout.strip()}\nstderr:\n{result.stderr.strip()}", color='red')
+                    return
+                if upload_count > 0:
+                    print_colored(f"📊 Uploaded {upload_count} file(s), skipped {len(files_skipped)} file(s)", color='green')
+                else:
+                    print_colored(f"📊 No files uploaded, {len(files_skipped)} file(s) were already up to date", color='green')
+            except subprocess.TimeoutExpired:
+                print_colored(f"❌ Error: Running {file} timed out after {timeout} seconds.", color='red')
+            except Exception as e:
+                print_colored(f"❌ Unexpected error running {file}: {e}", color='red')
+        else:
+            print_colored(f"⚠️ boot.py uploaded, app will run automatically on boot. Not running app.run() now.", color='yellow')
+    except Exception as e:
+        print_colored(f"❌ Error: {e}", color='red')
+
+@cli.command()
+@click.option('--port', default=None, help='Serial port, e.g., COM10')
+@click.option('--remove', 'remove_everything', is_flag=True, help='Actually remove all files in the ESP32 home directory')
+def remove(port, remove_everything):
+    """Remove all files in the ESP32 home directory (requires --remove flag to actually delete files)."""
+    if not port:
+        ports = [p.device for p in serial.tools.list_ports.comports()]
+        port = ports[0] if ports else None
+    if not port:
+        print_colored("No ESP32 found. Specify --port, e.g., --port COM10.", color='red')
+        return
+    if not check_micropython(port):
+        print_colored(f"MicroPython not detected on ESP32. Please run 'microweb flash --port {port}' first.", color='red')
+        return
+    try:
+        if remove_everything:
+            print_colored("Removing all files in ESP32 home directory...", color='yellow')
+            cmd_ls = ['mpremote', 'connect', port, 'ls']
+            result = subprocess.run(cmd_ls, capture_output=True, text=True, timeout=10)
+            if result.returncode == 0:
+                files = []
+                for line in result.stdout.strip().split('\n'):
+                    parts = line.strip().split()
+                    if len(parts) >= 2:
+                        filename = ' '.join(parts[1:])
+                        files.append(filename)
+                for filename in files:
+                    if filename in ('.', '..'):
+                        continue
+                    print_colored(f"Removing {filename}...", color='cyan')
+                    cmd_rm = [
+                        'mpremote', 'connect', port, 'exec',
+                        f"import os; import shutil; "
+                        f"shutil.rmtree('{filename}') if hasattr(__import__('shutil'), 'rmtree') and os.path.isdir('{filename}') "
+                        f"else (os.remove('{filename}') if '{filename}' in os.listdir() else None)"
+                    ]
+                    subprocess.run(cmd_rm, capture_output=True, text=True, timeout=10)
+                print_colored("All files in ESP32 home directory removed.", color='green')
+            else:
+                print_colored(f"Error listing files: {result.stderr}", color='red')
+        else:
+            print_colored("Dry run: No files were removed. Use --remove to actually delete all files in the ESP32 home directory.", color='yellow')
+    except Exception as e:
+        print_colored(f"Error removing files: {e}", color='red')
+
+@cli.command()
+def examples():
+            """Show example commands for using microweb CLI."""
+            print_colored("Example commands for microweb CLI:", color='blue', style='bold')
+            print_colored("\n1. Flash MicroPython and MicroWeb to ESP32:", color='cyan')
+            print_colored("   microweb flash --port COM10", color='green')
+            print_colored("\n2. Upload and run your app.py on ESP32:", color='cyan')
+            print_colored("   microweb run app.py --port COM10", color='green')
+            print_colored("\n3. Check static/template files without uploading:", color='cyan')
+            print_colored("   microweb run app.py --check-only", color='green')
+            print_colored("\n4. Remove all files from ESP32 (DANGEROUS):", color='cyan')
+            print_colored("   microweb remove --port COM10 --remove", color='green')
+            print_colored("\n5. Upload and set app to run on boot:", color='cyan')
+            print_colored("   microweb run app.py --port COM10 --add-boot", color='green')
+            print_colored("\n6. Remove boot.py from ESP32:", color='cyan')
+            print_colored("   microweb run app.py --port COM10 --remove-boot", color='green')
+            print_colored("\nReplace COM10 with your actual ESP32 serial port.", color='yellow')
+
+
+if __name__ == '__main__':
+    cli()

microweb/firmware/boot.py

@@ -0,0 +1,2 @@
+import gc
+gc.collect()

microweb/firmware/main.py

@@ -0,0 +1 @@
+import app