pyconvexity 0.4.8__py3-none-any.whl → 0.4.9__py3-none-any.whl

pyconvexity/_version.py

@@ -1 +1 @@
-__version__ = "0.4.8"
+__version__ = "0.4.9"

pyconvexity/solvers/pypsa/solver.py

@@ -149,9 +149,17 @@ class NetworkSolver:
         run_id = str(uuid.uuid4())
 
         try:
-            # Get solver configuration
+            # Extract PyPSA-specific options that shouldn't be passed to the solver
+            pypsa_options = {}
+            filtered_solver_options = solver_options.copy() if solver_options else {}
+            
+            # linearized_unit_commitment is a PyPSA option, not a solver option
+            if filtered_solver_options.get('linearized_unit_commitment'):
+                pypsa_options['linearized_unit_commitment'] = filtered_solver_options.pop('linearized_unit_commitment')
+            
+            # Get solver configuration (with filtered options)
             actual_solver_name, solver_config = self._get_solver_config(
-                solver_name, solver_options, custom_solver_config
+                solver_name, filtered_solver_options if filtered_solver_options else None, custom_solver_config
             )
 
             # Resolve discount rate - fallback to 0.0 if None
@@ -197,19 +205,22 @@ class NetworkSolver:
             # NOTE: Model constraints are applied DURING solve via extra_functionality
             # Network constraints were already applied to the network structure before solve
 
+            # Build optimize kwargs
+            optimize_kwargs = {
+                'solver_name': actual_solver_name,
+                'multi_investment_periods': True,
+                'extra_functionality': extra_functionality,
+            }
+            
+            # Add solver config if present
             if solver_config:
-                result = network.optimize(
-                    solver_name=actual_solver_name,
-                    multi_investment_periods=True,
-                    extra_functionality=extra_functionality,
-                    **solver_config,
-                )
-            else:
-                result = network.optimize(
-                    solver_name=actual_solver_name,
-                    multi_investment_periods=True,
-                    extra_functionality=extra_functionality,
-                )
+                optimize_kwargs.update(solver_config)
+            
+            # Add PyPSA-specific options (like linearized_unit_commitment)
+            if pypsa_options:
+                optimize_kwargs.update(pypsa_options)
+            
+            result = network.optimize(**optimize_kwargs)
 
             solve_time = time.time() - start_time
 
@@ -385,7 +396,7 @@ class NetworkSolver:
             mosek_default_options = {
                 "solver_options": {
                     "MSK_DPAR_MIO_REL_GAP_CONST": 0.05,  # MIP relative gap tolerance (5% to match Gurobi)
-                    "MSK_IPAR_MIO_MAX_TIME": 36000,  # Max time 1 hour
+                    "MSK_DPAR_MIO_MAX_TIME": 36000,  # Max time 10 hours
                 }
             }
             if solver_options:
@@ -448,7 +459,7 @@ class NetworkSolver:
             mosek_defaults = {
                 "solver_options": {
                     "MSK_DPAR_MIO_REL_GAP_CONST": 0.05,  # Match Gurobi 5% MIP gap (was 1e-4)
-                    "MSK_IPAR_MIO_MAX_TIME": 36000,  # Max time 1 hour
+                    "MSK_DPAR_MIO_MAX_TIME": 36000,  # Max time 10 hours
                     "MSK_IPAR_NUM_THREADS": 0,  # Use all cores (0 = auto)
                 }
             }

pyconvexity/solvers/pypsa/storage.py

@@ -4,12 +4,16 @@ Result storage functionality for PyPSA solver integration.
 Handles storing solve results back to the database with proper validation and error handling.
 """
 
+import logging
 import uuid
 import pandas as pd
 import numpy as np
 from typing import Dict, Any, Optional, Callable
 
 from pyconvexity.core.types import StaticValue
+
+logger = logging.getLogger(__name__)
+
 from pyconvexity.models import (
     list_components_by_type,
     set_static_attribute,
@@ -220,7 +224,6 @@ class ResultStorage:
         Returns:
             Number of buses with clearing prices stored
         """
-        logger.info(f"=== CALCULATING AND STORING CLEARING PRICES (scenario_id={scenario_id}) ===")
         
         try:
             from .clearing_price import ClearingPriceCalculator
@@ -233,21 +236,14 @@ class ResultStorage:
                 return 0
             
             # Log what we got from the calculator
-            logger.info(f"Clearing prices calculated for {len(clearing_prices)} buses")
             for bus_name, prices in clearing_prices.items():
                 n_zeros = np.sum(prices == 0)
                 n_inf = np.sum(np.isinf(prices))
                 valid = prices[(prices > 0) & np.isfinite(prices)]
