irie 0.0.21__tar.gz → 0.0.23__tar.gz

{irie-0.0.21 → irie-0.0.23}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: irie
-Version: 0.0.21
+Version: 0.0.23
 Summary: An infrastructure resilience engine
 Author-email: "Claudio M. Perez" <50180406+claudioperez@users.noreply.github.com>
 Project-URL: Repository, https://github.com/STAIRLab
@@ -90,7 +90,7 @@ Requires-Dist: dj-database-url==2.1.0
   </td>
 
   <td>
-    <a href="https://brace2.herokuapp.com">
+    <a href="https://structures.live">
     <img src="https://raw.githubusercontent.com/claudioperez/sdof/master/docs/assets/stairlab.svg"
          alt="STAIRlab Logo" width="200"/>
     </a>

{irie-0.0.21 → irie-0.0.23}/README.md

@@ -33,7 +33,7 @@
   </td>
 
   <td>
-    <a href="https://brace2.herokuapp.com">
+    <a href="https://structures.live">
     <img src="https://raw.githubusercontent.com/claudioperez/sdof/master/docs/assets/stairlab.svg"
          alt="STAIRlab Logo" width="200"/>
     </a>

{irie-0.0.21 → irie-0.0.23}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "irie"
-version = "0.0.21"
+version = "0.0.23"
 authors = [
   {name="Claudio M. Perez", email="50180406+claudioperez@users.noreply.github.com"}
 ]

{irie-0.0.21/src/irie/core → irie-0.0.23/src/irie/apps}/__init__.py

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

irie-0.0.23/src/irie/apps/config.py

@@ -0,0 +1,11 @@
+#===----------------------------------------------------------------------===#
+#
+#         STAIRLab -- STructural Artificial Intelligence Laboratory
+#
+#===----------------------------------------------------------------------===#
+from django.apps import AppConfig
+
+class AppsConfig(AppConfig):
+    default_auto_field = "django.db.models.BigAutoField"
+    name  = "irie.apps"
+    label = "irie_apps"

{irie-0.0.21 → irie-0.0.23}/src/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-0.0.21 → irie-0.0.23}/src/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-0.0.21 → irie-0.0.23}/src/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-0.0.21 → irie-0.0.23}/src/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-0.0.21 → irie-0.0.23}/src/irie/apps/inventory/urls.py

@@ -12,15 +12,16 @@ from django.urls import path, re_path
 from irie.apps.inventory import views
 
 urlpatterns = [
-    path("summarize/", views.asset_event_report),
+    path("summarize/",     views.asset_event_report),
     path("dashboard/",     views.dashboard, name="dashboard"),
     path("dashboard.html", views.dashboard),
-    path("dashboard/demo", views.dashboard),
 
     path("asset-table.html", views.asset_table),
     path("asset-table/",     views.asset_table, name="asset_table"),
     re_path(
-        r"^evaluations/(?P<event>[0-9 A-Z-]*)/(?P<cesmd>[0-9 A-Z-]*)/.*", views.asset_event_summary, name="asset_event_summary"
+        "^evaluations/(?P<event>[0-9 A-Z-]*)/(?P<cesmd>[0-9 A-Z-]*)/.*", views.asset_event_summary, 
+                                                                          name="asset_event_summary"
     ),
-    re_path(r"^inventory/(?P<calid>[0-9 A-Z-]*)/", views.asset_profile, name="asset_profile"),
+    re_path("^inventory/(?P<calid>[0-9 A-Z-]*)/evaluations/$", views.asset_evals,   name="asset_evals"),
+    re_path("^inventory/(?P<calid>[0-9 A-Z-]*)/$",             views.asset_profile, name="asset_profile"),
 ]

{irie-0.0.21 → irie-0.0.23}/src/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.")
@@ -172,6 +172,51 @@ def asset_event_report(request):
     return HttpResponse(resp)
 
 
