Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/modelskill/model/adapters/_res1d.py
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ def __init__(
self._start = Res1DNode(start_node, {reach.name: start_gridpoint})
self._end = Res1DNode(end_node, {reach.name: end_gridpoint})
self._length = reach.length
self._breakpoints = [
self._breakpoints: list[EdgeBreakPoint] = [
GridPoint(gridpoint) for gridpoint in intermediate_gridpoints
]

Expand All @@ -103,5 +103,5 @@ def length(self) -> float:
return self._length

@property
def breakpoints(self) -> list[GridPoint]:
def breakpoints(self) -> list[EdgeBreakPoint]:
return self._breakpoints
7 changes: 5 additions & 2 deletions src/modelskill/model/network.py
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,7 @@ def breakpoints(self) -> list[EdgeBreakPoint]:
class Network:
"""Network built from a set of edges, with coordinate lookup and data access."""

def __init__(self, edges: list[NetworkEdge]):
def __init__(self, edges: Sequence[NetworkEdge]):
self._edges: dict[str, NetworkEdge] = {e.id: e for e in edges}
self._graph = self._initialize_graph()
self._alias_map = self._initialize_alias_map()
Expand Down Expand Up @@ -561,8 +561,11 @@ def find(
"Must specify either 'node' or both 'edge' and 'distance' parameters"
)

ids: list[str | tuple[str, float]]

if by_node:
# Handle node lookup
assert node is not None
if not isinstance(node, list):
node = [node]
ids = list(node)
Expand Down Expand Up @@ -673,7 +676,7 @@ def recall(self, id: int | list[int]) -> dict[str, Any] | list[dict[str, Any]]:
# Create reverse lookup map
reverse_alias_map = {v: k for k, v in self._alias_map.items()}

results = []
results: list[dict[str, Any]] = []
for node_id in id:
if node_id not in reverse_alias_map:
raise KeyError(f"Node ID {node_id} not found in the network.")
Expand Down