irie 0.0.51__tar.gz → 0.0.53__tar.gz

{irie-0.0.51 → irie-0.0.53}/PKG-INFO

@@ -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 → irie-0.0.53}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "irie"
-version = "0.0.51"
+version = "0.0.53"
 authors = [
   {name="Claudio M. Perez", email="50180406+claudioperez@users.noreply.github.com"}
 ]

{irie-0.0.51 → irie-0.0.53}/src/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-0.0.51 → irie-0.0.53}/src/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-0.0.51 → irie-0.0.53}/src/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-0.0.51 → irie-0.0.53}/src/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-0.0.51 → irie-0.0.53}/src/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-0.0.51 → irie-0.0.53}/src/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 → irie-0.0.53}/src/irie.egg-info/PKG-INFO

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