irie 0.0.4__py3-none-any.whl → 0.0.6__py3-none-any.whl

irie/apps/templates/prediction/asset-predictors.html

@@ -23,12 +23,12 @@ Claudio Perez, Summer 2023
 {% block content %}
 <h1><code>{{ asset.calid }}</code> Predictors</h1>
   <div class="py-4 align-right">
-    {% for predictor in predictor_types %}
-    {% include 'prediction/new-predictor.html' with predictor=predictor %}
-    {% endfor %}
-
     <a role="button" class="button btn btn-outline-white btn-gray-600 text-white"
-    href="/inventory/{{ asset.calid }}" class="me-1">Back to Structure Profile</a>
+    href="/inventory/{{ asset.calid }}" class="me-1">Back to Structure</a>
+
+    {% for runner in runners %}
+    {% include 'prediction/new-runner.html' with runner=runner form=form %}
+    {% endfor %}
 
     {% if False %}
     <a role="button" class="button btn btn-outline-primary" disabled
@@ -102,7 +102,7 @@ Claudio Perez, Summer 2023
     let editor = new JSONEditor(editor_elem, config)
 
     editor.on('change', function () {
-      element.querySelector('#input').value = JSON.stringify(editor.getValue())
+      element.querySelector('#editor-input').value = JSON.stringify(editor.getValue())
     })
   }
 </script>

irie/apps/templates/prediction/form-submission.html

@@ -12,8 +12,8 @@
                           <svg class="icon icon-xxs" 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="M3 12l2-2m0 0l7-7 7 7M5 10v10a1 1 0 001 1h3m10-11l2 2m-2-2v10a1 1 0 01-1 1h-3m-6 0a1 1 0 001-1v-4a1 1 0 011-1h2a1 1 0 011 1v4a1 1 0 001 1m-6 0h6"></path></svg>
                       </a>
                   </li>
-                  <li class="breadcrumb-item"><a href="{% url 'dashboard' %}">BRACE2</a></li>
-                  <li class="breadcrumb-item">Assets</li>
+                  <li class="breadcrumb-item"><a href="{% url 'dashboard' %}">BRACE<sup>2</sup></a></li>
+                  <li class="breadcrumb-item">Inventory</li>
                   <li class="breadcrumb-item active" aria-current="page">New Predictor</li>
               </ol>
           </nav>
@@ -54,7 +54,7 @@
     </p>
     <div class="form-group"></div>
     <form action="/docs/form-submission.html" method="get">
-        <input id="input" type="hidden" name="json">
+        <input id="input" type="hidden" name="type" value="{{ runner. }}">
         <div id='editor-container'></div>
         <input id="submit" class="btn btn-primary" width="100" type="submit">
     </form>

irie/apps/templates/prediction/hazus/event.html

@@ -0,0 +1,33 @@
+
+<table class="table table-hover">
+    <thead>
+      <tr>
+        <th>Damage State</th>
+        <th>Probability</th>
+      </tr>
+    </thead>
+    <tbody>
+      {% if hazus and hazus.probabilities %}
+        <tr>
+          <td>Slight</td>
+          <td>{{ hazus.probabilities.Slight|floatformat:2 }}</td>
+        </tr>
+        <tr>
+          <td>Moderate</td>
+          <td>{{ hazus.probabilities.Moderate|floatformat:2 }}</td>
+        </tr>
+        <tr>
+          <td>Extensive</td>
+          <td>{{ hazus.probabilities.Extensive|floatformat:2 }}</td>
+        </tr>
+        <tr>
+          <td>Complete</td>
+          <td>{{ hazus.probabilities.Complete|floatformat:2 }}</td>
+        </tr>
+      {% else %}
+        <tr>
+          <td colspan="2">No Hazus fragility data available.</td>
+        </tr>
+      {% endif %}
+    </tbody>
+  </table>

irie/apps/templates/prediction/hazus/history.html