+# @login_required(login_url="/login/")
+def asset_evals(request, calid):
+    context = {}
+    html_template = loader.get_template("inventory/asset-evals.html")
+    context["segment"] = "assets"
+
+    context["nce_version"] = True
+
+    page = request.GET.get("page", 1)
+    try:
+        page = int(page)
+    except:
+        page = 1
+
+    try:
+        asset = Asset.objects.get(calid=calid)
+
+    except Asset.DoesNotExist:
+        return raise404(request, context)
+
+    context["asset"] = asset
+
+    if asset.cesmd:
+        events = list(sorted(
+            (e.event for e in Evaluation.objects.exclude(status=Evaluation.Status.Invalid).filter(asset=asset)),
+                             key=lambda x: x.motion_data["event_date"], reverse=True))
+
+        evals = [
+            {"event":      event,
+             "pga":        event.pga, #abs(event.motion_data["peak_accel"])/980., 
+             "evaluation": ssid,
+            }
+            for event, ssid in zip(events, ssid_stats(events, "period"))
+        ]
+        context["evaluations"] = Paginator(evals, 10).get_page(page)
+
+    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 asset_profile(request, calid):
@@ -188,6 +233,12 @@ def asset_profile(request, calid):
     except Asset.DoesNotExist:
         return raise404(request, context)
 
+    page = request.GET.get("page", 1)
+    try:
+        page = int(page)
+    except:
+        page = 1
+
     context["asset"] = asset
 
     # Compute Hazus fragility probabilities and curve
@@ -196,21 +247,13 @@ 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"),
-            },
             "sa_range": json.dumps(hazus_results["sa_range"]),
             "curves":   json.dumps(hazus_results["curves"])
-            # "plot_base64": hazus_results.get("plot_base64"),
         }
     except Exception as e: 
         print(e)
         pass 
 
-
     context["tables"] = _make_tables(asset)
 
     if asset.cesmd:
@@ -220,7 +263,6 @@ def asset_profile(request, calid):
             (e.event for e in Evaluation.objects.exclude(status=Evaluation.Status.Invalid).filter(asset=asset)),
                              key=lambda x: x.motion_data["event_date"], reverse=True))
 
-
         evals = [
             {"event": event,
              "pga": event.pga, #abs(event.motion_data["peak_accel"])/980., 
@@ -261,8 +303,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-0.0.21 → irie-0.0.23}/src/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-0.0.21 → irie-0.0.23}/src/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-0.0.23/src/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-0.0.21 → irie-0.0.23}/src/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-0.0.21 → irie-0.0.23}/src/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-0.0.21 → irie-0.0.23}/src/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-0.0.21 → irie-0.0.23}/src/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-0.0.21 → irie-0.0.23}/src/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-0.0.21 → irie-0.0.23}/src/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-0.0.21 → irie-0.0.23}/src/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-0.0.21 → irie-0.0.23}/src/irie/apps/prediction/urls.py

@@ -7,12 +7,12 @@
 #   Author: Claudio Perez
 #
 #----------------------------------------------------------------------------#
-from django.urls import path, re_path
+from django.urls import re_path
 from .views import new_prediction, asset_predictors, predictor_profile, predictor_upload
 
 urlpatterns = [
     re_path("^inventory/[0-9 A-Z-]*/predictors/new",   new_prediction),
     re_path("^inventory/(?P<calid>[0-9 A-Z-]*)/predictors/(?P<preid>[0-9 A-Z-]{1,})", predictor_profile),
     re_path("^inventory/(?P<calid>[0-9 A-Z-]*)/predictors/create", predictor_upload),
-    re_path("^inventory/[0-9 A-Z-]*/predictors/",      asset_predictors, name="asset_predictors")
+    re_path("^inventory/(?P<calid>[0-9 A-Z-]*)/predictors/",       asset_predictors, name="asset_predictors")
 ]

{irie-0.0.21 → irie-0.0.23}/src/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
 
@@ -36,9 +36,7 @@ def new_prediction(request):
 
 
 @login_required(login_url="/login/")
-def asset_predictors(request):
-
-    calid = request.path.split("/")[-3]
+def asset_predictors(request, calid):
 
     context = {"segment": "inventory"}
 
@@ -55,6 +53,7 @@ def asset_predictors(request):
 
     try:
         context["asset"] = Asset.objects.get(calid=calid)
+
     except Asset.DoesNotExist:
         return HttpResponse(
                 loader.get_template("site/page-404-sidebar.html").render(context, request)
@@ -103,9 +102,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 +117,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-0.0.21 → irie-0.0.23}/src/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-0.0.21 → irie-0.0.23}/src/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))