irie 0.0.22__tar.gz → 0.0.24__tar.gz

{irie-0.0.22 → irie-0.0.24}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: irie
-Version: 0.0.22
+Version: 0.0.24
 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.22 → irie-0.0.24}/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.22 → irie-0.0.24}/pyproject.toml

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

{irie-0.0.22 → irie-0.0.24}/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.22 → irie-0.0.24}/src/irie/apps/inventory/views.py

@@ -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., 

{irie-0.0.22 → irie-0.0.24}/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.22 → irie-0.0.24}/src/irie/apps/prediction/views.py

@@ -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)

{irie-0.0.22 → irie-0.0.24}/src/irie/apps/templates/accounts/login.html

@@ -18,11 +18,11 @@
                               <h1 class="mb-0 h3">Sign In</h1>
                               <br />
                               <p>
-                                  {% if msg %}
-                                      <span class="text-danger">{{ msg | safe }}</span>
-                                  {% else %}
-                                      Add your credentials
-                                  {% endif %}                                   
+                                {% if msg %}
+                                    <span class="text-danger">{{ msg | safe }}</span>
+                                {% else %}
+                                    Add your credentials
+                                {% endif %}                                   
                               </p> 
                             </div>
                             <form method="post" action="" class="mt-4">

{irie-0.0.22 → irie-0.0.24}/src/irie/apps/templates/includes/footer.html

@@ -2,15 +2,16 @@
   <div class="row">
     <div class="col-10 col-md-8 col-xl-8 mb-0 mb-md-0">
         <p class="mb-0 text-left">
-        &copy; BRACE<sup class="superscript">2</sup>
-        - A project by PEER.
+        &copy; <em>BRACE</em><sup class="superscript">2</sup>
+        - A project by <a target="_blank" href="https://peer.berkeley.edu">PEER</a>.
         </p>
     </div>
     <div class="col-10 col-md-4 col-xl-4 text-end">
       <ul class="list-inline list-group-flush list-group-borderless text-end mb-0">
         <li class="list-inline-item px-0 px-sm-2">
-            <a target="_blank" 
-               href="https://peer.berkeley.edu">Berkeley, CA</a>
+          Powered by 
+            <a target="_blank" href="https://stairlab.berkeley.edu/software/irie">
+              IRiE</a>
         </li>
       </ul>
     </div>

irie-0.0.24/src/irie/apps/templates/inventory/asset-evals.html

@@ -0,0 +1,70 @@
+{% extends "layouts/base.html" %}
+
+{% block title %} {{ asset.calid }} {% endblock %} 
+
+{% block stylesheets %}
+{% endblock stylesheets %}
+
+{% block content %}
+<div class="print">
+    <div class="col-10 mb-4 d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center py-4">
+      <div class="d-block mb-4 mb-md-0">
+          <nav aria-label="breadcrumb" class="d-none d-md-inline-block">
+            <ol class="breadcrumb breadcrumb-dark breadcrumb-transparent">
+              <li class="breadcrumb-item">
+                <a href="{% url 'dashboard' %}">
+                  <svg class="icon icon-xxs" fill="none" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M3 12l2-2m0 0l7-7 7 7M5 10v10a1 1 0 001 1h3m10-11l2 2m-2-2v10a1 1 0 01-1 1h-3m-6 0a1 1 0 001-1v-4a1 1 0 011-1h2a1 1 0 011 1v4a1 1 0 001 1m-6 0h6"></path></svg>
+                </a>
+              </li>
+              <li class="breadcrumb-item" aria-current="page"><a href="{% url 'asset_table' %}">Inventory</a></li>
+              <li class="breadcrumb-item active"><code>{{ asset.calid }}</code></li>
+              <li class="breadcrumb-item active">Evaluations</li>
+            </ol>
+          </nav>
+          <h2 class="h4">{{ asset.id }} - {{ asset.name }}</h2>
+      </div>
+    </div>
+</div>
+
+
+<details id="event-table" open><summary><h3>Health History</h3></summary>
+  {% if asset.cesmd %}
+  <div class="row">
+      <div class="col-10 mb-4">
+  {% include 'includes/asset-event-table.html' with evaluations=evaluations %}
+      </div>
+  </div>
+  {% endif %}
+</details>
+<hr>
+
+{% endblock content %}
+
+{% block javascripts %}
+<script>
+  const table_keys = [
+    {% for method in evaluations.0.evaluation %}
+            "{{ method }}",
+    {% endfor %}
+  ];
+  for (const key of table_keys) {
+    let elem = document.querySelector(`#ssid-set-${key}`);
+    elem.onclick = () => {
+      // Unhide
+      [...document.querySelectorAll(`.ssid-method-${key}`)].map((x) => {
+        console.log(x);
+        x.style.display = null;
+      });
+      document.querySelector("#ssid-name").textContent = elem.innerText;
+      // Hide rest
+      for (const oth of table_keys) {
+        if (oth != key)
+          [...document.querySelectorAll(`.ssid-method-${oth}`)].map((x) => {
+            console.log(x);
+            x.style.display = 'none';
+          });
+      }
+    };
+  }
+</script>
+{% endblock javascripts %}

