irie 0.0.38__py3-none-any.whl → 0.0.40__py3-none-any.whl

irie/apps/templates/inventory/asset-profile.html

@@ -130,17 +130,11 @@
         <a role="button" 
            href="/inventory/{{ asset.calid }}/predictors/"
            class="btn btn-sm btn-outline-primary d-inline-flex align-items-center mx-1">
-          <svg class="icon icon-xs me-2" fill="none" 
-              stroke="currentColor" viewBox="0 0 24 24" 
-              xmlns="http://www.w3.org/2000/svg"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 6v6m0 0v6m0-6h6m-6 0H6"></path></svg>
               Predictors
         </a>
         <a role="button" 
            href="{% url 'asset_sensors' calid=asset.calid %}"
            class="btn btn-sm btn-outline-primary d-inline-flex align-items-center mx-1">
-          <svg class="icon icon-xs me-2" fill="none" 
-              stroke="currentColor" viewBox="0 0 24 24" 
-              xmlns="http://www.w3.org/2000/svg"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 6v6m0 0v6m0-6h6m-6 0H6"></path></svg>
               Sensors
         </a>
       </div>

irie/apps/templates/inventory/asset-sensors.html

@@ -16,10 +16,14 @@ Chrystal Chern, Spring 2025
 {% block content %}
 <h1><code>{{ asset.calid }}</code> Sensors</h1>
   <div class="py-4 align-right">
-    <a role="button" class="button btn btn-outline-white btn-gray-600 text-white"
+    <a role="button" class="button btn btn-outline-primary"
     href="{% url 'asset_profile' calid=asset.calid %}" class="me-1">Back to Structure</a>
-    <a role="button" class="button btn btn-outline-white btn-gray-600 text-white"
-    href="{% url 'sensor_upload' calid=asset.calid %}" class="me-1">Add SensorGroup</a>
+    <a role="button" class="button btn btn-outline-primary"
+    href="{% url 'sensor_upload' calid=asset.calid %}" class="me-1">
+    <svg class="icon icon-xs me-2" fill="none" 
+        stroke="currentColor" viewBox="0 0 24 24" 
+        xmlns="http://www.w3.org/2000/svg"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 6v6m0 0v6m0-6h6m-6 0H6"></path></svg>
+        Add SensorGroup</a>
   </div>
 
   <div class="col-lg-10">

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/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/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/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.38.dist-info → irie-0.0.40.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: irie
-Version: 0.0.38
+Version: 0.0.40
 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.38.dist-info → irie-0.0.40.dist-info}/RECORD

@@ -396,8 +396,8 @@ irie/apps/templates/includes/settings-box.html,sha256=_YubYOyAJ8IldTgVlXP2wLLXpK
 irie/apps/templates/includes/sidebar.html,sha256=m2TahYwFnysqcLkK4ANYZhUf8xGVId_tiJFBKrQD4Cw,12386
 irie/apps/templates/inventory/asset-evals.html,sha256=KzbdJJ7ildMpfO4IQDuXqGBcPzUTlYpJ_Y3Wg4payVc,2700
 irie/apps/templates/inventory/asset-event-summary.html,sha256=5G7uZVf7kVL0wBaAfsEtTEEA5HRuBCzx8NrgDFheWI4,51357
-irie/apps/templates/inventory/asset-profile.html,sha256=K7D1D-ApjyEV05AyYxGnGs6B0sNq11jKusdPDwubmFA,14135
-irie/apps/templates/inventory/asset-sensors.html,sha256=Ugfdc79WqrHDvzAPi2o8HkjYz5nD7w5S5wZSknQNjxA,2184
+irie/apps/templates/inventory/asset-profile.html,sha256=rfj9tEXcUoTNHGAq_yVr2y1Io0f9qXZ6_EuWy9nWBJE,13585
+irie/apps/templates/inventory/asset-sensors.html,sha256=qLnlhnmOeT5uL1xH67mFPOgufXV_PJ31KEx5Aqt0TTw,2406
 irie/apps/templates/inventory/asset-table.html,sha256=Ak_N_QDUgWzyffBBidJ8H0wLR3zX3wNHQm6MnZYbruQ,12589
 irie/apps/templates/inventory/bridge-dashboard.html,sha256=67zrDlih3LOi9xFVwPVZZkgRT3DO-lE_qRL7q8Uz9GY,45472
 irie/apps/templates/inventory/bridge.html,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
