Update rips module, proto files, and Python examples

magnesj · magnesj · commit 8524b2ab6ac8 · 2026-02-10T07:35:14.000+01:00
diff --git a/docs/rips/PythonExamples/case_and_grid_operations/case_grid_group.py b/docs/rips/PythonExamples/case_and_grid_operations/case_grid_group.py
@@ -12,9 +12,9 @@
 case_paths.append(test_model_path + "/Case_with_10_timesteps/Real40/BRUGGE_0040.EGRID")
 
 for case_path in case_paths:
-    assert os.path.exists(
-        case_path
-    ), "You need to set valid case paths for this script to work"
+    assert os.path.exists(case_path), (
+        "You need to set valid case paths for this script to work"
+    )
 
 case_group = resinsight.project.create_grid_case_group(case_paths=case_paths)
 
diff --git a/docs/rips/PythonExamples/case_and_grid_operations/case_grid_group_generated_results.py b/docs/rips/PythonExamples/case_and_grid_operations/case_grid_group_generated_results.py
@@ -13,9 +13,9 @@
 case_paths.append(test_model_path + "/Case_with_10_timesteps/Real40/BRUGGE_0040.EGRID")
 
 for case_path in case_paths:
-    assert os.path.exists(
-        case_path
-    ), "You need to set valid case paths for this script to work"
+    assert os.path.exists(case_path), (
+        "You need to set valid case paths for this script to work"
+    )
 
 case_group = resinsight.project.create_grid_case_group(case_paths=case_paths)
 
diff --git a/docs/rips/PythonExamples/case_and_grid_operations/result_aliases.py b/docs/rips/PythonExamples/case_and_grid_operations/result_aliases.py
@@ -67,5 +67,5 @@
 
 try:
     alias_result = roff_case.grid_property("STATIC_NATIVE", "PERMX", 0)
-except:
+except Exception:
     print("Result PERMX no longer exists!")
diff --git a/docs/rips/PythonExamples/wells_and_fractures/modeled_well_path_lateral.py b/docs/rips/PythonExamples/wells_and_fractures/modeled_well_path_lateral.py
@@ -60,8 +60,8 @@
 # Check that lateral is a lateral
 parentWell = lateral.parent_branch()
 
-if parentWell != None:
+if parentWell is not None:
     print("Parent is " + parentWell.name)
 
-if parentWell.parent_branch() == None:
+if parentWell.parent_branch() is None:
     print("Parent is top level well.")
diff --git a/docs/rips/__init__.py b/docs/rips/__init__.py
@@ -3,7 +3,7 @@
 
 sys.path.insert(0, os.path.join(os.path.dirname(__file__), "generated"))
 
-from .resinsight_classes import *
+from .resinsight_classes import *  # noqa: F403
 
 from .case import Case as Case, EclipseCase as EclipseCase, GeoMechCase as GeoMechCase
 from .grid import Grid as Grid
@@ -17,15 +17,15 @@
 )
 from .well_log_plot import WellLogPlot as WellLogPlot
 from .well_path import WellPath as WellPath
-from . import well_path_collection
+from . import well_path_collection as well_path_collection  # noqa: F401
 from .simulation_well import SimulationWell as SimulationWell
 from .exception import RipsError as RipsError
 from .surface import RegularSurface as RegularSurface
 
 from typing import List
 
 __all__: List[str] = []
-for key in class_dict():
+for key in class_dict():  # noqa: F405
     __all__.append(key)
 
 # Add classes not in resinsight_classes
