irie 0.0.46__py3-none-any.whl → 0.0.48__py3-none-any.whl

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/init/management/commands/init_cesmd.py

@@ -5,11 +5,23 @@ 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"
 
 with open(DATA/"cgs_data.json") as f:
     CGS_DATA = json.loads(f.read())
+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):
@@ -29,6 +41,7 @@ class Command(BaseCommand):
                 asset.cesmd = cesmd 
                 asset.calid = calid
                 asset.cgs_data = CGS_DATA.get(cesmd, {})
+                asset.nbi_data = nbi_reshape(NBI_DATA.get(calid.replace("-", " "), [{}])[-1])
                 
                 asset.save()
                 print(asset)

{irie-0.0.46.dist-info → irie-0.0.48.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: irie
-Version: 0.0.46
+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.46.dist-info → irie-0.0.48.dist-info}/RECORD

@@ -111,7 +111,7 @@ irie/apps/prediction/runners/hazus.py,sha256=sWQDDmwN82wKSHW9EGx46JOOPo_IN2CTK7R
 irie/apps/prediction/runners/ssid.py,sha256=Y36FMPVzjNMXknQO6LegTBFUF2X-l7TXyddY4Z8SDmA,18701
 irie/apps/prediction/runners/opensees/__init__.py,sha256=QlInYqEKc1oYBnw6TeF4dS3VnOxmQeLptF9EKr-blfM,21177
 irie/apps/prediction/runners/opensees/metrics.py,sha256=HU1V0RYQDXrhTcHqwpnU2KOSl4UPNo9S6QP3sz2VcUY,6428
-irie/apps/prediction/runners/opensees/utilities.py,sha256=aPBANs6NR-EPrYsekBLx-IWvx4GbNypMtkHy3PPM6aM,9028
+irie/apps/prediction/runners/opensees/utilities.py,sha256=1cajnV6gWkJ5obYixfbHZKwxi1ECpR0sBWquAAGhseE,9032
 irie/apps/prediction/runners/opensees/xmlutils.py,sha256=Q3i5L0Dp_5nRsKRGMr-m_bS03Mxa36Ujb-RvwAmResc,7510
 irie/apps/prediction/runners/opensees/zipped.py,sha256=ou2BnxY4WzAzVp3cL9XJUeSJqdijRs-rbcagOsX_Ed0,942
 irie/apps/prediction/runners/opensees/schemas/__init__.py,sha256=AMX2Z5F_ltcB6ny1U41aDXIbAmS7wprjcA35j511XBU,1033
@@ -482,15 +482,15 @@ irie/init/data/nbi_definitions.json,sha256=NS3yNP1i1E_JXfGW_I_xOoNRsfeljDA5BZ_1h
 irie/init/data/nbi/04.tar,sha256=ubRgxWBshe0cNKxftbEVyFeh1HcUmFarVL2BBHo9Tyk,1884160
 irie/init/data/networks/soga_corridors.json,sha256=AQOUaKGNWkQxQKLfqphE9Qb_-NRmjN9IwK59SGjutxE,45496
 irie/init/management/commands/init_assets.py,sha256=z-QczBwa7altFy8oLgKtF2_ogHwWOGGFiMJYLkol-zU,5709
-irie/init/management/commands/init_cesmd.py,sha256=00aNGLN6M_oDhMyKySJuqaPW0IwJal3TxsxCKn1lCjs,1200
+irie/init/management/commands/init_cesmd.py,sha256=BDQqTzZGogVMjdRZgKr9MOZEhe78E8EvhIzB1zNuBBc,1626
 irie/init/management/commands/init_corridors.py,sha256=EzLk0HUiFxlco-2u0rypewOc9mAo_raqXC2_UCG8a_w,1241
 irie/init/management/commands/init_predictors.py,sha256=edCf7d36cwl4YitXLtvOfsPee-BiPF55_Gr73OvTPcU,2368
 irie/init/management/commands/make_asset.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 irie/pull/nbi.py,sha256=KpBjJ9GEU72Qk1t4bGN9cg0QBeVJ8k9XcI3Y1oSgIR0,11478
 irie/rest/__main__.py,sha256=6Nf_-Rr9zGmMyp_wqCFDO7ls9QPnPd9UyUgN17rIGYw,3680
 irie/usgs/__main__.py,sha256=HiSvPn5IW5IqRiCk1qRRq5dCy3-7iISw7v1P_w2rLrk,5049
-irie-0.0.46.dist-info/METADATA,sha256=xy70P74HMWw2NTd1QS8Ce0YOjB99wwY7IDUYUT6B_Iw,3207
-irie-0.0.46.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
-irie-0.0.46.dist-info/entry_points.txt,sha256=A_3h9wPBGfxGQ78_MGa-nO6Z0foxOYeAnIE47jxEztg,44
-irie-0.0.46.dist-info/top_level.txt,sha256=zVCxi5E2nkISZPzKq8VEhWe_dGuPcefLYV1tYqQdwlY,5
-irie-0.0.46.dist-info/RECORD,,
+irie-0.0.48.dist-info/METADATA,sha256=KGSRxqsOhraNrCUpT3-fbCggjfmUU6510Waf0i_JeLk,3227
+irie-0.0.48.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
+irie-0.0.48.dist-info/entry_points.txt,sha256=A_3h9wPBGfxGQ78_MGa-nO6Z0foxOYeAnIE47jxEztg,44
+irie-0.0.48.dist-info/top_level.txt,sha256=zVCxi5E2nkISZPzKq8VEhWe_dGuPcefLYV1tYqQdwlY,5
+irie-0.0.48.dist-info/RECORD,,