Merge branch 'feat/add-from-txt' into feature/downstream_node_performance-V2

Author: Thijss

VERSION

@@ -1 +1 @@
-1.0
+1.1

src/power_grid_model_ds/_core/model/grids/_text_sources.py

@@ -5,7 +5,6 @@
 """Create a grid from text a text file"""
 
 import logging
-import re
 from typing import TYPE_CHECKING
 
 from power_grid_model_ds._core.model.enums.nodes import NodeType
@@ -49,19 +48,17 @@ def load_from_txt(self, *args: str) -> "Grid":
     @staticmethod
     def read_txt(txt_lines: list[str]) -> tuple[set, dict]:
         """Extract assets from text"""
+
         txt_nodes = set()
         txt_branches = {}
         for text_line in txt_lines:
             if not text_line.strip() or text_line.startswith("#"):
                 continue  # skip empty lines and comments
-
-            pattern = re.compile(r"^\s*(\S+)\s+(\S+)(?:\s+(\S+))?\s*$")
-            match = pattern.match(text_line)
-            if not match:
-                raise ValueError(f"Text line '{text_line}' is invalid. Skipping...")
-
-            from_node_str, to_node_str, comment = match.groups()
-            comments = comment.split(",") if comment else []
+            try:
+                from_node_str, to_node_str, *comments = text_line.strip().split()
+            except ValueError as err:
+                raise ValueError(f"Text line '{text_line}' is invalid. Skipping...") from err
+            comments = comments[0].split(",") if comments else []
 
             txt_nodes |= {from_node_str, to_node_str}
             txt_branches[(from_node_str, to_node_str)] = comments

tests/unit/model/grids/test_grid_base.py

@@ -327,7 +327,7 @@ def test_from_txt_with_conflicting_ids(self):
 
     def test_from_txt_with_invalid_line(self):
         with pytest.raises(ValueError):
-            Grid.from_txt("S1 2 arg3 arg4")
+            Grid.from_txt("S1")
 
     def test_from_txt_with_unordered_node_ids(self):
         grid = Grid.from_txt("S1 2", "S1 10", "10 11", "2 5", "5 6", "3 4", "3 7")