irie 0.0.53__tar.gz → 0.0.55__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: irie
-Version: 0.0.53
+Version: 0.0.55
 Summary: An infrastructure resilience engine
 Author-email: "Claudio M. Perez" <50180406+claudioperez@users.noreply.github.com>
 Project-URL: Repository, https://github.com/STAIRLab

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

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

{irie-0.0.53 → irie-0.0.55}/src/irie/apps/events/views.py

@@ -32,7 +32,7 @@ def event_table(request):
         events = [i for i in sorted(EventRecord.objects.all(),
                              key=lambda x: x.motion_data["event_date"], reverse=True)]
 
-    paginator = Paginator(events, 5)
+    paginator = Paginator(events, 20)
 
 
 # reversed(sorted(Event.objects.all(),

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

@@ -21,7 +21,7 @@ urlpatterns = [
     path("asset_table/export", views.asset_table_export, name="asset_table_export_csv"),
     re_path(
         "^evaluations/(?P<event>[0-9 A-Z-]*)/(?P<cesmd>[0-9 A-Z-]*)/.*", views.asset_event_summary,
-                                                                          name="asset_event_summary"
+                                                                         name="asset_event_summary"
     ),
     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.53 → irie-0.0.55}/src/irie/apps/inventory/views.py

@@ -339,7 +339,6 @@ def asset_profile(request, calid):
             raise e
         import sys
         print(e, file=sys.stderr)
-        print(e)
         html_template = loader.get_template("site/page-500.html")
         return HttpResponse(html_template.render(context, request))
 

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

@@ -33,6 +33,12 @@ class PredictorModel(models.Model):
 
     def __str__(self):
         return f"{self.asset.calid} - {self.name} : {self.description}"
+    
+    def get_runner(self):
+        pass
+
+    def get_artist(self):
+        pass
 
 
 class SensorAssignment(models.Model):

{irie-0.0.53 → irie-0.0.55}/src/irie/apps/prediction/runners/opensees/__init__.py

@@ -500,58 +500,59 @@ class OpenSeesRunner(Runner):
     #
     # Viewing methods
     #
-    def structural_section(self, name):
-        from shps.shapes import from_aisc
-        from openbim.csi._frame.section import section_geometry, section_mesh
-
-        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
-        
 
+    @property
+    def _csi(self):
+        if not hasattr(self, "_csi_data") or self._csi_data is None:
+            from openbim.csi import load, create_model, collect_outlines
+            # 1) Parse the CSI file
+            try:
+                csi_file = self.predictor.config_file
+                self._csi_data = 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)
+                self._csi_data = None
 
+        return self._csi_data
+
+
+    def structural_section(self, name):
+        from openbim.csi._frame.section import create_section
+        # from openbim.csi._frame.outlines import section_mesh
+        if (s:= create_section(self._csi, name)) is not None:
+            return {}, s._create_model(mesh_size=0.1)
+
+
+    def structural_sections(self):        
+        from openbim.csi._frame.section import iter_sections
+        yield from iter_sections(self._csi)
+        # for s, name in iter_sections(self._csi):
+        #     yield {
+        #         "name": name,
+        #         "type": "Section",
+        #         "section": name,
+        #     }
 
     def structural_members(self):
 
-        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",[]):
+        for item in self._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"],
+                    # "section": item["Section"],
                 }
 
-        for item in csi.get("BRIDGE OBJECT DEFINITIONS 03 - SPANS 1 - GENERAL", []):
+        for item in self._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,
+                    # "section": None,
                 }
 
 
-
-
 # import subprocess 
 # class Event: pass 
 

{irie-0.0.53 → irie-0.0.55}/src/irie/apps/prediction/runners/ssid.py

@@ -12,7 +12,6 @@ import json
 import io 
 import base64
 import numpy as np
-# Ensure Agg backend is set for non-interactive plotting
 
 import quakeio
 from scipy.signal import find_peaks
@@ -433,6 +432,7 @@ def plot_spectral_surface(ax, traces, **options):
 
 
 def _plot_mountains(spectra, accellim=None):
