irie 0.0.2__py3-none-any.whl → 0.0.4__py3-none-any.whl

irie/__main__.py

@@ -7,17 +7,10 @@
 
 import os
 import sys
+from django.core.management import execute_from_command_line
 
 def main():
     os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'irie.core.settings')
-    try:
-        from django.core.management import execute_from_command_line
-    except ImportError as exc:
-        raise ImportError(
-            "Couldn't import Django. Are you sure it's installed and "
-            "available on your PYTHONPATH environment variable? Did you "
-            "forget to activate a virtual environment?"
-        ) from exc
     execute_from_command_line(sys.argv)
 
 if __name__ == '__main__':

irie/apps/config.py

@@ -1,6 +1,5 @@
 from django.apps import AppConfig
 
-
 class AppsConfig(AppConfig):
     default_auto_field = "django.db.models.BigAutoField"
     name  = "irie.apps"

irie/apps/events/apps.py

@@ -5,8 +5,6 @@
 #===----------------------------------------------------------------------===#
 from django.apps import AppConfig
 
-
 class AppConfig(AppConfig):
     name = "irie.apps.events"
     label= "irie_apps_events"
-

irie/apps/site/config.py

@@ -1,3 +1,8 @@
+#===----------------------------------------------------------------------===#
+#
+#         STAIRLab -- STructural Artificial Intelligence Laboratory
+#
+#===----------------------------------------------------------------------===#
 from django.apps import AppConfig
 
 

irie/apps/templates/networks/networks.js

@@ -164,26 +164,57 @@ function handleClickedTab(tabLink) {
 }
 
 function handleCorridorUpdate(event) {
-  // Prevent the form from submitting in the traditional way
-  event.preventDefault();
-
-  // Get the form element
-  const form = event.target;
-  const tab = "tab1";
-
-  // Close all bridge tabs
-  initializedTabs.slice(1, initializedTabs.length).forEach(tab => {
-    if (tab.startsWith('c')) {
+    // Prevent the form from submitting in the traditional way
+    event.preventDefault();
+  
+    // Get the form element
+    const form = event.target;
+    const tab = "tab1";
+  
+    // Normalize form fields with "weight" in their name to sum to 1.0
+    const formData = new FormData(form);
+    const weightFields = [];
+    let totalWeight = 0;
+  
+    // Collect "weight" fields and calculate total weight
+    formData.forEach((value, key) => {
+      if (key.toLowerCase().includes("weight")) {
+        // Ensure valid number, default to 0
+        const numericValue = parseFloat(value) || 0;
+        weightFields.push({ key, value: numericValue });
+        totalWeight += numericValue;
+      }
+    });
+  
+    // Normalize weights if totalWeight > 0 to avoid division by zero
+    if (totalWeight > 0) {
+      weightFields.forEach(field => {
+        const normalizedValue = field.value / totalWeight;
+        formData.set(field.key, normalizedValue);
+  
+        // Update the input field in the form
+        const inputElement = form.querySelector(`[name="${field.key}"]`);
+        if (inputElement) {
+          // Limit decimals for readability
+          inputElement.value = normalizedValue.toFixed(4);
+        }
+      });
+    }
+  
+    // Close all bridge tabs except the first one
+    initializedTabs.slice(1, initializedTabs.length).forEach(tab => {
+      if (tab.startsWith('c')) {
         console.log(tab);
         delCorridorTab(document.getElementById(`${tab}-tab`));
-    }
-  });
-
-  // Create a URLSearchParams object from the form data
-  // and fetch the data for the selected tab
-  loadContent(tab, new FormData(form));
+      }
+    });
+  
+    // Create a URLSearchParams object from the form data
+    // and fetch the data for the selected tab
+    loadContent(tab, formData);
 }
 
+
 // Event delegation: Listen for clicks on all nav links
 document.addEventListener('DOMContentLoaded', function () {
     initializedTabs.push('tab1');
@@ -197,4 +228,4 @@ document.addEventListener('DOMContentLoaded', function () {
             e.preventDefault(); handleClickedTab(tab);
         });
     });
-});
+});

irie/core/urls.py

@@ -11,9 +11,9 @@
 from django.contrib import admin
 from django.urls import path, include
 
