irie 0.0.49__py3-none-any.whl → 0.0.51__py3-none-any.whl

irie/apps/inventory/filters.py

@@ -5,37 +5,32 @@ class AssetFilter(django_filters.FilterSet):
     search = django_filters.CharFilter(
         lookup_expr="icontains", 
         field_name="calid",
-        label='Search'
+        label="Search"
     )
 
     cesmd_not_null = django_filters.BooleanFilter(
-        label='Instrumented',
+        label="Instrumented",
         widget=CheckboxInput(),
-        method='filter_cesmd_exists'
+        method="filter_cesmd_exists"
     )
 
     is_streaming = django_filters.BooleanFilter(
-        # field_name='is_complete',
-        label='Streaming',
+        # field_name="is_complete",
+        label="Streaming",
         widget=CheckboxInput(),
-        method='filter_is_streaming'
+        method="filter_is_streaming"
     )
 
     district = django_filters.CharFilter(
-        label='District',
-        method='filter_district'
+        label="District",
+        method="filter_district"
     )
 
     max_year = django_filters.NumberFilter(
-        label='Max Year',
-        method='filter_year',
-        # widget=django_filters.widgets.DateInput(attrs={'type': 'date'})
+        label="Max Year",
+        method="filter_year"
     )
-    # 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 (
@@ -43,19 +38,6 @@ class AssetFilter(django_filters.FilterSet):
             )
         }
         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):

irie/apps/inventory/models.py

@@ -63,7 +63,7 @@ class Asset(models.Model):
         from irie.apps.prediction.models import PredictorModel
         return {
             p.name: PREDICTOR_TYPES[p.protocol](p)
-            for p in PredictorModel.objects.filter(asset=self)
+            for p in reversed(PredictorModel.objects.filter(asset=self))
         }
 
     @property
@@ -123,7 +123,7 @@ class SensorGroup(models.Model):
 #   network = models.CharField(max_length=100)
 #   events  = None
     def __str__(self):
-        return f"{self.name} - {self.datum}"
+        return f"{self.asset.calid} - {self.name} ({self.datum})"
 
 class Sensor(models.Model):
     # class Status:
@@ -141,7 +141,7 @@ class Sensor(models.Model):
     group  = models.ForeignKey(SensorGroup, related_name="sensors", on_delete=models.RESTRICT)
 
     def __str__(self):
-        return f"{self.name} ({self.group.name})"
+        return f"{self.group.asset.calid} - {self.name} ({self.group.name})"
 
 
 

irie/apps/inventory/views.py

@@ -24,6 +24,7 @@ from irie.apps.events.models import EventRecord
 from irie.apps.site.view_utils import raise404
 from irie.apps.inventory.models import Asset, SensorGroup, Sensor, Datum
 from irie.apps.inventory.forms import SensorGroupForm, SensorForm, SensorFormSet
+from irie.apps.prediction.models import PredictorModel
 from .filters import AssetFilter
 # Predictors
 from irie.apps.prediction.runners.hazus import hazus_fragility
@@ -439,12 +440,18 @@ def sensor_upload(request, calid):
         group_form = SensorGroupForm(asset=asset)
         formset = SensorFormSet()
 
-    return render(request, "inventory/sensor-upload.html", {
+    context = {
         "group_form": group_form, 
         "formset": formset,
+        "renderings": [
+            {"name": predictor.name, "glb": predictor.render_file.url}
+            for predictor in  PredictorModel.objects.filter(asset=asset, protocol="IRIE_PREDICTOR_V1")
+            if predictor.render_file and predictor.render_file.url
+        ],
         "asset": asset,
         "datums": list(datums)
-    })
+    }
+    return render(request, "inventory/sensor-upload.html", context)
 
 
 def _filter_asset_table(request):

irie/apps/prediction/admin.py

@@ -4,6 +4,7 @@
 #
 #===----------------------------------------------------------------------===#
 from django.contrib import admin
-from .models import PredictorModel
+from .models import PredictorModel, SensorAssignment
 
 admin.site.register(PredictorModel)