@@ -451,10 +451,10 @@ irie/core/wsgi.py,sha256=8dxK789vOoRWm0IatEhNqMgZhov9TlspjM6hOUbjg24,395
 irie/init/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 irie/init/__main__.py,sha256=9PhToipU4y-7H_ndU5aoCdaWayhR5ld669LPnKUDBu4,828
 irie/init/bridges.py,sha256=OBBKnLx2lmMKDfeR0C8CBSbnpnzO0lfokBypD2nEFcM,74198
-irie/init/calid.py,sha256=Nmmv5e4rX-6_Uoo7FGRdU23p1NHKOWzPgUGoIulJMGk,8267
+irie/init/calid.py,sha256=1tj1Qu-aoxbbtmVHQ80EEg0tuD2zDRROPETG5_1WikQ,8315
 irie/init/getCGSData.py,sha256=iZG3Ab1Y_rhiliKCPNy0MZrKBsfEe6ShgSFz2ttvTUU,2916
 irie/init/getCGSevents.py,sha256=4dBkFFJQrUs6gfl1Nj-_R2UOZj0B_T017a6tC7fUHOw,421
-irie/init/getNBIData.py,sha256=WuconVGj-DyiOCFHWCYSt7PEVsVzFf_3XHjzWKuUWjg,8292
+irie/init/getNBIData.py,sha256=m_sBK9WoeqEGXpX1FfmywGvVzuiVWZghl0sfcFOcbYI,9402
 irie/init/hayward.zip,sha256=WECOnYLP_3EeKHQzdxm17MHTncF2QdgXI28Vm6Iopt0,124675
 irie/init/data/cgs-stations.json,sha256=h-KKF-u31j_OQnQZQlmFzDjqgi0AcsPNzohn7bCNq0Q,105563
 irie/init/data/cgs_data.json,sha256=l2lADALMXVLKY6jn-rvEZjYWcZjGHLk22ZudocdR81Q,27752
@@ -463,14 +463,14 @@ irie/init/data/nbi_data-california.json,sha256=nyslZbMf30WrtdyqCpMvxd-NNxNzFHtZX
 irie/init/data/nbi_definitions.json,sha256=NS3yNP1i1E_JXfGW_I_xOoNRsfeljDA5BZ_1h0Cu_1I,4301
 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=CGbB7eLlctfusbHal3v1LOs1y02ugJITrqhK7qE4XSs,5894
-irie/init/management/commands/init_cesmd.py,sha256=IPuKYtrQEDb8C-TyUKpjbdjlLUrUkATW5dmtqEd7SVQ,1183
+irie/init/management/commands/init_assets.py,sha256=4EK194gtub1erZ1WoezF60sP5q94CkBjzBbhKh1OrDg,5743
+irie/init/management/commands/init_cesmd.py,sha256=00aNGLN6M_oDhMyKySJuqaPW0IwJal3TxsxCKn1lCjs,1200
 irie/init/management/commands/init_corridors.py,sha256=EzLk0HUiFxlco-2u0rypewOc9mAo_raqXC2_UCG8a_w,1241
 irie/init/management/commands/init_predictors.py,sha256=jdD7rd8l2qxuUuR5GOYuHXp-ZQkAK477TefksBMdlOw,2362
 irie/rest/__main__.py,sha256=6Nf_-Rr9zGmMyp_wqCFDO7ls9QPnPd9UyUgN17rIGYw,3680
 irie/usgs/__main__.py,sha256=HiSvPn5IW5IqRiCk1qRRq5dCy3-7iISw7v1P_w2rLrk,5049
-irie-0.0.38.dist-info/METADATA,sha256=CjLqjK7fnBhPBGxUN_sct9Ep-tuGIQl2HgmEMvLX7as,3207
-irie-0.0.38.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
-irie-0.0.38.dist-info/entry_points.txt,sha256=A_3h9wPBGfxGQ78_MGa-nO6Z0foxOYeAnIE47jxEztg,44
-irie-0.0.38.dist-info/top_level.txt,sha256=zVCxi5E2nkISZPzKq8VEhWe_dGuPcefLYV1tYqQdwlY,5
-irie-0.0.38.dist-info/RECORD,,
+irie-0.0.40.dist-info/METADATA,sha256=nfZd_K6XcVG91zVzOXHlKlM06WHz5AmoJGmXphjHXWE,3207
+irie-0.0.40.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+irie-0.0.40.dist-info/entry_points.txt,sha256=A_3h9wPBGfxGQ78_MGa-nO6Z0foxOYeAnIE47jxEztg,44
+irie-0.0.40.dist-info/top_level.txt,sha256=zVCxi5E2nkISZPzKq8VEhWe_dGuPcefLYV1tYqQdwlY,5
+irie-0.0.40.dist-info/RECORD,,