irie 0.0.39__tar.gz → 0.0.41__tar.gz

{irie-0.0.39 → irie-0.0.41}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: irie
-Version: 0.0.39
+Version: 0.0.41
 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.39 → irie-0.0.41}/pyproject.toml

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

{irie-0.0.39 → irie-0.0.41}/src/irie/apps/templates/site/index.html

@@ -255,13 +255,14 @@ td.left-text{vertical-align:middle}
             <table>
               <tr>
                 <td style=text-align:center>
-                  <a href="https://stairlab.berkeley.edu/software/opensees/">
+                  <a href="https://opensees.stairlab.io">
                   <img class="first-column-layout"
                        src="{{ ASSETS_ROOT }}/content_images/brace/opensees.jpg" alt="opensees"></a></td>
                 <td class=full-center-text><a href="https://pypi.org/project/sees" >sees</a></td>
                 <td class=left-text>Direct and idiomatic bindings to <a href="https://github.com/claudioperez/OpenSeesRT" >
                   <samp>OpenSeesRT</samp></a> kernel for finite element analysis.</td>
               </tr>
+              {% if False %}
               <tr>
                 <td style=text-align:center>
                   <a href="https://claudioperez.github.io/sdof" >
@@ -270,6 +271,7 @@ td.left-text{vertical-align:middle}
                 <td class=full-center-text><a href="https://pypi.org/project/sdof" >sdof</a></td>
                 <td class=left-text>Parallel integration of single degree-of-freedom systems.</td>
               </tr>
+              {% endif %}
               <tr>
                 <td style="text-align:center">
                   <a href="https://chrystalchern.github.io/mdof">

{irie-0.0.39 → irie-0.0.41}/src/irie/init/calid.py

@@ -27,7 +27,10 @@ CESMD = {
     "04-0236":   ("CE89324",                  None, "Rio Dell - Hwy 101/Painter St. Overpass"),
     "54-0823G":  ("CE23631",                  None, "San Bernardino - I10/215 Interchange Br"),
     "33-0214L":  ("CE58658",                  None, "Hayward - Hwy 580/238 Interchange Bridge"),
+}
 
