irie 0.0.19__tar.gz → 0.0.21__tar.gz

{irie-0.0.19 → irie-0.0.21}/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.1
 Name: irie
-Version: 0.0.19
-Summary: Infrastructure Resilience Engine
+Version: 0.0.21
+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/

{irie-0.0.19 → irie-0.0.21}/pyproject.toml

@@ -1,10 +1,10 @@
 [project]
 name = "irie"
-version = "0.0.19"
+version = "0.0.21"
 authors = [
   {name="Claudio M. Perez", email="50180406+claudioperez@users.noreply.github.com"}
 ]
-description="Infrastructure Resilience Engine"
+description="An infrastructure resilience engine"
 
 license = {file = ".github/LICENSE.txt"}
 readme = "README.md"

{irie-0.0.19 → irie-0.0.21}/src/irie/apps/evaluation/daemon.py

@@ -60,18 +60,6 @@ class LiveEvaluation:
         return mname
 
     def setMetricData(self, mname: str, pid: str, data: dict):
-#       self.metrics[mname][pid].data = data
-#       try:
-#           self.evaluation_data[mname]["details"][pid] = data["details"]
-#       except KeyError:
-#           self.evaluation_data[mname]["details"][pid] = data
-#                   self.metrics[mname][pid].buildDetails()
-#       try:
-#           None
-#       except KeyError:
-#           self.evaluation_data[mname]["summary"][pid] = \
-#                   self.metrics[mname][pid].getSummary()
-
         self.evaluation_data[mname]["details"][pid] = data.get("details", data)
         self.evaluation_data[mname]["summary"][pid] = data.get("summary", data)
         if len(self.evaluation_data[mname]["summary"]) == 1:

irie-0.0.21/src/irie/apps/evaluation/migrations/0002_evaluation_status.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.1.2 on 2024-12-14 07:51
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('irie_apps_evaluation', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='evaluation',
+            name='status',
+            field=models.CharField(choices=[('Finished', 'Finished'), ('Running', 'Running'), ('Invalid', 'Invalid')], default='Finished', max_length=25),
+        ),
+    ]

{irie-0.0.19 → irie-0.0.21}/src/irie/apps/evaluation/models.py

@@ -19,16 +19,25 @@ from irie.apps.inventory.models import Asset
 from .daemon import LiveEvaluation
 
 class Evaluation(models.Model):
+    class Status(models.TextChoices):
+        Finished  = "Finished"
+        Running   = "Running"
+        Invalid   = "Invalid"
+
     id = models.BigAutoField(primary_key=True)
     event = models.ForeignKey(EventRecord, on_delete=models.CASCADE)
     asset = models.ForeignKey(Asset, on_delete=models.CASCADE, null=True)
     evaluation_data = models.JSONField(default=dict)
+    status  = models.CharField(max_length=25,
+                               choices=Status.choices,
+                               default=Status.Finished)
 
     @classmethod
     def create(cls, event: EventRecord, asset: Asset, data: dict = None):
         evaluation = cls()
         evaluation.event = event
         evaluation.asset = asset
+        evaluation.status = Evaluation.Status.Running
         evaluation.save()
 
         if data is not None:
@@ -43,6 +52,7 @@ class Evaluation(models.Model):
 
 def evaluate(event, evaluation)->"Evaluation":
 
+    count_okay = 0
     daemon = LiveEvaluation(event, event.asset.predictors, evaluation)
 
     # assignPredictorMetrics?
@@ -63,11 +73,18 @@ def evaluate(event, evaluation)->"Evaluation":
             for mname in predictions[predictor_name][1]:
                 print(f">>> Retrieving {predictor_name}/{mname}.", file=sys.stderr)
                 data = daemon.predictors[predictor_name].getMetricData(run_id, mname)
-                daemon.setMetricData(mname, predictor_name, data)
+                if data is not None:
+                    count_okay += 1
+                    daemon.setMetricData(mname, predictor_name, data)
 
             print(f">>> Completed {predictor_name}.", file=sys.stderr)
 
+    if count_okay:
+        evaluation.status = Evaluation.Status.Finished
+    else:
+        evaluation.status = Evaluation.Status.Invalid
 
+    evaluation.save()
     daemon.save()
     return evaluation
 

{irie-0.0.19 → irie-0.0.21}/src/irie/apps/inventory/views.py

@@ -25,6 +25,8 @@ from .filters import AssetFilter
 # Predictors
 from irie.apps.prediction.runners.hazus import hazus_fragility
 from irie.apps.prediction.runners.ssid import make_mountains, ssid_stats, ssid_event_plot
+# Evaluations
+from irie.apps.evaluation.models import Evaluation
 
 
 @login_required(login_url="/login/")
@@ -47,7 +49,6 @@ def _fetch_rendering(request):
 
 @login_required(login_url="/login/")
 def asset_event_summary(request, cesmd, event):
-    from irie.apps.evaluation.models import Evaluation
 
     context = {}
     context["segment"] = "events"
