irie 0.0.4__tar.gz → 0.0.6__tar.gz

{irie-0.0.4 → irie-0.0.6}/PKG-INFO

@@ -1,11 +1,11 @@
 Metadata-Version: 2.1
 Name: irie
-Version: 0.0.4
+Version: 0.0.6
 Summary: Infrastructure Resilience Engine
 Author-email: wd <5018-006+wd@users.noreply.github.com>
 Project-URL: Repository, https://github.com/STAIRLab/irie
 Project-URL: Documentation, https://structures.live
-Keywords: visualization,rendering,seismic,opensees,post-processing,finite-element-analysis,glTF
+Keywords: visualization,seismic,opensees,resilience,post-processing,finite-element-analysis,glTF
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Science/Research
 Classifier: Intended Audience :: Developers
@@ -29,6 +29,7 @@ Classifier: Operating System :: MacOS
 Description-Content-Type: text/markdown
 Requires-Dist: opensees
 Requires-Dist: quakeio
+Requires-Dist: mdof
 Requires-Dist: bottle
 Requires-Dist: openbim
 Requires-Dist: folium
@@ -46,6 +47,7 @@ Requires-Dist: sqlparse==0.5.1
 Requires-Dist: toml>=0.10.2
 Requires-Dist: whitenoise==5.3.0
 Requires-Dist: crispy-bootstrap5
+Requires-Dist: django-filter
 Requires-Dist: django-crispy-forms
 Requires-Dist: django-environ==0.11.2
 Requires-Dist: djangorestframework==3.15.2
@@ -55,7 +57,7 @@ Requires-Dist: dj-database-url==2.1.0
 <div align="center">
 <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>
+<span style="font-size: 150;"><i><b>i</b>nfrastructure <b>r</b>es<b>i</b>lience <b>e</b>ngine</i></span>
 <hr>
 <h4>PEER</h4>
 </div>

{irie-0.0.4 → irie-0.0.6}/README.md

@@ -1,7 +1,7 @@
 <div align="center">
 <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>
+<span style="font-size: 150;"><i><b>i</b>nfrastructure <b>r</b>es<b>i</b>lience <b>e</b>ngine</i></span>
 <hr>
 <h4>PEER</h4>
 </div>