+# TODO: Need to get NBI/CGS Data for these 
+{
 #-------------------------------------
 
     "34-0006":   ("CE58600",                  None, "Oakland - SF Bay Bridge/East: SAS"),

{irie-0.0.39 → irie-0.0.41}/src/irie/init/getNBIData.py

@@ -33,10 +33,13 @@ def getBridgeList(headers, start_page=1, totalpages=3, pagesize=10, totalbridges
     url = 'https://infobridge.fhwa.dot.gov/Data/GetAllBridges'
 
     payload = {
-        "isShowBridgesApplied":True,
+        "isShowBridgesApplied": True,
         "gridParam": {
-            "isShowBridgesApplied":True, "IsFilterApplied":False, "SelectedFilters":None,
-            "SortOrder":"asc", "SortIndex": "STATE_CODE",
+            "isShowBridgesApplied": True, 
+            "IsFilterApplied": False, 
+            "SelectedFilters": None,
+            "SortOrder": "asc", 
+            "SortIndex": "STATE_CODE",
         }
     }
 
@@ -76,6 +79,7 @@ def getBridgeList(headers, start_page=1, totalpages=3, pagesize=10, totalbridges
 
 
 def getNBIData(headers, bridgeTable, years,
+               structure=None,
                keep_query=False):
 
     url = 'https://infobridge.fhwa.dot.gov/Data/getBridgeInformation'
@@ -107,7 +111,7 @@ def getNBIData(headers, bridgeTable, years,
         "IS_YEAR_SELECTED": False, 
         "Is_Overview_Bridge_Selected": False,
         "NEW_BRIDGE_ID": 0, 
-        "STRUCTURE_NUMBER": None, 
+        "STRUCTURE_NUMBER": structure, 
         "STATE_NAME": None,
         "STATE_CODE": 0,    
         "IS_EXPERIMENTAL": False, 
@@ -141,13 +145,13 @@ def getNBIData(headers, bridgeTable, years,
             if r.status_code == 200:
                 htmlcontent = r.content.decode('utf-8')
                 try:
-                    data[STRUCTURE_NUMBER][0] = {
+                    data[STRUCTURE_NUMBER].append({
                         k: (
                             v if k != "Results" else {
                                 kk: vv for kk, vv in v.items() if (kk != "NBIDataQuery" or keep_query)
                             }
                         ) for k, v in json.loads(htmlcontent).items()
-                     }
+                     })
                 except Exception as e:
                     print(f">> Error: {e}", file=sys.stderr)
                     continue
@@ -193,6 +197,20 @@ if __name__ == '__main__':
         print(json.dumps(bridgeTable, indent=2))
         sys.exit()
 
+    elif sys.argv[1] == "-S":
+        headers.update({
+            'datatype':     'json',
+            'content-type': 'application/json; charset=UTF-8',
+            'accept':       'application/json, text/plain, */*'
+        })
+        bridgeTable = json.load(open(sys.argv[1]))
+
+        # calids = list(map(str.strip, open("init/calid.txt").readlines()))
+        # bridgeTable = [i for i in bridgeTable if i["STRUCTURE_NUMBER"] in calids]
+
+
+        print(json.dumps(nbi_data, indent=2))
+
     else:
         headers.update({
             'datatype':     'json',
@@ -200,6 +218,7 @@ if __name__ == '__main__':
             'accept':       'application/json, text/plain, */*'
         })
         bridgeTable = json.load(open(sys.argv[1]))
+
         bridgeTable = [
             i for i in bridgeTable 
             if " " in i["STRUCTURE_NUMBER"] and len(i["STRUCTURE_NUMBER"]) in {7, 8}
@@ -207,7 +226,20 @@ if __name__ == '__main__':
 
         # calids = list(map(str.strip, open("init/calid.txt").readlines()))
         # bridgeTable = [i for i in bridgeTable if i["STRUCTURE_NUMBER"] in calids]
-
-    nbi_data = getNBIData(headers, bridgeTable[:], years=(2024,)) #range(2020, 2024))
-    print(json.dumps(nbi_data, indent=2))
+        if len(sys.argv) > 3:
+            bridgeTable = [
+                i for i in bridgeTable 
+                if i["STRUCTURE_NUMBER"] == sys.argv[3]
+            ]
+            if len(bridgeTable) == 0:
+                print(f"Structure {sys.argv[3]} not found", file=sys.stderr)
+                sys.exit(1)
+        else:
+            bridgeTable = [
+                i for i in bridgeTable 
+                if " " in i["STRUCTURE_NUMBER"] and len(i["STRUCTURE_NUMBER"]) in {7, 8}
+            ]
+
+        nbi_data = getNBIData(headers, bridgeTable[:], years=(2024,)) #range(2020, 2024))
+        print(json.dumps(nbi_data, indent=2))
 

{irie-0.0.39 → irie-0.0.41}/src/irie/init/management/commands/init_assets.py

@@ -129,7 +129,7 @@ def load_assets(NBI_DATA):
 
         try:
             asset = Asset.objects.get(calid=calid)
-            if UPDATE_ASSETS:
+            if UPDATE_ASSETS and nbi:
                 asset.nbi_data = nbi
                 asset.save()
 
@@ -147,11 +147,8 @@ def load_assets(NBI_DATA):
 
             count += 1
 
-        # if config:
-        #     asset.bridge_sensors = json.dumps(config["accelerometers"]["bridge_channels"])
-        #     asset.ground_sensors = json.dumps(config["accelerometers"]["ground_channels"])
-
-        asset.save()
+        if asset.nbi_data or asset.cgs_data:
+            asset.save()
 
         continue
 

{irie-0.0.39 → irie-0.0.41}/src/irie/init/management/commands/init_cesmd.py

@@ -29,6 +29,7 @@ class Command(BaseCommand):
                 asset.cesmd = cesmd 
                 asset.calid = calid
                 asset.cgs_data = CGS_DATA.get(cesmd, {})
+                
                 asset.save()
                 print(asset)
                 count += 1

{irie-0.0.39 → irie-0.0.41}/src/irie.egg-info/PKG-INFO

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