appmanager-server 0.3.0__tar.gz → 0.4.0__tar.gz

{appmanager_server-0.3.0 → appmanager_server-0.4.0}/CHANGELOG.md

@@ -7,6 +7,20 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ---
 
+## [0.4.0] - 2026-08-28
+
+### Added
+- **Automatic Sub-App Root Module Resolution**: Automatically prepends sub-app root directory (`app_dir`) to `sys.path` during dynamic module loading in `load_wsgi_app_from_path`, enabling seamless relative/module imports within sub-app packages.
+
+---
+
+## [0.3.1] - 2026-08-28
+
+### Fixed
+- **App & Role Deletion Type-To-Confirm Modal**: Fixed modal validation logic and dynamic form URL in Admin Dashboard where typing the exact app/role slug did not enable the confirmation submission.
+
+---
+
 ## [0.3.0] - 2026-08-28
 
 ### Added

appmanager_server-0.4.0/MANIFEST.in

@@ -0,0 +1,17 @@
+include LICENSE
+include README.md
+include CHANGELOG.md
+include SECURITY.md
+include requirements.txt
+include .env.example
+graft appmanager/templates
+graft appmanager/static
+global-exclude __pycache__
+global-exclude *.py[cod]
+global-exclude .env*
+global-exclude *.db
+global-exclude *.sqlite*
+prune instance
+prune installed_apps
+prune .venv
+prune .pytest_cache

