arthexis 0.1.20__tar.gz → 0.1.21__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: arthexis
-Version: 0.1.20
+Version: 0.1.21
 Summary: Power & Energy Infrastructure
 Author-email: "Rafael J. Guillén-Osorio" <tecnologia@gelectriic.com>
 License-Expression: GPL-3.0-only
@@ -59,7 +59,6 @@ Requires-Dist: kombu==5.5.4
 Requires-Dist: libipld==3.1.1
 Requires-Dist: Markdown==3.8.2
 Requires-Dist: mdx_truly_sane_lists==1.3
-Requires-Dist: mcp==1.18.0
 Requires-Dist: mfrc522==0.0.7; sys_platform == "linux"
 Requires-Dist: outcome==1.3.0.post0
 Requires-Dist: packaging==25.0
@@ -67,7 +66,7 @@ Requires-Dist: pillow==11.3.0
 Requires-Dist: prompt_toolkit==3.0.51
 Requires-Dist: psutil==7.1.1
 Requires-Dist: psycopg==3.2.9
-Requires-Dist: psycopg-binary==3.2.11
+Requires-Dist: psycopg-binary==3.2.12
 Requires-Dist: pyasn1==0.6.1
 Requires-Dist: pyasn1_modules==0.4.2
 Requires-Dist: pycparser==2.22
@@ -111,7 +110,7 @@ Requires-Dist: websockets==13.1
 Requires-Dist: whitenoise==6.11.0
 Requires-Dist: plyer==2.1.0; sys_platform == "win32"
 Requires-Dist: wsproto==1.2.0
-Requires-Dist: zope.interface==7.2
+Requires-Dist: zope.interface==8.0.1
 Dynamic: license-file
 
 # Arthexis Constellation

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: arthexis
-Version: 0.1.20
+Version: 0.1.21
 Summary: Power & Energy Infrastructure
 Author-email: "Rafael J. Guillén-Osorio" <tecnologia@gelectriic.com>
 License-Expression: GPL-3.0-only
@@ -59,7 +59,6 @@ Requires-Dist: kombu==5.5.4
 Requires-Dist: libipld==3.1.1
 Requires-Dist: Markdown==3.8.2
 Requires-Dist: mdx_truly_sane_lists==1.3
-Requires-Dist: mcp==1.18.0
 Requires-Dist: mfrc522==0.0.7; sys_platform == "linux"
 Requires-Dist: outcome==1.3.0.post0
 Requires-Dist: packaging==25.0
@@ -67,7 +66,7 @@ Requires-Dist: pillow==11.3.0
 Requires-Dist: prompt_toolkit==3.0.51
 Requires-Dist: psutil==7.1.1
 Requires-Dist: psycopg==3.2.9
-Requires-Dist: psycopg-binary==3.2.11
+Requires-Dist: psycopg-binary==3.2.12
 Requires-Dist: pyasn1==0.6.1
 Requires-Dist: pyasn1_modules==0.4.2
 Requires-Dist: pycparser==2.22
@@ -111,7 +110,7 @@ Requires-Dist: websockets==13.1
 Requires-Dist: whitenoise==6.11.0
 Requires-Dist: plyer==2.1.0; sys_platform == "win32"
 Requires-Dist: wsproto==1.2.0
-Requires-Dist: zope.interface==7.2
+Requires-Dist: zope.interface==8.0.1
 Dynamic: license-file
 
 # Arthexis Constellation

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

@@ -60,8 +60,6 @@ core/urls.py
 core/user_data.py
 core/views.py
 core/widgets.py
-core/workgroup_urls.py
-core/workgroup_views.py
 nodes/__init__.py
 nodes/admin.py
 nodes/apps.py
@@ -125,9 +123,6 @@ 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
 tests/test_auto_upgrade_scheduler.py
 tests/test_awg_admin.py
 tests/test_benchmark_command.py
@@ -154,6 +149,7 @@ tests/test_email_transaction.py
 tests/test_env_refresh_clean.py
 tests/test_env_refresh_pip.py
 tests/test_env_refresh_unlink.py
