irie 0.0.56__py3-none-any.whl → 0.0.57__py3-none-any.whl

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

@@ -12,12 +12,13 @@ from pathlib import Path
 import contextlib
 try:
     from xcsi.csi import collect_outlines, load as load_csi
-    from xcsi.csi._frame.section import create_section
-    from xcsi.csi._frame.section import iter_sections
+    from xcsi.csi._frame.section import create_section, iter_sections
     from xcsi.job import Job
     from xcsi.metrics import PeakDrift
 except:
-    pass
+    from openbim.csi import load as load_csi, create_model, collect_outlines
+    from openbim.csi._frame.section import create_section, iter_sections
+
 
 from irie.apps.prediction.runners import (Runner, RunID, classproperty)
 

irie/apps/prediction/views.py

@@ -253,13 +253,13 @@ def create_model(request, calid):
         try:
             csi = load((str(line.decode()).replace("\r\n","\n") for line in uploaded_file.readlines()))
         except Exception as e:
-            return HttpResponse(r400.render({"message": json.dumps({"error": str(e)})}), status=400)
+            return HttpResponse(r400.render({"message": json.dumps({"error": str(e)})}), status=500)
 
         # 2) Process CSI data into xara model
         try:
             model = create_model(csi, verbose=True)
         except Exception as e:
-            return HttpResponse(r400.render({"message": json.dumps({"error": str(e)})}), status=400)
+            return HttpResponse(r400.render({"message": json.dumps({"error": str(e)})}), status=500)
 
         # 3) Render the model
         outlines = collect_outlines(csi, model.frame_tags)
@@ -299,7 +299,8 @@ def create_model(request, calid):
     except Exception as e:
         if "DEBUG" in os.environ and os.environ["DEBUG"]:
             raise e
+        print(e)
         html_template = loader.get_template("site/page-500.html")
-        return HttpResponse(html_template.render({}, request))
+        return HttpResponse(html_template.render({}, request), status=500)
 
 

{irie-0.0.56.dist-info → irie-0.0.57.dist-info}/METADATA

@@ -1,11 +1,11 @@
 Metadata-Version: 2.4
 Name: irie
-Version: 0.0.56
+Version: 0.0.57
 Summary: An infrastructure resilience engine
 Author-email: "Claudio M. Perez" <50180406+claudioperez@users.noreply.github.com>
 Project-URL: Repository, https://github.com/STAIRLab
 Project-URL: Documentation, https://stairlab.berkeley.edu/software/irie/
-Keywords: visualization,seismic,opensees,resilience,post-processing,structural-health-monitoring,finite-element-analysis,glTF
+Keywords: resilience,structural-health-monitoring,finite-element-analysis,xara
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Science/Research
 Classifier: Intended Audience :: Developers
@@ -27,15 +27,14 @@ Classifier: Operating System :: Unix
 Classifier: Operating System :: MacOS
 Description-Content-Type: text/markdown
 Requires-Dist: tqdm
-Requires-Dist: opensees
+Requires-Dist: opensees>=0.1.0
 Requires-Dist: quakeio
 Requires-Dist: mdof
-Requires-Dist: veux
+Requires-Dist: veux>=0.0.35
 Requires-Dist: xara
-Requires-Dist: bottle
-Requires-Dist: openbim
-Requires-Dist: xsection
 Requires-Dist: xcsi
+Requires-Dist: xsection>=0.0.19
+Requires-Dist: openbim
 Requires-Dist: folium
 Requires-Dist: pandas
 Requires-Dist: numpy

{irie-0.0.56.dist-info → irie-0.0.57.dist-info}/RECORD

@@ -100,7 +100,7 @@ irie/apps/prediction/metrics.py,sha256=Zh1utUZTGddQEVn4e1rLO74tbIz7bVvZli8sgmuB_
 irie/apps/prediction/models.py,sha256=06yXUH2JtKAsMn9BCJe0nlwOXdjNOXkl9UnSw8wJ6F4,3048
 irie/apps/prediction/predictor.py,sha256=-x_4kHWnfUxiX2aQfbl3dsbVAG4lRKAFbo1CqfZNCIc,831
 irie/apps/prediction/urls.py,sha256=V41EjswrZ4FGPMetHzxkL4m0wNJvPEuV0UrwxLWqgkA,1012
