irie 0.0.21__py3-none-any.whl → 0.0.22__py3-none-any.whl

irie/apps/__init__.py

@@ -2,4 +2,4 @@
 #
 #         STAIRLab -- STructural Artificial Intelligence Laboratory
 #
-#===----------------------------------------------------------------------===#
+#===----------------------------------------------------------------------===#

irie/apps/config.py

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

irie/apps/evaluation/models.py

@@ -32,6 +32,9 @@ class Evaluation(models.Model):
                                choices=Status.choices,
                                default=Status.Finished)
 
+    def __str__(self):
+        return f"Evaluation {self.id} ({self.status})"
+
     @classmethod
     def create(cls, event: EventRecord, asset: Asset, data: dict = None):
         evaluation = cls()

irie/apps/events/models.py

@@ -21,7 +21,7 @@ from irie.apps.inventory.models import Asset
 class EventRecord(models.Model):
     id = models.BigAutoField(primary_key=True)
     upload_date = models.DateField(blank=False)
-    event_file  = models.FileField(upload_to='events', blank=True)
+    event_file  = models.FileField(upload_to="events", blank=True)
     upload_data = models.JSONField(default=dict)
     motion_data = models.JSONField(default=dict)
     cesmd = models.CharField(max_length=7)

irie/apps/inventory/models.py

@@ -21,6 +21,19 @@ class Corridor(models.Model):
     def __str__(self):
         return f"{self.name} ({self.assets.count()})"
 
+
+class _Sensor: # (models.Model):
+    class Status:
+        active: bool 
+
+    status = None 
+
+class Station: # (models.Model):
+    sensors = None  
+    assets  = None
+    network = None
+    events  = None
+
 class Asset(models.Model):
     id = models.BigAutoField(primary_key=True)
     cesmd = models.CharField(max_length=7, blank=True, null=True)
@@ -56,7 +69,7 @@ class Asset(models.Model):
             return None
 
     @property
-    def predictors(self): # ->Dict[str, Predictor]:
+    def predictors(self):
         from irie.apps.prediction.predictor import PREDICTOR_TYPES
         from irie.apps.prediction.models import PredictorModel
         return {

irie/apps/inventory/sitemaps.py

@@ -1,4 +1,8 @@
-
+#===----------------------------------------------------------------------===#
+#
+#         STAIRLab -- STructural Artificial Intelligence Laboratory
+#
+#===----------------------------------------------------------------------===#
 from django.contrib.sitemaps import Sitemap
 from django.urls import reverse
 from .models import Asset  # Replace with your model

irie/apps/inventory/views.py

@@ -40,7 +40,7 @@ def _fetch_rendering(request):
 
     from irie.apps.prediction.models import PredictorModel
     for p in PredictorModel.objects.filter(asset=asset):
-        if p.protocol == "IRIE_PREDICTOR_T4":
+        if p.protocol == "IRIE_PREDICTOR_V1":
             return HttpResponse("html")
 
     return HttpResponse("No rendering available for this asset.")
@@ -196,12 +196,12 @@ def asset_profile(request, calid):
 
         # Add fragility probabilities and plot to the context
         context["hazus"] = {
-            "probabilities": {
-                "Slight": hazus_results.get("Slight"),
-                "Moderate": hazus_results.get("Moderate"),
-                "Extensive": hazus_results.get("Extensive"),
-                "Complete": hazus_results.get("Complete"),
-            },
+            # "probabilities": {
+            #     "Slight": hazus_results.get("Slight"),
+            #     "Moderate": hazus_results.get("Moderate"),
+            #     "Extensive": hazus_results.get("Extensive"),
+            #     "Complete": hazus_results.get("Complete"),
+            # },
             "sa_range": json.dumps(hazus_results["sa_range"]),
             "curves":   json.dumps(hazus_results["curves"])
             # "plot_base64": hazus_results.get("plot_base64"),
@@ -261,8 +261,9 @@ def _make_tables(asset):
                "Owner Agency",
                "Year Reconstructed",
                "Bridge Posting Code",
-               "Latitude",
-               "Longitude",
+#              "Latitude",
+#              "Longitude",
+               "Structure Number",
                "NBIS Minimum Bridge Length",
                "Record Type",
                "State Name",

irie/apps/prediction/apps.py

@@ -6,7 +6,6 @@
 from django.apps import AppConfig
 
 class PredictionConfig(AppConfig):
-    default_auto_field = 'django.db.models.BigAutoField'
-    name  = 'irie.apps.prediction'
-    label = 'apps_prediction'
-
+    default_auto_field = "django.db.models.BigAutoField"
+    name  = "irie.apps.prediction"
+    label = "apps_prediction"

irie/apps/prediction/forms.py

@@ -9,11 +9,13 @@ from irie.apps.prediction.models import PredictorModel
 class PredictorForm(forms.ModelForm):
     class Meta:
         model = PredictorModel
-        fields = '__all__'
-        exclude = ['render_file', 
-                   'asset', 
-                   'metrics', 
-                   'active', 
-                   'entry_point', 
-                   'config', 
-                   'protocol']
+        fields = "__all__"
+        exclude = [
+            "render_file", 
+            "asset", 
+            "metrics", 
+            "active", 
+            "entry_point", 
+            "config", 
+            "protocol"
+        ]

irie/apps/prediction/migrations/0003_alter_predictormodel_protocol.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.1.2 on 2024-12-15 00:56
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('apps_prediction', '0002_alter_predictormodel_protocol'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='predictormodel',
+            name='protocol',
+            field=models.CharField(choices=[('IRIE_PREDICTOR_V1', 'Type1'), ('IRIE_PREDICTOR_T2', 'Type2')], default='IRIE_PREDICTOR_T2', max_length=25),
+        ),
+    ]

irie/apps/prediction/models.py

@@ -12,8 +12,8 @@ class PredictorModel(models.Model):
     class Protocol(models.TextChoices):
         TYPE1 = "IRIE_PREDICTOR_V1"
         TYPE2 = "IRIE_PREDICTOR_T2"
-        TYPE3 = "IRIE_PREDICTOR_T3"
-        TYPE4 = "IRIE_PREDICTOR_T4"
+        # TYPE3 = "IRIE_PREDICTOR_T3"
+        # TYPE4 = "IRIE_PREDICTOR_T4"
 
     id          = models.BigAutoField(primary_key=True)
     name        = models.CharField(max_length=35)
@@ -26,8 +26,8 @@ class PredictorModel(models.Model):
 
     entry_point = models.JSONField(default=list)
     config      = models.JSONField(default=dict)
-    config_file = models.FileField(upload_to='predictor_configs/', null=True, blank=True)
-    render_file = models.FileField(upload_to='renderings/', null=True, blank=True)
+    config_file = models.FileField(upload_to="predictor_configs/", null=True, blank=True)
+    render_file = models.FileField(upload_to="renderings/", null=True, blank=True)
     metrics     = models.JSONField(default=list)
 
     active      = models.BooleanField()

irie/apps/prediction/predictor.py

@@ -17,9 +17,9 @@ from .runners.opensees import OpenSeesRunner
 from .runners.ssid import SystemIdRunner 
 
 PREDICTOR_TYPES : Dict[str, Runner] = {
-    # "IRIE_PREDICTOR_V1" : PredictorType1,
+    "IRIE_PREDICTOR_V1" : OpenSeesRunner,
     "IRIE_PREDICTOR_T2" : SystemIdRunner,
-    "" :                  SystemIdRunner,
+#   "" :                  SystemIdRunner,
 #   "IRIE_PREDICTOR_T3" : PredictorType3,
     "IRIE_PREDICTOR_T4" : OpenSeesRunner,
 }

irie/apps/prediction/runners/__init__.py

@@ -1,3 +1,8 @@
+#===----------------------------------------------------------------------===#
+#
+#         STAIRLab -- STructural Artificial Intelligence Laboratory
+#
+#===----------------------------------------------------------------------===#
 from pathlib import Path
 from typing import NewType
 from abc import abstractmethod

irie/apps/prediction/runners/hazus.py

@@ -47,11 +47,10 @@ class HazusRunner(Runner):
     platform = "mdof"
 
     schema = {
-      "title": "System ID",
-      "name": "P2",
+      "title": "Hazus",
       "type": "object",
       "required": [
-        "name",
+        "soil_type",
         "decimation",
         "method",
         "channels"
@@ -60,26 +59,12 @@ class HazusRunner(Runner):
         "name": {
           "type": "string",
           "title": "Name",
-          "description": "Predictor name",
-          "minLength": 2,
-          # "default": "S1"
+          "default": "Hazus"
         },
-        "method": {
+        "soil_type": {
           "type": "string",
-          "title": "Method",
-          "enum": ["Fourier Spectrum","Response Spectrum","SRIM","OKID"]
-        },
-        "damping": {
-          "type": "number",
-          "title": "Damping",
-          "default": 0.02,
-          "options": {"dependencies": {"method": ["Response Spectrum"]}},
-          "description": "assumed damping ratio"
-        },
-        "channel": {
-          "type": "integer",
-          "title": "Channel",
-          "description": ""
+          "title": "Soil type",
+          "enum": ["A","B","C","D"]
         }
       }
     }
@@ -162,6 +147,7 @@ def hazus_fragility(
 
     return dict(sa_range=sa_range, curves=curves)
 
+
 def hazus_prediction(
         nbi_data: dict,
         soil_type: str = "B",  # Soil classification ("A", "B", "C", "D", "E")
@@ -324,11 +310,11 @@ def modify_ground_motion(soil_type: str, pga: float, sa_03s: float, sa_10s: floa
         ],
         "FA": [
             (0.25, {"A": 0.8, "B": 0.9, "C": 1.3, "D": 1.6, "E": 2.4}),
-            (0.5, {"A": 0.8, "B": 0.9, "C": 1.3, "D": 1.4, "E": 1.7}),
+            (0.50, {"A": 0.8, "B": 0.9, "C": 1.3, "D": 1.4, "E": 1.7}),
             (0.75, {"A": 0.8, "B": 0.9, "C": 1.2, "D": 1.2, "E": 1.3}),
-            (1.0, {"A": 0.8, "B": 0.9, "C": 1.2, "D": 1.1, "E": 1.1}),
+            (1.00, {"A": 0.8, "B": 0.9, "C": 1.2, "D": 1.1, "E": 1.1}),
             (1.25, {"A": 0.8, "B": 0.9, "C": 1.2, "D": 1.0, "E": 0.9}),
-            (1.5, {"A": 0.8, "B": 0.9, "C": 1.2, "D": 1.0, "E": 0.8}),
+            (1.50, {"A": 0.8, "B": 0.9, "C": 1.2, "D": 1.0, "E": 0.8}),
         ],
         "FV": [
             (0.1, {"A": 0.8, "B": 0.8, "C": 1.5, "D": 2.4, "E": 4.2}),
@@ -420,11 +406,11 @@ def _get_i_shape(bridge_type: int) -> int:
     """
     # Mapping of bridge types to I_shape values from Table 7-1
     i_shape_mapping = {
-        1: 0, 2: 0, 3: 1, 4: 1, 5: 0, 6: 0,
-        7: 0, 8: 0, 9: 0, 10: 1, 11: 1, 12: 0,
-        13: 0, 14: 0, 15: 1, 16: 1, 17: 0, 18: 0,
-        19: 0, 20: 0, 21: 0, 22: 1, 23: 1, 24: 0,
-        25: 0, 26: 1, 27: 1,
+        1 : 0,   2 : 0,   3 : 1,   4 : 1,   5 : 0,   6 : 0,
+        7 : 0,   8 : 0,   9 : 0,   10: 1,   11: 1,   12: 0,
+        13: 0,   14: 0,   15: 1,   16: 1,   17: 0,   18: 0,
+        19: 0,   20: 0,   21: 0,   22: 1,   23: 1,   24: 0,
+        25: 0,   26: 1,   27: 1,
     }
 
     if bridge_type not in i_shape_mapping:
@@ -537,38 +523,37 @@ def _hazus_type(properties: dict) -> int:
     HWB5  101 106  Non-CA <  1990 N/A   N/A N/A EQ1 0 Conventional Multi-Col. Bent, Simple  Support - Concrete 
     HWB6  101 106  CA     <  1975 N/A   N/A N/A EQ1 0 Conventional Multi-Col. Bent, Simple  Support - Concrete 
     HWB7  101 106  Non-CA >= 1990 N/A   N/A N/A EQ1 0 Seismic      Multi-Col. Bent, Simple  Support - Concrete 
-        101 106  CA     >= 1975 N/A   N/A N/A EQ1 0 Seismic      Multi-Col. Bent, Simple  Support - Concrete
+          101 106  CA     >= 1975 N/A   N/A N/A EQ1 0 Seismic      Multi-Col. Bent, Simple  Support - Concrete
     HWB8  205 206  CA     <  1975 N/A   N/A N/A EQ2 0 Conventional Single Col., Box Girder -  Continuous Concrete 
     HWB9  205 206  CA     >= 1975 N/A   N/A N/A EQ3 0 Seismic      Single Col., Box Girder -  Continuous Concrete 
     HWB10 201 206  Non-CA <  1990 N/A   N/A N/A EQ2 1 Conventional Continuous Concrete 
-        201 206  CA     <  1975 N/A   N/A N/A EQ2 1 Conventional Continuous Concrete 
+          201 206  CA     <  1975 N/A   N/A N/A EQ2 1 Conventional Continuous Concrete 
     HWB11 201 206  Non-CA >= 1990 N/A   N/A N/A EQ3 1 Seismic      Continuous Concrete 
-        201 206  CA     >= 1975 N/A   N/A N/A EQ3 1 Seismic      Continuous Concrete 
+          201 206  CA     >= 1975 N/A   N/A N/A EQ3 1 Seismic      Continuous Concrete 
     HWB12 301 306  Non-CA <  1990 N/A   N/A No  EQ4 0 Conventional Multi-Col. Bent, Simple  Support - Steel 
     HWB13 301 306  CA     <  1975 N/A   N/A No  EQ4 0 Conventional Multi-Col. Bent, Simple  Support - Steel 
     HWB14 301 306  Non-CA >= 1990 N/A   N/A N/A EQ1 0 Seismic      Multi-Col. Bent, Simple  Support - Steel 
-        301 306  CA     >= 1975 N/A   N/A N/A EQ1 0 Seismic      Multi-Col. Bent, Simple  Support - Steel 
+          301 306  CA     >= 1975 N/A   N/A N/A EQ1 0 Seismic      Multi-Col. Bent, Simple  Support - Steel 
     HWB15 402 410  Non-CA <  1990 N/A   N/A No  EQ5 1 Conventional Continuous Steel 
-        402 410  CA     <  1975 N/A   N/A No  EQ5 1 Conventional Continuous Steel 
+          402 410  CA     <  1975 N/A   N/A No  EQ5 1 Conventional Continuous Steel 
     HWB16 402 410  Non-CA >= 1990 N/A   N/A N/A EQ3 1 Seismic      Continuous Steel 
-        402 410  CA     >= 1975 N/A   N/A N/A EQ3 1 Seismic      Continuous Steel 
+          402 410  CA     >= 1975 N/A   N/A N/A EQ3 1 Seismic      Continuous Steel 
     HWB17 501 506  Non-CA <  1990 N/A   N/A N/A EQ1 0 Conventional Multi-Col. Bent, Simple  Support - Prestressed  Concrete 
     HWB18 501 506  CA     <  1975 N/A   N/A N/A EQ1 0 Conventional Multi-Col. Bent, Simple  Support - Prestressed  Concrete 
     HWB19 501 506  Non-CA >= 1990 N/A   N/A N/A EQ1 0 Seismic      Multi-Col. Bent, Simple  Support - Prestressed  Concrete
-        501 506  CA     >= 1975 N/A   N/A N/A EQ1 0 Seismic      Multi-Col. Bent, Simple  Support - Prestressed  Concrete 
+          501 506  CA     >= 1975 N/A   N/A N/A EQ1 0 Seismic      Multi-Col. Bent, Simple  Support - Prestressed  Concrete 
     HWB20 605 606  CA     <  1975 N/A   N/A N/A EQ2 0 Conventional Single Col., Box Girder -  Prestressed Continuous  Concrete 
     HWB21 605 606  CA     >= 1975 N/A   N/A N/A EQ3 0 Seismic      Single Col., Box Girder -  Prestressed Continuous  Concrete 
     HWB22 601 607  Non-CA <  1990 N/A   N/A N/A EQ2 1 Conventional Continuous Concrete
-        601 607  CA     <  1975 N/A   N/A N/A EQ2 1 Conventional Continuous Concrete
+          601 607  CA     <  1975 N/A   N/A N/A EQ2 1 Conventional Continuous Concrete
     HWB23 601 607  Non-CA >= 1990 N/A   N/A N/A EQ3 1 Seismic      Continuous Concrete
-        601 607  CA     >= 1975 N/A   N/A N/A EQ3 1 Seismic      Continuous Concrete 
+          601 607  CA     >= 1975 N/A   N/A N/A EQ3 1 Seismic      Continuous Concrete 
     HWB24 301 306  Non-CA <  1990 N/A   N/A Yes EQ6 0 Conventional Multi-Col. Bent, Simple  Support - Steel 
     HWB25 301 306  CA     <  1975 N/A   N/A Yes EQ6 0 Conventional Multi-Col. Bent, Simple  Support - Steel 
     HWB26 402 410  Non-CA <  1990 N/A   N/A Yes EQ7 1 Conventional Continuous Steel 
     HWB27 402 410  CA     <  1975 N/A   N/A Yes EQ7 1 Conventional Continuous Steel 
     HWB28 N/A N/A All other bridges that are not classified 
 
-
     --------------------------
 
     Table 9-7: Hazus Highway System Classification

irie/apps/prediction/runners/opensees/__init__.py

@@ -69,7 +69,7 @@ class OpenSeesRunner(Runner):
         predictor.name = data.pop("name")
         predictor.config = data
         predictor.asset = asset
-        predictor.protocol = "IRIE_PREDICTOR_T4"
+        predictor.protocol = "IRIE_PREDICTOR_V1"
         predictor.active = True
         return predictor
 

irie/apps/prediction/runners/ssid.py

@@ -1,3 +1,8 @@
+#===----------------------------------------------------------------------===#
+#
+#         STAIRLab -- STructural Artificial Intelligence Laboratory
+#
+#===----------------------------------------------------------------------===#
 from irie.apps.events.models import EventRecord
 from irie.apps.prediction.runners import Runner, RunID
 from irie.apps.prediction.models import PredictorModel
@@ -47,7 +52,6 @@ class SystemIdRunner(Runner):
           "title": "Name",
           "description": "Predictor name",
           "minLength": 2,
-          # "default": "S1"
         },
         "method": {
           "type": "string",

irie/apps/prediction/templatetags/predictor.py

@@ -9,7 +9,6 @@ def display_predictor(predictor):
     out = out + predictor.description
     out = out + "\n".join((out, '<table class="table align-items-center"><tbody>'))
 
-    #for key, val in predictor.conf.get("config", {}).items():
     for key, val in predictor.conf.items():
         name = predictor.schema["properties"].get(key, {"name": key}).get("name", key)
         out = out + f"<tr><td>{name}</td><td><code>{val}</code></td><tr>"

irie/apps/prediction/views.py

@@ -21,7 +21,7 @@ from django.shortcuts import render
 
 from irie.apps.site.view_utils import raise404
 from irie.apps.inventory.models import Asset
-from irie.apps.prediction.predictor import PREDICTOR_TYPES, OpenSeesRunner
+from irie.apps.prediction.predictor import PREDICTOR_TYPES
 from irie.apps.prediction.models import PredictorModel
 from .forms import PredictorForm
 
@@ -103,9 +103,8 @@ def predictor_upload(request, calid):
 
     html_template = loader.get_template("prediction/predictor-upload.html")
 
-    if request.method == 'POST':
-        form = PredictorForm(request.POST, request.FILES)  # include request.FILES
-        # if form.is_valid():
+    if request.method == "POST":
+        form = PredictorForm(request.POST, request.FILES)
         asset = Asset.objects.get(calid=calid)
 
         # Save the predictor
@@ -119,12 +118,12 @@ def predictor_upload(request, calid):
 
 
     try:
-        return render(request, 'prediction/predictor-upload.html', {"form": form})
+        return render(request, "prediction/predictor-upload.html", {"form": form})
 
     except Exception as e:
         if "DEBUG" in os.environ and os.environ["DEBUG"]:
             raise e
         html_template = loader.get_template("site/page-500.html")
-        return HttpResponse(html_template.render(context, request))
+        return HttpResponse(html_template.render({}, request))
 
 

irie/apps/prediction/views_api.py

@@ -25,8 +25,6 @@ from rest_framework.permissions import IsAuthenticated
 
 from .models import Event
 from irie.apps.inventory.models import Asset
-# from irie.apps.evaluation.evaluation import (run_evaluation,
-#                                         add_evaluation)
 from irie.apps.evaluation.models import Evaluation
 import quakeio
 
@@ -40,7 +38,6 @@ def serialize_event(event):
     else:
         serialized["event_file"] = None
 
-    #serialized["data_str"] = json.loads(event.data_str) if event.data_str else {}
     return serialized
 
 
@@ -116,7 +113,6 @@ def save_event(request, event, success_status):
     event.cesmd = "CE" + event.motion_data["station_number"]
     event.asset = Asset.objects.get(cesmd="CE" + event.motion_data["station_number"])
     event.event_file = event_file
-#   if event_file is not None:
 
     event.save()
 

irie/apps/site/view_utils.py

@@ -7,7 +7,7 @@ def raise404(request, context={}, error=None):
     if error is not None and "DEBUG" in os.environ and os.environ["DEBUG"]:
         raise error
     if "segment" in context:
-        html_template = loader.get_template("home/page-404-sidebar.html")
+        html_template = loader.get_template("site/page-404-sidebar.html")
     else:
-        html_template = loader.get_template("home/page-404.html")
+        html_template = loader.get_template("site/page-404.html")
     return HttpResponse(html_template.render(context, request))

irie/apps/sitemaps.py

@@ -1,13 +1,18 @@
+#===----------------------------------------------------------------------===#
+#
+#         STAIRLab -- STructural Artificial Intelligence Laboratory
+#
+#===----------------------------------------------------------------------===#
 from django.contrib.sitemaps import Sitemap
 from django.urls import reverse
 
 class IrieSitemap(Sitemap):
     priority = 0.9
-    changefreq = 'weekly'
+    changefreq = "weekly"
 
     def items(self):
         # Return the names of your static views
-        return ['home', 'about', 'dashboard', 'asset_table']
+        return ["home", "about", "dashboard", "asset_table"]
 
     def location(self, item):
         return reverse(item)

irie/apps/templates/inventory/asset-profile.html

@@ -205,9 +205,9 @@
     </details>
     
 
-    {% if asset.cesmd %}
+    {% if asset.cesmd or hazus %}
     <details id="event-table" open><summary><h3>Health History</h3></summary>
-
+      {% if asset.cesmd %}
       <div class="row">
           <div class="col-8 mb-4">
             <!-- <div class="card bg-white-100 border-0 shadow table-wrapper table-responsive"> -->
@@ -215,6 +215,7 @@
             <!-- </div> -->
           </div>
       </div>
+      {% endif %}
 
       {# Hazus #}
       <div class="row">

irie/core/settings.py

@@ -222,3 +222,9 @@ LOGGING = {
         "level": "DEBUG",
     },
 }
+
+if not DEBUG:
+    SECURE_SSL_REDIRECT = True
+    # Specific to Heroku:
+    SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https')
+

irie/init/__main__.py

@@ -7,7 +7,13 @@ from django.core.management import execute_from_command_line, call_command
 
 cd = pathlib.Path(__file__).parents[0]
 
-def init(settings):
+def init(argv):
+    settings = argv[1]
+
+    if len(argv) > 2:
+        actions = argv[2]
+    else:
+        actions = "magcp"
 
     os.environ.setdefault('DJANGO_SETTINGS_MODULE', settings)
 
@@ -16,21 +22,25 @@ def init(settings):
         "migrate"
     ])
 
-    call_command("makemigrations")
-
-    call_command("migrate")
+    if "m" in actions:
+        call_command("makemigrations")
+        call_command("migrate")
 
-#   call_command("init_assets")
+    if "a" in actions:
+        call_command("init_assets")
 
-    call_command("init_cesmd")
+    if "g" in actions:
+        call_command("init_cesmd")
 
-#   call_command("init_corridors")
+    if "c" in actions:
+        call_command("init_corridors")
 
-#   call_command("init_predictors")
+    if "p" in actions:
+        call_command("init_predictors")
 
 
 
 
 if __name__ == "__main__":
-    init(sys.argv[1])
+    init(sys.argv)
 

irie/init/bridges.py

@@ -1,3 +1,8 @@
+#===----------------------------------------------------------------------===#
+#
+#         STAIRLab -- STructural Artificial Intelligence Laboratory
+#
+#===----------------------------------------------------------------------===#
 # - clean names
 # - add descriptions
 import sys
@@ -16,7 +21,7 @@ PYTHON = sys.executable
 
 CE58658 = {
     "channels": {
-    # channel node dof rotationangle locationname
+    # channel node  dof rotation angle location name
         "1":  (1031, 3,  37.66*pi/180, "abutment_1"),
         "2":  (1031, 2,  37.66*pi/180, "abutment_1"),
         "3":  (1031, 1,  37.66*pi/180, "abutment_1"),
@@ -64,9 +69,12 @@ CE58658 = {
         {'key': 12020, 'strain': True, 'label': 'Bent 12 South'}, 
         {'key': 12030, 'strain': True, 'label': 'Bent 12 Center'},
         {'key': 13010, 'strain': True, 'label': 'Bent 13 South, NE Line'}, 
-        {'key': 13020, 'strain': True, 'label': 'Bent 13 North, NE Line'}, {'key': 13040, 'strain': False, 'label': 'Bent 13, NR Line'}, 
-        {'key': 14010, 'strain': True, 'label': 'Bent 14 South, NE Line'}, {'key': 14020, 'strain': True, 'label': 'Bent 14 North, NE Line'}, 
-        {'key': 14030, 'strain': True, 'label': 'Bent 14 Center, NE Line'}, {'key': 14040, 'strain': False, 'label': 'Bent 14, NR Line'}
+        {'key': 13020, 'strain': True, 'label': 'Bent 13 North, NE Line'}, 
+        {'key': 13040, 'strain': False, 'label': 'Bent 13, NR Line'}, 
+        {'key': 14010, 'strain': True, 'label': 'Bent 14 South, NE Line'}, 
+        {'key': 14020, 'strain': True, 'label': 'Bent 14 North, NE Line'}, 
+        {'key': 14030, 'strain': True, 'label': 'Bent 14 Center, NE Line'}, 
+        {'key': 14040, 'strain': False, 'label': 'Bent 14, NR Line'}
     ],
     "bents": [
         {'node': 203, 'record': True, 'label': 'Bent 2 North'},
@@ -202,9 +210,8 @@ BRIDGES = {
            },
         ]
     },
-    "CE24704": {
-       "cesmd":  "CE24704", 
-       "calid": "53-2791 (07-LA-10-8.8)",
+    "CE24704": { # La Cienega
+       "cesmd":  "CE24704",
        "name": "Los Angeles - I10/La Cienega Bridge",
         "accelerometers": {
             "ground_channels": [9, 10, 11], 
@@ -233,7 +240,7 @@ BRIDGES = {
            },
         ]
     },
-    "CE24706": {
+    "CE24706": { # Palmdale
        "cesmd":  "CE24706", 
        "calid": "53-1794 (07-LA-14-R57.37)",
        "name": "Palmdale - Hwy 14/Barrel Springs Bridge",
@@ -264,7 +271,7 @@ BRIDGES = {
            }
         ]
     },
-    "CE24775": {
+    "CE24775": { # Grapevine
        "cesmd":  "CE24775", 
        "calid": "50-0271 (06-KER-5-4.1)",
        "name": "Grapevine - I5/Lebec Rd Bridge",
@@ -299,7 +306,7 @@ BRIDGES = {
            }
         ]
     },
-    "CE47315": {
+    "CE47315": { # San Juan Bautista
        "cesmd":  "CE47315", 
        "calid": "43-0031E (05-SBT-156-0.00)",
        "name": "San Juan Bautista - Hwy 101/156 Overpass",
@@ -334,7 +341,7 @@ BRIDGES = {
         #    }
         ]
     },
-    "CE68185": { #  (Alfred Zampa Memorial Bridge) (Carquinez West, Southbound, Suspension)
+    "CE68185": { # (Carquinez West, Southbound, Suspension) (Alfred Zampa Memorial Bridge) 
        "cesmd":  "CE68185",
        "calid": "28-0352L (04-SOL-80-0.01)",
        "name": "Vallejo - Carquinez/I80 West Bridge",
@@ -428,7 +435,7 @@ BRIDGES = {
             }
         ]
     },
-    "CE79421": {
+    "CE79421": { # Leggett
        "cesmd":  "CE79421", 
        "calid": "10-0299 (01-MEN-101-160.03)",
        "name": "Leggett - Hwy 101/Confusion Hill Bridge",
@@ -487,7 +494,7 @@ BRIDGES = {
            }
         ]
     },
-    "CE89708": {
+    "CE89708": { # Arcata
        "cesmd":  "CE89708", 
        "calid": "04-0170 (01-HUM-101-R92.99)",
        "name": "Arcata - Hwy 101/Murray Road Bridge",
@@ -604,7 +611,7 @@ BRIDGES = {
            }
         ]
     },
-    "CE89973": {
+    "CE89973": { # rio-dell eel river
        "cesmd":  "CE89973", 
        "calid": "04-0016R (01-HUM-101-53.9)",
        "Location": "40.5093 N, 124.1196 W",
@@ -667,7 +674,7 @@ BRIDGES = {
            }
         ]
     },
-    "CE24694": { # sylmar
+    "CE24694": { # Sylmar
         "cesmd": "CE24694",
         "calid": "53-2795F",
         "Location": "34.3349 N, 118.5084 W",
@@ -706,7 +713,7 @@ BRIDGES = {
             }
         ]
     },
-    "CE13795": { # capistrano
+    "CE13795": { # Capistrano
        "cesmd": "CE13795", 
        "calid": "55-0225 (07-ORA-5-6.62)",
        "name": "Capistrano Beach - I5/Via Calif. Bridge",
@@ -994,7 +1001,7 @@ BRIDGES = {
             {
                 "name": f"OpenSees",
                 "metrics": [*LINEAR_METRICS, *NONLINEAR_METRICS],
-                "protocol": "IRIE_PREDICTOR_T4",
+                "protocol": "IRIE_PREDICTOR_V1",
                 "entry_point": [PYTHON, "-mCE58658", f"Procedures/nonlinear.tcl"],
                 "platform": "OpenSees",
                 "active": False,
@@ -1043,27 +1050,8 @@ BRIDGES = {
             },
         ]
     },
-    # "CE68682": {
-    #     "cesmd": "CE68682", 
-    #     "calid": "28-0153 (04-CC-68-25.04)"},
-
-    # "CE58600": {
-    #    "cesmd": "CE58600", 
-    #    "calid": "34-0006 (04-SF-80-13.2)",
-    #    "name": "Oakland - SF Bay Bridge/East: SAS",
-    #    "predictors": [
-    #        {
-    #            "name": "SRIM_tran", "description": "Transverse configuration.", "protocol": "", "metrics": ["SPECTRAL_SHIFT_IDENTIFICATION"], "entry_point": [PYTHON, "-m", "mdof", "srim"],
-    #            "config": {
-    #                 "--decimate", SS_DEC, "--ss-size", 12, "--arx-order", 190, 
-    #                 "--inputs", "[4,28,71]", "--outputs", "[9,33,51,71]"
-    #             ],
-    #        }
-    #     ]
-    # },
     # "CE58700": {
-    #    "cesmd":  "CE58700", 
-    #    "calid": "CE58700",
+    #    "cesmd":  "CE58700",
     #    "name": "San Francisco - Golden Gate Bridge",
     #    "predictors": [
     #        {
@@ -1095,8 +1083,7 @@ BRIDGES = {
     #     ]
     # },
     # "CE58601": {
-    #    "cesmd":  "CE58601", 
-    #    "calid": "34-0006 (04-SF-80-8.7)",
+    #    "cesmd":  "CE58601",
     #    "name": "Oakland - SF Bay Bridge/East: Skyway",
     #    "predictors": [
     #        {

irie/init/calid.py

@@ -1,34 +1,115 @@
-
+#===----------------------------------------------------------------------===#
+#
+#         STAIRLab -- STructural Artificial Intelligence Laboratory
+#
+#===----------------------------------------------------------------------===#
 CESMD = {
-#   "CE89324":                     {},
-#   "CE58700":                     "CE58700", # CE58700
-    "04-0236":                     "CE89324", # painter
-    "04-0228":    "CE89686", # eureka-samoa
-    "10-0299": "CE79421", # CE79421
-    "23-0015R":   "CE68184", # carquinez-east-northbound
-    "28-0352L":   "CE68185", # carquinez-west-southbound
-    "28-0153":    "CE68682", # CE68682
-    "33-0214L":                    "CE58658", # hayward
-    "34-0003":      "CE58632", # CE58632
-    "34-0006":     "CE58600", # CE58600
-    "34-0006":      "CE58601", # CE58601
-    "04-0016R":  "CE89973", # CE89973
-    "04-0170": "CE89708", # CE89708
-    "04-0229":    "CE89735", # CE89735
-    "04-0230":    "CE89736", # CE89736
-
-    "43-0031E":    "CE47315", # CE47315
-    "47-0048":                     "CE54730", # crowley
-    "50-0271":      "CE24775", # CE24775
-    "50-0340":      "CE33742", # ridgecrest
-    "53-1471":      "CE14406", # CE14406
-    "53-1794":      "CE24706", # CE24706
-    "53-2791":      "CE24704", # CE24704
-    "53-2795F":                    "CE24694", # sylmar
-    "54-0823G":                     "CE23631", # bernardino
-    "55-0225":      "CE13795", # capistrano
-    "56-0586G":     "CE13705", # CE13705
-    "58-0215":                     "CE01336", # meloland
+    "56-0586G":  "CE13705", # "08-RIV-15-R41.57",   "Corona - I15/Hwy91 Interchange Bridge"
+    "53-1471":   "CE14406", # "07-LA-47-0.86",      "Vincent Thomas Bridge"
+    "53-2791":   "CE24704", # "07-LA-10-8.8",       "La Cienega Bridge"
+    "53-1794":   "CE24706", # "07-LA-14-R57.37",    "Palmdale - Hwy 14/Barrel Springs Bridge"
+    "50-0271":   "CE24775", # "06-KER-5-4.1",       "Grapevine - I5/Lebec Rd Bridge"
+    "43-0031E":  "CE47315", # "05-SBT-156-0.00",    "San Juan Bautista - Hwy 101/156 Overpass"
+    "28-0352L":  "CE68185", # "04-SOL-80-0.01",     "Vallejo - Carquinez/I80 West Bridge"
+    "23-0015R":  "CE68184", # "04-SOL-80-12.8",     "Vallejo - Carquinez/I80 East Bridge"
+    "10-0299":   "CE79421", # "01-MEN-101-160.03",  "Confusion Hill Bridge (Leggett, Hwy 101)"
+    "04-0170":   "CE89708", # "01-HUM-101-R92.99",  "Arcata - Hwy 101/Murray Road Bridge"
+    "04-0229":   "CE89735", # "01-HUM-255-0.7",     "Eureka - Middle Channel Bridge"
+    "04-0230":   "CE89736", # "01-HUM-255-0.2",     "Eureka - Eureka Channel Bridge"
+    "04-0016R":  "CE89973", # "01-HUM-101-53.9",    "Rio Dell - Hwy 101/Eel River Bridge"
+    "50-0340":   "CE33742", # "09-KER-395-R25.08",  "Ridgecrest - Hwy 395/Brown Road Bridge"
+    "53-2795F":  "CE24694", # "07-LA-5-24.5",       "Sylmar - I5/14 Interchange Bridge"
+    "55-0225":   "CE13795", # "07-ORA-5-6.62",      "Capistrano Beach - I5/Via Calif. Bridge"
+
+    "58-0215":   "CE01336", # "El Centro - Hwy8/Meloland Overpass [Abandoned]"
+    "47-0048":   "CE54730", # "Lake Crowley - Hwy 395 Bridge"
+    "04-0228":   "CE89686", # "Eureka - Samoa Channel Bridge"
+    "04-0236":   "CE89324", # "Rio Dell - Hwy 101/Painter St. Overpass"
+    "54-0823G":  "CE23631", # "San Bernardino - I10/215 Interchange Br"
+    "33-0214L":  "CE58658", # "Hayward - Hwy 580/238 Interchange Bridge"
+
+#-------------------------------------
+
+    "34-0006":   "CE58600", # "Oakland - SF Bay Bridge/East: SAS"
+#   "34-0006":   "CE58601", # "04-SF-80-8.7", "Oakland - SF Bay Bridge/East: Skyway"
+#   "34-0006":   "CE58602", # "Oakland - SF Bay Bridge/East: YBITS"
+#   "34-0006":   "CE58603", # "Oakland - SF Bay Bridge/East: E Approach"
+    "34-0003":   "CE58632", # "04-SF-80-5.6", "San Francisco - Bay Bridge/West"
+
+    "35-0054":   "CE58677", # "San Mateo Bridge"
+#   "35-0054":   "CE58799", # "San Mateo Bridge Trestle"
+    "53-3032":   "CE14709", # "Long Beach - Schuyler Heim Bridge"
+    "51-0104":   "CE25749", # "Santa Barbara - San Roque Canyon Bridge"
+    "44-0298":   "CE47646", # "Big Sur - New Hwy 1/Pfeiffer Cnyn Bridge"
+    "44-0060":   "CE47729", # "Big Sur - Hwy 1/Pfeiffer Canyon Bridge [Demolished]"
+#   "37-0470L":  "CE57748", # "Santa Clara - Hwy 237/Alviso Overpass"
+#   "37-0470K":  "CE57748", # "Santa Clara - Hwy 237/Alviso Overpass"
+    "27-0013":   "CE68778", # "Novato - Hwy37/Petaluma River Bridge"
+    "17-0058L":  "CE76741", # "Truckee - I80/Truckee River Bridge"
+    "06-0210":   "CE88638", # "Shasta Lake - I5/Antlers Bridge"
+    "54-0474F":  "CE12666", # "North Palm Springs - I10/Hwy 62 Bridge"
+    "53-1185":   "CE14690", # "Los Angeles - I405/San Gabriel River Br"
+    "50-0402R":  "CE34715", # "Mojave - Hwy 14/Railroad Bridge"
+    "33-0347S":  "CE58656", # "Oakland - Hwy 580/13 Interchange Bridge"
+    "33-0302H":  "CE58657", # "Oakland - Hwy 580/24 Interchange Bridge"
+#   "35-0285":   "CE58678", # "Belmont - I280 Pedestrian Bridge"
+
+    "01-0020":   "CE99190", # "01-DN-101-36.06",     "Crescent City - Hwy 101/Smith Rvr Bridge"
+    "01-0028":   "CE99710", # "01-DN-101-R4.04",     "Klamath - Hwy 101/Klamath River Bridge"
+    "10-0081":   "CE69760", # "01-MEN-101-R9.53",    "Hopland - Hwy 101/Railroad Bridge"
+    "10-0134":   "CE79683", # "01-MEN-1-43.00",      "Albion - Hwy 1/Salmon Creek Bridge"
+    "10-0031":   "CE79757", # "01-MEN-271-5.2",      "Leggett - Cedar Creek Bridge"
+    "10-0030":   "CE79761", # "01-MEN-271-4.9",      "Leggett - Big Dann Bridge"
+    "10-0176":   "CE79296", # "01-MEN-1-96.9",       "Fort Bragg - Hwy 1/Noyo River Bridge"
+
+    "06-0021":   "CE88194", # "02-SHA-5-R28.14",     "Redding - I5/Shasta Lake Bridge"
+
+    "24-0045":   "CE67972", # "03-YOL-80-7.25",      "West Sacramento - I80/Yolo Causeway"
+
+    "35-0038":   "CE58596", # "04-SM-84-29.0",       "Dumbarton Bridge"
+    "35-0130":   "CE58536", # "04-SM-101-23.7",      "South San Francisco - Sierra Pt Overpass"
+    "35-0031":   "CE58754", # "04-SM-1-20.82",       "Half Moon Bay - Hwy 1/Tunitas Cr. Bridge"
+    "28-0009":   "CE67771", # "04-CC-160-0.82",      "Antioch - San Joaquin River Bridge"
+    "28-0153":   "CE68682", # "04-CC-68-25.04",      "Benicia - Martinez"
+    "28-0153R":  "CE68322", # "04-CC,Sol-680-L0.0",  "Benicia - Martinez/I680 East Bridge"
+    "28-0100":   "CE58258", # "04-CC,MRN-580-6.1/7.8,0.0/2.6", "Richmond - San Rafael Bridge"
+    "36-0088R":  "CE47707", # "04-SCR-1-R1.59",      "Watsonville - Hwy1/Struve Slough Bridge"
+    "20-0195":   "CE69671", # "04-SON-1-19.72",      "Jenner - Hwy 1/Russian River Bridge"
+    "20-0235":   "CE68717", # "04-SON-101-13.88",    "Rohnert Park - Hwy 101 Bridge"
+
+    "51-0090":   "CE26917", # "05-SB-01-R6.78",      "Lompoc - Hwy 1/El Jaro Creek Bridge"
+    "49-0036":   "CE36668", # "05-SLO-46-54.77",     "Parkfield - Hwy 46/Cholame Creek Bridge"
+    "49-0046":   "CE37728", # "05-SLO-52.92",        "San Simeon - Hwy 1/San Simeon Crk Bridge"
+    "51-0066":   "CE25758", # "05-SB-166-R69.94",    "Cuyama - Hwy 166/Cuyama River Bridge"
+
+    "53-1630G":  "CE24670", # "07-LS-405-29.43",     "Los Angeles - I10/405 Interchange Bridge"
+    "53-2318G":  "CE24689", # "07-LA-134-R13.25",    "Pasadena - I210/Hwy134 Interchnge Bridge"
+    "52-0449":   "CE25324", # "07-VEN-101-37.21",    "Oxnard - Hwy 101/Santa Clara Rvr Bridge"
+    "52-0331L":  "CE24738", # "07-VEN-023/118-21.0", "Moorpark - Hwy 23/118 Bridge"
+    "52-0214L":  "CE25725", # "07-VEN-101-R26",      "Ventura - Hwy101/Telephone Rd. Bridge"
+
+    "54-1177":   "CE22503", # "08-SBd-18,38-44.4",   "Big Bear Lake - Hwys 18 & 38 Bridge"
+    "56-0452F":  "CE12649", # "08-RIV-10-6.67",      "Beaumont - I10/60 Interchange Bridge"
+    "54-0783R":  "CE23650", # "08-SBD-15-16.35",     "Devore - I15/215 Interchange Bridge"
+
+    "23-0064":   "CE68065", # "10-SOL-37-R7.39",     "Vallejo - Hwy 37/Napa River Bridge"
+
+    "57-0520L":  "CE03731", # "11-SD-5-25.91",       "San Diego - I5/Hwy 52 Interchange Bridge"
+    "57-0857":   "CE03679", # "11-SD-75-R20.49",     "San Diego - Coronado Bridge"
+    "27-0052":   "CE58700", # "",                    "San Francisco - Golden Gate Bridge",
 }
 
+"""
+    "":   "CE24714", # "San Fernando - I210/Hwy 118 Bridge [Abandoned]"
+    "":   "CE25697", # "Cuyama Valley - Hwy 33/Quatal Cyn Bridge [Abandoned]"
+    "":   "NP5235",  # "Riverside; Santa Ana River Bridge"
+    "":   "NP1571",  # "San Jose; Interchange 101/280/680"
+
+    "":   "CE58414", # "Pacifica - Hwy1/Devils Slide Bridge"
+    "":   "CE57595", # "Fremont - Channel B Bridge"
+    "":   "CE14703", # "Long Beach - Gerald Desmond Bridge",
+    "":   "CE58501", # "Hayward - BART Elevated Section",
+    "":   "CE58633", # "San Francisco - Bay Bridge/East [Abandoned]",
+"""
+
 CALID = {v: k for k, v in CESMD.items()}

{irie-0.0.21.dist-info → irie-0.0.22.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: irie
-Version: 0.0.21
+Version: 0.0.22
 Summary: An infrastructure resilience engine
 Author-email: "Claudio M. Perez" <50180406+claudioperez@users.noreply.github.com>
 Project-URL: Repository, https://github.com/STAIRLab

{irie-0.0.21.dist-info → irie-0.0.22.dist-info}/RECORD

@@ -1,9 +1,9 @@
 irie/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 irie/__main__.py,sha256=JTbP1tFc8z2e_wXuurYT9MBe3pLt9UwY_HHnuEZvI2c,501
-irie/apps/__init__.py,sha256=wkkNngGxgYcCM745-rlvP6ynrI0b0QN3aWmLWDsR8zU,230
-irie/apps/config.py,sha256=jSCQprndMFQQIzgUWTe2Sa6MpU8iVqUoOy3cPkYOFP0,169
+irie/apps/__init__.py,sha256=0HD7vRzfFqSPsnJF15Hts06RR-MBlJcUMHaipYEkYYk,229
+irie/apps/config.py,sha256=VJW1NKjouIMBejJDbMYqmIUzZsnORQk02tuYO7bxo4s,399
 irie/apps/context_processors.py,sha256=kdMNU9-yK7rd8QWH5KxiKyQufFEmMLfZMRl7G8p7XHk,114
-irie/apps/sitemaps.py,sha256=dkSrQqjGr2Wv6BlNTKUA2V3hAIcIScXCgZ044LT1ccc,342
+irie/apps/sitemaps.py,sha256=yYjh_IXH2wBcIaSBG9-3BA8H_ijgkP0BWEFJAPpIoWc,572
 irie/apps/authentication/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 irie/apps/authentication/admin.py,sha256=2h43pTXd3NKV8-_fkUEkzkS4zqih0qBLE8q6Yj7fpEg,33
 irie/apps/authentication/config.py,sha256=kZPDGP1IwuN5r3uziuBcOw_HBO7dnBgMEpN-Z0yewpM,112
@@ -25,7 +25,7 @@ irie/apps/evaluation/admin.py,sha256=kn7L9M8Vrcc8UfmnwOV_JS8TV464-21xEKV6VyX2Ni8
 irie/apps/evaluation/apps.py,sha256=siqeOaH_tmCU0edSPIWcw_6cmvw5gHWpbeWWbuTUYGM,557
 irie/apps/evaluation/daemon.py,sha256=9iTefaGUOELIqJgeSdZUPcx7rKdRvxkVuwDpQ1DM7ME,3405
 irie/apps/evaluation/identification.py,sha256=Y1c6AlUlawas2fVOxDxowK_W1aJEDhe9b3NUYIXf40M,6183
-irie/apps/evaluation/models.py,sha256=Wks_phbD1fOG7aGj1W7XQuJB1EaUf1lWBHRdgEMqo34,2970
+irie/apps/evaluation/models.py,sha256=R4GVIJL8sfXqjxiqhM1RWfc0oe7WXqcBXhkp5SCuXuo,3049
 irie/apps/evaluation/urls.py,sha256=DnLB-MADpbZZxmdmgPbx2CAvdPv2X0pVgvoJmrYwzr0,483
 irie/apps/evaluation/views.py,sha256=vhQpT7Q-rotzmU_VB6Dx-1RxpX454cqK2nz4aIPp4YI,2341
 irie/apps/evaluation/migrations/0001_initial.py,sha256=Bu9By3pDY-Dls_dSUGBQOGlrs0dGQPRCZrOC7gxtb1I,846
@@ -34,7 +34,7 @@ irie/apps/evaluation/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm
 irie/apps/events/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 irie/apps/events/admin.py,sha256=YbPPlS1d4NZ-Ah3LVtIKER1wtVK-y7kRA9H_-ql9kRs,342
 irie/apps/events/apps.py,sha256=avHJMVjGJlpGSwhTuFSP4jkbFMeXs7wASP2H4Z2nYhE,353
-irie/apps/events/models.py,sha256=vX8gmCYdIDRiM8QWskyzdjs5-MUMNwIkPa9-AWYQG1g,3903
+irie/apps/events/models.py,sha256=YwtvQCbFKOEGhVEAlGmCCLbepxwo0Xz0uV4vQ5z8dHM,3903
 irie/apps/events/tests.py,sha256=PSZUTXteVS5Fim2upOndb1HW5Pu7DoC1r25-7_1i-so,33
 irie/apps/events/tests_events.py,sha256=iVNwnlZgqug1MtEIGS_E82wcQ7522m-0q47kreN_D90,8363
 irie/apps/events/urls.py,sha256=UrVmK0NpKvmDNH9Iad4CTbN9KdXaW4W3ZNWxPpiSgUY,1052
@@ -52,12 +52,12 @@ irie/apps/inventory/calid.py,sha256=3L8MbPIGOE3kzDnqeyY055pRBiF2O2l0cmpuDbTsdTg,
 irie/apps/inventory/fields.py,sha256=J3nTImPsuCeiOWBizSL4tnuKs36sPfXALNTKEZY-wVg,79
 irie/apps/inventory/filters.py,sha256=U7fYRyf-FicpwZ6L-U8IlRuRpCyKNFMAi0k5zAw7AGw,2184
 irie/apps/inventory/forms.py,sha256=8KaegZRIJlCEpHbdNLWEETfa4x3oGYSE_YTfwUEgyYs,400
-irie/apps/inventory/models.py,sha256=tDu25wiJ2Xj2fZ-m7r5ueK8xoRuLZI0AUgFw967uoLs,3480
-irie/apps/inventory/sitemaps.py,sha256=yc3UMVuGWA8vC9zHseY1jfkeRw5_jTYjy-UUcGtGwpU,597
+irie/apps/inventory/models.py,sha256=lAqh7UyK6cj0rScfvrdxjhurlMiKx5fN2L6OuR-g_VM,3661
+irie/apps/inventory/sitemaps.py,sha256=Nha1MTsIH_ad7JyoxwonPytp7MNuEhDNszkEUOmlN0o,826
 irie/apps/inventory/tables.py,sha256=vZdPOcbN1ibuWXqLwbBUoQw9iavwa1GJ5fd83k8bu7Y,27874
 irie/apps/inventory/traffic.py,sha256=B3PHqn2Pm4AEdUZ_tuA16fuFruo2rm5waMBwLQyF-9g,4490337
 irie/apps/inventory/urls.py,sha256=mpmHjvDSHhC5xrEosbTH_h2bGWNJfslGcrt2mnUO40E,1019
-irie/apps/inventory/views.py,sha256=xOFxT4Te6zYEFCJNKCsJF4YDk5do-HcfWpBPMvuBBsI,14549
+irie/apps/inventory/views.py,sha256=07wgzoBcLMGdN88lAKsab6lP-nLYhL8sg741wIHm8jw,14597
 irie/apps/inventory/archive/arcGIS.py,sha256=vcfsy1be4edOXD1Z3rkUnq9QmCTol7dypdF816Q3B_w,34893
 irie/apps/inventory/migrations/0001_initial.py,sha256=PwTHv4Q3gqWFha--8Zp9kUOh-cYalB14jXj7RVJUVnw,1786
 irie/apps/inventory/migrations/0002_alter_asset_bridge_sensors_and_more.py,sha256=rPzWHkjg-ZCorVA_gv6MVb5F6LTLHcwlPwhBR1PxVr0,842
@@ -75,21 +75,22 @@ irie/apps/networks/views.py,sha256=DDmu1_6WzB2D8c43DYZtnVk5N_g8_3Wtuz9gRXJBAt0,2
 irie/apps/networks/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 irie/apps/prediction/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 irie/apps/prediction/admin.py,sha256=WEPTXvwBFzh8m62Y_xusBfzqn0DXAT_wvqhCNefBano,335
-irie/apps/prediction/apps.py,sha256=NJ32eKlTL0dmZggBXSBM_9m0JafMYPBRHhHG0YSmjMk,423
-irie/apps/prediction/forms.py,sha256=qzWepBLV9cFHiXSSqeltwaV6amTU6sD3A97zkLZYhtc,644
+irie/apps/prediction/apps.py,sha256=sejLu4xx8_IwQQKTnxC_DNK-vhjiqeG0_uk2Zg1ga-M,422
+irie/apps/prediction/forms.py,sha256=TGej1UK30hlkcDGPRmLr8JujHxAqe7wIlTLZNVqXCpM,624
 irie/apps/prediction/metrics.py,sha256=Zh1utUZTGddQEVn4e1rLO74tbIz7bVvZli8sgmuB_X0,1410
-irie/apps/prediction/models.py,sha256=eapabvXuntbVxYtpBcZ74S2dHTspqJTQAtA-f5DgR_I,1444
-irie/apps/prediction/predictor.py,sha256=ih22LqQ5ofJacACDtNpeR7UdLT8Hka7V1TiEk5sFj7E,833
+irie/apps/prediction/models.py,sha256=5PK8UOwS5vQBAJX9MLtHNqWQp5c3pYGzYM9vAKaKnYA,1448
+irie/apps/prediction/predictor.py,sha256=-x_4kHWnfUxiX2aQfbl3dsbVAG4lRKAFbo1CqfZNCIc,831
 irie/apps/prediction/urls.py,sha256=59im21mNf-tr6gUMBPiyVdVRNVe9x6JHdcpvjogjuD4,847
-irie/apps/prediction/views.py,sha256=Iy2S4bi2U_IpHwY7C3-VFWgiwYztNxS5yDvh7Zr65dk,4046
-irie/apps/prediction/views_api.py,sha256=_1FrfiqRlM52G3wRuI6myD7Z1mAP2pbyhZFBo23-c-U,7123
+irie/apps/prediction/views.py,sha256=QTukWXdMy2CzIbDN6hR4bIe5Q1pan6pNfnZlPQmDvuA,3970
+irie/apps/prediction/views_api.py,sha256=DJzLYO5ouPOWkkZJNZxZJzxC3TROKJ-L6Z2IC1NMuFQ,6888
 irie/apps/prediction/migrations/0001_initial.py,sha256=-0GWd2vUUAzSPfptccAJ3raI3UD4Xj9H0E5EJ7xN0Ek,1428
 irie/apps/prediction/migrations/0002_alter_predictormodel_protocol.py,sha256=nrQvuZ1eRR7fR17IjdS0Xyw14y9DpE6HkG2-h7HQ_zA,560
+irie/apps/prediction/migrations/0003_alter_predictormodel_protocol.py,sha256=4N_vqjUddxMQBdzP1ZGBIP4uTlqWQfyBg3Dnt_w3T9A,518
 irie/apps/prediction/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-irie/apps/prediction/runners/__init__.py,sha256=lX8IvcW3iDTyrm__GtU05gdpqKsoxoTxSImcZCVPY9E,1803
-irie/apps/prediction/runners/hazus.py,sha256=LXNb1NmkEDEx1Jc5Ojv0cGdFrI4C2V4yQ8wlQGN1Uy0,30881
-irie/apps/prediction/runners/ssid.py,sha256=iJgY-7N3AT-RVbWL1K4C-tnJ1ZhCmeT6FHQTn1SmlCY,18499
-irie/apps/prediction/runners/opensees/__init__.py,sha256=fHa5k_bCKbGS-DAHPx-Tzqm5Is76DeBc0d-w7vda2ao,21177
+irie/apps/prediction/runners/__init__.py,sha256=1ABdBWttfOdjI87YxJGEFcFSLcgXMHvMqUQWNpRuxS4,2033
+irie/apps/prediction/runners/hazus.py,sha256=IxEnXlpvWR92Iq9NOby_qqcWW4TjZ8zKWxNw6XyJKjQ,30463
+irie/apps/prediction/runners/ssid.py,sha256=Y36FMPVzjNMXknQO6LegTBFUF2X-l7TXyddY4Z8SDmA,18701
+irie/apps/prediction/runners/opensees/__init__.py,sha256=QlInYqEKc1oYBnw6TeF4dS3VnOxmQeLptF9EKr-blfM,21177
 irie/apps/prediction/runners/opensees/metrics.py,sha256=HU1V0RYQDXrhTcHqwpnU2KOSl4UPNo9S6QP3sz2VcUY,6428
 irie/apps/prediction/runners/opensees/utilities.py,sha256=aPBANs6NR-EPrYsekBLx-IWvx4GbNypMtkHy3PPM6aM,9028
 irie/apps/prediction/runners/opensees/xmlutils.py,sha256=Q3i5L0Dp_5nRsKRGMr-m_bS03Mxa36Ujb-RvwAmResc,7510
@@ -102,7 +103,7 @@ irie/apps/prediction/runners/opensees/schemas/hwd_conf_default.json,sha256=t471C
 irie/apps/prediction/runners/opensees/schemas/hwd_results.schema.json,sha256=izj75gw_DXv0nU6xTNQtefRWi0fUMrcOKFQmxJg1-_c,1474
 irie/apps/prediction/runners/opensees/schemas/hwd_results_default.json,sha256=f8SqyEhomuMEp4_swTbg6mt7t_0nWlJVVW_s67C-bIk,233
 irie/apps/prediction/templatetags/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-irie/apps/prediction/templatetags/predictor.py,sha256=43MXAC-Y-ex_w9_cdvl4UbkrdlZWN_PUg0NVM8C0rHY,793
+irie/apps/prediction/templatetags/predictor.py,sha256=B_28QyEbj2b1MUZWLJdF8bQtQYL4_KKTh6sk3gRXPXE,730
 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=VFlhAZpacFZWpHHGBKaPvsIEpEydkSL9IaB8OWyEue8,345
@@ -110,7 +111,7 @@ 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
 irie/apps/site/view_sdof.py,sha256=PuLmm8INLaCWc5tuTmZaS_l1zJeZe_yE8pE4eXRdbNc,1194
-irie/apps/site/view_utils.py,sha256=HAhg32jLBf0nvD4ta_oJ8fUODuc0fHi9khWSeztjtYw,566
+irie/apps/site/view_utils.py,sha256=_SO-7i5g8B5qMKg3iBYazrjlKNUTh4HzTSunB_mXgp8,566
 irie/apps/site/views.py,sha256=KRF_SRHP9aCGqocKTNUBGJdq3y2faq3O7AD1xyD4hdM,2888
 irie/apps/site/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 irie/apps/site/templatetags/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -372,7 +373,7 @@ irie/apps/templates/includes/scripts.html,sha256=1Up6xJJSTpdLTJp0tDAa3JubevvSlic
 irie/apps/templates/includes/settings-box.html,sha256=wexsLS4SMRyKci-r4L_LQ6QM27h4U291091NcGiTT3o,2486
 irie/apps/templates/includes/sidebar.html,sha256=uJnzXtcV7UvXscvEHe5z0wpLsFZk8B9mj1_Ye08NRbY,10972
 irie/apps/templates/inventory/asset-event-summary.html,sha256=BmLAFtfNDi98aZIu5WbkPMda-QZgoWhssN6l3e2QLgE,50672
-irie/apps/templates/inventory/asset-profile.html,sha256=lVH983PV9EIgugsfqb8Y94JrPMmD84OFX9twUNdjXno,11287
+irie/apps/templates/inventory/asset-profile.html,sha256=WQRfwf_0cnqgEBk0UQs6io8CNevn-lYEEncEEIQqgLM,11340
 irie/apps/templates/inventory/asset-table.html,sha256=hiPrumCigE_m1H6vSr8l-AoRosV8WnFuRg89cuzavvY,12129
 irie/apps/templates/inventory/bridge-dashboard.html,sha256=67zrDlih3LOi9xFVwPVZZkgRT3DO-lE_qRL7q8Uz9GY,45472
 irie/apps/templates/inventory/bridge.html,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
@@ -415,13 +416,13 @@ irie/apps/templates/site/transactions.html,sha256=-heynHR8PTt_C4P3IWmYG_VE1aGH68
 irie/apps/templates/site/unused-dashboard-cards.html,sha256=DDNWrnIf4o0wj06WYH8YitTfemzARRcVafZ2iNFdJZM,14715
 irie/core/__init__.py,sha256=wkkNngGxgYcCM745-rlvP6ynrI0b0QN3aWmLWDsR8zU,230
 irie/core/asgi.py,sha256=3lVQKFRA4bznM2mWu5Cv24a5H9pfb6YU07q-I_TN0DM,395
-irie/core/settings.py,sha256=9jqn02olEya6O2p3pABLFhmHRwl_U05sOAtluo6y1Rg,6342
+irie/core/settings.py,sha256=MZ361c0489-CB2LXkK2dySWT6y2fIcUmUK7CeRWlGZk,6481
 irie/core/urls.py,sha256=gxPSV6OhMGYm2O2uRJjFSTOjcIKSXuMeEyAmQcUctLU,1460
 irie/core/wsgi.py,sha256=8dxK789vOoRWm0IatEhNqMgZhov9TlspjM6hOUbjg24,395
 irie/init/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-irie/init/__main__.py,sha256=EMfVc-Q-IPi1uBU3vOkoP4_-JMWpK1dFnqu3prfXsDM,589
-irie/init/bridges.py,sha256=vWDhpQ42Ws9SHUMPw5N8sEQ_7PXbdXRK1SUlSMQQCeI,74681
-irie/init/calid.py,sha256=Q6ie1irxm9EiGdxuR2OD05Hffg0UsTWIxQJha-kWkVs,1331
+irie/init/__main__.py,sha256=9PhToipU4y-7H_ndU5aoCdaWayhR5ld669LPnKUDBu4,828
+irie/init/bridges.py,sha256=OBBKnLx2lmMKDfeR0C8CBSbnpnzO0lfokBypD2nEFcM,74198
+irie/init/calid.py,sha256=Q86vBrRTF6YL_MOzVw4CKXIcdx0SlD35DAYNpMWcekM,7439
 irie/init/getCGSData.py,sha256=iZG3Ab1Y_rhiliKCPNy0MZrKBsfEe6ShgSFz2ttvTUU,2916
 irie/init/getCGSevents.py,sha256=4dBkFFJQrUs6gfl1Nj-_R2UOZj0B_T017a6tC7fUHOw,421
 irie/init/getNBIData.py,sha256=xEzM4nCfaRo5QoB90QCezxbOdpKd54UbeFNaymvDhZU,7923
@@ -438,8 +439,8 @@ irie/init/management/commands/init_corridors.py,sha256=EzLk0HUiFxlco-2u0rypewOc9
 irie/init/management/commands/init_predictors.py,sha256=jdD7rd8l2qxuUuR5GOYuHXp-ZQkAK477TefksBMdlOw,2362
 irie/rest/__main__.py,sha256=6Nf_-Rr9zGmMyp_wqCFDO7ls9QPnPd9UyUgN17rIGYw,3680
 irie/usgs/__main__.py,sha256=HiSvPn5IW5IqRiCk1qRRq5dCy3-7iISw7v1P_w2rLrk,5049
-irie-0.0.21.dist-info/METADATA,sha256=zcQb6vRAYraG6jkwTZtPjklZbNUbTXwFsLwXQNH3eBI,3247
-irie-0.0.21.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-irie-0.0.21.dist-info/entry_points.txt,sha256=A_3h9wPBGfxGQ78_MGa-nO6Z0foxOYeAnIE47jxEztg,44
-irie-0.0.21.dist-info/top_level.txt,sha256=zVCxi5E2nkISZPzKq8VEhWe_dGuPcefLYV1tYqQdwlY,5
-irie-0.0.21.dist-info/RECORD,,
+irie-0.0.22.dist-info/METADATA,sha256=mHd6PvO92I0BfsgE5x8ky6e2CYRkqiFqud9MacONNzY,3247
+irie-0.0.22.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+irie-0.0.22.dist-info/entry_points.txt,sha256=A_3h9wPBGfxGQ78_MGa-nO6Z0foxOYeAnIE47jxEztg,44
+irie-0.0.22.dist-info/top_level.txt,sha256=zVCxi5E2nkISZPzKq8VEhWe_dGuPcefLYV1tYqQdwlY,5
+irie-0.0.22.dist-info/RECORD,,