-admin.site.site_header = "BRACE2 Administration"
-admin.site.index_title = "BRACE2 Administration"
-admin.site.site_title  = "BRACE2 Administration"
+admin.site.site_header = "IRiE"
+admin.site.index_title = "IRiE"
+admin.site.site_title  = "IRiE"
 
 urlpatterns = [
     path('admin/', admin.site.urls),

irie/init/management/commands/init_assets.py

@@ -116,7 +116,7 @@ def load_assets(NBI_DATA):
         config = find_bridge(BRIDGES, calid)
         cesmd  = CESMD.get(calid, None)
         try:
-            if skip(nbi, ROUTES):
+            if skip(nbi, ROUTES) or item == "33 0726L":
                 continue
         except:
             print("Failed to skip ", calid)

{irie-0.0.2.dist-info → irie-0.0.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: irie
-Version: 0.0.2
+Version: 0.0.4
 Summary: Infrastructure Resilience Engine
 Author-email: wd <5018-006+wd@users.noreply.github.com>
 Project-URL: Repository, https://github.com/STAIRLab/irie
@@ -31,9 +31,15 @@ Requires-Dist: opensees
 Requires-Dist: quakeio
 Requires-Dist: bottle
 Requires-Dist: openbim
+Requires-Dist: folium
+Requires-Dist: pandas
+Requires-Dist: numpy
+Requires-Dist: orjson
+Requires-Dist: jsonschema
+Requires-Dist: beautifulsoup4
+Requires-Dist: autopep8
 Requires-Dist: Django==5.1.2
 Requires-Dist: asgiref==3.8.1
-Requires-Dist: autopep8
 Requires-Dist: gunicorn==23.0.0
 Requires-Dist: pytz==2021.3
 Requires-Dist: sqlparse==0.5.1
@@ -44,24 +50,21 @@ Requires-Dist: django-crispy-forms
 Requires-Dist: django-environ==0.11.2
 Requires-Dist: djangorestframework==3.15.2
 Requires-Dist: djangorestframework-simplejwt==5.3.1
-Requires-Dist: folium
-Requires-Dist: pandas
-Requires-Dist: numpy
-Requires-Dist: orjson
-Requires-Dist: jsonschema
 Requires-Dist: dj-database-url==2.1.0
 
 <div align="center">
-<h2>irie</h2>
-<font size="28"><i><b>i</b>nfrastructure <b>r</b>el<b>i</b>ability <b>e</b>ngine</i></font>
+<h4><code>irie</code></h4>
+<hr>
+<span style="font-size: 150;"><i><b>i</b>nfrastructure <b>r</b>el<b>i</b>ability <b>e</b>ngine</i></span>
+<hr>
 <h4>PEER</h4>
 </div>
 
-### External Dependencies
+### Powered By
 
-- [`quakeio`](https://pypi.org/project/quakeio)
 - [`opensees`](https://pypi.org/project/opensees)
+- [`quakeio`](https://pypi.org/project/quakeio)
 - [`mdof`](https://pypi.org/project/mdof)
+- [`sees`](https://pypi.org/project/sees)
 - [`sdof`](https://pypi.org/project/sdof)
 
-For developer notes, see [`help/README.md`](help/README.md).

{irie-0.0.2.dist-info → irie-0.0.4.dist-info}/RECORD

@@ -1,8 +1,7 @@
 irie/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-irie/__main__.py,sha256=QP2N1G6FkO36pv1R4cEcmY-Ix9VoViuk3BY4sZDvIYM,796
-irie/mgmt.py,sha256=KTo_shkPWfBSRjG815PAj5ntmoasAKqJeVDUOvjBY1o,550
+irie/__main__.py,sha256=JTbP1tFc8z2e_wXuurYT9MBe3pLt9UwY_HHnuEZvI2c,501
 irie/apps/__init__.py,sha256=wkkNngGxgYcCM745-rlvP6ynrI0b0QN3aWmLWDsR8zU,230
-irie/apps/config.py,sha256=Cwb9-d4rqoPZ7uKHYzTxblo0CS7ee8cP0Aj4CXiZyHw,171
+irie/apps/config.py,sha256=63zGFCvptXwnYXb5_Be0njFGgkJQtnWOcYnkeEJN-QU,170
 irie/apps/context_processors.py,sha256=kdMNU9-yK7rd8QWH5KxiKyQufFEmMLfZMRl7G8p7XHk,114
 irie/apps/authentication/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 irie/apps/authentication/admin.py,sha256=2h43pTXd3NKV8-_fkUEkzkS4zqih0qBLE8q6Yj7fpEg,33
@@ -32,7 +31,7 @@ irie/apps/evaluation/migrations/0001_initial.py,sha256=Bu9By3pDY-Dls_dSUGBQOGlrs
 irie/apps/evaluation/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 irie/apps/events/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 irie/apps/events/admin.py,sha256=k0XveXjnXzR5WDAhX6sIbFUXLD9fzO1TLhMqllQET4k,317
-irie/apps/events/apps.py,sha256=bhgXBdYftVhVY85TfVa6unob1aCFeQ-Yd_9Ax9tjES8,355
+irie/apps/events/apps.py,sha256=avHJMVjGJlpGSwhTuFSP4jkbFMeXs7wASP2H4Z2nYhE,353
 irie/apps/events/models.py,sha256=F2QrIcWi7x6fqE4i3ZviunKAAHQR3F0EhttSdNHovMo,2351
 irie/apps/events/tests.py,sha256=PSZUTXteVS5Fim2upOndb1HW5Pu7DoC1r25-7_1i-so,33
 irie/apps/events/tests_events.py,sha256=iVNwnlZgqug1MtEIGS_E82wcQ7522m-0q47kreN_D90,8363
@@ -90,7 +89,7 @@ irie/apps/prediction/templatetags/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeR
 irie/apps/prediction/templatetags/predictor.py,sha256=43MXAC-Y-ex_w9_cdvl4UbkrdlZWN_PUg0NVM8C0rHY,793
 irie/apps/site/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 irie/apps/site/admin.py,sha256=2h43pTXd3NKV8-_fkUEkzkS4zqih0qBLE8q6Yj7fpEg,33
-irie/apps/site/config.py,sha256=IbMn6ehpwTvXpeJxLQTNYhdYCAQKpr2bU-2h9ZCmJB8,115
+irie/apps/site/config.py,sha256=VFlhAZpacFZWpHHGBKaPvsIEpEydkSL9IaB8OWyEue8,345
 irie/apps/site/models.py,sha256=EIjVfI3vKdeloNjkmLHRB3UTkYh3EhETvuK-Th5_VM8,73
 irie/apps/site/tests.py,sha256=PSZUTXteVS5Fim2upOndb1HW5Pu7DoC1r25-7_1i-so,33
 irie/apps/site/urls.py,sha256=NZP5FlFVS_CeoxU_CLsFMv2zvtAwsY3bbxCx6MX7Xzs,256
@@ -423,7 +422,7 @@ irie/apps/templates/layouts/base-fullscreen.html,sha256=14X-eubwjujt4jGMJGvbYqaW
 irie/apps/templates/layouts/base.html,sha256=1fJ-YCAQMd-Lf83B4Lf1sMPkS6oGAzrmD5_h1xs-SKI,2313
 irie/apps/templates/layouts/json-form.html,sha256=cT6Pd2168Z3p8RODS7SulUC79LnuzSs0EVLVxkGOXAo,1333
 irie/apps/templates/networks/corridor_table.html,sha256=VijOUKq15D3zqru5nq-WZin59YIwb5FvOB1F8-K_MJQ,894
-irie/apps/templates/networks/networks.js,sha256=Dn0d1RwoNQ4e1EIFRpD3PR6_mA2WTSXYIGGk8LwR-rw,6341
+irie/apps/templates/networks/networks.js,sha256=oENJ0SqTJYfbgHmI1w-QcUPbgI182kRienSrxyRPD4o,7440
 irie/apps/templates/networks/styled_inputs.html,sha256=4IqtA4oQw6zAc2oypEYspIn_dS0syvVtZvkshhj1Tco,118
 irie/apps/templates/prediction/asset-predictors.html,sha256=Uu4QdwYe7xvtTG0NSMg9Fu5azajJBCiJTYyWnLBbhkk,3810
 irie/apps/templates/prediction/form-submission.html,sha256=IBAHLK2gr7kMgD-nemx-VVGpT4npEQwdsL5uGYiOhy8,5564
@@ -451,7 +450,7 @@ irie/apps/templates/site/unused-dashboard-cards.html,sha256=DDNWrnIf4o0wj06WYH8Y
 irie/core/__init__.py,sha256=wkkNngGxgYcCM745-rlvP6ynrI0b0QN3aWmLWDsR8zU,230
 irie/core/asgi.py,sha256=3lVQKFRA4bznM2mWu5Cv24a5H9pfb6YU07q-I_TN0DM,395
 irie/core/settings.py,sha256=XQOGRUhIXEF0oIlK9V47UJ9jmIknCKtzcp-Y89RHLhs,6479
-irie/core/urls.py,sha256=_61X4Z5TkXq554Fr1qGz9jcXRIaTPXSSCPW-y8D8Qb8,1115
+irie/core/urls.py,sha256=FCZ9jQfUDJ3HfY7iVv_DPlC5kyRxnq0Z8l8DUTgFJPk,1064
 irie/core/wsgi.py,sha256=8dxK789vOoRWm0IatEhNqMgZhov9TlspjM6hOUbjg24,395
 irie/init/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 irie/init/__main__.py,sha256=YGMfr1r3zkx7nl_sjCHDVhamsq0y7SxwcxQj5eodwK4,519
@@ -465,11 +464,11 @@ irie/init/data/cgs_data.json,sha256=l2lADALMXVLKY6jn-rvEZjYWcZjGHLk22ZudocdR81Q,
 irie/init/data/nbi_codes-california.json,sha256=UPFbBzxY2NshREecsP4evCA8vdvXFRvG4rYT4_KHmQs,2398694
 irie/init/data/nbi_data-california.json,sha256=nyslZbMf30WrtdyqCpMvxd-NNxNzFHtZX_TDWRZFob0,8534365
 irie/init/data/networks/soga_corridors.json,sha256=AQOUaKGNWkQxQKLfqphE9Qb_-NRmjN9IwK59SGjutxE,45496
-irie/init/management/commands/init_assets.py,sha256=24bM-y2541axWamzbiQRMicGzll5V6gPEEblRJt-yx0,6404
+irie/init/management/commands/init_assets.py,sha256=LtptSA90Czy9vh3qfn6QqfLkR6o3Nw30QRQh4Poe8Qk,6426
 irie/init/management/commands/init_corridors.py,sha256=kvcY8V5blEdyUxVGxm3wtBhv9AddPz0wAUJFRufZVxo,1359
 irie/init/management/commands/init_predictors.py,sha256=5JwAb8vJUTCMVtwzolZLjxrN-O-UJxiiZg-ugTtbGoA,1993
-irie-0.0.2.dist-info/METADATA,sha256=u4FZUJf8BJzrwFXPXRGCLTQUS98rOoPMzVYk1GBSYjQ,2420
-irie-0.0.2.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-irie-0.0.2.dist-info/entry_points.txt,sha256=A_3h9wPBGfxGQ78_MGa-nO6Z0foxOYeAnIE47jxEztg,44
-irie-0.0.2.dist-info/top_level.txt,sha256=zVCxi5E2nkISZPzKq8VEhWe_dGuPcefLYV1tYqQdwlY,5
-irie-0.0.2.dist-info/RECORD,,
+irie-0.0.4.dist-info/METADATA,sha256=Z0E5iXGM8hOa_ezoqZIQVV_vhWPQJugK0wyLOyTgv_s,2457
+irie-0.0.4.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+irie-0.0.4.dist-info/entry_points.txt,sha256=A_3h9wPBGfxGQ78_MGa-nO6Z0foxOYeAnIE47jxEztg,44
+irie-0.0.4.dist-info/top_level.txt,sha256=zVCxi5E2nkISZPzKq8VEhWe_dGuPcefLYV1tYqQdwlY,5
+irie-0.0.4.dist-info/RECORD,,

irie/mgmt.py

@@ -1,20 +0,0 @@
-#!/usr/bin/env python
-#===----------------------------------------------------------------------===#
-#
-#         STAIRLab -- STructural Artificial Intelligence Laboratory
-#
-#===----------------------------------------------------------------------===#
-
-import os
-import sys
-from django.core.management import execute_from_command_line
-
-def main():
-#   os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'irie.core.settings')
-#   print(sys.stdin.read())
-    execute_from_command_line(sys.argv)
-#   print(sys.argv)
-
-if __name__ == '__main__':
-    main()
-