-irie/apps/prediction/views.py,sha256=bcjgp9Nz989fBCtqM-pwYS4x25NLik2K6n60vgDJEXY,10021
+irie/apps/prediction/views.py,sha256=OyADC1axt8AxR1WRCyqq_cfba3ar-IrvUd-dmq8Cbz8,10050
 irie/apps/prediction/views_api.py,sha256=DJzLYO5ouPOWkkZJNZxZJzxC3TROKJ-L6Z2IC1NMuFQ,6888
 irie/apps/prediction/migrations/0001_initial.py,sha256=-0GWd2vUUAzSPfptccAJ3raI3UD4Xj9H0E5EJ7xN0Ek,1428
 irie/apps/prediction/migrations/0002_alter_predictormodel_protocol.py,sha256=nrQvuZ1eRR7fR17IjdS0Xyw14y9DpE6HkG2-h7HQ_zA,560
@@ -112,7 +112,7 @@ irie/apps/prediction/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm
 irie/apps/prediction/runners/__init__.py,sha256=pur6vJ5zXwjyTxl7p0TBJ8dt-2h-4Ty65KPmtRM8lyQ,2308
 irie/apps/prediction/runners/hazus.py,sha256=sWQDDmwN82wKSHW9EGx46JOOPo_IN2CTK7RF23Rx4c4,31207
 irie/apps/prediction/runners/ssid.py,sha256=_5TZrbWtt-Mid-PXiUu33QOQ7rUK2FLkyAg_B957RLc,18811
-irie/apps/prediction/runners/opensees/__init__.py,sha256=gD366xj0BndXpDmJaNQiqrN92Gs_DINeA8dEkGojTyM,22770
+irie/apps/prediction/runners/opensees/__init__.py,sha256=Fim3_faaUlpbNow4gGcvQnAmRBaFIfONeRQWKf8nR-I,22873
 irie/apps/prediction/runners/opensees/metrics.py,sha256=6dyoBXBx9_itF83rculpuE7B__blG5AIMfQpa-srulU,6431
 irie/apps/prediction/runners/opensees/utilities.py,sha256=1cajnV6gWkJ5obYixfbHZKwxi1ECpR0sBWquAAGhseE,9032
 irie/apps/prediction/runners/opensees/xmlutils.py,sha256=Q3i5L0Dp_5nRsKRGMr-m_bS03Mxa36Ujb-RvwAmResc,7510
@@ -497,8 +497,8 @@ irie/init/management/commands/make_asset.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm
 irie/pull/nbi.py,sha256=KpBjJ9GEU72Qk1t4bGN9cg0QBeVJ8k9XcI3Y1oSgIR0,11478
 irie/rest/__main__.py,sha256=AJIcioUAfG1Lj_tyxHXo1Z7qFXxa9PqxCyaqZSkIZYg,3829
 irie/usgs/__main__.py,sha256=HiSvPn5IW5IqRiCk1qRRq5dCy3-7iISw7v1P_w2rLrk,5049
-irie-0.0.56.dist-info/METADATA,sha256=uSyT5avnQ_mO5WVkFfFnDIicjUIms_dFtUdOydN7WGo,3249
-irie-0.0.56.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-irie-0.0.56.dist-info/entry_points.txt,sha256=A_3h9wPBGfxGQ78_MGa-nO6Z0foxOYeAnIE47jxEztg,44
-irie-0.0.56.dist-info/top_level.txt,sha256=zVCxi5E2nkISZPzKq8VEhWe_dGuPcefLYV1tYqQdwlY,5
-irie-0.0.56.dist-info/RECORD,,
+irie-0.0.57.dist-info/METADATA,sha256=i-jtlQpWBj9ccHP8BTG7N5GiP9piTqWbFk1U_DAaeQI,3203
+irie-0.0.57.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+irie-0.0.57.dist-info/entry_points.txt,sha256=A_3h9wPBGfxGQ78_MGa-nO6Z0foxOYeAnIE47jxEztg,44
+irie-0.0.57.dist-info/top_level.txt,sha256=zVCxi5E2nkISZPzKq8VEhWe_dGuPcefLYV1tYqQdwlY,5
+irie-0.0.57.dist-info/RECORD,,