+tests/test_environment_network_setup_form.py
 tests/test_experience_admin_group.py
 tests/test_fixture_presence.py
 tests/test_footer_no_references.py
@@ -171,11 +167,6 @@ tests/test_log_paths.py
 tests/test_login_view_no_site.py
 tests/test_manage_debug_flag.py
 tests/test_manuals.py
-tests/test_mcp_asgi.py
-tests/test_mcp_auto_start.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
@@ -223,6 +214,7 @@ tests/test_role_marker_filtering.py
 tests/test_seed_data.py
 tests/test_send_invite_command.py
 tests/test_settings_helpers.py
+tests/test_settings_mcp_port.py
 tests/test_shell_scripts.py
 tests/test_show_leads_command.py
 tests/test_sigil_builder.py

{arthexis-0.1.20 → arthexis-0.1.21}/arthexis.egg-info/requires.txt

@@ -45,14 +45,13 @@ kombu==5.5.4
 libipld==3.1.1
 Markdown==3.8.2
 mdx_truly_sane_lists==1.3
-mcp==1.18.0
 outcome==1.3.0.post0
 packaging==25.0
 pillow==11.3.0
 prompt_toolkit==3.0.51
 psutil==7.1.1
 psycopg==3.2.9
-psycopg-binary==3.2.11
+psycopg-binary==3.2.12
 pyasn1==0.6.1
 pyasn1_modules==0.4.2
 pycparser==2.22
@@ -95,7 +94,7 @@ websocket-client==1.8.0
 websockets==13.1
 whitenoise==6.11.0
 wsproto==1.2.0
-zope.interface==7.2
+zope.interface==8.0.1
 
 [:sys_platform == "linux"]
 gpiozero==2.0.1

{arthexis-0.1.20 → arthexis-0.1.21}/config/asgi.py

@@ -9,35 +9,21 @@ 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": http_application,
+        "http": django_asgi_app,
         "websocket": AuthMiddlewareStack(URLRouter(websocket_patterns)),
     }
 )

{arthexis-0.1.20 → arthexis-0.1.21}/config/settings.py

@@ -444,32 +444,6 @@ ASGI_APPLICATION = "config.asgi.application"
 CHANNEL_LAYERS = {"default": {"BACKEND": "channels.layers.InMemoryChannelLayer"}}
 
 
-# MCP sigil resolver configuration
-def _env_int(name: str, default: int) -> int:
-    try:
-        return int(os.environ.get(name, default))
-    except (TypeError, ValueError):  # pragma: no cover - defensive
-        return default
-
-
-def _split_env_list(name: str) -> list[str]:
-    raw = os.environ.get(name)
-    if not raw:
-        return []
-    return [item.strip() for item in raw.split(",") if item.strip()]
-
-
-MCP_SIGIL_SERVER = {
-    "host": os.environ.get("MCP_SIGIL_HOST", "127.0.0.1"),
-    "port": _env_int("MCP_SIGIL_PORT", 8800),
-    "api_keys": _split_env_list("MCP_SIGIL_API_KEYS"),
-    "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", "/mcp"),
-}
-
-
 # Custom user model
 AUTH_USER_MODEL = "core.User"
 

{arthexis-0.1.20 → arthexis-0.1.21}/config/urls.py

@@ -156,7 +156,6 @@ urlpatterns = [
     ),
     path("admin/", admin.site.urls),
     path("i18n/setlang/", csrf_exempt(set_language), name="set_language"),
-    path("api/", include("core.workgroup_urls")),
     path("", include("pages.urls")),
 ]
 

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

@@ -91,9 +91,7 @@ from .models import (
     SecurityGroup,
     InviteLead,
     PublicWifiAccess,
-    AssistantProfile,
     Todo,
-    hash_key,
 )
 from .user_data import (
     EntityModelAdmin,
@@ -110,8 +108,6 @@ from .rfid_import_export import (
     parse_accounts,
     serialize_accounts,
 )
-from .mcp import process as mcp_process
-from .mcp.server import resolve_base_urls
 from . import release as release_utils
 
 logger = logging.getLogger(__name__)
@@ -1304,46 +1300,6 @@ class ReleaseManagerInlineForm(ProfileFormMixin, forms.ModelForm):
         }
 
 
