arthexis 0.1.19__py3-none-any.whl → 0.1.20__py3-none-any.whl

{arthexis-0.1.19.dist-info → arthexis-0.1.20.dist-info}/METADATA

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

{arthexis-0.1.19.dist-info → arthexis-0.1.20.dist-info}/RECORD

@@ -1,4 +1,4 @@
-arthexis-0.1.19.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+arthexis-0.1.20.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
 config/__init__.py,sha256=AwpOX7il-DAOmkdJ5dVfVJ3CWWebn1lHyQNmkw1EkDw,103
 config/active_app.py,sha256=KJqYh-o91nPQjVXPEdbiJHzsI6cN9IZsBZ9O3iZ6Hyc,373
 config/asgi.py,sha256=T-0QSbtieEWKPIDkEcEdd-q6qjK8ZCwwjCaISOBkWdM,1296
@@ -15,15 +15,15 @@ config/settings_helpers.py,sha256=0BdBciUHIkwsWa0vV_RKAd4wDuEzgE7G-42XYiES4YQ,31
 config/urls.py,sha256=zvU4FSMKPlXUrGDjUgJCRFQztWb78wo1urW2DQf8qdI,5463
 config/wsgi.py,sha256=zU_mKlya6hejQ21PxKacTui3dUWd4ca_-YJNSYAoMX0,433
 core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-core/admin.py,sha256=tVoWAdi4LzNaGQBOkvyIAmmALn3cXj-fU9rdYUPBYNg,145572
+core/admin.py,sha256=3MhT1TA8QUAgmjlwBmLD6Z1nT19ZUrXLCBSchV1R6LE,151562
 core/admin_history.py,sha256=XZ4b0ryufIka-xcwboK3DzmOL-INSx5Y2fJO-aJdV70,1783
 core/admindocs.py,sha256=ycD0bJ_VE6rTGf9ebXTiKdYkD8Y8hD2oQ4HxxoBURCM,6756
 core/apps.py,sha256=L_UMYI72-5jTo6nt8mfCbgdLhlP32D-8k76EZw0QyAA,14348
 core/auto_upgrade.py,sha256=1EffHHFylgydWdZM_id6CppV0QqBtdNw7cwBYVdbNdk,1715
-core/backends.py,sha256=Mzv_0YYF3iNWYAaKAJHHk75X2im-Kihu1zsg8eBeW2c,10509
+core/backends.py,sha256=okrNW5Z-zDhJB9Al529aTOHGsTLACeQ6v_hMl4cyfnA,10704
 core/changelog.py,sha256=SRn37i5N-qb-RYV4Gpu9fg7Kv8gu4TH8ZwEmDRgN-Vo,12594
 core/entity.py,sha256=o4VteOXePGEsIWJFZ3fpq3DZsdWr3hpQ9A6kFbKosSE,4844
-core/environment.py,sha256=JLcvxAwU3OTL8O6kzwcUCFNZ3T28KanHrU_4mDBFamU,1584
+core/environment.py,sha256=DfmVn2HVwX0rru-BSak6n3R3ier0UiHCZUoNszjt6oA,10182
 core/fields.py,sha256=d-qGahdcv4SRcO4fwCJ6_-NnEAP5xW0k3kODdAAAHSA,5412
 core/form_fields.py,sha256=h2xT8sO8EWbznsiARkxukFk69yoW6mQwqpgonA-d6aA,2496
 core/github_helper.py,sha256=fkjoUPwOB19zbGuk39LNLJ5AbIVKFf3rNCtnu-JISIc,5733
@@ -34,79 +34,79 @@ core/liveupdate.py,sha256=22m0ueQ10-6b-9pQJHY0_5WRYA98fysXKEXOWzIr550,691
 core/log_paths.py,sha256=lxvgXPgJtVNZ-kYrqV8VFle4GFQrSxG-yRTglqvclmU,3318
 core/mailer.py,sha256=JpW0RnD9uZ4O-wvlqeW7CMw95IFeCSkdvbankJDwHq0,2886
 core/middleware.py,sha256=j19K9SX-Emkv7BDDtAacR9g6RWsxhKHwCc8w23JFvMM,3388
