irie 0.0.47__tar.gz → 0.0.48__tar.gz

{irie-0.0.47 → irie-0.0.48}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: irie
-Version: 0.0.47
+Version: 0.0.48
 Summary: An infrastructure resilience engine
 Author-email: "Claudio M. Perez" <50180406+claudioperez@users.noreply.github.com>
 Project-URL: Repository, https://github.com/STAIRLab
@@ -32,6 +32,7 @@ Requires-Dist: opensees
 Requires-Dist: quakeio
 Requires-Dist: mdof
 Requires-Dist: veux
+Requires-Dist: xara
 Requires-Dist: bottle
 Requires-Dist: openbim
 Requires-Dist: folium

{irie-0.0.47 → irie-0.0.48}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "irie"
-version = "0.0.47"
+version = "0.0.48"
 authors = [
   {name="Claudio M. Perez", email="50180406+claudioperez@users.noreply.github.com"}
 ]
@@ -25,6 +25,7 @@ dependencies = [
   "quakeio",
   "mdof",
   "veux",
+  "xara",
   "bottle",
   "openbim",
   "folium",

{irie-0.0.47 → irie-0.0.48}/src/irie/apps/prediction/runners/opensees/utilities.py

@@ -8,7 +8,6 @@ import json
 import fnmatch
 import numpy as np
 
-from matplotlib import pyplot as plt
 from math import pi
 from collections import defaultdict
 import quakeio
@@ -239,6 +238,7 @@ def getPeak(file, other=None):
     return peakVals, timePeakVals, maxPeakCol
 
 def husid(accRH, plothusid, dt, lb=0.05, ub=0.95):
+    from matplotlib import pyplot as plt
     ai = np.tril(np.ones(len(accRH)))@accRH**2
     husid = ai/ai[-1]
     ilb = next(x for x, val in enumerate(husid) if val > lb)

{irie-0.0.47 → irie-0.0.48}/src/irie/init/management/commands/init_cesmd.py

@@ -5,6 +5,7 @@ from irie.init.calid   import CALID, CESMD
 from pathlib import Path
 from django.core.management.base import BaseCommand
 import json
+from collections import defaultdict
 
 DATA = Path(irie.__file__).parents[0]/"init"/"data"
 
@@ -13,6 +14,15 @@ with open(DATA/"cgs_data.json") as f:
 with open(DATA/"nbi_data_cesmd.json") as f:
     NBI_DATA = json.loads(f.read())
 
+
+def nbi_reshape(raw):
+    data = defaultdict(dict)
+    for row in raw["Results"]["NBIData"]["NBIDataList"]:
+        data[row["TABLE_NAME"]][row["EXPANDED_FIELD_ALIAS"]] = row["FIELD_VALUE"]
+
+    return dict(data)
+
+
 class Command(BaseCommand):
     def handle(self, *args, **kwargs):
         # with open(DATA/"cgs-stations.json") as f:
@@ -31,7 +41,7 @@ class Command(BaseCommand):
                 asset.cesmd = cesmd 
                 asset.calid = calid
                 asset.cgs_data = CGS_DATA.get(cesmd, {})
-                asset.nbi_data = NBI_DATA.get(calid.replace("-", " "), {})
+                asset.nbi_data = nbi_reshape(NBI_DATA.get(calid.replace("-", " "), [{}])[-1])
                 
                 asset.save()
                 print(asset)

{irie-0.0.47 → irie-0.0.48}/src/irie.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: irie
-Version: 0.0.47
+Version: 0.0.48
 Summary: An infrastructure resilience engine
 Author-email: "Claudio M. Perez" <50180406+claudioperez@users.noreply.github.com>
 Project-URL: Repository, https://github.com/STAIRLab
@@ -32,6 +32,7 @@ Requires-Dist: opensees
 Requires-Dist: quakeio
 Requires-Dist: mdof
 Requires-Dist: veux
+Requires-Dist: xara
 Requires-Dist: bottle
 Requires-Dist: openbim
 Requires-Dist: folium

{irie-0.0.47 → irie-0.0.48}/src/irie.egg-info/requires.txt

@@ -3,6 +3,7 @@ opensees
 quakeio
 mdof
 veux
+xara
 bottle
 openbim
 folium