{irie-0.0.22 → irie-0.0.24}/src/irie/apps/templates/inventory/asset-event-summary.html

@@ -536,16 +536,18 @@
                         </div>
                       {% endcomment %}
                   <div class="tab-content" id="ssid-pills" style="overflow-x:auto;">
-                    {% if all_evaluations.SPECTRAL_SHIFT_IDENTIFICATION %}
+                  {% if all_evaluations.SPECTRAL_SHIFT_IDENTIFICATION %}
                     {% with summary=all_evaluations.SPECTRAL_SHIFT_IDENTIFICATION.summary %}
                     {% for model_name, metric_data in summary.items %}
                         {{ metric_data.description }}
-                        {% if "error" in metric_data %}
-                        <b>{{ metric_data.error }}</b>
-                        {% else %}
                         <div class="tab-pane fade {% if not forloop.counter0 %}show active{% endif %}" id="pills-{{ model_name }}-ssid"
                              role="tabpanel">
-                          {# metric_data.data #}
+                          {% if "error" in metric_data %}
+                          This metric failed to run. The error message reads:
+                          <blockquote style="padding: 20px;">
+                            {{ metric_data.error }}
+                          </blockquote>
+                          {% else %}
                           <table class="table align-items-center table-flush">
                             <thead class="thead-light">
                               <tr>
@@ -568,11 +570,10 @@
                         </div>
                     {% endfor  %}
                     {% endwith %}
-                    {% else %}
+                  {% else %}
                     <center>NA</center>
-                    {% endif   %}
-                    {# #}
-                    </div>
+                  {% endif %}
+                  </div>
                 </div>
                 <div class="card-footer">
                   <ul class="nav nav-pills my-0" id="pills-tab" role="tablist">    

{irie-0.0.22 → irie-0.0.24}/src/irie/apps/templates/inventory/asset-profile.html

@@ -21,16 +21,10 @@
     height: auto;
     margin: -200px 0 -100px -100px;
 }
-/*
-  width: 400px;
-  height: 300px;
-  margin: -75px 0 0 -100px;
-*/
 </style>
 <style>
 @media print {
   @page {
-    /* size:210mm 297mm;  */ 
     size: 8.5in 11in;
   }
   #event-table, #rendering, #structureProfile {
@@ -61,12 +55,9 @@
   }
   h1 {
     font-size: 16pt;
-/*  position: fixed;
-    top: 0; */
   }
   h2, h3, h4 {
     font-size: 14pt;
-    /* margin-top: 25px; */
   }
   main, div.print {
     visibility: visible;
@@ -121,7 +112,7 @@
 
 {% block content %}
 <div class="print">
-    <div class="col-8 mb-4 d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center py-4">
+    <div class="col-10 mb-4 d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center py-4">
       <div class="d-block mb-4 mb-md-0">
           <nav aria-label="breadcrumb" class="d-none d-md-inline-block">
             <ol class="breadcrumb breadcrumb-dark breadcrumb-transparent">
@@ -191,13 +182,17 @@
       {% endif %}
     {% if asset.cesmd %}
     <div id="sensors" class="row">
-      <div class="col-8 mb-4">
+      <div class="col-10 mb-4">
         <div class="card h-100 bg-white-100 border-0 shadow">
           <div class="card-header d-sm-flex flex-row align-items-center flex-0">
           </div>
           <div class="card-body align-items-center p-2">
             <img src="{{ ASSETS_ROOT }}/inventory/ll{{ asset.cesmd|slice:"2:" }}.svg">
           </div>
+          <div class="card-footer">
+            <span class="small">
+              Source: <a rel="nofollow noreferrer" href="https://www.strongmotioncenter.org/cgi-bin/CESMD/stationhtml.pl?stationID={{asset.cesmd}}&network=CGS">CGS</a></span>
+          </div>
         </div>
       </div>
     </div>
@@ -209,17 +204,15 @@
     <details id="event-table" open><summary><h3>Health History</h3></summary>
       {% if asset.cesmd %}
       <div class="row">
-          <div class="col-8 mb-4">
-            <!-- <div class="card bg-white-100 border-0 shadow table-wrapper table-responsive"> -->
+          <div class="col-10 mb-4">
       {% include 'includes/asset-event-table.html' with evaluations=evaluations %}
-            <!-- </div> -->
           </div>
       </div>
       {% endif %}
 
       {# Hazus #}
       <div class="row">
-        <div class="col-8 mb-4">
+        <div class="col-10 mb-4">
           <div class="card bg-white-100 border-0 shadow ">
             <div class="card-header">
               <h4>Hazus Fragility</h4>
@@ -227,6 +220,9 @@
             <div class="card-body  d-flex align-items-center justify-content-center">
               {% include "prediction/hazus/history.html" with hazus=hazus %}
             </div>
+            <div class="card-footer">
+              <span class="small">Source: <a rel="nofollow noreferrer" href="https://www.fema.gov/flood-maps/tools-resources/flood-map-products/hazus/user-technical-manuals">FEMA</a></span>
+            </div>
           </div>
         </div>
       </div>
@@ -240,16 +236,14 @@
     <details open><summary><h3>Structure Details</h3></summary>
 
     <div class="row">
-      <div class="col-8 mb-4">
+      <div class="col-10 mb-4">
         {% for table in tables %}
         <div class="card bg-white-100 border-0 shadow table-wrapper table-responsive">
           <div class="card">
             <div class="card-body shadow table-wrapper table-responsive">
               <table class="table table-hover" style="display: block;">
                 <caption>{{asset.calid}} Table {{forloop.counter}}</caption>
-                {# <thead><tr><th>Key</th> <th>Value</th></tr></thead> #}
                 <tbody>
-                  {# <tr><td><b>CESMD</b></td><td>{{ asset_data.cesmd }}</td></tr> #}
                   {% for key,val in table.items %}
                   {% if val %}
                   <tr>
@@ -263,6 +257,9 @@
                 </tbody>
               </table>
             </div>
+            <div class="card-footer">
+              <span class="small">Source: <a rel="nofollow noreferrer" href="https://infobridge.fhwa.dot.gov/">InfoBridge</a></span>
+            </div>
         </div>
       </div>
       <br>

{irie-0.0.22 → irie-0.0.24}/src/irie/apps/templates/layouts/base.html

@@ -7,7 +7,17 @@
 -->
 <head> 
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<!-- Google tag (gtag.js) -->
+{% comment %}
+<script async src="https://www.googletagmanager.com/gtag/js?id=G-TFW5X9DYND"></script>
+<script>
+  window.dataLayer = window.dataLayer || [];
+  function gtag(){dataLayer.push(arguments);}
+  gtag('js', new Date());
 
+  gtag('config', 'G-TFW5X9DYND');
+</script>
+{% endcomment %}
 <title>{% block title %}{% endblock %} | BRACE2</title>
 
 <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
@@ -15,7 +25,7 @@
 <meta name="author" content="PEER">
 <meta name="description" content="BRACE2 is a platform for real-time structural health monitoring.">
 <meta name="keywords" content="dashboard,  shm, bridge, fem, fea, health-monitoring,  real-time,  datatable, peer, brace2, pacific earthquake engineering research center, mechanics" />
-<link rel="canonical" href="https://peer.berkeley.edu">
+<link rel="canonical" href="https://structures.live{{ request.path }}">
 
 <!-- Favicon -->
 <link rel="apple-touch-icon" sizes="120x120" href="{{ ASSETS_ROOT }}/img/favicon/apple-touch-icon.png">

{irie-0.0.22 → irie-0.0.24}/src/irie.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: irie
-Version: 0.0.22
+Version: 0.0.24
 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.22 → irie-0.0.24}/src/irie.egg-info/SOURCES.txt

@@ -380,6 +380,7 @@ src/irie/apps/templates/includes/paginate.js
 src/irie/apps/templates/includes/scripts.html
 src/irie/apps/templates/includes/settings-box.html
 src/irie/apps/templates/includes/sidebar.html
+src/irie/apps/templates/inventory/asset-evals.html
 src/irie/apps/templates/inventory/asset-event-summary.html
 src/irie/apps/templates/inventory/asset-profile.html
 src/irie/apps/templates/inventory/asset-table.html