irie 0.0.0__tar.gz → 0.0.1__tar.gz

{irie-0.0.0 → irie-0.0.1}/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.1
 Name: irie
-Version: 0.0.0
-Summary: Finite element visualization with GPU support
+Version: 0.0.1
+Summary: Infrastructure Resilience Engine
 Author-email: wd <5018-006+wd@users.noreply.github.com>, ab <52-93467+ab@users.noreply.github.com>
 Project-URL: Repository, https://github.com/STAIRLab/irie
 Project-URL: Documentation, https://structures.live
@@ -31,11 +31,30 @@ Requires-Dist: opensees
 Requires-Dist: quakeio
 Requires-Dist: bottle
 Requires-Dist: openbim
+Requires-Dist: Django==5.1.2
+Requires-Dist: asgiref==3.8.1
+Requires-Dist: autopep8
+Requires-Dist: gunicorn==23.0.0
+Requires-Dist: pytz==2021.3
+Requires-Dist: sqlparse==0.5.1
+Requires-Dist: toml>=0.10.2
+Requires-Dist: whitenoise==5.3.0
+Requires-Dist: crispy-bootstrap5
+Requires-Dist: django-crispy-forms
+Requires-Dist: django-environ==0.11.2
+Requires-Dist: djangorestframework==3.15.2
+Requires-Dist: djangorestframework-simplejwt==5.3.1
+Requires-Dist: folium
+Requires-Dist: pandas
+Requires-Dist: numpy
+Requires-Dist: orjson
+Requires-Dist: jsonschema
+Requires-Dist: dj-database-url==2.1.0
 
 <div align="center">
-<h2>BRACE2</h2>
-<h1>Health Monitoring Platform</h1>
-<h4>Mk III</h4>
+<h2>irie</h2>
+<font size="28"><i><b>i</b>nfrastructure <b>r</b>el<b>i</b>ability <b>e</b>ngine</i></font>
+<h4>PEER</h4>
 </div>
 
 ### External Dependencies

{irie-0.0.0 → irie-0.0.1}/README.md

@@ -1,7 +1,7 @@
 <div align="center">
-<h2>BRACE2</h2>
-<h1>Health Monitoring Platform</h1>
-<h4>Mk III</h4>
+<h2>irie</h2>
+<font size="28"><i><b>i</b>nfrastructure <b>r</b>el<b>i</b>ability <b>e</b>ngine</i></font>
+<h4>PEER</h4>
 </div>
 
 ### External Dependencies

{irie-0.0.0 → irie-0.0.1}/pyproject.toml

@@ -1,11 +1,11 @@
 [project]
 name = "irie"
-version = "0.0.0"
+version = "0.0.1"
 authors = [
   {name="wd", email="5018-006+wd@users.noreply.github.com"},
   {name="ab",   email="52-93467+ab@users.noreply.github.com"}
 ]
-description="Finite element visualization with GPU support"
+description="Infrastructure Resilience Engine"
 
 license = {file = ".github/LICENSE.txt"}
 readme = "README.md"
@@ -24,7 +24,26 @@ dependencies = [
   "opensees",
   "quakeio",
   "bottle",
-  "openbim"
+  "openbim",
+  "Django==5.1.2",
+  "asgiref==3.8.1",
+  "autopep8",
+  "gunicorn==23.0.0",
+  "pytz==2021.3",
+  "sqlparse==0.5.1",
+  "toml>=0.10.2",
+  "whitenoise==5.3.0",
+  "crispy-bootstrap5 ",
+  "django-crispy-forms",
+  "django-environ==0.11.2",
+  "djangorestframework==3.15.2",
+  "djangorestframework-simplejwt==5.3.1",
+  "folium",
+  "pandas",
+  "numpy",
+  "orjson",
+  "jsonschema",
+  "dj-database-url==2.1.0"
 ]
 
 classifiers = [

{irie-0.0.0 → irie-0.0.1}/src/irie/__main__.py

@@ -9,7 +9,7 @@ import os
 import sys
 
 def main():
-    os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'core.settings')
+    os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'irie.core.settings')
     try:
         from django.core.management import execute_from_command_line
     except ImportError as exc:

{irie-0.0.0 → irie-0.0.1}/src/irie/apps/config.py

@@ -3,6 +3,6 @@ from django.apps import AppConfig
 
 class AppsConfig(AppConfig):
     default_auto_field = "django.db.models.BigAutoField"
-    name = "apps"
-    label = "apps"
+    name  = "irie.apps"
+    label = "irie_apps"
 