-class AssistantProfileInlineForm(ProfileFormMixin, forms.ModelForm):
-    user_key = forms.CharField(
-        required=False,
-        widget=forms.PasswordInput(render_value=True),
-        help_text="Provide a plain key to create or rotate credentials.",
-    )
-    profile_fields = ("assistant_name", "user_key", "scopes", "is_active")
-
-    class Meta:
-        model = AssistantProfile
-        fields = ("assistant_name", "scopes", "is_active")
-
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        if not self.instance.pk and "is_active" in self.fields:
-            self.fields["is_active"].initial = False
-
-    def clean(self):
-        cleaned = super().clean()
-        if cleaned.get("DELETE"):
-            return cleaned
-        if not self.instance.pk and not cleaned.get("user_key"):
-            if cleaned.get("scopes") or cleaned.get("is_active"):
-                raise forms.ValidationError(
-                    "Provide a user key to create an assistant profile."
-                )
-        return cleaned
-
-    def save(self, commit=True):
-        instance = super().save(commit=False)
-        user_key = self.cleaned_data.get("user_key")
-        if user_key:
-            instance.user_key_hash = hash_key(user_key)
-            instance.last_used_at = None
-        if commit:
-            instance.save()
-            self.save_m2m()
-        return instance
-
-
 PROFILE_INLINE_CONFIG = {
     OdooProfile: {
         "form": OdooProfileInlineForm,
@@ -1474,12 +1430,6 @@ PROFILE_INLINE_CONFIG = {
             "secondary_pypi_url",
         ),
     },
-    AssistantProfile: {
-        "form": AssistantProfileInlineForm,
-        "fields": ("assistant_name", "user_key", "scopes", "is_active"),
-        "readonly_fields": ("user_key_hash", "created_at", "last_used_at"),
-        "template": "admin/edit_inline/profile_stacked.html",
-    },
 }
 
 