{irie-0.0.4 → irie-0.0.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "irie"
-version = "0.0.4"
+version = "0.0.6"
 authors = [
   {name="wd", email="5018-006+wd@users.noreply.github.com"},
 ]
@@ -11,9 +11,9 @@ readme = "README.md"
 
 keywords = [
   "visualization",
-  "rendering",
   "seismic",
   "opensees",
+  "resilience",
   "post-processing",
   "finite-element-analysis",
   "glTF"
@@ -22,6 +22,7 @@ keywords = [
 dependencies = [
   "opensees",
   "quakeio",
+  "mdof",
   "bottle",
   "openbim",
   "folium",
@@ -40,6 +41,7 @@ dependencies = [
   "toml>=0.10.2",
   "whitenoise==5.3.0",
   "crispy-bootstrap5 ",
+  "django-filter",
   "django-crispy-forms",
   "django-environ==0.11.2",
   "djangorestframework==3.15.2",
@@ -92,14 +94,18 @@ build-backend = "setuptools.build_meta"
 [tool.setuptools.packages.find]
 where = ["src"]
 
-[tool.setuptools.package-data]
-#irie = ["assets/*", "data/*.tar", "data/*.json", "data/networks/*.json"]
+# [tool.setuptools.sdist]
+# formats = ["xztar"]
 
+[tool.setuptools.package-data]
 irie = [
     "apps/templates/**/*",
-    "apps/static/**/*",
+    "apps/static/*.*",
+    "apps/static/assets/img/**/*",
+    "apps/static/assets/css/**/*",
+    "apps/static/assets/js/**/*",
 
-    "init/data/*.tar", 
+    "init/data/nbi/*.tar", 
     "init/data/*.json", 
     "init/data/networks/*.json"
 ]

{irie-0.0.4 → irie-0.0.6}/src/irie/apps/config.py

@@ -4,4 +4,3 @@ class AppsConfig(AppConfig):
     default_auto_field = "django.db.models.BigAutoField"
     name  = "irie.apps"
     label = "irie_apps"
-

{irie-0.0.4 → irie-0.0.6}/src/irie/apps/evaluation/identification.py

@@ -26,7 +26,7 @@ import json
 from collections import defaultdict
 
 import numpy as np
-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
 

{irie-0.0.4 → irie-0.0.6}/src/irie/apps/evaluation/models.py

@@ -14,18 +14,18 @@ import logging
 from threading import Thread
 from django.db import models
 
-from irie.apps.events.models import Event
+from irie.apps.events.models import EventRecord
 from irie.apps.inventory.models import Asset
 from .daemon import LiveEvaluation
 
 class Evaluation(models.Model):
     id = models.BigAutoField(primary_key=True)
-    event = models.ForeignKey(Event, on_delete=models.CASCADE)
+    event = models.ForeignKey(EventRecord, on_delete=models.CASCADE)
     asset = models.ForeignKey(Asset, on_delete=models.CASCADE, null=True)
     evaluation_data = models.JSONField(default=dict)
 
     @classmethod
-    def create(cls, event: Event, asset: Asset, data: dict = None):
+    def create(cls, event: EventRecord, asset: Asset, data: dict = None):
         evaluation = cls()
         evaluation.event = event
         evaluation.asset = asset

{irie-0.0.4 → irie-0.0.6}/src/irie/apps/evaluation/views.py

@@ -20,13 +20,13 @@ from rest_framework.decorators import api_view, permission_classes
 from rest_framework.permissions import IsAuthenticated
 
 from .models import Evaluation
-from irie.apps.events.models import Event
+from irie.apps.events.models import EventRecord
 from irie.apps.inventory import views as inventory
 from irie.apps.inventory.models import Asset
 
 def _evals_and_events(asset):
     evals = Evaluation.objects.filter(asset_id=asset.id)
-    events = (Event.objects.get(id=eval.event.id) for eval in evals)
+    events = (EventRecord.objects.get(id=eval.event.id) for eval in evals)
     return evals, events
 
 @api_view(['GET'])
@@ -56,7 +56,7 @@ def get_evaluations(request):
                 } for eval in evals
             ],
             "summary": {
-                "SPECTRAL_SHIFT_IDENTIFICATION": inventory._ssid_stats(
+                "SPECTRAL_SHIFT_IDENTIFICATION": inventory.ssid_stats(
                         events, #[inventory._find_ssid(event_id=event.id) for event in events],
                         "period"
                 )

{irie-0.0.4 → irie-0.0.6}/src/irie/apps/events/admin.py

@@ -4,6 +4,6 @@
 #
 #===----------------------------------------------------------------------===#
 from django.contrib import admin
-from .models import Event
+from .models import HazardEvent, EventRecord
 
-admin.site.register(Event)
+admin.site.register(EventRecord)

irie-0.0.6/src/irie/apps/events/migrations/0002_rename_event_eventrecord.py

@@ -0,0 +1,19 @@
+# Generated by Django 5.1.2 on 2024-12-08 03:44
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('irie_apps_evaluation', '0001_initial'),
+        ('irie_apps_events', '0001_initial'),
+        ('irie_apps_inventory', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.RenameModel(
+            old_name='Event',
+            new_name='EventRecord',
+        ),
+    ]

irie-0.0.6/src/irie/apps/events/migrations/0003_hazardevent.py

@@ -0,0 +1,21 @@
+# Generated by Django 5.1.2 on 2024-12-08 03:49
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('irie_apps_events', '0002_rename_event_eventrecord'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='HazardEvent',
+            fields=[
+                ('id', models.BigAutoField(primary_key=True, serialize=False)),
+                ('name', models.CharField(max_length=20)),
+                ('records', models.ManyToManyField(related_name='event', to='irie_apps_events.eventrecord')),
+            ],
+        ),
+    ]

{irie-0.0.4 → irie-0.0.6}/src/irie/apps/events/models.py

@@ -18,7 +18,7 @@ from django.core.mail import send_mail
 from irie.apps.inventory.models import Asset
 
 
-class Event(models.Model):
+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)
@@ -32,7 +32,7 @@ class Event(models.Model):
     asset = models.ForeignKey(Asset, on_delete=models.CASCADE)
 
     def __str__(self):
-        return f"{self.cesmd} - {self.record_identifier}"
+        return f"{self.cesmd} - {self.motion_data.get('event_date', '')}"
 
     class Meta:
         ordering = ["-id"]
@@ -43,18 +43,68 @@ class Event(models.Model):
 
     @property
     def pga(self):
-        return abs(self.motion_data["peak_accel"])/980.
+        return round(abs(self.motion_data["peak_accel"])/980.665, 2)
+    
+    def plot_accel(self):
+        import io
+        import json
+        import base64
+        import quakeio
+        import matplotlib 
+        matplotlib.use("Agg")
+        import matplotlib.pyplot as plt
+        from mdof.utilities.printing import plot_io
+        from mdof.utilities.config import extract_channels, create_time_vector
+
+        try:
+            import scienceplots
+            plt.style.use(["science"])
+        except ImportError:
+            pass
+
+
+        evnt = quakeio.read(self.event_file.path, format="csmip.zip")
+        try:
+            channels = json.loads(self.asset.bridge_sensors[2:-1])
+            outputs,dt = extract_channels(evnt, channels)
+            *_, time = create_time_vector(len(outputs[0]), dt)
+        except:
+            return None 
+
+        try:
+            inputs,dt  = extract_channels(evnt, json.loads(self.asset.ground_sensors[2:-1]))
+
+            fig = plot_io(inputs, outputs, time)
+        except:
+
+            fig, ax = plt.subplots()
+            for output in outputs:
+                ax.plot(time, output)
+
+        buffer = io.BytesIO()
+        fig.savefig(buffer, format="png")
+        buffer.seek(0)
+        return base64.b64encode(buffer.read()).decode("utf-8")
+
+class HazardEvent(models.Model):
+    id       = models.BigAutoField(primary_key=True)
+    name     = models.CharField(max_length=20)
+    records  = models.ManyToManyField('EventRecord', related_name='event')
+
+    def __str__(self):
+        return f"{self.name} ({self.records.count()})"
+
 
 
 # Signal to delete the event file when the model instance is deleted
-@receiver(post_delete, sender=Event)
+@receiver(post_delete, sender=EventRecord)
 def delete_file_on_delete(sender, instance, **kwargs):
     if instance.event_file:
         if os.path.isfile(instance.event_file.path):
             os.remove(instance.event_file.path)
 
 # Signal to delete the old event file when the file is replaced
-@receiver(pre_save, sender=Event)
+@receiver(pre_save, sender=EventRecord)
 def delete_file_on_change(sender, instance, **kwargs):
     if not instance.pk:
         return False

irie-0.0.6/src/irie/apps/events/views.py

@@ -0,0 +1,100 @@
+
+import os
+from django.template import loader
+from django.core.paginator import Paginator
+from django.http import HttpResponse
+from django.contrib.auth.decorators import login_required
+
+from irie.apps.events.models import EventRecord
+from irie.apps.site.view_utils import raise404
+
+
+@login_required(login_url="/login/")
+def event_table(request):
+    """
+    This view generates the event table page. It uses the event-table.html
+    """
+    context = {}
+    page_template = "event-table.html"
+    context["segment"] = "event-table.html"
+
+    page = request.GET.get("page", 1)
+    try:
+        page = int(page)
+    except:
+        page = 1
+    
+    asset = request.GET.get("asset", None)
+
+    if asset is not None:
+        events = [i for i in reversed(sorted(EventRecord.objects.filter(asset=asset),
+                             key=lambda x: x.motion_data["event_date"]))]
+    else:
+        events = [i for i in reversed(sorted(EventRecord.objects.all(),
+                             key=lambda x: x.motion_data["event_date"]))]
+    
+    # Paginator for 10 items per page
+    paginator = Paginator(events, 15)
+
+
+# reversed(sorted(Event.objects.all(),
+#                                         key=lambda x: x.motion_data["event_date"]))
+    context["events"] = paginator.get_page(page)
+
+
+    html_template = loader.get_template("events/" + page_template)
+
+    try:
+        return HttpResponse(html_template.render(context, request))
+
+    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))
+
+
+@login_required(login_url="/login/")
+def event_collection(request):
+    """
+    This view generates the event table page. It uses the event-table.html
+    """
+    context = {}
+    page_template = "event-table.html"
+    context["segment"] = "event-table.html"
+
+    page = request.GET.get("page", 1)
+    try:
+        page = int(page)
+    except:
+        page = 1
+    
+    asset = request.GET.get("asset", None)
+
+    if asset is not None:
+        events = [i for i in reversed(sorted(EventRecord.objects.filter(asset=asset),
+                             key=lambda x: x.motion_data["event_date"]))]
+    else:
+        events = [i for i in reversed(sorted(EventRecord.objects.all(),
+                             key=lambda x: x.motion_data["event_date"]))]
+    
+    # Paginator for 10 items per page
+    paginator = Paginator(events, 15)
+
+
+# reversed(sorted(Event.objects.all(),
+#                                         key=lambda x: x.motion_data["event_date"]))
+    context["events"] = paginator.get_page(page)
+
+
+    html_template = loader.get_template("events/" + page_template)
+
+    try:
+        return HttpResponse(html_template.render(context, request))
+
+    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))
+

