arthexis 0.1.12__py3-none-any.whl → 0.1.13__py3-none-any.whl

{arthexis-0.1.12.dist-info → arthexis-0.1.13.dist-info}/METADATA

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

{arthexis-0.1.12.dist-info → arthexis-0.1.13.dist-info}/RECORD

@@ -1,28 +1,30 @@
-arthexis-0.1.12.dist-info/licenses/LICENSE,sha256=IwGE9guuL-ryRPEKi6wFPI_zOhg7zDZbTYuHbSt_SAk,35823
+arthexis-0.1.13.dist-info/licenses/LICENSE,sha256=IwGE9guuL-ryRPEKi6wFPI_zOhg7zDZbTYuHbSt_SAk,35823
 config/__init__.py,sha256=8_b7rx_-Xcuzu3Z7mSR94q3PAhjyYqLFQi3IOEz6hcI,108
 config/active_app.py,sha256=MET_G7oHL7GkoSo3VkkMzymM-PwsSZazMLZxpgjFLTo,388
-config/asgi.py,sha256=n09URedOmQ_59II3UCl3iodGSDWOuN_A8DFyfLjuylA,803
+config/asgi.py,sha256=P7q9K5M-GTdmQuVEkSDPm89yS93-x7WkwZ6pq1EfoZ4,1339
 config/auth_app.py,sha256=2NkC_iYQxnpbv0gYxW4xp5DgQtdkVLpa-JzAF-638ZE,205
-config/celery.py,sha256=qRTHgNYfT2OyIz4cW49YiiKgVgzLs2mSfAEQBgso0M4,743
+config/celery.py,sha256=6BnonLD51aG2tFtjNheYQDKmoEqzhmNLtjcOvgOrvlU,851
 config/context_processors.py,sha256=bjLSqbz7Qw6knPosIc4KNFEl5HsJHOe23htoNsul40E,2404
 config/horologia_app.py,sha256=u1hTYcEmIqh82Gt5YNPvR5ta2MnVatELvD9ByFrCH1A,194
 config/loadenv.py,sha256=bhFbHTbRJSkSwrFk3UInKEKQ8ZY-poatOGi7rC57YAI,298
 config/logging.py,sha256=334jADN4dM5GNHaCWlYPOKYa5BhfxbsuejH_QDALG6g,1793
 config/middleware.py,sha256=EvraDumepnKwCDswHGXb1mK7vud_dEEoZ4eh0IQ7fhQ,744
 config/offline.py,sha256=mhQjCUzdOwSzZ6oLgPDJR48xaPIDzOi34ARUEz43seE,1431
-config/settings.py,sha256=SVsBKHoGYix3oHKlFAB4zjYRSQ1r-E9NREFYRvmcc1o,22710
+config/settings.py,sha256=sdxnJ_F0sp7qrG6vgObdgDem8mVirPBfMumzoTcMCVQ,21782
+config/settings_helpers.py,sha256=D5w1GdfO8hjWoIlnDBPLpWgfd-NQQuKNttSrIeBSMek,3236
 config/urls.py,sha256=MmbES50lTHyMZ6risgXAGfevncN7j4HC74jR4PX_5xY,5228
 config/wsgi.py,sha256=Fu-ONO2SgYeU6rhmy909P-uLX-n8ALJQObdm9MHPS-k,450
 core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-core/admin.py,sha256=P7Mbh_POpxrqzLCMf6YH3axhDbJPMQWQyTOKV9Z88UA,101803
+core/admin.py,sha256=sR772Bf28isQvnHRv5vjVi0um4yTzggWMRcjrfA6rI8,103412
 core/admin_history.py,sha256=NIDWkosJoHMaucBvUjq8VmmL-0e8ngJ4l4XA89d4jwQ,1833
 core/admindocs.py,sha256=GufdugiNEG87xGSDYVq4CBMhGRubsQCzgz-FqDIqzpM,5367
 core/apps.py,sha256=Kyv7vnYPBWDg21uYyUo1aOki0Rb5zC3_3LRJTgEHE3s,11236
-core/auto_upgrade.py,sha256=BkoE7rJuYAmwoMux22NqujWZYjYXtN40GBloC0sNMY4,1799
+core/auto_upgrade.py,sha256=UASqknQ8YOPAjMzdyP_f5smzbnw04DjGwqHf-tMmt4I,1772
 core/backends.py,sha256=VsZZwskII6QLnxP6Ff593V7o9lqXXfN2_bIfZXrvjyI,8222
 core/entity.py,sha256=dkPywTVk981fV8bOEoZw-1SMrdh8T0jVAUZnRxg3dDg,4505
 core/environment.py,sha256=egNX3vP9xRJt0dqxNZFXi25ZMhe3IZH3Vjne1_k7hxo,1645
 core/fields.py,sha256=4nJ_tngso8NHs6HBl8nn5PWvbcOiuAgkoM6hixrFm64,5580
+core/form_fields.py,sha256=vRqHi8yjvDEUhpdwQth9Os4hKMxBcKX4UhcgL6zawW8,2571
 core/github_helper.py,sha256=k9LmxL0Ec5MzFwZsbMpWMMJ-5tGMe-5yRoI8V0sbFsw,682
 core/github_issues.py,sha256=LKqt-Ilx5TRYnx2LXttc54Nvuh3_1VRP0u_M3whe09c,4963
 core/lcd_screen.py,sha256=mkKtIJjHGDLaV4t80L-JScsZXbLhlYUDknAcvV9Ijr0,2651
@@ -30,11 +32,11 @@ core/liveupdate.py,sha256=kTgbE2gnU3PPIV-88Bw2swSl1aGp6stSdBYqBFbLvx0,716
 core/log_paths.py,sha256=6UXYk6QIUmRO3ecFaFH3dgJ_pf4C_wUN6b0JqUhLVBY,3045
 core/mailer.py,sha256=OF3UgrTVs2St60tQG3ORV7_N6AWK6EtuB04KQXDop_Q,2829
 core/middleware.py,sha256=a4XL0pld4YiG-vanHrzYbJNHv64s75lvmG9inoG1ln0,3479
-core/models.py,sha256=t38b5raQFARB8MsjFkWm-vng65ITX3Ogtb_HuYZ3vqA,91507
+core/models.py,sha256=sa06Axm1p7W7EcYqrX0mWemwxhYIhWWjkby-qV-sLbk,96345
 core/notifications.py,sha256=YtNDGxNveZ6t3tlMXJ7wIaZZTWIZfOKy6vN9mXkeYnA,4021
 core/public_wifi.py,sha256=A08IPJqcdgUKSWbktyqsV4ol8C0uxDxZy1s1ECuPdBE,6526
 core/reference_utils.py,sha256=2AQxtUkEbArieu1FMz3rTTHKPCDTJhHp_7bhzQCkN3U,3735
-core/release.py,sha256=zVDcN2k4NsIydQqSq33jmMdSSYgR-1xocFWBnzaIZhU,11179
+core/release.py,sha256=jZtTNyw3zezUJ6gd9Y7oo4fkyvDasTrkFGGMAufbsH0,11888
 core/sigil_builder.py,sha256=63KSTh7AohG0szr_amBov0zoZuTE8bWqmgsEfPsZHCg,4992
 core/sigil_context.py,sha256=8xrGiB2L1dFfSTrVLsFPLKfkhRwCXXZ0-EXvZdPeTMU,459
 core/sigil_resolver.py,sha256=PAGwF3ugsqN85tKyIvT0YCDCM2MU_Mct2mCJz8XY1s4,11413
@@ -42,61 +44,62 @@ core/system.py,sha256=iH3-Ymonn_wVAvTmg2fJBI81F0nDCcrSJsAwIlD4sR0,15212
 core/tasks.py,sha256=9njUdJUZNtu23XfWhSxk5lX1kKuvckX0qamxlxTHFxA,12328
 core/temp_passwords.py,sha256=Kp4C-y1Hh4GeV1vSOCw3ZyIjcRMts186lUgtEkd3rxY,5452
 core/test_system_info.py,sha256=sHCuo-qyw0BKacbGXFhTWxkuPgywdMGiQ_6YK022n-E,4803
-core/tests.py,sha256=wCzvp3HO2bewvYPN9OstYjqtCLLWhK1msYuZxBg-lQ4,61577
+core/tests.py,sha256=75znkttcCZ9RCIND1c5JnNfJIU1YrJRtjEj678QcC80,62011
 core/tests_liveupdate.py,sha256=D1o2gPopnK7wDCeDQlJ-tfitWh4umZQFRxSTCFY-puc,527
 core/urls.py,sha256=x-LNCxCgrLINdBsJTUUcAuMS5EK5Sh1ybvsVuUnJfLw,436
 core/user_data.py,sha256=kOzcWJcR-d05E7QYoNzKqQSm9bnKJvtG6zq0zRf-tDI,21371
-core/views.py,sha256=o8gjDuBzo_7YXEdFt4_OJpuz1Zg4Y7srcesNr-DIYYs,49169
-core/widgets.py,sha256=ihah_-NtFJ3oRCS3TdcT6iHCUTlg1tUULJsVCu05C0o,1379
+core/views.py,sha256=LoyNaISnwWUBVpr4zE4FN5c_KjiO3c2rtx_onE2RgIg,50361
+core/widgets.py,sha256=B1E7iM1LFATHCK92UqcHV_oUua3Eun5uWibmjc9f7_Q,2845
 core/workgroup_urls.py,sha256=2bC8mOMkxIj04WsNis0Td6AmmJFr6z27Ol5epIvhO28,424
 core/workgroup_views.py,sha256=pFJ4PIRN3WWpRyombpWDKKteYQYoI7lu7ddSEKojD7I,2983
 nodes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nodes/actions.py,sha256=HHnwByTBc3guOORvrKOuvUFID-_BpBq6OENE_PDgk9s,2335
-nodes/admin.py,sha256=VhTQawEOFnosSl5cQo_EnXYmeyHBjHCwSS44bMTbaeA,32766
-nodes/apps.py,sha256=KijGydsQBS-8Q8uBc0ahDZXSSCMzP3tQcYIEigJxdCE,2077
+nodes/admin.py,sha256=_I9BBMuciFuFd8oLzJZ7y9iB7zzeyjbO0AQ64SgfL2M,42272
+nodes/apps.py,sha256=mKeub2f8tukiXbz8cA1xVJM6hnlgce_TGITiQEOqL9A,2716
 nodes/backends.py,sha256=-g7PIbGtIn_3kGoi2w_mJ6zVjvUKTRRWhHABPnnf29g,6081
 nodes/dns.py,sha256=X8PML9rPR7i6NwCSqqxnlO1qpHHRo8uA-XePDTQZYrY,7251
 nodes/feature_checks.py,sha256=ZK9PufvF2pFWHUm4khg8lfHVNncA6zrMBxu-WZEw7-E,4129
 nodes/lcd.py,sha256=7MqS3jV_De2ysSmTtXQfYTWaxdfbmm6YfNdb_7qIVZc,5923
-nodes/models.py,sha256=aF_Bhbi54H2A3HuQiwsvTEwk6JAsImJjdAdL8OcHeTg,49040
+nodes/models.py,sha256=s_GdZkWyWySQauVdSytLY9HeqraX80_5Vz-br5bO_GY,55899
 nodes/reports.py,sha256=pQwwTa5E-JhUwQIbKKQvgD_Cw9556CH0ieRgRjBMnMQ,12470
 nodes/tasks.py,sha256=jorbN4h0PqWMBRMFdkGgJtvG8GPFwGr5Hxlm5In3EeY,1568
-nodes/tests.py,sha256=28oh6oAINpq8a-EknsB-GKU-4RYfnNSdedqV411W5Jg,100131
-nodes/urls.py,sha256=20yZDZf4DNgIZ9hQWsUzjp8k5Fryg9ukk761_KGQt9k,548
+nodes/tests.py,sha256=sxXeaaNCE6sn_CQYe7PDrhp0q0yhMRQyOy2blodnbH8,124914
+nodes/urls.py,sha256=30rYTwQGOnilucXDf8nf95debxn6aytMQHFo8MRbd2A,620
 nodes/utils.py,sha256=h3qVmCBBLyrh06FmDldprxfDQG7dgLw82Tf5PrU-5Qc,4120
