Feature/include file input #31

LaSi5002 · 2025-11-11T10:24:19Z

No description provided.

dragos-ana

Thanks for the nice addition!
I left some comments / questions.

dragos-ana · 2025-11-20T06:44:50Z

src/fourc_webviewer/fourc_webserver.py

-            temp_dir=Path(self._server_vars["temp_dir_object"].name),
-        )
-        self.state.vtu_path = fourc_geometry.vtu_file_path
+        if "render_window" not in self._actors:


Suggested change

if "render_window" not in self._actors:

if "render_window" not in self._server_vars:

As in #30, the render window should be saved only once in the server vars.

Yes of course. Overlooked it again

dragos-ana · 2025-11-20T06:56:54Z

src/fourc_webviewer/fourc_webserver.py

+            self._server_vars["temp_dir_object"].name
+            + "\\"
+            + self._server_vars["fourc_yaml_name"]
+        ).exists():


Suggested change

self._server_vars["temp_dir_object"].name

+ "\\"

+ self._server_vars["fourc_yaml_name"]

).exists():

self._server_vars["temp_dir_object"].name

/

self._server_vars["fourc_yaml_name"]

).exists():

The current code is Windows-only! We don't need to specify delimiters for Path, but can use a normal forward-slash.
Please adapt this for each occurence, the webviewer does not start for other OS.

Sorry, I didn't know about that. I will change it

dragos-ana · 2025-11-20T07:01:11Z

src/fourc_webviewer/fourc_webserver.py

+            if not Path(
+                self._server_vars["temp_dir_object"].name
+                + "\\"
+                + Path(
+                    self._server_vars["fourc_yaml_content"]
+                    .sections.get("STRUCTURE GEOMETRY", {})
+                    .get("FILE")
+                ).name
+            ).exists():


Please make this better readable by splitting the long chain into dedicated variables. You can already reuse geometry_file_name

dragos-ana · 2025-11-20T07:06:03Z

src/fourc_webviewer/fourc_webserver.py

+                + "\\"
+                + self._server_vars["fourc_yaml_name"]
+            )
+        geometry_file_name = (


Suggested change

geometry_file_name = (

# verify whether an eventual included geometry file exists within the temp dir

geometry_file_name = (

dragos-ana · 2025-11-20T07:12:34Z

src/fourc_webviewer/fourc_webserver.py

+                    if "e" in all_contained_var_names:
+                        all_contained_var_names.remove("e")
+                    if "E" in all_contained_var_names:
+                        all_contained_var_names.remove("E")


Maybe this check is better suited within get_variable_names_in_funct_expression directly

Yes definitely. At the time it was just supposed to be a quick fix so i could open all the yaml files, but I will implement it properly now.

dragos-ana · 2025-11-20T07:23:43Z

src/fourc_webviewer/fourc_webserver.py

+                with open(include_file_server, "rb") as fr:
+                    with open(include_temp_path, "wb") as fw:
+                        fw.write(fr.read())


shutil.copyfile might be better for this. Also, what should this check provide? If a file with the same name is present in the initial file directory, then it should be copied to the temp dir? What about the case where you upload a completely new file, and within its INCLUDES section it references to a file which coincidentally has the same name as one of the files present in the initial file directory? Then it would basically get replaced by the old file, right? If so, this should be changed.
IMO, this function requires some comments to better understand the information flow.

I commented the file so it can be better understood.
The reason why I added this copy functionality is, that if the user is working on a specific yaml file and uses the webviewer frequently, they should not have to upload the exodus file every time they open the yaml file. Now he can copy the .exo file into the server directory and it will be automatically loaded every time the file gets opened.

The important thing is that include_file_server does only refer to the initial directory if the file was uploaded from the server. Which would not be the case in most situations.

Of course I can remove this feature, but I believe that it could be very nice for quality of life.
I think it would be best if we had a small meeting about this and some other final things about the viewer.

dragos-ana · 2025-11-20T07:53:27Z

src/fourc_webviewer/fourc_webserver.py

+            print(
+                "Warning: File does not have a .yml / .yaml / .dat / .DAT ending or is empty. Try opening another file."
+            )
+            return


Why not raise an Exception?

The viewer should not be closed if the user opens a wrong file. He can just open the right one without any problem. I can remove the Warning if you think its not adequate.

dragos-ana · 2025-11-20T07:57:07Z

src/fourc_webviewer/fourc_webserver.py

-        self._server_vars["render_count"]["change_fourc_yaml_file"] += 1
-        if self._server_vars["render_count"]["change_fourc_yaml_file"] > 1:
-            self.state.vtu_path = ""
+        if self._server_vars["fourc_yaml_read_in_status"]:


Shouldn't self.state.included_files be emptied at some point when changing files? We would not want residual files from the previous study within the current session...

Yes, it gets emptied once you request the include files (request_included_files) which recalculates the needed files and prompts the user to upload them

dragos-ana · 2025-11-20T08:06:16Z

src/fourc_webviewer/fourc_webserver.py

+
+        self._server_vars["fourc_yaml_name"] = temp_fourc_yaml_file.name
+
+        self.request_included_files()


Here you removed the render_count part, which emptied the vtu path if a new file was considered. This was only done for "non-initial" renderings, because this function is also called at startup. The vtu path was then created subsequent to conversion after pressing CONVERT. Does this work reliably after removing this aspect? Does changing files make the visualization disappear until you press CONVERT?

This is also a topic I would like to discuss. I removed the convert functionality (although some artifacts of it remain currently) as I did not see the need to explicitly ask the user to confirm. The vtu path is now set in init_pyvista_render_objects, so exactly as the actors are set up. This works reliably and I have not encountered any problems until now.

dragos-ana · 2025-11-20T08:11:02Z

src/fourc_webviewer/gui_utils.py

                        ),
-                        blur=server.controller.on_leave_edit_field,
-                        update_modelValue="flushState('general_sections')",  # this is required in order to flush the state changes correctly to the server, as our passed on v-model is a nested variable
+                        update_modelValue="flushState('add_value')",  # this is required in order to flush the state changes correctly to the server, as our passed on v-model is a nested variable


I think this was more reliable for changes of general_sections rather than add_value. What is the motivation behind changing it? And why is the blur removed?

This was a bug fix of the add value field at the bottom right of the edit mode. It should not flush general_sections because the variable it refences is add_value which is not part of general_sections.

LaSi5002 and others added 3 commits November 10, 2025 22:15

Add include files pop up

871db10

Add yaml includes recursive

918ac2e

Merge branch 'main' into feature/include-file-input

ee88cf7

dragos-ana requested changes Nov 20, 2025

View reviewed changes

improve readability and fixes

6109f1a

	if "render_window" not in self._actors:
	if "render_window" not in self._server_vars:

	geometry_file_name = (
	# verify whether an eventual included geometry file exists within the temp dir
	geometry_file_name = (


		self._server_vars["fourc_yaml_name"] = temp_fourc_yaml_file.name

		self.request_included_files()

Feature/include file input #31

Are you sure you want to change the base?

Feature/include file input #31

Uh oh!

Conversation

LaSi5002 commented Nov 11, 2025

Uh oh!

dragos-ana left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants