irie 0.0.5__py3-none-any.whl → 0.0.6__py3-none-any.whl

irie/apps/inventory/views.py

@@ -10,16 +10,21 @@
 #----------------------------------------------------------------------------#
 import os
 import re
+import json
+import base64
+import numpy as np
 from django.core.paginator import Paginator
-from django.template import loader, TemplateDoesNotExist
+from django.template import loader
 from django.http import HttpResponse
 from django.contrib.auth.decorators import login_required
-from django.core.exceptions import ObjectDoesNotExist
 
-from irie.apps.events.models import Event
+from irie.apps.events.models import EventRecord
 from irie.apps.site.view_utils import raise404
 from irie.apps.inventory.models import Asset
-from irie.apps.inventory.forms import AssetForm
+from .filters import AssetFilter
+# Predictors
+from irie.apps.prediction.runners.hazus import hazus_fragility
+from irie.apps.prediction.runners.ssid import make_mountains, ssid_stats, ssid_event_plot
 
 
 @login_required(login_url="/login/")
@@ -34,37 +39,13 @@ def fetch_rendering(request):
 
     from irie.apps.prediction.models import PredictorModel
     for p in PredictorModel.objects.filter(asset=asset):
-        if p.protocol == "BRACE2_CLI_PREDICTOR_T4":
+        if p.protocol == "IRIE_PREDICTOR_T4":
             return HttpResponse("html")
 
     return HttpResponse("No rendering available for this asset.")
 
 
 
-def _make_freq_plot(evaluation):
-    import numpy as np
-    from mdof.macro import FrequencyContent
-
-    plot = FrequencyContent(scale=True, period=True, xlabel="Period (s)", ylabel="Normalized Amplitude")
-
-    for name, mdata in evaluation["summary"].items():
-        periods = []
-        amplitudes = []
-        for i in mdata.get("data", []):
-            if "period" in i:
-                periods.append(i["period"])
-                if "amplitude" in i:
-                    amplitudes.append(i["amplitude"])
-
-        if len(amplitudes) and (len(amplitudes) == len(periods)):
-            plot.add(np.array(periods), np.array(amplitudes), label=name)
-        else:
-            plot.add(np.array(periods), label=name)
-
-    fig = plot.get_figure()
-    return fig.to_json()
- 
-
 @login_required(login_url="/login/")
 def asset_event_summary(request, cesmd, event):
     from irie.apps.evaluation.models import Evaluation
@@ -74,7 +55,6 @@ def asset_event_summary(request, cesmd, event):
     html_template = loader.get_template("inventory/asset-event-summary.html")
 
     try:
-
         segments = request.path.split("/")
         _, _, is_nce = segments[-3:]
 
@@ -94,7 +74,7 @@ def asset_event_summary(request, cesmd, event):
 
         if "SPECTRAL_SHIFT_IDENTIFICATION" in evaluation_data:
             context["freq_plot_json"] = \
-                    _make_freq_plot(evaluation_data["SPECTRAL_SHIFT_IDENTIFICATION"])
+                    ssid_event_plot(evaluation_data["SPECTRAL_SHIFT_IDENTIFICATION"])
 
         context["all_evaluations"] = evaluation_data
 
@@ -107,7 +87,7 @@ def asset_event_summary(request, cesmd, event):
         }
         context["asset"]       = evaluation and evaluation.event.asset or None
         context["nce_version"] = is_nce
-        context["event_data"]  = Event.objects.get(pk=int(event)).motion_data
+        context["event_data"]  = EventRecord.objects.get(pk=int(event)).motion_data
 
 
         resp = html_template.render(context, request)
@@ -120,6 +100,7 @@ def asset_event_summary(request, cesmd, event):
         html_template = loader.get_template("site/page-500.html")
         return HttpResponse(html_template.render(context, request))
 
+
 @login_required(login_url="/login/")
 def dashboard(request):
     from irie.apps.inventory.models import Asset
