irie 0.0.41__py3-none-any.whl → 0.0.43__py3-none-any.whl

irie/apps/inventory/filters.py

@@ -37,7 +37,7 @@ class AssetFilter(django_filters.FilterSet):
     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
+                asset.nbi_data and int(asset.nbi_data["NBI_BRIDGE"].get("Year Built",0) or 0) <= int(value) #.year
             )
         }
         return queryset.filter(id__in=ids)

irie/apps/inventory/models.py

@@ -142,3 +142,30 @@ class Sensor(models.Model):
 
     def __str__(self):
         return f"{self.name} ({self.group.name})"
+
+
+
+# class Rendering:
+#     def __init__(self, url=None, units, datum):
+#         self._url = url
+
+
+#     def url(self):
+#         return self._url
+    
+#     def url_or_data(self):
+#         pass
+    
+#     def scale_meter(self):
+#         pass
+
+# class PersistentRendering(models.Model):
+#     asset = models.ForeignKey(Asset, on_delete=models.CASCADE)
+#     datum = models.ForeignKey(Datum, on_delete=models.CASCADE)
+#     units = models.CharField(max_length=3) 
+
+# class TemporaryRendering(Rendering):
+#     def __init__(self, data, units, datum, asset):
+#         self._data  = data
+#         self._units = units 
+#         self._datum = datum

irie/apps/inventory/urls.py

@@ -27,4 +27,7 @@ urlpatterns = [
     re_path("^inventory/(?P<calid>[0-9 A-Z-]*)/$",              views.asset_profile, name="asset_profile"),
     re_path("^inventory/(?P<calid>[0-9 A-Z-]*)/sensors/$",      views.asset_sensors, name="asset_sensors"),
     re_path("^inventory/(?P<calid>[0-9 A-Z-]*)/sensor_upload",  views.sensor_upload, name="sensor_upload"),
+
+    path("inventory/map2/", views.map_inventory),
+    path("california.json", views.california_json),
 ]

irie/apps/inventory/views.py

@@ -221,6 +221,62 @@ def asset_evals(request, calid):
         return HttpResponse(html_template.render(context, request))
 
 
+def california_json(request):
+    with open("ca.json") as f:
+        return HttpResponse(f.read(), content_type="application/json")
+    with open("us_states.json") as f:
+        cal = [s for s in json.load(f)["features"] if s["id"] == "CA"][0]
+    return HttpResponse(json.dumps({"type": "FeatureCollection", "features": [cal]}), content_type="application/json")
+
+def map_inventory(request):
+
+    import json
+    from irie.apps.inventory.models import Asset
+
+    consumed = {
+        "Partial": set(),
+        "Complete": set(),
+        "Instrumented": set()
+    }
+
+    data = {
+        "Partial": [],
+        "Complete": [],
+        "Instrumented": []
+    }
+
+    for asset in Asset.objects.all():
+        if asset.is_complete:
+            consumed["Complete"].add(asset.calid)
+            lat, lon = asset.coordinates
+            data["Complete"].append({
+                "lat": lat, "lon": lon
+            })
+
+    from irie.init.calid import CESMD, CESMD_LONG_LAT
+    for calid in CESMD:
+        if calid not in consumed["Complete"]:
+            consumed["Instrumented"].add(asset.calid)
+            try:
+                lat, lon = CESMD_LONG_LAT[CESMD[calid][0][2:]]
+            except:
+                continue
+            data["Instrumented"].append({
+                # "lat": lat, "lon": -lon
+                "lat": lat, "lon": lon
+            })
+
+    for asset in Asset.objects.all():
+        if asset.calid not in consumed["Instrumented"] and asset.calid not in consumed["Complete"]:
+            lat, lon = asset.coordinates
+            data["Partial"].append({
+                "lat": lat, "lon": lon
+            })
+
+
+    html_template = loader.get_template("inventory/map-inventory.html")
+    return HttpResponse(html_template.render({"data": json.dumps(data)}, request))
+
 # @login_required(login_url="/login/")
 def asset_profile(request, calid):
 
@@ -548,6 +604,7 @@ class AssetMap:
                         weight=1,
                         z_index_offset=10 if b.is_complete else 100000
                     )
