solve typing issues and move util methods to functions in solvers.py

PyPSA · Sep 23, 2024 · 53d6f3f · 53d6f3f
1 parent 40de2b8
commit 53d6f3f
Show file tree

Hide file tree

Showing 3 changed files with 89 additions and 74 deletions.
diff --git a/linopy/constants.py b/linopy/constants.py
@@ -208,7 +208,7 @@ class Result:
 
     status: Status
     solution: Union[Solution, None] = None
-    solver_model: Union[Any, None] = None
+    solver_model: Any = None
 
     def __repr__(self) -> str:
         solver_model_string = (

diff --git a/linopy/model.py b/linopy/model.py
@@ -49,7 +49,7 @@
 )
 from linopy.matrices import MatrixAccessor
 from linopy.objective import Objective
-from linopy.solvers import available_solvers, quadratic_solvers
+from linopy.solvers import available_solvers, quadratic_solvers, Solver
 from linopy.types import (
     ConstantLike,
     ConstraintLike,
@@ -79,6 +79,9 @@ class Model:
     the optimization process.
     """
 
+    solver_model: Any
+    solver_name: str
+
     __slots__ = (
         # containers
         "_variables",