Updated the schema files to work with new requirements.

app/schemas/auralization_schema.py

@@ -19,7 +19,7 @@ class AuralizationSchema(Schema):
     id = fields.Integer()
     simulationId = fields.Integer()
     audioFileId = fields.Integer()
-    status = fields.Enum(Status, default=Status.Uncreated)
+    status = fields.Enum(Status, dump_default=Status.Uncreated)
     createdAt = fields.String()
     updatedAt = fields.String()
 

app/schemas/file_schema.py

@@ -2,10 +2,10 @@
 
 
 class FileSchema(Schema):
-    id = fields.Number()
+    id = fields.Integer()
     fileName = fields.Str()
     slot = fields.Str()
-    size = fields.Number()
+    size = fields.Integer()
 
 
 class GetSlotSchema(Schema):

app/schemas/geometry_schema.py

@@ -16,7 +16,7 @@ class GeometrySchema(Schema):
 
 
 class GeometryStartQuerySchema(Schema):
-    fileUploadId = fields.Number(required=True)
+    fileUploadId = fields.Integer(required=True)
 
 
 class GeometryGetQuerySchema(Schema):

app/schemas/material_schema.py

@@ -14,7 +14,7 @@ class MaterialUpdateSchema(Schema):
     absorptionCoefficients = fields.List(fields.Float())
 
 class MaterialSchema(MaterialCreateSchema):
-    id = fields.Number()
+    id = fields.Integer()
     origin = fields.String()
     createdAt = fields.String()
     updatedAt = fields.String()

app/schemas/mesh_schema.py

@@ -10,7 +10,7 @@
 
 
 class MeshSchema(Schema):
-    id = fields.Number()
+    id = fields.Integer()
     taskId = fields.Integer()
 
     createdAt = fields.Str()

app/schemas/model_schema.py

@@ -4,7 +4,7 @@
 
 
 class ModelSchema(Schema):
-    id = fields.Number()
+    id = fields.Integer()
     name = fields.Str(required=True)
     sourceFileId = fields.Integer()
     outputFileId = fields.Integer()

app/schemas/project_schema.py

@@ -6,7 +6,7 @@
 
 
 class ProjectSchema(Schema):
-    id = fields.Number()
+    id = fields.Integer()
     name = fields.Str(required=True)
     description = fields.Str(required=True)
     group = fields.Str(required=True)

requirements.txt

@@ -1,144 +1,144 @@
-alabaster==0.7.16
-alembic==1.10.2
-amqp==5.2.0
-apispec==6.3.0
-asgiref==3.7.2
-asttokens==2.2.1
-attrs==23.2.0
-Babel==2.15.0
-backcall==0.2.0
-billiard==4.2.0
-black==25.1.0
-blinker==1.5
-celery==5.4.0
-certifi==2023.5.7
-cfgv==3.4.0
-charset-normalizer==3.3.2
-click==8.1.3
-click-didyoumean==0.3.1
-click-plugins==1.1.1
-click-repl==0.3.0
-colorama==0.4.6
-comm==0.1.2
-contourpy==1.2.1
-coverage==7.2.7
-cycler==0.12.1
-debugpy==1.6.4
-decorator==5.1.1
-distlib==0.3.6
-Django==4.2.6
-dnspython==2.6.1
-docutils==0.21.2
-entrypoints==0.4
-eventlet==0.36.1
-executing==1.2.0
-filelock==3.12.2
-flake8==6.1.0
-Flask==2.2.5
-Flask-Cors==3.0.10
-Flask-JWT-Extended==4.4.4
-Flask-Migrate==4.0.4
-Flask-Script==2.0.5
-flask-smorest==0.40.0
-Flask-SQLAlchemy==3.0.3
-fonttools==4.53.1
-gmsh==4.13.1
-greenlet==2.0.2
-gunicorn==21.2.0
-identify==2.6.0
-idna==3.7
-imagesize==1.4.1
-importlib-metadata==6.7.0
-ipykernel==6.19.2
-ipython==8.10.0
-isort==5.12.0
-itsdangerous==2.1.2
-jedi==0.18.2
-Jinja2==3.1.2
-jsonschema==4.22.0
-jsonschema-specifications==2023.12.1
-jupyter_client==7.4.8
-jupyter_core==5.1.0
-kiwisolver==1.4.5
-kombu==5.3.7
-Mako==1.2.4
-markdown-it-py==3.0.0
-MarkupSafe==2.1.2
-marshmallow==3.19.0
-mccabe==0.7.0
-mdurl==0.1.2
-meshio==5.3.5
-mypy-extensions==1.0.0
-nest-asyncio==1.5.6
-networkx==3.3
-nodeenv==1.9.1
+alabaster
+alembic
+amqp
+apispec
+asgiref
+asttokens
+attrs
+Babel
+backcall
+billiard
+black
+blinker
+celery
+certifi
+cfgv
+charset-normalizer
+click
+click-didyoumean
+click-plugins
+click-repl
+colorama
+comm
+contourpy
+coverage
+cycler
+debugpy
+decorator
+distlib
+Django
+dnspython
+docutils
+entrypoints
+eventlet
+executing
+filelock
+flake8
+Flask
+Flask-Cors
+Flask-JWT-Extended
+Flask-Migrate
+Flask-Script
+flask-smorest
+Flask-SQLAlchemy
+fonttools
+gmsh
+greenlet
+gunicorn
+identify
+idna
+imagesize
+importlib-metadata
+ipykernel
+ipython
+isort
+itsdangerous
+jedi
+Jinja2
+jsonschema
+jsonschema-specifications
+jupyter_client
+jupyter_core
+kiwisolver
+kombu
+Mako
+markdown-it-py
+MarkupSafe
+marshmallow>=3.13.0
+mccabe
+mdurl
+meshio
+mypy-extensions
+nest-asyncio
+networkx
+nodeenv
 numpy
