irie 0.0.18__py3-none-any.whl → 0.0.20__py3-none-any.whl

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/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/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/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]
         ]
@@ -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/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/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>

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/apps/templates/site/index.html

@@ -7,7 +7,7 @@
   <meta name="title" content="BRACE2 Platform">
   <meta name="author" content="Claudio M. Perez">
   <meta name="description" content="BRACE2 platform for structural health monitoring.">
-  <meta name="keywords" content="opensees, finite element analysis, system identification, mdof, berkeley, bridge, engineering, earthquake engineering" />
+  <meta name="keywords" content="digital twin, opensees, finite element analysis, system identification, berkeley, bridge, engineering, earthquake engineering" />
   
   {# Open Graph and Facebook #}
   <meta property="og:type" content="website">
@@ -31,8 +31,10 @@
   <meta name="msapplication-TileColor" content="#ffffff">
   <meta name="theme-color" content="#ffffff">
 
+  {% comment %}
   <link type="text/css" href="{{ ASSETS_ROOT }}/vendor/sweetalert2/dist/sweetalert2.min.css" rel="stylesheet">  
   <link type="text/css" href="{{ ASSETS_ROOT }}/vendor/notyf/notyf.min.css" rel="stylesheet">  
+  {% endcomment %}
 
   {# BRACE CSS #}
   <link type="text/css" href="{{ ASSETS_ROOT }}/css/brace.css" rel="stylesheet">

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.18.dist-info → irie-0.0.20.dist-info}/METADATA

@@ -1,10 +1,10 @@
 Metadata-Version: 2.1
 Name: irie
-Version: 0.0.18
+Version: 0.0.20
 Summary: Infrastructure Resilience Engine
-Author-email: wd <5018-006+wd@users.noreply.github.com>
-Project-URL: Repository, https://github.com/STAIRLab/irie
-Project-URL: Documentation, https://structures.live
+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,finite-element-analysis,glTF
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Science/Research
@@ -71,3 +71,31 @@ Requires-Dist: dj-database-url==2.1.0
 - [`sees`](https://pypi.org/project/sees)
 - [`sdof`](https://pypi.org/project/sdof)
 
+
+<table align="center">
+<tr>
+
+  <td>
+    <a href="https://peer.berkeley.edu">
+    <img src="https://raw.githubusercontent.com/claudioperez/sdof/master/docs/assets/peer-black-300.png"
+         alt="PEER Logo" width="200"/>
+    </a>
+  </td>
+
+  <td>
+    <a href="https://dot.ca.gov/">
+    <img src="https://raw.githubusercontent.com/claudioperez/sdof/master/docs/assets/Caltrans.svg.png"
+         alt="Caltrans Logo" width="200"/>
+    </a>
+  </td>
+
+  <td>
+    <a href="https://brace2.herokuapp.com">
+    <img src="https://raw.githubusercontent.com/claudioperez/sdof/master/docs/assets/stairlab.svg"
+         alt="STAIRlab Logo" width="200"/>
+    </a>
+  </td>
+ 
+ </tr>
+</table>
+

{irie-0.0.18.dist-info → irie-0.0.20.dist-info}/RECORD

@@ -23,12 +23,13 @@ irie/apps/documents/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5
 irie/apps/evaluation/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 irie/apps/evaluation/admin.py,sha256=kn7L9M8Vrcc8UfmnwOV_JS8TV464-21xEKV6VyX2Ni8,1379
 irie/apps/evaluation/apps.py,sha256=siqeOaH_tmCU0edSPIWcw_6cmvw5gHWpbeWWbuTUYGM,557
-irie/apps/evaluation/daemon.py,sha256=GRZaECGz0nfuGehJd8iU4bg5UXHLd3wr0XXAZbBloxM,3859
+irie/apps/evaluation/daemon.py,sha256=9iTefaGUOELIqJgeSdZUPcx7rKdRvxkVuwDpQ1DM7ME,3405
 irie/apps/evaluation/identification.py,sha256=Y1c6AlUlawas2fVOxDxowK_W1aJEDhe9b3NUYIXf40M,6183
-irie/apps/evaluation/models.py,sha256=yYgc9ey4TgfGJGgsWc836G--8l-KNQjdCmt6OyLhaS8,2373
+irie/apps/evaluation/models.py,sha256=Wks_phbD1fOG7aGj1W7XQuJB1EaUf1lWBHRdgEMqo34,2970
 irie/apps/evaluation/urls.py,sha256=DnLB-MADpbZZxmdmgPbx2CAvdPv2X0pVgvoJmrYwzr0,483
 irie/apps/evaluation/views.py,sha256=vhQpT7Q-rotzmU_VB6Dx-1RxpX454cqK2nz4aIPp4YI,2341
 irie/apps/evaluation/migrations/0001_initial.py,sha256=Bu9By3pDY-Dls_dSUGBQOGlrs0dGQPRCZrOC7gxtb1I,846
+irie/apps/evaluation/migrations/0002_evaluation_status.py,sha256=XkvEtJDmE7h48wrj_dguhAUmFSk2nMUYD09c8nhvp9c,494
 irie/apps/evaluation/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 irie/apps/events/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 irie/apps/events/admin.py,sha256=YbPPlS1d4NZ-Ah3LVtIKER1wtVK-y7kRA9H_-ql9kRs,342
@@ -56,7 +57,7 @@ irie/apps/inventory/sitemaps.py,sha256=yc3UMVuGWA8vC9zHseY1jfkeRw5_jTYjy-UUcGtGw
 irie/apps/inventory/tables.py,sha256=vZdPOcbN1ibuWXqLwbBUoQw9iavwa1GJ5fd83k8bu7Y,27874
 irie/apps/inventory/traffic.py,sha256=B3PHqn2Pm4AEdUZ_tuA16fuFruo2rm5waMBwLQyF-9g,4490337
 irie/apps/inventory/urls.py,sha256=mpmHjvDSHhC5xrEosbTH_h2bGWNJfslGcrt2mnUO40E,1019
-irie/apps/inventory/views.py,sha256=QA0zw7uRYdChF3bW6GZzjiUmtO_u8T45onFz-w5m_1U,14439
+irie/apps/inventory/views.py,sha256=nfFG1AsCSuZPtMcCxKYxrbrQqK27iOExz1RhSSAQCRc,14596
 irie/apps/inventory/archive/arcGIS.py,sha256=vcfsy1be4edOXD1Z3rkUnq9QmCTol7dypdF816Q3B_w,34893
 irie/apps/inventory/migrations/0001_initial.py,sha256=PwTHv4Q3gqWFha--8Zp9kUOh-cYalB14jXj7RVJUVnw,1786
 irie/apps/inventory/migrations/0002_alter_asset_bridge_sensors_and_more.py,sha256=rPzWHkjg-ZCorVA_gv6MVb5F6LTLHcwlPwhBR1PxVr0,842
@@ -370,9 +371,9 @@ irie/apps/templates/includes/paginate.js,sha256=dAaL4uFQzEIbm61c_USEHlQLFkKc2ndJ
 irie/apps/templates/includes/scripts.html,sha256=1Up6xJJSTpdLTJp0tDAa3JubevvSlicOE4_j1vEOkek,1190
 irie/apps/templates/includes/settings-box.html,sha256=wexsLS4SMRyKci-r4L_LQ6QM27h4U291091NcGiTT3o,2486
 irie/apps/templates/includes/sidebar.html,sha256=uJnzXtcV7UvXscvEHe5z0wpLsFZk8B9mj1_Ye08NRbY,10972
-irie/apps/templates/inventory/asset-event-summary.html,sha256=ZDhCIO6gV6XTeLDZt2l5X47hBv9jXsLL4p9yflbu-mk,50749
-irie/apps/templates/inventory/asset-profile.html,sha256=iHUT9In2zjiVBZ3NHnrQMLkUAIaELMMHZm2UHFXMiR8,11289
-irie/apps/templates/inventory/asset-table.html,sha256=A-1hVxDxuahlZQ1CYFb2fKO9710wKk5NoZN-dNBjrNE,12208
+irie/apps/templates/inventory/asset-event-summary.html,sha256=BmLAFtfNDi98aZIu5WbkPMda-QZgoWhssN6l3e2QLgE,50672
+irie/apps/templates/inventory/asset-profile.html,sha256=0j8JdAu8fKGOnGjkBb0pKopRkaqQIKzI1dek6oxCx38,11208
+irie/apps/templates/inventory/asset-table.html,sha256=hiPrumCigE_m1H6vSr8l-AoRosV8WnFuRg89cuzavvY,12129
 irie/apps/templates/inventory/bridge-dashboard.html,sha256=67zrDlih3LOi9xFVwPVZZkgRT3DO-lE_qRL7q8Uz9GY,45472
 irie/apps/templates/inventory/bridge.html,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 irie/apps/templates/inventory/dashboard.html,sha256=yKEqsdSQpLIxv-E2sytN3yPNN9Li0q4488N3VVT9Jg8,7604
@@ -396,7 +397,7 @@ irie/apps/templates/prediction/hazus/history.js,sha256=blHRXzlEfMBCezPE-2dZCpt2r
 irie/apps/templates/site/about.html,sha256=5hS5taj3XF-F8z-uIn53ZFXVHVS4apLRMg39OyvMvRs,610
 irie/apps/templates/site/asset_map.html,sha256=rnTjeYMc8NESIo6Uuq8fgZ_xcKNuKdt4zcqoUTDI8Xg,387
 irie/apps/templates/site/components-forms.html,sha256=FKOiR-3e9iw-xOHeaP2RB3O2gP10R-Mt8wdXfb1rDBQ,13865
-irie/apps/templates/site/index.html,sha256=0gO_GpglbQQU6pMaHhn3MyhDl3OcwwepnwACeUvQFGk,15724
+irie/apps/templates/site/index.html,sha256=KZiKpqwWyZ11RZSPZ4oqJ42Z-kECES6YsIfL7MCZGN8,15767
 irie/apps/templates/site/json-form.html,sha256=ZrRWy5xnGBOqG51b6mdVGI0Io5X1z47DTFB9wW6ZQYA,1785
 irie/apps/templates/site/page-403.html,sha256=caU6t3fsCJiAIuZvRQekK2UemdZSNxc3l80ceSz0mp0,1289
 irie/apps/templates/site/page-404-sidebar.html,sha256=krMA-iYHaJNfXSwY7H_epZycWLiIb_bBbuWTmqC4ca4,1581
@@ -417,7 +418,7 @@ irie/core/settings.py,sha256=9jqn02olEya6O2p3pABLFhmHRwl_U05sOAtluo6y1Rg,6342
 irie/core/urls.py,sha256=H_oIilxAeV6C5W3TY_-oYwkbHiOnHdrRGweBDnOe04k,1279
 irie/core/wsgi.py,sha256=8dxK789vOoRWm0IatEhNqMgZhov9TlspjM6hOUbjg24,395
 irie/init/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-irie/init/__main__.py,sha256=6-_8v1yigDWa6AE0c4xT5CBF--MVhQWnOmG-1ea8X6w,589
+irie/init/__main__.py,sha256=EMfVc-Q-IPi1uBU3vOkoP4_-JMWpK1dFnqu3prfXsDM,589
 irie/init/bridges.py,sha256=vWDhpQ42Ws9SHUMPw5N8sEQ_7PXbdXRK1SUlSMQQCeI,74681
 irie/init/calid.py,sha256=Q6ie1irxm9EiGdxuR2OD05Hffg0UsTWIxQJha-kWkVs,1331
 irie/init/getCGSData.py,sha256=iZG3Ab1Y_rhiliKCPNy0MZrKBsfEe6ShgSFz2ttvTUU,2916
@@ -436,8 +437,8 @@ irie/init/management/commands/init_corridors.py,sha256=EzLk0HUiFxlco-2u0rypewOc9
 irie/init/management/commands/init_predictors.py,sha256=jdD7rd8l2qxuUuR5GOYuHXp-ZQkAK477TefksBMdlOw,2362
 irie/rest/__main__.py,sha256=6Nf_-Rr9zGmMyp_wqCFDO7ls9QPnPd9UyUgN17rIGYw,3680
 irie/usgs/__main__.py,sha256=HiSvPn5IW5IqRiCk1qRRq5dCy3-7iISw7v1P_w2rLrk,5049
-irie-0.0.18.dist-info/METADATA,sha256=P1TMv5Y8XvAbQvrp8KALn4jDxFCEsHfHGnA29lwWf4Y,2527
-irie-0.0.18.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-irie-0.0.18.dist-info/entry_points.txt,sha256=A_3h9wPBGfxGQ78_MGa-nO6Z0foxOYeAnIE47jxEztg,44
-irie-0.0.18.dist-info/top_level.txt,sha256=zVCxi5E2nkISZPzKq8VEhWe_dGuPcefLYV1tYqQdwlY,5
-irie-0.0.18.dist-info/RECORD,,
+irie-0.0.20.dist-info/METADATA,sha256=5hxwSV5Sr0rE1jc33o6wBorklugHZZmr399OcdrS2DA,3244
+irie-0.0.20.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+irie-0.0.20.dist-info/entry_points.txt,sha256=A_3h9wPBGfxGQ78_MGa-nO6Z0foxOYeAnIE47jxEztg,44
+irie-0.0.20.dist-info/top_level.txt,sha256=zVCxi5E2nkISZPzKq8VEhWe_dGuPcefLYV1tYqQdwlY,5
+irie-0.0.20.dist-info/RECORD,,