+admin.site.register(SensorAssignment)

irie/apps/prediction/migrations/0004_sensorassignment.py

@@ -0,0 +1,31 @@
+# Generated by Django 5.1.2 on 2025-04-28 01:52
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('apps_prediction', '0003_alter_predictormodel_protocol'),
+        ('irie_apps_inventory', '0008_alter_sensor_dx_alter_sensor_dy_alter_sensor_dz_and_more'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='SensorAssignment',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('node', models.IntegerField()),
+                ('role', models.CharField(choices=[('input', 'Input'), ('output', 'Output')], max_length=16)),
+                ('orient_z', models.FloatField()),
+                ('orient_x', models.FloatField(default=0.0)),
+                ('orient_y', models.FloatField(default=0.0)),
+                ('offset_x', models.FloatField(default=0.0)),
+                ('offset_y', models.FloatField(default=0.0)),
+                ('offset_z', models.FloatField(default=0.0)),
+                ('predictor', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='apps_prediction.predictormodel')),
+                ('sensor', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='irie_apps_inventory.sensor')),
+            ],
+        ),
+    ]

irie/apps/prediction/migrations/0005_remove_sensorassignment_offset_x_and_more.py

@@ -0,0 +1,53 @@
+# Generated by Django 5.1.2 on 2025-04-28 02:12
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('apps_prediction', '0004_sensorassignment'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='sensorassignment',
+            name='offset_x',
+        ),
+        migrations.RemoveField(
+            model_name='sensorassignment',
+            name='offset_y',
+        ),
+        migrations.RemoveField(
+            model_name='sensorassignment',
+            name='offset_z',
+        ),
+        migrations.AddField(
+            model_name='sensorassignment',
+            name='show_x',
+            field=models.FloatField(default=0),
+            preserve_default=False,
+        ),
+        migrations.AddField(
+            model_name='sensorassignment',
+            name='show_y',
+            field=models.FloatField(default=0),
+            preserve_default=False,
+        ),
+        migrations.AddField(
+            model_name='sensorassignment',
+            name='show_z',
+            field=models.FloatField(default=0),
+            preserve_default=False,
+        ),
+        migrations.AlterField(
+            model_name='sensorassignment',
+            name='orient_x',
+            field=models.FloatField(),
+        ),
+        migrations.AlterField(
+            model_name='sensorassignment',
+            name='orient_y',
+            field=models.FloatField(),
+        ),
+    ]

irie/apps/prediction/migrations/0006_remove_sensorassignment_show_x_and_more.py

@@ -0,0 +1,25 @@
+# Generated by Django 5.1.2 on 2025-04-28 02:26
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('apps_prediction', '0005_remove_sensorassignment_offset_x_and_more'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='sensorassignment',
+            name='show_x',
+        ),
+        migrations.RemoveField(
+            model_name='sensorassignment',
+            name='show_y',
+        ),
+        migrations.RemoveField(
+            model_name='sensorassignment',
+            name='show_z',
+        ),
+    ]

irie/apps/prediction/models.py

@@ -5,15 +5,14 @@
 #===----------------------------------------------------------------------===#
 from django.db import models
 
-from irie.apps.inventory.models import Asset
+from irie.apps.inventory.models import Asset, Sensor
+
 
 class PredictorModel(models.Model):
     # https://docs.djangoproject.com/en/4.2/ref/models/fields/
     class Protocol(models.TextChoices):
         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)
@@ -36,6 +35,26 @@ class PredictorModel(models.Model):
         return f"{self.asset.calid} - {self.name} : {self.description}"
 
 
+class SensorAssignment(models.Model):
+    predictor = models.ForeignKey(PredictorModel, on_delete=models.CASCADE)
+    sensor    = models.ForeignKey(Sensor,         on_delete=models.CASCADE)
+    node      = models.IntegerField()
+    role      = models.CharField(
+        max_length=16,
+        choices=[
+            ('input',   'Input'),
+            ('output',  'Output'),
+        ]
+    )
+
+    orient_z  = models.FloatField()
+    orient_x  = models.FloatField()
+    orient_y  = models.FloatField()
+    # show_x    = models.FloatField()
+    # show_y    = models.FloatField()
+    # show_z    = models.FloatField()
+
+
 # class PhysicsPredictor(models.Model):
 #     class Units(models.TextChoices):
 #         iks = "IKS"