-numpy-stl==3.1.1
-openpyxl==3.1.5
-packaging==22.0
-pandas==2.2.3
-parso==0.8.3
-passlib==1.7.4
-pathspec==0.12.1
-pexpect==4.8.0
-pickleshare==0.7.5
-pillow==10.3.0
-pipenv==2023.7.3
-platformdirs==3.8.0
-pre-commit==3.8.0
-prompt-toolkit==3.0.36
-psutil==5.9.4
-psycopg2-binary==2.9.6
-ptyprocess==0.7.0
-pure-eval==0.2.2
-pycodestyle==2.11.1
-pyflakes==3.1.0
-pyglet==1.5.29
-Pygments==2.18.0
-PyJWT==2.6.0
-pyparsing==3.1.2
-python-dateutil==2.8.2
-python-dotenv==1.0.0
-python-utils==3.8.2
-pytz==2023.3
-# pywin32==306
-PyYAML==6.0.2
-pyzmq==24.0.1
-referencing==0.35.1
-requests==2.32.3
-rhino3dm==8.6.1
-rich==13.7.1
-rpds-py==0.18.1
-scipy==1.14.0
-six==1.16.0
-snowballstemmer==2.2.0
-soundfile==0.13.1
-Sphinx==7.3.7 # Docs
-sphinxcontrib-applehelp==1.0.8 # docs, potentially secondary requirement
-sphinxcontrib-devhelp==1.0.6 # docs, potentially secondary requirement
-sphinxcontrib-htmlhelp==2.0.5 # docs, potentially secondary requirement
-sphinxcontrib-jsmath==1.0.1 # docs, potentially secondary requirement
-sphinxcontrib-qthelp==1.0.7 # docs, potentially secondary requirement
-sphinxcontrib-serializinghtml==1.1.10 # docs, potentially secondary requirement
-SQLAlchemy==2.0.7
-sqlparse==0.4.4
-stack-data==0.6.2
-tomli==2.0.1
-tornado==6.3.2
-traitlets==5.7.1
-trimesh==4.4.1
+numpy-stl
+openpyxl
+packaging
+pandas
+parso
+passlib
+pathspec
+pexpect
+pickleshare
+pillow
+pipenv
+platformdirs
+pre-commit
+prompt-toolkit
+psutil
+psycopg2-binary
+ptyprocess
+pure-eval
+pycodestyle
+pyflakes
+pyglet
+Pygments
+PyJWT
+pyparsing
+python-dateutil
+python-dotenv
+python-utils
+pytz
+# pywin32
+PyYAML
+pyzmq
+referencing
+requests
+rhino3dm
+rich
+rpds-py
+scipy
+six
+snowballstemmer
+soundfile
+Sphinx # Docs
+sphinxcontrib-applehelp # docs, potentially secondary requirement
+sphinxcontrib-devhelp # docs, potentially secondary requirement
+sphinxcontrib-htmlhelp # docs, potentially secondary requirement
+sphinxcontrib-jsmath # docs, potentially secondary requirement
+sphinxcontrib-qthelp # docs, potentially secondary requirement
+sphinxcontrib-serializinghtml # docs, potentially secondary requirement
+SQLAlchemy
+sqlparse
+stack-data
+tomli
+tornado
+traitlets
+trimesh
 typing_extensions
-tzdata==2023.3
-urllib3==2.2.2
-vine==5.1.0
-virtualenv==20.23.1
-virtualenv-clone==0.5.7
-watchdog==4.0.1
-wcwidth==0.2.5
-webargs==8.2.0
-Werkzeug==2.2.3
-wincertstore==0.2
-zipp==3.15.0
+tzdata
+urllib3
+vine
+virtualenv
+virtualenv-clone
+watchdog
+wcwidth
+webargs
+Werkzeug
+wincertstore
+zipp
 pytest
 locust
 ezdxf
@@ -149,11 +149,8 @@ sphinx-design # Docs, required for tabs and other design elements
 sphinx-copybutton # Docs, required for copy buttons in code blocks
 sphinx-gallery # Docs, required for example gallery
 matplotlib # Docs, required for plot directive
-pyroomacoustics
 docker
 pathlib
 paramiko
-git+https://github.com/Building-acoustics-TU-Eindhoven/acousticDE.git@d32afb2498e27bd996fc7356d57dc4f1ed76aa44#egg=acousticDE
-# git+https://github.com/dtu-act/deeponet-acoustic-wave-prop.git@3d3fc5ee952756eedcd4fec3c3674ad829825c7e#egg=deeponet-acoustics
-git+https://github.com/Building-acoustics-TU-Eindhoven/edg-acoustics.git@08cac98da98ed14ba1366741b1c0644001503b82#egg=edg-acoustics
 
+acousticDE # Needed for generate_mesh function (should decouple at some point)