@@ -132,15 +113,18 @@ def dashboard(request):
             context["demo_version"] = True
 
         context["recent_evaluations"] = [
-            (evaluation, Event.objects.get(pk=evaluation.event_id))
+            (evaluation, EventRecord.objects.get(pk=evaluation.event_id))
             for evaluation in reversed(list(Evaluation.objects.all())[-6:])
         ]
-        assets = [
+        assets = list(set(
             Asset.objects.get(cesmd=event[1].cesmd) for event in context["recent_evaluations"]
-        ]
-        context["asset_map"] = AssetMap(assets, 
-                                        layer_assets=False, 
-                                        traffic=False).get_html()
+        ))
+        colors = {
+            asset.id: max(event[1].pga for event in context["recent_evaluations"] if event[1].cesmd == asset.cesmd)
+            for asset in assets
+        }
+        
+        context["asset_map"] = AssetMap(assets, colors=colors, color_name="Peak Station Accel.").get_html()
         context["calid"] = {b.cesmd: b.calid for b in assets}
 
         html_template = loader.get_template("inventory/dashboard.html")
@@ -154,105 +138,36 @@ def dashboard(request):
 
 
 
-def _ssid_stats(events, key):
-    """
-    mode_results is a list (station level) of lists (event level) of dictionaries (mode level).
-    mode_results = [
-        [
-            {
-                "period": ..., 
-                "frequency": ...,
-                "damping": ...,
-                "emac": ...,
-                "mpc": ...,
-            },
-            ...
-        ],
-        ...
-    ]
+@login_required(login_url="/login/")
+def asset_event_report(request):
+    from irie.apps.evaluation.models import Evaluation
 
-    [
-       # "Event"
-       {"S1": {"period": [0.1]},
-        "R1": {"period": [1.2]}}
-    ]
-    """
-    mode_results = [_find_ssid(event.id) for event in events]
-    import numpy as np
-
-    filtered_results = [
-            {
-              method: [
-                  result for result in event_results[method]
-                        if key in result and result.get("emac", 1.0) > 0.5 and result.get("mpc", 1.0) > 0.5
-              ] for method in event_results
-            } for event_results in mode_results
-    ]
+    context = {}
+    context["segment"] = "events"
+    html_template = loader.get_template("inventory/report.tex")
 
