pyconvexity 0.5.1.post1__tar.gz → 0.5.1.post2__tar.gz

{pyconvexity-0.5.1.post1 → pyconvexity-0.5.1.post2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyconvexity
-Version: 0.5.1.post1
+Version: 0.5.1.post2
 Summary: Python library for energy system modeling and optimization with PyPSA
 Author-email: Convexity Team <info@convexity.com>
 License: MIT

{pyconvexity-0.5.1.post1 → pyconvexity-0.5.1.post2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pyconvexity"
-version = "0.5.1.post1"
+version = "0.5.1.post2"
 description = "Python library for energy system modeling and optimization with PyPSA"
 readme = "README.md"
 license = {text = "MIT"}
@@ -81,7 +81,7 @@ profile = "black"
 line_length = 88
 
 [tool.mypy]
-python_version = "0.5.1.post1"
+python_version = "0.5.1.post2"
 warn_return_any = true
 warn_unused_configs = true
 disallow_untyped_defs = true

pyconvexity-0.5.1.post2/src/pyconvexity/_version.py

@@ -0,0 +1 @@
+__version__ = "0.5.1.post2"

{pyconvexity-0.5.1.post1 → pyconvexity-0.5.1.post2}/src/pyconvexity/solvers/pypsa/solver.py

@@ -502,7 +502,11 @@ class NetworkSolver:
         """
         try:
             # Extract basic solve information
-            status = getattr(result, "status", "unknown")
+            # PyPSA's result may be a tuple or object, and may not have a status attribute
+            raw_status = getattr(result, "status", None)
+            if raw_status is None:
+                raw_status = "unknown"
+            
             objective_value = getattr(network, "objective", None)
 
             # Convert PyPSA result to dictionary format
@@ -510,12 +514,34 @@ class NetworkSolver:
 
             # Determine success based on multiple criteria
             success = self._determine_solve_success(
-                result, network, status, objective_value
+                result, network, raw_status, objective_value
             )
+            
+            # Update status to reflect the determined success
+            # This ensures database and API consumers get meaningful status values
+            if success:
+                # If we determined success, set status to "optimal" unless we have better info
+                if raw_status in ["optimal", "feasible"]:
+                    status = raw_status
+                elif hasattr(result, "termination_condition"):
+                    term_condition = str(result.termination_condition).lower()
+                    if "optimal" in term_condition:
+                        status = "optimal"
+                    else:
+                        status = "feasible"  # Solved successfully but not necessarily optimal
+                else:
+                    status = "optimal"  # Default for successful solves
+            else:
+                # If solve failed, use raw status or "failed"
+                if raw_status not in ["unknown", "", None]:
+                    status = raw_status
+                else:
+                    status = "failed"
 
             solve_result = {
                 "success": success,
-                "status": status,
+                "status": status,  # Now contains meaningful status instead of "unknown"
+                "raw_status": raw_status,  # Keep original PyPSA status for debugging
                 "solve_time": solve_time,
                 "solver_name": solver_name,
                 "run_id": run_id,

{pyconvexity-0.5.1.post1 → pyconvexity-0.5.1.post2}/src/pyconvexity.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyconvexity
-Version: 0.5.1.post1
+Version: 0.5.1.post2
 Summary: Python library for energy system modeling and optimization with PyPSA
 Author-email: Convexity Team <info@convexity.com>
 License: MIT

pyconvexity-0.5.1.post1/src/pyconvexity/_version.py

@@ -1 +0,0 @@
-__version__ = "0.5.1.post1"