{irie-0.0.4 → irie-0.0.6}/src/irie/apps/events/views_events.py

@@ -5,7 +5,6 @@
 #===----------------------------------------------------------------------===#
 import json
 import datetime
-from threading import Thread
 from django.shortcuts import render
 from django.core.exceptions import ObjectDoesNotExist
 from django.shortcuts import HttpResponse
@@ -16,10 +15,8 @@ from rest_framework.decorators import api_view, permission_classes, parser_class
 from rest_framework import status
 from rest_framework.permissions import IsAuthenticated
 
-from .models import Event
+from .models import EventRecord
 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
 
@@ -33,7 +30,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
 
 
@@ -93,10 +89,10 @@ def save_event(request, event, success_status):
     # CREATE EVENT
     if event is None:
         # Doing a PUT
-        event = Event.objects.filter(record_identifier=rec_id).first()
+        event = EventRecord.objects.filter(record_identifier=rec_id).first()
         if event is None:
             print("PUT: creating", rec_id, "\n\n")
-            event = Event()
+            event = EventRecord()
         else:
             print("PUT: updating", rec_id, "\n\n")
             upload_date = event.upload_date
@@ -168,7 +164,7 @@ def events(request):
     #     return HttpResponse(json.dumps({"detail": "Not authorized"}), status=status.HTTP_401_UNAUTHORIZED)
 
     if request.method == "GET":
