irie 0.0.15__tar.gz → 0.0.17__tar.gz

{irie-0.0.15 → irie-0.0.17}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: irie
-Version: 0.0.15
+Version: 0.0.17
 Summary: Infrastructure Resilience Engine
 Author-email: wd <5018-006+wd@users.noreply.github.com>
 Project-URL: Repository, https://github.com/STAIRLab/irie

{irie-0.0.15 → irie-0.0.17}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "irie"
-version = "0.0.15"
+version = "0.0.17"
 authors = [
   {name="wd", email="5018-006+wd@users.noreply.github.com"},
 ]

{irie-0.0.15 → irie-0.0.17}/src/irie/apps/events/views_events.py

@@ -55,8 +55,7 @@ def save_event(request, event, success_status):
 
 
     if len(errors) > 0:
-        return HttpResponse(json.dumps(
-            {
+        return HttpResponse(json.dumps({
                 "errors": errors
             }), status=status.HTTP_400_BAD_REQUEST)
 
@@ -69,10 +68,10 @@ def save_event(request, event, success_status):
                 ).serialize(serialize_data=False, summarize=True)
             )
         except:
-            return HttpResponse(json.dumps(
-                {
+            return HttpResponse(json.dumps({
                     "errors": ["Failed to parse ground motion file."]
-                }), status=status.HTTP_400_BAD_REQUEST)
+            }), status=status.HTTP_400_BAD_REQUEST)
+
     elif "motion_data" in request.data:
         motion_data = json.loads(request.data.get("motion_data"))
 
@@ -85,7 +84,6 @@ def save_event(request, event, success_status):
     # RECORD ID
     rec_id = motion_data.get("record_identifier", "")
 
-
     if EventRecord.objects.filter(record_identifier=rec_id).first():
         print("\n\nSKIPPING\n\n")
         return HttpResponse(json.dumps({"data": ""}), status=success_status)

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

@@ -0,0 +1,69 @@
+import django_filters
+from django.forms import CheckboxInput
+
+class AssetFilter(django_filters.FilterSet):
+    search = django_filters.CharFilter(
+        lookup_expr="icontains", 
+        field_name="name",
+        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'
+    )
+
+    max_year = django_filters.NumberFilter(
+        label='Max Year',
+        method='filter_year',
+        # widget=django_filters.widgets.DateInput(attrs={'type': 'date'})
+    )
+    # max_year = django_filters.DateFilter(
+    #     label='Max Year',
+    #     field_name='nbi_data__NBI_BRIDGE__Year Built',
+    #     lookup_expr='lte'
+    # )
+    def filter_year(self, queryset, name, value):
+        ids = {
+            asset.id for asset in queryset if (
+                asset.nbi_data and int(asset.nbi_data["NBI_BRIDGE"]["Year Built"] or 0) <= int(value) #.year
+            )
+        }
+        return queryset.filter(id__in=ids)
+        if value:
+            return queryset.filter(
+                nbi_data__NBI_BRIDGE__Year_Built__lte=int(value) #.year
+            )
+        return 
+    
+        if value:
+            filtered_ids = [
+                asset.id for asset in queryset if (
+                    asset.nbi_data and asset.nbi_data["NBI_BRIDGE"]["Year Built"] <= value.year
+                )
+            ]
+            return queryset.filter(id__in=filtered_ids)
+ 
+
+    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.15 → irie-0.0.17}/src/irie/apps/inventory/models.py

@@ -10,6 +10,7 @@
 #----------------------------------------------------------------------------#
 from django.db import models
 from django.core.validators import int_list_validator
+from django.urls import reverse
 
 class Corridor(models.Model):
     id       = models.BigAutoField(primary_key=True)
@@ -41,6 +42,18 @@ class Asset(models.Model):
 
     def __str__(self):
         return f"{self.calid} - {self.name}"
+    
+    def get_absolute_url(self):
+        return reverse("asset_profile", args=[self.calid])
+    
+    @property 
+    def last_event(self):
+        from irie.apps.events.models import EventRecord
+        # TODO: use event_date
+        try:
+            return EventRecord.objects.filter(asset=self).latest("upload_date")
+        except EventRecord.DoesNotExist:
+            return None
 
     @property
     def predictors(self): # ->Dict[str, Predictor]:
@@ -54,7 +67,7 @@ class Asset(models.Model):
     @property
     def event_count(self):
         from irie.apps.events.models import EventRecord
-        return len(EventRecord.objects.filter(cesmd=self.cesmd)) 
+        return EventRecord.objects.filter(asset=self).count()
 
     @property
     def rendering(self):

irie-0.0.17/src/irie/apps/inventory/sitemaps.py