irie/apps/prediction/runners/__init__.py

@@ -20,7 +20,8 @@ class Runner:
 
         if isinstance(pred, dict):
             # Create from dict when posted from API; this
-            # is used to create a new PredictorModel
+            # is used to create a new PredictorModel. 
+            # In the future this may be removed.
             self.name: str   = pred["name"]
             self.description = pred.get("description", "")
             self.conf        = pred["config"]
@@ -28,7 +29,7 @@ class Runner:
             self.entry_point = pred["entry_point"]
             self.active = pred.get("active", True)
         else:
-            # Create from PredictorModel when loaded from database.
+            # Create from existing PredictorModel when loaded from database.
             # This is done when running analysis
             self.id = pred.id
             self.asset = pred.asset
@@ -38,9 +39,17 @@ class Runner:
             self.entry_point = pred.entry_point
             self.metrics = pred.metrics
             self.active = pred.active
+
+            # NEW:
+            self.predictor = pred
+
+            self.runs = {}
             if pred.config_file:
                 self.model_file = Path(pred.config_file.path).resolve()
                 self.out_dir = Path(__file__).parents[0]/"Predictions"
+            else:
+                self.model_file = None
+                self.out_dir = None
                 self.runs = {}
 
     @abstractmethod

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

@@ -47,7 +47,7 @@ def new_cd(x):
 class OpenSeesRunner(Runner):
     @property
     def platform(self):
-        return self.conf.get("platform", "")
+        return self.conf.get("platform", "xara")
 
 
     @classmethod
@@ -58,9 +58,7 @@ class OpenSeesRunner(Runner):
         # TODO
         data.pop("file")
         uploaded_file = request.FILES.get('config_file', None)
-        print(uploaded_file)
         if uploaded_file:
-
             with open(uploaded_file.name, 'wb+') as destination:
                 for chunk in uploaded_file.chunks():
                     destination.write(chunk)
@@ -499,72 +497,126 @@ class OpenSeesRunner(Runner):
             return {}
         return {}
 
+    #
+    # Viewing methods
+    #
+    def structural_section(self, name):
+        from shps.shapes import from_aisc
+        from openbim.csi._frame.section import section_geometry, section_mesh
 
-import subprocess 
-class Event: pass 
+        from openbim.csi import load, create_model, collect_outlines
+        # 1) Parse the CSI file
+        try:
+            csi_file = self.predictor.config_file
+            csi = load((str(line.decode()).replace("\r\n","\n") for line in csi_file.readlines()))
+        except:
+            return None
+
+        mesh = section_mesh(csi, name)
+        return {}, mesh
+        mesh = from_aisc("W12x14").create_mesh(mesh_kwds={"engine": "meshpy"})
+        mesh = (mesh.nodes, mesh.cells())
+        # return {}, mesh
+        
 
-class PredictorType1(Runner):
-    @property
-    def platform(self):
-        return self.conf.get("platform", "")
 
-    @classmethod
-    def create(cls, asset, request):
-        from irie.apps.prediction.models import PredictorModel
-        predictor = PredictorModel()
-        data = json.loads(request.data.get("json"))
-        predictor.entry_point = [
-            sys.executable, "-m", "opensees"
-        ]
-        data["metrics"] = []
-
-        predictor.name = data.pop("name")
-        predictor.config = data
-        predictor.asset = asset
-        predictor.protocol = "IRIE_PREDICTOR_T1"
-        predictor.active = False
-        return predictor
 
+    def structural_members(self):
 