-        events_data = Event.objects.all()
+        events_data = EventRecord.objects.all()
 
         events_count = events_data.count()
 
@@ -180,7 +176,7 @@ def events(request):
         return HttpResponse(json.dumps({"count": events_count, "data": events_data}), status=status.HTTP_200_OK)
 
     elif request.method == "POST":
-        event = Event()
+        event = EventRecord()
         return save_event(request, event, status.HTTP_201_CREATED)
 
     elif request.method == "PUT":
@@ -197,7 +193,7 @@ def event(request, event_id):
     #    return HttpResponse(json.dumps({"detail": "Not authorized"}), status=status.HTTP_401_UNAUTHORIZED)
 
     try:
-        event = Event.objects.get(pk=event_id)
+        event = EventRecord.objects.get(pk=event_id)
     except ObjectDoesNotExist:
         return HttpResponse(json.dumps({"detail": "Not found"}), status=status.HTTP_404_NOT_FOUND)
 

irie-0.0.6/src/irie/apps/inventory/filters.py

@@ -0,0 +1,37 @@
+import django_filters
+from django.forms import CheckboxInput
+
+class AssetFilter(django_filters.FilterSet):
+    search = django_filters.CharFilter(
+        lookup_expr="icontains", 
+        field_name="calid",
+        label='Search'
+    )
+
+    cesmd_not_null = django_filters.BooleanFilter(
+        label='On CESMD',
+        widget=CheckboxInput(),
+        method='filter_cesmd_exists'
+    )
+
+    is_complete = django_filters.BooleanFilter(
+        field_name='is_complete',
+        label='Is Complete',
+        widget=CheckboxInput()
+    )
+    district = django_filters.CharFilter(
+        label='District',
+        method='filter_district'
+    )
+
+    def filter_cesmd_exists(self, queryset, name, value):
+        if value:  # Checkbox is checked
+            return queryset.exclude(cesmd__isnull=True).exclude(cesmd__exact='')
+        return queryset
+
+    def filter_district(self, queryset, name, value):
+        return [
+            asset for asset in queryset if (
+                asset.nbi_data and asset.nbi_data["NBI_BRIDGE"]["Highway Agency District"] == value
+            )
+        ]

{irie-0.0.4 → irie-0.0.6}/src/irie/apps/inventory/models.py

@@ -51,6 +51,13 @@ class Asset(models.Model):
             for p in PredictorModel.objects.filter(asset=self)
         }
 
+    @property
+    def rendering(self):
+        from irie.apps.prediction.models import PredictorModel
+        for predictor in PredictorModel.objects.filter(asset=self):
+            if predictor.render_file:
+                return predictor.render_file.url
+
     @property
     def coordinates(self):
         if self.nbi_data:

{irie-0.0.4 → irie-0.0.6}/src/irie/apps/inventory/urls.py

@@ -12,6 +12,7 @@ from django.urls import path, re_path
 from irie.apps.inventory import views
 
 urlpatterns = [
+    path("summarize/", views.asset_event_report),
     path("dashboard/",     views.dashboard, name="dashboard"),
     path("dashboard.html", views.dashboard),
     path("dashboard/demo", views.dashboard),