+    # Ensure Agg backend is set for non-interactive plotting
     import matplotlib
     matplotlib.use('Agg')
     from matplotlib import pyplot as plt, ticker, cm

{irie-0.0.53 → irie-0.0.55}/src/irie/apps/prediction/urls.py

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

{irie-0.0.53 → irie-0.0.55}/src/irie/apps/prediction/views.py

@@ -14,6 +14,7 @@ import json
 import veux
 import uuid
 import base64
+import hashlib
 
 from django.shortcuts import HttpResponse
 from django.template import loader, TemplateDoesNotExist
@@ -30,6 +31,14 @@ from irie.apps.prediction.models import PredictorModel
 from .forms import PredictorForm
 
 
+
+def _string_to_id(s: str) -> str:
+    # 1. SHA-256 → bytes   2. URL-safe Base64 (no + / =)   3. strip padding
+    b64 = base64.urlsafe_b64encode(
+            hashlib.sha256(s.encode()).digest()
+          ).rstrip(b'=').decode('ascii')
+    return f"id_{b64}"
+
 @login_required(login_url="/login/")
 def asset_predictors(request, calid):
 
@@ -59,8 +68,7 @@ def asset_predictors(request, calid):
 
 
 @login_required(login_url="/login/")
-def predictor_profile_detail(request, calid, preid):
-    print(preid)
+def predictor_render(request, calid, preid):
     try:
         predictor = PredictorModel.objects.get(pk=int(preid))
     except ObjectDoesNotExist:
@@ -71,7 +79,18 @@ def predictor_profile_detail(request, calid, preid):
     runner = PREDICTOR_TYPES[predictor.protocol](predictor) 
 
     try:
-        data, mesh = runner.structural_section(sname)
+        _, mesh = runner.structural_section(sname)
+
+        can = veux._create_canvas(name="gltf")
+        import numpy as np
+        R = np.array([[1, 0],[0, 1], [0, 0]])
+        can.plot_lines(mesh.exterior()@R.T)
+        if (interior := mesh.interior()) is not None:
+            for i in interior:
+                can.plot_lines(i@R.T)
+        glb = can.to_glb()
+        return HttpResponse(glb, content_type="application/binary")
+
     except Exception as e:
         raise e
         return HttpResponse(
@@ -79,6 +98,7 @@ def predictor_profile_detail(request, calid, preid):
             content_type="application/json",
             status=404
         )
+
     from veux.plane import PlaneModel
     art = veux.create_artist(mesh, ndf=1, canvas="gltf")
     art.draw_surfaces()
@@ -86,7 +106,7 @@ def predictor_profile_detail(request, calid, preid):
 
     glb = art.canvas.to_glb()
     return HttpResponse(glb, content_type="application/binary")
-    glb64 = base64.b64encode(glb).decode("utf-8")
+
     # rendering = f"data:application/octet-stream;base64,{glb64}"
     # rendering = art._repr_html_()
     r = dict(
@@ -120,12 +140,19 @@ def predictor_profile(request, calid, preid):
     context["predictor"] = predictor
     context["sensors"] = predictor.sensorassignment_set.all()
 
-
     try:
         if predictor.protocol == PredictorModel.Protocol.TYPE1:
             html_template = loader.get_template("prediction/xara-profile.html")
+            
             context["members"] = context["runner"].structural_members()
 
+            context["sections"] = [
+                {
+                    "id": _string_to_id(name),
+                    "name": name,
+                } for _, name in context["runner"].structural_sections()
+            ]
+
         else:
             html_template = loader.get_template("prediction/predictor-profile.html")
 
@@ -243,7 +270,7 @@ def create_model(request, calid):
         )
         artist.draw_surfaces()
 
-        # Generate the .glb file
+        # Generate the .glb data
         glb = artist.canvas.to_glb()
 
         if request.POST.get("action") == "commit":

{irie-0.0.53 → irie-0.0.55}/src/irie/apps/static/assets/js/brace.js

