pyconvexity 0.5.1__py3-none-any.whl → 0.5.1.post2__py3-none-any.whl

pyconvexity/_version.py

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

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/transformations/time_axis.py

@@ -589,6 +589,16 @@ class TimeAxisModifier:
             # Get time bounds for the new time axis
             new_start_timestamp = new_periods[0].timestamp
             new_end_timestamp = new_periods[-1].timestamp
+            
+            # Calculate the duration of one new period in seconds
+            # This is needed to properly include all original data within the last new period
+            new_period_duration_seconds = new_resolution_minutes * 60
+            
+            # The end timestamp represents the START of the last period, not its end.
+            # To include all original data that falls within the last period,
+            # we need to extend the end boundary by the period duration (minus 1 second
+            # to avoid including the start of the next period).
+            effective_end_timestamp = new_end_timestamp + new_period_duration_seconds - 1
 
             logger.debug(
                 f"Original data: {len(original_values)} points, "
@@ -598,6 +608,10 @@ class TimeAxisModifier:
                 f"New time range: {new_periods[0].formatted_time} to "
                 f"{new_periods[-1].formatted_time}"
             )
+            logger.debug(
+                f"Effective end timestamp for slicing: {effective_end_timestamp} "
+                f"(added {new_period_duration_seconds}s period duration)"
+            )
 
             # Find the slice of original data that falls within the new time range
             start_idx = 0
@@ -609,9 +623,10 @@ class TimeAxisModifier:
                     start_idx = i
                     break
 
-            # Find end index - last period <= new_end_timestamp
+            # Find end index - last period <= effective_end_timestamp
+            # Use effective_end_timestamp to include all data within the last new period
             for i in range(len(original_periods) - 1, -1, -1):
-                if original_periods[i].timestamp <= new_end_timestamp:
+                if original_periods[i].timestamp <= effective_end_timestamp:
                     end_idx = i + 1  # +1 because slice end is exclusive
                     break
 

{pyconvexity-0.5.1.dist-info → pyconvexity-0.5.1.post2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyconvexity
-Version: 0.5.1
+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.dist-info → pyconvexity-0.5.1.post2.dist-info}/RECORD

@@ -1,5 +1,5 @@
 pyconvexity/__init__.py,sha256=Prol-EntlU_jWLR3D55ZRYqkLnenLnt5cXVc_NT1cI4,5934
-pyconvexity/_version.py,sha256=eZ1bOun1DDVV0YLOBW4wj2FP1ajReLjbIrGmzN7ASBw,22
+pyconvexity/_version.py,sha256=NzwicjWvX-oujWpkElhba_Uhu9tnA3prazJglxgYyRM,28
 pyconvexity/dashboard.py,sha256=7x04Hr-EwzTAf-YJdHzfV83Gf2etltwtzwh_bCYJ5lk,8579
 pyconvexity/timeseries.py,sha256=QdKbiqjAlxkJATyKm2Kelx1Ea2PsAnnCYfVLU5VER1Y,11085
 pyconvexity/core/__init__.py,sha256=gdyyHNqOc4h9Nfe9u6NA936GNzH6coGNCMgBvvvOnGE,1196
@@ -34,14 +34,14 @@ pyconvexity/solvers/pypsa/batch_loader.py,sha256=ZgOcZqMnMS3TOYTq2Ly2O4cuwhNNAic
 pyconvexity/solvers/pypsa/builder.py,sha256=1ZU68Wtl_jQSXHzspKQDkR6bxAVU1nKvPfnPUl0aO3k,23256
 pyconvexity/solvers/pypsa/clearing_price.py,sha256=HdAk7GPfJFVI4t6mL0zQGEOMAvuyfpl0yNCnah1ZGH0,29164
 pyconvexity/solvers/pypsa/constraints.py,sha256=20WliFDhPQGMAsS4VOTU8LZJpsFpLVRHpNsZW49GTcc,16397
-pyconvexity/solvers/pypsa/solver.py,sha256=pNI9ch0vO5q-8mWc3RHTscWB_ymj4s2lVJQ_e2nbzHY,44417
+pyconvexity/solvers/pypsa/solver.py,sha256=JcjIv9yU3YhEDUN4kllRe2NP6y56LD_LBlymHGWDflc,45806
 pyconvexity/solvers/pypsa/storage.py,sha256=nbONOBnunq3tyexa5yDUsT9xdxieUfrqhoM76_2HIGg,94956
 pyconvexity/transformations/__init__.py,sha256=JfTk0b2O3KM22Dcem2ZnNvDDBmlmqS2X3Q_cO0H3r44,406
 pyconvexity/transformations/api.py,sha256=t_kAAk9QSF1YTlrTM7BECd_v08jUgXVV6e9iX2M0aAg,3694
-pyconvexity/transformations/time_axis.py,sha256=VyQPp09PyIr7IlxoKPeZCMkHPKPcIhI9ap_6kCyzjyk,28362
+pyconvexity/transformations/time_axis.py,sha256=Cr_H-FozXLQno4n6jMSZCTj3M4h7tGpsuqGcMW2qghY,29322
 pyconvexity/validation/__init__.py,sha256=VJNZlFoWABsWwUKktNk2jbtXIepH5omvC0WtsTS7o3o,583
 pyconvexity/validation/rules.py,sha256=GiNadc8hvbWBr09vUkGiLLTmSdvtNSeGLFwvCjlikYY,9241
-pyconvexity-0.5.1.dist-info/METADATA,sha256=DUDViqyeOCBaSihifxoHTu7P4tjBms1JU90L3jGdbxc,4967
-pyconvexity-0.5.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pyconvexity-0.5.1.dist-info/top_level.txt,sha256=wFPEDXVaebR3JO5Tt3HNse-ws5aROCcxEco15d6j64s,12
-pyconvexity-0.5.1.dist-info/RECORD,,
+pyconvexity-0.5.1.post2.dist-info/METADATA,sha256=QhPbcPges-IW8J6QabgcVwvouxNrPwrkDe21sDT3yls,4973
+pyconvexity-0.5.1.post2.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+pyconvexity-0.5.1.post2.dist-info/top_level.txt,sha256=wFPEDXVaebR3JO5Tt3HNse-ws5aROCcxEco15d6j64s,12
+pyconvexity-0.5.1.post2.dist-info/RECORD,,

{pyconvexity-0.5.1.dist-info → pyconvexity-0.5.1.post2.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.9.0)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any