-    @classproperty
-    def schema(cls):
-        from irie.apps.prediction.runners.opensees import schemas
-        return {
-            "title": "Structural Model",
-            "options": {"disable_collaps": True},
-            "schema": "http://json-schema.org/draft-04/schema#",
-            "type": "object",
-            "properties": {
-                "platform": {
-                  "type": "string",
-                  "title": "Platform",
-                  "enum": ["OpenSees","CSiBridge"]
-                },
-                "model":    schemas.load("hwd_conf.schema.json"),
-                "analysis": schemas.load("hwd_analysis.schema.json"),
-            }
-        }
+        from openbim.csi import load, create_model, collect_outlines
+        # 1) Parse the CSI file
+        csi_file = self.predictor.config_file
+        try:
+            csi = load((str(line.decode()).replace("\r\n","\n") for line in csi_file.readlines()))
+        except Exception as e:
+            import sys
+            print(f"Error loading CSiBridge file: {e}", file=sys.stderr)
+            csi = {}
+        
+        for item in csi.get("BRIDGE BENT DEFINITIONS 2 - COLUMN DATA",[]):
+            if "ColNum" in item and "Section" in item:
+                yield {
+                    "name": item["ColNum"],
+                    "type": "Column",
+                    "section": item["Section"],
+                }
 
-    def newPrediction(self, event: Event) -> RunID:
-        self.event = event
-        event_file = Path(event.event_file.path).resolve()
-        command = [*self.entry_point, "new", event_file]
-        run_id = subprocess.check_output(command).decode().strip()
-        return RunID(int(run_id))
+        for item in csi.get("BRIDGE OBJECT DEFINITIONS 03 - SPANS 1 - GENERAL", []):
+            if "SpanName" in item and "BridgeSect" in item:
+                yield {
+                    "name": item["SpanName"],
+                    "type": "Span",
+                    "section": None,
+                }
 
-    def runPrediction(self, run_id: RunID):
-        command = [*self.entry_point, "run", str(run_id)]
 
-        if "scale" in self.event.upload_data:
-            command.extend(["--scale", str(float(self.event.upload_data["scale"]))])
-        print(":: Running ", command, file=sys.stderr)
-        subprocess.check_output(command)
 
-        print(f":: Model {self.name} returned", file=sys.stderr)
-        return
 
-    def getMetricData(self, run, metric):
-        try:
-            return json.loads(subprocess.check_output([*self.entry_point, "get", str(run), metric]).decode())
-        except json.decoder.JSONDecodeError:
-            return {}
+# import subprocess 
+# class Event: pass 
+
+# class PredictorType1(Runner):
+#     @property
+#     def platform(self):
+#         return self.conf.get("platform", "")
+
+#     @classmethod
+#     def create(cls, asset, request):
+#         from irie.apps.prediction.models import PredictorModel
+#         predictor = PredictorModel()
+#         data = json.loads(request.data.get("json"))
+#         predictor.entry_point = [
+#             sys.executable, "-m", "opensees"
+#         ]
+#         data["metrics"] = []
+
+#         predictor.name = data.pop("name")
+#         predictor.config = data
+#         predictor.asset = asset
+#         predictor.protocol = "IRIE_PREDICTOR_T1"
+#         predictor.active = False
+#         return predictor
+
+
+#     @classproperty
+#     def schema(cls):
+#         from irie.apps.prediction.runners.opensees import schemas
+#         return {
+#             "title": "Structural Model",
+#             "options": {"disable_collaps": True},
+#             "schema": "http://json-schema.org/draft-04/schema#",
+#             "type": "object",
+#             "properties": {
+#                 "platform": {
+#                   "type": "string",
+#                   "title": "Platform",
+#                   "enum": ["OpenSees","CSiBridge"]
+#                 },
+#                 "model":    schemas.load("hwd_conf.schema.json"),
+#                 "analysis": schemas.load("hwd_analysis.schema.json"),
+#             }
+#         }
+
+#     def newPrediction(self, event: Event) -> RunID:
+#         self.event = event
+#         event_file = Path(event.event_file.path).resolve()
+#         command = [*self.entry_point, "new", event_file]
+#         run_id = subprocess.check_output(command).decode().strip()
+#         return RunID(int(run_id))
+
+#     def runPrediction(self, run_id: RunID):
+#         command = [*self.entry_point, "run", str(run_id)]
+
+#         if "scale" in self.event.upload_data:
+#             command.extend(["--scale", str(float(self.event.upload_data["scale"]))])
+#         print(":: Running ", command, file=sys.stderr)
+#         subprocess.check_output(command)
+
+#         print(f":: Model {self.name} returned", file=sys.stderr)
+#         return
+
+#     def getMetricData(self, run, metric):
+#         try:
+#             return json.loads(subprocess.check_output([*self.entry_point, "get", str(run), metric]).decode())
+#         except json.decoder.JSONDecodeError:
+#             return {}