-    from collections import defaultdict
-    values = defaultdict(list)
-    for event in filtered_results:
-        for method in event:
-            for result in event[method]:
-                values[method].append(result[key])
-
-    mean = {method: np.mean(values[method]) for method in values}
-    std =  {method: np.std(values[method]) for method in values}
-
-    def _first(method_results):
-        if method_results and len(method_results) > 0:
-            results = np.array([result[key] for result in method_results])
-            try:
-                idx = np.argmax([result["amplitude"] for result in method_results])
-                return results[idx]
-            except KeyError:
-                return np.max(results)
-        else: 
-            return {}
-
-    return [
-        {method: {
-#           "distance": (closest_item[key]-mean)/std),
-            "nearest_mean": event_results[method][np.argmin(np.abs(mean[method] \
-                            - [result[key] for result in event_results[method]]))] \
-                if event_results[method] and len(event_results[method]) > 0 else {} ,
-            "maximum": _first(event_results[method])
-            }
-            for method in event_results
-        }
-        for event_results in filtered_results
+    events = [
+        EventRecord.objects.get(pk=evaluation.event_id)
+        for evaluation in reversed(list(Evaluation.objects.all())[-6:])
     ]
+    assets = list(set(
+        Asset.objects.get(cesmd=event.cesmd) for event in events
+    ))
+    context["events"] = events
+    context["assets"] = assets 
 
+    context["mountains"] = []
 
-def _find_ssid(event_id=None, evaluation=None):
-    """
-    Given an event ID, finds the results of the first configured
-    system ID run. This generally looks like a list of dicts,
-    each with fields "frequency", "damping", etc.
-    """
-    from irie.apps.evaluation.models import Evaluation
+    if request.method == 'POST' and request.FILES.get('map_image'):
+        context["map"] = base64.b64encode(request.FILES['map_image'].read()).decode("utf-8")
 
-    if evaluation is None:
-        evaluation = Evaluation.objects.filter(event_id=int(event_id))
+    for event in events:
+        context["mountains"].append(make_mountains(event.asset))
 
-    elif not isinstance(evaluation, list):
-        evaluation = [evaluation]
+    resp = html_template.render(context, request)
 
+    return HttpResponse(resp)
 
-    if len(evaluation) != 1:
-        return []
-
-    else:
-        evaluation_data = evaluation[0].evaluation_data
-
-    if "SPECTRAL_SHIFT_IDENTIFICATION" in evaluation_data:
-        return {
-                key: val.get("data", val.get("error", [])) 
-                    for key,val in evaluation_data["SPECTRAL_SHIFT_IDENTIFICATION"]["summary"].items()
-        }
-
-    else:
-        return []
 
 
 @login_required(login_url="/login/")
@@ -267,17 +182,41 @@ def asset_profile(request, calid):
     try:
         asset = Asset.objects.get(calid=calid)
 
-    except ObjectDoesNotExist:
+    except Asset.DoesNotExist:
         return raise404(request, context)
 
     context["asset"] = asset
 
+    # Compute Hazus fragility probabilities and curve
+    try:
+        hazus_results = hazus_fragility(asset.nbi_data, generate_plot=False, return_data=True)
+
+        # 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"),
+            },
+            "sa_range": json.dumps(hazus_results["sa_range"]),
+            "curves":   json.dumps(hazus_results["curves"])
+            # "plot_base64": hazus_results.get("plot_base64"),
+        }
+    except: 
+        pass 
+
+    try:
+        context["mountains"] = make_mountains(asset)
+    except:
+        pass
+
     context["tables"] = _make_tables(asset)
 
     if asset.cesmd:
         cesmd = asset.cesmd
 