-nodes/views.py,sha256=lrT90AsOXeqpvkZnlCPv78mXILGJ8FwJzgsjU-wAZ4Y,15611
+nodes/views.py,sha256=trgJaCJ4QZ6I0eWXxzRqqN9WXMfugcPdTyKLiCHa2ZI,21466
 ocpp/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ocpp/admin.py,sha256=LUJw7fk5q336oAoftfGHs5_pbvEozjMPF69-WCTlAiM,26675
+ocpp/admin.py,sha256=xXAuC8c5fWCxgUiCnL5RWEEks7fmPLVTkWoqoiP4a-0,32397
 ocpp/apps.py,sha256=mCZ5Z0ei7z7c62luIcIhbEuwL1N4czQFSToOkGvRmms,867
-ocpp/consumers.py,sha256=drfud7XSCP3zhrAc6ljzyrqM8K6VDPNFRs4Z_NeHfLk,57896
-ocpp/evcs.py,sha256=O53rCHdxKcgPsj7o57rDiNHTVvEii3DTtQ3djWFTohw,34065
+ocpp/consumers.py,sha256=NA5IG--kOER2bDkLsa3pygiEtXSuiBXCYU-9nXS5zrg,62584
+ocpp/evcs.py,sha256=KrkujSKkhzDJ64_btXQ4Vu7TIZfH_0UHs7Eptny73wg,29727
 ocpp/evcs_discovery.py,sha256=47pWgqX1_JOT5BGSrIdEyuoPTGWN4b6rNjJr8kWeQCg,4034
-ocpp/models.py,sha256=fZlqwPCq3LNHSE-RnGUqgFWI5FT_QyRandxujbxNZZs,32177
+ocpp/models.py,sha256=fhOxKqulTRlvHQ36b5KT5CDnVS9YlTorrQahUQC4gh8,32318
 ocpp/reference_utils.py,sha256=sTgbXfmz00f23LBBkpO-sBGoJf1qaEshHeSofLReYCc,1114
-ocpp/routing.py,sha256=g9vPnLw-D1N8L_mW0_oCe-nTDibjC0Et-SFxe8NFAOI,308
-ocpp/simulator.py,sha256=hFwXuX8SaSJKEXWVWakyBxGa6ZbPvwa0PVTnKrXR1nw,28049
+ocpp/routing.py,sha256=8hhP8vqAJm279_0MU6P183h61N98cL20BZap4ZrYRT8,449
+ocpp/simulator.py,sha256=aQ4u5OLIuicCpV3SMCS6pFI-cU45heO0NqJkvbXyH7o,28761
+ocpp/status_display.py,sha256=eR4qNeGhLVt6FO-sRY4kz9eGLtnCtbxDjeR0etZBHk8,965
 ocpp/store.py,sha256=OjGWT3WkpoahGpUwn_ZpIOsxgOnryoXXSwPCvFsLkzM,17410
 ocpp/tasks.py,sha256=cOcJBshckFKs8GnACvmYZUBG116amtLRAzEP-JNqlZ0,905
 ocpp/test_export_import.py,sha256=TK1__E4K5WrLYPIx-1iJWoIhuRCnOtXc2cYEpGigd3U,4660
 ocpp/test_rfid.py,sha256=hX8VZ2HRyBGjtQLClZ1gy28dOj25RT2r9eK3l9XkmJg,25877
-ocpp/tests.py,sha256=aQZBGmGzhzMh2GrEsunN50gRKUgtIqdD4Y4NbjsPt7E,138325
-ocpp/transactions_io.py,sha256=sFCJvAU5IqWZ4rLvagy4gdcGVvH2rBZvNCfHTXDYJAs,7044
+ocpp/tests.py,sha256=5xH8zY2vD4QJyOsMc1LMDrXXhKVrzFTOVfjRNNxfyLM,163083
+ocpp/transactions_io.py,sha256=emiPuIepqOE-IdRE2SA7REJAmF3Yur17m7gzdK4S_wE,7576
 ocpp/urls.py,sha256=jl6AQLtmLMvrNXP3dQKgPe9Kvaul4oaYd80DskpzVBc,1750