@@ -183,7 +183,7 @@ document.addEventListener("DOMContentLoaded", function(event) {
     });
 
     if (document.querySelector('.current-year')){
-       document.querySelector('.current-year').textContent = new Date().getFullYear();
+      document.querySelector('.current-year').textContent = new Date().getFullYear();
     }
     // Glide JS
 });
@@ -302,7 +302,7 @@ if (document.querySelector('.fixed-plugin')) {
 
 }
 
-//Set Sidebar Color
+// Set Sidebar Color
 function sidebarColor(a) {
   var parent = document.querySelector(".nav-link.active");
   var color = a.getAttribute("data-color");

{irie-0.0.53 → irie-0.0.55}/src/irie/apps/templates/includes/paginate.js

@@ -5,6 +5,7 @@
 //===----------------------------------------------------------------------===#
 //
 class TablePagination {
+
     constructor(tableId, paginationId, searchInputId, rowsPerPage = 9) {
         this.table = document.getElementById(tableId);
         this.pagination = document.getElementById(paginationId);

{irie-0.0.53 → irie-0.0.55}/src/irie/apps/templates/includes/scripts.html

@@ -1,5 +1,3 @@
-
-<!-- Core -->
 <script src="{{ ASSETS_ROOT }}/vendor/@popperjs/core/dist/umd/popper.min.js"></script>
 <script src="{{ ASSETS_ROOT }}/vendor/bootstrap/dist/js/bootstrap.min.js"></script>
 <script>

{irie-0.0.53 → irie-0.0.55}/src/irie/apps/templates/inventory/sensor-upload.html

@@ -243,12 +243,10 @@ document.addEventListener('DOMContentLoaded', () => {
 
     const scene = createSensorRenderer(container, modelPath);
 
-
-    const arrowObjects = [];
-
     //
     // Plot Button
     //
+    const arrowObjects = [];
     const plotButton = document.getElementById('plot-btn');
     plotButton.addEventListener('click', function () {
         arrowObjects.forEach(arrow => {

{irie-0.0.53 → irie-0.0.55}/src/irie/apps/templates/prediction/asset-predictors.html

@@ -62,7 +62,7 @@ Claudio Perez, Summer 2023
           <h6 class="accordion-header" style="display:inline" id="{{forloop.counter}}">
             <a href="./{{predictor.id}}" >
               {{predictor.name}}
-            </a> (<code>{{ predictor.platform }}</code>)
+            </a> <!-- (<code>{{ predictor.platform }}</code>) -->
           </h6>
         </div>
 

{irie-0.0.53 → irie-0.0.55}/src/irie/apps/templates/prediction/create-model.html

@@ -36,6 +36,7 @@
       </a>
     </div>
   </div>
+
   <div class="row">
     <div class="col">
       <form method="POST" enctype="multipart/form-data">
@@ -46,6 +47,13 @@
       </form>
     </div>
   </div>
+
+  {% if navigator %}
+  {% include "prediction/veux/navigator.html" with members=navigator.members sections=navigator.sections %}
+  {% endif %}
+
+  {% if error %}
+  {% endif %}
   <div class="row">
     <iframe
       id="map"
@@ -58,6 +66,25 @@
 {% endblock content %}
 
 {% block javascripts %}
+{% if navigator %}
+<script>
+  
+{% include "prediction/veux/navigator.js" %}
+
+const VIEWER = new VeuxNavigator(`/inventory/{{asset.calid}}/predictors/{{predictor.id}}/render/?section=`,
+                              document.querySelector('#tab-link-container'),
+                              document.getElementById('tab-content-container'));
+
+function handleMemberSelection(elem) {
+    VIEWER.select(elem);
+}
+
+document.addEventListener('DOMContentLoaded', function () {
+    VIEWER.initTabs('tab1', '.tab-link');
+});
+</script>
+{% endif %}
+
 <script>
   const button = document.getElementById('render');
   const form = document.querySelector('form');

irie-0.0.55/src/irie/apps/templates/prediction/veux/navigator.html

@@ -0,0 +1,121 @@
+<div class="">
+    <div class="row align-right">
+  <!-- Left Side: Sensor Form -->
+      <div class="col-md-4" >
+        <div class="card bg-white-100 border-1 rounded-0 shadow">
+          <div class="card-header d-sm-flex flex-row align-items-center flex-0">
+            <select id="table-switcher" 
+                    class="form-select form-select-sm me-2">
+              <option value="members" >Members</option>
+              <option value="sections">Sections</option>
+              <option value="sensors" >Sensors</option>
+            </select>
+          </div>
+          <div class="card-body">
+            <div class="table-response">
+              <table id="members" 
+                    class="table align-items-center table-flush">
+                <thead class="thead-light">
+                <tr>
+                  <th class="border-bottom" scope="col">#</th>
+                  <th class="border-bottom" scope="col">Type</th>
+                </tr>
+                </thead>
+                <tbody>
+                  {% for member in members %}
+                  <tr id="veux-member-{{member.id}}" 
+                      data-section="{{ member.section }}"
+                      style="cursor: pointer;" 
+                      onClick="handleMemberSelection(this)">
+                  <td><code>{{ member.name }}</code></td>
+                  <td>{{ member.type }}</td>
+                  </tr>
+                  {% endfor %}
+                </tbody>
+              </table>
+  
+              <table id="sections" hidden
+                    class="table align-items-center table-flush">
+                <thead class="thead-light">
+                <tr>
+                  <th class="border-bottom" scope="col">#</th>
+                  <th class="border-bottom" scope="col">Type</th>
+                </tr>
+                </thead>
+                <tbody>
+                  {% for member in sections %}
+                  <tr id="veux-member-{{member.id}}" 
+                      data-query="{{ member.name }}"
+                      data-name="{{ member.name }}"
+                      style="cursor: pointer;" 
+                      onClick="handleMemberSelection(this)">
+                  <td><code>{{ member.name }}</code></td>
+                  <td>{{ member.type }}</td>
+                  </tr>
+                  {% endfor %}
+                </tbody>
+              </table>
+  
+              <table id="sensors"
+                     class="table align-items-center table-flush" hidden>
+                <thead class="thead-light">
+                <tr>
+                  <th class="border-bottom" scope="col">#</th>
+                  <th class="border-bottom" scope="col">Node</th>
+                  <th class="border-bottom" scope="col">Type</th>
+                </tr>
+                </thead>
+                <tbody>
+                  {% for sensor in sensors %}
+                  <tr id="sensor-{{sensor.id}}"
+                      data-sensor-x="{{  sensor.sensor.x }}"
+                      data-sensor-y="{{  sensor.sensor.y }}"
+                      data-sensor-z="{{  sensor.sensor.z }}"
+                      data-sensor-dx="{{ sensor.sensor.dx }}"
+                      data-sensor-dy="{{ sensor.sensor.dy }}"
+                      data-sensor-dz="{{ sensor.sensor.dy }}">
+                    <td><code>{{ sensor.id }}</code></td>
+                    <td>{{ sensor.node }}</td>
+                    <td>{{ sensor.role }}</td>
+                  </tr>
+                  {% endfor %}
+                </tbody>
+              </table>
+              <nav>
+                <ul class="pagination" id="pagination"></ul>
+              </nav>
+            </div>
+          </div>
+        </div>
+      </div>
+  
+  <!-- Right Side: Predictor Rendering -->
+      <div class="col-md-8">
+        <div id="rendering" class="card bg-white-100 border-1 rounded-0 shadow">
+          <div class="card-header">
+            <ul id="tab-link-container" class="nav nav-tabs" id="myTab" role="tablist">
+                <li class="nav-item" role="presentation">
+                  <a class="nav-link tab-link active" 
+                     id="tab1-tab" 
+                     data-bs-toggle="tab" href="#"
+                     data-tab="tab1" 
+                     role="tab">Model</a>
+                </li>
+            </ul>
+          </div>
+          <div class="card-body text-center" style="background-color: #f0f0f0;">
+              <div id="tab-content-container">
+                <div id="tab1-content" class="tab-content">
+                  <div id="main-viewer"
+                      style="width: 100%; height: 300px; background-color: #f0f0f0; margin: 0 auto;">
+                  </div>
+                </div>
+              </div>
+          </div>
+          <div class="card-footer text-center">
+              Powered by <a href="https://veux.io/">veux</a>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>

irie-0.0.53/src/irie/apps/templates/prediction/viewer/veux-viewer.js → irie-0.0.55/src/irie/apps/templates/prediction/veux/navigator.js

@@ -4,15 +4,15 @@
 //
 //===----------------------------------------------------------------------===//
 //
-class VeuxViewer {
+class VeuxNavigator {
     #initializedTabs;
     #table;
     #url;
     #tabLinkContainer;
     #tabContentContainer;
 
-    constructor(url, tabLinkContainer, tabContentContainer) {
-      this.#url = url;
+    constructor(baseUrl, tabLinkContainer, tabContentContainer) {
+      this.#url = baseUrl;
       this.#initializedTabs = [];
       this.#tabLinkContainer = tabLinkContainer;
       this.#tabContentContainer = tabContentContainer;
@@ -32,7 +32,8 @@ class VeuxViewer {
     }
 
     select(elem) {
-        const sname =  elem.dataset.section;
+        const sname =  `${elem.id}`; //dataset.name;
+        // const hash  = elem.dataset.hash;
 
         if (this.#initializedTabs.includes(sname)) {
             const tabLink = this.#tabLinkContainer.querySelector(`#${sname}-tab`);
@@ -40,11 +41,11 @@ class VeuxViewer {
             return;
         }
 
-        this.addTab(sname);
+        this.addTab(elem);
     }
 
-    addTab(corr) {
-        const tab = `${corr}`;
+    addTab(elem) {
+        const tab = `${elem.id}`;
     
         //
         //
@@ -54,10 +55,10 @@ class VeuxViewer {
         tabLink.classList.add("tab-link", "nav-link", "active");
         tabLink.href = "#";
         tabLink.setAttribute('data-tab', tab);
-        tabLink.setAttribute('data-section', corr);
+        tabLink.setAttribute('data-query', elem.dataset.query);
         tabLink.setAttribute('data-bs-toggle', 'tab');
         tabLink.setAttribute('role', 'tab');
-        tabLink.innerHTML = `${corr} <button class="btn-close" type="button" aria-label="Close"></button>`;
+        tabLink.innerHTML = `${elem.dataset.name} <button class="btn-close" type="button" aria-label="Close"></button>`;
         const closeButton = tabLink.querySelector('.btn-close');
         closeButton.addEventListener('click', (e) => {
             this.delTab(tabLink);
@@ -83,14 +84,10 @@ class VeuxViewer {
         tabContent.style.display = 'block';
         this.#tabContentContainer.appendChild(tabContent);
     
-        // Get the data-tab attribute to know which content to load
-        const selectedTab = tabLink.getAttribute('data-tab');
-    
+        
         this.#initializedTabs.push(tab);
-    
         this.clickTab(tabLink);
-    
-        this.fetchAndUpdateTab(selectedTab, corr);
+        this.fetchAndUpdateTab(tab, elem.dataset.query);
         return tabLink;
     }
 
@@ -133,7 +130,7 @@ class VeuxViewer {
         this.clickTab(document.getElementById('tab1-tab'));
     }
 
-    fetchAndUpdateTab(tab) {
+    fetchAndUpdateTab(tab, query) {
         const contentDiv = this.#tabContentContainer.querySelector(`#${tab}-content`);
 
         // Show loading message while content is being fetched
@@ -145,7 +142,7 @@ class VeuxViewer {
         </div>
         `;
 
-        let apiUrl = `${this.#url}${tab}`;
+        let apiUrl = `${this.#url}${query}`;
         console.log(`Fetching content from: ${apiUrl}`);
 
         if (true) {
@@ -162,6 +159,9 @@ class VeuxViewer {
             contentDiv.appendChild(mv);
             return;
         }
+
+        //
+        //
         fetch(apiUrl)
             .then(response => response.json())
             .then(data => {