arthexis 0.1.11__tar.gz → 0.1.12__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: arthexis
-Version: 0.1.11
+Version: 0.1.12
 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)](docs/development/ocpp-user-manual.md)
 
 ## Purpose
 

{arthexis-0.1.11 → arthexis-0.1.12}/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)](docs/development/ocpp-user-manual.md)
 
 ## Purpose
 

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: arthexis
-Version: 0.1.11
+Version: 0.1.12
 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)](docs/development/ocpp-user-manual.md)
 
 ## Purpose
 

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

@@ -63,8 +63,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,6 +77,7 @@ 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
@@ -148,6 +151,7 @@ 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_process.py
 tests/test_mcp_sigil_server.py
@@ -183,7 +187,6 @@ tests/test_rfid_admin_scan_csrf.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_shell_scripts.py
@@ -194,6 +197,7 @@ tests/test_sites_utils.py
 tests/test_staff_login_net_message.py
 tests/test_switch_role_script.py
 tests/test_temp_passwords.py
+tests/test_totp_admin.py
 tests/test_uninstall_script.py
 tests/test_update_fixtures_command.py
 tests/test_urls_autodiscover.py

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

@@ -685,10 +685,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.11 → arthexis-0.1.12}/core/admin.py

@@ -76,6 +76,7 @@ from .user_data import (
 )
 from .widgets import OdooProductWidget
 from .mcp import process as mcp_process
+from .mcp.server import resolve_base_urls
 
 
 admin.site.unregister(Group)
@@ -371,6 +372,29 @@ class ReleaseManagerAdminForm(forms.ModelForm):
             "github_token": forms.Textarea(attrs={"rows": 3, "style": "width: 40em;"}),
         }
 
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.fields["pypi_token"].help_text = format_html(
+            "{} <a href=\"{}\" target=\"_blank\" rel=\"noopener noreferrer\">{}</a>{}",
+            "Generate an API token from your PyPI account settings.",
+            "https://pypi.org/manage/account/token/",
+            "pypi.org/manage/account/token/",
+            (
+                " by clicking “Add API token”, optionally scoping it to the package, "
+                "and paste the full `pypi-***` value here."
+            ),
+        )
+        self.fields["github_token"].help_text = format_html(
+            "{} <a href=\"{}\" target=\"_blank\" rel=\"noopener noreferrer\">{}</a>{}",
+            "Create a personal access token at GitHub → Settings → Developer settings →",
+            "https://github.com/settings/tokens",
+            "github.com/settings/tokens",
+            (
+                " with the repository access needed for releases (repo scope for classic tokens "
+                "or an equivalent fine-grained token) and paste it here."
+            ),
+        )
+
 
 @admin.register(ReleaseManager)
 class ReleaseManagerAdmin(ProfileAdminMixin, SaveBeforeChangeAction, EntityModelAdmin):
@@ -690,28 +714,30 @@ class OdooProfileAdminForm(forms.ModelForm):
         )
 
 
-class EmailInboxAdminForm(forms.ModelForm):
-    """Admin form for :class:`core.models.EmailInbox` with hidden password."""
-
-    password = forms.CharField(
-        widget=forms.PasswordInput(render_value=True),
-        required=False,
-        help_text="Leave blank to keep the current password.",
-    )
+class MaskedPasswordFormMixin:
+    """Mixin that hides stored passwords while allowing updates."""
 
-    class Meta:
-        model = EmailInbox
-        fields = "__all__"
+    password_sigil_fields: tuple[str, ...] = ()
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
+        field = self.fields.get("password")
+        if field is None:
+            return
+        if not isinstance(field.widget, forms.PasswordInput):
+            field.widget = forms.PasswordInput()
+        field.widget.attrs.setdefault("autocomplete", "new-password")
+        field.help_text = field.help_text or "Leave blank to keep the current password."
         if self.instance.pk:
-            self.fields["password"].initial = ""
+            field.initial = ""
             self.initial["password"] = ""
         else:
-            self.fields["password"].required = True
+            field.required = True
 
     def clean_password(self):
