irie 0.0.12__tar.gz → 0.0.14__tar.gz

{irie-0.0.12 → irie-0.0.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: irie
-Version: 0.0.12
+Version: 0.0.14
 Summary: Infrastructure Resilience Engine
 Author-email: wd <5018-006+wd@users.noreply.github.com>
 Project-URL: Repository, https://github.com/STAIRLab/irie
@@ -27,6 +27,7 @@ Classifier: Operating System :: POSIX
 Classifier: Operating System :: Unix
 Classifier: Operating System :: MacOS
 Description-Content-Type: text/markdown
+Requires-Dist: tqdm
 Requires-Dist: opensees
 Requires-Dist: quakeio
 Requires-Dist: mdof

{irie-0.0.12 → irie-0.0.14}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "irie"
-version = "0.0.12"
+version = "0.0.14"
 authors = [
   {name="wd", email="5018-006+wd@users.noreply.github.com"},
 ]
@@ -20,6 +20,7 @@ keywords = [
 ] 
 
 dependencies = [
+  "tqdm",
   "opensees",
   "quakeio",
   "mdof",

{irie-0.0.12 → irie-0.0.14}/src/irie/apps/evaluation/daemon.py

@@ -44,7 +44,10 @@ class LiveEvaluation:
 
     def runPredictor(self, args: Tuple[str, Tuple[RunID, List[HealthMetric]]]):
         predictor_name, (run_id, metrics) = args
-        self.predictors[predictor_name].runPrediction(run_id)
+        try:
+            self.predictors[predictor_name].runPrediction(run_id)
+        except:
+            pass
         return predictor_name, run_id
 
     # met_tag, predictor_name
@@ -83,8 +86,6 @@ class LiveEvaluation:
 
         for mname in self.active_metrics:
             for predictor, score in self.scorePredictors(mname, self.predictors.values(), event):
-                print(predictor, score)
-
 
                 if predictor.name not in queued_predictions and predictor.active:
                     rid = predictor.newPrediction(event)
@@ -102,6 +103,6 @@ class LiveEvaluation:
     def scorePredictors(self, metric, predictors: Collection["Predictor"], event)->Iterator[Tuple["Predictor", int]]:
         for predictor in predictors:
             if predictor.active and metric in predictor.getMetricList():
-                print(">>> ", predictor.name, metric, file=sys.stderr)
+                # print(">>> ", predictor.name, metric, file=sys.stderr)
                 yield (predictor, 0)
 

{irie-0.0.12 → irie-0.0.14}/src/irie/apps/evaluation/models.py

@@ -35,7 +35,8 @@ class Evaluation(models.Model):
             evaluation.evaluation_data = data["evaluation_data"]
             evaluation.save()
         else:
-            Thread(target=evaluate, args=(event, evaluation)).start()
+            evaluate(event, evaluation)
+#           Thread(target=evaluate, args=(event, evaluation)).start()
 
         return evaluation
 

{irie-0.0.12 → irie-0.0.14}/src/irie/apps/events/models.py

@@ -65,14 +65,14 @@ class EventRecord(models.Model):
 
         evnt = quakeio.read(self.event_file.path, format="csmip.zip")
         try:
-            channels = json.loads(self.asset.bridge_sensors[2:-1])
+            channels = json.loads(self.asset.bridge_sensors)
             outputs,dt = extract_channels(evnt, channels)
             *_, time = create_time_vector(len(outputs[0]), dt)
         except:
-            return None 
+            return None
 
         try:
-            inputs,dt  = extract_channels(evnt, json.loads(self.asset.ground_sensors[2:-1]))
+            inputs,dt  = extract_channels(evnt, json.loads(self.asset.ground_sensors))
 
             fig = plot_io(inputs, outputs, time)
         except:

{irie-0.0.12 → irie-0.0.14}/src/irie/apps/events/views_events.py

@@ -86,6 +86,10 @@ def save_event(request, event, success_status):
     rec_id = motion_data.get("record_identifier", "")
 
 
+    if EventRecord.objects.filter(record_identifier=rec_id).first():
+        print("\n\nSKIPPING\n\n")
+        return HttpResponse(json.dumps({"data": ""}), status=success_status)
+
     # CREATE EVENT
     if event is None:
         # Doing a PUT

{irie-0.0.12 → irie-0.0.14}/src/irie/apps/prediction/predictor.py

@@ -223,7 +223,6 @@ class PredictorType2(Runner):
                        *map(str, self.conf.get("argv", []))]
 
         self.metric_details = subprocess.check_output(command).decode()
-        print(self.metric_details)
         return True
 
     def getMetricData(self, run, metric):
@@ -273,7 +272,6 @@ class PredictorType4(Runner):
                        *map(str, self.conf.get("argv", []))]
 
         self.metric_details = subprocess.check_output(command).decode()
