wxGUI/gmodeler: Correct variable replacement in model_convert.py

[gureckyfrantisek]

I found the issue which caused the previous variable in the same string not get recognized.

The issue was that when another match was found, the old value got replaced instead of the updated one called "parametrizedValue".

Also made the curly braces around variable names optional, they get recognized correctly but leaving them mandatory should be readable, that is up for debate.

I tested this with r.in.pdal and a *.laz file and the import worked as expected with both the values replaced with options.

This will resolve #7212.

[landam]

Curly braces enclosing variables were introduced in version 8.5. I assumed this change was meant to ensure backward compatibility, which would be nice. I tested to load model without braces (attached in the issue), the conversion to Python works. But attempt to run the model (directly from the modeler, not converted Python code) fails - no variables are substituted.

p.in.pdal -e -o --overwrite input=%path/dmp1g/%tile.laz output=%tile_dmp method=mean type=FCELL zscale=1.0 iscale=1.0 resolution=%resolution dimension=z
...

Backward compatibility wasn’t explicitly mentioned in the issue. I think it’s fine to keep this change in the PR, but in that case the model execution should be fixed as well.

[gureckyfrantisek]

With the latest commits I changed every re.compile in the gmodeler folder have optional curly braces.

I managed to both run the model directly and have the values parametrized in the generated python code, but I had a leftover empty raster in my map at the end of the process:

Failed to run command 'd.rast map=%tile_chm'. Details:

GRASS_INFO_ERROR(70582,1): Raster map <%tile_chm> not found
GRASS_INFO_END(70582,1)
Failed to run command 'd.rast map=%tile_chm'. Details:

GRASS_INFO_ERROR(70665,1): Raster map <%tile_chm> not found
GRASS_INFO_END(70665,1)

I couldn't see, where the d.rast function is called, it's not in the model or the python code.

It doesn't break it, so I didn't look for a solution yet.

[landam]

@gureckyfrantisek It should be relatively easy to fix see https://github.com/OSGeo/grass/blob/main/gui/wxpython/gmodeler/model_items.py#L692

[landam]

It would be nice to fix in this PR.

[gureckyfrantisek]

I realized that the regex now allows for a variable to be parametrized as %{tile.laz or %tile}.laz, which works but could be unwanted behavior.

Should I improve the regex based on this realization?

[landam]

ealized that the regex now allows for a variable to be parametrized as %{tile.laz or %tile}.laz, which

@gureckyfrantisek Yes, please refine the regex—either adopt curly brace syntax (%{tile}), which is recommended in GRASS 8.5 and newer, or retain the older format (%tile) for compatibility with GRASS 8.4. Nothing between.

[landam]

I tested both models (v1: without braces and v2: with braces), see
06_grass_chm_v3.zip

Run model:

• v1: works
• v2: works

Display result:

• v1: doesn't work

Failed to run command 'd.rast map=%tile_chm'. Details:                          
                                                                                
GRASS_INFO_ERROR(89749,1): Raster map <%tile_chm> not found                     
GRASS_INFO_END(89749,1)  

• v2: doesn't work (see comment above)

Convert to Python script and run:

• v1: works
• v2: works

[landam]

@gureckyfrantisek Just a note: it would be nice to define the regex for variables in a single place and reuse it across the code to avoid duplication. This isn’t a blocker for this PR, as the duplication already exists in the codebase.

[gureckyfrantisek]

The issue is deeper, running the model now displays the maps correctly, but so should the maps when the Display prop is changed in canvas aswell as the map name after running the converted Python script.

I used a very simillar logic for all these cases but only after running the model it is substituted correctly.

Running converted Python doesn't fail but also doesn't display the maps and the Display prop in canvas fails.