irie 0.0.51__py3-none-any.whl → 0.0.53__py3-none-any.whl

irie/apps/inventory/views.py

@@ -337,6 +337,9 @@ def asset_profile(request, calid):
     except Exception as e:
         if "DEBUG" in os.environ and os.environ["DEBUG"]:
             raise e
+        import sys
+        print(e, file=sys.stderr)
+        print(e)
         html_template = loader.get_template("site/page-500.html")
         return HttpResponse(html_template.render(context, request))
 

irie/apps/prediction/runners/__init__.py

@@ -45,7 +45,8 @@ class Runner:
 
             self.runs = {}
             if pred.config_file:
-                self.model_file = Path(pred.config_file.path).resolve()
+                # TODO: for Amazon S3
+                # self.model_file = Path(pred.config_file.path).resolve()
                 self.out_dir = Path(__file__).parents[0]/"Predictions"
             else:
                 self.model_file = None

irie/apps/prediction/runners/ssid.py

@@ -15,9 +15,7 @@ import numpy as np
 # Ensure Agg backend is set for non-interactive plotting
 
 import quakeio
-from mdof import transform
 from scipy.signal import find_peaks
-from mdof.utilities import Config, extract_channels
 import subprocess
 
 
@@ -318,6 +316,7 @@ def _load_events(asset, output_channels):
     }
     """
     events = {}
+    from mdof.utilities import extract_channels
     for evt in EventRecord.objects.filter(asset=asset):
 
         try:
@@ -342,6 +341,8 @@ def _get_spectra(event, conf, cmap):
     with the maximum period of the N_PEAKS tallest peaks, as well as plotting options
     such as color and alpha.
     """
+    from mdof import transform
+    from mdof.utilities import Config
     period_band = conf.period_band
 
     n_outputs = event['outputs'].shape[0]
@@ -466,7 +467,7 @@ def _plot_mountains(spectra, accellim=None):
 
 
 def make_mountains(asset, conf=None, output_channels=None):
-
+    from mdof.utilities import Config
     cmap = colormaps['plasma']
     if conf is None:
         conf = Config()
@@ -547,6 +548,7 @@ if __name__ == '__main__':
     import sys
     from matplotlib import pyplot as plt, ticker, cm
     from matplotlib import colormaps
+    from mdof.utilities import Config
 
     procedure = parse_args(sys.argv)
     STATION_TYPE = procedure['STATION_TYPE']

irie/apps/prediction/views.py

@@ -120,15 +120,15 @@ def predictor_profile(request, calid, preid):
     context["predictor"] = predictor
     context["sensors"] = predictor.sensorassignment_set.all()
 
-    if predictor.protocol == PredictorModel.Protocol.TYPE1:
-        html_template = loader.get_template("prediction/xara-profile.html")
-        context["members"] = context["runner"].structural_members()
 
-    else:
-        html_template = loader.get_template("prediction/predictor-profile.html")
+    try:
+        if predictor.protocol == PredictorModel.Protocol.TYPE1:
+            html_template = loader.get_template("prediction/xara-profile.html")
+            context["members"] = context["runner"].structural_members()
 
+        else:
+            html_template = loader.get_template("prediction/predictor-profile.html")
 
-    try:
         return HttpResponse(html_template.render(context, request))
 
     except Exception as e:

irie/apps/templates/prediction/viewer/veux-viewer.js