-        events = list(reversed(sorted(Event.objects.filter(cesmd=cesmd),
+        events = list(reversed(sorted(EventRecord.objects.filter(cesmd=cesmd),
                                       key=lambda x: x.motion_data["event_date"])))
 
         evals = [
@@ -285,17 +224,13 @@ def asset_profile(request, calid):
              "pga": event.pga, #abs(event.motion_data["peak_accel"])/980., 
              "evaluation": ssid,
             }
-            for i, (event, ssid) in enumerate(zip(events, _ssid_stats(events, "period")))
+            for i, (event, ssid) in enumerate(zip(events, ssid_stats(events, "period")))
         ]
         context["evaluations"] = Paginator(evals, 5).get_page(1)
 
     try:
         return HttpResponse(html_template.render(context, request))
 
-    # except TemplateDoesNotExist:
-    #     context["rendering"] = None
-    #     return HttpResponse(html_template.render(context, request))
-
     except Exception as e:
         if "DEBUG" in os.environ and os.environ["DEBUG"]:
             raise e
@@ -303,16 +238,16 @@ def asset_profile(request, calid):
         return HttpResponse(html_template.render(context, request))
 
 def _make_tables(asset):
-    if asset.cesmd:
+    if asset.cesmd and isinstance(asset.cgs_data, list):
         tables = [
-        {k: v for k,v in group.items()
-            if k not in {
-                "Remarks",
-                "Instrumentation",
-                "Remarks/Notes",
-                "Construction Date"
-            }
-        } for group in asset.cgs_data[1:]
+            {k: v for k,v in group.items()
+                if k not in {
+                    "Remarks",
+                    "Instrumentation",
+                    "Remarks/Notes",
+                    "Construction Date"
+                }
+            } for group in asset.cgs_data[1:]
         ]
     else:
         tables = []
@@ -368,7 +303,6 @@ def asset_table(request):
 
     context = {}
     context["segment"] = "assets"
-    html_template = loader.get_template("inventory/asset-table.html")
 
     page = request.GET.get("page", 1)
     try:
@@ -376,12 +310,20 @@ def asset_table(request):
     except:
         page = 1
 
-    assets = Asset.objects.all() #exclude(cesmd__isnull=True),
+    filter_set = AssetFilter(request.GET, queryset=Asset.objects.all())
+    assets = filter_set.qs
     context["bridges"]   = Paginator(assets, 10).get_page(page)
-    context["asset_map"] = AssetMap(assets=assets,
-                                    cesmd=True, 
-                                    layer_assets=True).get_html()
+    context["asset_map"] = AssetMap(assets=assets).get_html()
+    context["filter"] = filter_set
 
+
+    # Copy the GET parameters and remove the 'page' parameter
+    query_params = request.GET.copy()
+    query_params.pop('page', None)  # Remove 'page' parameter if it exists
+    context["query_string"] = query_params.urlencode()
+
+
+    html_template = loader.get_template("inventory/asset-table.html")
     try:
         return HttpResponse(html_template.render(context, request))
 
@@ -394,54 +336,57 @@ def asset_table(request):
 
 
 import folium
-from folium import branca
 
 class AssetMap:
-    def __init__(self, 
-                 assets, 
-                 layer_assets=True, 
-                 traffic=False, 
-                 cesmd=True):
-        self._layer_assets = layer_assets
+    def __init__(self, assets, name=None, colors=None, color_name=None):
+        if name is None:
+            name = "Assets"
+
+        if colors is not None:
+            cm = folium.branca.colormap.LinearColormap(colors=["green", "yellow", "orange", "red"], 
+                                                       vmin=0, vmax=max(colors.values()),
+                                                       caption=color_name)
+            colors = {
+                k: cm.rgb_hex_str(v) for k,v in colors.items()
+            }
+        else:
+            cm = None 
 
+        markers = self.add_bridges(assets, colors=colors)
 
-        self._assets = assets
+        if len(markers) > 0:
+            location = sum(np.array(m.location) for m in markers) / len(markers)
+        else:
+            location = [37.7735, -122.0993] # (self._preferences.latitude, self._preferences.longitude)
 
-        self._figure = figure = folium.Figure()
+        # self._figure = figure = folium.Figure()
         self._map    = m      = folium.Map(
-            location=[37.7735, -122.0993], zoom_start=6, tiles=None
+            location=location, 
+            zoom_start=6, 
+            tiles='cartodbpositron'
         )
 
-        folium.raster_layers.TileLayer(
-                tiles='cartodbpositron',
-                name='Instrumented Bridges'
-        ).add_to(m)
-        m.add_to(figure)
+        if cm is not None:
+            cm.add_to(m)
 
-        if cesmd:
-            self.add_CESMD()
+        for marker in markers:
+            marker.add_to(m)
 
-        if traffic:
-            self.add_traffic()
 
-        if self._layer_assets:
-
-            self._asset_layers = {
-                "partial":  folium.FeatureGroup(name="Partial Digital Twins"),
-                "complete": folium.FeatureGroup(name="Full Digital Twins")
-            }
-            list(map(lambda i: i.add_to(self._map), self._asset_layers.values()))
-            self.add_twins(list(self._asset_layers.values()))
+        # CESMD
+        # Partial
+        # Full
 
 
     def get_html(self, **kwargs):
-        folium.LayerControl(collapsed=False).add_to(self._map)
-        self._figure.render()
         return self._map._repr_html_()
 
-    def add_twins(self, features):
+    def add_bridges(self, assets, colors=None):
+        if colors is None:
+            colors = {}
 
-        for b in self._assets:
+        markers = []
+        for b in assets:
             lat, lon = b.coordinates
             popup = folium.Popup(
                         folium.Html(
@@ -455,61 +400,23 @@ class AssetMap:
                         max_width=100
             )
             if b.is_complete:
-                folium.Marker(
+                markers.append(folium.Marker(
                     location=[lat, lon],
                     popup=popup,
                     icon=folium.Icon(icon="cloud", color="blue" if not b.is_complete else "beige"),
                     z_index_offset=1000
-                ).add_to(features[int(b.is_complete)])
+                ))
             else:
-                folium.CircleMarker(
+                markers.append(folium.CircleMarker(
                     location=[lat, lon],
                     popup=popup,
-                    color="blue",
+                    color="black",
+                    fill_color=colors.get(b.id, "gray"),
                     fill=True,
                     opacity=1,
                     fill_opacity=1,
-                    radius=3,
+                    radius=4,
+                    weight=1,
                     z_index_offset=800
-                ).add_to(features[int(b.is_complete)])
-        return self
-
-    def add_CESMD(self):
-        cesmdbridges = folium.FeatureGroup(name="Registered Bridges")
-        cesmdbridges.add_to(self._map)
-
-        for b in self._assets:
-            if not b.cesmd:
-                continue
-            lat, lon = b.coordinates
-
-            folium.Marker(
-                location=[lat, lon],
-                popup=b.cesmd,
-                icon=folium.Icon(icon="glyphicon-road", color="lightgray"),
-            ).add_to(cesmdbridges)
-
-
-    def add_traffic(self):
-        # from irie.apps.inventory.traffic import TRAFFIC_LOW, TRAFFIC_MID, TRAFFIC_HIGH, TRAFFIC_ALL
-        from irie.apps.inventory.traffic import TRAFFIC_ALL
-        traffic = folium.FeatureGroup(name="Traffic")
-        traffic.add_to(self._map)
-
-        cm = branca.colormap.LinearColormap(colors=['green', 'yellow', 'orange', 'red'], vmin=10000, vmax=100000)
-        for loc in TRAFFIC_ALL:
-            folium.CircleMarker([loc["coords"][1],loc["coords"][0]],
-                radius=5,
-                popup=None,
-                color=cm.rgb_hex_str(loc["properties"]["AHEAD_AADT"]),
-                fill=True,
-                opacity=0.5,
-                weight=0,
-               ).add_to(traffic)
-
-        cm = branca.colormap.LinearColormap(colors=['green', 'yellow', 'orange', 'red'], 
-                                            vmin=10000, vmax=100000, 
-                                            caption='Average Annual Daily Traffic Crossings')
-        cm.add_to(self._map)
-
-        return self
+                ))
+        return markers

irie/apps/prediction/forms.py

@@ -6,15 +6,11 @@
 from django import forms
 from irie.apps.prediction.models import PredictorModel
 
-
-# class CsiForm(forms.Form):
-#     option1 = forms.CharField(label='Option 1', max_length=100)
-#     option2 = forms.CharField(label='Option 2', max_length=100)
-#     file_upload = forms.FileField(label='Upload a file', required=True)
-
-
 class PredictorForm(forms.ModelForm):
     class Meta:
         model = PredictorModel
         fields = '__all__'
-        exclude = ['render_file', 'metrics', 'active', 'entry_point', 'config', 'protocol']
+        exclude = ['render_file', 'asset', 'metrics', 'active', 
+                   'entry_point', 
+                   'config', 
+                   'protocol']

irie/apps/prediction/metrics.py

@@ -23,8 +23,6 @@ class PeriodShiftMetric(HealthMetric):
     def getSummary(self):
         return self.data
 
-
-
 class ColumnStrainStateMetric01(HealthMetric):
     metric_tag = "COLUMN_STRAIN_STATES"
 

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

@@ -0,0 +1,18 @@
+# Generated by Django 5.1.2 on 2024-12-08 02:25
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('apps_prediction', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='predictormodel',
+            name='protocol',
+            field=models.CharField(choices=[('IRIE_PREDICTOR_V1', 'Type1'), ('IRIE_PREDICTOR_T2', 'Type2'), ('IRIE_PREDICTOR_T3', 'Type3'), ('IRIE_PREDICTOR_T4', 'Type4')], default='IRIE_PREDICTOR_T2', max_length=25),
+        ),
+    ]

irie/apps/prediction/models.py

@@ -10,10 +10,10 @@ from irie.apps.inventory.models import Asset
 class PredictorModel(models.Model):
     # https://docs.djangoproject.com/en/4.2/ref/models/fields/
     class Protocol(models.TextChoices):
-        TYPE1 = "BRACE2_CLI_PREDICTOR_V1"
-        TYPE2 = "BRACE2_CLI_PREDICTOR_T2"
-        TYPE3 = "BRACE2_CLI_PREDICTOR_T3"
-        TYPE4 = "BRACE2_CLI_PREDICTOR_T4"
+        TYPE1 = "IRIE_PREDICTOR_V1"
+        TYPE2 = "IRIE_PREDICTOR_T2"
+        TYPE3 = "IRIE_PREDICTOR_T3"
+        TYPE4 = "IRIE_PREDICTOR_T4"
 
     id          = models.BigAutoField(primary_key=True)
     name        = models.CharField(max_length=35)

irie/apps/prediction/predictor.py

@@ -16,8 +16,13 @@ import subprocess
 from pathlib import Path
 from typing import Dict
 
-from .runners import Runner, RunID, Event, MetricType, classproperty, OpenSeesRunner
+from .runners import (
+    Runner, RunID,
+    classproperty
+)
+from .runners.opensees import OpenSeesRunner
 
+class Event: pass
 
 
 class PredictorType1(Runner):
@@ -38,7 +43,7 @@ class PredictorType1(Runner):
         predictor.name = data.pop("name")
         predictor.config = data
         predictor.asset = asset
-        predictor.protocol = "BRACE2_CLI_PREDICTOR_T1"
+        predictor.protocol = "IRIE_PREDICTOR_T1"
         predictor.active = False
         return predictor
 
@@ -196,7 +201,7 @@ class PredictorType2(Runner):
         predictor.name = data.pop("name")
         predictor.config = data
         predictor.asset = asset
-        predictor.protocol = "BRACE2_CLI_PREDICTOR_T2"
+        predictor.protocol = "IRIE_PREDICTOR_T2"
         predictor.active = True
         return predictor
 
@@ -207,10 +212,11 @@ class PredictorType2(Runner):
 
     def runPrediction(self, run_id: RunID) -> bool:
         event_file = Path(self.event.event_file.path).resolve()
-#       if "config" in self.conf:
         command = [*self.entry_point,
-                   "--config", json.dumps(self.conf),
+                   "--config", 
+                   json.dumps(self.conf),
                    event_file]
+
         if False:
             command = [*self.entry_point,
                        event_file,
@@ -246,7 +252,7 @@ class PredictorType4(Runner):
         predictor.name = config.pop("name")
         predictor.config = config
         predictor.asset = asset
-        predictor.protocol = "BRACE2_CLI_PREDICTOR_T4"
+        predictor.protocol = "IRIE_PREDICTOR_T4"
         predictor.active = True
         return predictor
 
@@ -267,7 +273,7 @@ class PredictorType4(Runner):
                        *map(str, self.conf.get("argv", []))]
 
         self.metric_details = subprocess.check_output(command).decode()
-        print(self.metric_details)
+        # print(self.metric_details)
         return True
 
     def getMetricData(self, run, metric):
@@ -277,10 +283,10 @@ class PredictorType4(Runner):
 
 
 PREDICTOR_TYPES : Dict[str, Runner] = {
-    "BRACE2_CLI_PREDICTOR_V1" : PredictorType1,
-    "BRACE2_CLI_PREDICTOR_T2" : PredictorType2,
-    "" :                        PredictorType2,
-#   "BRACE2_CLI_PREDICTOR_T3" : PredictorType3,
-    "BRACE2_CLI_PREDICTOR_T4" : OpenSeesRunner,
+    "IRIE_PREDICTOR_V1" : PredictorType1,
+    "IRIE_PREDICTOR_T2" : PredictorType2,
+    "" :                  PredictorType2,
+#   "IRIE_PREDICTOR_T3" : PredictorType3,
+    "IRIE_PREDICTOR_T4" : OpenSeesRunner,
 }