@@ -1526,7 +1476,6 @@ PROFILE_MODELS = (
     EmailOutbox,
     SocialProfile,
     ReleaseManager,
-    AssistantProfile,
 )
 USER_PROFILE_INLINES = [
     _build_profile_inline(model, "user") for model in PROFILE_MODELS
@@ -2013,188 +1962,6 @@ class EmailInboxAdmin(ProfileAdminMixin, SaveBeforeChangeAction, EntityModelAdmi
         return TemplateResponse(request, "admin/core/emailinbox/search.html", context)
 
 
-@admin.register(AssistantProfile)
-class AssistantProfileAdmin(
-    ProfileAdminMixin, SaveBeforeChangeAction, EntityModelAdmin
-):
-    list_display = ("assistant_name", "owner", "created_at", "last_used_at", "is_active")
-    readonly_fields = ("user_key_hash", "created_at", "last_used_at")
-
-    change_form_template = "admin/workgroupassistantprofile_change_form.html"
-    change_list_template = "admin/assistantprofile_change_list.html"
-    change_actions = ["my_profile_action"]
-    changelist_actions = ["my_profile"]
-    fieldsets = (
-        ("Owner", {"fields": ("user", "group")}),
-        ("Credentials", {"fields": ("user_key_hash",)}),
-        (
-            "Configuration",
-            {
-                "fields": (
-                    "assistant_name",
-                    "scopes",
-                    "is_active",
-                    "created_at",
-                    "last_used_at",
-                )
-            },
-        ),
-    )
-
-    def owner(self, obj):
-        return obj.owner_display()
-
-    owner.short_description = "Owner"
-
-    def get_urls(self):
-        urls = super().get_urls()
-        opts = self.model._meta
-        app_label = opts.app_label
-        model_name = opts.model_name
-        custom = [
-            path(
-                "<path:object_id>/generate-key/",
-                self.admin_site.admin_view(self.generate_key),
-                name=f"{app_label}_{model_name}_generate_key",
-            ),
-            path(
-                "server/start/",
-                self.admin_site.admin_view(self.start_server),
-                name=f"{app_label}_{model_name}_start_server",
-            ),
-            path(
-                "server/stop/",
-                self.admin_site.admin_view(self.stop_server),
-                name=f"{app_label}_{model_name}_stop_server",
-            ),
-            path(
-                "server/status/",
-                self.admin_site.admin_view(self.server_status),
-                name=f"{app_label}_{model_name}_status",
-            ),
-        ]
-        return custom + urls
-
-    def changelist_view(self, request, extra_context=None):
-        extra_context = extra_context or {}
-        status = mcp_process.get_status()
-        opts = self.model._meta
-        app_label = opts.app_label
-        model_name = opts.model_name
-        extra_context.update(
-            {
-                "mcp_status": status,
-                "mcp_server_actions": {
-                    "start": reverse(f"admin:{app_label}_{model_name}_start_server"),
-                    "stop": reverse(f"admin:{app_label}_{model_name}_stop_server"),
-                    "status": reverse(f"admin:{app_label}_{model_name}_status"),
-                },
-            }
-        )
-        return super().changelist_view(request, extra_context=extra_context)
-
-    def _redirect_to_changelist(self):
-        opts = self.model._meta
-        return HttpResponseRedirect(
-            reverse(f"admin:{opts.app_label}_{opts.model_name}_changelist")
-        )
-
-    def generate_key(self, request, object_id, *args, **kwargs):
-        profile = self.get_object(request, object_id)
-        if profile is None:
-            return HttpResponseRedirect("../")
-        if profile.user is None:
-            self.message_user(
-                request,
-                "Assign a user before generating a key.",
-                level=messages.ERROR,
-            )
-            return HttpResponseRedirect("../")
-        profile, key = AssistantProfile.issue_key(profile.user)
-        context = {
-            **self.admin_site.each_context(request),
-            "opts": self.model._meta,
-            "original": profile,
-            "user_key": key,
-        }
-        return TemplateResponse(request, "admin/assistantprofile_key.html", context)
-
-    def render_change_form(
-        self, request, context, add=False, change=False, form_url="", obj=None
-    ):
-        response = super().render_change_form(
-            request, context, add=add, change=change, form_url=form_url, obj=obj
-        )
-        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)
-        mount_path = config.get("mount_path") or "/"
-        display_base_url = base_url or f"http://{host}:{port}"
-        display_issuer_url = issuer_url or display_base_url
-        chat_endpoint = f"{display_base_url.rstrip('/')}/api/chat/"
-        if isinstance(response, dict):
-            response.setdefault("mcp_server_host", host)
-            response.setdefault("mcp_server_port", port)
-            response.setdefault("mcp_server_base_url", display_base_url)
-            response.setdefault("mcp_server_issuer_url", display_issuer_url)
-            response.setdefault("mcp_server_mount_path", mount_path)
-            response.setdefault("mcp_server_chat_endpoint", chat_endpoint)
-        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", display_base_url)
-                context_data.setdefault("mcp_server_issuer_url", display_issuer_url)
-                context_data.setdefault("mcp_server_mount_path", mount_path)
-                context_data.setdefault("mcp_server_chat_endpoint", chat_endpoint)
-        return response
-
-    def start_server(self, request):
-        try:
-            pid = mcp_process.start_server()
-        except mcp_process.ServerAlreadyRunningError as exc:
-            self.message_user(request, str(exc), level=messages.WARNING)
-        except mcp_process.ServerStartError as exc:
-            self.message_user(request, str(exc), level=messages.ERROR)
-        else:
-            self.message_user(
-                request,
-                f"Started MCP server (PID {pid}).",
-                level=messages.SUCCESS,
-            )
-        return self._redirect_to_changelist()
-
-    def stop_server(self, request):
-        try:
-            pid = mcp_process.stop_server()
-        except mcp_process.ServerNotRunningError as exc:
-            self.message_user(request, str(exc), level=messages.WARNING)
-        except mcp_process.ServerStopError as exc:
-            self.message_user(request, str(exc), level=messages.ERROR)
-        else:
-            self.message_user(
-                request,
-                f"Stopped MCP server (PID {pid}).",
-                level=messages.SUCCESS,
-            )
-        return self._redirect_to_changelist()
-
-    def server_status(self, request):
-        status = mcp_process.get_status()
-        if status["running"]:
-            msg = f"MCP server is running (PID {status['pid']})."
-            level = messages.INFO
-        else:
-            msg = "MCP server is not running."
-            level = messages.WARNING
-        if status.get("last_error"):
-            msg = f"{msg} {status['last_error']}"
-        self.message_user(request, msg, level=level)
-        return self._redirect_to_changelist()
-
-
 class EnergyCreditInline(admin.TabularInline):
     model = EnergyCredit
     fields = ("amount_kw", "created_by", "created_on")
@@ -3690,6 +3457,7 @@ class RFIDAdmin(EntityModelAdmin, ImportExportModelAdmin):
                 "toggle_url": toggle_url,
                 "toggle_label": toggle_label,
                 "public_view_url": public_view_url,
+                "deep_read_url": reverse("rfid-scan-deep"),
             }
         )
         context["title"] = _("Scan RFIDs")