-ocpp/views.py,sha256=FyLt7_67IeteBDADoRkqO3WJGit9noiMs_5RVapwUfo,45669
+ocpp/views.py,sha256=OI3NM1oauWIHL_3Czt_Srn322SnVH_wqdcoNwXpidpw,49268
 pages/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pages/admin.py,sha256=0D2ZGqOhMjk8LfXnPr0g0uMUPJl2qCgvDJz_2IS3WFM,16904
+pages/admin.py,sha256=KLjrVI4zzENiZA4cDi5jJ79DNnpgfg3jIVRcP5X5umQ,16978
 pages/apps.py,sha256=mfCxegmnRqKcszyEwpQhZpW9JWOuEYdVereU_w49BXg,298
 pages/checks.py,sha256=an-MlMCIG-FSKmdgOhYV0VOoB_wDQD7dxKD03Hjrzts,1567
 pages/context_processors.py,sha256=4lkk2mTzmsOKhDhQanWXuU2bbwow0h-1Zn5GWOrL2z4,4132
 pages/defaults.py,sha256=cOhb5p_SneIsK6Qfn9SV1fyq7L3gDheWYo1xp7SplF8,535
-pages/forms.py,sha256=xwQ1uKqZBrIjn9DJQIqZtn0u_xO46w9vSjKVX9Mt6pc,6349
+pages/forms.py,sha256=63_243YfT8sAW3hrdyNgYhVxlXTAUZeshaLWUlreR1c,7256
 pages/middleware.py,sha256=fUdAscLa6h2EqJTFUjhVijfSf82gBfm6XUZTVygWAnk,5227
 pages/models.py,sha256=O4wtjD8jkZlguxEQFcvijSPM55KBjRBdhzvg0FHnxt4,14577
-pages/tests.py,sha256=Pk0waQkWxi-5EZq44XOUGdhvZC1oXh8dy4j0FqRb6ns,84353
+pages/tests.py,sha256=T4akrxZv2NPK3X9mguipW7DUn4F7OyKG6DDlRqpJEpI,88701
 pages/urls.py,sha256=iwe4hvcr_ko-n4h24t6t2882eZp2qyLXeEYkrIahoGU,1067
 pages/utils.py,sha256=7kik1W0Gk6SFxYGhg6shfI2W9Xdcv1sCpkRCQ883a88,311
-pages/views.py,sha256=_7NqHt0omhAge63Fz6ukbbBE06oQzKgVoO5e3WtSMvk,43044
-arthexis-0.1.12.dist-info/METADATA,sha256=nErwfvr1FpIptkmRFT7yLGLigaHdMcXaLL4iFUTEhXc,10137
-arthexis-0.1.12.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-arthexis-0.1.12.dist-info/top_level.txt,sha256=J2a2q8_BWrCZ8H2WFUNMBfO2jz8j2gax6zZh-_1QDac,29
-arthexis-0.1.12.dist-info/RECORD,,
+pages/views.py,sha256=DSzsvHGOVavKU_gDIweHRWQeHiQoe0czkeigZ2a4ge0,43260
+arthexis-0.1.13.dist-info/METADATA,sha256=PhW-6uJCu_HAvfQ7saLHifGvvCK2JRO3BSGDapjTat8,10184
+arthexis-0.1.13.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+arthexis-0.1.13.dist-info/top_level.txt,sha256=J2a2q8_BWrCZ8H2WFUNMBfO2jz8j2gax6zZh-_1QDac,29
+arthexis-0.1.13.dist-info/RECORD,,

config/asgi.py

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

config/celery.py

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

config/settings.py

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

config/settings_helpers.py

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

core/admin.py

@@ -16,6 +16,7 @@ from django.contrib.auth.admin import (
     GroupAdmin as DjangoGroupAdmin,
     UserAdmin as DjangoUserAdmin,
 )
+import logging
 from import_export import resources, fields
 from import_export.admin import ImportExportModelAdmin
 from import_export.widgets import ForeignKeyWidget
@@ -34,6 +35,7 @@ import calendar
 import re
 from django_object_actions import DjangoObjectActions
 from ocpp.models import Transaction