{irie-0.0.0 → irie-0.0.1}/src/irie/apps/documents/apps.py

@@ -3,5 +3,5 @@ from django.apps import AppConfig
 
 class DocumentsConfig(AppConfig):
     default_auto_field = "django.db.models.BigAutoField"
-    name = 'apps.documents'
+    name = 'irie.apps.documents'
     label = 'documents'

{irie-0.0.0 → irie-0.0.1}/src/irie/apps/documents/urls.py

@@ -1,6 +1,6 @@
 from django.urls import path
 from django.conf.urls.static import static
-from core import settings
+from irie.core import settings
 from django.contrib.staticfiles.urls import staticfiles_urlpatterns
 
 from . import views

{irie-0.0.0 → irie-0.0.1}/src/irie/apps/evaluation/apps.py

@@ -13,6 +13,6 @@ from django.apps import AppConfig
 
 class PredictionConfig(AppConfig):
     default_auto_field = 'django.db.models.BigAutoField'
-    name = 'apps.evaluation'
-    label = 'apps_evaluation'
+    name = "irie.apps.evaluation"
+    label = "irie_apps_evaluation"
 

{irie-0.0.0 → irie-0.0.1}/src/irie/apps/evaluation/daemon.py

@@ -13,8 +13,8 @@ import multiprocessing.dummy
 from collections import defaultdict
 from typing import List, Iterator, Tuple, Dict, Collection
 
-from apps.prediction.predictor import RunID
-from apps.prediction.metrics import HealthMetric, METRIC_CLASSES
+from irie.apps.prediction.predictor import RunID
+from irie.apps.prediction.metrics import HealthMetric, METRIC_CLASSES
 
 class LiveEvaluation:
     # TODO: Merge into models.Evaluation?

{irie-0.0.0 → irie-0.0.1}/src/irie/apps/evaluation/identification.py

@@ -26,9 +26,9 @@ import json
 from collections import defaultdict
 
 import numpy as np
