irie 0.0.55__tar.gz → 0.0.57__tar.gz

{irie-0.0.55 → irie-0.0.57}/PKG-INFO

@@ -1,11 +1,11 @@
 Metadata-Version: 2.4
 Name: irie
-Version: 0.0.55
+Version: 0.0.57
 Summary: An infrastructure resilience engine
 Author-email: "Claudio M. Perez" <50180406+claudioperez@users.noreply.github.com>
 Project-URL: Repository, https://github.com/STAIRLab
 Project-URL: Documentation, https://stairlab.berkeley.edu/software/irie/
-Keywords: visualization,seismic,opensees,resilience,post-processing,structural-health-monitoring,finite-element-analysis,glTF
+Keywords: resilience,structural-health-monitoring,finite-element-analysis,xara
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Science/Research
 Classifier: Intended Audience :: Developers
@@ -27,12 +27,13 @@ Classifier: Operating System :: Unix
 Classifier: Operating System :: MacOS
 Description-Content-Type: text/markdown
 Requires-Dist: tqdm
-Requires-Dist: opensees
+Requires-Dist: opensees>=0.1.0
 Requires-Dist: quakeio
 Requires-Dist: mdof
-Requires-Dist: veux
+Requires-Dist: veux>=0.0.35
 Requires-Dist: xara
-Requires-Dist: bottle
+Requires-Dist: xcsi
+Requires-Dist: xsection>=0.0.19
 Requires-Dist: openbim
 Requires-Dist: folium
 Requires-Dist: pandas

{irie-0.0.55 → irie-0.0.57}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "irie"
-version = "0.0.55"
+version = "0.0.57"
 authors = [
   {name="Claudio M. Perez", email="50180406+claudioperez@users.noreply.github.com"}
 ]