-        # print(self.metric_details)
         return True
 
     def getMetricData(self, run, metric):

{irie-0.0.12 → irie-0.0.14}/src/irie/apps/prediction/runners/__init__.py

@@ -31,13 +31,10 @@ class Runner:
             self.entry_point = conf.entry_point
             self.metrics = conf.metrics
             self.active = conf.active
-            try:
+            if conf.config_file:
                 self.model_file = Path(conf.config_file.path).resolve()
-            except ValueError as e:
-                print(e)
-
-            self.out_dir = Path(__file__).parents[0]/"Predictions"
-            self.runs = {}
+                self.out_dir = Path(__file__).parents[0]/"Predictions"
+                self.runs = {}
 
     @abstractmethod
     def newPrediction(self, event)->RunID: ...

{irie-0.0.12 → irie-0.0.14}/src/irie/apps/prediction/runners/opensees/utilities.py

@@ -37,6 +37,7 @@ def read_model(filename:str)->dict:
     return model
 
 # --8<--------------------------------------------------------
+
 def damage_states(Dcol):
     from opensees import section
     from opensees.section import patch

{irie-0.0.12 → irie-0.0.14}/src/irie/apps/prediction/runners/ssid.py

@@ -321,7 +321,7 @@ def make_mountains(asset, output_channels=None):
     if output_channels is None:
         if not asset.bridge_sensors:
             raise ValueError("Failed to determine output sensors for Asset")
-        output_channels = json.loads(asset.bridge_sensors[2:-1])
+        output_channels = json.loads(asset.bridge_sensors)
 
     n_expected_outputs = len(output_channels)
     events = _load_events(asset, output_channels)

{irie-0.0.12 → irie-0.0.14}/src/irie/apps/templates/inventory/asset-profile.html

@@ -9,6 +9,24 @@
 <script type="module" src="https://ajax.googleapis.com/ajax/libs/model-viewer/4.0.0/model-viewer.min.js"></script>
 <!-- <script type="module" src="https://unpkg.com/@google/model-viewer/dist/model-viewer.min.js"></script> -->
 {% endif %}
