irie 0.0.41__py3-none-any.whl → 0.0.42__py3-none-any.whl

irie/apps/static/assets/js/brace.js

@@ -91,7 +91,7 @@ document.addEventListener("DOMContentLoaded", function(event) {
         el.style.color = 'url(' + el.getAttribute('data-color') + ')';
     });
 
-    //Tooltips
+    // Tooltips
     var tooltipTriggerList = [].slice.call(document.querySelectorAll('[data-bs-toggle="tooltip"]'))
     var tooltipList = tooltipTriggerList.map(
         function (tooltipTriggerEl) {
@@ -681,6 +681,7 @@ window.addEventListener('resize', function(event) {
 
       }
     });
+
   } else {
     total.forEach(function(item, i) {
       if (item.classList.contains('on-resize')) {

irie/apps/templates/includes/scripts.html

@@ -2,6 +2,15 @@
 <!-- Core -->
 <script src="{{ ASSETS_ROOT }}/vendor/@popperjs/core/dist/umd/popper.min.js"></script>
 <script src="{{ ASSETS_ROOT }}/vendor/bootstrap/dist/js/bootstrap.min.js"></script>
+<script>
+    var win = navigator.platform.indexOf('Win') > -1;
+    if (win && document.querySelector('#sidenav-scrollbar')) {
+      var options = {
+        damping: '0.5'
+      }
+      Scrollbar.init(document.querySelector('#sidenav-scrollbar'), options);
+    }
+</script>
 
 {% comment %}
 <script src="{{ ASSETS_ROOT }}/vendor/onscreen/dist/on-screen.umd.min.js"></script>
@@ -18,7 +27,7 @@
 <script src="{{ ASSETS_ROOT }}/vendor/notyf/notyf.min.js"></script>
 
 <!-- Simplebar -->
-<script src="{{ ASSETS_ROOT }}/vendor/simplebar/dist/simplebar.min.js"></script>
+<!-- <script src="{{ ASSETS_ROOT }}/vendor/simplebar/dist/simplebar.min.js"></script> -->
 
 <!-- Github buttons -->
 <script async defer src="https://buttons.github.io/buttons.js"></script>

irie/apps/templates/includes/sidebar.html

@@ -1,9 +1,16 @@
 
-        <nav class="navbar navbar-theme-primary navbar-dark px-4 col-12 d-lg-none">
+        <nav class="navbar navbar-theme-secondary navbar-dark px-4 col-12 d-lg-none">
             <a class="navbar-brand me-lg-5" href="/">
                 <img class="navbar-brand-light" src="{{ ASSETS_ROOT }}/img/brace2-no_text.png" alt="BRACE2 logo" />
             </a>
             <div class="d-flex align-items-center">
+                <a href="javascript:;" class="nav-link text-body p-0" id="iconNavbarSidenav">
+                  <div class="sidenav-toggler-inner">
+                    <i class="sidenav-toggler-line"></i>
+                    <i class="sidenav-toggler-line"></i>
+                    <i class="sidenav-toggler-line"></i>
+                  </div>
+                </a>
                 <!-- <button class="navbar-toggler d-lg-none collapsed" type="button"  -->
                 <button class="navbar-toggler collapsed" type="button" 
                         data-bs-toggle="collapse" 
@@ -15,16 +22,16 @@
         </nav>
 
         <!-- <nav id="sidebarMenu" class="sidebar d-lg-block bg-gray-800 text-white collapse" data-simplebar> -->
-        <aside id="sidebarMenu" class="sidebar d-lg-block collapse bg-white ms-2 my-2 navbar-vertical navbar-expand-xs" data-simplebar>
-          <div class="sidebar-inner px-4 pt-3">
+        <aside id="sidenav-main" style="z-index: 1;"  class="sidebar navbar navbar-vertical navbar-expand-xs d-lg-block collapse bg-white ms-2 my-2 fixed-start">
+          <!-- <div class="sidebar-inner px-4 pt-3"> -->
+          <div class="collapse navbar-collapse sidebar-inner px-4 pt-3 w-auto"  id="sidenav-collapse-main">
+            {% comment %}
             <div class="user-card d-flex d-md-none align-items-center justify-content-between justify-content-md-center pb-4">
               <div class="d-flex align-items-center">
-                {% comment %}
                 <div class="avatar-lg me-4">
                   <img src="{{ ASSETS_ROOT }}/img/team/profile-picture-3.jpg" class="card-img-top rounded-circle border-white"
                     alt="Profile picture">
                 </div>
-                {% endcomment %}
                 <div class="d-block">
                   <a href="/page-sign-in.html" class="btn btn-secondary btn-sm d-inline-flex align-items-center">
                     <svg class="icon icon-xxs me-1" 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="M17 16l4-4m0 0l-4-4m4 4H7m6 4v1a3 3 0 01-3 3H6a3 3 0 01-3-3V7a3 3 0 013-3h4a3 3 0 013 3v1"></path></svg>
@@ -40,9 +47,10 @@
                 </a>
               </div>
             </div>
-            <ul class="nav flex-column pt-3 pt-md-0">
+            {% endcomment %}
+            <ul class="nav navbar-nav flex-column pt-3 pt-md-0">
               <li class="nav-item">
-                <a href="/" class="nav-link d-flex align-items-center">
+                <a href="/" class="nav-link d-flex align-items-center" data-bs-toggle="collapse">
                   <span class="sidebar-icon">
                     <img src="{{ ASSETS_ROOT }}/img/brace2-no_text.png" height="20" width="20" alt="BRACE2 Logo">
                   </span>
@@ -53,7 +61,7 @@
 
               <li role="separator" class="dropdown-divider mt-2 mb-2 border-gray-700"></li>
               
-              <li class="nav-item {% if 'dashboard' in segment %} active {% endif %}">
+              <li class="nav-item {% if 'dashboard' in segment %} active {% endif %}" data-bs-toggle="collapse">
                 <a href="{% url 'dashboard' %}" class="nav-link">
                   <span class="sidebar-icon">
                     <svg class="icon icon-xs me-2" fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path d="M2 10a8 8 0 018-8v8h8a8 8 0 11-16 0z"></path><path d="M12 2.252A8.014 8.014 0 0117.748 8H12V2.252z"></path></svg>
@@ -62,9 +70,9 @@
                 </a>
               </li>
 
-              <li class="nav-item {% if 'events' in segment %} active {% endif %}">
+              <li class="nav-item {% if 'events' in segment %} active {% endif %}" data-bs-toggle="collapse">
                 <span
-                  class="nav-link  collapsed  d-flex justify-content-between align-items-center"
+                  class="nav-link collapsed  d-flex justify-content-between align-items-center"
                   data-bs-toggle="collapse" data-bs-target="#submenu-events">
                   <span>
                     <span class="sidebar-icon">
@@ -89,7 +97,7 @@
                 </div>
               </li>
 
-              <li class="nav-item {% if 'assets' in segment %} active {% endif %}">
+              <li class="nav-item text-dark {% if 'assets' in segment %} active {% endif %}" data-bs-toggle="collapse">
                 <a href="{% url 'asset_table' %}" class="nav-link">
                   <span class="sidebar-icon">
                     <svg class="icon icon-xs me-2" fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path d="M4 4a2 2 0 00-2 2v1h16V6a2 2 0 00-2-2H4z"></path><path fill-rule="evenodd" d="M18 9H2v5a2 2 0 002 2h12a2 2 0 002-2V9zM4 13a1 1 0 011-1h1a1 1 0 110 2H5a1 1 0 01-1-1zm5-1a1 1 0 100 2h1a1 1 0 100-2H9z" clip-rule="evenodd"></path></svg>

irie/apps/templates/layouts/base.html

@@ -44,7 +44,7 @@
 
 {% block stylesheets %}{% endblock stylesheets %}
 </head>
-<body>
+<body class="g-sidenav-show">
   {% include 'includes/sidebar.html' %}
   
   <main class="content">

irie/init/getNBIData2.py

@@ -0,0 +1,304 @@
+#===----------------------------------------------------------------------===#
+#
+#         STAIRLab -- STructural Artificial Intelligence Laboratory
+#
+#===----------------------------------------------------------------------===#
+#
+# First run without arguments to generate list of structure numbers and
+# save to JSON. Then run with that JSON as argv[1] to pull inventory data.
+#
+# Adapted from:
+# https://github.com/psychogeekir/ScrapeNBIBridgeInfo/raw/master/getNBIClimateData.py
+#
+# Claudio M. Perez
+#
+# TODO:
+#
+# - Add option for "SELECTED_TAB": "NBETab", 
+#
+# - Perhaps add something like:
+#     --filter-calid calids.txt
+#   This will be useful for testing, eg, (chrystal's first version)
+#     python getNBIData.py yearly.json --filter-calid <(echo "33 0214L")
+#   
+#   or
+#     python getNBIData.py | python getNBIData.py /dev/stdin <(echo "33 0214L")
+#
+import sys
+import json
+import requests
+from tqdm import tqdm
+from pathlib import Path
+
+NAME = Path(__file__).name
+
+EXAMPLES= """"
+Examples:
+    run to obtain structure numbers list:
+        $ {NAME}
+    run to obtain data from JSON list:
+        $ {NAME} [structure_numbers]
+    run filtering for given structure 33 0214L:
+        $ {NAME} [structure_numbers] --filter-calid "33 0214L"
+    run filtering for given structures:
+        $ {NAME} [structure_numbers] --filter-list [list]
+"""
+
+HELP=f"""
+
+usage:  $ {NAME}
+        $ {NAME} --help
+        $ {NAME} [structure_numbers] [options]
+
+Two-step process to obtain data from the National Bridge Inventory.
+
+Positional Arguments:
+
+Options:
+    -fc, --filter-calid             filter for specific structure.
+    -fl, --filter-list              filter for specified structures in txt file.
+    -h, --help                      print this message and exit.
+
+{EXAMPLES}
+"""
+
+def getBridgeList(headers, start_page=1, totalpages=3, pagesize=10, totalbridges=24, page_nums=None, **kwds):
+    url = 'https://infobridge.fhwa.dot.gov/Data/GetAllBridges'
+
+    payload = {
+        "isShowBridgesApplied":True,
+        "gridParam": {
+            "isShowBridgesApplied":True, "IsFilterApplied":False, "SelectedFilters":None,
+            "SortOrder":"asc", "SortIndex": "STATE_CODE",
+        }
+    }
+
+    pages = []
+    def filter(row):
+        return int(row["STATE_CODE"]) > 0
+
+    if page_nums is None:
+        page_nums = range(start_page, totalpages + 1)
+
+    for pageno in page_nums:
+        try:
+            payload["gridParam"]["PageNumber"] = pageno
+            payload["gridParam"]["PageSize"]   = pagesize
+
+            r = requests.post(url, headers=headers, data=json.dumps(payload))
+
+            if r.status_code == 200:
+                try:
+                    resp = json.loads(eval(r.content.decode('utf-8'))) # [1:-1].replace("\\", ""))
+                except:
+                    print(f"Failed to get page {pageno}", file=sys.stderr)
+                    continue
+
+                bridges = [
+                    {'BRIDGE_YEARLY_ID': row['BRIDGE_YEARLY_ID'], 
+                     'STRUCTURE_NUMBER': row['STRUCTURE_NUMBER'].strip()}
+                        for row in resp["Results"]["rows"] # if filter(row)
+                ]
+                pages.extend(bridges)
+                print(pageno, len(pages), len(bridges), resp["Results"]["rows"][-1]["STATE_NAME"], file=sys.stderr)
+
+        except KeyboardInterrupt:
+            break
+
+    return pages
+
+
+def getNBIData(headers, bridgeTable, years, tab="NBI",
+               keep_query=False):
+
+    url = 'https://infobridge.fhwa.dot.gov/Data/getBridgeInformation'
+
+    _headers = headers.copy()
+    # payload = {
+    #     "requestModel": {
+    #         "SELECTED_TAB": "OverviewTab",
+    #         "SELECTED_YEAR_ID": None,
+    #         "IS_NEW_RECORD": True,
+    #         "IS_YEAR_SELECTED": False,
+    #         "Is_Overview_Bridge_Selected": False,
+    #         "SELECTED_YEAR": None,
+    #         "CURRENT_YEARLY_ID": "25099893",
+    #         "IS_NBI_TREE_SELECTED": False,
+    #         "Folder_Name": None,
+    #         "tabChange": False,
+    #         "BRIDGE_YEARLY_ID": "25099893",
+    #         "NEW_BRIDGE_ID": 58813,
+    #         "SELECTED_NDE_TAB": "General"
+    #     }
+    # }
+
+    payload  = {
+      "requestModel":{
+        "SELECTED_TAB": f"{tab}Tab", 
+        "SELECTED_YEAR_ID": None, 
+        "IS_NEW_RECORD": False,
+        "IS_YEAR_SELECTED": False, 
+        "Is_Overview_Bridge_Selected": False,
+        "NEW_BRIDGE_ID": 0, 
+        "STRUCTURE_NUMBER": None, 
+        "STATE_NAME": None,
+        "STATE_CODE": 0,    
+        "IS_EXPERIMENTAL": False, 
+        "SELECTED_NDE_TAB": "General",
+       #"MERRA_ID": 0,"IS_NBI_TREE_SELECTED": False,"Folder_Name": None,"tabChange": False,
+      }
+    }
+
+
+    referer = 'https://infobridge.fhwa.dot.gov/Data/BridgeDetail/'
+    data = {}
+
+    for i,bridge in enumerate(tqdm(bridgeTable)):
+
+        BRIDGE_YEARLY_ID = bridge['BRIDGE_YEARLY_ID']
+        STRUCTURE_NUMBER = bridge['STRUCTURE_NUMBER']
+
+        # data[STRUCTURE_NUMBER] = []
+
+        for year in years:
+            _headers['referer'] = referer + str(BRIDGE_YEARLY_ID)
+
+            payload["requestModel"].update({
+                  "SELECTED_YEAR":     year,
+                  "CURRENT_YEARLY_ID": BRIDGE_YEARLY_ID,
+                  "BRIDGE_YEARLY_ID":  BRIDGE_YEARLY_ID,
+            })
+
+            r = requests.post(url, data=json.dumps(payload), headers=_headers)
+
+            if r.status_code == 200:
+                htmlcontent = r.content.decode('utf-8')
+                # print(data[STRUCTURE_NUMBER][0])
+                try:
+                    data[STRUCTURE_NUMBER] = [{
+                        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
+
+            else:
+                print(f">> Error ({year}) {r.status_code}: {r.content}", file=sys.stderr)
+        
+        if i % 500 == 0:
+            with open(f"nbi_data-{i}.json", "w") as f:
+                json.dump(data, f, indent=2)
+
+    return data
+
+
+if __name__ == '__main__':
+    user_agent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36 Edg/130.0.0.0"
+    request_verification_token = 'CfDJ8M6CuWz5hhxGnmUVXw2yDHQlfeNDzVoF03IbAJ0p3LdaDW7poklPvy74ykYda-qwcrtUXD4rnNzn583Ug7PWbR9IlomGzQh1OQIw_pa9d5TNwdN5p77SDfIfz3yq1nWPzxemEn_8bbh7TGGK9FIwcRY' 
+    cookie = "_ga=GA1.1.478241025.1718907711; _ga_0623JYSC1Q=GS1.1.1718922743.2.0.1718922743.0.0.0; _ga_VW1SFWJKBB=GS1.1.1730789269.3.0.1730789272.0.0.0; _ga_CSLL4ZEK4L=GS1.1.1730789269.3.0.1730789272.0.0.0; _ga_NQ5ZN114SB=GS1.1.1730789269.3.0.1730789272.0.0.0; .AspNetCore.Session=CfDJ8M6CuWz5hhxGnmUVXw2yDHRQxNlIdqc8pBGKOJhMcHphMelhCyOQD7cnzYLVUWcsfCE8KOO8TNogarX5FbmvNQeSW1pTphWgR%2B6RLzPiUWuR4yPiDmb6rg82isfHqoEBhFoziXpFlU2o9pMgQICLsy7WbaeZbSgOl6FTg5Y0vLQ5; __RequestVerificationToken=CfDJ8M6CuWz5hhxGnmUVXw2yDHQXNjHWpjZ61I-CMSrl0yWsdWpCyt2QhUoeZ2L2aY0sqNpGy-wrD8ToMph6-wbfcRPpqORdlVci0ghxWu-3i4PCuWsiOkq90E1WupEYErSXnhsQVwHHGcD63WI7qyXZd7w; _ga_GNYE9X3V7H=GS1.1.1730825963.2.1.1730825988.0.0.0"
+
+    headers = {
+        'authority':       'infobridge.fhwa.dot.gov',
+        'origin':          'https://infobridge.fhwa.dot.gov',
+        'sec-fetch-site':  'same-origin',
+        'sec-fetch-mode':  'cors',
+        'accept-encoding': 'gzip, deflate, br',
+        'accept-language': 'en-US,en;q=0.9',
+
+        '__requestverificationtoken': request_verification_token,
+        'user-agent': user_agent,
+        'cookie': cookie
+    }
+
+    if len(sys.argv) == 1:
+            
+        headers.update({
+            'x-requested-with': 'XMLHttpRequest',
+            'content-type':     'application/json; charset=UTF-8',
+            'accept':           'application/json, text/javascript, */*; q=0.01',
+            'referer':          'https://infobridge.fhwa.dot.gov/Data',
+        })
+
+        bridgeTable = getBridgeList(headers, start_page=511, totalpages=808, pagesize=100)
+        print(json.dumps(bridgeTable, indent=2))
+        with open(f"nbi_codes-california-test.json","w") as f:
+        # with open(f"nbi_codes-california.json","w") as f:
+            json.dump(bridgeTable,f,indent=2)
+        sys.exit()
+
+    elif len(sys.argv) == 2:
+        headers.update({
+                'datatype':     'json',
+                'content-type': 'application/json; charset=UTF-8',
+                '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}
+            ]
+
+        # 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))
+        with open(f"nbi_data-california-test.json","w") as f:
+        # with open(f"nbi_data-california.json","w") as f:
+            json.dump(nbi_data,f,indent=2)
+
+    else:
+        arg1 = sys.argv[1]
+        args2 = iter(sys.argv[2:])
+
+        if arg1 in ["--help", "-h"]:
+            print(HELP)
+            sys.exit
+        else:     
+            headers.update({
+                'datatype':     'json',
+                'content-type': 'application/json; charset=UTF-8',
+                'accept':       'application/json, text/plain, */*'
+            })
+            bridgeTable = json.load(open(sys.argv[1]))
+            for arg in args2:
+                if arg in ["--help", "-h"]:
+                    print(HELP)
+                    sys.exit
+                elif arg in ["--filter-calid", "-fc"]:
+                    calid = next(args2)
+                    bridgeTable = [
+                        i for i in bridgeTable 
+                        if calid in i["STRUCTURE_NUMBER"]
+                    ]
+                    file_ending = calid
+                elif arg in ["--filter-list", "-fl"]:
+                    filename = next(args2)
+                    with open(filename, 'r') as file:
+                        # Check if this is dependent on a specific txt structure (currently 1 bridge/line)
+                        calid = [line.strip() for line in file]     
+                    # print(calid)
+                    bridgeTable = [
+                        i for i in bridgeTable 
+                        if any(j in i["STRUCTURE_NUMBER"] for j in calid)
+                    ]
+                    # print(bridgeTable)
+                    file_ending = Path(filename).name
+
+            # 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))
+
+            # TODO: remove this and replace with arg parsing
+            tab = ...
+
+            with open(f"{tab}_data-{file_ending}.json","w") as f:
+            # with open(f"nbi_data-california.json","w") as f:
+                json.dump(nbi_data,f,indent=2)
+