-core/models.py,sha256=QIZazU5lwTaNQyO68Fm0Jg2AXDAjvg_HsK_djnKIv_Q,127829
-core/notifications.py,sha256=LYktoKM5k4q7YYWAJuqdeKM-p0Q-3gXgfqdq71qLS68,3916
+core/models.py,sha256=U4oyaIuh1VSvpK7xwyZek09hRzVtY75zYXh1at7-_Pk,131276
+core/notifications.py,sha256=jNLSuSCrhb8x5cDu_APeDlkrmbMejufk5eJOhssAC4I,3917
 core/public_wifi.py,sha256=yydLgxOo9DmJJbM4X_23wGR3gxL3YzHno54v9GssuFA,7213
-core/reference_utils.py,sha256=jeox3V4cZNxzM2Jj31g_mdb3O55zy9S2iXAZu70R1Zc,3627
+core/reference_utils.py,sha256=tffCoyE1w4_SmYzXVWOsW8aR_ZVVTSPzrGhBq8K2xzA,3631
 core/release.py,sha256=y5NRs0XwB7RQVvMEZoNWYjTBxuG68dOMizUXLRx7-x8,31561
 core/rfid_import_export.py,sha256=petyhPvL0WUpehc6uGUDUhjYQ9AVvc6O49zuhDs6YFw,3516
-core/sigil_builder.py,sha256=VLwbrrD7Zr3SHfIDYV-V7uv7LEGiIelCSkeGswHibuc,4843
+core/sigil_builder.py,sha256=nMuhYlw3j3LosrK85Q0pYsMcfGWCmrmdnv8UG7GTq_o,4856
 core/sigil_context.py,sha256=GCzjfM6fcVvBtSbVNfmE6sx3HU8QnxnXrCIytnNpQzM,439
 core/sigil_resolver.py,sha256=rCsypuX-0oWNfKyM1T9ZLWHY0Ezwhtk4VmI0L3krnsE,11098
 core/system.py,sha256=RyBqooWezM0Li_KCRskchD5Lub0cdqBmrnU6ilC8MPE,39823
-core/tasks.py,sha256=Vjv3wQaK-eRs3osSTfVbtgzBoBQvTHXHbrOKxDY7V00,11617
+core/tasks.py,sha256=d0MQP5fmn5pA2VCFGxDMEX0xppDIIh8IAzPfGdnk8J4,12340
 core/temp_passwords.py,sha256=FieUnIUeQHmA1DoXvfJ5U6-Ayv3oDz-hSln5s_vNbA4,5271
 core/test_system_info.py,sha256=IMPz21KEs6OC5YbL7YaIBdmJVLjRY6MgPuZpldJB5OI,6935
-core/tests.py,sha256=H0vPRcwcD3HNscRInbMGvdzs9ixvmkLh3d4YSEeQfEc,98679
+core/tests.py,sha256=a78FZug8JPbvIMx1MgxmcYGyTpMr3WboTvqjnxI9evs,98715
 core/tests_liveupdate.py,sha256=IquU8ztk6zbzC1bQu3Nrr3RzGzuujtPwDkANJHbxg98,510
 core/urls.py,sha256=YPippON1MAP2KeZZ8jHpcLO6mvbnKn1q7fdMv5Vm9dY,425
 core/user_data.py,sha256=02CfvxayELWSWZJCxWpv1Yz7EGg08yEu5MM31Khsi0U,21083