@@ -113,7 +114,7 @@ def dashboard(request):
             context["demo_version"] = True
 
         context["recent_evaluations"] = [
-            (Evaluation.objects.get(event_id=event.id), event)
+            (Evaluation.objects.exclude(status=Evaluation.Status.Invalid).get(event_id=event.id), event)
             for event in sorted(EventRecord.objects.all(), 
                                 key=lambda x: x.motion_data["event_date"], reverse=True)[:6]
         ]
@@ -124,7 +125,7 @@ def dashboard(request):
             asset.id: max(event[1].pga for event in context["recent_evaluations"] if event[1].cesmd == asset.cesmd)
             for asset in assets
         }
-        
+
         context["asset_map"] = AssetMap(assets, colors=colors, color_name="Peak Station Accel.").get_html()
         context["calid"] = {b.cesmd: b.calid for b in assets}
 
@@ -191,7 +192,7 @@ def asset_profile(request, calid):
 
     # Compute Hazus fragility probabilities and curve
     try:
-        hazus_results = hazus_fragility(asset.nbi_data, generate_plot=False, return_data=True)
+        hazus_results = hazus_fragility(asset.nbi_data)
 
         # Add fragility probabilities and plot to the context
         context["hazus"] = {
@@ -205,7 +206,8 @@ def asset_profile(request, calid):
             "curves":   json.dumps(hazus_results["curves"])
             # "plot_base64": hazus_results.get("plot_base64"),
         }
-    except: 
+    except Exception as e: 
+        print(e)
         pass 
 
 
@@ -214,8 +216,10 @@ def asset_profile(request, calid):
     if asset.cesmd:
         cesmd = asset.cesmd
 
-        events = list(reversed(sorted(EventRecord.objects.filter(cesmd=cesmd),
-                                      key=lambda x: x.motion_data["event_date"])))
+        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,

{irie-0.0.19 → irie-0.0.21}/src/irie/apps/templates/includes/asset-event-table.html

@@ -59,20 +59,32 @@
     </tbody>
   </table>
 
-  <div class="card-footer px-3 border-0 d-flex flex-column flex-lg-row align-items-center justify-content-between">
-    <nav aria-label="Page navigation example">
-        <ul class="pagination mb-0">
-            <li class="page-item">
-                <a class="page-link disabled" href="#">Previous</a>
-            </li>
-            <li class="page-item disabled">
-                <a class="page-link" href="#">1</a>
-            </li>
-            <li class="page-item disabled">
-                <a class="page-link" href="#">Next</a>
-            </li>
-        </ul>
-    </nav>
-    <div class="fw-normal small mt-4 mt-lg-0">Showing <b>{{ evaluations|length }}</b> out of <b>{{ evaluations|length }}</b> entries</div>
-  </div>
+      <div class="card-footer px-3 border-0 d-flex flex-column flex-lg-row align-items-center justify-content-between">
+        <nav aria-label="Page navigation example">
+            <ul class="pagination mb-0">
+              <li class="page-item {% if not evaluations.has_previous %}disabled{% endif %}">
+                {% if evaluations.has_previous %}
+                  <a class="page-link" href="?page={{ evaluations.previous_page_number }}&{{ page_query }}">Previous</a>
+                {% else %}
+                  <a class="page-link disabled" href="#">Previous</a>
+                {% endif %}
+              </li>
+              {% for page in evaluations.paginator.page_range %}
+                {% if page <= evaluations.number|add:3 and page >= evaluations.number|add:-3 %}
+                  <li class="page-item {% if page == evaluations.number %}active{% endif %}">
+                    <a class="page-link" href="?page={{ page }}&{{ page_query }}">{{ page }}</a>
+                  </li>
+                {% endif %}
+              {% endfor %}
+              <li class="page-item {% if not evaluations.has_next %}disabled{% endif %}">
+                {% if evaluations.has_next %}
+                  <a class="page-link" href="?page={{ evaluations.next_page_number }}&{{ page_query }}">Next</a>
+                {% else %}
+                  <a class="page-link disabled" href="#">Next</a>
+                {% endif %}
+              </li>
+            </ul>
+        </nav>
+        <div class="fw-normal small mt-4 mt-lg-0">Showing <b>{{ evaluations|length }}</b> out of <b>{{ evaluations.paginator.count }}</b> entries</div>
+      </div>
   </div>

{irie-0.0.19 → irie-0.0.21}/src/irie/apps/templates/inventory/asset-event-summary.html

@@ -20,11 +20,10 @@
       <nav aria-label="breadcrumb" class="d-none d-md-inline-block">
         <ol class="breadcrumb breadcrumb-dark breadcrumb-transparent">
           <li class="breadcrumb-item">
-            <a href="/">
+            <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"><a href="{% url 'dashboard' %}">BRACE<sup>2</sup></a></li>
           <li class="breadcrumb-item" aria-current="page">Evaluations</li>
           <li class="breadcrumb-item" aria-current="page">{{ event.id }}</li>
           <li class="breadcrumb-item active"><code>{{ asset.calid }}</code></li>