@@ -0,0 +1 @@
+<div id="hazusPlot" data-hazus-x="{{ hazus.sa_range }}" data-hazus-curves="{{ hazus.curves }}"></div>

irie/apps/templates/prediction/hazus/history.js

@@ -0,0 +1,44 @@
+var layout = {
+	// title: {text: 'Hazus Fragility'},
+	uirevision:'true',
+	xaxis: {
+		title: {
+		  text: 'Spectral Acceleration (g)',
+		  font: {
+			//family: 'Courier New, monospace',
+			size: 18,
+			color: '#7f7f7f'
+		  }
+		},
+		autorange: true
+	  },
+	  yaxis: {
+		title: {
+		  text: 'Damage Probability',
+		  font: {
+			//family: 'Courier New, monospace',
+			size: 18,
+			color: '#7f7f7f'
+		  }
+		},
+		autorange: true
+	  }
+};
+
+Plotly.react('hazusPlot', data, layout);
+
+var elem = document.getElementById('hazusPlot');
+
+let curves = JSON.parse(elem.dataset.hazusCurves);
+
+var x = JSON.parse(elem.dataset.hazusX);
+
+// add random data to three line traces
+var data = [
+	{mode:'lines', line: {color: "#b55400"},  x: x, y: curves.Slight, name: "Slight"},
+	{mode: 'lines', line: {color: "#393e46"}, x: x, y: curves.Moderate, name: "Moderate"},
+	{mode: 'lines', line: {color: "#222831"}, x: x, y: curves.Extensive, name: "Extensive"},
+	{mode: 'lines', line: {color: "#222831"}, x: x, y: curves.Complete, name: "Complete"},
+]
+
+Plotly.react('hazusPlot', data, layout);

irie/apps/templates/prediction/{new-predictor.html → new-runner.html}

@@ -3,18 +3,18 @@
 <button type="button" 
         class="btn btn-outline-primary" 
         data-bs-toggle="modal"
-        data-bs-target="#{{predictor.name.lower}}Modal">
-  <span class="me-1">New {{predictor.title}}</span>
+        data-bs-target="#{{runner.name.lower}}Modal">
+  <span class="me-1">New {{runner.title}}</span>
 </button>
 
 <!-- Modal -->
-<div class="modal fade" id="{{predictor.name.lower}}Modal" tabindex="-1" 
-     aria-labelledby="{{predictor.name.lower}}ModalLabel" aria-hidden="true">
+<div class="modal fade" id="{{runner.name.lower}}Modal" tabindex="-1" 
+     aria-labelledby="{{runner.name.lower}}ModalLabel" aria-hidden="true">
   <div class="modal-dialog modal-xl">
     <div class="modal-content">
       <div class="modal-header">
         <span class="me-3">
-          <h3 class="modal-title" id="{{predictor.name.lower}}ModalLabel">New Predictor</h3> </span>
+          <h3 class="modal-title" id="{{runner.name.lower}}ModalLabel">New Predictor</h3> </span>
         <div class="d-flex justify-content-end align-items-center">
             <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
         </div>
@@ -42,10 +42,14 @@
             {% endcomment %}
 
             <div class="form-group"></div>
-            <form id="{{predictor.name}}" action="./" method="post" >
+            <form id="{{runner.name}}" action="./" method="post" >
               {% csrf_token %}