@@ -9,25 +9,23 @@ description="An infrastructure resilience engine"
 readme = "README.md"
 
 keywords = [
-  "visualization",
-  "seismic",
-  "opensees",
   "resilience",
-  "post-processing",
   "structural-health-monitoring",
   "finite-element-analysis",
-  "glTF"
+  "xara"
 ] 
 
 dependencies = [
   "tqdm",
-  "opensees",
+  "opensees>=0.1.0",
   "quakeio",
   "mdof",
-  "veux",
+  "veux>=0.0.35",
   "xara",
-  "bottle",
-  "openbim",
+  "xcsi",
+  "xsection>=0.0.19",
+  "openbim", # TODO: remove, superceded by xcsi
+
   "folium",
   "pandas",
   "numpy",

{irie-0.0.55 → irie-0.0.57}/src/irie/apps/inventory/models.py

@@ -96,6 +96,7 @@ class Asset(models.Model):
         ordering = ["-id"]
 
 
+
 class Vulnerability: # (models.Model):
     type    = None
     asset   = None
@@ -125,6 +126,7 @@ class SensorGroup(models.Model):
     def __str__(self):
         return f"{self.asset.calid} - {self.name} ({self.datum})"
 
+
 class Sensor(models.Model):
     # class Status:
     #     active: bool
@@ -138,12 +140,31 @@ class Sensor(models.Model):
     dy   = models.DecimalField(decimal_places=2, max_digits=10)
     dz   = models.DecimalField(decimal_places=2, max_digits=10)
 
-    group  = models.ForeignKey(SensorGroup, related_name="sensors", on_delete=models.RESTRICT)
+    group  = models.ForeignKey(SensorGroup,
+                               related_name="sensors",
+                               on_delete=models.RESTRICT)
 
     def __str__(self):
         return f"{self.group.asset.calid} - {self.name} ({self.group.name})"
 
 
+    def acceleration(self, event):
+        import quakeio
+
+        motion_data = (
+            quakeio.read(
+                event.event_file.path, input_format="csmip.zip"
+            )
+        )
+
+        series = motion_data.match("l", station_channel=f"{self.name}").accel.data
+
+        return [
+            (series*float(self.dx)).tolist(),
+            (series*float(self.dy)).tolist(),
+            (series*float(self.dz)).tolist()
+        ]
+
 
 # class Rendering:
 #     def __init__(self, url=None, units, datum):

{irie-0.0.55 → irie-0.0.57}/src/irie/apps/inventory/urls.py

@@ -25,8 +25,11 @@ urlpatterns = [
     ),
     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"),
+    # Sensors
     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/<slug:calid>/sensors/<int:group_id>/edit/", views.sensor_edit, name="sensor_edit"),
+
 
     path("inventory/map2/", views.map_inventory),
     path("california.json", views.california_json),

{irie-0.0.55 → irie-0.0.57}/src/irie/apps/inventory/views.py

@@ -408,14 +408,16 @@ def asset_sensors(request, calid):
     asset = Asset.objects.get(calid=calid)
     context = {
         "asset": asset,
+        "segment": "assets",
         "groups": SensorGroup.objects.filter(asset=asset)
     }
     html_template = loader.get_template("inventory/asset-sensors.html")
     return HttpResponse(html_template.render(context, request))
 
+
 @login_required(login_url="/login/")
 def sensor_upload(request, calid):
-    asset = get_object_or_404(Asset, calid=calid)  # Fetch the asset using calid
+    asset = get_object_or_404(Asset, calid=calid)
     datums = Datum.objects.filter(asset=asset).values(
         'id', 'orient_x', 'locate_x', 'orient_y', 'locate_y', 'orient_z', 'locate_z'
     )
@@ -443,7 +445,8 @@ def sensor_upload(request, calid):
         formset = SensorFormSet()
 
     context = {
-        "group_form": group_form, 
+        "group_form": group_form,
+        "segment": "assets",
         "formset": formset,
         "renderings": [
             {"name": predictor.name, "glb": predictor.render_file.url}
@@ -456,6 +459,68 @@ def sensor_upload(request, calid):
     return render(request, "inventory/sensor-upload.html", context)
 
 
+@login_required(login_url="/login/")
+def sensor_edit(request, calid, group_id):
+    """
+    Edit an existing SensorGroup + its Sensors while re-using the
+    sensor-upload.html template.
+    """
+    from django.forms import modelformset_factory
+
+    asset = get_object_or_404(Asset, calid=calid)
+    sensor_group = get_object_or_404(SensorGroup, pk=group_id, asset=asset)
+
+    #
+    SensorFormSet = modelformset_factory(
+        Sensor,
+        form=SensorForm,
+        extra=0,
+        can_delete=True,
+    )
+
+    if request.method == "POST":
+        group_form = SensorGroupForm(request.POST, instance=sensor_group, asset=asset)
+        formset = SensorFormSet(request.POST, queryset=sensor_group.sensors.all())
+
+        if group_form.is_valid() and formset.is_valid():
+            # update the group fields
+            group_form.save()
+
+            # saves edits, additions (extra rows you may allow), and deletions
+            sensors = formset.save(commit=False)
+            for sensor in sensors:
+                sensor.group = sensor_group
+                sensor.save()
+
+            # any forms flagged for deletion come back in formset.deleted_objects
+            for obj in formset.deleted_objects:
+                obj.delete()
+
+            return redirect("asset_sensors", calid=calid)
+    else:
+        group_form = SensorGroupForm(instance=sensor_group, asset=asset)
+        formset = SensorFormSet(queryset=sensor_group.sensors.all())
+
+    context = {
+        "group_form": group_form,
+        "segment": "assets",
+        "formset": formset,
+        "is_edit": True,               # optional flag so the template can tweak titles/buttons
+        "renderings": [
+            {"name": p.name, "glb": p.render_file.url}
+            for p in PredictorModel.objects.filter(asset=asset, protocol="IRIE_PREDICTOR_V1")
+            if p.render_file and p.render_file.url
+        ],
+        "asset": asset,
+        "datums": list(
+            Datum.objects.filter(asset=asset).values(
+                "id", "orient_x", "locate_x", "orient_y", "locate_y", "orient_z", "locate_z"
+            )
+        ),
+    }
+    return render(request, "inventory/sensor-upload.html", context)
+
+
 def _filter_asset_table(request):
     # Copy the GET parameters and remove the 'page' parameter
     page_query = request.GET.copy()

{irie-0.0.55 → irie-0.0.57}/src/irie/apps/prediction/models.py

@@ -34,8 +34,10 @@ class PredictorModel(models.Model):
     def __str__(self):
         return f"{self.asset.calid} - {self.name} : {self.description}"
     
-    def get_runner(self):
-        pass
+    @property
+    def runner(self):
+        from irie.apps.prediction.predictor import PREDICTOR_TYPES
+        return PREDICTOR_TYPES[self.protocol](self) 
 
     def get_artist(self):
         pass
@@ -53,9 +55,9 @@ class SensorAssignment(models.Model):
         ]
     )
 
-    orient_z  = models.FloatField()
-    orient_x  = models.FloatField()
-    orient_y  = models.FloatField()
+    # orient_z  = models.FloatField()
+    # orient_x  = models.FloatField()
+    # orient_y  = models.FloatField()
     # show_x    = models.FloatField()
     # show_y    = models.FloatField()
     # show_z    = models.FloatField()