+from ocpp.rfid.utils import build_mode_toggle
 from nodes.models import EmailOutbox
 from .models import (
     User,
@@ -78,6 +80,8 @@ from .widgets import OdooProductWidget
 from .mcp import process as mcp_process
 from .mcp.server import resolve_base_urls
 
+logger = logging.getLogger(__name__)
+
 
 admin.site.unregister(Group)
 
@@ -1998,6 +2002,13 @@ class ProductAdmin(EntityModelAdmin):
             try:
                 results = self._search_odoo_products(profile, form)
             except Exception:
+                logger.exception(
+                    "Failed to fetch Odoo products for user %s (profile_id=%s, host=%s, database=%s)",
+                    getattr(getattr(request, "user", None), "pk", None),
+                    getattr(profile, "pk", None),
+                    getattr(profile, "host", None),
+                    getattr(profile, "database", None),
+                )
                 form.add_error(None, _("Unable to fetch products from Odoo."))
                 results = []
             else:
@@ -2302,15 +2313,13 @@ class RFIDAdmin(EntityModelAdmin, ImportExportModelAdmin):
     change_list_template = "admin/core/rfid/change_list.html"
     resource_class = RFIDResource
     list_display = (
-        "label_id",
+        "label",
         "rfid",
         "custom_label",
         "color",
         "kind",
         "released",
-        "energy_accounts_display",
         "allowed",
-        "added_on",
         "last_seen_on",
     )
     list_filter = ("color", "released", "allowed")
@@ -2321,10 +2330,11 @@ class RFIDAdmin(EntityModelAdmin, ImportExportModelAdmin):
     readonly_fields = ("added_on", "last_seen_on")
     form = RFIDForm
 
-    def energy_accounts_display(self, obj):
-        return ", ".join(str(a) for a in obj.energy_accounts.all())
+    def label(self, obj):
+        return obj.label_id
 
-    energy_accounts_display.short_description = "Energy Accounts"
+    label.admin_order_field = "label_id"
+    label.short_description = "Label"
 
     def scan_rfids(self, request, queryset):
         return redirect("admin:core_rfid_scan")
@@ -2359,16 +2369,43 @@ class RFIDAdmin(EntityModelAdmin, ImportExportModelAdmin):
 
     def scan_view(self, request):
         context = self.admin_site.each_context(request)
-        context["scan_url"] = reverse("admin:core_rfid_scan_next")
-        context["admin_change_url_template"] = reverse(
-            "admin:core_rfid_change", args=[0]
+        table_mode, toggle_url, toggle_label = build_mode_toggle(request)
+        public_view_url = reverse("rfid-reader")
+        if table_mode:
+            public_view_url = f"{public_view_url}?mode=table"
+        context.update(
+            {
+                "scan_url": reverse("admin:core_rfid_scan_next"),
+                "admin_change_url_template": reverse(
+                    "admin:core_rfid_change", args=[0]
+                ),
+                "title": _("Scan RFIDs"),
+                "opts": self.model._meta,
+                "table_mode": table_mode,
+                "toggle_url": toggle_url,
+                "toggle_label": toggle_label,
+                "public_view_url": public_view_url,
+            }
         )
+        context["title"] = _("Scan RFIDs")
+        context["opts"] = self.model._meta
+        context["show_release_info"] = True
         return render(request, "admin/core/rfid/scan.html", context)
 
     def scan_next(self, request):
         from ocpp.rfid.scanner import scan_sources
+        from ocpp.rfid.reader import validate_rfid_value
 
-        result = scan_sources(request)
+        if request.method == "POST":
+            try:
+                payload = json.loads(request.body.decode("utf-8") or "{}")
+            except (json.JSONDecodeError, UnicodeDecodeError):
+                return JsonResponse({"error": "Invalid JSON payload"}, status=400)
+            rfid = payload.get("rfid") or payload.get("value")
+            kind = payload.get("kind")
+            result = validate_rfid_value(rfid, kind=kind)
+        else:
+            result = scan_sources(request)
         status = 500 if result.get("error") else 200
         return JsonResponse(result, status=status)
 

core/auto_upgrade.py

@@ -39,8 +39,8 @@ def ensure_auto_upgrade_periodic_task(
     except Exception:
         return
 
-    mode = mode_file.read_text().strip() or "version"
-    interval_minutes = 5 if mode == "latest" else 10
+    _mode = mode_file.read_text().strip() or "version"
+    interval_minutes = 5
 
     try:
         schedule, _ = IntervalSchedule.objects.get_or_create(