-core/views.py,sha256=oH210iFack4Yvt4ug5DGM3mx24GhPGFhZOlzi4WMV_w,89298
+core/views.py,sha256=U3hwNqJz_I9ybmmdJvLrljrynJaUzGMeHhsiaBJD4mk,90297
 core/widgets.py,sha256=vlR9PlFfZGlkHm5X2cqNXuEBZSj8gmWaR6MO1mMy6kg,6904
 core/workgroup_urls.py,sha256=XR9IqwsSBI8epW7_-hHhWFU9wsyJfZehHwNQBhCgmpM,407
 core/workgroup_views.py,sha256=vtumF3-8YaTD-K6nSd8eYvUyq3ftpvWSEwtcp5B-P6o,2889
 nodes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-nodes/admin.py,sha256=QuBB7JMqUvu2io6ZoZVTdqXLOX0CaB-394yUuwiRqDM,62022
+nodes/admin.py,sha256=20gUgL5clMr_hNugybDqYdhoZh-4cWB2dVp6lgnHo_I,66960
 nodes/apps.py,sha256=AxK-sh9JBJZwNOLjqw9omCQGUQWw-45VRdYH07XhVJU,2732
 nodes/backends.py,sha256=dmmbS0X2YIlCDz2KjoDf_L62dy--nuqZF1rEDoi2JHM,5921
 nodes/dns.py,sha256=D5smXD7Rkh6E4MdL6TBL2WY8GgJg7Rx9z88LZrcMbTw,7048
 nodes/feature_checks.py,sha256=27e4PCkZ8BGWnJCOwMcY2Bo9z7LoeZWiTZuISWGnrzk,3996
 nodes/lcd.py,sha256=iKA8Wmq85KZD52aTzAU8ZmS144_gbdGMOXcE8yuECps,5758
-nodes/models.py,sha256=ay2FE-M0I82SR3__BPdfrXAaOvBL4CKua9_xOOm3mKg,62593
+nodes/models.py,sha256=S2Gc68Q2_8r8RO1ZKxASN5mEOj1q4UWtxdum5A-p0-4,71693
 nodes/reports.py,sha256=NRYh3Y0SlZFhx31Zh2K03yO12ZrpxEHEY6T-dODA6WE,12059
-nodes/rfid_sync.py,sha256=SP_BRUhgYMBH-zXrcM7uShgFSGYmmuIMb1OdcU1e-5U,6956
+nodes/rfid_sync.py,sha256=oeblawcp6xeLApdIuhsJS83OAk58Eu7pVVmgpAc0Nt8,6953
 nodes/signals.py,sha256=PtOKdQfb08mV1LgSZvn7ZAcfOyy2c3Xkq4AOpBQyUdE,622
-nodes/tasks.py,sha256=ur59ebu9z02idmvy_IvUQt3eu9LWRyyNpkg2szvIHCQ,1522
-nodes/tests.py,sha256=w_vUQNatk2K-FIu1yd1I4iD95q68DQ0H9uDYx1Cl3gA,156975
-nodes/urls.py,sha256=OaPypFt5gcmVe87NDzt1WMiC3YwHezih4jV_pGkICcE,601
+nodes/tasks.py,sha256=7m9pKO-iI6JDdfPQ-GWRGown4mdyKrcroOnhbiWN7dY,5246
+nodes/tests.py,sha256=OS9yI940avVZNNE9tn0i-Tr-BnyHKiUFKz0O1adNsUQ,176567
+nodes/urls.py,sha256=-o9_pLo6XHerKMQwL0TW80wm6wmtVZqyNWcUhpdq9vk,915
 nodes/utils.py,sha256=wt7UuSXGuq79A-g-B6EW3kK49QWJBb7zhhkw4pun4k8,4474
-nodes/views.py,sha256=qJnAW5lIO5Up6n3IiTutERHZJTU-eZ_3ChpuZBIZ3oU,22526
+nodes/views.py,sha256=ZaUlTLQUaRbQsiLCfTuwigxXSpoeUqBkrs938KsjmjA,36962
 ocpp/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ocpp/admin.py,sha256=2gnFJFvDDTJmmMuuPVf9ZEuKLLsc6Z7_HFYSlg6TlwE,35336
+ocpp/admin.py,sha256=1X2g-ICBJyp2Queh8Bexu8vXex6qU9onWN5yruczZ0s,38318
 ocpp/apps.py,sha256=i3NqrmIamNEQBT33CIqh7HOSOPmJXCMKrZ-DUd3whqg,842