{arthexis-0.1.20 → arthexis-0.1.21}/core/apps.py

@@ -348,9 +348,3 @@ class CoreConfig(AppConfig):
             weak=False,
         )
 
-        try:
-            from .mcp.auto_start import schedule_auto_start
-
-            schedule_auto_start(check_profiles_immediately=False)
-        except Exception:  # pragma: no cover - defensive
-            logger.exception("Failed to schedule MCP auto-start")

{arthexis-0.1.20 → arthexis-0.1.21}/core/environment.py

@@ -71,7 +71,7 @@ class NetworkSetupForm(forms.Form):
     ethernet_subnet = forms.CharField(
         label=_("Ethernet subnet"),
         required=False,
-        help_text=_("Provide N or N/P (prefix 16 or 24) to supply --subnet."),
+        help_text=_("Provide Z, Z/P (prefix 16 or 24), X.Y.Z, or X.Y.Z/P to supply --subnet."),
     )
     update_ap_password_only = forms.BooleanField(
         label=_("Update access point password only"),
@@ -84,16 +84,35 @@ class NetworkSetupForm(forms.Form):
         if not value:
             return ""
         raw = value.strip()
-        match = re.fullmatch(r"(?P<subnet>\d{1,3})(?:/(?P<prefix>\d{1,2}))?", raw)
+        match = re.fullmatch(
+            r"(?P<first>\d{1,3})(?:\.(?P<second>\d{1,3})\.(?P<third>\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."),
+                _("Enter a subnet in the form Z, Z/P, X.Y.Z, or X.Y.Z/P with prefix 16 or 24."),
             )
+        first_octet = int(match.group("first"))
+        second = match.group("second")
+        third = match.group("third")
+        if second is not None and third is not None:
+            octets = [first_octet, int(second), int(third)]
+            for octet in octets:
+                if octet < 0 or octet > 255:
+                    raise forms.ValidationError(
+                        _("Subnet octets must be between 0 and 255."),
+                    )
+            if octets[2] > 254:
+                raise forms.ValidationError(
+                    _("The third subnet octet must be between 0 and 254."),
+                )
+            subnet_value = ".".join(str(octet) for octet in octets)
+        else:
+            if first_octet < 0 or first_octet > 254:
+                raise forms.ValidationError(
+                    _("Subnet value must be between 0 and 254."),
+                )
+            subnet_value = str(first_octet)
         prefix_value = match.group("prefix")
         if prefix_value:
             prefix = int(prefix_value)
@@ -101,8 +120,8 @@ class NetworkSetupForm(forms.Form):
                 raise forms.ValidationError(
                     _("Subnet prefix must be 16 or 24."),
                 )
-            return f"{subnet}/{prefix}"
-        return str(subnet)
+            return f"{subnet_value}/{prefix}"
+        return subnet_value
 
     def clean(self) -> dict:
         cleaned_data = super().clean()