@@ -7,11 +7,12 @@
 class VeuxViewer {
     #initializedTabs;
     #table;
+    #url;
     #tabLinkContainer;
     #tabContentContainer;
 
-    constructor(table, tabLinkContainer, tabContentContainer) {
-      this.#table = table;
+    constructor(url, tabLinkContainer, tabContentContainer) {
+      this.#url = url;
       this.#initializedTabs = [];
       this.#tabLinkContainer = tabLinkContainer;
       this.#tabContentContainer = tabContentContainer;
@@ -144,7 +145,8 @@ class VeuxViewer {
         </div>
         `;
 
-        let apiUrl = `/inventory/04-0236/predictors/1389/detail/?section=${tab}`;
+        let apiUrl = `${this.#url}${tab}`;
+        console.log(`Fetching content from: ${apiUrl}`);
 
         if (true) {
             contentDiv.innerHTML = "";

irie/apps/templates/prediction/xara-profile.html

@@ -144,7 +144,7 @@
 <script>
 {% include "prediction/viewer/veux-viewer.js" %}
 
-const VIEWER = new VeuxViewer(document.querySelector('#members'), 
+const VIEWER = new VeuxViewer(`/inventory/{{asset.calid}}/predictors/{{predictor.id}}/detail/?section=`,
                               document.querySelector('#tab-link-container'),
                               document.getElementById('tab-content-container'));
 

{irie-0.0.51.dist-info → irie-0.0.53.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: irie
-Version: 0.0.51
+Version: 0.0.53
 Summary: An infrastructure resilience engine
 Author-email: "Claudio M. Perez" <50180406+claudioperez@users.noreply.github.com>
 Project-URL: Repository, https://github.com/STAIRLab

{irie-0.0.51.dist-info → irie-0.0.53.dist-info}/RECORD

@@ -65,7 +65,7 @@ irie/apps/inventory/models.py,sha256=VdJ_5mEb6lBk21NalK8bhOy0u6SFdWmhXpcQ4vRs3Pg
 irie/apps/inventory/sitemaps.py,sha256=Nha1MTsIH_ad7JyoxwonPytp7MNuEhDNszkEUOmlN0o,826
 irie/apps/inventory/tables.py,sha256=vZdPOcbN1ibuWXqLwbBUoQw9iavwa1GJ5fd83k8bu7Y,27874
 irie/apps/inventory/urls.py,sha256=u2LNLB4K4fDq3yPYtREKf3i7_yHRzrTP3cb22G8Brvk,1578
-irie/apps/inventory/views.py,sha256=1r-UjcNuxq4rGeCnstDiRxC5BIzGyKsu86KAnTaZrwA,21878
+irie/apps/inventory/views.py,sha256=0CyW2MytaUTlaWZsJ0HREcm9yHlt9zEacUrSAJnUNpQ,21951
 irie/apps/inventory/archive/CESMD.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 irie/apps/inventory/archive/calid.py,sha256=3L8MbPIGOE3kzDnqeyY055pRBiF2O2l0cmpuDbTsdTg,3014
 irie/apps/inventory/migrations/0001_initial.py,sha256=PwTHv4Q3gqWFha--8Zp9kUOh-cYalB14jXj7RVJUVnw,1786
@@ -100,7 +100,7 @@ irie/apps/prediction/metrics.py,sha256=Zh1utUZTGddQEVn4e1rLO74tbIz7bVvZli8sgmuB_
 irie/apps/prediction/models.py,sha256=hmgSXRgUovuekHCxqPaqSiN7WNNjY7iAz9gqOOlELLo,2841
 irie/apps/prediction/predictor.py,sha256=-x_4kHWnfUxiX2aQfbl3dsbVAG4lRKAFbo1CqfZNCIc,831
 irie/apps/prediction/urls.py,sha256=_v7CdR97c7eMcsilURYP0c1QCzxBNnex0lbcTfWrpOI,1028
-irie/apps/prediction/views.py,sha256=D86dBdG0cZnphSh8Icf7UdEEXpqnx8HRhzlEEMz4tm0,9231
+irie/apps/prediction/views.py,sha256=iP0SyE1WVbGCNDM2T44E0HNvNJSuN8FSSOOF5uv1fYk,9251
 irie/apps/prediction/views_api.py,sha256=DJzLYO5ouPOWkkZJNZxZJzxC3TROKJ-L6Z2IC1NMuFQ,6888
 irie/apps/prediction/migrations/0001_initial.py,sha256=-0GWd2vUUAzSPfptccAJ3raI3UD4Xj9H0E5EJ7xN0Ek,1428
 irie/apps/prediction/migrations/0002_alter_predictormodel_protocol.py,sha256=nrQvuZ1eRR7fR17IjdS0Xyw14y9DpE6HkG2-h7HQ_zA,560
@@ -109,9 +109,9 @@ irie/apps/prediction/migrations/0004_sensorassignment.py,sha256=aUSFlaXiclLH68nF
 irie/apps/prediction/migrations/0005_remove_sensorassignment_offset_x_and_more.py,sha256=ojU-wQl6CEtiDpS2mVJurSuw9UUdCxDblP_PDcVgqNQ,1472
 irie/apps/prediction/migrations/0006_remove_sensorassignment_show_x_and_more.py,sha256=GbvT1XpRL7Eu_4lm6RYJziUtvFOcI9qTQoUIDvkuZWg,595
 irie/apps/prediction/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-irie/apps/prediction/runners/__init__.py,sha256=Rh1OJFDmCWiTRGVW5F2W0ixlVFaNFdb2VeC6H4zNX9o,2268
+irie/apps/prediction/runners/__init__.py,sha256=pur6vJ5zXwjyTxl7p0TBJ8dt-2h-4Ty65KPmtRM8lyQ,2308
 irie/apps/prediction/runners/hazus.py,sha256=sWQDDmwN82wKSHW9EGx46JOOPo_IN2CTK7RF23Rx4c4,31207
-irie/apps/prediction/runners/ssid.py,sha256=058E7eChphK5rUxfOmxZTU_x5qzFgFwrB7AMvt22yyg,18694
+irie/apps/prediction/runners/ssid.py,sha256=sVOsDm5TotpUdd2mTqvAiMveOPMjTEoQBy40EyCY5YI,18807
 irie/apps/prediction/runners/opensees/__init__.py,sha256=S5qKLo_7_pJKiSvsArpNz012h7ku4eR0tk35fLegKdk,23051
 irie/apps/prediction/runners/opensees/metrics.py,sha256=HU1V0RYQDXrhTcHqwpnU2KOSl4UPNo9S6QP3sz2VcUY,6428
 irie/apps/prediction/runners/opensees/utilities.py,sha256=1cajnV6gWkJ5obYixfbHZKwxi1ECpR0sBWquAAGhseE,9032
@@ -427,11 +427,11 @@ irie/apps/templates/prediction/create-mdof.html,sha256=QVuZGz3E5iwYvOQk_kkitAt5q
 irie/apps/templates/prediction/create-model.html,sha256=QjgeuEqSCDFbJlGK3PY6LePia3vJXKqD6g2TKdpIeE4,3237
 irie/apps/templates/prediction/new-runner.html,sha256=7gMXrrD-CylMDUelIltB9JnmnqlBr4euqktTfRFnhdU,1586
 irie/apps/templates/prediction/predictor-profile.html,sha256=PWUQAOAAWQP_Ak2D-cQP5PoVjyLiz6Kc8lhNLlffnZk,1253
-irie/apps/templates/prediction/xara-profile.html,sha256=sZqKCWKk-nK2V_Y496gPhgghtxYKYZQE5jLLwAPLlak,8805
+irie/apps/templates/prediction/xara-profile.html,sha256=eCzUuPcv03QBYwipYAN30uEUB1wVKKUWGfqd3q1kUEI,8843
 irie/apps/templates/prediction/hazus/event.html,sha256=vcmQKfb-Gww5sd-kn6b2QL3llRrfQFv8mafVNNxTHrY,841
 irie/apps/templates/prediction/hazus/history.html,sha256=zvnwP0gxSV9JNBbYACnKlMLB9iD7hGUbdkZ6kfJtBik,136
 irie/apps/templates/prediction/hazus/history.js,sha256=blHRXzlEfMBCezPE-2dZCpt2rVgTiGHkYlY1t-clOE8,1101
-irie/apps/templates/prediction/viewer/veux-viewer.js,sha256=k-EEdls3SRcbo91nrYQg7MWUZNh-uCgOwKrmNL19oic,6167
+irie/apps/templates/prediction/viewer/veux-viewer.js,sha256=gPhTyPupjV_RD8t86Lc2wGZsY68TLuv0WjzyaDpRsfI,6189
 irie/apps/templates/sensors/render-sensors.js,sha256=u05VQ7dBDhUMsTYs0_xgdltA2V5DAqenVKgYhAlBxw0,5570
 irie/apps/templates/site/about.html,sha256=5hS5taj3XF-F8z-uIn53ZFXVHVS4apLRMg39OyvMvRs,610
 irie/apps/templates/site/asset_map.html,sha256=rnTjeYMc8NESIo6Uuq8fgZ_xcKNuKdt4zcqoUTDI8Xg,387
@@ -496,8 +496,8 @@ irie/init/management/commands/make_asset.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm
 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.51.dist-info/METADATA,sha256=8jBFaUIlYbxfIZdGncwy1nMcVS3MMG0iPDBCqMEbbCc,3205
-irie-0.0.51.dist-info/WHEEL,sha256=ck4Vq1_RXyvS4Jt6SI0Vz6fyVs4GWg7AINwpsaGEgPE,91
-irie-0.0.51.dist-info/entry_points.txt,sha256=A_3h9wPBGfxGQ78_MGa-nO6Z0foxOYeAnIE47jxEztg,44
-irie-0.0.51.dist-info/top_level.txt,sha256=zVCxi5E2nkISZPzKq8VEhWe_dGuPcefLYV1tYqQdwlY,5
-irie-0.0.51.dist-info/RECORD,,
+irie-0.0.53.dist-info/METADATA,sha256=KeFh5656sSo032wk-q7KSOarl264gYDZbVGtYlGXdiA,3205
+irie-0.0.53.dist-info/WHEEL,sha256=ck4Vq1_RXyvS4Jt6SI0Vz6fyVs4GWg7AINwpsaGEgPE,91
+irie-0.0.53.dist-info/entry_points.txt,sha256=A_3h9wPBGfxGQ78_MGa-nO6Z0foxOYeAnIE47jxEztg,44
+irie-0.0.53.dist-info/top_level.txt,sha256=zVCxi5E2nkISZPzKq8VEhWe_dGuPcefLYV1tYqQdwlY,5
+irie-0.0.53.dist-info/RECORD,,