-ocpp/consumers.py,sha256=s51784IwUoWfLaMI_zfnCve7ouZIB5xAnlgwThb40Gw,67979
+ocpp/consumers.py,sha256=wt9tauYSlpWnGbaGsJKIPt4D13HyloLIHwmlK8iqA0Q,71674
 ocpp/evcs.py,sha256=q1mZrCVSZxXTrtYsDqH6lkeEcJ6tfSC7p9YxkDmpSCw,28883
 ocpp/evcs_discovery.py,sha256=OmrzgaOHwveDRJs8AIhrM3apX8_k2PPXh_oYaYpNW3c,3876
-ocpp/models.py,sha256=6BG-maPpcalLFoEHcbpecuXqia9mQx2ZATOu2pvUaBU,31846
+ocpp/models.py,sha256=wUGYSh382e_zYXq059GCaWqUCjQTTvYbbt0PdlONMFc,34411
 ocpp/reference_utils.py,sha256=_UR82GfE93kv4766mHyVIfdhhyYvrT59660r3H6W55M,1072
 ocpp/routing.py,sha256=3kQya-MdJ00778xDmX0esQLBP05P200V45asg-CGNoo,438
 ocpp/simulator.py,sha256=vnyd59QffT79AaPhmfM_jipni_nqfG57X5tXyx1rBoc,28016
 ocpp/status_display.py,sha256=YGFosd5HJETA0DcLdsjvx6EfhZSnI8Aa3cMnHG2WsBE,939
 ocpp/store.py,sha256=gLCSaP9KKF7li2ALlE3O3RW5eVJtoe-_YHfKhdf0VOM,18943
-ocpp/tasks.py,sha256=OxIaI4OSLz9AfwLexnXhiBILBimTs3gVrPd197Jguqg,5819
-ocpp/test_export_import.py,sha256=Zp6xUBlRq7XkdKjOs78BhkujNQdklxi4RLxU8c-udWY,4530
-ocpp/test_rfid.py,sha256=hMFQwYDPhwfTW2XdDT5q__gKrL8YPbv7DNNMdwzJ7BQ,39105
-ocpp/tests.py,sha256=Y9Z4hfeiqRRCFP8utsVadFTLcKBOwTVIQuDJK3dYqas,186492
-ocpp/transactions_io.py,sha256=YnxI-Tv5UFxv0JuFK3XpoqFYP8eRT8sMuDiqkiMHPtU,7387
-ocpp/urls.py,sha256=3T5O5DSwVk4PbhPx5p4D3UseCWvC5xV5HwJLSM6AfA8,1700
-ocpp/views.py,sha256=TRsfkm8VpygNPW7WIK_hQGX5a2ohrKnTcPfTM11WXVc,60141
+ocpp/tasks.py,sha256=n2axf1Oo7brZtXRe-uCwt6K0f57ZlHUNvp6c5W0Gdzo,6035
+ocpp/test_export_import.py,sha256=ouQbTCp4mxfqoK6gondlu3PPcyrT9jSbWAX5gqqgaNk,4561
+ocpp/test_rfid.py,sha256=IhFSlvsI8A8D3S32sRE298nYfrmqxbv7GfVErtNU3DQ,39137
+ocpp/tests.py,sha256=8Tzb_agTQdLdHnccAGCTfYbcRQHznz5DJI3Hb94mg5M,190065
+ocpp/transactions_io.py,sha256=p2aUsKlCDYnZ4ZBrOM7pxXoW_w3Tbm-tvRFSjnR3x24,7738
+ocpp/urls.py,sha256=5ZomUtznJe3kfs8E-DtVp12eFva5jUuJdpTEczIsQ5w,1730
+ocpp/views.py,sha256=G2y2g55XJBJ0gzZPUqA4pplKfQIrO3-fjH5CkOYqDsw,63152
 pages/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pages/admin.py,sha256=E-jcxUI-89gFgqGI38HMSHbfDw1inpSUiRR83utJ0fc,32512
 pages/apps.py,sha256=o8gQP-VdZOk9LXIEo6IDmOSqX3TP8XypBvKGGWLoQ0k,351
 pages/checks.py,sha256=sM8_hUVM_HOIocvtTb2sY3AaSEvbTnOlO46UchGVd-0,1527
