Merge remote-tracking branch 'upstream/main' into feature/input-validation-general

Author: LaSi5002

README.md

@@ -40,6 +40,7 @@ conda activate 4c-webviewer
 
 Install all requirements with:
 ```bash
+conda install -c conda-forge vtk=9.4.2
 pip install -e .
 ```
 

requirements.in

@@ -6,10 +6,9 @@ trame-plotly
 plotly
 pandas
 pyvista
-vtk
+vtk==9.4.2
 numpy
-# include fourcipp from github
-git+https://github.com/4C-multiphysics/fourcipp.git
+fourcipp
 lnmmeshio>=5.6.3
 numexpr
 

requirements.txt

@@ -6,17 +6,16 @@
 #
 aiohappyeyeballs==2.6.1
     # via aiohttp
-aiohttp==3.12.2
+aiohttp==3.12.14
     # via wslink
-aiosignal==1.3.2
+aiosignal==1.4.0
     # via aiohttp
 attrs==25.3.0
     # via
     #   aiohttp
-    #   fourcipp
     #   jsonschema
     #   referencing
-certifi==2025.4.26
+certifi==2025.7.14
     # via requests
 cfgv==3.4.0
     # via pre-commit
@@ -27,18 +26,16 @@ contourpy==1.3.2
 cycler==0.12.1
     # via matplotlib
 deprecation==2.1.0
-    # via
-    #   fourcipp
-    #   rapidyaml
-distlib==0.3.9
+    # via rapidyaml
+distlib==0.4.0
     # via virtualenv
 filelock==3.18.0
     # via virtualenv
-fonttools==4.58.0
+fonttools==4.59.0
     # via matplotlib
-fourcipp @ git+https://github.com/4C-multiphysics/fourcipp.git
+fourcipp==0.29.0
     # via -r requirements.in
-frozenlist==1.6.0
+frozenlist==1.7.0
     # via
     #   aiohttp
     #   aiosignal
@@ -50,14 +47,12 @@ idna==3.10
     #   yarl
 iniconfig==2.1.0
     # via pytest
-jsonschema==4.23.0
+jsonschema==4.25.0
     # via fourcipp
 jsonschema-rs==0.30.0
     # via fourcipp
 jsonschema-specifications==2025.4.1
-    # via
-    #   fourcipp
-    #   jsonschema
+    # via jsonschema
 kiwisolver==1.4.8
     # via matplotlib
 lnmmeshio==5.6.3
@@ -78,19 +73,19 @@ meshio==5.3.5
     # via lnmmeshio
 more-itertools==10.7.0
     # via trame-server
-msgpack==1.1.0
+msgpack==1.1.1
     # via wslink
-multidict==6.4.4
+multidict==6.6.3
     # via
     #   aiohttp
     #   yarl
-narwhals==1.41.0
+narwhals==1.48.1
     # via plotly
 nodeenv==1.9.1
     # via pre-commit
-numexpr==2.10.2
+numexpr==2.11.0
     # via -r requirements.in
-numpy==2.2.5
+numpy==2.3.1
     # via
     #   -r requirements.in
     #   contourpy
@@ -104,22 +99,21 @@ numpy==2.2.5
 packaging==25.0
     # via
     #   deprecation
-    #   fourcipp
     #   matplotlib
     #   plotly
     #   pooch
     #   pytest
-pandas==2.2.3
+pandas==2.3.1
     # via -r requirements.in
-pillow==11.2.1
+pillow==11.3.0
     # via
     #   matplotlib
     #   pyvista
 platformdirs==4.3.8
     # via
     #   pooch
     #   virtualenv
-plotly==6.1.2
+plotly==6.2.0
     # via
     #   -r requirements.in
     #   trame-plotly
@@ -129,15 +123,17 @@ pooch==1.8.2
     # via pyvista
 pre-commit==4.2.0
     # via -r requirements.in
-propcache==0.3.1
+propcache==0.3.2
     # via
     #   aiohttp
     #   yarl
-pygments==2.19.1
-    # via rich
+pygments==2.19.2
+    # via
+    #   pytest
+    #   rich
 pyparsing==3.2.3
     # via matplotlib
-pytest==8.3.5
+pytest==8.4.1
     # via -r requirements.in
 python-dateutil==2.9.0.post0
     # via
@@ -147,7 +143,7 @@ python-utils==3.9.1
     # via lnmmeshio
 pytz==2025.2
     # via pandas
-pyvista==0.45.2
+pyvista==0.45.3
     # via -r requirements.in
 pyyaml==6.0.2
     # via
@@ -158,33 +154,29 @@ rapidyaml==0.9.0
     # via fourcipp
 referencing==0.36.2
     # via
-    #   fourcipp
     #   jsonschema
     #   jsonschema-specifications
 requests==2.32.4
     # via pooch
 rich==14.0.0
     # via meshio
-rpds-py==0.24.0
+rpds-py==0.26.0
     # via
-    #   fourcipp
     #   jsonschema
     #   referencing
-ruamel-yaml==0.18.10
+ruamel-yaml==0.18.14
     # via fourcipp
 ruamel-yaml-clib==0.2.12
-    # via
-    #   fourcipp
-    #   ruamel-yaml
+    # via ruamel-yaml
 scooby==0.10.1
     # via pyvista
 six==1.17.0
     # via python-dateutil
 tqdm==4.66.5
     # via lnmmeshio
-trame==3.9.1
+trame==3.11.0
     # via -r requirements.in
-trame-client==3.9.0
+trame-client==3.9.1
     # via
     #   trame
     #   trame-components
@@ -195,27 +187,27 @@ trame-common==1.0.0
     # via
     #   trame
     #   trame-client
-trame-components==2.4.2
+trame-components==2.5.0
     # via -r requirements.in
 trame-plotly==3.1.0
     # via -r requirements.in
-trame-server==3.4.0
+trame-server==3.5.0
     # via trame
-trame-vtk==2.8.15
+trame-vtk==2.9.1
     # via -r requirements.in
 trame-vuetify==3.0.1
     # via -r requirements.in
-typing-extensions==4.13.2
+typing-extensions==4.14.1
     # via
-    #   fourcipp
+    #   aiosignal
     #   python-utils
     #   pyvista
     #   referencing
 tzdata==2025.2
     # via pandas
 urllib3==2.5.0
     # via requests
-virtualenv==20.31.2
+virtualenv==20.32.0
     # via pre-commit
 vtk==9.4.2
     # via
@@ -225,5 +217,5 @@ wslink==2.3.4
     # via
     #   trame
     #   trame-server
-yarl==1.20.0
+yarl==1.20.1
     # via aiohttp

src/fourc_webviewer/fourc_webserver.py

@@ -310,7 +310,7 @@ def init_general_sections_state_and_server_vars(self):
         approach to add them up to the main section SOLVERS.
         """
 
-        self.state.json_schema = CONFIG["json_schema"]
+        self.state.json_schema = CONFIG.fourc_json_schema
 
         # define substrings of section names to exclude
         substr_to_exclude = ["DESIGN", "TOPOLOGY", "ELEMENTS", "NODE", "FUNCT"]