arthexis 0.1.19__tar.gz → 0.1.20__tar.gz

{arthexis-0.1.19 → arthexis-0.1.20}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: arthexis
-Version: 0.1.19
+Version: 0.1.20
 Summary: Power & Energy Infrastructure
 Author-email: "Rafael J. Guillén-Osorio" <tecnologia@gelectriic.com>
 License-Expression: GPL-3.0-only
@@ -171,7 +171,7 @@ Arthexis Constellation ships in four node roles tailored to different deployment
       <td valign="top"><strong>Multi-Device Edge, Network &amp; Data Acquisition</strong><br />Features: AP Router, Celery Queue, NGINX Server, RFID Scanner</td>
     </tr>
     <tr>
-      <td valign="top"><strong>Constellation</strong></td>
+      <td valign="top"><strong>Watchtower</strong></td>
       <td valign="top"><strong>Multi-User Cloud &amp; Orchestration</strong><br />Features: Celery Queue, NGINX Server</td>
     </tr>
   </tbody>
@@ -184,7 +184,7 @@ Arthexis Constellation ships in four node roles tailored to different deployment
 - **[Windows](https://en.wikipedia.org/wiki/Microsoft_Windows)**: open [PowerShell](https://learn.microsoft.com/powershell/) or [Git Bash](https://gitforwindows.org/) and run the same command.
 
 ### 2. Start and stop
-Terminal nodes can start directly with the scripts below without installing; Control, Satellite, and Constellation roles require installation first. Both approaches listen on [`http://localhost:8000/`](http://localhost:8000/) by default.
+Terminal nodes can start directly with the scripts below without installing; Control, Satellite, and Watchtower roles require installation first. Both approaches listen on [`http://localhost:8000/`](http://localhost:8000/) by default.
 
 - **[VS Code](https://code.visualstudio.com/)**
    - Open the folder and go to the **Run and Debug** panel (`Ctrl+Shift+D`).

{arthexis-0.1.19 → arthexis-0.1.20}/README.md

@@ -55,7 +55,7 @@ Arthexis Constellation ships in four node roles tailored to different deployment
       <td valign="top"><strong>Multi-Device Edge, Network &amp; Data Acquisition</strong><br />Features: AP Router, Celery Queue, NGINX Server, RFID Scanner</td>
     </tr>
     <tr>
-      <td valign="top"><strong>Constellation</strong></td>
+      <td valign="top"><strong>Watchtower</strong></td>
       <td valign="top"><strong>Multi-User Cloud &amp; Orchestration</strong><br />Features: Celery Queue, NGINX Server</td>
     </tr>
   </tbody>
@@ -68,7 +68,7 @@ Arthexis Constellation ships in four node roles tailored to different deployment
 - **[Windows](https://en.wikipedia.org/wiki/Microsoft_Windows)**: open [PowerShell](https://learn.microsoft.com/powershell/) or [Git Bash](https://gitforwindows.org/) and run the same command.
 
 ### 2. Start and stop
-Terminal nodes can start directly with the scripts below without installing; Control, Satellite, and Constellation roles require installation first. Both approaches listen on [`http://localhost:8000/`](http://localhost:8000/) by default.
+Terminal nodes can start directly with the scripts below without installing; Control, Satellite, and Watchtower roles require installation first. Both approaches listen on [`http://localhost:8000/`](http://localhost:8000/) by default.
 
 - **[VS Code](https://code.visualstudio.com/)**
    - Open the folder and go to the **Run and Debug** panel (`Ctrl+Shift+D`).

{arthexis-0.1.19 → arthexis-0.1.20}/arthexis.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: arthexis
-Version: 0.1.19
+Version: 0.1.20
 Summary: Power & Energy Infrastructure
 Author-email: "Rafael J. Guillén-Osorio" <tecnologia@gelectriic.com>
 License-Expression: GPL-3.0-only
@@ -171,7 +171,7 @@ Arthexis Constellation ships in four node roles tailored to different deployment
       <td valign="top"><strong>Multi-Device Edge, Network &amp; Data Acquisition</strong><br />Features: AP Router, Celery Queue, NGINX Server, RFID Scanner</td>
     </tr>
     <tr>
-      <td valign="top"><strong>Constellation</strong></td>
+      <td valign="top"><strong>Watchtower</strong></td>
       <td valign="top"><strong>Multi-User Cloud &amp; Orchestration</strong><br />Features: Celery Queue, NGINX Server</td>
     </tr>
   </tbody>
@@ -184,7 +184,7 @@ Arthexis Constellation ships in four node roles tailored to different deployment
 - **[Windows](https://en.wikipedia.org/wiki/Microsoft_Windows)**: open [PowerShell](https://learn.microsoft.com/powershell/) or [Git Bash](https://gitforwindows.org/) and run the same command.
 
 ### 2. Start and stop
-Terminal nodes can start directly with the scripts below without installing; Control, Satellite, and Constellation roles require installation first. Both approaches listen on [`http://localhost:8000/`](http://localhost:8000/) by default.
+Terminal nodes can start directly with the scripts below without installing; Control, Satellite, and Watchtower roles require installation first. Both approaches listen on [`http://localhost:8000/`](http://localhost:8000/) by default.
 
 - **[VS Code](https://code.visualstudio.com/)**
    - Open the folder and go to the **Run and Debug** panel (`Ctrl+Shift+D`).

{arthexis-0.1.19 → arthexis-0.1.20}/arthexis.egg-info/SOURCES.txt

@@ -194,6 +194,7 @@ tests/test_power_admin_group.py
 tests/test_profile_inline_deletion.py
 tests/test_pypi_check.py
 tests/test_pypi_token.py
+tests/test_readme_editor.py
 tests/test_readme_language.py
 tests/test_reference_qr_code.py
 tests/test_reference_transaction_uuid.py
@@ -230,6 +231,7 @@ tests/test_sites_utils.py
 tests/test_social_profile.py
 tests/test_staff_login_net_message.py
 tests/test_staff_required_decorator.py
+tests/test_suite_gateway.py
 tests/test_switch_role_script.py
 tests/test_system_changelog_report.py
 tests/test_temp_passwords.py

{arthexis-0.1.19 → arthexis-0.1.20}/core/admin.py

@@ -1,3 +1,4 @@
+from collections import defaultdict
 from io import BytesIO
 import os
 
@@ -2909,7 +2910,7 @@ class CopyRFIDForm(forms.Form):
         normalized = (cleaned or "").strip().upper()
         if not normalized:
             raise forms.ValidationError(_("RFID value is required."))
-        if RFID.objects.filter(rfid=normalized).exists():
+        if RFID.matching_queryset(normalized).exists():
             raise forms.ValidationError(
                 _("An RFID with this value already exists.")
             )
@@ -2943,6 +2944,7 @@ class RFIDAdmin(EntityModelAdmin, ImportExportModelAdmin):
         "print_card_labels",
         "print_release_form",
         "copy_rfids",
+        "merge_rfids",
         "toggle_selected_user_data",
         "toggle_selected_released",
         "toggle_selected_allowed",
@@ -3177,6 +3179,145 @@ class RFIDAdmin(EntityModelAdmin, ImportExportModelAdmin):
         context["media"] = self.media + form.media
         return TemplateResponse(request, "admin/core/rfid/copy.html", context)
 
+    @admin.action(description=_("Merge RFID cards"))
+    def merge_rfids(self, request, queryset):
+        tags = list(queryset.prefetch_related("energy_accounts"))
+        if len(tags) < 2:
+            self.message_user(
+                request,
+                _("Select at least two RFIDs to merge."),
+                level=messages.WARNING,
+            )
+            return None
+
+        normalized_map: dict[int, str] = {}
+        groups: defaultdict[str, list[RFID]] = defaultdict(list)
+        unmatched = 0
+        for tag in tags:
+            normalized = RFID.normalize_code(tag.rfid)
+            normalized_map[tag.pk] = normalized
+            if not normalized:
+                unmatched += 1
+                continue
+            prefix = normalized[: RFID.MATCH_PREFIX_LENGTH]
+            groups[prefix].append(tag)
+
+        merge_groups: list[list[RFID]] = []
+        skipped = unmatched
+        for prefix, group in groups.items():
+            if len(group) < 2:
+                skipped += len(group)
+                continue
+            group.sort(
+                key=lambda item: (
+                    len(normalized_map.get(item.pk, "")),
+                    normalized_map.get(item.pk, ""),
+                    item.pk,
+                )
+            )
+            merge_groups.append(group)
+
+        if not merge_groups:
+            self.message_user(
+                request,
+                _("No matching RFIDs were found to merge."),
+                level=messages.WARNING,
+            )
+            return None
+
+        merged_tags = 0
+        merged_groups = 0
+        conflicting_accounts = 0
+        with transaction.atomic():
+            for group in merge_groups:
+                canonical = group[0]
+                update_fields: set[str] = set()
+                existing_account_ids = set(
+                    canonical.energy_accounts.values_list("pk", flat=True)
+                )
+                for tag in group[1:]:
+                    other_value = normalized_map.get(tag.pk, "")
+                    if canonical.adopt_rfid(other_value):
+                        update_fields.add("rfid")
+                        normalized_map[canonical.pk] = RFID.normalize_code(
+                            canonical.rfid
+                        )
+                    accounts = list(tag.energy_accounts.all())
+                    if accounts:
+                        transferable: list[EnergyAccount] = []
+                        for account in accounts:
+                            if existing_account_ids and account.pk not in existing_account_ids:
+                                conflicting_accounts += 1
+                                continue
+                            transferable.append(account)
+                        if transferable:
+                            canonical.energy_accounts.add(*transferable)
+                            existing_account_ids.update(
+                                account.pk for account in transferable
+                            )
+                    if tag.allowed and not canonical.allowed:
+                        canonical.allowed = True
+                        update_fields.add("allowed")
+                    if tag.released and not canonical.released:
+                        canonical.released = True
+                        update_fields.add("released")
+                    if tag.key_a_verified and not canonical.key_a_verified:
+                        canonical.key_a_verified = True
+                        update_fields.add("key_a_verified")
+                    if tag.key_b_verified and not canonical.key_b_verified:
+                        canonical.key_b_verified = True
+                        update_fields.add("key_b_verified")
+                    if tag.last_seen_on and (
+                        not canonical.last_seen_on
+                        or tag.last_seen_on > canonical.last_seen_on
+                    ):
+                        canonical.last_seen_on = tag.last_seen_on
+                        update_fields.add("last_seen_on")
+                    if not canonical.origin_node and tag.origin_node_id:
+                        canonical.origin_node = tag.origin_node
+                        update_fields.add("origin_node")
+                    merged_tags += 1
+                    tag.delete()
+                if update_fields:
+                    canonical.save(update_fields=sorted(update_fields))
+                merged_groups += 1
+
+        if merged_tags:
+            self.message_user(
+                request,
+                ngettext(
+                    "Merged %(removed)d RFID into %(groups)d canonical record.",
+                    "Merged %(removed)d RFIDs into %(groups)d canonical records.",
+                    merged_tags,
+                )
+                % {"removed": merged_tags, "groups": merged_groups},
+                level=messages.SUCCESS,
+            )
+
+        if skipped:
+            self.message_user(
+                request,
+                ngettext(
+                    "Skipped %(count)d RFID because it did not share the first %(length)d characters with another selection.",
+                    "Skipped %(count)d RFIDs because they did not share the first %(length)d characters with another selection.",
+                    skipped,
+                )
+                % {"count": skipped, "length": RFID.MATCH_PREFIX_LENGTH},
+                level=messages.WARNING,
+            )
+
+        if conflicting_accounts:
+            self.message_user(
+                request,
+                ngettext(
+                    "Skipped %(count)d energy account because the RFID was already linked to a different account.",
+                    "Skipped %(count)d energy accounts because the RFID was already linked to a different account.",
+                    conflicting_accounts,
+                )
+                % {"count": conflicting_accounts},
+                level=messages.WARNING,
+            )
+
     def _render_card_labels(
         self,
         request,

{arthexis-0.1.19 → arthexis-0.1.20}/core/backends.py

@@ -81,10 +81,16 @@ class RFIDBackend:
         if not rfid_value:
             return None
 
-        tag = RFID.objects.filter(rfid=rfid_value).first()
-        if not tag or not tag.allowed:
+        tag = RFID.matching_queryset(rfid_value).filter(allowed=True).first()
+        if not tag:
             return None
 
+        update_fields: list[str] = []
+        if tag.adopt_rfid(rfid_value):
+            update_fields.append("rfid")
+        if update_fields:
+            tag.save(update_fields=update_fields)
+
         command = (tag.external_command or "").strip()
         if command:
             env = os.environ.copy()

arthexis-0.1.20/core/environment.py

@@ -0,0 +1,278 @@
+from __future__ import annotations
+
+import os
+import re
+import shlex
+import subprocess
+from pathlib import Path
+
+from django import forms
+from django.conf import settings
+from django.contrib import admin
+from django.core.exceptions import PermissionDenied
+from django.template.response import TemplateResponse
+from django.urls import path, reverse
+from django.utils.translation import gettext_lazy as _
+
+
+def _get_django_settings():
+    return sorted(
+        [(name, getattr(settings, name)) for name in dir(settings) if name.isupper()]
+    )
+
+
+class NetworkSetupForm(forms.Form):
+    prompt_for_password = forms.BooleanField(
+        label=_("Prompt for new WiFi password"),
+        required=False,
+        help_text=_("Add --password to request a password even when one is already configured."),
+    )
+    access_point_name = forms.CharField(
+        label=_("Access point name"),
+        required=False,
+        max_length=32,
+        help_text=_("Use --ap to set the wlan0 access point name."),
+    )
+    skip_firewall_validation = forms.BooleanField(
+        label=_("Skip firewall validation"),
+        required=False,
+        help_text=_("Add --no-firewall to bypass firewall port checks."),
+    )
+    skip_access_point_configuration = forms.BooleanField(
+        label=_("Skip access point configuration"),
+        required=False,
+        help_text=_("Add --no-ap to leave the access point configuration unchanged."),
+    )
+    allow_unsafe_changes = forms.BooleanField(
+        label=_("Allow modifying the active internet connection"),
+        required=False,
+        help_text=_("Include --unsafe to allow changes that may interrupt connectivity."),
+    )
+    interactive = forms.BooleanField(
+        label=_("Prompt before each step"),
+        required=False,
+        help_text=_("Run the script with --interactive to confirm each action."),
+    )
+    install_watchdog = forms.BooleanField(
+        label=_("Install WiFi watchdog service"),
+        required=False,
+        initial=True,
+        help_text=_("Keep selected to retain the watchdog or clear to add --no-watchdog."),
+    )
+    vnc_validation = forms.ChoiceField(
+        label=_("VNC validation"),
+        choices=(
+            ("default", _("Use script default (skip validation)")),
+            ("require", _("Require that a VNC service is enabled (--vnc)")),
+        ),
+        initial="default",
+        required=True,
+    )
+    ethernet_subnet = forms.CharField(
+        label=_("Ethernet subnet"),
+        required=False,
+        help_text=_("Provide N or N/P (prefix 16 or 24) to supply --subnet."),
+    )
+    update_ap_password_only = forms.BooleanField(
+        label=_("Update access point password only"),
+        required=False,
+        help_text=_("Use --ap-set-password without running other setup steps."),
+    )
+
+    def clean_ethernet_subnet(self) -> str:
+        value = self.cleaned_data.get("ethernet_subnet", "")
+        if not value:
+            return ""
+        raw = value.strip()
+        match = re.fullmatch(r"(?P<subnet>\d{1,3})(?:/(?P<prefix>\d{1,2}))?", raw)
+        if not match:
+            raise forms.ValidationError(
+                _("Enter a subnet in the form N or N/P with prefix 16 or 24."),
+            )
+        subnet = int(match.group("subnet"))
+        if subnet < 0 or subnet > 254:
+            raise forms.ValidationError(
+                _("Subnet value must be between 0 and 254."),
+            )
+        prefix_value = match.group("prefix")
+        if prefix_value:
+            prefix = int(prefix_value)
+            if prefix not in {16, 24}:
+                raise forms.ValidationError(
+                    _("Subnet prefix must be 16 or 24."),
+                )
+            return f"{subnet}/{prefix}"
+        return str(subnet)
+
+    def clean(self) -> dict:
+        cleaned_data = super().clean()
+        if cleaned_data.get("update_ap_password_only"):
+            other_flags = [
+                cleaned_data.get("prompt_for_password"),
+                bool(cleaned_data.get("access_point_name")),
+                cleaned_data.get("skip_firewall_validation"),
+                cleaned_data.get("skip_access_point_configuration"),
+                cleaned_data.get("allow_unsafe_changes"),
+                cleaned_data.get("interactive"),
+                bool(cleaned_data.get("ethernet_subnet")),
+                cleaned_data.get("vnc_validation") == "require",
+                not cleaned_data.get("install_watchdog", True),
+            ]
+            if any(other_flags):
+                raise forms.ValidationError(
+                    _(
+                        "Update access point password only cannot be combined with other network-setup options."
+                    )
+                )
+        return cleaned_data
+
+    def build_command(self, script_path: Path) -> list[str]:
+        command = [str(script_path)]
+        data = self.cleaned_data
+        if data.get("update_ap_password_only"):
+            command.append("--ap-set-password")
+            return command
+        if data.get("prompt_for_password"):
+            command.append("--password")
+        access_point_name = data.get("access_point_name")
+        if access_point_name:
+            command.extend(["--ap", access_point_name])
+        if data.get("skip_firewall_validation"):
+            command.append("--no-firewall")
+        if data.get("skip_access_point_configuration"):
+            command.append("--no-ap")
+        if data.get("allow_unsafe_changes"):
+            command.append("--unsafe")
+        if data.get("interactive"):
+            command.append("--interactive")
+        if not data.get("install_watchdog"):
+            command.append("--no-watchdog")
+        if data.get("vnc_validation") == "require":
+            command.append("--vnc")
+        ethernet_subnet = data.get("ethernet_subnet")
+        if ethernet_subnet:
+            command.extend(["--subnet", ethernet_subnet])
+        return command
+
+
+def _environment_view(request):
+    env_vars = sorted(os.environ.items())
+    context = admin.site.each_context(request)
+    environment_tasks: list[dict[str, str]] = []
+    if request.user.is_superuser:
+        environment_tasks.append(
+            {
+                "name": _("Run network-setup"),
+                "description": _(
+                    "Configure network services, stage managed NGINX sites, and review script output."
+                ),
+                "url": reverse("admin:environment-network-setup"),
+            }
+        )
+    context.update(
+        {
+            "title": _("Environment"),
+            "env_vars": env_vars,
+            "environment_tasks": environment_tasks,
+        }
+    )
+    return TemplateResponse(request, "admin/environment.html", context)
+
+
+def _environment_network_setup_view(request):
+    if not request.user.is_superuser:
+        raise PermissionDenied
+
+    script_path = Path(settings.BASE_DIR) / "network-setup.sh"
+    command_result: dict[str, object] | None = None
+
+    if request.method == "POST":
+        form = NetworkSetupForm(request.POST)
+        if form.is_valid():
+            command = form.build_command(script_path)
+            if not script_path.exists():
+                form.add_error(None, _("The network-setup.sh script could not be found."))
+            else:
+                try:
+                    completed = subprocess.run(
+                        command,
+                        capture_output=True,
+                        text=True,
+                        cwd=settings.BASE_DIR,
+                        check=False,
+                    )
+                except FileNotFoundError:
+                    form.add_error(None, _("The network-setup.sh script could not be executed."))
+                except OSError as exc:
+                    form.add_error(
+                        None,
+                        _("Unable to execute network-setup.sh: %(error)s")
+                        % {"error": str(exc)},
+                    )
+                else:
+                    if hasattr(shlex, "join"):
+                        command_display = shlex.join(command)
+                    else:
+                        command_display = " ".join(shlex.quote(part) for part in command)
+                    command_result = {
+                        "command": command_display,
+                        "stdout": completed.stdout,
+                        "stderr": completed.stderr,
+                        "returncode": completed.returncode,
+                        "succeeded": completed.returncode == 0,
+                    }
+    else:
+        form = NetworkSetupForm()
+
+    context = admin.site.each_context(request)
+    context.update(
+        {
+            "title": _("Run network-setup"),
+            "form": form,
+            "command_result": command_result,
+            "task_description": _(
+                "Configure script flags, execute network-setup, and review the captured output."
+            ),
+            "back_url": reverse("admin:environment"),
+        }
+    )
+    return TemplateResponse(request, "admin/environment_network_setup.html", context)
+
+
+def _config_view(request):
+    context = admin.site.each_context(request)
+    context.update(
+        {
+            "title": _("Django Settings"),
+            "django_settings": _get_django_settings(),
+        }
+    )
+    return TemplateResponse(request, "admin/config.html", context)
+
+
+def patch_admin_environment_view() -> None:
+    """Register the Environment and Config admin views on the main admin site."""
+    original_get_urls = admin.site.get_urls
+
+    def get_urls():
+        urls = original_get_urls()
+        custom = [
+            path(
+                "environment/network-setup/",
+                admin.site.admin_view(_environment_network_setup_view),
+                name="environment-network-setup",
+            ),
+            path(
+                "environment/",
+                admin.site.admin_view(_environment_view),
+                name="environment",
+            ),
+            path(
+                "config/",
+                admin.site.admin_view(_config_view),
+                name="config",
+            ),
+        ]
+        return custom + urls
+
+    admin.site.get_urls = get_urls