arthexis 0.1.11__tar.gz → 0.1.13__tar.gz

{arthexis-0.1.11 → arthexis-0.1.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: arthexis
-Version: 0.1.11
+Version: 0.1.13
 Summary: Django-based MESH system
 Author-email: "Rafael J. Guillén-Osorio" <tecnologia@gelectriic.com>
 License-Expression: GPL-3.0-only
@@ -115,7 +115,7 @@ Dynamic: license-file
 
 # Arthexis Constellation
 
-[![Coverage](https://raw.githubusercontent.com/arthexis/arthexis/main/coverage.svg)](https://github.com/arthexis/arthexis/actions/workflows/coverage.yml) [![OCPP 1.6 Coverage](https://raw.githubusercontent.com/arthexis/arthexis/main/ocpp_coverage.svg)](https://raw.githubusercontent.com/arthexis/arthexis/main/ocpp_coverage.svg)
+[![Coverage](https://raw.githubusercontent.com/arthexis/arthexis/main/coverage.svg)](https://github.com/arthexis/arthexis/actions/workflows/coverage.yml) [![OCPP 1.6 Coverage](https://raw.githubusercontent.com/arthexis/arthexis/main/ocpp_coverage.svg)](https://github.com/arthexis/arthexis/blob/main/docs/development/ocpp-user-manual.md)
 
 ## Purpose
 

{arthexis-0.1.11 → arthexis-0.1.13}/README.md

@@ -1,6 +1,6 @@
 # Arthexis Constellation
 
-[![Coverage](https://raw.githubusercontent.com/arthexis/arthexis/main/coverage.svg)](https://github.com/arthexis/arthexis/actions/workflows/coverage.yml) [![OCPP 1.6 Coverage](https://raw.githubusercontent.com/arthexis/arthexis/main/ocpp_coverage.svg)](https://raw.githubusercontent.com/arthexis/arthexis/main/ocpp_coverage.svg)
+[![Coverage](https://raw.githubusercontent.com/arthexis/arthexis/main/coverage.svg)](https://github.com/arthexis/arthexis/actions/workflows/coverage.yml) [![OCPP 1.6 Coverage](https://raw.githubusercontent.com/arthexis/arthexis/main/ocpp_coverage.svg)](https://github.com/arthexis/arthexis/blob/main/docs/development/ocpp-user-manual.md)
 
 ## Purpose
 

{arthexis-0.1.11 → arthexis-0.1.13}/arthexis.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: arthexis
-Version: 0.1.11
+Version: 0.1.13
 Summary: Django-based MESH system
 Author-email: "Rafael J. Guillén-Osorio" <tecnologia@gelectriic.com>
 License-Expression: GPL-3.0-only
@@ -115,7 +115,7 @@ Dynamic: license-file
 
 # Arthexis Constellation
 
-[![Coverage](https://raw.githubusercontent.com/arthexis/arthexis/main/coverage.svg)](https://github.com/arthexis/arthexis/actions/workflows/coverage.yml) [![OCPP 1.6 Coverage](https://raw.githubusercontent.com/arthexis/arthexis/main/ocpp_coverage.svg)](https://raw.githubusercontent.com/arthexis/arthexis/main/ocpp_coverage.svg)
+[![Coverage](https://raw.githubusercontent.com/arthexis/arthexis/main/coverage.svg)](https://github.com/arthexis/arthexis/actions/workflows/coverage.yml) [![OCPP 1.6 Coverage](https://raw.githubusercontent.com/arthexis/arthexis/main/ocpp_coverage.svg)](https://github.com/arthexis/arthexis/blob/main/docs/development/ocpp-user-manual.md)
 
 ## Purpose
 

{arthexis-0.1.11 → arthexis-0.1.13}/arthexis.egg-info/SOURCES.txt

@@ -18,6 +18,7 @@ config/logging.py
 config/middleware.py
 config/offline.py
 config/settings.py
+config/settings_helpers.py
 config/urls.py
 config/wsgi.py
 core/__init__.py
@@ -30,6 +31,7 @@ core/backends.py
 core/entity.py
 core/environment.py
 core/fields.py
+core/form_fields.py
 core/github_helper.py
 core/github_issues.py
 core/lcd_screen.py
@@ -63,8 +65,10 @@ nodes/admin.py
 nodes/apps.py
 nodes/backends.py
 nodes/dns.py
+nodes/feature_checks.py
 nodes/lcd.py
 nodes/models.py
+nodes/reports.py
 nodes/tasks.py
 nodes/tests.py
 nodes/urls.py
@@ -75,10 +79,12 @@ ocpp/admin.py
 ocpp/apps.py
 ocpp/consumers.py
 ocpp/evcs.py
+ocpp/evcs_discovery.py
 ocpp/models.py
 ocpp/reference_utils.py
 ocpp/routing.py
 ocpp/simulator.py
+ocpp/status_display.py
 ocpp/store.py
 ocpp/tasks.py
 ocpp/test_export_import.py
@@ -111,6 +117,7 @@ tests/test_admin_object_history.py
 tests/test_admin_profile_link.py
 tests/test_admin_system_stop.py
 tests/test_allowed_hosts_hostname.py
+tests/test_api_login_required.py
 tests/test_assistant_data_api.py
 tests/test_assistant_profile_admin.py
 tests/test_assistant_profile_api.py
@@ -118,6 +125,7 @@ tests/test_auto_upgrade_scheduler.py
 tests/test_awg_admin.py
 tests/test_benchmark_command.py
 tests/test_birthday_greetings.py
+tests/test_build_pypi_command.py
 tests/test_celery_no_debug.py
 tests/test_check_migrations_script.py
 tests/test_client_report_generation.py
@@ -142,15 +150,19 @@ tests/test_footer_render.py
 tests/test_git_checks.py
 tests/test_github_issue_reporting.py
 tests/test_install_script.py
+tests/test_invitation_login_view.py
 tests/test_language_switch.py
 tests/test_lcd_check_command.py
 tests/test_lcd_smbus2.py
 tests/test_localhost_admin_backend.py
 tests/test_login_view_no_site.py
 tests/test_manage_debug.py
+tests/test_manage_debug_flag.py
 tests/test_manuals.py
+tests/test_mcp_asgi.py
 tests/test_mcp_process.py
 tests/test_mcp_sigil_server.py
+tests/test_mcp_sigil_server_command.py
 tests/test_message_command.py
 tests/test_migrations.py
 tests/test_model_verbose_name_capitalization.py
@@ -172,28 +184,34 @@ tests/test_readme_language.py
 tests/test_reference_qr_code.py
 tests/test_reference_transaction_uuid.py
 tests/test_register_site_apps_command.py
+tests/test_release_build_flow.py
 tests/test_release_checklist.py
 tests/test_release_logs.py
 tests/test_release_manager_admin.py
+tests/test_release_packages.py
 tests/test_release_progress.py
 tests/test_release_tasks.py
 tests/test_request_invite.py
 tests/test_rfid_admin_reference_clear.py
 tests/test_rfid_admin_scan_csrf.py
+tests/test_rfid_backend.py
 tests/test_rfid_background_reader.py
 tests/test_rfid_client_report.py
 tests/test_role_marker_filtering.py
-tests/test_scan_evcs_consoles_command.py
 tests/test_seed_data.py
 tests/test_send_invite_command.py
+tests/test_settings_helpers.py
 tests/test_shell_scripts.py
 tests/test_show_leads_command.py
 tests/test_sigil_builder.py
 tests/test_sigil_resolution.py
 tests/test_sites_utils.py
 tests/test_staff_login_net_message.py
+tests/test_staff_required_decorator.py
 tests/test_switch_role_script.py
 tests/test_temp_passwords.py
+tests/test_totp_admin.py
+tests/test_totp_backend.py
 tests/test_uninstall_script.py
 tests/test_update_fixtures_command.py
 tests/test_urls_autodiscover.py

{arthexis-0.1.11 → arthexis-0.1.13}/config/asgi.py

@@ -9,21 +9,35 @@ https://docs.djangoproject.com/en/5.2/howto/deployment/asgi/
 
 import os
 from config.loadenv import loadenv
+from typing import Any, Awaitable, Callable, Dict, MutableMapping
 from channels.auth import AuthMiddlewareStack
 from channels.routing import ProtocolTypeRouter, URLRouter
 from django.core.asgi import get_asgi_application
 import ocpp.routing
 
+from core.mcp.asgi import application as mcp_application
+from core.mcp.asgi import is_mcp_scope
+
 loadenv()
 os.environ.setdefault("DJANGO_SETTINGS_MODULE", "config.settings")
 
 django_asgi_app = get_asgi_application()
 
+Scope = MutableMapping[str, Any]
+Receive = Callable[[], Awaitable[Dict[str, Any]]]
+Send = Callable[[Dict[str, Any]], Awaitable[None]]
+
 websocket_patterns = ocpp.routing.websocket_urlpatterns
 
+async def http_application(scope: Scope, receive: Receive, send: Send) -> None:
+    if is_mcp_scope(scope):
+        await mcp_application(scope, receive, send)
+    else:
+        await django_asgi_app(scope, receive, send)
+
 application = ProtocolTypeRouter(
     {
-        "http": django_asgi_app,
+        "http": http_application,
         "websocket": AuthMiddlewareStack(URLRouter(websocket_patterns)),
     }
 )

{arthexis-0.1.11 → arthexis-0.1.13}/config/celery.py

@@ -9,7 +9,14 @@ os.environ.setdefault("DJANGO_SETTINGS_MODULE", "config.settings")
 
 # When running on production-oriented nodes, avoid Celery debug mode.
 NODE_ROLE = os.environ.get("NODE_ROLE", "")
-if NODE_ROLE in {"Constellation", "Satellite"}:
+PRODUCTION_ROLES = {
+    "constellation",
+    "satellite",
+    "control",
+    "terminal",
+    "gateway",
+}
+if NODE_ROLE.lower() in PRODUCTION_ROLES:
     for var in ["CELERY_TRACE_APP", "CELERY_DEBUG"]:
         os.environ.pop(var, None)
     os.environ.setdefault("CELERY_LOG_LEVEL", "INFO")

{arthexis-0.1.11 → arthexis-0.1.13}/config/settings.py

@@ -22,61 +22,24 @@ from celery.schedules import crontab
 from django.http import request as http_request
 from django.http.request import split_domain_port
 from django.middleware.csrf import CsrfViewMiddleware
-from django.core.exceptions import DisallowedHost
+from django.core.exceptions import DisallowedHost, ImproperlyConfigured
 from django.contrib.sites import shortcuts as sites_shortcuts
 from django.contrib.sites.requests import RequestSite
-from django.core.management.utils import get_random_secret_key
 from urllib.parse import urlsplit
 import django.utils.encoding as encoding
 
+from config.settings_helpers import (
+    extract_ip_from_host,
+    install_validate_host_with_subnets,
+    load_secret_key,
+    strip_ipv6_brackets,
+)
+
 if not hasattr(encoding, "force_text"):  # pragma: no cover - Django>=5 compatibility
     from django.utils.encoding import force_str
 
     encoding.force_text = force_str
-
-
-
-_original_validate_host = http_request.validate_host
-
-
-def _strip_ipv6_brackets(host: str) -> str:
-    if host.startswith("[") and host.endswith("]"):
-        return host[1:-1]
-    return host
-
-
-def _extract_ip_from_host(host: str):
-    """Return an :mod:`ipaddress` object for ``host`` when possible."""
-
-    candidate = _strip_ipv6_brackets(host)
-    try:
-        return ipaddress.ip_address(candidate)
-    except ValueError:
-        domain, _port = split_domain_port(host)
-        if domain and domain != host:
-            candidate = _strip_ipv6_brackets(domain)
-            try:
-                return ipaddress.ip_address(candidate)
-            except ValueError:
-                return None
-    return None
-
-
-def _validate_host_with_subnets(host, allowed_hosts):
-    ip = _extract_ip_from_host(host)
-    if ip is None:
-        return _original_validate_host(host, allowed_hosts)
-    for pattern in allowed_hosts:
-        try:
-            network = ipaddress.ip_network(pattern)
-        except ValueError:
-            continue
-        if ip in network:
-            return True
-    return _original_validate_host(host, allowed_hosts)
-
-
-http_request.validate_host = _validate_host_with_subnets
+install_validate_host_with_subnets()
 
 # Build paths inside the project like this: BASE_DIR / 'subdir'.
 BASE_DIR = Path(__file__).resolve().parent.parent
@@ -96,29 +59,7 @@ with contextlib.suppress(FileNotFoundError):
 # See https://docs.djangoproject.com/en/5.2/howto/deployment/checklist/
 
 # SECURITY WARNING: keep the secret key used in production secret!
-
-
-def _load_secret_key() -> str:
-    for env_var in ("DJANGO_SECRET_KEY", "SECRET_KEY"):
-        value = os.environ.get(env_var)
-        if value:
-            return value
-
-    secret_file = BASE_DIR / "locks" / "django-secret.key"
-    with contextlib.suppress(OSError):
-        stored_key = secret_file.read_text(encoding="utf-8").strip()
-        if stored_key:
-            return stored_key
-
-    generated_key = get_random_secret_key()
-    with contextlib.suppress(OSError):
-        secret_file.parent.mkdir(parents=True, exist_ok=True)
-        secret_file.write_text(generated_key, encoding="utf-8")
-
-    return generated_key
-
-
-SECRET_KEY = _load_secret_key()
+SECRET_KEY = load_secret_key(BASE_DIR)
 
 # SECURITY WARNING: don't run with debug turned on in production!
 
@@ -258,7 +199,7 @@ def _normalize_origin_tuple(scheme: str | None, host: str) -> tuple[str, str, st
     if not scheme or scheme.lower() not in {"http", "https"}:
         return None
     domain, port = split_domain_port(host)
-    normalized_host = _strip_ipv6_brackets(domain.strip().lower())
+    normalized_host = strip_ipv6_brackets(domain.strip().lower())
     if not normalized_host:
         return None
     normalized_port = port.strip() if isinstance(port, str) else port
@@ -325,13 +266,13 @@ def _origin_verified_with_subnets(self, request):
     if normalized_origin is None:
         return _original_origin_verified(self, request)
 
-    origin_ip = _extract_ip_from_host(normalized_origin[1])
+    origin_ip = extract_ip_from_host(normalized_origin[1])
 
     for candidate in _candidate_origin_tuples(request, allowed_hosts):
         if candidate == normalized_origin:
             return True
 
-        candidate_ip = _extract_ip_from_host(candidate[1])
+        candidate_ip = extract_ip_from_host(candidate[1])
         if origin_ip and candidate_ip:
             for pattern in allowed_hosts:
                 try:
@@ -367,13 +308,13 @@ def _check_referer_with_forwarded(self, request):
         return _original_check_referer(self, request)
 
     allowed_hosts = _get_allowed_hosts()
-    referer_ip = _extract_ip_from_host(normalized_referer[1])
+    referer_ip = extract_ip_from_host(normalized_referer[1])
 
     for candidate in _candidate_origin_tuples(request, allowed_hosts):
         if candidate == normalized_referer:
             return
 
-        candidate_ip = _extract_ip_from_host(candidate[1])
+        candidate_ip = extract_ip_from_host(candidate[1])
         if referer_ip and candidate_ip:
             for pattern in allowed_hosts:
                 try:
@@ -524,6 +465,7 @@ MCP_SIGIL_SERVER = {
     "required_scopes": ["sigils:read"],
     "issuer_url": os.environ.get("MCP_SIGIL_ISSUER_URL"),
     "resource_server_url": os.environ.get("MCP_SIGIL_RESOURCE_URL"),
+    "mount_path": os.environ.get("MCP_SIGIL_MOUNT_PATH"),
 }
 
 
@@ -544,8 +486,16 @@ OTP_TOTP_ISSUER = os.environ.get("OTP_TOTP_ISSUER", "Arthexis")
 # Database
 # https://docs.djangoproject.com/en/5.2/ref/settings/#databases
 
+FORCED_DB_BACKEND = os.environ.get("ARTHEXIS_FORCE_DB_BACKEND", "").strip().lower()
+if FORCED_DB_BACKEND and FORCED_DB_BACKEND not in {"sqlite", "postgres"}:
+    raise ImproperlyConfigured(
+        "ARTHEXIS_FORCE_DB_BACKEND must be 'sqlite' or 'postgres' when defined."
+    )
+
 
 def _postgres_available() -> bool:
+    if FORCED_DB_BACKEND == "sqlite":
+        return False
     try:
         import psycopg
     except Exception:
@@ -566,7 +516,15 @@ def _postgres_available() -> bool:
         return False
 
 
-if _postgres_available():
+if FORCED_DB_BACKEND == "postgres":
+    _use_postgres = True
+elif FORCED_DB_BACKEND == "sqlite":
+    _use_postgres = False
+else:
+    _use_postgres = _postgres_available()
+
+
+if _use_postgres:
     DATABASES = {
         "default": {
             "ENGINE": "django.db.backends.postgresql",
@@ -582,10 +540,16 @@ if _postgres_available():
         }
     }
 else:
+    _sqlite_override = os.environ.get("ARTHEXIS_SQLITE_PATH")
+    if _sqlite_override:
+        SQLITE_DB_PATH = Path(_sqlite_override)
+    else:
+        SQLITE_DB_PATH = BASE_DIR / "db.sqlite3"
+
     DATABASES = {
         "default": {
             "ENGINE": "django.db.backends.sqlite3",
-            "NAME": BASE_DIR / "db.sqlite3",
+            "NAME": SQLITE_DB_PATH,
             "OPTIONS": {"timeout": 60},
             "TEST": {"NAME": BASE_DIR / "test_db.sqlite3"},
         }
@@ -625,6 +589,8 @@ LANGUAGES = [
 
 LOCALE_PATHS = [BASE_DIR / "locale"]
 
+FORMAT_MODULE_PATH = ["config.formats"]
+
 TIME_ZONE = "America/Monterrey"
 
 USE_I18N = True
@@ -685,10 +651,15 @@ LOGGING = {
             "backupCount": 7,
             "encoding": "utf-8",
             "formatter": "standard",
-        }
+        },
+        "console": {
+            "class": "logging.StreamHandler",
+            "level": "ERROR",
+            "formatter": "standard",
+        },
     },
     "root": {
-        "handlers": ["file"],
+        "handlers": ["file", "console"],
         "level": "DEBUG",
     },
 }

arthexis-0.1.13/config/settings_helpers.py

@@ -0,0 +1,109 @@
+"""Utility helpers shared by :mod:`config.settings` and related tests."""
+
+from __future__ import annotations
+
+import contextlib
+import ipaddress
+import os
+from pathlib import Path
+from typing import Mapping, MutableMapping
+
+from django.core.management.utils import get_random_secret_key
+from django.http import request as http_request
+from django.http.request import split_domain_port
+
+
+__all__ = [
+    "extract_ip_from_host",
+    "install_validate_host_with_subnets",
+    "load_secret_key",
+    "strip_ipv6_brackets",
+    "validate_host_with_subnets",
+]
+
+
+def strip_ipv6_brackets(host: str) -> str:
+    """Return ``host`` without IPv6 URL literal brackets."""
+
+    if host.startswith("[") and host.endswith("]"):
+        return host[1:-1]
+    return host
+
+
+def extract_ip_from_host(host: str):
+    """Return an :mod:`ipaddress` object for ``host`` when possible."""
+
+    candidate = strip_ipv6_brackets(host)
+    try:
+        return ipaddress.ip_address(candidate)
+    except ValueError:
+        domain, _port = split_domain_port(host)
+        if domain and domain != host:
+            candidate = strip_ipv6_brackets(domain)
+            try:
+                return ipaddress.ip_address(candidate)
+            except ValueError:
+                return None
+    return None
+
+
+def validate_host_with_subnets(host, allowed_hosts, original_validate=None):
+    """Extend Django's host validation to honor subnet CIDR notation."""
+
+    if original_validate is None:
+        original_validate = http_request.validate_host
+
+    ip = extract_ip_from_host(host)
+    if ip is None:
+        return original_validate(host, allowed_hosts)
+
+    for pattern in allowed_hosts:
+        try:
+            network = ipaddress.ip_network(pattern)
+        except ValueError:
+            continue
+        if ip in network:
+            return True
+    return original_validate(host, allowed_hosts)
+
+
+def install_validate_host_with_subnets() -> None:
+    """Monkeypatch Django's host validator to recognize subnet patterns."""
+
+    original_validate = http_request.validate_host
+
+    def _patched(host, allowed_hosts):
+        return validate_host_with_subnets(host, allowed_hosts, original_validate)
+
+    http_request.validate_host = _patched
+
+
+def load_secret_key(
+    base_dir: Path,
+    env: Mapping[str, str] | MutableMapping[str, str] | None = None,
+    secret_file: Path | None = None,
+) -> str:
+    """Load the Django secret key from the environment or a persisted file."""
+
+    if env is None:
+        env = os.environ
+
+    for env_var in ("DJANGO_SECRET_KEY", "SECRET_KEY"):
+        value = env.get(env_var)
+        if value:
+            return value
+
+    if secret_file is None:
+        secret_file = base_dir / "locks" / "django-secret.key"
+
+    with contextlib.suppress(OSError):
+        stored_key = secret_file.read_text(encoding="utf-8").strip()
+        if stored_key:
+            return stored_key
+
+    generated_key = get_random_secret_key()
+    with contextlib.suppress(OSError):
+        secret_file.parent.mkdir(parents=True, exist_ok=True)
+        secret_file.write_text(generated_key, encoding="utf-8")
+
+    return generated_key