arthexis 0.1.5__tar.gz → 0.1.7__tar.gz

{arthexis-0.1.5 → arthexis-0.1.7}/PKG-INFO

@@ -1,8 +1,8 @@
 Metadata-Version: 2.4
 Name: arthexis
-Version: 0.1.5
+Version: 0.1.7
 Summary: Django-based MESH system
-Author-email: "Rafael J. Guillén-Osorio" <tecnologia@gelectriic.com>
+Author-email: "Rafael J. Guillén-Osorio" <tecnologia@gelectriic.com>
 License-Expression: MIT
 Project-URL: Repository, https://github.com/arthexis/arthexis
 Project-URL: Homepage, https://arthexis.com
@@ -112,15 +112,15 @@ Dynamic: license-file
 Arthexis Constellation is a narrative-driven Django-based suite that centralizes tools for managing charging infrastructure and orchestrating energy related products and services.
 
 ## Features
-- Compatibility with all OCPP 1.6 certified chargers
-- Native API integration with Odoo 1.6-based CRMs
-- Runs everywhere Python 3.10+ is installed
-- Single codebase with special features per role
+- Compatible with OCPP 1.6+ chargers
+- API integration with Odoo 1.6+
+- Runs on Windows and Linux (Ubuntu 16+)
+- One codebase. Six* specialized Roles.
 
 ## Support