@@ -0,0 +1,19 @@
+
+from django.contrib.sitemaps import Sitemap
+from django.urls import reverse
+from .models import Asset  # Replace with your model
+
+class InventorySitemap(Sitemap):
+    changefreq = "weekly"  # Change frequency of the content
+    priority = 0.5  # Priority of the URLs in the sitemap
+
+    def items(self):
+        # Return a queryset of objects for the sitemap
+        return Asset.objects.exclude(cesmd__isnull=True)
+
+    def lastmod(self, obj):
+        # Return the last modification date of an object
+        if event := obj.last_event:
+            return event.upload_date
+        return None
+

{irie-0.0.15 → irie-0.0.17}/src/irie/apps/inventory/views.py

@@ -140,7 +140,6 @@ def dashboard(request):
         return HttpResponse(html_template.render(context, request))
 
 
-
 @login_required(login_url="/login/")
 def asset_event_report(request):
     from irie.apps.evaluation.models import Evaluation
@@ -173,7 +172,7 @@ def asset_event_report(request):
 
 
 
-@login_required(login_url="/login/")
+# @login_required(login_url="/login/")
 def asset_profile(request, calid):
 
     context = {}
@@ -209,10 +208,6 @@ def asset_profile(request, calid):
     except: 
         pass 
 
-    try:
-        context["mountains"] = make_mountains(asset)
-    except:
-        pass
 
     context["tables"] = _make_tables(asset)
 
@@ -298,7 +293,7 @@ def _make_tables(asset):
 
 
 
-@login_required(login_url="/login/")
+# @login_required(login_url="/login/")
 def asset_table(request):
     """
     Returns a table of all assets in the database, paginated

{irie-0.0.15 → irie-0.0.17}/src/irie/apps/prediction/forms.py

@@ -10,7 +10,10 @@ class PredictorForm(forms.ModelForm):
     class Meta:
         model = PredictorModel
         fields = '__all__'
-        exclude = ['render_file', 'asset', 'metrics', 'active', 
+        exclude = ['render_file', 
+                   'asset', 
+                   'metrics', 
+                   'active', 
                    'entry_point', 
                    'config', 
                    'protocol']

irie-0.0.17/src/irie/apps/prediction/predictor.py

@@ -0,0 +1,26 @@
+#===----------------------------------------------------------------------===#
+#
+#         STAIRLab -- STructural Artificial Intelligence Laboratory
+#
+#===----------------------------------------------------------------------===#
+#
+#   This module implements the predictor abstraction.
+#
+#   Author: Claudio Perez
+#
+#----------------------------------------------------------------------------#
+from __future__ import annotations
+from typing import Dict
+
+from .runners import Runner, RunID
+from .runners.opensees import OpenSeesRunner
+from .runners.ssid import SystemIdRunner 
+
+PREDICTOR_TYPES : Dict[str, Runner] = {
+    # "IRIE_PREDICTOR_V1" : PredictorType1,
+    "IRIE_PREDICTOR_T2" : SystemIdRunner,
+    "" :                  SystemIdRunner,
+#   "IRIE_PREDICTOR_T3" : PredictorType3,
+    "IRIE_PREDICTOR_T4" : OpenSeesRunner,
+}
+

{irie-0.0.15 → irie-0.0.17}/src/irie/apps/prediction/runners/__init__.py

@@ -11,28 +11,30 @@ class classproperty(property):
 
 
 class Runner:
-    def __init__(self, conf: dict):
+    def __init__(self, pred: dict):
 
-        if isinstance(conf, dict):
+        if isinstance(pred, dict):
             # Create from dict when posted from API; this
             # is used to create a new PredictorModel
-            self.name: str   = conf["name"]
-            self.description = conf.get("description", "")
-            self.conf        = conf["config"]
-            self.metrics     = conf["metrics"]
-            self.entry_point = conf["entry_point"]
-            self.active = conf.get("active", True)
+            self.name: str   = pred["name"]
+            self.description = pred.get("description", "")
+            self.conf        = pred["config"]
+            self.metrics     = pred["metrics"]
+            self.entry_point = pred["entry_point"]
+            self.active = pred.get("active", True)
         else:
             # Create from PredictorModel when loaded from database.
             # This is done when running analysis
-            self.name: str = conf.name
+            self.id = pred.id
+            self.asset = pred.asset
+            self.name: str = pred.name
             self.description = "" # conf.description
-            self.conf = conf.config
-            self.entry_point = conf.entry_point
-            self.metrics = conf.metrics
-            self.active = conf.active
-            if conf.config_file:
-                self.model_file = Path(conf.config_file.path).resolve()
+            self.conf = pred.config
+            self.entry_point = pred.entry_point
+            self.metrics = pred.metrics
+            self.active = pred.active
+            if pred.config_file:
+                self.model_file = Path(pred.config_file.path).resolve()
                 self.out_dir = Path(__file__).parents[0]/"Predictions"
                 self.runs = {}