irie/apps/prediction/runners/ssid.py

@@ -13,20 +13,13 @@ import io
 import base64
 import numpy as np
 # Ensure Agg backend is set for non-interactive plotting
-import matplotlib
-matplotlib.use('Agg')
-from matplotlib import pyplot as plt, ticker, cm
+
 import quakeio
 from mdof import transform
 from scipy.signal import find_peaks
 from mdof.utilities import Config, extract_channels
-from matplotlib import colormaps
 import subprocess
-# try:
-#     import scienceplots
-#     plt.style.use(["science"])
-# except ImportError:
-#     pass
+
 
 N_PEAKS = 5 # number of "significant" peaks per record
 MISSING_CHANNEL_LIMIT = 3 # number of missing output channels allowed before skipping event
@@ -439,6 +432,10 @@ def plot_spectral_surface(ax, traces, **options):
 
 
 def _plot_mountains(spectra, accellim=None):
+    import matplotlib
+    matplotlib.use('Agg')
+    from matplotlib import pyplot as plt, ticker, cm
+    from matplotlib import colormaps
     fig = plt.figure(figsize=(13,13))
     ax = fig.add_subplot(projection='3d')
 
@@ -512,7 +509,6 @@ def make_mountains(asset, conf=None, output_channels=None):
     buffer = io.BytesIO()
     fig.savefig(buffer, format="png")
     buffer.seek(0)
-    # plt.show()
 
     # Encode the image as Base64
     return base64.b64encode(buffer.read()).decode("utf-8")
@@ -549,6 +545,9 @@ def parse_args(args):
 if __name__ == '__main__':
 
     import sys
+    from matplotlib import pyplot as plt, ticker, cm
+    from matplotlib import colormaps
+
     procedure = parse_args(sys.argv)
     STATION_TYPE = procedure['STATION_TYPE']
     outdir = Path(procedure['outdir'])

irie/apps/prediction/urls.py

@@ -8,13 +8,18 @@
 #
 #----------------------------------------------------------------------------#
 from django.urls import re_path
-from .views import new_prediction, asset_predictors, predictor_profile, predictor_upload, asset_map
+from .views import (
+    asset_predictors, predictor_profile, predictor_profile_detail,
+    create_mdof, create_model, asset_map
+)
+
+_ROOT = "^inventory/(?P<calid>[0-9 A-Z-]*)/predictors"
 
 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/map/$", asset_map),
-    re_path("^inventory/(?P<calid>[0-9 A-Z-]*)/map/$",                   asset_map),
-    re_path("^inventory/(?P<calid>[0-9 A-Z-]*)/predictors/create/$",     predictor_upload),
-    re_path("^inventory/(?P<calid>[0-9 A-Z-]*)/predictors/",             asset_predictors, name="asset_predictors")
+    re_path(f"{_ROOT}/(?P<preid>[0-9]{{1,}})/$",        predictor_profile),
+    re_path(f"{_ROOT}/(?P<preid>[0-9]{{1,}})/detail/",  predictor_profile_detail),
+    re_path(f"{_ROOT}/create/map/$",                asset_map),
+    re_path(f"{_ROOT}/create/model/$",              create_model),
+    re_path(f"{_ROOT}/create/v1/$",                 create_mdof),
+    re_path(f"{_ROOT}/$",                           asset_predictors, name="asset_predictors")
 ]