+
+<style>
+.crop {
+  width: 100%; /* 200px;*/
+  height: auto ; /* 150px; */
+  overflow: hidden;
+}
+.crop img {
+    width: 100%;
+    height: auto;
+    margin: -200px 0 -100px -100px;
+}
+/*
+  width: 400px;
+  height: 300px;
+  margin: -75px 0 0 -100px;
+*/
+</style>
 <style>
 @media print {
   @page {
@@ -216,8 +234,10 @@
       {% if mountains %}
       <div class="col-10 card bg-white-100 border-0 shadow mt-4">
         <div class="card-body">
-          <h4>Mountains</h4>
-          <img src="data:image/jpeg;base64,{{ mountains }}" alt="Fragility Curve" style="max-width: 100%; height: auto;">
+          <h4>Spectrum</h4>
+          <div class="crop">
+            <img src="data:image/jpeg;base64,{{ mountains }}" alt="Fragility Curve">
+          </div>
         </div>
       </div>
       {% endif %}

{irie-0.0.12 → irie-0.0.14}/src/irie/core/urls.py

@@ -40,5 +40,5 @@ urlpatterns = [
 
 
 # Ensure we can serve files stored with models (eg, bridge renderings)
-] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
+] # + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
 

{irie-0.0.12 → irie-0.0.14}/src/irie/init/bridges.py

@@ -27,7 +27,7 @@ CE58658 = {
         "13": (1030, 2,  37.66*pi/180, "deck_level_near_abut_1"),
         "14": (304,  1,  31.02*pi/180, "bent_3_deck_level"),
         "15": (304,  2,  31.02*pi/180, "bent_3_deck_level"),
-        # "16": (30003, 3, ((31.02+26.26)/2)*pi/180, "midspan_between_bents_3_4_deck"),
+      # "16": (30003, 3, ((31.02+26.26)/2)*pi/180, "midspan_between_bents_3_4_deck"),
         "17": (401,  1,  26.26*pi/180, "bent_4_north_column_grnd_level"),
         "18": (401,  2,  26.26*pi/180, "bent_4_north_column_grnd_level"),
         "19": (403,  1,  26.26*pi/180, "bent_4_north_column_top"),
@@ -46,15 +46,24 @@ CE58658 = {
         {'key':  3020, 'strain': True, 'label':  'Bent 3 South' },
         {'key':  4010, 'strain': True, 'label':  'Bent 4 North' },
         {'key':  4020, 'strain': True, 'label':  'Bent 4 South' },
-        {'key':  5010, 'strain': True, 'label':  'Bent 5 North' }, {'key':  5020, 'strain': True, 'label':  'Bent 5 South'}, 
-        {'key':  6010, 'strain': True, 'label':  'Bent 6 North' }, {'key':  6020, 'strain': True, 'label':  'Bent 6 South'}, 
-        {'key':  7010, 'strain': True, 'label':  'Bent 7 North' }, {'key':  7020, 'strain': True, 'label':  'Bent 7 South'}, 
-        {'key':  8010, 'strain': True, 'label':  'Bent 8 North' }, {'key':  8020, 'strain': True, 'label':  'Bent 8 South'}, 
-        {'key':  9010, 'strain': True, 'label':  'Bent 9 North' }, {'key':  9020, 'strain': True, 'label':  'Bent 9 South'}, 
-        {'key': 10010, 'strain': True, 'label': 'Bent 10 North' }, {'key': 10020, 'strain': True, 'label': 'Bent 10 South'}, 
-        {'key': 11010, 'strain': True, 'label': 'Bent 11 North' }, {'key': 11020, 'strain': True, 'label': 'Bent 11 South'}, 
-        {'key': 12010, 'strain': True, 'label': 'Bent 12 North' }, {'key': 12020, 'strain': True, 'label': 'Bent 12 South'}, 
-        {'key': 12030, 'strain': True, 'label': 'Bent 12 Center'}, {'key': 13010, 'strain': True, 'label': 'Bent 13 South, NE Line'}, 
+        {'key':  5010, 'strain': True, 'label':  'Bent 5 North' },
+        {'key':  5020, 'strain': True, 'label':  'Bent 5 South'}, 
+        {'key':  6010, 'strain': True, 'label':  'Bent 6 North' },
+        {'key':  6020, 'strain': True, 'label':  'Bent 6 South'}, 
+        {'key':  7010, 'strain': True, 'label':  'Bent 7 North' },
+        {'key':  7020, 'strain': True, 'label':  'Bent 7 South'}, 
+        {'key':  8010, 'strain': True, 'label':  'Bent 8 North' },
+        {'key':  8020, 'strain': True, 'label':  'Bent 8 South'}, 
+        {'key':  9010, 'strain': True, 'label':  'Bent 9 North' },
+        {'key':  9020, 'strain': True, 'label':  'Bent 9 South'}, 
+        {'key': 10010, 'strain': True, 'label': 'Bent 10 North' },
+        {'key': 10020, 'strain': True, 'label': 'Bent 10 South'}, 
+        {'key': 11010, 'strain': True, 'label': 'Bent 11 North' },
+        {'key': 11020, 'strain': True, 'label': 'Bent 11 South'}, 
+        {'key': 12010, 'strain': True, 'label': 'Bent 12 North' },
+        {'key': 12020, 'strain': True, 'label': 'Bent 12 South'}, 
+        {'key': 12030, 'strain': True, 'label': 'Bent 12 Center'},
+        {'key': 13010, 'strain': True, 'label': 'Bent 13 South, NE Line'}, 
         {'key': 13020, 'strain': True, 'label': 'Bent 13 North, NE Line'}, {'key': 13040, 'strain': False, 'label': 'Bent 13, NR Line'}, 
         {'key': 14010, 'strain': True, 'label': 'Bent 14 South, NE Line'}, {'key': 14020, 'strain': True, 'label': 'Bent 14 North, NE Line'}, 
         {'key': 14030, 'strain': True, 'label': 'Bent 14 Center, NE Line'}, {'key': 14040, 'strain': False, 'label': 'Bent 14, NR Line'}
@@ -63,7 +72,33 @@ CE58658 = {
         {'node': 203, 'record': True, 'label': 'Bent 2 North'},
         {'node': 205, 'record': True, 'label': 'Bent 2 South'},
         {'node': 303, 'record': True, 'label': 'Bent 3 North'},
-        {'node': 305, 'record': True, 'label': 'Bent 3 South'}, {'node': 403, 'record': True, 'label': 'Bent 4 North'}, {'node': 405, 'record': True, 'label': 'Bent 4 South'}, {'node': 503, 'record': True, 'label': 'Bent 5 North'}, {'node': 505, 'record': True, 'label': 'Bent 5 South'}, {'node': 603, 'record': True, 'label': 'Bent 6 North'}, {'node': 605, 'record': True, 'label': 'Bent 6 South'}, {'node': 703, 'record': True, 'label': 'Bent 7 North'}, {'node': 705, 'record': True, 'label': 'Bent 7 South'}, {'node': 803, 'record': True, 'label': 'Bent 8 North'}, {'node': 805, 'record': True, 'label': 'Bent 8 South'}, {'node': 903, 'record': True, 'label': 'Bent 9 North'}, {'node': 905, 'record': True, 'label': 'Bent 9 South'}, {'node': 1003, 'record': True, 'label': 'Bent 10 North'}, {'node': 1005, 'record': True, 'label': 'Bent 10 South'}, {'node': 1103, 'record': True, 'label': 'Bent 11 North'}, {'node': 1105, 'record': True, 'label': 'Bent 11 South'}, {'node': 1203, 'record': True, 'label': 'Bent 12 North'}, {'node': 1207, 'record': True, 'label': 'Bent 12 South'}, {'node': 1205, 'record': True, 'label': 'Bent 12 Center'}, {'node': 1303, 'record': True, 'label': 'Bent 13 South, NE Line'}, {'node': 1305, 'record': True, 'label': 'Bent 13 North, NE Line'}, {'node': 1315, 'record': True, 'label': 'Bent 13, NR Line'}, {'node': 1403, 'record': True, 'label': 'Bent 14 South, NE Line'}, {'node': 1405, 'record': True, 'label': 'Bent 14 North, NE Line'}, {'node': 1404, 'record': True, 'label': 'Bent 14 Center, NE Line'}, {'node': 1415, 'record': True, 'label': 'Bent 14, NR Line'}, 
+        {'node': 305, 'record': True, 'label': 'Bent 3 South'},
+        {'node': 403, 'record': True, 'label': 'Bent 4 North'},
+        {'node': 405, 'record': True, 'label': 'Bent 4 South'},
+        {'node': 503, 'record': True, 'label': 'Bent 5 North'},
+        {'node': 505, 'record': True, 'label': 'Bent 5 South'}, 
+        {'node': 603, 'record': True, 'label': 'Bent 6 North'}, 
+        {'node': 605, 'record': True, 'label': 'Bent 6 South'}, 
+        {'node': 703, 'record': True, 'label': 'Bent 7 North'}, 
+        {'node': 705, 'record': True, 'label': 'Bent 7 South'}, 
+        {'node': 803, 'record': True, 'label': 'Bent 8 North'}, 
+        {'node': 805, 'record': True, 'label': 'Bent 8 South'}, 
+        {'node': 903, 'record': True, 'label': 'Bent 9 North'}, 
+        {'node': 905, 'record': True, 'label': 'Bent 9 South'}, 
+        {'node': 1003, 'record': True, 'label': 'Bent 10 North'}, 
+        {'node': 1005, 'record': True, 'label': 'Bent 10 South'}, 
+        {'node': 1103, 'record': True, 'label': 'Bent 11 North'}, 
+        {'node': 1105, 'record': True, 'label': 'Bent 11 South'}, 
+        {'node': 1203, 'record': True, 'label': 'Bent 12 North'}, 
+        {'node': 1207, 'record': True, 'label': 'Bent 12 South'}, 
+        {'node': 1205, 'record': True, 'label': 'Bent 12 Center'}, 
+        {'node': 1303, 'record': True, 'label': 'Bent 13 South, NE Line'}, 
+        {'node': 1305, 'record': True, 'label': 'Bent 13 North, NE Line'}, 
+        {'node': 1315, 'record': True, 'label': 'Bent 13, NR Line'}, 
+        {'node': 1403, 'record': True, 'label': 'Bent 14 South, NE Line'}, 
+        {'node': 1405, 'record': True, 'label': 'Bent 14 North, NE Line'}, 
+        {'node': 1404, 'record': True, 'label': 'Bent 14 Center, NE Line'}, 
+        {'node': 1415, 'record': True, 'label': 'Bent 14, NR Line'}, 
         # {'node': 'Max', 'record': True, 'label': 'Max'}
     ]
 }
@@ -149,10 +184,10 @@ BRIDGES = {
                "name": "FSTF_tran", "description": "Transverse configuration.", "protocol": "", "metrics": ["SPECTRAL_SHIFT_IDENTIFICATION"],"entry_point": [PYTHON, "-m", "mdof", "fourier"],
                "config": {"period_band": PERIOD_BAND, "inputs": [24], "outputs": [3]},
            },
-        #    {
-        #        "name": "SRIM_tran2", "description": "Transverse with dense sensor configuration.", "protocol": "", "metrics": ["SPECTRAL_SHIFT_IDENTIFICATION"],"entry_point": [PYTHON, "-m", "mdof", "srim"],
-        #        "config": {"decimate": SS_DEC, "order": 12, "horizon": 190, "inputs": [1,9,24], "outputs": [2,4,5,6,7]},
-        #    },
+           {
+               "name": "SRIM_tran2", "description": "Transverse with dense sensor configuration.", "protocol": "", "metrics": ["SPECTRAL_SHIFT_IDENTIFICATION"],"entry_point": [PYTHON, "-m", "mdof", "srim"],
+               "config": {"decimate": SS_DEC, "order": 12, "horizon": 190, "inputs": [1,9,24], "outputs": [2,4,5,6,7]},
+           },
            {
                "name": "SRIM_vert", "description": "Vertical Configuration.", "protocol": "", "metrics": ["SPECTRAL_SHIFT_IDENTIFICATION"],"entry_point": [PYTHON, "-m", "mdof", "srim"],
                "config": {"decimate": SS_DEC, "order": 12, "horizon": 190, "inputs": [14,19,26], "outputs": [16,18,22]},
@@ -258,10 +293,10 @@ BRIDGES = {
                "name": "FSTF_tran", "description": "Transverse configuration._deck", "protocol": "", "metrics": ["SPECTRAL_SHIFT_IDENTIFICATION"],"entry_point": [PYTHON, "-m", "mdof", "fourier"],
                "config": {"period_band": PERIOD_BAND, "inputs": [14], "outputs": [9]},
            },
-        #    {
-        #        "name": "SRIM_tran2", "description": "Transverse configuration._center_wall", "protocol": "", "metrics": ["SPECTRAL_SHIFT_IDENTIFICATION"],"entry_point": [PYTHON, "-m", "mdof", "srim"],
-        #        "config": {"decimate": SS_DEC, "order": 12, "horizon": 190, "inputs": [14], "outputs": [12,9]},
-        #    }
+           {
+               "name": "SRIM_tran2", "description": "Transverse configuration._center_wall", "protocol": "", "metrics": ["SPECTRAL_SHIFT_IDENTIFICATION"],"entry_point": [PYTHON, "-m", "mdof", "srim"],
+               "config": {"decimate": SS_DEC, "order": 12, "horizon": 190, "inputs": [14], "outputs": [12,9]},
+           }
         ]
     },
     "CE47315": {

{irie-0.0.12/src/irie/post → irie-0.0.14/src/irie/rest}/__main__.py

@@ -2,11 +2,53 @@
 # Claudio Perez
 import sys
 import json
+import time
+import tqdm
+from pathlib import Path
 from os import environ
 
 import requests
 from requests.auth import HTTPBasicAuth
 
+class IrieRest:
+    def __init__(self):
+        pass
+
+def list_evals():
+    import os
+    import requests
+
+    # Environment variables for authentication and hostname
+    username = os.getenv("IRIE_USERNAME")
+    password = os.getenv("IRIE_PASSWORD")
+    hostname = os.getenv("IRIE_HOSTNAME")
+
+    if not all([username, password, hostname]):
+        raise ValueError("Ensure all required environment variables and file path are set.")
+
+    # API endpoint
+    url = f"{hostname}/api/evals/"
+    headers = {
+        "Content-Type": "multipart/form-data",
+    }
+
+
+    # Perform the POST request with Basic Auth
+    response = requests.get(url, auth=(username, password))
+
+    # Output the response
+    return json.loads(response.text)
+
+def post_motions(filenames):
+    progress = tqdm.tqdm(filenames)
+    for filename in progress:
+        if (response := post_motion(filename)) and response.get("data",""):
+            progress.set_description(f"Analyzing {Path(filename).name}")
+            time.sleep(5)
+        else:
+            progress.set_description(f"Skipping {Path(filename).name}")
+            continue 
+
 def post_motion(filename):
     import os
     import requests
@@ -30,10 +72,10 @@ def post_motion(filename):
         }
         # Perform the POST request with Basic Auth
         response = requests.post(url, auth=(username, password), files=files)
-
-    # Output the response
-    print(f"Status Code: {response.status_code}")
-    print(f"Response: {response.text}")
+    try:
+        return json.loads(response.text)
+    except:
+        return None
 
 
 def post_evaluations(data):
@@ -73,16 +115,23 @@ def post_evaluations(data):
 
 
 if __name__ == "__main__":
-    filename = sys.argv[1]
 
-    if filename.endswith(".zip"):
-        post_motion(filename)
-    
-    else:
-        with open(filename, "r") as f:
+    if len(sys.argv) == 1:
+        print(json.dumps(list_evals()))
+
+    elif len(sys.argv) > 2:
+        post_motions(sys.argv[1:])
+
+    elif sys.argv[1].endswith(".zip"):
+        post_motion(sys.argv[1])
+
+    elif sys.argv[1].enswith(".json"):
+        with open(sys.argv[1], "r") as f:
             data = json.load(f)["data"]
 
         for bridge in data:
             for event in bridge["events"]:
                 post_evaluations(event)
+    else:
+        pass
 

{irie-0.0.12 → irie-0.0.14}/src/irie.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: irie
-Version: 0.0.12
+Version: 0.0.14
 Summary: Infrastructure Resilience Engine
 Author-email: wd <5018-006+wd@users.noreply.github.com>
 Project-URL: Repository, https://github.com/STAIRLab/irie
@@ -27,6 +27,7 @@ Classifier: Operating System :: POSIX
 Classifier: Operating System :: Unix
 Classifier: Operating System :: MacOS
 Description-Content-Type: text/markdown
+Requires-Dist: tqdm
 Requires-Dist: opensees
 Requires-Dist: quakeio
 Requires-Dist: mdof

{irie-0.0.12 → irie-0.0.14}/src/irie.egg-info/SOURCES.txt

@@ -371,5 +371,5 @@ src/irie/init/data/networks/soga_corridors.json
 src/irie/init/management/commands/init_assets.py
 src/irie/init/management/commands/init_corridors.py
 src/irie/init/management/commands/init_predictors.py
-src/irie/post/__main__.py
+src/irie/rest/__main__.py
 src/irie/usgs/__main__.py

{irie-0.0.12 → irie-0.0.14}/src/irie.egg-info/requires.txt

@@ -1,3 +1,4 @@
+tqdm
 opensees
 quakeio
 mdof