+
             if b.is_complete:
                 marker = folium.Marker(
                        location=[lat, lon],

irie/apps/prediction/forms.py

@@ -14,7 +14,8 @@ class PredictorForm(forms.ModelForm):
             "render_file", 
             "asset", 
             "metrics", 
-            "active", 
+            "active",
+            "description",
             "entry_point", 
             "config", 
             "protocol"

irie/apps/prediction/models.py

@@ -35,3 +35,27 @@ class PredictorModel(models.Model):
     def __str__(self):
         return f"{self.asset.calid} - {self.name} : {self.description}"
 
+
+# class PhysicsPredictor(models.Model):
+#     class Units(models.TextChoices):
+#         iks = "IKS"
+#         ips = "IPS"
+#         fps = "FPS"
+#         mks = "MKS"
+#         cgs = "CGS"
+
+#     id          = models.BigAutoField(primary_key=True)
+#     name        = models.CharField(max_length=35)
+#     active      = models.BooleanField()
+#     asset       = models.ForeignKey(Asset, on_delete=models.CASCADE)
+#     description = models.TextField(default="")
+
+#     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)
+
+#     units       = models.CharField(max_length=3, choices=Units.choices)
+
+
+#     def __str__(self):
+#         return f"{self.name} : {self.asset.calid}"

irie/apps/prediction/runners/hazus.py

@@ -31,7 +31,6 @@ REFERENCES
 import math
 import json
 from scipy.stats import norm
-from irie.apps.events.models import EventRecord
 from irie.apps.prediction.runners import Runner, RunID
 from irie.apps.prediction.models import PredictorModel
 
@@ -181,30 +180,30 @@ def _bridge_info(nbi: dict) -> dict:
     """
     try:
         nbi_bridge = nbi.get("NBI_BRIDGE", {})
-        nbi_superstructure = nbi.get("NBI_SUPERSTRUCTURE_DECK", {})
+        nbi_supers = nbi.get("NBI_SUPERSTRUCTURE_DECK", {})
 
-        # Parse "Skew Angle"
-        skew_angle_str = nbi_bridge.get("Skew Angle", "0")
-        if "99" in skew_angle_str:  # Handle undefined skew
+        # 34: "Skew Angle"
+        skew_angle_str = nbi_bridge.get("Skew Angle", "99")
+        if "99" in skew_angle_str:
             skew_angle = 0
         else:
             skew_angle = float(skew_angle_str.split(" - ")[0])
 
         return {
             "state_code":      StateCodes.California,
-            "year_built":      int(nbi_bridge.get("Year Built", 0)),
-            "skew_angle":      skew_angle,
+            "year_built":      int(nbi_bridge.get("Year Built", 0)),                                      # 27
+            "skew_angle":      skew_angle,                                                                # 34
             "service_type":    int(
-                nbi_bridge.get("Type of Service on Bridge Code", "0 - Unknown").split(" - ")[0]
-                + nbi_bridge.get("Type Of Service Under Bridge Code", "0 - Unknown").split(" - ")[0]
+                nbi_bridge.get("Type of Service on Bridge Code", "0 - Unknown").split(" - ")[0]           # 42A
+                + nbi_bridge.get("Type Of Service Under Bridge Code", "0 - Unknown").split(" - ")[0]      # 42B
             ),
-            "material_flag":   int(nbi_superstructure.get("Main Span Material", "0 - Unknown").split(" - ")[0]),
-            "geometry_flag":   int(nbi_superstructure.get("Main Span Design", "0 - Unknown").split(" - ")[0]),
-            "span_count":      int(nbi_superstructure.get("Number of Spans in Main Unit", 0)),
-            "approach_spans":  int(nbi_superstructure.get("Number of Approach Spans", 0)),
-            "max_span_length": float(nbi_bridge.get("Length of Maximum Span", 0.0)),
-            "total_length":    float(nbi_bridge.get("Structure Length", 0.0)),
-            "deck_width":      float(nbi_bridge.get("Deck Width - Out to Out", 0.0)),
+            "material_flag":   int(nbi_supers.get("Main Span Material", "0 - Unknown").split(" - ")[0]),  # 43A
+            "geometry_flag":   int(nbi_supers.get("Main Span Design", "0 - Unknown").split(" - ")[0]),    # 43B
+            "span_count":      int(nbi_supers.get("Number of Spans in Main Unit", 0)),                    # 45
+            "approach_spans":  int(nbi_supers.get("Number of Approach Spans", 0)),                        # 46
+            "max_span_length": float(nbi_bridge.get("Length of Maximum Span", 0.0)),                      # 48
+            "total_length":    float(nbi_bridge.get("Structure Length", 0.0)),                            # 49
+            "deck_width":      float(nbi_bridge.get("Deck Width - Out to Out", 0.0)),                     # 52
         }
     except ValueError as e:
         raise ValueError(f"Error processing NBI data: {e}")
@@ -214,12 +213,20 @@ def _bridge_info(nbi: dict) -> dict:
 
 def _hazus_curve(type: int, properties: dict, sa_03s: float, sa_10s: float, soil_type: str) -> dict:
     """
-    Compute fragility probabilities for the four damage states and optionally generate fragility curves.
+    Compute fragility probabilities for the four damage states
 
     See page 7-14 of [1]
-    Args:
+    See reference [3] for details
+    See Section 7.1.6.2 of [1] for example
+
+    Parameters
     - type (int): Bridge classification (integer from 1 to 28).
-    - properties (dict): Dictionary containing bridge-specific properties.
+    - properties (dict): Dictionary containing NBI data:
+        - span_count (N), 
+        - skew_angle (α), 
+        - deck_width (W), 
+        - max_span_length (Lmax), # 48
+        - total_length (L),       # 49
     - pga (float): Peak Ground Acceleration (g).
     - sa_03s (float): Spectral Acceleration at 0.3 seconds (g).
     - sa_10s (float): Spectral Acceleration at 1.0 seconds (g).
@@ -227,6 +234,10 @@ def _hazus_curve(type: int, properties: dict, sa_03s: float, sa_10s: float, soil
 
     Returns:
     - dict: Fragility probabilities for Slight, Moderate, Extensive, and Complete damage states.
+
+    Note
+    The skew angle is defined as the angle between the centerline of a 
+    pier and a line normal to the roadway centerline.
     """
     # Validate inputs
     required_keys = {"span_count", "skew_angle"}
@@ -242,6 +253,9 @@ def _hazus_curve(type: int, properties: dict, sa_03s: float, sa_10s: float, soil
     skew_angle = properties["skew_angle"]
 
     # Step 2: Get soil-amplified shaking parameters
+    # Evaluate the soil-amplified shaking at the bridge site. That is, get the peak ground acceleration
+    # (PGA), spectral accelerations (Sa at 0.3 seconds and Sa at 1.0 second) and the permanent ground
+    # deformation (in inches).
     modified_values = modify_ground_motion(soil_type, None, sa_03s, sa_10s)
     modified_sa_03s = modified_values['sa_03s']
     modified_sa_10s = modified_values['sa_10s']

irie/apps/prediction/urls.py

@@ -8,11 +8,13 @@
 #
 #----------------------------------------------------------------------------#
 from django.urls import re_path
-from .views import new_prediction, asset_predictors, predictor_profile, predictor_upload
+from .views import new_prediction, asset_predictors, predictor_profile, predictor_upload, asset_map
 
 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/(?P<calid>[0-9 A-Z-]*)/predictors/",       asset_predictors, name="asset_predictors")
+    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")
 ]

irie/apps/prediction/views.py

@@ -11,11 +11,15 @@
 #----------------------------------------------------------------------------#
 import os
 import json
+import veux
+import uuid
+import base64
 
 from django.shortcuts import HttpResponse
 from django.template import loader, TemplateDoesNotExist
 from django.contrib.auth.decorators import login_required
 from django.core.exceptions import ObjectDoesNotExist
+from django.core.files.base import ContentFile
 
 from django.shortcuts import render
 
@@ -97,27 +101,116 @@ def predictor_profile(request, calid, preid):
         return HttpResponse(html_template.render(context, request))
 
 
+@login_required(login_url="/login/")
+def asset_map(request, calid):
+
+
+    r200 = loader.get_template("inventory/asset-on-map.html")
+    r400 = loader.get_template("site/page-400.html")
+    asset = Asset.objects.get(calid=calid)
+    context = {
+        "asset": asset,
+        "viewer": "three",
+        "location": json.dumps(list(reversed(list(asset.coordinates)))),
+    }
+
+    if request.method == "GET":
+        context["render_src"] = asset.rendering
+
+    elif request.method == "POST":
+        from openbim.csi import load, create_model, collect_outlines
+        # context["offset"] = json.dumps(list(reversed(list(asset.coordinates))))
+        context["rotate"] = "[0, 0, 0]"
+        context["scale"]  = 1/3.2808 # TODO
+
+        uploaded_file = request.FILES.get('config_file')
+
+        try:
+            csi = load((str(line.decode()).replace("\r\n","\n") for line in uploaded_file.readlines()))
+        except Exception as e:
+            return HttpResponse(r400.render({"message": json.dumps({"error": str(e)})}), status=400)
+
+        try:
+            model = create_model(csi, verbose=True)
+        except Exception as e:
+            return HttpResponse(r400.render({"message": json.dumps({"error": str(e)})}), status=400)
+
+
+        outlines = collect_outlines(csi, model.frame_tags)
+        artist = veux.render(model, canvas="gltf", vertical=3,
+                                reference={"frame.surface", "frame.axes"},
+                                model_config={"frame_outlines": outlines})
+
+        glb = artist.canvas.to_glb()
+        glb64 = base64.b64encode(glb).decode("utf-8")
+        context["render_glb"] = f"data:application/octet-stream;base64,{glb64}"
+
+
+    try:
+        return HttpResponse(r200.render(context, request))
+
+    except Exception as e:
+        r500 = loader.get_template("site/page-500.html")
+        return HttpResponse(r500.render({"message": str(e)}, request), status=500)
+
+
+
+
 @login_required(login_url="/login/")
 def predictor_upload(request, calid):
 
+    asset = Asset.objects.get(calid=calid)
     html_template = loader.get_template("prediction/predictor-upload.html")
+    r400 = loader.get_template("site/page-400.html")
+    context = {
+        "asset": asset,
+        "segment": "inventory",
+        "viewer": "babylon",
+        "offset": json.dumps(list(reversed(list(asset.coordinates)))),
+    }
 
     if request.method == "POST":
+        from openbim.csi import load, create_model, collect_outlines
         form = PredictorForm(request.POST, request.FILES)
-        asset = Asset.objects.get(calid=calid)
 
-        # Save the predictor
-        predictor = PREDICTOR_TYPES[request.POST.get("runner")].create(asset, request)
-        predictor.save()
+        uploaded_file = request.FILES.get('config_file')
 
-        return HttpResponse(json.dumps({"data": {"id": predictor.id}}))
+        try:
+            csi = load((str(line.decode()).replace("\r\n","\n") for line in uploaded_file.readlines()))
+        except Exception as e:
+            return HttpResponse(r400.render({"message": json.dumps({"error": str(e)})}), status=400)
 
-    else:
-        form = PredictorForm()
+        model = create_model(csi, verbose=True)
+
+        # Generate the .glb file using veux
+        outlines = collect_outlines(csi, model.frame_tags)
+        artist = veux.create_artist(model, canvas="gltf", vertical=3,
+                             model_config={"frame_outlines": outlines}
+        )
+        artist.draw_surfaces()
+        glb = artist.canvas.to_glb()
+
+        if request.POST.get("action") == "commit":
+            if not form.is_valid():
+                return HttpResponse(json.dumps({"error": "Invalid form data"}), status=400)
+            predictor = PredictorModel()
+            predictor.active = False
+            predictor.asset = asset
+            predictor.name = form.cleaned_data['name']
+            predictor.description = "empty"
+
+            predictor.render_file.save(f"{uuid.uuid4()}.glb", ContentFile(glb), save=True)
+            predictor.save()
+
+        context["form"] = form
+
+    else: # probably a GET
+        context["form"] = PredictorForm()
 
 
     try:
-        return render(request, "prediction/predictor-upload.html", {"form": form})
+        return HttpResponse(html_template.render(context, request))
+        # return render(request, "prediction/predictor-upload.html", {"form": form})
 
     except Exception as e:
         if "DEBUG" in os.environ and os.environ["DEBUG"]:

irie/apps/static/assets/css/brace.css

@@ -22277,38 +22277,6 @@ textarea.form-control-lg {
   color: #3A416F;
 }
 
-.breadcrumb-item {
-  font-size: 0.875rem;
-}
-.breadcrumb-item.text-white::before {
-  color: #ffffff;
-}
-
-.breadcrumb-dark {
-  background-color: #1F2937;
-}
-.breadcrumb-dark .breadcrumb-item {
-  font-weight: 600;
-}
-.breadcrumb-dark .breadcrumb-item a {
-  color: #F2F4F6;
-}
-.breadcrumb-dark .breadcrumb-item a:hover {
-  color: #ffffff;
-}
-.breadcrumb-dark .breadcrumb-item + .breadcrumb-item::before {
-  color: #6B7280;
-}
-.breadcrumb-dark .breadcrumb-item.active {
-  color: #D1D5DB;
-}
-
-.breadcrumb-links {
-  padding: 0;
-  margin: 0;
-  background: transparent;
-}
-
 .card {
   box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.05);
   border: 1px solid #E5E7EB;
@@ -23442,7 +23410,6 @@ svg.text-dark .color-background {
   padding-left: 0.75rem;
   padding-right: 0.75rem;
   font-weight: 500;
-  color: #ffffff;
   font-size: 0.75rem;
 }
 .navbar-vertical .navbar-nav .nav-link > i {