-              <input id="input" type="hidden" name="json">
-              <div id="{{predictor.name}}-editor" data-schema="{{predictor.schema}}" ></div>
+              {# form.as_p #}
+              <input id="editor-input" type="hidden" name="json">
+              <div id="{{runner.name}}-editor" 
+                   data-schema="{{runner.schema}}" 
+                   data-protocol="{{ runner.protocol }}">
+              </div>
               <input id="submit" class="btn btn-primary" width="100" type="submit">
             </form>
             <br>

irie/apps/templates/site/index.html

@@ -200,9 +200,8 @@ td.left-text{vertical-align:middle}
         <div class="row justify-content-between align-items-center mb-5 mb-lg-7">
           <div class="row justify-content-between align-items-center">
             <div class="col-lg-5 order-lg-2 mb-5 mb-lg-0">
-              <h2 class="h1">Hazard Analysis</h2>
-              <p class="mb-4 lead fw-bold">High Fidelity Modeling</p>
-              <p class="mb-4">BRACE2 integrates state of the art modeling software</p>
+              <h2 class="h1">Health Diagnosis</h2>
+              <p class="mb-4">...</p>
               <a
                 href="" target="_blank"
                 class="btn btn-outline-gray-600 d-inline-flex align-items-center"><svg class="icon icon-xs me-2"
@@ -216,11 +215,8 @@ td.left-text{vertical-align:middle}
                  alt="Front pages overview"></div>
           </div>
           <div class="col-lg-5 mb-5 mb-lg-0">
-            <h2 class="h1 d-flex align-items-center">Events <span
-                class="badge-md ms-3 mb-0 fs-6 badge rounded-pill text-dark bg-secondary">Pro</span></h2>
-            <p class="mb-4 lead fw-bold">Advanced FullCalendar.js integration</p>
-            <p class="mb-4">We created a fully editable calendar where you can add, edit and delete events for your
-              admin dashboard.</p><a href="" target="_blank"
+            <h2 class="h1 d-flex align-items-center">Sensor Integration</h2>
+            <p class="mb-4">.</p><a href="" target="_blank"
               class="btn btn-secondary d-inline-flex align-items-center me-3"><svg class="icon icon-xs me-2"
                 fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
                 <path
@@ -229,55 +225,41 @@ td.left-text{vertical-align:middle}
               </svg> Demo
             </a>
           </div>
-          <div class="col-lg-6"><img src="{{ ASSETS_ROOT}}/img/earthquake-hazard.png" alt="Kanban Preview"></div>
+          <div class="col-lg-6"><img src="{{ ASSETS_ROOT}}/img/earthquake-hazard.png" alt="Sensor Preview"></div>
         </div>
         <div class="row justify-content-between align-items-center mb-5 mb-lg-7">
+          <div class="row justify-content-between align-items-center">
+            <div class="col-lg-5 order-lg-2 mb-5 mb-lg-0">
+              <h2 class="h1">Digital Twins</h2>
+              <p class="mb-4">BRACE<sup>2</sup> integrates state of the art modeling software</p>
+              <a
+                href="" target="_blank"
+                class="btn btn-outline-gray-600 d-inline-flex align-items-center"><svg class="icon icon-xs me-2"
+                  fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
+                  <path
+                    d="M9 4.804A7.968 7.968 0 005.5 4c-1.255 0-2.443.29-3.5.804v10A7.969 7.969 0 015.5 14c1.669 0 3.218.51 4.5 1.385A7.962 7.962 0 0114.5 14c1.255 0 2.443.29 3.5.804v-10A7.968 7.968 0 0014.5 4c-1.255 0-2.443.29-3.5.804V12a1 1 0 11-2 0V4.804z">
+                  </path>
+                </svg> Getting started</a>
+            </div>
+            <div class="col-lg-6 order-lg-1"><img src="{{ ASSETS_ROOT }}/img/metric.png"
+                 alt="Digital twins"></div>
+          </div>
           <div class="col-lg-5 order-lg-2 mb-5 mb-lg-0">
-            <h2 class="h1 d-flex align-items-center">Corridors <span
-                class="badge-md ms-3 mb-0 fs-6 badge rounded-pill text-dark bg-secondary">Pro</span></h2>
-            <p class="mb-4 lead fw-bold">Markers and cards integration with Leaflet.js</p>
-            <p class="mb-4">You can use this map to add markers with custom cards and show them on a map using our
-              custom MapBox integration with Leaflet.js</p>
-              <a href=""
-                 target="_blank" 
-                 class="btn btn-secondary d-inline-flex align-items-center me-3"><svg
-                    class="icon icon-xs me-2" fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
-                      <path fill-rule="evenodd"
-                        d="M12 1.586l-4 4v12.828l4-4V1.586zM3.707 3.293A1 1 0 002 4v10a1 1 0 00.293.707L6 18.414V5.586L3.707 3.293zM17.707 5.293L14 1.586v12.828l2.293 2.293A1 1 0 0018 16V6a1 1 0 00-.293-.707z"
-                        clip-rule="evenodd"></path>
-              </svg> Demo </a><a href="https://themesberg.com/docs/volt-bootstrap-5-dashboard/plugins/mapbox/"
+            <h2 class="h1 d-flex align-items-center"> Corridors<span
+                class="badge-md mb-0 fs-6 badge ms-3 rounded-pill text-dark bg-secondary">New</span></h2>
+            <p class="mb-4">Corridor-level health analysis and recovery planning</p>
+              <a href="https://dot.ca.gov/-/media/dot-media/programs/research-innovation-system-information/documents/research-notes/task3798-rns-05-24-a11y.pdf"
                 target="_blank" class="btn btn-outline-gray-600 d-inline-flex align-items-center"><svg
                 class="icon icon-xs me-2" fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
                 <path fill-rule="evenodd"
                   d="M18 10a8 8 0 11-16 0 8 8 0 0116 0zm-8-3a1 1 0 00-.867.5 1 1 0 11-1.731-1A3 3 0 0113 8a3.001 3.001 0 01-2 2.83V11a1 1 0 11-2 0v-1a1 1 0 011-1 1 1 0 100-2zm0 8a1 1 0 100-2 1 1 0 000 2z"
                   clip-rule="evenodd"></path>
-              </svg> Guide</a>
+              </svg> Read More</a>
           </div>
           <div class="col-lg-6 order-lg-1"><img src="./assets/img/mockup-map-presentation.png"
-              alt="MapBox Leaflet.js Custom Integration Mockup"></div>
-        </div>
-        <div class="row justify-content-between align-items-center mb-5 mb-lg-7">
-          <div class="col-lg-5 mb-5 mb-lg-0">
-            <h2 class="h1 d-flex align-items-center">Calendar <span
-                class="badge-md ms-3 mb-0 fs-6 badge rounded-pill text-dark bg-secondary">Pro</span></h2>
-            <p class="mb-4 lead fw-bold">Advanced FullCalendar.js integration</p>
-            <p class="mb-4">We created a fully editable calendar where you can add, edit and delete events for your
-              admin dashboard.</p><a href="https://demo.themesberg.com/volt-pro/pages/calendar.html" target="_blank"
-              class="btn btn-secondary d-inline-flex align-items-center me-3"><svg class="icon icon-xs me-2"
-                fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
-                <path fill-rule="evenodd"
-                  d="M6 2a1 1 0 00-1 1v1H4a2 2 0 00-2 2v10a2 2 0 002 2h12a2 2 0 002-2V6a2 2 0 00-2-2h-1V3a1 1 0 10-2 0v1H7V3a1 1 0 00-1-1zm0 5a1 1 0 000 2h8a1 1 0 100-2H6z"
-                  clip-rule="evenodd"></path>
-              </svg> Demo </a><a href="https://themesberg.com/docs/volt-bootstrap-5-dashboard/plugins/calendar/"
-              target="_blank" class="btn btn-outline-gray-600 d-inline-flex align-items-center"><svg
-                class="icon icon-xs me-2" fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
-                <path fill-rule="evenodd"
-                  d="M18 10a8 8 0 11-16 0 8 8 0 0116 0zm-8-3a1 1 0 00-.867.5 1 1 0 11-1.731-1A3 3 0 0113 8a3.001 3.001 0 01-2 2.83V11a1 1 0 11-2 0v-1a1 1 0 011-1 1 1 0 100-2zm0 8a1 1 0 100-2 1 1 0 000 2z"
-                  clip-rule="evenodd"></path>
-              </svg> Guide</a>
-          </div>
-          <div class="col-lg-6"><img src="./assets/img/mockup-calendar-presentation.png" alt="Calendar Preview"></div>
+              alt="Corridors"></div>
         </div>
+
       </div>
       <figure class="position-absolute bottom-0 left-0 w-100 d-none d-md-block mb-n2">
         <svg class="home-pattern" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 3000 185.4"><path d="M3000,0v185.4H0V0c496.4,115.6,996.4,173.4,1500,173.4S2503.6,115.6,3000,0z"></path></svg></figure>       
@@ -286,7 +268,7 @@ td.left-text{vertical-align:middle}
     <div class="container align-items-center">
       <h1 class=tabs-title>Ecosystem</h1>
       <div class=uikit-tab-wrapper>
-            <p>The BRACE<sup>2</sup> Ecosystem</p>
+            <p>The <em>BRACE</em><sup>2</sup> Ecosystem</p>
             <table>
               {% if False %}
               <tr class=highlight-th>

irie/core/urls.py

@@ -7,7 +7,8 @@
 #   Fall 2022
 #
 #----------------------------------------------------------------------------#
-
+from django.conf import settings
+from django.conf.urls.static import static
 from django.contrib import admin
 from django.urls import path, include
 
@@ -36,4 +37,8 @@ urlpatterns = [
 
     # Leave `site.urls` as last the last line
     path("", include("irie.apps.site.urls"))
-]
+
+
+# Ensure we can serve files stored with models (eg, bridge renderings)
+] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
+