diff --git a/docs/rips/contour_map.py b/docs/rips/contour_map.py
@@ -37,7 +37,7 @@ def export_to_text(
 
 
 @add_method(GeoMechContourMap)
-def export_to_text(
+def export_to_text(  # noqa: F811
     self: GeoMechContourMap,
     export_file_name: str = "",
     export_local_coordinates: bool = False,
diff --git a/docs/rips/instance.py b/docs/rips/instance.py
@@ -14,6 +14,7 @@
 import signal
 import sys
 import json
+import subprocess
 
 import grpc
 
@@ -164,7 +165,7 @@ def launch(
         with tempfile.TemporaryDirectory() as tmp_dir_path:
             port_number_file = tmp_dir_path + "/portnumber.txt"
             parameters: List[str] = [
-                "ResInsight",
+                resinsight_executable,
                 "--server",
                 str(requested_port),
                 "--portnumberfile",
@@ -178,7 +179,8 @@ def launch(
             for i in range(0, len(parameters)):
                 parameters[i] = str(parameters[i])
 
-            pid = os.spawnv(os.P_NOWAIT, resinsight_executable, parameters)
+            process = subprocess.Popen(parameters)
+            pid = process.pid
             if pid:
                 port = Instance.__read_port_number_from_file(
                     port_number_file, init_timeout
diff --git a/docs/rips/resinsight_classes.py b/docs/rips/resinsight_classes.py
@@ -1 +1 @@
-from .generated.generated_classes import *
+from .generated.generated_classes import *  # noqa: F403
diff --git a/docs/rips/tests/conftest.py b/docs/rips/tests/conftest.py
@@ -1,9 +1,13 @@
 import pytest
 import sys
 import os
+import multiprocessing
+
+# Use spawn instead of fork to avoid deadlocks with gRPC threads
+multiprocessing.set_start_method("spawn", force=True)
 
 sys.path.insert(1, os.path.join(sys.path[0], "../../"))
-import rips
+import rips  # noqa: E402
 
 _rips_instance = None
 
diff --git a/docs/rips/tests/test_completion_export.py b/docs/rips/tests/test_completion_export.py
@@ -2,7 +2,6 @@
 import os
 
 sys.path.insert(1, os.path.join(sys.path[0], "../../"))
-import rips
 
 import dataroot
 
@@ -69,9 +68,9 @@ def compare_with_reference(
     Raises:
         AssertionError: If files don't match or don't exist
     """
-    assert os.path.exists(
-        export_file_path
-    ), f"Export {file_description} does not exist: {export_file_path}"
+    assert os.path.exists(export_file_path), (
+        f"Export {file_description} does not exist: {export_file_path}"
+    )
 
     with open(export_file_path, "r") as f:
         content = f.read()
diff --git a/docs/rips/tests/test_export_corner_point_grid.py b/docs/rips/tests/test_export_corner_point_grid.py
@@ -112,9 +112,9 @@ def test_export_corner_point_grid_roundtrip(rips_instance, initialize_test):
     )
 
     assert original_case is not None, "Failed to load test case"
-    assert (
-        original_case.name == "BRUGGE_0000"
-    ), f"Expected case name BRUGGE_0000, got {original_case.name}"
+    assert original_case.name == "BRUGGE_0000", (
+        f"Expected case name BRUGGE_0000, got {original_case.name}"
+    )
 
     # Get original geometry data for comparison
     original_active_count = original_case.cell_count().active_cell_count
diff --git a/docs/rips/tests/test_faults.py b/docs/rips/tests/test_faults.py
@@ -1,10 +1,8 @@
 import sys
 import os
 import math
-import pytest
 
 sys.path.insert(1, os.path.join(sys.path[0], "../../"))
-import rips
 
 import dataroot
 
diff --git a/docs/rips/tests/test_get_completion_data.py b/docs/rips/tests/test_get_completion_data.py
@@ -9,8 +9,6 @@
 
 import dataroot
 
-import pytest
-
 
 def test_get_completion_data_basic(rips_instance, initialize_test):
     """Test GetCompletionData with a well path and completions"""
@@ -148,7 +146,7 @@ def test_get_completion_data_multiple_intervals(rips_instance, initialize_test):
 
     # Import existing well path
     well_path_file = case_root_path + "/wellpath_a.dev"
-    well_path_names = rips_instance.project.import_well_paths([well_path_file])
+    rips_instance.project.import_well_paths([well_path_file])
     wells = rips_instance.project.well_paths()
     well_path = wells[0]
     well_path.name = "TestMultiInterval"
@@ -223,7 +221,7 @@ def test_get_completion_data_field_validation(rips_instance, initialize_test):
 
     # Import existing well path
     well_path_file = case_root_path + "/wellpath_a.dev"
-    well_path_names = rips_instance.project.import_well_paths([well_path_file])
+    rips_instance.project.import_well_paths([well_path_file])
     wells = rips_instance.project.well_paths()
     well_path = wells[0]
     well_path.name = "FieldValidationTest"
@@ -406,16 +404,16 @@ def test_get_completion_data_stability_comprehensive(rips_instance, initialize_t
         if compdat.HasField("diameter"):
             assert abs(compdat.diameter - 0.25) < 0.001, "Diameter should match input"
         if compdat.HasField("skin_factor"):
-            assert (
-                abs(compdat.skin_factor - 0.1) < 0.001
-            ), "Skin factor should match input"
+            assert abs(compdat.skin_factor - 0.1) < 0.001, (
+                "Skin factor should match input"
+            )
         if compdat.HasField("start_md") and compdat.HasField("end_md"):
-            assert (
-                2190.0 <= compdat.start_md <= 2610.0
-            ), "Start MD should be in expected range"
-            assert (
-                2190.0 <= compdat.end_md <= 2610.0
-            ), "End MD should be in expected range"
+            assert 2190.0 <= compdat.start_md <= 2610.0, (
+                "Start MD should be in expected range"
+            )
+            assert 2190.0 <= compdat.end_md <= 2610.0, (
+                "End MD should be in expected range"
+            )
             assert compdat.end_md >= compdat.start_md, "End MD should be >= start MD"
 
 
@@ -467,12 +465,12 @@ def test_completion_data_regression_reference(rips_instance, initialize_test):
         print("Re-run the test to validate against the reference")
 
         # Validate the generated data has expected structure
-        assert (
-            len(current_results["compdat"]) > 0
-        ), "Should have COMPDAT entries in reference"
-        assert (
-            len(current_results["welspecs"]) > 0
-        ), "Should have WELSPECS entries in reference"
+        assert len(current_results["compdat"]) > 0, (
+            "Should have COMPDAT entries in reference"
+        )
+        assert len(current_results["welspecs"]) > 0, (
+            "Should have WELSPECS entries in reference"
+        )
 
 
 def generate_reference_completion_data(rips_instance):
@@ -594,34 +592,34 @@ def validate_compdat_properties(
         assert compdat.grid_i > 0, f"Entry {i}: Grid I should be positive"
         assert compdat.grid_j > 0, f"Entry {i}: Grid J should be positive"
         assert compdat.upper_k > 0, f"Entry {i}: Upper K should be positive"
-        assert (
-            compdat.lower_k >= compdat.upper_k
-        ), f"Entry {i}: Lower K should be >= upper K"
+        assert compdat.lower_k >= compdat.upper_k, (
+            f"Entry {i}: Lower K should be >= upper K"
+        )
         assert compdat.open_shut_flag in [
             "OPEN",
             "SHUT",
         ], f"Entry {i}: Invalid open/shut flag"
 
         # Validate optional fields when present
         if compdat.HasField("transmissibility"):
-            assert (
-                compdat.transmissibility >= 0
-            ), f"Entry {i}: Transmissibility should be non-negative"
+            assert compdat.transmissibility >= 0, (
+                f"Entry {i}: Transmissibility should be non-negative"
+            )
 
         if compdat.HasField("diameter") and expected_diameter is not None:
-            assert (
-                abs(compdat.diameter - expected_diameter) < 0.001
-            ), f"Entry {i}: Diameter mismatch"
+            assert abs(compdat.diameter - expected_diameter) < 0.001, (
+                f"Entry {i}: Diameter mismatch"
+            )
 
         if compdat.HasField("skin_factor") and expected_skin is not None:
-            assert (
-                abs(compdat.skin_factor - expected_skin) < 0.001
-            ), f"Entry {i}: Skin factor mismatch"
+            assert abs(compdat.skin_factor - expected_skin) < 0.001, (
+                f"Entry {i}: Skin factor mismatch"
+            )
 
         if compdat.HasField("start_md") and compdat.HasField("end_md"):
-            assert (
-                compdat.end_md >= compdat.start_md
-            ), f"Entry {i}: End MD should be >= start MD"
+            assert compdat.end_md >= compdat.start_md, (
+                f"Entry {i}: End MD should be >= start MD"
+            )
             assert compdat.start_md >= 0, f"Entry {i}: Start MD should be non-negative"
 
         if compdat.HasField("kh"):
@@ -703,7 +701,7 @@ def test_completion_data_reference_failure_simulation(rips_instance, initialize_
     well_path.update()
 
     # Same completion parameters as reference
-    perf_interval = well_path.append_perforation_interval(
+    well_path.append_perforation_interval(
         start_md=2200.0, end_md=2600.0, diameter=0.25, skin_factor=0.1
     )
 
@@ -721,12 +719,12 @@ def test_completion_data_reference_failure_simulation(rips_instance, initialize_
         reference_results = json.load(f)
 
     # This should fail because well names are different
-    assert (
-        modified_results["compdat"] != reference_results["compdat"]
-    ), "Modified data should differ from reference (well name changed)"
-    assert (
-        modified_results["welspecs"] != reference_results["welspecs"]
-    ), "Modified WELSPECS should differ from reference (well name changed)"
+    assert modified_results["compdat"] != reference_results["compdat"], (
+        "Modified data should differ from reference (well name changed)"
+    )
+    assert modified_results["welspecs"] != reference_results["welspecs"], (
+        "Modified WELSPECS should differ from reference (well name changed)"
+    )
 
     print("Reference test correctly detects data changes")
 
@@ -769,9 +767,9 @@ def test_welspecs_grid_name_field(rips_instance, initialize_test):
         # This results in WELSPECS output (not WELSPECL)
         if welspec.HasField("grid_name"):
             # If grid_name field exists, it should be empty for main grid
-            assert (
-                welspec.grid_name.strip() == ""
-            ), "Main grid wells should have empty grid_name"
+            assert welspec.grid_name.strip() == "", (
+                "Main grid wells should have empty grid_name"
+            )
 
         # Verify required WELSPECS fields
         assert welspec.group_name, "Should have group name"
@@ -813,9 +811,7 @@ def test_completion_data_cross_validation(rips_instance, initialize_test):
     start_md = 2400.0
     end_md = 2420.0
 
-    perf_interval = well_path.append_perforation_interval(
-        start_md, end_md, diameter, skin_factor
-    )
+    well_path.append_perforation_interval(start_md, end_md, diameter, skin_factor)
 
     # Get data via gRPC API
     completion_data = well_path.completion_data(case.id)
@@ -835,17 +831,17 @@ def test_completion_data_cross_validation(rips_instance, initialize_test):
 
                 # Also check skin factor for this entry
                 if compdat.HasField("skin_factor"):
-                    assert (
-                        abs(compdat.skin_factor - skin_factor) < 0.001
-                    ), "Skin factor should match"
+                    assert abs(compdat.skin_factor - skin_factor) < 0.001, (
+                        "Skin factor should match"
+                    )
 
                 # Check MD range
                 if compdat.HasField("start_md") and compdat.HasField("end_md"):
-                    assert (
-                        start_md <= compdat.start_md <= end_md + 5
-                    ), "Start MD should be in range"
-                    assert (
-                        start_md <= compdat.end_md <= end_md + 5
-                    ), "End MD should be in range"
+                    assert start_md <= compdat.start_md <= end_md + 5, (
+                        "Start MD should be in range"
+                    )
+                    assert start_md <= compdat.end_md <= end_md + 5, (
+                        "End MD should be in range"
+                    )
 
     assert found_matching_entry, f"Should find COMPDAT entry with diameter {diameter}"
diff --git a/docs/rips/tests/test_laterals.py b/docs/rips/tests/test_laterals.py
diff --git a/docs/rips/tests/test_msw_completion_data.py b/docs/rips/tests/test_msw_completion_data.py
diff --git a/docs/rips/tests/test_pdmobject_validation.py b/docs/rips/tests/test_pdmobject_validation.py
diff --git a/docs/rips/tests/test_summary_cases.py b/docs/rips/tests/test_summary_cases.py
diff --git a/docs/rips/tests/test_wells.py b/docs/rips/tests/test_wells.py
diff --git a/docs/rips/tests/test_windows_paths.py b/docs/rips/tests/test_windows_paths.py

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-from .generated.generated_classes import *`
	`1`	`+from .generated.generated_classes import * # noqa: F403`