-                if len(valid) > 0:
-                    logger.info(f"  {bus_name}: {len(prices)} periods, mean=£{np.mean(valid):.2f}, "
-                               f"zeros={n_zeros}, inf={n_inf}, range=[£{np.min(valid):.2f}, £{np.max(valid):.2f}]")
-                else:
-                    logger.warning(f"  {bus_name}: {len(prices)} periods, ALL ZERO OR INF (zeros={n_zeros}, inf={n_inf})")
-            
+
             # Get bus component IDs
             buses = list_components_by_type(conn, "BUS")
             bus_name_to_id = {bus.name: bus.id for bus in buses}
-            logger.info(f"Found {len(buses)} buses in database: {list(bus_name_to_id.keys())}")
             
             stored_count = 0
             for bus_name, prices in clearing_prices.items():
@@ -268,14 +264,12 @@ class ResultStorage:
                         conn, bus_id, "clearing_price", values, scenario_id
                     )
                     stored_count += 1
-                    logger.info(f"  ✅ {bus_name} (id={bus_id}): stored {len(values)} clearing prices")
                 except Exception as e:
                     logger.error(f"  ❌ {bus_name} (id={bus_id}): failed to store clearing_price: {e}")
                     import traceback
                     traceback.print_exc()
                     continue
             
-            logger.info(f"=== CLEARING PRICES: Stored {stored_count}/{len(clearing_prices)} buses ===")
             return stored_count
             
         except ImportError as e:

{pyconvexity-0.4.8.dist-info → pyconvexity-0.4.9.dist-info}/METADATA

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

{pyconvexity-0.4.8.dist-info → pyconvexity-0.4.9.dist-info}/RECORD

@@ -1,5 +1,5 @@
 pyconvexity/__init__.py,sha256=P67QJ8npf-QWmBX12im__eICLoRz8cByQ5OJXiyIBmA,5706
-pyconvexity/_version.py,sha256=40-PUZPRIakJU2yYWQcwTYvSJA6iewqiG8XylhxuAQk,22
+pyconvexity/_version.py,sha256=LdxLMJM_JXsCQBeSvnxCNyGWmINE0yWfna3DQaT41Vs,22
 pyconvexity/dashboard.py,sha256=7x04Hr-EwzTAf-YJdHzfV83Gf2etltwtzwh_bCYJ5lk,8579
 pyconvexity/timeseries.py,sha256=QdKbiqjAlxkJATyKm2Kelx1Ea2PsAnnCYfVLU5VER1Y,11085
 pyconvexity/core/__init__.py,sha256=gdyyHNqOc4h9Nfe9u6NA936GNzH6coGNCMgBvvvOnGE,1196
@@ -34,11 +34,11 @@ 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=M-s-VUCnRD8Jdh22PCUA-gWgYp1eH6_sgpoSzcv6kNQ,59762
-pyconvexity/solvers/pypsa/storage.py,sha256=-plXsEWDAxdDESryNTLxE7gmKqhH0lvoiQTFPVBlUY4,96046
+pyconvexity/solvers/pypsa/solver.py,sha256=iVgDsmYK7AvutkpuNoW_DoLAKODFJTFA2W1cCo1yhPQ,60427
+pyconvexity/solvers/pypsa/storage.py,sha256=KcHIK3wgYjs7oV4tAqWU3HnxJcC_5MoylLoPuAECmDU,95195
 pyconvexity/validation/__init__.py,sha256=VJNZlFoWABsWwUKktNk2jbtXIepH5omvC0WtsTS7o3o,583
 pyconvexity/validation/rules.py,sha256=GiNadc8hvbWBr09vUkGiLLTmSdvtNSeGLFwvCjlikYY,9241
-pyconvexity-0.4.8.dist-info/METADATA,sha256=1XoACQku7fC6MNJ0oeGm59kRAabONcs5oyrFE5WCOnU,4967
-pyconvexity-0.4.8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pyconvexity-0.4.8.dist-info/top_level.txt,sha256=wFPEDXVaebR3JO5Tt3HNse-ws5aROCcxEco15d6j64s,12
-pyconvexity-0.4.8.dist-info/RECORD,,
+pyconvexity-0.4.9.dist-info/METADATA,sha256=Po_2qtmjGEUegJTuGGVOwagD4uH97bFNjM6o4O6bmdU,4967
+pyconvexity-0.4.9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pyconvexity-0.4.9.dist-info/top_level.txt,sha256=wFPEDXVaebR3JO5Tt3HNse-ws5aROCcxEco15d6j64s,12
+pyconvexity-0.4.9.dist-info/RECORD,,