irie/init/__main__.py

@@ -24,6 +24,8 @@ def init(settings):
 
     call_command("init_corridors")
 
+    call_command("init_predictors")
+
 
 
 if __name__ == "__main__":

irie/init/bridges.py

@@ -2,6 +2,7 @@
 # - add descriptions
 import sys
 from math import pi
+from pathlib import Path
 
 r = 12
 no=190
@@ -949,7 +950,7 @@ BRIDGES = {
             {
                 "name": f"Linear",
                 "metrics": [*LINEAR_METRICS],
-                "protocol": "BRACE2_CLI_PREDICTOR_V1",
+                "protocol": "IRIE_PREDICTOR_V1",
                 "entry_point": [PYTHON, "-mCE58658", f"Procedures/linear.tcl"],
                 "platform": "OpenSees",
                 "active": False,
@@ -958,11 +959,12 @@ BRIDGES = {
             {
                 "name": f"OpenSees",
                 "metrics": [*LINEAR_METRICS, *NONLINEAR_METRICS],
-                "protocol": "BRACE2_CLI_PREDICTOR_V1",
+                "protocol": "IRIE_PREDICTOR_T4",
                 "entry_point": [PYTHON, "-mCE58658", f"Procedures/nonlinear.tcl"],
                 "platform": "OpenSees",
                 "active": False,
-                "config": CE58658
+                "config": CE58658,
+                "model_file": Path(__file__).parents[0]/"hayward.zip"
             },
             {
                 "name": "SRIM_tran", "description": "Transverse configuration.", "protocol": "", "metrics": ["SPECTRAL_SHIFT_IDENTIFICATION"],"entry_point": [PYTHON, "-m", "mdof", "srim"],

irie/init/management/commands/init_assets.py

@@ -6,10 +6,11 @@ import lzma
 import tarfile
 from pathlib import Path
 from django.core.management.base import BaseCommand
+import json
 try:
-    import orjson as json
+    import orjson
 except ImportError:
-    import json
+    import json as orjson
 
 DATA = Path(irie.__file__).parents[0]/"init"/"data"
 
@@ -17,9 +18,8 @@ with open(DATA/"cgs_data.json") as f:
     CGS_DATA = json.loads(f.read())
 
 
-
 from collections import defaultdict
-from irie.apps.inventory.models  import Asset, Corridor
+from irie.apps.inventory.models  import Asset
 from irie.init.calid   import CALID, CESMD
 from irie.init.bridges import BRIDGES
 
@@ -49,8 +49,6 @@ SKIP_DESIGN = {
 
 
 def load_assets(NBI_DATA):
-#   with open(NBI_FILE) as f:
-#       NBI_DATA = json.loads(f.read())
 
     def find_bridge(bridges, calid):
         for bridge in bridges.values():
@@ -79,7 +77,7 @@ def load_assets(NBI_DATA):
         return not (
             (
                 get_route(bridge) in routes
-                and bridge["NBI_BRIDGE"]["Highway Agency District"] in DISTRICTS
+#               and bridge["NBI_BRIDGE"]["Highway Agency District"] in DISTRICTS
 #               and bridge["NBI_POSTING_STATUS"]["Structure Operational Status Code"] == "A - Open"
             ) or (
                 bridge["NBI_BRIDGE"]["Highway Agency District"] in DISTRICTS
@@ -101,15 +99,14 @@ def load_assets(NBI_DATA):
 # 1. Collect routes of interest
     ROUTES = set()
     for bridge in BRIDGES.values():
-        nbi = get_nbi(bridge["calid"].split(" ")[0].replace("-", " "), missing_ok=True)
+        calid = bridge["calid"].split(" ")[0].replace("-", " ")
+        nbi = get_nbi(calid, missing_ok=True)
         if nbi is not None:
             ROUTES.add(get_route(nbi))
 
 
     count = 0
 
-#   CORRIDORS = defaultdict(set)
-
     for item in NBI_DATA:
         calid  = item.replace(" ", "-")
         nbi    = get_nbi(item)
@@ -122,14 +119,6 @@ def load_assets(NBI_DATA):
             print("Failed to skip ", calid)
             continue
 
-        count += 1
-#       print(calid, f"({cesmd = })")
-
-        cname = get_route(nbi)
-
-#       CORRIDORS[cname].add(calid)
-
-
         if DRY:
             continue
 
@@ -144,7 +133,7 @@ def load_assets(NBI_DATA):
 
 #               print(">> Saved ", calid, f"({cesmd = })")
 
-        except:
+        except Asset.DoesNotExist:
             if nbi is None:
                 print(">> Skipping ", calid)
                 continue
@@ -156,38 +145,33 @@ def load_assets(NBI_DATA):
                       cgs_data = CGS_DATA.get(cesmd, {}),
                       nbi_data = nbi,
                       is_complete=False)
-            asset.save()
             print(asset)
 
-        continue
-
-
-        try:
-            corridor = Corridor.objects.get(name=cname)
-            corridor.save()
-            print(">> Saved ", cname)
-            continue
+            count += 1
 
-        except:
-            corridor = Corridor(name=cname)
-            corridor.save()
-            print(corridor)
+        if config:
+            asset.bridge_sensors = json.dumps(config["accelerometers"]["bridge_channels"])
+            asset.ground_sensors = json.dumps(config["accelerometers"]["ground_channels"])
 
-        corridor.assets.add(asset)
+        asset.save()
 
-        del nbi
+        continue
 
     print(f"Created {count} of {len(NBI_DATA)} assets")
 
-#   print(f"Created {len(CORRIDORS)} corridors")
-
 
 class Command(BaseCommand):
     help = 'Description of what script_1 does'
 
     def handle(self, *args, **kwargs):
-        # Open the tar file
-        with tarfile.open(DATA/"04.tar", "r") as tar:
+
+        # Load assets outside of district 4
+        with open(DATA/"nbi_data-california.json") as f:
+            load_assets(json.load(f)) 
+
+
+        # Open the district tar file 
+        with tarfile.open(DATA/"nbi"/"04.tar", "r") as tar:
             # Iterate through each file in the tar archive
             for member in tar.getmembers():
                 # Process only .xz files
@@ -205,15 +189,10 @@ class Command(BaseCommand):
                     with lzma.LZMAFile(xz_file) as decompressed_file:
                         # Load the JSON content
                         try:
-                            data = json.loads(decompressed_file.read())
+                            data = orjson.loads(decompressed_file.read())
                             load_assets(data)
 
-                        except json.JSONDecodeError as e:
+                        except orjson.JSONDecodeError as e:
                             print(f"Failed to parse JSON in {member.name}: {e}")
 
 
-
-#       NBI_FILE = data/"nbi_data-california.json" # os.environ.get("IRIE_INIT_ASSETS") # "data/nbi/04.json" #"nbi_data-500.json" # "data/nbi_data-california.json" # "data/nbi-california-2024.json" #  
-
-
-

irie/init/management/commands/init_corridors.py

@@ -10,21 +10,19 @@ which takes in corridor_line.geojson and soga_corridors.csv
 """
 
 import sys
-import csv
 import json
 from pathlib import Path
-from collections import defaultdict
 
 import irie
-from irie.apps.inventory.models   import Asset, Corridor
+from irie.apps.inventory.models  import Asset, Corridor
 
 from django.core.management.base import BaseCommand
-data = Path(irie.__file__).parents[0]/"init"/"data"/"networks"
+DATA = Path(irie.__file__).parents[0]/"init"/"data"/"networks"
 
 class Command(BaseCommand):
 
     def handle(self, *args, **kwargs):
-        with open(data/"soga_corridors.json") as f:
+        with open(DATA/"soga_corridors.json") as f:
             corridors = json.load(f)
 
         for cdata in corridors:
@@ -39,7 +37,6 @@ class Command(BaseCommand):
             corridor.save()
 
             for calid in cdata["bridges"]:
-                # corridor.assets.add(Asset.objects.get(calid=calid))
                 try:
                     corridor.assets.add(Asset.objects.get(calid=calid))
                     print(f"Added {calid} to {corridor.name}")

irie/init/management/commands/init_predictors.py

@@ -1,22 +1,35 @@
 """
 Assets must already be created
 """
-import json
-from pathlib import Path
 from django.core.management.base import BaseCommand
+from django.core.files.temp import NamedTemporaryFile
+from django.core.files import File
 
 from irie.apps.inventory.models import Asset
 from irie.apps.prediction.models  import PredictorModel
 from irie.init.bridges import BRIDGES
 
+
+def _create_file(path):
+    temp_file = NamedTemporaryFile(delete=True)
+    with open(path, "rb") as f:
+        temp_file.write(f.read())
+    temp_file.flush()
+    return File(temp_file, name="model.zip")
+
+
 class Command(BaseCommand):
     def handle(self, *args, **kwargs):
         for bridge in BRIDGES.values():
             print(bridge["cesmd"])
+            try:
+                asset = Asset.objects.get(cesmd=bridge["cesmd"])
+            except Asset.DoesNotExist:
+                continue
+
             for conf in bridge.get("predictors", []):
                 print(">> ", conf["name"])
                 try:
-                    "a" + 1
                     pred = PredictorModel.objects.get(cesmd=bridge["cesmd"])
                     pred.config = conf["config"]
                     pred.name   = conf["name"]
@@ -31,19 +44,21 @@ class Command(BaseCommand):
                         if str(type) == conf["protocol"]:
                             protocol = type
 
-#           if protocol is None:
-#               raise ValueError(f"Unknown predictor protocol: {conf['protocol']}")
                     config = conf.get("config", {})
 
-                    a = PredictorModel(asset  = Asset.objects.get(cesmd=bridge["cesmd"]),
+                    a = PredictorModel(asset  = asset,
                                        name   = conf["name"],
                                        entry_point   = conf["entry_point"],
                                        config = config,
                                        description = conf.get("description", ""),
-                                       active = True,
+                                       active = conf.get("active", True),
                                        metrics = list(conf.get("metrics", [])),
                                        protocol = protocol
-                                       )
+                        )
+
+                    if "model_file" in conf:
+                        a.config_file.save("model.zip", _create_file(conf["model_file"]))
+
                     a.save()
                     print(a)