+        field = self.fields.get("password")
+        if field is None:
+            return self.cleaned_data.get("password")
         pwd = self.cleaned_data.get("password")
         if not pwd and self.instance.pk:
             return keep_existing("password")
@@ -719,10 +745,23 @@ class EmailInboxAdminForm(forms.ModelForm):
 
     def _post_clean(self):
         super()._post_clean()
-        _restore_sigil_values(
-            self,
-            ["username", "host", "password", "protocol"],
-        )
+        if self.password_sigil_fields:
+            _restore_sigil_values(self, self.password_sigil_fields)
+
+
+class EmailInboxAdminForm(MaskedPasswordFormMixin, forms.ModelForm):
+    """Admin form for :class:`core.models.EmailInbox` with hidden password."""
+
+    password = forms.CharField(
+        widget=forms.PasswordInput(attrs={"autocomplete": "new-password"}),
+        required=False,
+        help_text="Leave blank to keep the current password.",
+    )
+    password_sigil_fields = ("username", "host", "password", "protocol")
+
+    class Meta:
+        model = EmailInbox
+        fields = "__all__"
 
 
 class ProfileInlineFormSet(BaseInlineFormSet):
@@ -880,16 +919,25 @@ class SocialProfileInlineForm(ProfileFormMixin, forms.ModelForm):
         fields = ("network", "handle", "domain", "did")
 
 
-class EmailOutboxInlineForm(ProfileFormMixin, forms.ModelForm):
-    profile_fields = EmailOutbox.profile_fields
+class EmailOutboxAdminForm(MaskedPasswordFormMixin, forms.ModelForm):
+    """Admin form for :class:`nodes.models.EmailOutbox` with hidden password."""
+
     password = forms.CharField(
-        widget=forms.PasswordInput(render_value=True),
+        widget=forms.PasswordInput(attrs={"autocomplete": "new-password"}),
         required=False,
         help_text="Leave blank to keep the current password.",
     )
+    password_sigil_fields = ("password", "host", "username", "from_email")
 
     class Meta:
         model = EmailOutbox
+        fields = "__all__"
+
+
+class EmailOutboxInlineForm(ProfileFormMixin, EmailOutboxAdminForm):
+    profile_fields = EmailOutbox.profile_fields
+
+    class Meta(EmailOutboxAdminForm.Meta):
         fields = (
             "password",
             "host",
@@ -901,27 +949,6 @@ class EmailOutboxInlineForm(ProfileFormMixin, forms.ModelForm):
             "is_enabled",
         )
 
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        if self.instance.pk:
-            self.fields["password"].initial = ""
-            self.initial["password"] = ""
-        else:
-            self.fields["password"].required = True
-
-    def clean_password(self):
-        pwd = self.cleaned_data.get("password")
-        if not pwd and self.instance.pk:
-            return keep_existing("password")
-        return pwd
-
-    def _post_clean(self):
-        super()._post_clean()
-        _restore_sigil_values(
-            self,
-            ["password", "host", "username", "from_email"],
-        )
-
 
 class ReleaseManagerInlineForm(ProfileFormMixin, forms.ModelForm):
     profile_fields = ReleaseManager.profile_fields