-pages/context_processors.py,sha256=JELk1V5R5yOVIm5h3JfikG1_V6QSUN3LDlKWF8p9zCE,5543
-pages/defaults.py,sha256=l36APPAZO4ub2A8Pp-lQGujKeOVYcyzU6t7-kOk8VoA,522
+pages/context_processors.py,sha256=0Ie3_lPY6-j6f8eXtSzMlWpprMzY0tvX9fcOdpJr6Vs,5788
+pages/defaults.py,sha256=3tjv3nFPxwpFu6poJ1Ez1MP92Q6ZvyRluftKHlU-zeI,522
 pages/forms.py,sha256=T0atqxdNds3IBP8N-9c5-ACf3iR9FzzmhzK4MOa24e8,7058
 pages/middleware.py,sha256=MYd5Nko4AnFg3orY6MuyvvNg_I6GCIf8mDW8znSOgvQ,7042
 pages/models.py,sha256=Ms_m_tzzstNghN_JOzyfwsbllDBIl_AKnYdTRTJthqM,22173
-pages/module_defaults.py,sha256=R8n6eQDjNRMpO-DW86OFGvyRarju5Bx7Fnb275R_z24,5411
+pages/module_defaults.py,sha256=rCAY8aTyxYNL0M5zDr393rX-Gi-svXqKtuLXm0rILrQ,5444
 pages/site_config.py,sha256=f1Me0GFdHeGbIeyMlQNzD2e6hym59YHqbz92U_ppffY,4057
 pages/tasks.py,sha256=ivcba_3wSQ1-cku0oDplzw6vLeQ9hBq3R4TG-LmR5gs,1913
-pages/tests.py,sha256=5rRi1e_mSoS6VGykrz58VZTb428RJRR9zMi3-Pfg3FU,138871
-pages/urls.py,sha256=BbfEl6SbNfyFo2acA8Wze6aHV2kJR-0339FCIOi6cD4,1231
+pages/tests.py,sha256=rgMYFiei8ONBNts4vJzukjaWN-WUGLxr6LFwtSHJQ_8,141550
+pages/urls.py,sha256=rcK0zEJTSCurYhx77ZK_GVVMSHTS5ZJWoKTJkh1lj-M,1305
 pages/utils.py,sha256=CR4D1debgJLGgXsw9kap2ggpe7fIpSoWS_ivbgMNp2k,564
-pages/views.py,sha256=hthdoV352cZRru-Wi3Wtv0ZXOjOba7z7rIpHLlzfuVo,47665
-arthexis-0.1.19.dist-info/METADATA,sha256=ko-yFBbCoQEs9EUfs6BzAcFK5qfn_7uvRJcqbk6pgpQ,11757
-arthexis-0.1.19.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-arthexis-0.1.19.dist-info/top_level.txt,sha256=J2a2q8_BWrCZ8H2WFUNMBfO2jz8j2gax6zZh-_1QDac,29
-arthexis-0.1.19.dist-info/RECORD,,
+pages/views.py,sha256=2ik28HW70a0S84K8hMQ8qL9yzVH1WggXT7S8G5ZaLgA,50940
+arthexis-0.1.20.dist-info/METADATA,sha256=RLz9veHKDPM6UzcxnJgZcxj3ri6TuTPVLSK9QBn48mM,11751
+arthexis-0.1.20.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+arthexis-0.1.20.dist-info/top_level.txt,sha256=J2a2q8_BWrCZ8H2WFUNMBfO2jz8j2gax6zZh-_1QDac,29
+arthexis-0.1.20.dist-info/RECORD,,

core/admin.py

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

core/backends.py

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

core/environment.py

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