-from apps.events.models import Event
-from apps.site.view_utils import raise404
-from apps.inventory.models import Asset
+from irie.apps.events.models import Event
+from irie.apps.site.view_utils import raise404
+from irie.apps.inventory.models import Asset
 
 def mkdd(asset, pid, key):
     evaluations = list(reversed(sorted(Evaluation.objects.filter(asset=asset),

{irie-0.0.0 → irie-0.0.1}/src/irie/apps/evaluation/models.py

@@ -14,8 +14,8 @@ import logging
 from threading import Thread
 from django.db import models
 
-from apps.events.models import Event
-from apps.inventory.models import Asset
+from irie.apps.events.models import Event
+from irie.apps.inventory.models import Asset
 from .daemon import LiveEvaluation
 
 class Evaluation(models.Model):

{irie-0.0.0 → irie-0.0.1}/src/irie/apps/evaluation/views.py

@@ -20,9 +20,9 @@ from rest_framework.decorators import api_view, permission_classes
 from rest_framework.permissions import IsAuthenticated
 
 from .models import Evaluation
-from apps.events.models import Event
-from apps.inventory import views as inventory
-from apps.inventory.models import Asset
+from irie.apps.events.models import Event
+from irie.apps.inventory import views as inventory
+from irie.apps.inventory.models import Asset
 
 def _evals_and_events(asset):
     evals = Evaluation.objects.filter(asset_id=asset.id)

{irie-0.0.0 → irie-0.0.1}/src/irie/apps/events/apps.py

@@ -7,6 +7,6 @@ from django.apps import AppConfig
 
 
 class AppConfig(AppConfig):
-    name = "apps.events"
-    label= "apps_events"
+    name = "irie.apps.events"
+    label= "irie_apps_events"
 

{irie-0.0.0 → irie-0.0.1}/src/irie/apps/events/models.py

@@ -15,7 +15,7 @@ from django.db.models.signals import post_delete, pre_save
 from django.dispatch import receiver
 from django.core.mail import send_mail
 
-from apps.inventory.models import Asset
+from irie.apps.inventory.models import Asset
 
 
 class Event(models.Model):

{irie-0.0.0 → irie-0.0.1}/src/irie/apps/events/views.py

@@ -5,8 +5,8 @@ from django.core.paginator import Paginator
 from django.http import HttpResponse
 from django.contrib.auth.decorators import login_required
 
-from apps.events.models import Event
-from apps.site.view_utils import raise404
+from irie.apps.events.models import Event
+from irie.apps.site.view_utils import raise404
 
 
 @login_required(login_url="/login/")

{irie-0.0.0 → irie-0.0.1}/src/irie/apps/events/views_events.py

@@ -17,10 +17,10 @@ from rest_framework import status
 from rest_framework.permissions import IsAuthenticated
 
 from .models import Event
-from apps.inventory.models import Asset
-# from apps.evaluation.evaluation import (run_evaluation,
+from irie.apps.inventory.models import Asset
+# from irie.apps.evaluation.evaluation import (run_evaluation,
 #                                         add_evaluation)
-from apps.evaluation.models import Evaluation
+from irie.apps.evaluation.models import Evaluation
 import quakeio
 
 

{irie-0.0.0 → irie-0.0.1}/src/irie/apps/inventory/apps.py

@@ -8,5 +8,5 @@ from django.apps import AppConfig
 
 class InventoryConfig(AppConfig):
     default_auto_field = 'django.db.models.BigAutoField'
-    name = 'apps.inventory'
+    name = "irie.apps.inventory"
     label = 'apps_inventory'

{irie-0.0.0 → irie-0.0.1}/src/irie/apps/inventory/forms.py

@@ -4,7 +4,7 @@
 #
 #===----------------------------------------------------------------------===#
 from django import forms
-from apps.inventory.models import Asset
+from irie.apps.inventory.models import Asset
 
 class AssetForm(forms.ModelForm):
     class Meta:

{irie-0.0.0 → irie-0.0.1}/src/irie/apps/inventory/models.py

@@ -44,8 +44,8 @@ class Asset(models.Model):
 
     @property
     def predictors(self): # ->Dict[str, Predictor]:
-        from apps.prediction.predictor import PREDICTOR_TYPES
-        from apps.prediction.models import PredictorModel
+        from irie.apps.prediction.predictor import PREDICTOR_TYPES
+        from irie.apps.prediction.models import PredictorModel
         return {
             p.name: PREDICTOR_TYPES[p.protocol](p)
             for p in PredictorModel.objects.filter(asset=self)

{irie-0.0.0 → irie-0.0.1}/src/irie/apps/inventory/urls.py

@@ -9,7 +9,7 @@
 #
 #----------------------------------------------------------------------------#
 from django.urls import path, re_path
-from apps.inventory import views
+from irie.apps.inventory import views
 
 urlpatterns = [
     path("dashboard/",     views.dashboard, name="dashboard"),

{irie-0.0.0 → irie-0.0.1}/src/irie/apps/inventory/views.py

@@ -16,10 +16,10 @@ from django.http import HttpResponse
 from django.contrib.auth.decorators import login_required
 from django.core.exceptions import ObjectDoesNotExist
 
-from apps.events.models import Event
-from apps.site.view_utils import raise404
-from apps.inventory.models import Asset
-from apps.inventory.forms import AssetForm
+from irie.apps.events.models import Event
+from irie.apps.site.view_utils import raise404
+from irie.apps.inventory.models import Asset
+from irie.apps.inventory.forms import AssetForm
 
 
 @login_required(login_url="/login/")
@@ -32,7 +32,7 @@ def fetch_rendering(request):
         return HttpResponse(template.render({}, request))
 
 
-    from apps.prediction.models import PredictorModel
+    from irie.apps.prediction.models import PredictorModel
     for p in PredictorModel.objects.filter(asset=asset):
         if p.protocol == "BRACE2_CLI_PREDICTOR_T4":
             return HttpResponse("html")
@@ -67,7 +67,7 @@ def _make_freq_plot(evaluation):
 
 @login_required(login_url="/login/")
 def asset_event_summary(request, cesmd, event):
-    from apps.evaluation.models import Evaluation
+    from irie.apps.evaluation.models import Evaluation
 
     context = {}
     context["segment"] = "events"
@@ -122,8 +122,8 @@ def asset_event_summary(request, cesmd, event):
 
 @login_required(login_url="/login/")
 def dashboard(request):
-    from apps.inventory.models import Asset
-    from apps.evaluation.models import Evaluation
+    from irie.apps.inventory.models import Asset
+    from irie.apps.evaluation.models import Evaluation
 
     context = {}
     context["segment"] = "dashboard"
@@ -230,7 +230,7 @@ def _find_ssid(event_id=None, evaluation=None):
     system ID run. This generally looks like a list of dicts,
     each with fields "frequency", "damping", etc.
     """
-    from apps.evaluation.models import Evaluation
+    from irie.apps.evaluation.models import Evaluation
 
     if evaluation is None:
         evaluation = Evaluation.objects.filter(event_id=int(event_id))
@@ -491,8 +491,8 @@ class AssetMap:
 
 
     def add_traffic(self):
-        # from apps.inventory.traffic import TRAFFIC_LOW, TRAFFIC_MID, TRAFFIC_HIGH, TRAFFIC_ALL
-        from apps.inventory.traffic import TRAFFIC_ALL
+        # from irie.apps.inventory.traffic import TRAFFIC_LOW, TRAFFIC_MID, TRAFFIC_HIGH, TRAFFIC_ALL
+        from irie.apps.inventory.traffic import TRAFFIC_ALL
         traffic = folium.FeatureGroup(name="Traffic")
         traffic.add_to(self._map)
 

{irie-0.0.0 → irie-0.0.1}/src/irie/apps/networks/apps.py

@@ -2,4 +2,4 @@ from django.apps import AppConfig
 
 class NetworksConfig(AppConfig):
     default_auto_field = "django.db.models.BigAutoField"
-    name = "apps.networks"
+    name = "irie.apps.networks"

{irie-0.0.0 → irie-0.0.1}/src/irie/apps/networks/networks.py

@@ -13,7 +13,7 @@ from shapely.geometry import Point
 import folium
 from folium.plugins import TagFilterButton, Search
 
-from apps.inventory.models import Asset
+from irie.apps.inventory.models import Asset
 
 cwd = Path(__file__).parent
 

{irie-0.0.0 → irie-0.0.1}/src/irie/apps/networks/urls.py

@@ -10,9 +10,9 @@
 #
 #----------------------------------------------------------------------------#
 from django.urls import path
-from apps.networks import views
+from irie.apps.networks import views
 
 urlpatterns = [
-    path("networks/",     views.network_maps,     name="networks"),
-    path("api/networks/", views.load_network_map, name='load_network_map'),
+    path("recovery/",     views.network_maps,     name="recovery"),
+    path("api/recovery/", views.load_network_map, name='load_recovery_map'),
 ]

{irie-0.0.0 → irie-0.0.1}/src/irie/apps/prediction/apps.py

@@ -7,6 +7,6 @@ from django.apps import AppConfig
 
 class PredictionConfig(AppConfig):
     default_auto_field = 'django.db.models.BigAutoField'
-    name  = 'apps.prediction'
+    name  = 'irie.apps.prediction'
     label = 'apps_prediction'
 

{irie-0.0.0 → irie-0.0.1}/src/irie/apps/prediction/forms.py

@@ -4,7 +4,7 @@
 #
 #===----------------------------------------------------------------------===#
 from django import forms
-from apps.prediction.models import PredictorModel
+from irie.apps.prediction.models import PredictorModel
 
 
 # class CsiForm(forms.Form):

{irie-0.0.0 → irie-0.0.1}/src/irie/apps/prediction/models.py

@@ -5,7 +5,7 @@
 #===----------------------------------------------------------------------===#
 from django.db import models
 
-from apps.inventory.models import Asset
+from irie.apps.inventory.models import Asset
 
 class PredictorModel(models.Model):
     # https://docs.djangoproject.com/en/4.2/ref/models/fields/

{irie-0.0.0 → irie-0.0.1}/src/irie/apps/prediction/views.py

@@ -22,10 +22,10 @@ from django.shortcuts import render
 from rest_framework.decorators import api_view, permission_classes
 from rest_framework.permissions import IsAuthenticated
 
-from apps.site.view_utils import raise404
-from apps.inventory.models import Asset
-from apps.prediction.predictor import PREDICTOR_TYPES, OpenSeesRunner
-from apps.prediction.models import PredictorModel
+from irie.apps.site.view_utils import raise404
+from irie.apps.inventory.models import Asset
+from irie.apps.prediction.predictor import PREDICTOR_TYPES, OpenSeesRunner
+from irie.apps.prediction.models import PredictorModel
 from .forms import PredictorForm
 
 @login_required(login_url="/login/")

{irie-0.0.0 → irie-0.0.1}/src/irie/apps/prediction/views_api.py

@@ -24,10 +24,10 @@ from rest_framework import status
 from rest_framework.permissions import IsAuthenticated
 
 from .models import Event
-from apps.inventory.models import Asset
-# from apps.evaluation.evaluation import (run_evaluation,
+from irie.apps.inventory.models import Asset
+# from irie.apps.evaluation.evaluation import (run_evaluation,
 #                                         add_evaluation)
-from apps.evaluation.models import Evaluation
+from irie.apps.evaluation.models import Evaluation
 import quakeio
 
 

{irie-0.0.0 → irie-0.0.1}/src/irie/apps/site/config.py

@@ -2,5 +2,5 @@ from django.apps import AppConfig
 
 
 class MyConfig(AppConfig):
-    name = "apps.site"
-    label = "apps_site"
+    name = "irie.apps.site"
+    label = "irie_site"

{irie-0.0.0 → irie-0.0.1}/src/irie/apps/site/urls.py

@@ -1,5 +1,5 @@
 from django.urls import path, re_path
-from apps.site import views, view_sdof
+from irie.apps.site import views, view_sdof
 
 urlpatterns = [
     path("", views.index, name="home"),

{irie-0.0.0 → irie-0.0.1}/src/irie/apps/site/view_sdof.py

@@ -9,7 +9,7 @@ from django.urls import reverse
 
 import quakeio
 
-from apps.events.models import Event
+from irie.apps.events.models import Event
 
 
 @login_required(login_url="/login/")

{irie-0.0.0 → irie-0.0.1}/src/irie/core/settings.py

@@ -54,13 +54,13 @@ INSTALLED_APPS = [
     "django.contrib.messages",
     "django.contrib.staticfiles",
     "rest_framework",
-    "apps.site",
-    "apps.events",
-    "apps.inventory",
-    "apps.prediction",
-    "apps.evaluation",
-    "apps.networks",
-    "apps.documents", # TODO
+    "irie.apps.site",
+    "irie.apps.events",
+    "irie.apps.inventory",
+    "irie.apps.prediction",
+    "irie.apps.evaluation",
+#   "irie.apps.networks",
+    "irie.apps.documents", # TODO
     "crispy_forms",
     "crispy_bootstrap5",
 
@@ -81,7 +81,7 @@ MIDDLEWARE = [
     "django.middleware.clickjacking.XFrameOptionsMiddleware",
 ]
 
-ROOT_URLCONF = "core.urls"
+ROOT_URLCONF = "irie.core.urls"
 LOGIN_REDIRECT_URL = "home"  # Route defined in site/urls.py
 LOGOUT_REDIRECT_URL = "home"  # Route defined in site/urls.py
 TEMPLATE_DIR = os.path.join(CORE_DIR, "apps/templates")  # ROOT dir for templates
@@ -103,7 +103,7 @@ TEMPLATES = [
     },
 ]
 
-WSGI_APPLICATION = "core.wsgi.application"
+WSGI_APPLICATION = "irie.core.wsgi.application"
 
 # Database
 # https://docs.djangoproject.com/en/3.0/ref/settings/#databases

{irie-0.0.0 → irie-0.0.1}/src/irie/core/urls.py

@@ -19,21 +19,21 @@ urlpatterns = [
     path('admin/', admin.site.urls),
 
     # Authentication routes
-    path("", include("apps.authentication.urls")),
+    path("", include("irie.apps.authentication.urls")),
 
     # Application routes
-    path("", include("apps.events.urls")),
+    path("", include("irie.apps.events.urls")),
 
-    path("", include("apps.evaluation.urls")),
+    path("", include("irie.apps.evaluation.urls")),
 
-    path("", include("apps.prediction.urls")),
+    path("", include("irie.apps.prediction.urls")),
 
-    path("", include("apps.inventory.urls")),
+    path("", include("irie.apps.inventory.urls")),
 
-    path("", include("apps.networks.urls")),
+#   path("", include("irie.apps.recovery.urls")),
 
-    path("", include("apps.documents.urls")),
+    path("", include("irie.apps.documents.urls")),
 
     # Leave `site.urls` as last the last line
-    path("", include("apps.site.urls"))
+    path("", include("irie.apps.site.urls"))
 ]

irie-0.0.1/src/irie/init/__main__.py

@@ -0,0 +1,27 @@
+import os
+import sys
+import pathlib
+import subprocess
+
+from django.core.management import execute_from_command_line
+
+cd = pathlib.Path(__file__).parents[0]
+
+def init(settings):
+
+    print("MIGRATING")
+    os.environ.setdefault('DJANGO_SETTINGS_MODULE', settings)
+    execute_from_command_line([
+        "__irie__",
+        "migrate"
+    ])
+
+
+    with open(cd/"init_assets.py", "r") as f:
+        result = subprocess.run([
+            sys.executable, "-mirie.mgmt", "shell"
+        ], stdin=f, capture_output=True, text=True)
+
+if __name__ == "__main__":
+    init(sys.argv[1])
+