-You may contact us at tecnologia at gelectriic dot com or visit our [web page](https://www.gelectriic.com/) for professional services and commercial support.
+Contact us at tecnologia at gelectriic dot com or visit our [web page](https://www.gelectriic.com/) for professional services and commercial support.
 
 ## About Me
-> "What? You want to know about me too? Well, I enjoy developing software, roleplaying games, long walks on the beach and a fourth secret thing."
+> "What, you wanna know about me too? Well, I enjoy developing software, role-playing games, long walks on the beach and a fourth secret thing."
 > --Arthexis
 

arthexis-0.1.7/README.md

@@ -0,0 +1,18 @@
+# Arthexis Constellation
+
+## Purpose
+Arthexis Constellation is a narrative-driven Django-based suite that centralizes tools for managing charging infrastructure and orchestrating energy related products and services.
+
+## Features
+- Compatible with OCPP 1.6+ chargers
+- API integration with Odoo 1.6+
+- Runs on Windows and Linux (Ubuntu 16+)
+- One codebase. Six* specialized Roles.
+
+## Support
+Contact us at tecnologia at gelectriic dot com or visit our [web page](https://www.gelectriic.com/) for professional services and commercial support.
+
+## About Me
+> "What, you wanna know about me too? Well, I enjoy developing software, role-playing games, long walks on the beach and a fourth secret thing."
+> --Arthexis
+

{arthexis-0.1.5 → arthexis-0.1.7}/arthexis.egg-info/PKG-INFO

@@ -1,8 +1,8 @@
 Metadata-Version: 2.4
 Name: arthexis
-Version: 0.1.5
+Version: 0.1.7
 Summary: Django-based MESH system
-Author-email: "Rafael J. Guillén-Osorio" <tecnologia@gelectriic.com>
+Author-email: "Rafael J. Guillén-Osorio" <tecnologia@gelectriic.com>
 License-Expression: MIT
 Project-URL: Repository, https://github.com/arthexis/arthexis
 Project-URL: Homepage, https://arthexis.com
@@ -112,15 +112,15 @@ Dynamic: license-file
 Arthexis Constellation is a narrative-driven Django-based suite that centralizes tools for managing charging infrastructure and orchestrating energy related products and services.
 
 ## Features
-- Compatibility with all OCPP 1.6 certified chargers
-- Native API integration with Odoo 1.6-based CRMs
-- Runs everywhere Python 3.10+ is installed
-- Single codebase with special features per role
+- Compatible with OCPP 1.6+ chargers
+- API integration with Odoo 1.6+
+- Runs on Windows and Linux (Ubuntu 16+)
+- One codebase. Six* specialized Roles.
 
 ## Support
-You may contact us at tecnologia at gelectriic dot com or visit our [web page](https://www.gelectriic.com/) for professional services and commercial support.
+Contact us at tecnologia at gelectriic dot com or visit our [web page](https://www.gelectriic.com/) for professional services and commercial support.
 
 ## About Me
-> "What? You want to know about me too? Well, I enjoy developing software, roleplaying games, long walks on the beach and a fourth secret thing."
+> "What, you wanna know about me too? Well, I enjoy developing software, role-playing games, long walks on the beach and a fourth secret thing."
 > --Arthexis
 

{arthexis-0.1.5 → arthexis-0.1.7}/arthexis.egg-info/SOURCES.txt

@@ -12,17 +12,20 @@ config/asgi.py
 config/auth_app.py
 config/celery.py
 config/context_processors.py
+config/horologia_app.py
 config/loadenv.py
 config/logging.py
 config/middleware.py
 config/offline.py
 config/settings.py
 config/urls.py
+config/workgroup_app.py
 config/wsgi.py
 core/__init__.py
 core/admin.py
 core/apps.py
 core/backends.py
+core/checks.py
 core/entity.py
 core/environment.py
 core/fields.py
@@ -33,6 +36,7 @@ core/notifications.py
 core/release.py
 core/system.py
 core/tasks.py
+core/test_system_info.py
 core/tests.py
 core/urls.py
 core/user_data.py
@@ -78,19 +82,20 @@ tests/test_acronym_capitalization.py
 tests/test_admin_history.py
 tests/test_admin_index_actions.py
 tests/test_awg_admin.py
+tests/test_celery_no_debug.py
 tests/test_csrf_failure.py
 tests/test_csrf_origin_subnet.py
+tests/test_dist_cleanup.py
 tests/test_email_collector.py
 tests/test_email_inbox.py
 tests/test_email_inbox_admin.py
 tests/test_email_inbox_search_action.py
 tests/test_env_refresh_clean.py
 tests/test_env_refresh_unlink.py
-tests/test_footer_admin_link.py
+tests/test_fixture_check.py
 tests/test_footer_no_references.py
 tests/test_footer_presence.py
 tests/test_footer_render.py
-tests/test_github_token.py
 tests/test_install_script.py
 tests/test_language_switch.py
 tests/test_lcd_smbus2.py
@@ -101,15 +106,12 @@ tests/test_notify_command.py
 tests/test_odoo_profile.py
 tests/test_odoo_profile_admin.py
 tests/test_offline.py
-tests/test_package_release_admin_actions.py
 tests/test_pypi_token.py
 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_fixture_cleanup.py
 tests/test_release_logs.py
-tests/test_release_mapping.py
 tests/test_release_progress.py
 tests/test_release_tasks.py
 tests/test_rfid_admin_reference_clear.py
@@ -120,4 +122,6 @@ tests/test_seed_data.py
 tests/test_sigil_resolution.py
 tests/test_urls_autodiscover.py
 tests/test_user_datum_admin.py
-tests/test_vscode_manage.py
+tests/test_version_file.py
+tests/test_vscode_manage.py
+tests/test_workgroup_admin_group.py

{arthexis-0.1.5 → arthexis-0.1.7}/config/celery.py

@@ -7,6 +7,13 @@ from celery import Celery
 
 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", "Virtual"}:
+    for var in ["CELERY_TRACE_APP", "CELERY_DEBUG"]:
+        os.environ.pop(var, None)
+    os.environ.setdefault("CELERY_LOG_LEVEL", "INFO")
+
 app = Celery("config")
 app.config_from_object("django.conf:settings", namespace="CELERY")
 app.autodiscover_tasks()

arthexis-0.1.7/config/horologia_app.py

@@ -0,0 +1,7 @@
+from django_celery_beat.apps import BeatConfig as BaseBeatConfig
+
+
+class HorologiaConfig(BaseBeatConfig):
+    """Customize Periodic Tasks app label."""
+
+    verbose_name = "5. Horologia"

{arthexis-0.1.5 → arthexis-0.1.7}/config/logging.py

@@ -13,14 +13,17 @@ class ActiveAppFileHandler(TimedRotatingFileHandler):
     """File handler that writes to a file named after the active app."""
 
     def _current_file(self) -> Path:
+        log_dir = Path(settings.LOG_DIR)
+        log_dir.mkdir(parents=True, exist_ok=True)
         if "test" in sys.argv:
-            return Path(settings.LOG_DIR) / "tests.log"
-        return Path(settings.LOG_DIR) / f"{get_active_app()}.log"
+            return log_dir / "tests.log"
+        return log_dir / f"{get_active_app()}.log"
 
     def emit(self, record: logging.LogRecord) -> None:
         current = str(self._current_file())
         if self.baseFilename != current:
             self.baseFilename = current
+            Path(self.baseFilename).parent.mkdir(parents=True, exist_ok=True)
             if self.stream:
                 self.stream.close()
             self.stream = self._open()
@@ -29,7 +32,9 @@ class ActiveAppFileHandler(TimedRotatingFileHandler):
     def rotation_filename(self, default_name: str) -> str:
         """Place rotated logs inside the old log directory."""
         default_path = Path(default_name)
-        return str(Path(settings.OLD_LOG_DIR) / default_path.name)
+        old_log_dir = Path(settings.OLD_LOG_DIR)
+        old_log_dir.mkdir(parents=True, exist_ok=True)
+        return str(old_log_dir / default_path.name)
 
     def getFilesToDelete(self):
         """Return files to delete in the old log directory respecting backupCount."""

{arthexis-0.1.5 → arthexis-0.1.7}/config/settings.py

@@ -148,8 +148,8 @@ INSTALLED_APPS = [
     "django_object_actions",
     "django.contrib.sites",
     "channels",
-    "post_office",
-    "django_celery_beat",
+    "config.workgroup_app.WorkgroupConfig",
+    "config.horologia_app.HorologiaConfig",
 ] + LOCAL_APPS
 
 if DEBUG:

arthexis-0.1.7/config/workgroup_app.py

@@ -0,0 +1,7 @@
+from post_office.apps import PostOfficeConfig as BasePostOfficeConfig
+
+
+class WorkgroupConfig(BasePostOfficeConfig):
+    """Customize Post Office app label."""
+
+    verbose_name = "6. Workgroup"

{arthexis-0.1.5 → arthexis-0.1.7}/core/admin.py

@@ -21,6 +21,7 @@ from django.templatetags.static import static
 from django.utils.html import format_html
 import json
 import uuid
+import requests
 from django_object_actions import DjangoObjectActions
 from .user_data import UserDatumAdminMixin
 from .models import (
@@ -38,11 +39,12 @@ from .models import (
     Reference,
     OdooProfile,
     FediverseProfile,
-    EmailInbox,
+    EmailInbox as CoreEmailInbox,
     Package,
     PackageRelease,
     ReleaseManager,
     SecurityGroup,
+    InviteLead,
 )
 from .user_data import UserDatumAdminMixin
 
@@ -224,6 +226,20 @@ class SecurityGroupAdmin(DjangoGroupAdmin):
     filter_horizontal = ("permissions",)
 
 
+@admin.register(InviteLead)
+class InviteLeadAdmin(admin.ModelAdmin):
+    list_display = ("email", "created_on")
+    search_fields = ("email", "comment")
+    readonly_fields = (
+        "created_on",
+        "user",
+        "path",
+        "referer",
+        "user_agent",
+        "ip_address",
+    )
+
+
 class EnergyAccountRFIDForm(forms.ModelForm):
     """Form for assigning existing RFIDs to an energy account."""
 
@@ -380,6 +396,14 @@ class FediverseProfileAdmin(admin.ModelAdmin):
                 self.message_user(request, f"{profile}: {exc}", level=messages.ERROR)
 
 
+class EmailInbox(CoreEmailInbox):
+    class Meta:
+        proxy = True
+        app_label = "post_office"
+        verbose_name = CoreEmailInbox._meta.verbose_name
+        verbose_name_plural = CoreEmailInbox._meta.verbose_name_plural
+
+
 class EmailInboxAdminForm(forms.ModelForm):
     """Admin form for :class:`core.models.EmailInbox` with hidden password."""
 
@@ -390,7 +414,7 @@ class EmailInboxAdminForm(forms.ModelForm):
     )
 
     class Meta:
-        model = EmailInbox
+        model = CoreEmailInbox
         fields = "__all__"
 
     def __init__(self, *args, **kwargs):
@@ -445,6 +469,10 @@ class EmailInboxAdmin(admin.ModelAdmin):
         ),
     )
 
+    def save_model(self, request, obj, form, change):
+        super().save_model(request, obj, form, change)
+        obj.__class__ = EmailInbox
+
     @admin.action(description="Test selected inboxes")
     def test_connection(self, request, queryset):
         for inbox in queryset:
@@ -772,17 +800,16 @@ class RFIDAdmin(ImportExportModelAdmin):
 class PackageReleaseAdmin(SaveBeforeChangeAction, admin.ModelAdmin):
     list_display = (
         "version",
-        "package",
+        "package_link",
         "is_current",
         "pypi_url",
-        "pr_link",
         "revision_short",
         "published_status",
     )
     list_display_links = ("version",)
-    actions = ["publish_release"]
+    actions = ["publish_release", "validate_releases"]
     change_actions = ["publish_release_action"]
-    readonly_fields = ("pypi_url", "pr_url", "is_current", "revision")
+    readonly_fields = ("pypi_url", "is_current", "revision")
     fields = (
         "package",
         "release_manager",
@@ -790,9 +817,13 @@ class PackageReleaseAdmin(SaveBeforeChangeAction, admin.ModelAdmin):
         "revision",
         "is_current",
         "pypi_url",
-        "pr_url",
     )
 
+    @admin.display(description="package", ordering="package")
+    def package_link(self, obj):
+        url = reverse("admin:core_package_change", args=[obj.package_id])
+        return format_html('<a href="{}">{}</a>', url, obj.package)
+
     def revision_short(self, obj):
         return obj.revision_short
 
@@ -821,6 +852,37 @@ class PackageReleaseAdmin(SaveBeforeChangeAction, admin.ModelAdmin):
     publish_release_action.label = "Publish selected Release"
     publish_release_action.short_description = "Publish this release"
 
+    @admin.action(description="Validate selected Releases")
+    def validate_releases(self, request, queryset):
+        deleted = False
+        for release in queryset:
+            if not release.pypi_url:
+                self.message_user(
+                    request,
+                    f"{release} has not been published yet",
+                    messages.WARNING,
+                )
+                continue
+            url = (
+                f"https://pypi.org/pypi/{release.package.name}/{release.version}/json"
+            )
+            try:
+                resp = requests.get(url, timeout=10)
+            except Exception as exc:  # pragma: no cover - network failure
+                self.message_user(request, f"{release}: {exc}", messages.ERROR)
+                continue
+            if resp.status_code == 200:
+                continue
+            release.delete()
+            deleted = True
+            self.message_user(
+                request,
+                f"Deleted {release} as it was not found on PyPI",
+                messages.WARNING,
+            )
+        if deleted:
+            PackageRelease.dump_fixture()
+
     @staticmethod
     def _boolean_icon(value: bool) -> str:
         icon = static("admin/img/icon-yes.svg" if value else "admin/img/icon-no.svg")
@@ -835,10 +897,4 @@ class PackageReleaseAdmin(SaveBeforeChangeAction, admin.ModelAdmin):
     def is_current(self, obj):
         return self._boolean_icon(obj.is_current)
 
-    def pr_link(self, obj):
-        if obj.pr_url:
-            return format_html('<a href="{0}" target="_blank">{0}</a>', obj.pr_url)
-        return ""
-
-    pr_link.short_description = "PR URL"
 

{arthexis-0.1.5 → arthexis-0.1.7}/core/apps.py

@@ -5,7 +5,7 @@ from django.utils.translation import gettext_lazy as _
 class CoreConfig(AppConfig):
     default_auto_field = "django.db.models.BigAutoField"
     name = "core"
-    verbose_name = _("Business Models")
+    verbose_name = _("2. Business")
 
     def ready(self):  # pragma: no cover - called by Django
         from django.contrib.auth import get_user_model
@@ -16,6 +16,7 @@ class CoreConfig(AppConfig):
         )
         from .system import patch_admin_system_view
         from .environment import patch_admin_environment_view
+        from . import checks  # noqa: F401
 
         def create_default_arthexis(**kwargs):
             User = get_user_model()

arthexis-0.1.7/core/checks.py

@@ -0,0 +1,29 @@
+import hashlib
+from pathlib import Path
+from django.conf import settings
+from django.core import checks
+
+
+def _fixture_hash() -> str:
+    base_dir = Path(settings.BASE_DIR)
+    md5 = hashlib.md5()
+    for path in sorted(base_dir.glob("**/fixtures/*.json")):
+        md5.update(path.read_bytes())
+    return md5.hexdigest()
+
+
+@checks.register(checks.Tags.database)
+def check_unapplied_fixtures(app_configs=None, **kwargs):
+    """Warn if fixture files have changed since last refresh."""
+    hash_file = Path(settings.BASE_DIR) / "fixtures.md5"
+    stored = hash_file.read_text().strip() if hash_file.exists() else ""
+    current = _fixture_hash()
+    if stored != current:
+        return [
+            checks.Warning(
+                "Unapplied fixture changes detected.",
+                hint="Run env-refresh to apply fixtures.",
+                id="core.W001",
+            )
+        ]
+    return []

{arthexis-0.1.5 → arthexis-0.1.7}/core/entity.py

@@ -1,4 +1,5 @@
 import copy
+import logging
 import os
 import re
 
@@ -7,6 +8,8 @@ from django.conf import settings
 from django.db import models
 from django.contrib.auth.models import UserManager as DjangoUserManager
 
+logger = logging.getLogger(__name__)
+
 
 class EntityQuerySet(models.QuerySet):
     def delete(self):  # pragma: no cover - delegates to instance delete
@@ -78,14 +81,33 @@ class Entity(models.Model):
             root_name, key = match.group(1), match.group(2)
             try:
                 root = SigilRoot.objects.get(prefix__iexact=root_name)
+                if root.context_type == SigilRoot.Context.CONFIG:
+                    if root.prefix.upper() == "ENV":
+                        if key in os.environ:
+                            return os.environ[key]
+                        logger.warning(
+                            "Missing environment variable for sigil [%s.%s]",
+                            root_name,
+                            key,
+                        )
+                        return match.group(0)
+                    if root.prefix.upper() == "SYS":
+                        if hasattr(settings, key):
+                            return str(getattr(settings, key))
+                        logger.warning(
+                            "Missing settings attribute for sigil [%s.%s]",
+                            root_name,
+                            key,
+                        )
+                        return match.group(0)
+                logger.warning(
+                    "Unresolvable sigil [%s.%s]: unsupported context", root_name, key
+                )
             except SigilRoot.DoesNotExist:
-                return ""
-            if root.context_type == SigilRoot.Context.CONFIG:
-                if root.prefix.upper() == "ENV":
-                    return os.environ.get(key, "")
-                if root.prefix.upper() == "SYS":
-                    return str(getattr(settings, key, ""))
-            return ""
+                logger.warning("Unknown sigil root [%s]", root_name)
+            except Exception:
+                logger.exception("Error resolving sigil [%s.%s]", root_name, key)
+            return match.group(0)
 
         return pattern.sub(repl, text)
 

{arthexis-0.1.5 → arthexis-0.1.7}/core/models.py

@@ -10,12 +10,13 @@ from django.utils.translation import gettext_lazy as _
 from django.core.validators import RegexValidator
 from django.core.exceptions import ValidationError
 from django.apps import apps
-from django.db.models.signals import m2m_changed, post_delete, post_save
+from django.db.models.signals import m2m_changed
 from django.dispatch import receiver
 from datetime import timedelta
 from django.contrib.contenttypes.models import ContentType
 import hashlib
 import os
+import subprocess
 from io import BytesIO
 from django.core.files.base import ContentFile
 import qrcode
@@ -62,6 +63,34 @@ class SigilRoot(Entity):
         verbose_name_plural = "Sigil Roots"
 
 
+class Lead(models.Model):
+    """Common request lead information."""
+
+    user = models.ForeignKey(
+        settings.AUTH_USER_MODEL, null=True, blank=True, on_delete=models.SET_NULL
+    )
+    path = models.TextField(blank=True)
+    referer = models.TextField(blank=True)
+    user_agent = models.TextField(blank=True)
+    ip_address = models.GenericIPAddressField(null=True, blank=True)
+    created_on = models.DateTimeField(auto_now_add=True)
+
+    class Meta:
+        abstract = True
+
+
+class InviteLead(Lead):
+    email = models.EmailField()
+    comment = models.TextField(blank=True)
+
+    class Meta:
+        verbose_name = "Invite Lead"
+        verbose_name_plural = "Invite Leads"
+
+    def __str__(self) -> str:  # pragma: no cover - simple representation
+        return self.email
+
+
 class Address(Entity):
     """Physical location information for a user."""
 
@@ -1075,7 +1104,7 @@ class ReleaseManager(Entity):
         max_length=200,
         blank=True,
         help_text=(
-            "Personal access token used to create GitHub pull requests. "
+            "Personal access token for GitHub operations. "
             "Used before the GITHUB_TOKEN environment variable."
         ),
     )
@@ -1159,7 +1188,6 @@ class PackageRelease(Entity):
         max_length=40, blank=True, default=revision_utils.get_revision, editable=False
     )
     pypi_url = models.URLField("PyPI URL", blank=True, editable=False)
