irie 0.0.18__tar.gz → 0.0.20__tar.gz

{irie-0.0.18 → irie-0.0.20}/PKG-INFO

@@ -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.20/README.md

@@ -0,0 +1,44 @@
+<div align="center">
+<h4><code>irie</code></h4>
+<hr>
+<span style="font-size: 150;"><i><b>i</b>nfrastructure <b>r</b>es<b>i</b>lience <b>e</b>ngine</i></span>
+<hr>
+<h4>PEER</h4>
+</div>
+
+### Powered By
+
+- [`opensees`](https://pypi.org/project/opensees)
+- [`quakeio`](https://pypi.org/project/quakeio)
+- [`mdof`](https://pypi.org/project/mdof)
+- [`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 → irie-0.0.20}/pyproject.toml

@@ -1,8 +1,8 @@
 [project]
 name = "irie"
-version = "0.0.18"
+version = "0.0.20"
 authors = [
-  {name="wd", email="5018-006+wd@users.noreply.github.com"},
+  {name="Claudio M. Perez", email="50180406+claudioperez@users.noreply.github.com"}
 ]
 description="Infrastructure Resilience Engine"
 
@@ -75,8 +75,8 @@ classifiers = [
 
 
 [project.urls]
-Repository = "https://github.com/STAIRLab/irie"
-Documentation = "https://structures.live"
+Repository = "https://github.com/STAIRLab"
+Documentation = "https://stairlab.berkeley.edu/software/irie/"
 
 [project.scripts]
 irie = "irie.__main__:main"
@@ -90,13 +90,9 @@ requires = [
 build-backend = "setuptools.build_meta"
 
 
-# [tool.setuptools]
-# packages = { find = {} }
 [tool.setuptools.packages.find]
 where = ["src"]
 
-# [tool.setuptools.sdist]
-# formats = ["xztar"]
 
 [tool.setuptools.package-data]
 "*" = [
@@ -117,4 +113,3 @@ where = ["src"]
     "init/hayward.zip"
 ]
 
-

{irie-0.0.18 → irie-0.0.20}/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.20/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.18 → irie-0.0.20}/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.18 → irie-0.0.20}/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]
         ]
@@ -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.18 → irie-0.0.20}/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.18 → irie-0.0.20}/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>

{irie-0.0.18 → irie-0.0.20}/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.18 → irie-0.0.20}/src/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-0.0.18 → irie-0.0.20}/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.18 → irie-0.0.20}/src/irie.egg-info/PKG-INFO

@@ -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 → irie-0.0.20}/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

irie-0.0.18/README.md

@@ -1,16 +0,0 @@
-<div align="center">
-<h4><code>irie</code></h4>
-<hr>
-<span style="font-size: 150;"><i><b>i</b>nfrastructure <b>r</b>es<b>i</b>lience <b>e</b>ngine</i></span>
-<hr>
-<h4>PEER</h4>
-</div>
-
-### Powered By
-
-- [`opensees`](https://pypi.org/project/opensees)
-- [`quakeio`](https://pypi.org/project/quakeio)
-- [`mdof`](https://pypi.org/project/mdof)
-- [`sees`](https://pypi.org/project/sees)
-- [`sdof`](https://pypi.org/project/sdof)
-