irie 0.0.16__py3-none-any.whl → 0.0.17__py3-none-any.whl

irie/apps/prediction/runners/opensees/__init__.py

@@ -11,7 +11,7 @@ import zipfile
 from pathlib import Path
 import contextlib
 
-from irie.apps.prediction.runners import (Runner, MetricType, RunID, classproperty)
+from irie.apps.prediction.runners import (Runner, RunID, classproperty)
 
 from .utilities import read_model
 from .metrics import (
@@ -29,7 +29,6 @@ OPENSEES = [
 @contextlib.contextmanager
 def new_cd(x):
     d = os.getcwd()
-
     # This could raise an exception, but it's probably
     # best to let it propagate and let the caller
     # deal with it, since they requested x
@@ -52,19 +51,28 @@ class OpenSeesRunner(Runner):
 
 
     @classmethod
-    def create(cls, asset, request, form):
-        predictor = form.save(commit=False)
-
-        predictor.entry_point = [
-            sys.executable, "-m", "opensees"
-        ]
-        predictor.config = {}
+    def create(cls, asset, request):
+        from irie.apps.prediction.models import PredictorModel
+        predictor = PredictorModel()
+        data = json.loads(request.body)
+        # TODO
+        data.pop("file")
+        uploaded_file = request.FILES.get('config_file', None)
+        print(uploaded_file)
+        if uploaded_file:
+
+            with open(uploaded_file.name, 'wb+') as destination:
+                for chunk in uploaded_file.chunks():
+                    destination.write(chunk)
+        
+        # predictor.config_file = uploaded_file # data.pop("file")
+        predictor.name = data.pop("name")
+        predictor.config = data
+        predictor.asset = asset
         predictor.protocol = "IRIE_PREDICTOR_T4"
         predictor.active = True
-        # predictor.metrics = self.getMetricList()
         return predictor
 
-
     @classproperty
     def schema(cls):
         from . import schemas
@@ -491,3 +499,72 @@ class OpenSeesRunner(Runner):
             return {}
         return {}
 
+
+import subprocess 
+class Event: pass 
+
+class PredictorType1(Runner):
+    @property
+    def platform(self):
+        return self.conf.get("platform", "")
+
+    @classmethod
+    def create(cls, asset, request):
+        from irie.apps.prediction.models import PredictorModel
+        predictor = PredictorModel()
+        data = json.loads(request.data.get("json"))
+        predictor.entry_point = [
+            sys.executable, "-m", "opensees"
+        ]
+        data["metrics"] = []
+
+        predictor.name = data.pop("name")
+        predictor.config = data
+        predictor.asset = asset
+        predictor.protocol = "IRIE_PREDICTOR_T1"
+        predictor.active = False
+        return predictor
+
+
+    @classproperty
+    def schema(cls):
+        from irie.apps.prediction.runners.opensees import schemas
+        return {
+            "title": "Structural Model",
+            "options": {"disable_collaps": True},
+            "schema": "http://json-schema.org/draft-04/schema#",
+            "type": "object",
+            "properties": {
+                "platform": {
+                  "type": "string",
+                  "title": "Platform",
+                  "enum": ["OpenSees","CSiBridge"]
+                },
+                "model":    schemas.load("hwd_conf.schema.json"),
+                "analysis": schemas.load("hwd_analysis.schema.json"),
+            }
+        }
+
+    def newPrediction(self, event: Event) -> RunID:
+        self.event = event
+        event_file = Path(event.event_file.path).resolve()
+        command = [*self.entry_point, "new", event_file]
+        run_id = subprocess.check_output(command).decode().strip()
+        return RunID(int(run_id))
+
+    def runPrediction(self, run_id: RunID):
+        command = [*self.entry_point, "run", str(run_id)]
+
+        if "scale" in self.event.upload_data:
+            command.extend(["--scale", str(float(self.event.upload_data["scale"]))])
+        print(":: Running ", command, file=sys.stderr)
+        subprocess.check_output(command)
+
+        print(f":: Model {self.name} returned", file=sys.stderr)
+        return
+
+    def getMetricData(self, run, metric):
+        try:
+            return json.loads(subprocess.check_output([*self.entry_point, "get", str(run), metric]).decode())
+        except json.decoder.JSONDecodeError:
+            return {}

irie/apps/prediction/runners/ssid.py

@@ -1,3 +1,7 @@
+from irie.apps.events.models import EventRecord
+from irie.apps.prediction.runners import Runner, RunID
+from irie.apps.prediction.models import PredictorModel
+
 from pathlib import Path
 import json
 import io 
@@ -12,6 +16,7 @@ from mdof import transform
 from scipy.signal import find_peaks
 from mdof.utilities import Config, extract_channels
 from matplotlib import colormaps
+import subprocess
 # try:
 #     import scienceplots
 #     plt.style.use(["science"])
@@ -22,7 +27,155 @@ N_PEAKS = 5 # number of "significant" peaks per record
 MISSING_CHANNEL_LIMIT = 3 # number of missing output channels allowed before skipping event
 MAX_ACCEL = 3.0
 
-from irie.apps.events.models import EventRecord
+
+class SystemIdRunner(Runner):
+    platform = "mdof"
+
+    schema = {
+      "title": "System ID",
+      "name": "P2",
+      "type": "object",
+      "required": [
+        "name",
+        "decimation",
+        "method",
+        "channels"
+      ],
+      "properties": {
+        "name": {
+          "type": "string",
+          "title": "Name",
+          "description": "Predictor name",
+          "minLength": 2,
+          # "default": "S1"
+        },
+        "method": {
+          "type": "string",
+          "title": "Method",
+          "enum": ["Fourier Spectrum","Response Spectrum","SRIM","OKID"]
+        },
+        "decimation": {
+          "type": "integer",
+          "title": "Decimation",
+          "default": 1,
+          "minimum": 1,
+          "maximum": 8
+        },
+        "order": {
+          "type": "integer",
+          "title": "Model Order",
+          "default": 8,
+          "minimum": 2,
+          "maximum": 64,
+          "options": {"dependencies": {"method": ["SRIM","OKID"]}}
+        },
+        "horizon": {
+          "type": "integer",
+          "title": "Prediction Horizon",
+          "default": 100,
+          "minimum": 50,
+          "maximum": 500,
+          "options": {"dependencies": {"method": ["SRIM"]}}
+        },
+        "period_band": {
+          "type": "string",
+          "title": "Period Band",
+          "default": "[0.1,2.3]",
+          "options": {"dependencies": {"method": ["Fourier Spectrum"]}},
+          "description": "[0.1,2.3] if interested in periods between 0.1 seconds and 2.3 seconds"
+        },
+        "damping": {
+          "type": "float",
+          "title": "Damping",
+          "default": 0.02,
+          "options": {"dependencies": {"method": ["Response Spectrum"]}},
+          "description": "assumed damping ratio"
+        },
+        "channels": {
+          "type": "array",
+          "format": "table",
+          "title": "Channels",
+          "uniqueItems": True,
+          "items": {
+            "title": "Acceleration",
+            "type": "object",
+            "properties": {
+              "type": {
+                "type": "string",
+                "enum": ["output","input"],
+                "default": "output"
+              },
+              "id": {"type": "integer", "description": "Number identifying signal channel"}
+            }
+          },
+          "default": [{"type": "output", "id": 1}]
+        }
+      }
+    }
+
+    def render(self):
+        try:
+          return make_mountains(self.asset, self.conf)
+        except:
+            return None
+
+    @classmethod
+    def create(cls, asset, request):
+        predictor = PredictorModel()
+        data = json.loads(request.body)
+        method = {
+                "Fourier Spectrum": "fourier",
+                "Response Spectrum": "response",
+                "FDD": "fdd",
+                "OKID": "okid-era",
+                "SRIM": "srim"
+        }[data.pop("method")]
+
+        predictor.entry_point = [
+                sys.executable, "-m", "mdof", method
+        ]
+        data["outputs"] = [i["id"] for i in data["channels"] if i["type"] == "output"]
+        data["inputs"]  = [i["id"] for i in data["channels"] if i["type"] == "input"]
+        data["threads"] = 4
+        data["metrics"] = ["SPECTRAL_SHIFT_IDENTIFICATION"]
+        del data["channels"]
+
+        predictor.name = data.pop("name")
+        predictor.config = data
+        predictor.asset = asset
+        predictor.protocol = "IRIE_PREDICTOR_T2"
+        predictor.active = True
+        return predictor
+
+
+    def newPrediction(self, event):
+        self.event = event
+        return RunID(1)
+
+    def runPrediction(self, run_id: RunID) -> bool:
+        event_file = Path(self.event.event_file.path).resolve()
+        command = [*self.entry_point,
+                   "--config", 
+                   json.dumps(self.conf),
+                   event_file]
+
+        if False:
+            command = [*self.entry_point,
+                       event_file,
+                       *map(str, self.conf.get("argv", []))]
+        try:
+            self.metric_data = json.loads(
+                subprocess.check_output(command).decode()
+            )
+            return True
+        except Exception as e:
+            self.metric_data = {"error": str(e)}
+            return False
+
+    def getMetricData(self, run, metric):
+        if not hasattr(self, "metric_data"):
+            raise Exception(f"Error {self.name}({id(self)}), {run}")
+        return self.metric_data
 
 
 
@@ -186,12 +339,14 @@ def _load_events(asset, output_channels):
     return {k:v for k,v in events}
 
 
-def get_spectra(event, period_band, cmap):
+def _get_spectra(event, conf, cmap):
     """
     Get coordinates (periods, amplitudes) of spectra for an event, and return them along
     with the maximum period of the N_PEAKS tallest peaks, as well as plotting options
     such as color and alpha.
     """
+    period_band = conf.period_band
+
     n_outputs = event['outputs'].shape[0]
     frequencies,_,S = transform.fdd(outputs=event['outputs'], step=event['dt']) # Full frequency spectrum
     periods = 1/frequencies
@@ -309,14 +464,18 @@ def _plot_mountains(spectra, accellim=None):
     return fig
 
 
-def make_mountains(asset, output_channels=None):
+def make_mountains(asset, conf=None, output_channels=None):
 
     cmap = colormaps['plasma']
-    conf = Config()
-    conf.period_band = (0.1,3)
-    conf.damping = 0.02
-    conf.ss_decimation = 8
-    conf.order = 40
+    if conf is None:
+        conf = Config()
+        conf.period_band = (0.1,3)
+        conf.damping = 0.02
+        conf.ss_decimation = 8
+        conf.order = 40
+        conf.method = "fdd"
+    else:
+        conf = Config(**conf)
 
     if output_channels is None:
         if not asset.bridge_sensors:
@@ -333,7 +492,7 @@ def make_mountains(asset, output_channels=None):
             print(f"Missing {n_expected_outputs-n_parsed_channels} output channels; skipping event") # Missing too many channels
             continue
 
-        spectra[filename] = get_spectra(event, conf.period_band, cmap) # {'spec_coords':spec_coords, 'max_peak_period':max_peak_period, 'plot_conf':plot_conf}
+        spectra[filename] = _get_spectra(event, conf, cmap) # {'spec_coords':spec_coords, 'max_peak_period':max_peak_period, 'plot_conf':plot_conf}
 
 
     # if station == 'CE89494':

irie/apps/prediction/urls.py

@@ -12,8 +12,7 @@ from .views import new_prediction, asset_predictors, predictor_profile, predicto
 
 urlpatterns = [
     re_path("^inventory/[0-9 A-Z-]*/predictors/new",   new_prediction),
-    re_path("^inventory/[0-9 A-Z-]*/predictors/[0-9]", predictor_profile),
-    re_path("^inventory/(?P<calid>[0-9 A-Z-]*)/predictors/create/", predictor_upload),
-    re_path("^inventory/[0-9 A-Z-]*/predictors/",      asset_predictors, name="asset_predictors"),
-    re_path("^inventory/[0-9 A-Z-]*/predictors/",      asset_predictors),
+    re_path("^inventory/(?P<calid>[0-9 A-Z-]*)/predictors/(?P<preid>[0-9 A-Z-]{1,})", predictor_profile),
+    re_path("^inventory/(?P<calid>[0-9 A-Z-]*)/predictors/create", predictor_upload),
+    re_path("^inventory/[0-9 A-Z-]*/predictors/",      asset_predictors, name="asset_predictors")
 ]

irie/apps/prediction/views.py

@@ -19,9 +19,6 @@ from django.core.exceptions import ObjectDoesNotExist
 
 from django.shortcuts import render
 
-from rest_framework.decorators import api_view, permission_classes
-from rest_framework.permissions import IsAuthenticated
-
 from irie.apps.site.view_utils import raise404
 from irie.apps.inventory.models import Asset
 from irie.apps.prediction.predictor import PREDICTOR_TYPES, OpenSeesRunner
@@ -38,41 +35,7 @@ def new_prediction(request):
     return HttpResponse(html_template.render(context, request))
 
 
-#@login_required(login_url="/login/")
-@api_view(["GET", "POST", "PUT"])
-@permission_classes([IsAuthenticated])
-def predictor_api(request):
-
-    context = {"segment": "assets"}
-
-    context["predictor_types"] = list(reversed([
-           {"schema": json.dumps(cls.schema),
-            "name":   cls.__name__,
-            "title":  cls.schema["title"]}
-            for cls in set(PREDICTOR_TYPES.values())
-    ]))
-
-    calid = request.path.split("/")[-3]
-
-    try:
-        context["asset"] = Asset.objects.get(calid=calid)
-
-    except:
-        return HttpResponse(
-                loader.get_template("site/page-404-sidebar.html").render(context, request)
-               )
-
-    if request.method == "POST":
-        print(request.POST)
-        PREDICTOR_TYPES["IRIE_PREDICTOR_T2"].create(context["asset"],request).save()
-
-    html_template = loader.get_template("prediction/asset-predictors.html")
-    return HttpResponse(html_template.render(context, request))
-
-
-@api_view(["GET", "POST", "PUT"])
-# @login_required(login_url="/login/")
-@permission_classes([IsAuthenticated])
+@login_required(login_url="/login/")
 def asset_predictors(request):
 
     calid = request.path.split("/")[-3]
@@ -97,45 +60,17 @@ def asset_predictors(request):
                 loader.get_template("site/page-404-sidebar.html").render(context, request)
                )
 
-    if request.method == "POST":
-        form = PredictorForm(request.POST, request.FILES)
-        if form.is_valid():
-            # Process the form data and uploaded file
-            # asset = form.cleaned_data['asset']
-            asset = Asset.objects.get(calid=calid)
-            uploaded_file = request.FILES['config_file']
-
-            if uploaded_file:
-                with open(uploaded_file.name, 'wb+') as destination:
-                    for chunk in uploaded_file.chunks():
-                        destination.write(chunk)
-
-            # Save the predictor
-            if request.POST.get("runner", None) == "IRIE_PREDICTOR_T2":
-                PREDICTOR_TYPES["IRIE_PREDICTOR_T2"].create(context["asset"],request).save()
-            else: 
-                OpenSeesRunner.create(asset,None,form).save()
-    else:
-        context["form"] = PredictorForm()
-
     html_template = loader.get_template("prediction/asset-predictors.html")
     return HttpResponse(html_template.render(context, request))
 
 
 @login_required(login_url="/login/")
-def predictor_profile(request):
+def predictor_profile(request, calid, preid):
 
     context = {}
     html_template = loader.get_template("prediction/predictor-profile.html")
     context["segment"] = "inventory"
 
-    url_segs = request.path.split("/")
-    if len(url_segs) < 5:
-        return raise404(request, context)
-    else:
-        calid = url_segs[2]
-        preid = url_segs[4]
-
     try:
         asset = Asset.objects.get(calid=calid)
     except Asset.DoesNotExist:
@@ -149,7 +84,6 @@ def predictor_profile(request):
     context["asset"] = asset
     context["predictor"] = PREDICTOR_TYPES[predictor.protocol](predictor)
 
-
     try:
         return HttpResponse(html_template.render(context, request))
 
@@ -167,29 +101,19 @@ def predictor_profile(request):
 @login_required(login_url="/login/")
 def predictor_upload(request, calid):
 
-    context = {}
     html_template = loader.get_template("prediction/predictor-upload.html")
-    context["segment"] = "assets"
 
     if request.method == 'POST':
         form = PredictorForm(request.POST, request.FILES)  # include request.FILES
-        if form.is_valid():
-            # Process the form data and uploaded file
-            # asset = form.cleaned_data['asset']
-            asset = Asset.objects.get(calid=calid)
-            uploaded_file = request.FILES['config_file']
-
-            with open(uploaded_file.name, 'wb+') as destination:
-                for chunk in uploaded_file.chunks():
-                    destination.write(chunk)
+        # if form.is_valid():
+        asset = Asset.objects.get(calid=calid)
 
-            # Save the predictor
-            OpenSeesRunner.create(asset,None,form).save()
+        # Save the predictor
+        predictor = PREDICTOR_TYPES[request.POST.get("runner")].create(asset, request)
+        predictor.save()
 
-            context = {}
+        return HttpResponse(json.dumps({"data": {"id": predictor.id}}))
 
-            return render(request, 'prediction/predictor-upload.html',
-                          context)
     else:
         form = PredictorForm()
 
@@ -197,7 +121,6 @@ def predictor_upload(request, calid):
     try:
         return render(request, 'prediction/predictor-upload.html', {"form": form})
 
-
     except Exception as e:
         if "DEBUG" in os.environ and os.environ["DEBUG"]:
             raise e

irie/apps/sitemaps.py

@@ -0,0 +1,14 @@
+from django.contrib.sitemaps import Sitemap
+from django.urls import reverse
+
+class IrieSitemap(Sitemap):
+    priority = 0.9
+    changefreq = 'weekly'
+
+    def items(self):
+        # Return the names of your static views
+        return ['home', 'about', 'dashboard', 'asset_table']
+
+    def location(self, item):
+        return reverse(item)
+

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

@@ -230,21 +230,6 @@
           </div>
         </div>
       </div>
-
-      {% if mountains %}
-      <div class="col-8 card bg-white-100 border-0 shadow mb-4">
-        <div class="card-body">
-          <h4>Spectrum</h4>
-          <div class="crop">
-            <img src="data:image/jpeg;base64,{{ mountains }}" alt="Spectral content">
-          </div>
-        </div>
-        <div class="card-footer">
-          Powered by <a href="https://chrystalchern.github.io/mdof"><em>mdof</em></a>
-        </div>
-      </div>
-      {% endif %}
-      
     </details>
     <hr>
     {% endif %}

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

@@ -93,6 +93,44 @@ table a[href^="https://"]::after
                   placeholder="Search assets"
                 >
               </div>
+
+              <!-- Latest Year -->
+              <div class="input-group mb-3">
+                <span class="input-group-text">
+                    <svg class="icon icon-xs" x-description="Heroicon name: solid/search" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
+                        <path fill-rule="evenodd" d="M8 4a4 4 0 100 8 4 4 0 000-8zM2 8a6 6 0 1110.89 3.476l4.817 4.817a1 1 0 01-1.414 1.414l-4.816-4.816A6 6 0 012 8z" clip-rule="evenodd"></path>
+                    </svg>
+                </span>
+                <button type="button" class="btn input-group-text btn-outline dropdown-toggle dropdown-toggle-split" data-bs-toggle="dropdown" aria-expanded="false">
+                  <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-caret-down-fill" viewBox="0 0 16 16">
+                    <path d="M7.247 11.14l-4.796-5.481C2.014 5.334 2.482 4.5 3.25 4.5h9.5c.768 0 1.236.835.799 1.159l-4.796 5.481a1 1 0 0 1-1.506 0z"/>
+                  </svg>                  
+                  <span class="visually-hidden">Toggle Dropdown</span>
+                </button>
+                <ul class="dropdown-menu">
+                  <li><a class="dropdown-item" href="#">Include fields:</a></li>
+                  <li><hr class="dropdown-divider"></li>
+                  <li><div class="form-check form-switch">
+                    <input class="form-check-input" type="checkbox" role="switch" id="flexSwitchCheckDefault">
+                    <label class="form-check-label" for="flexSwitchCheckDefault">Retrofit</label>
+                  </div></li>
+                  <li><div class="form-check form-switch">
+                    <input class="form-check-input" type="checkbox" role="switch" id="flexSwitchCheckChecked" checked>
+                    <label class="form-check-label" for="flexSwitchCheckChecked">Built</label>
+                  </div></li>
+                </ul>
+                <input 
+                  id="max_year" 
+                  name="max_year"
+                  type="number"
+                  max="2024"
+                  step="1"
+                  class="form-control" 
+                  value="{{ filter.form.max_year.value|default_if_none:'2024' }}" 
+                  placeholder="Latest Year Built"
+                >
+              </div>
+
           
               <!-- CESMD Not Null Checkbox -->
               <div class="col-12">
@@ -108,21 +146,6 @@ table a[href^="https://"]::after
                       </label>
                   </div>
               </div>
-          
-              {# Is Complete Checkbox #}
-              <div class="col-12">
-                  <div class="form-check">
-                      <input 
-                          type="checkbox" 
-                          name="is_complete" 
-                          id="is_complete" 
-                          class="form-check-input" 
-                          {% if filter.form.is_complete.value %}checked{% endif %}>
-                      <label for="is_complete" class="form-check-label">
-                          {{ filter.form.is_complete.label }}
-                      </label>
-                  </div>
-              </div>
 
               {# Buttons #}
               <div class="col-12 d-flex justify-content-between">