{appmanager_server-0.3.0 → appmanager_server-0.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: appmanager-server
-Version: 0.3.0
+Version: 0.4.0
 Summary: High-performance multi-tenant WSGI portal, dynamic sub-app dispatcher, and extension framework for Python/Flask.
 Author: AppManager Contributors
 License: MIT

{appmanager_server-0.3.0 → appmanager_server-0.4.0}/appmanager/__init__.py

@@ -8,7 +8,7 @@ from appmanager.database import db
 from appmanager.extension import AppManager
 from appmanager.middleware import DynamicAppDispatcherMiddleware
 
-__version__ = "0.3.0"
+__version__ = "0.4.0"
 
 __all__ = [
     "AppManager",

{appmanager_server-0.3.0 → appmanager_server-0.4.0}/appmanager/admin/app_installer.py

@@ -2,6 +2,7 @@ import ast
 import importlib.util
 import inspect
 import json
+import logging
 import os
 import shutil
 import subprocess
@@ -30,6 +31,8 @@ from appmanager.security import (
 from appmanager.security_scanner import SecurityScanReport, run_security_scan
 from appmanager.signals import subapp_installed, subapp_reloaded, subapp_uninstalled, subapp_updated
 
+logger = logging.getLogger("appmanager.installer")
+
 
 def sanitize_slug(slug_text: str) -> str:
     clean = secure_filename(slug_text.lower().replace(" ", "-"))
@@ -217,19 +220,35 @@ def validate_subapp_package(path_or_zip: str) -> Tuple[bool, List[str], Dict[str
 
 def discover_entrypoint(app_dir: str) -> str:
     """
-    Search for common Flask entrypoint files (app.py, wsgi.py, main.py, run.py) or manifest.json.
-    Returns 'module_name:app_variable' string e.g. 'app:app'
+    Search for common Flask entrypoint files (app.py, wsgi.py, main.py, run.py, src/app.py, packages)
+    or manifest.json. Returns 'module_name:app_variable' string e.g. 'app:app'
     """
     manifest = parse_manifest(app_dir)
     if manifest and "entry_point" in manifest:
         return manifest["entry_point"]
 
-    candidates = ["app.py", "wsgi.py", "main.py", "run.py"]
+    candidates = [
+        "app.py",
+        "wsgi.py",
+        "main.py",
+        "run.py",
+        "server.py",
+        os.path.join("src", "app.py"),
+        os.path.join("src", "main.py"),
+        os.path.join("src", "wsgi.py"),
+    ]
     for candidate in candidates:
         if os.path.exists(os.path.join(app_dir, candidate)):
-            module_name = candidate[:-3]  # Strip .py
+            module_name = candidate[:-3].replace(os.sep, ".")  # Strip .py and normalize slashes
             return f"{module_name}:app"
 
+    # Check for package directories with __init__.py (e.g. appmanager, app, <slug>)
+    slug = os.path.basename(app_dir.rstrip("/\\"))
+    for pkg_cand in [slug, slug.replace("-", "_"), "app", "appmanager"]:
+        init_file = os.path.join(app_dir, pkg_cand, "__init__.py")
+        if os.path.exists(init_file):
+            return f"{pkg_cand}:create_app"
+
     # Default fallback
     return "app:app"
 
@@ -263,7 +282,9 @@ def load_wsgi_app_from_path(app_dir: str, entry_point: str = "app:app") -> Any:
 
     module_path = module_path_or_err
     if not os.path.exists(module_path):
-        raise FileNotFoundError(f"Entrypoint file '{module_name}.py' not found in {app_dir}")
+        raise FileNotFoundError(
+            f"Entrypoint module/file '{module_name}' was not found in sub-app package."
+        )
 
     # Unique scoped module spec name to avoid sys.path pollution
     slug = os.path.basename(app_dir)
@@ -275,6 +296,8 @@ def load_wsgi_app_from_path(app_dir: str, entry_point: str = "app:app") -> Any:
 
     mod = importlib.util.module_from_spec(spec)
     sys.modules[scoped_module_name] = mod
+    if app_dir not in sys.path:
+        sys.path.insert(0, app_dir)
     spec.loader.exec_module(mod)
 
     # Check for Flask app instance, callable create_app factory, or WSGI middleware
@@ -402,6 +425,7 @@ def stage_git_repo(
     if not is_safe_repo_url(repo_url):
         raise ValueError(f"Invalid or unsafe git repository URL: '{repo_url}'")
 
+    logger.info("Staging Git repository installation from '%s'", repo_url)
     cleanup_expired_staged_sessions()
 
     import tempfile
@@ -426,6 +450,7 @@ def stage_git_repo(
                     res.stderr.strip() or f"Failed to clone repository from '{repo_url}'."
                 )
     except Exception as git_err:
+        logger.error("Failed to clone Git repository '%s': %s", repo_url, git_err)
         if os.path.exists(temp_stage_dir):
             shutil.rmtree(temp_stage_dir, ignore_errors=True)
         raise ValueError(f"Failed to clone Git repository: {git_err}")
@@ -471,6 +496,13 @@ def stage_git_repo(
         "created_at": time.time(),
     }
     _write_staging_metadata(temp_stage_dir, _staged_installations[staging_id])
+    logger.info(
+        "Staged Git app '%s' (staging_id=%s, risk=%s, safe=%s)",
+        resolved_slug,
+        staging_id,
+        scan_report.risk_level,
+        scan_report.is_safe,
+    )
 
     return staging_id, scan_report, manifest
 
@@ -553,6 +585,13 @@ def stage_zip_file(
         "created_at": time.time(),
     }
     _write_staging_metadata(temp_stage_dir, _staged_installations[staging_id])
+    logger.info(
+        "Staged ZIP package '%s' (filename: %s, risk=%s, safe=%s)",
+        resolved_slug,
+        filename,
+        scan_report.risk_level,
+        scan_report.is_safe,
+    )
 
     return staging_id, scan_report, manifest
 
@@ -581,6 +620,7 @@ def finalize_staged_installation(
 
     final_slug = sanitize_slug(slug or session.get("slug") or session.get("name") or "sub-app")
     target_dir = os.path.join(current_app.config["INSTALLED_APPS_DIR"], final_slug)
+    logger.info("Finalizing installation of staged app '%s' into '%s'", final_slug, target_dir)
 
     if os.path.exists(target_dir):
         if os.path.exists(staging_dir):
@@ -631,6 +671,7 @@ def finalize_staged_installation(
             else:
                 initial_settings[s_key] = s_val
 
+    logger.info("Installing dependencies for '%s'...", final_slug)
     install_dependencies(target_dir)
 
     installed_app = InstalledApp(

{appmanager_server-0.3.0 → appmanager_server-0.4.0}/appmanager/api/routes.py

@@ -73,22 +73,34 @@ def system_health():
 
         db.session.execute(text("SELECT 1"))
     except Exception as e:
+        import logging
+
+        logging.getLogger("appmanager.api").exception(f"Database health check failed: {e}")
         db_ok = False
-        db_error = str(e)
+        if current_app.config.get("DEBUG", False):
+            db_error = str(e)
 
-    total_apps = InstalledApp.query.count()
-    active_apps = InstalledApp.query.filter_by(is_active=True).count()
+    total_apps = 0
+    active_apps = 0
+    if db_ok:
+        try:
+            total_apps = InstalledApp.query.count()
+            active_apps = InstalledApp.query.filter_by(is_active=True).count()
+        except Exception:
+            pass
 
     overall_status = "healthy" if db_ok else "unhealthy"
 
-    return jsonify(
-        {
-            "status": overall_status,
-            "timestamp": datetime.now(timezone.utc).isoformat(),
-            "database": {"connected": db_ok, "error": db_error},
-            "apps": {"total": total_apps, "active": active_apps},
-        }
-    ), 200 if db_ok else 503
+    resp_data = {
+        "status": overall_status,
+        "timestamp": datetime.now(timezone.utc).isoformat(),
+        "database": {"connected": db_ok},
+        "apps": {"total": total_apps, "active": active_apps},
+    }
+    if db_error is not None:
+        resp_data["database"]["error"] = db_error
+
+    return jsonify(resp_data), 200 if db_ok else 503
 
 
 @api_bp.route("/apps", methods=["GET"])

{appmanager_server-0.3.0 → appmanager_server-0.4.0}/appmanager/auth/routes.py

@@ -1,3 +1,4 @@
+import logging
 from datetime import datetime, timezone
 
 from flask import (
@@ -23,6 +24,7 @@ from appmanager.database import db
 from appmanager.models import InstalledApp, MagicLinkToken, User, UserAppPermission
 from appmanager.security import check_rate_limit, is_safe_redirect_url
 
+logger = logging.getLogger("appmanager.auth")
 auth_bp = Blueprint("auth", __name__, url_prefix="/auth")
 
 

{appmanager_server-0.3.0 → appmanager_server-0.4.0}/appmanager/cli.py

@@ -983,6 +983,19 @@ def check_deps_cli(
             query = query.filter_by(slug=slug)
         apps = query.all()
 
+        if not apps and slug and slug.lower() != "all":
+            target_dir = os.path.join(installed_apps_dir, slug) if not os.path.isabs(slug) else slug
+            if os.path.isdir(target_dir):
+                manifest = parse_manifest(target_dir) or {}
+                app_name = manifest.get("name", slug)
+                apps = [
+                    type(
+                        "DiskApp",
+                        (),
+                        {"name": app_name, "slug": os.path.basename(target_dir.rstrip("/"))},
+                    )()
+                ]
+
         if not apps:
             print("No matching installed applications found.\n")
             return 0

{appmanager_server-0.3.0 → appmanager_server-0.4.0}/appmanager/config.py

@@ -6,7 +6,17 @@ from dotenv import load_dotenv
 # Automatically load .env if present in current working directory or base directory
 load_dotenv()
 
-DEFAULT_BASE_DIR = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
+# Resolve base directory: when running as installed package, use current working directory
+_pkg_root = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
+if (
+    "site-packages" in _pkg_root
+    or "dist-packages" in _pkg_root
+    or not os.path.exists(os.path.join(_pkg_root, "pyproject.toml"))
+):
+    DEFAULT_BASE_DIR = os.path.abspath(os.getcwd())
+else:
+    DEFAULT_BASE_DIR = _pkg_root
+
 BASE_DIR = os.getenv("APPMANAGER_BASE_DIR", DEFAULT_BASE_DIR)
 
 
@@ -73,9 +83,16 @@ class Config:
 
     # Security settings
     SESSION_COOKIE_HTTPONLY = True
-    SESSION_COOKIE_SAMESITE = os.getenv("SESSION_COOKIE_SAMESITE", "Lax")
+    SESSION_COOKIE_SAMESITE = "Lax"
     SESSION_COOKIE_SECURE = os.getenv("SESSION_COOKIE_SECURE", "false").lower() in (
         "true",
         "1",
         "yes",
     )
+
+    # Logging Configuration
+    LOG_LEVEL = os.getenv("LOG_LEVEL", "INFO").upper()
+    LOG_FORMAT = os.getenv(
+        "LOG_FORMAT",
+        "[%(asctime)s] [%(levelname)s] [%(name)s]: %(message)s",
+    )

{appmanager_server-0.3.0 → appmanager_server-0.4.0}/appmanager/dependency_manager.py

@@ -282,12 +282,18 @@ def install_app_dependencies(
     timeout: int = 180,
 ) -> Tuple[bool, str]:
     """
-    Installs sub-app dependencies from requirements.txt based on configured venv mode.
+    Installs sub-app dependencies from requirements.txt and installs the sub-app itself
+    into the virtual environment if it is an installable Python package (has pyproject.toml or setup.py).
     Returns (success, output_or_error_message).
     """
     req_file = os.path.join(app_dir, "requirements.txt")
-    if not os.path.exists(req_file):
-        return True, "No requirements.txt found (nothing to install)."
+    has_reqs = os.path.exists(req_file)
+    has_pkg = os.path.exists(os.path.join(app_dir, "pyproject.toml")) or os.path.exists(
+        os.path.join(app_dir, "setup.py")
+    )
+
+    if not has_reqs and not has_pkg:
+        return True, "No requirements.txt or pyproject.toml found (nothing to install)."
 
     if venv_mode == "isolated":
         venv_dir = os.path.join(app_dir, ".venv")
@@ -314,26 +320,66 @@ def install_app_dependencies(
         except Exception:
             pass
 
-        install_cmd = [pip_path, "install", "-r", req_file]
+        pip_base = [pip_path, "install"]
     else:
         # Singular shared host virtual environment
-        install_cmd = [sys.executable, "-m", "pip", "install", "-r", req_file]
+        pip_base = [sys.executable, "-m", "pip", "install"]
 
-    try:
-        proc = subprocess.run(
-            install_cmd,
-            capture_output=True,
-            text=True,
-            timeout=timeout,
-        )
-        if proc.returncode == 0:
-            return True, proc.stdout or "Dependencies installed successfully."
-        else:
-            return False, f"Pip installation failed (code {proc.returncode}): {proc.stderr}"
-    except subprocess.TimeoutExpired:
-        return False, f"Dependency installation timed out after {timeout} seconds."
-    except Exception as e:
-        return False, f"Unexpected error during dependency installation: {str(e)}"
+    outputs: List[str] = []
+
+    # 1. Install requirements.txt if present
+    if has_reqs:
+        try:
+            proc = subprocess.run(
+                pip_base + ["-r", req_file],
+                capture_output=True,
+                text=True,
+                timeout=timeout,
+            )
+            if proc.returncode != 0:
+                return (
+                    False,
+                    f"Pip requirements installation failed (code {proc.returncode}): {proc.stderr}",
+                )
+            if proc.stdout:
+                outputs.append(proc.stdout.strip())
+        except subprocess.TimeoutExpired:
+            return False, f"Dependency installation timed out after {timeout} seconds."
+        except Exception as e:
+            return False, f"Unexpected error during requirements installation: {str(e)}"
+
+    # 2. Install package itself if installable (pyproject.toml or setup.py present)
+    if has_pkg:
+        try:
+            # Attempt editable install, fallback to standard directory install
+            proc = subprocess.run(
+                pip_base + ["-e", app_dir],
+                capture_output=True,
+                text=True,
+                timeout=timeout,
+            )
+            if proc.returncode != 0:
+                proc = subprocess.run(
+                    pip_base + [app_dir],
+                    capture_output=True,
+                    text=True,
+                    timeout=timeout,
+                )
+            if proc.returncode != 0:
+                return (
+                    False,
+                    f"Package self-installation failed (code {proc.returncode}): {proc.stderr}",
+                )
+            if proc.stdout:
+                outputs.append(proc.stdout.strip())
+        except subprocess.TimeoutExpired:
+            return False, f"Package installation timed out after {timeout} seconds."
+        except Exception as e:
+            return False, f"Unexpected error during package installation: {str(e)}"
+
+    return True, "\n".join(
+        outputs
+    ) if outputs else "Package and dependencies installed successfully."
 
 
 def analyze_uninstall_dependencies(

{appmanager_server-0.3.0 → appmanager_server-0.4.0}/appmanager/extension.py

@@ -1,3 +1,4 @@
+import logging
 import os
 from typing import Any, List, Optional, Union
 
@@ -15,6 +16,26 @@ from appmanager.middleware import DynamicAppDispatcherMiddleware
 from appmanager.models import InstalledApp, UserAppPermission
 
 
+def _setup_logging(app: Flask) -> None:
+    """
+    Configures structured logging for the AppManager package.
+    """
+    level_name = app.config.get("LOG_LEVEL", "INFO").upper()
+    log_level = getattr(logging, level_name, logging.INFO)
+    log_format = app.config.get(
+        "LOG_FORMAT",
+        "[%(asctime)s] [%(levelname)s] [%(name)s]: %(message)s",
+    )
+
+    logger = logging.getLogger("appmanager")
+    logger.setLevel(log_level)
+
+    if not logger.handlers:
+        handler = logging.StreamHandler()
+        handler.setFormatter(logging.Formatter(log_format))
+        logger.addHandler(handler)
+
+
 class AppManager:
     """
     Standard Flask extension class for AppManager.
@@ -53,6 +74,8 @@ class AppManager:
             if key.isupper() and key not in app.config:
                 app.config[key] = getattr(Config, key)
 
+        _setup_logging(app)
+
         # Ensure base directories exist
         base_dir = app.config.get("BASE_DIR", Config.BASE_DIR)
         os.makedirs(app.config["INSTALLED_APPS_DIR"], exist_ok=True)

{appmanager_server-0.3.0 → appmanager_server-0.4.0}/appmanager/middleware.py

@@ -1,3 +1,4 @@
+import logging
 import os
 import re
 from typing import Any, Callable, Dict, Optional
@@ -10,6 +11,7 @@ from appmanager.database import db
 from appmanager.models import InstalledApp, User, UserAppPermission
 from appmanager.signals import subapp_reloaded
 
+logger = logging.getLogger("appmanager.dispatcher")
 VALID_SLUG_PATTERN = re.compile(r"^[a-zA-Z0-9_-]+$")
 
 
@@ -206,22 +208,42 @@ class DynamicAppDispatcherMiddleware:
                     environ["HTTP_X_APPMANAGER_SUBAPP_SLUG"] = slug
                     environ["HTTP_X_FORWARDED_PREFIX"] = f"/apps/{slug}"
 
+                    logger.debug(
+                        "Dispatching request '%s %s' to sub-app '%s' (user: %s)",
+                        environ.get("REQUEST_METHOD", "GET"),
+                        path_info,
+                        slug,
+                        user.email if user else "anonymous",
+                    )
+
                     # 3. Load or Retrieve Sub-App WSGI Instance
                     app_dir = os.path.join(
                         self.main_app.config["INSTALLED_APPS_DIR"], app_record.slug
                     )
                     if not os.path.exists(app_dir):
+                        logger.warning("Sub-app directory for '%s' not found at %s", slug, app_dir)
+                        is_admin = bool(user and getattr(user, "is_admin", False))
+                        debug_mode = bool(self.main_app.config.get("DEBUG", False))
+                        if is_admin or debug_mode:
+                            msg = f"App directory for '{app_record.name}' was not found on the server filesystem."
+                        else:
+                            msg = f"The '{app_record.name}' application is currently unavailable."
                         return self._send_html_response(
                             start_response,
                             500,
-                            "Installation Error",
-                            f"App directory for '{app_record.name}' was not found on the server filesystem.",
+                            "Application Unavailable",
+                            msg,
                             link_url="/",
                             link_text="Return to Home",
                         )
 
                     try:
                         if slug not in self.sub_app_cache:
+                            logger.info(
+                                "Loading sub-app '%s' into WSGI cache (entrypoint: %s)",
+                                slug,
+                                app_record.entry_point,
+                            )
                             sub_app_obj = load_wsgi_app_from_path(app_dir, app_record.entry_point)
                             # Get standard wsgi_app callable if it's a Flask instance
                             wsgi_callable = getattr(sub_app_obj, "wsgi_app", sub_app_obj)
@@ -233,11 +255,23 @@ class DynamicAppDispatcherMiddleware:
 
                         wsgi_callable = self.sub_app_cache[slug]
                     except Exception as e:
+                        import logging
+
+                        logging.getLogger("appmanager.dispatcher").exception(
+                            f"Error loading sub-app '{app_record.slug}': {e}"
+                        )
+                        is_admin = bool(user and getattr(user, "is_admin", False))
+                        debug_mode = bool(self.main_app.config.get("DEBUG", False))
+                        if is_admin or debug_mode:
+                            err_msg = f"Failed to load Flask sub-app '{app_record.name}': {str(e)}"
+                        else:
+                            err_msg = f"The '{app_record.name}' application encountered an error while starting. Please contact an administrator."
+
                         return self._send_html_response(
                             start_response,
                             500,
-                            "App Load Error",
-                            f"Failed to load Flask sub-app '{app_record.name}': {str(e)}",
+                            "Application Error",
+                            err_msg,
                             link_url="/",
                             link_text="Return to Home",
                         )

{appmanager_server-0.3.0 → appmanager_server-0.4.0}/appmanager/security.py

@@ -116,20 +116,35 @@ def is_safe_repo_url(repo_url: str) -> bool:
 def validate_entrypoint_path(app_dir: str, entry_point: str) -> Tuple[bool, str]:
     """
     Ensures an entrypoint string does not escape the app directory via directory traversal.
+    Supports module names ('app'), dotted paths ('src.app'), and package paths ('appmanager').
     """
     if ":" in entry_point:
         module_name = entry_point.split(":", 1)[0]
     else:
         module_name = entry_point
 
-    # Disallow path separators in module name
-    if "/" in module_name or "\\" in module_name or ".." in module_name:
+    # Disallow parent references
+    if ".." in module_name:
         return False, "Entrypoint module name cannot contain path separators or parent references."
 
-    module_file = os.path.join(app_dir, f"{module_name}.py")
-    abs_module = os.path.abspath(module_file)
     abs_app_dir = os.path.abspath(app_dir)
 
+    # 1. Direct .py file path
+    if module_name.endswith(".py"):
+        cand_path = os.path.join(app_dir, module_name)
+    else:
+        cand_path = os.path.join(app_dir, f"{module_name}.py")
+        if not os.path.exists(cand_path):
+            # 2. Check dotted or nested path: e.g. src.app -> src/app.py or pkg/__init__.py
+            parts = module_name.replace("\\", "/").replace(".", "/").split("/")
+            cand_py = os.path.join(app_dir, *parts) + ".py"
+            cand_init = os.path.join(app_dir, *parts, "__init__.py")
+            if os.path.exists(cand_py):
+                cand_path = cand_py
+            elif os.path.exists(cand_init):
+                cand_path = cand_init
+
+    abs_module = os.path.abspath(cand_path)
     if not abs_module.startswith(abs_app_dir):
         return False, "Entrypoint file escapes application directory."
 

{appmanager_server-0.3.0 → appmanager_server-0.4.0}/appmanager/templates/admin/dashboard.html

@@ -207,7 +207,7 @@
                                                         <button type="submit" class="btn btn-ghost btn-sm" title="Set as default landing app">Default</button>
                                                     {% endif %}
                                                 </form>
-                                                <button type="button" class="btn btn-danger btn-sm" onclick="openConfirm('uninstall-{{ app.id }}', 'Uninstall {{ app.name }}?', 'Type <code>{{ app.slug }}</code> to confirm')">Uninstall</button>
+                                                <button type="button" class="btn btn-danger btn-sm" onclick="openConfirm('/admin/apps/{{ app.id }}/delete', '{{ app.slug }}', 'Uninstall {{ app.name }}?', 'Type <code>{{ app.slug }}</code> to confirm')">Uninstall</button>
                                             </div>
                                         </td>
                                     </tr>
@@ -333,7 +333,7 @@
                                     <td class="num">{{ role_counts.get(r.slug, 0) }}</td>
                                     <td>
                                         {% if not r.is_system %}
-                                            <button type="button" class="btn btn-danger btn-sm" onclick="openConfirm('role-{{ r.id }}', 'Delete role {{ r.name }}?', 'Type <code>{{ r.slug }}</code> to confirm')">Delete</button>
+                                            <button type="button" class="btn btn-danger btn-sm" onclick="openConfirm('/admin/roles/{{ r.id }}/delete', '{{ r.slug }}', 'Delete role {{ r.name }}?', 'Type <code>{{ r.slug }}</code> to confirm')">Delete</button>
                                         {% else %}
                                             <span class="text-faint" style="font-size:0.75rem;">Protected</span>
                                         {% endif %}
@@ -621,18 +621,15 @@
     }
 
     // Type-to-confirm destructive action modal
-    var confirmSlug = '';
-    function openConfirm(slug, title, desc) {
-        confirmSlug = slug;
-        document.getElementById('confirm-title').textContent = title;
-        document.getElementById('confirm-desc').innerHTML = desc;
+    var expectedConfirmText = '';
+    function openConfirm(actionUrl, expectedSlug, title, desc) {
+        expectedConfirmText = (expectedSlug || '').trim();
+        document.getElementById('confirm-title').textContent = title || 'Confirm Action';
+        document.getElementById('confirm-desc').innerHTML = desc || ('Type <code>' + expectedConfirmText + '</code> to confirm');
         document.getElementById('confirm-input').value = '';
+        document.getElementById('confirm-input').placeholder = expectedConfirmText;
         document.getElementById('confirm-submit').disabled = true;
-        document.getElementById('confirm-form').action = '/admin/apps/' + slug.split('-').pop() + '/delete';
-        // For roles, the action differs
-        if (slug.indexOf('role-') === 0) {
-            document.getElementById('confirm-form').action = '/admin/roles/' + slug.split('-').pop() + '/delete';
-        }
+        document.getElementById('confirm-form').action = actionUrl;
         document.getElementById('confirm-modal').style.display = 'flex';
         document.getElementById('confirm-input').focus();
     }
@@ -640,7 +637,7 @@
         document.getElementById('confirm-modal').style.display = 'none';
     }
     document.getElementById('confirm-input').addEventListener('input', function (e) {
-        document.getElementById('confirm-submit').disabled = (e.target.value.trim() !== confirmSlug.split('-').pop());
+        document.getElementById('confirm-submit').disabled = (e.target.value.trim() !== expectedConfirmText);
     });
     document.getElementById('confirm-modal').addEventListener('click', function (e) {
         if (e.target === this) closeConfirm();

{appmanager_server-0.3.0 → appmanager_server-0.4.0}/appmanager_server.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: appmanager-server
-Version: 0.3.0
+Version: 0.4.0
 Summary: High-performance multi-tenant WSGI portal, dynamic sub-app dispatcher, and extension framework for Python/Flask.
 Author: AppManager Contributors
 License: MIT

{appmanager_server-0.3.0 → appmanager_server-0.4.0}/appmanager_server.egg-info/SOURCES.txt

@@ -1,4 +1,3 @@
-.env.example
 CHANGELOG.md
 LICENSE
 MANIFEST.in

{appmanager_server-0.3.0 → appmanager_server-0.4.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "appmanager-server"
-version = "0.3.0"
+version = "0.4.0"
 description = "High-performance multi-tenant WSGI portal, dynamic sub-app dispatcher, and extension framework for Python/Flask."
 readme = "README.md"
 authors = [

{appmanager_server-0.3.0 → appmanager_server-0.4.0}/tests/test_dependency_manager.py

@@ -116,3 +116,24 @@ def test_install_app_dependencies_no_reqs(tmp_path):
     ok, msg = install_app_dependencies(str(empty_dir), venv_mode="singular")
     assert ok is True
     assert "nothing to install" in msg
+
+
+def test_install_app_dependencies_package_structure(tmp_path, monkeypatch):
+    pkg_dir = tmp_path / "pkg_app"
+    pkg_dir.mkdir()
+    (pkg_dir / "pyproject.toml").write_text("[project]\nname = 'pkg-app'\nversion = '0.1.0'\n")
+
+    # Mock subprocess.run to verify pip install -e is invoked
+    called_cmds = []
+
+    def mock_run(cmd, **kwargs):
+        called_cmds.append(cmd)
+        return type(
+            "Proc", (), {"returncode": 0, "stdout": "Successfully installed pkg-app", "stderr": ""}
+        )()
+
+    monkeypatch.setattr("subprocess.run", mock_run)
+
+    ok, msg = install_app_dependencies(str(pkg_dir), venv_mode="singular")
+    assert ok is True
+    assert any("-e" in c and str(pkg_dir) in c for c in called_cmds)

{appmanager_server-0.3.0 → appmanager_server-0.4.0}/tests/test_packaging_and_cli.py

@@ -12,7 +12,7 @@ from appmanager.cli import main
 
 
 def test_package_exports():
-    assert __version__ == "0.3.0"
+    assert __version__ == "0.4.0"
     assert callable(create_app)
     assert callable(create_dispatchable_app)
     assert DynamicAppDispatcherMiddleware is not None
@@ -25,7 +25,7 @@ def test_cli_version(capsys):
         main(["--version"])
     assert exc.value.code == 0
     captured = capsys.readouterr()
-    assert "0.3.0" in captured.out or "0.3.0" in captured.err
+    assert __version__ in captured.out or __version__ in captured.err
 
 
 def test_cli_help(capsys):

appmanager_server-0.3.0/.env.example

@@ -1,51 +0,0 @@
-# ==============================================================================
-# AppManager Configuration
-# Copy this file to .env and adjust the values as needed.
-# ==============================================================================
-
-# Core Application Security
-# IMPORTANT: Generate strong random secrets for production!
-SECRET_KEY=appmanager-change-this-to-a-secure-random-string-in-production-min-32-chars
-JWT_SECRET=jwt-change-this-to-a-secure-random-string-in-production-min-32-chars
-JWT_ACCESS_TOKEN_EXPIRES_DAYS=7
-MAGIC_LINK_EXPIRES_MINUTES=15
-
-# Server & Host URL
-APP_BASE_URL=http://localhost:5000
-PORT=5000
-HOST=0.0.0.0
-TEMPLATES_AUTO_RELOAD=true
-SESSION_COOKIE_SAMESITE=Lax
-SESSION_COOKIE_SECURE=false
-
-# Database Configuration (SQLite default, PostgreSQL/MySQL supported)
-# Examples:
-#   SQLite: sqlite:///instance/appmanager.db
-#   PostgreSQL: postgresql://user:password@localhost:5432/appmanager
-#   MySQL: mysql+pymysql://user:password@localhost:3306/appmanager
-DATABASE_URL=sqlite:///instance/appmanager.db
-
-# Storage Directories
-# INSTALLED_APPS_DIR=./installed_apps
-# TEMP_UPLOAD_DIR=./instance/uploads
-
-# Google OAuth 2.0 (Optional - for Google Login)
-GOOGLE_CLIENT_ID=
-GOOGLE_CLIENT_SECRET=
-GOOGLE_DISCOVERY_URL=https://accounts.google.com/.well-known/openid-configuration
-
-# SMTP Email Configuration (Required for Magic Link email delivery in production)
-SMTP_SERVER=
-SMTP_PORT=587
-SMTP_USER=
-SMTP_PASSWORD=
-MAIL_DEFAULT_SENDER=noreply@appmanager.local
-
-# Developer Magic Login (Set to true to show one-click login button when SMTP is disabled)
-ALLOW_DEV_MAGIC_LOGIN=false
-
-# Role & Admin Provisioning
-# FIRST_USER_IS_ADMIN: If true, the very first user who registers will be granted the admin role
-FIRST_USER_IS_ADMIN=true
-# ADMIN_EMAILS: Comma-separated list of emails that automatically receive admin role upon registration
-ADMIN_EMAILS=

appmanager_server-0.3.0/MANIFEST.in

@@ -1,11 +0,0 @@
-include LICENSE
-include README.md
-include CHANGELOG.md
-include SECURITY.md
-include requirements.txt
-include .env.example
-include appmanager/py.typed
-recursive-include appmanager/templates *
-recursive-include appmanager/static *
-recursive-exclude * __pycache__
-recursive-exclude * *.py[co]