{irie-0.0.19 → irie-0.0.21}/src/irie/apps/templates/inventory/asset-profile.html

@@ -126,11 +126,10 @@
           <nav aria-label="breadcrumb" class="d-none d-md-inline-block">
             <ol class="breadcrumb breadcrumb-dark breadcrumb-transparent">
               <li class="breadcrumb-item">
-                <a href="/">
+                <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"><a href="{% url 'dashboard' %}">BRACE<sup>2</sup></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>
             </ol>
@@ -243,24 +242,26 @@
       <div class="col-8 mb-4">
         {% for table in tables %}
         <div class="card bg-white-100 border-0 shadow table-wrapper table-responsive">
-          <div class="card 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>
-                  <th scope="row" style="text-align:left; width:40%;">{{ key }}</th>
-                  <!-- The inline style here ensures that 
-                        there are line breaks in rows with long text -->
-                  <td style="width: 60%; white-space: normal !important;word-wrap: break-word;">{{ val }}</td>
-                </tr>
-                {% endif %}
-                {% endfor %}
-              </tbody>
-            </table>
+          <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>
+                    <th scope="row" style="text-align:left; width:40%;">{{ key }}</th>
+                    <!-- The inline style here ensures that 
+                          there are line breaks in rows with long text -->
+                    <td style="width: 60%; white-space: normal !important;word-wrap: break-word;">{{ val }}</td>
+                  </tr>
+                  {% endif %}
+                  {% endfor %}
+                </tbody>
+              </table>
+            </div>
         </div>
       </div>
       <br>

{irie-0.0.19 → irie-0.0.21}/src/irie/apps/templates/inventory/asset-table.html

@@ -28,11 +28,10 @@ table a[href^="https://"]::after
         <nav aria-label="breadcrumb" class="d-none d-md-inline-block">
           <ol class="breadcrumb breadcrumb-dark breadcrumb-transparent">
             <li class="breadcrumb-item">
-              <a href="/">
+              <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"><a href="{% url 'dashboard' %}">BRACE<sup>2</sup></a></li>
             <li class="breadcrumb-item active" aria-current="page">Inventory</li>
           </ol>
         </nav>

irie-0.0.21/src/irie/apps/templates/site/robots.txt

@@ -0,0 +1,8 @@
+Sitemap: https://structures.live/sitemap.xml
+
+User-Agent: *
+Disallow: /inventory/*/*/
+
+User-agent: GPTBot
+Disallow: /
+

{irie-0.0.19 → irie-0.0.21}/src/irie/core/urls.py

@@ -11,6 +11,7 @@ from django.conf import settings
 from django.conf.urls.static import static
 from django.contrib import admin
 from django.urls import path, include
+from django.views.generic.base import TemplateView
 
 admin.site.site_header = "IRiE"
 admin.site.index_title = "IRiE"
@@ -18,6 +19,11 @@ admin.site.site_title  = "IRiE"
 
 urlpatterns = [
     path('admin/', admin.site.urls),
+    path(
+        "robots.txt",
+        TemplateView.as_view(template_name="site/robots.txt", content_type="text/plain"),
+    ),
+
 
     # Authentication routes
     path("", include("irie.apps.authentication.urls")),

{irie-0.0.19 → irie-0.0.21}/src/irie/init/__main__.py

@@ -16,9 +16,9 @@ def init(settings):
         "migrate"
     ])
 
-#   call_command("makemigrations")
+    call_command("makemigrations")
 
-#   call_command("migrate")
+    call_command("migrate")
 
 #   call_command("init_assets")
 

{irie-0.0.19 → irie-0.0.21}/src/irie.egg-info/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.1
 Name: irie
-Version: 0.0.19
-Summary: Infrastructure Resilience Engine
+Version: 0.0.21
+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/

{irie-0.0.19 → irie-0.0.21}/src/irie.egg-info/SOURCES.txt

@@ -37,6 +37,7 @@ src/irie/apps/evaluation/models.py
 src/irie/apps/evaluation/urls.py
 src/irie/apps/evaluation/views.py
 src/irie/apps/evaluation/migrations/0001_initial.py
+src/irie/apps/evaluation/migrations/0002_evaluation_status.py
 src/irie/apps/evaluation/migrations/__init__.py
 src/irie/apps/events/__init__.py
 src/irie/apps/events/admin.py
@@ -415,6 +416,7 @@ src/irie/apps/templates/site/page-lock.html
 src/irie/apps/templates/site/page-reset-password.html
 src/irie/apps/templates/site/page-sign-in.html
 src/irie/apps/templates/site/page-sign-up.html
+src/irie/apps/templates/site/robots.txt
 src/irie/apps/templates/site/settings.html
 src/irie/apps/templates/site/tables-bootstrap-tables.html
 src/irie/apps/templates/site/transactions.html