irie 0.0.56__tar.gz → 0.0.57__tar.gz

{irie-0.0.56 → irie-0.0.57}/PKG-INFO

@@ -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 → irie-0.0.57}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "irie"
-version = "0.0.56"
+version = "0.0.57"
 authors = [
   {name="Claudio M. Perez", email="50180406+claudioperez@users.noreply.github.com"}
 ]
@@ -9,27 +9,23 @@ description="An infrastructure resilience engine"
 readme = "README.md"
 
 keywords = [
-  "visualization",
-  "seismic",
-  "opensees",
   "resilience",
-  "post-processing",
   "structural-health-monitoring",
   "finite-element-analysis",
-  "glTF"
+  "xara"
 ] 
 
 dependencies = [
   "tqdm",
-  "opensees",
+  "opensees>=0.1.0",
   "quakeio",
   "mdof",
-  "veux",
+  "veux>=0.0.35",
   "xara",
-  "bottle",
-  "openbim",
-  "xsection",
   "xcsi",
+  "xsection>=0.0.19",
+  "openbim", # TODO: remove, superceded by xcsi
+
   "folium",
   "pandas",
   "numpy",

{irie-0.0.56 → irie-0.0.57}/src/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-0.0.56 → irie-0.0.57}/src/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 → irie-0.0.57}/src/irie.egg-info/PKG-INFO

@@ -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 → irie-0.0.57}/src/irie.egg-info/requires.txt

@@ -1,13 +1,12 @@
 tqdm
-opensees
+opensees>=0.1.0
 quakeio
 mdof
-veux
+veux>=0.0.35
 xara
-bottle
-openbim
-xsection
 xcsi
+xsection>=0.0.19
+openbim
 folium
 pandas
 numpy