-    pr_url = models.URLField("PR URL", blank=True, editable=False)
 
     class Meta:
         verbose_name = "Package Release"
@@ -1251,17 +1279,29 @@ class PackageRelease(Entity):
         )
         self.revision = revision_utils.get_revision()
         self.save(update_fields=["revision"])
+        PackageRelease.dump_fixture()
+        if kwargs.get("git"):
+            diff = subprocess.run(
+                ["git", "status", "--porcelain", "core/fixtures/releases.json"],
+                capture_output=True,
+                text=True,
+            )
+            if diff.stdout.strip():
+                release_utils._run(["git", "add", "core/fixtures/releases.json"])
+                release_utils._run(
+                    [
+                        "git",
+                        "commit",
+                        "-m",
+                        f"chore: update release fixture for v{self.version}",
+                    ]
+                )
+                release_utils._run(["git", "push"])
 
     @property
     def revision_short(self) -> str:
         return self.revision[-6:] if self.revision else ""
 
-
-@receiver([post_save, post_delete], sender=PackageRelease)
-def _update_release_fixture(sender, instance, **kwargs) -> None:
-    """Keep the release fixture in sync with the database."""
-    PackageRelease.dump_fixture()
-
 # Ensure each RFID can only be linked to one energy account
 @receiver(m2m_changed, sender=EnergyAccount.rfids.through)
 def _rfid_unique_energy_account(sender, instance, action, reverse, model, pk_set, **kwargs):