@@ -1324,10 +1351,8 @@ class OdooProfileAdmin(ProfileAdminMixin, SaveBeforeChangeAction, EntityModelAdm
     changelist_actions = ["my_profile"]
     fieldsets = (
         ("Owner", {"fields": ("user", "group")}),
-        (
-            "Configuration",
-            {"fields": ("host", "database", "username", "password")},
-        ),
+        ("Configuration", {"fields": ("host", "database")}),
+        ("Credentials", {"fields": ("username", "password")}),
         (
             "Odoo Employee",
             {"fields": ("verified_on", "odoo_uid", "name", "email")},
@@ -1417,18 +1442,10 @@ class EmailInboxAdmin(ProfileAdminMixin, SaveBeforeChangeAction, EntityModelAdmi
 
     fieldsets = (
         ("Owner", {"fields": ("user", "group")}),
+        ("Credentials", {"fields": ("username", "password")}),
         (
-            None,
-            {
-                "fields": (
-                    "username",
-                    "host",
-                    "port",
-                    "password",
-                    "protocol",
-                    "use_ssl",
-                )
-            },
+            "Configuration",
+            {"fields": ("host", "port", "protocol", "use_ssl")},
         ),
     )
 
@@ -1526,17 +1543,10 @@ class AssistantProfileAdmin(
     changelist_actions = ["my_profile"]
     fieldsets = (
         ("Owner", {"fields": ("user", "group")}),
+        ("Credentials", {"fields": ("user_key_hash",)}),
         (
-            None,
-            {
-                "fields": (
-                    "scopes",
-                    "is_active",
-                    "user_key_hash",
-                    "created_at",
-                    "last_used_at",
-                )
-            },
+            "Configuration",
+            {"fields": ("scopes", "is_active", "created_at", "last_used_at")},
         ),
     )
 
@@ -1627,14 +1637,19 @@ class AssistantProfileAdmin(
         config = dict(getattr(settings, "MCP_SIGIL_SERVER", {}))
         host = config.get("host") or "127.0.0.1"
         port = config.get("port", 8800)
+        base_url, issuer_url = resolve_base_urls(config)
         if isinstance(response, dict):
             response.setdefault("mcp_server_host", host)
             response.setdefault("mcp_server_port", port)
+            response.setdefault("mcp_server_base_url", base_url)
+            response.setdefault("mcp_server_issuer_url", issuer_url)
         else:
             context_data = getattr(response, "context_data", None)
             if context_data is not None:
                 context_data.setdefault("mcp_server_host", host)
                 context_data.setdefault("mcp_server_port", port)
+                context_data.setdefault("mcp_server_base_url", base_url)
+                context_data.setdefault("mcp_server_issuer_url", issuer_url)
         return response
 
     def start_server(self, request):
@@ -1922,7 +1937,7 @@ class ProductFetchWizardForm(forms.Form):
 @admin.register(Product)
 class ProductAdmin(EntityModelAdmin):
     form = ProductAdminForm
-    actions = ["fetch_odoo_product"]
+    actions = ["fetch_odoo_product", "register_from_odoo"]
 
     def _odoo_profile_admin(self):
         return self.admin_site._registry.get(OdooProfile)
@@ -1932,7 +1947,7 @@ class ProductAdmin(EntityModelAdmin):
         return profile.execute(
             "product.product",
             "search_read",
-            domain,
+            [domain],
             {
                 "fields": [
                     "name",
@@ -2072,6 +2087,169 @@ class ProductAdmin(EntityModelAdmin):
         context["media"] = self.media + form.media
         return TemplateResponse(request, "admin/core/product/fetch_odoo.html", context)
 
+    def get_urls(self):
+        urls = super().get_urls()
+        custom = [
+            path(
+                "register-from-odoo/",
+                self.admin_site.admin_view(self.register_from_odoo_view),
+                name=f"{self.opts.app_label}_{self.opts.model_name}_register_from_odoo",
+            )
+        ]
+        return custom + urls
+
+    @admin.action(description="Register from Odoo")
+    def register_from_odoo(self, request, queryset=None):  # pragma: no cover - simple redirect
+        return HttpResponseRedirect(
+            reverse(
+                f"admin:{self.opts.app_label}_{self.opts.model_name}_register_from_odoo"
+            )
+        )
+
+    def _build_register_context(self, request):
+        opts = self.model._meta
+        context = self.admin_site.each_context(request)
+        context.update(
+            {
+                "opts": opts,
+                "title": _("Register from Odoo"),
+                "has_credentials": False,
+                "profile_url": None,
+                "products": [],
+                "selected_product_id": request.POST.get("product_id", ""),
+            }
+        )
+
+        profile_admin = self._odoo_profile_admin()
+        if profile_admin is not None:
+            context["profile_url"] = profile_admin.get_my_profile_url(request)
+
+        profile = getattr(request.user, "odoo_profile", None)
+        if not profile or not profile.is_verified:
+            context["credential_error"] = _(
+                "Configure your Odoo employee credentials before registering products."
+            )
+            return context, None
+
+        try:
+            products = profile.execute(
+                "product.product",
+                "search_read",
+                [[]],
+                {
+                    "fields": [
+                        "name",
+                        "description_sale",
+                        "list_price",
+                        "standard_price",
+                    ],
+                    "limit": 0,
+                },
+            )
+        except Exception:
+            context["error"] = _("Unable to fetch products from Odoo.")
+            return context, []
+
+        context["has_credentials"] = True
+        simplified = []
+        for product in products:
+            simplified.append(
+                {
+                    "id": product.get("id"),
+                    "name": product.get("name", ""),
+                    "description_sale": product.get("description_sale", ""),
+                    "list_price": product.get("list_price"),
+                    "standard_price": product.get("standard_price"),
+                }
+            )
+        context["products"] = simplified
+        return context, simplified
+
+    def register_from_odoo_view(self, request):
+        context, products = self._build_register_context(request)
+        if products is None:
+            return TemplateResponse(
+                request, "admin/core/product/register_from_odoo.html", context
+            )
+
+        if request.method == "POST" and context.get("has_credentials"):
+            if not self.has_add_permission(request):
+                context["form_error"] = _(
+                    "You do not have permission to add products."
+                )
+            else:
+                product_id = request.POST.get("product_id")
+                if not product_id:
+                    context["form_error"] = _("Select a product to register.")
+                else:
+                    try:
+                        odoo_id = int(product_id)
+                    except (TypeError, ValueError):
+                        context["form_error"] = _("Invalid product selection.")
+                    else:
+                        match = next(
+                            (item for item in products if item.get("id") == odoo_id),
+                            None,
+                        )
+                        if not match:
+                            context["form_error"] = _(
+                                "The selected product was not found. Reload the page and try again."
+                            )
+                        else:
+                            existing = self.model.objects.filter(
+                                odoo_product__id=odoo_id
+                            ).first()
+                            if existing:
+                                self.message_user(
+                                    request,
+                                    _(
+                                        "Product %(name)s already imported; opening existing record."
+                                    )
+                                    % {"name": existing.name},
+                                    level=messages.WARNING,
+                                )
+                                return HttpResponseRedirect(
+                                    reverse(
+                                        "admin:%s_%s_change"
+                                        % (
+                                            existing._meta.app_label,
+                                            existing._meta.model_name,
+                                        ),
+                                        args=[existing.pk],
+                                    )
+                                )
+                            product = self.model.objects.create(
+                                name=match.get("name") or f"Odoo Product {odoo_id}",
+                                description=match.get("description_sale", "") or "",
+                                renewal_period=30,
+                                odoo_product={
+                                    "id": odoo_id,
+                                    "name": match.get("name", ""),
+                                },
+                            )
+                            self.log_addition(
+                                request, product, "Registered product from Odoo"
+                            )
+                            self.message_user(
+                                request,
+                                _("Imported %(name)s from Odoo.")
+                                % {"name": product.name},
+                            )
+                            return HttpResponseRedirect(
+                                reverse(
+                                    "admin:%s_%s_change"
+                                    % (
+                                        product._meta.app_label,
+                                        product._meta.model_name,
+                                    ),
+                                    args=[product.pk],
+                                )
+                            )
+
+        return TemplateResponse(
+            request, "admin/core/product/register_from_odoo.html", context
+        )
+
 
 class RFIDResource(resources.ModelResource):
     reference = fields.Field(

{arthexis-0.1.11 → arthexis-0.1.12}/core/apps.py

@@ -21,6 +21,7 @@ class CoreConfig(AppConfig):
         from pathlib import Path
 
         from django.conf import settings
+        from django.core.exceptions import ObjectDoesNotExist
         from django.contrib.auth import get_user_model
         from django.db.models.signals import post_migrate
         from django.core.signals import got_request_exception
@@ -39,6 +40,26 @@ class CoreConfig(AppConfig):
         )
         from .admin_history import patch_admin_history
 
+        from django_otp.plugins.otp_totp.models import TOTPDevice as OTP_TOTPDevice
+
+        if not hasattr(
+            OTP_TOTPDevice._read_str_from_settings, "_core_totp_issuer_patch"
+        ):
+            original_read_str = OTP_TOTPDevice._read_str_from_settings
+
+            def _core_totp_read_str(self, key):
+                if key == "OTP_TOTP_ISSUER":
+                    try:
+                        settings_obj = self.custom_settings
+                    except ObjectDoesNotExist:
+                        settings_obj = None
+                    if settings_obj and settings_obj.issuer:
+                        return settings_obj.issuer
+                return original_read_str(self, key)
+
+            _core_totp_read_str._core_totp_issuer_patch = True
+            OTP_TOTPDevice._read_str_from_settings = _core_totp_read_str
+
         def create_default_arthexis(**kwargs):
             User = get_user_model()
             if not User.all_objects.exists():

{arthexis-0.1.11 → arthexis-0.1.12}/core/models.py

@@ -765,15 +765,28 @@ class EmailInbox(Profile):
                 typ, data = conn.search(None, "ALL")
             else:
                 criteria = []
-                if subject:
-                    criteria.extend(["SUBJECT", f'"{subject}"'])
-                if from_address:
-                    criteria.extend(["FROM", f'"{from_address}"'])
-                if body:
-                    criteria.extend(["TEXT", f'"{body}"'])
+                charset = None
+
+                def _append(term: str, value: str):
+                    nonlocal charset
+                    if not value:
+                        return
+                    try:
+                        value.encode("ascii")
+                        encoded_value = value
+                    except UnicodeEncodeError:
+                        charset = charset or "UTF-8"
+                        encoded_value = value.encode("utf-8")
+                    criteria.extend([term, encoded_value])
+
+                _append("SUBJECT", subject)
+                _append("FROM", from_address)
+                _append("TEXT", body)
+
                 if not criteria:
-                    criteria = ["ALL"]
-                typ, data = conn.search(None, *criteria)
+                    typ, data = conn.search(None, "ALL")
+                else:
+                    typ, data = conn.search(charset, *criteria)
             ids = data[0].split()[-fetch_limit:]
             messages = []
             for mid in ids:
@@ -2637,3 +2650,23 @@ class Todo(Entity):
         if isinstance(field, ConditionTextField):
             return field.evaluate(self)
         return ConditionCheckResult(True, "")
+
+
+class TOTPDeviceSettings(models.Model):
+    """Per-device configuration options for authenticator enrollments."""
+
+    device = models.OneToOneField(
+        "otp_totp.TOTPDevice",
+        on_delete=models.CASCADE,
+        related_name="custom_settings",
+    )
+    issuer = models.CharField(
+        max_length=64,
+        blank=True,
+        default="",
+        help_text=_("Label shown in authenticator apps. Leave blank to use Arthexis."),
+    )
+
+    class Meta:
+        verbose_name = _("Authenticator device settings")
+        verbose_name_plural = _("Authenticator device settings")

{arthexis-0.1.11 → arthexis-0.1.12}/core/reference_utils.py

@@ -30,7 +30,7 @@ def filter_visible_references(
         if host:
             site = Site.objects.filter(domain__iexact=host).first()
 
-    site_id = site.pk if site else None
+    site_id = getattr(site, "pk", None)
 
     if node is None:
         try:

{arthexis-0.1.11 → arthexis-0.1.12}/core/release.py

@@ -344,3 +344,7 @@ def publish(
     proc = subprocess.run(cmd, capture_output=True, text=True)
     if proc.returncode != 0:
         raise ReleaseError(proc.stdout + proc.stderr)
+
+    tag_name = f"v{version}"
+    _run(["git", "tag", tag_name])
+    _run(["git", "push", "origin", tag_name])