pyconvexity 0.3.8.post6__py3-none-any.whl → 0.4.0__py3-none-any.whl

pyconvexity/_version.py

@@ -1 +1 @@
-__version__ = "0.3.8post6"
+__version__ = "0.4.0"

pyconvexity/models/__init__.py

@@ -12,49 +12,85 @@ from pyconvexity.models.components import (
 )
 
 from pyconvexity.models.attributes import (
-    set_static_attribute, set_timeseries_attribute, get_attribute, delete_attribute
+    set_static_attribute, set_timeseries_attribute, get_attribute, delete_attribute,
+    get_timeseries, get_timeseries_metadata
 )
 
 from pyconvexity.models.network import (
     create_network, get_network_info, get_network_time_periods, list_networks,
-    create_carrier, list_carriers, get_network_config, set_network_config,
+    create_carrier, get_network_config, set_network_config,
     get_component_counts, get_master_scenario_id, resolve_scenario_id,
     get_first_network, get_network_by_name
 )
 
 # Import from new modules
 from pyconvexity.models.scenarios import (
-    list_scenarios as list_scenarios_new,
-    get_scenario_by_name, get_scenario_by_id, get_master_scenario
+    list_scenarios,
+    get_scenario_by_name, get_scenario_by_id, get_master_scenario,
+    Scenario
 )
 
 from pyconvexity.models.results import (
-    get_solve_results, get_yearly_results
+    get_solve_results, get_yearly_results,
+    SolveResults, YearlyResults
 )
 
 from pyconvexity.models.carriers import (
-    list_carriers as list_carriers_new,
-    get_carrier_by_name, get_carrier_by_id, get_carrier_colors
+    list_carriers,
+    get_carrier_by_name, get_carrier_by_id, get_carrier_colors,
+    Carrier
 )
 
-# Try to import old scenarios functions if they exist
-try:
-    from pyconvexity.models.scenarios_old import (
-        create_scenario, list_scenarios as list_scenarios_old, 
-        get_scenario, delete_scenario
-    )
-    # Use old functions as primary for backward compatibility
-    list_scenarios_primary = list_scenarios_old
-except ImportError:
-    # Old module doesn't exist, use new functions
-    list_scenarios_primary = list_scenarios_new
-    # Create dummy functions for backward compatibility
-    def create_scenario(*args, **kwargs):
-        raise NotImplementedError("create_scenario not yet implemented in new API")
-    def get_scenario(*args, **kwargs):
-        return get_scenario_by_id(*args, **kwargs)
-    def delete_scenario(*args, **kwargs):
-        raise NotImplementedError("delete_scenario not yet implemented in new API")
+# Backward compatibility aliases
+def get_scenario(conn, scenario_id):
+    """Backward compatible alias for get_scenario_by_id."""
+    return get_scenario_by_id(conn, scenario_id)
+
+def create_scenario(conn, network_id, name, description=None, is_master=False):
+    """
+    Create a new scenario.
+    
+    Args:
+        conn: Database connection
+        network_id: Network ID
+        name: Scenario name
+        description: Optional description
+        is_master: Whether this is the master scenario (will demote existing master)
+        
+    Returns:
+        Scenario ID
+    """
+    cursor = conn.execute("""
+        INSERT INTO scenarios (network_id, name, description, is_master)
+        VALUES (?, ?, ?, ?)
+    """, (network_id, name, description, is_master))
+    
+    scenario_id = cursor.lastrowid
+    return scenario_id
+
+def delete_scenario(conn, scenario_id):
+    """
+    Delete a scenario (cannot delete master scenario).
+    
+    Args:
+        conn: Database connection
+        scenario_id: Scenario ID to delete
+        
+    Raises:
+        ValidationError: If trying to delete master scenario or scenario doesn't exist
+    """
+    from pyconvexity.core.errors import ValidationError
+    
+    # Check if it's a master scenario
+    scenario = get_scenario_by_id(conn, scenario_id)
+    if scenario.is_master:
+        raise ValidationError("Cannot delete master scenario")
+    
+    # Delete the scenario
+    cursor = conn.execute("DELETE FROM scenarios WHERE id = ?", (scenario_id,))
+    
+    if cursor.rowcount == 0:
+        raise ValidationError(f"Scenario with ID {scenario_id} not found")
 
 __all__ = [
     # Component operations
@@ -65,6 +101,7 @@ __all__ = [
     
     # Attribute operations
     "set_static_attribute", "set_timeseries_attribute", "get_attribute", "delete_attribute",
+    "get_timeseries", "get_timeseries_metadata",
     
     # Network operations
     "create_network", "get_network_info", "get_network_time_periods", "list_networks",
@@ -73,15 +110,15 @@ __all__ = [
     "get_first_network", "get_network_by_name",
     
     # Scenario operations (backward compatible)
-    "create_scenario", "list_scenarios_primary", "get_scenario", "delete_scenario",
-    "list_scenarios_new", "get_scenario_by_name", "get_scenario_by_id", "get_master_scenario",
+    "create_scenario", "list_scenarios", "get_scenario", "delete_scenario",
+    "get_scenario_by_name", "get_scenario_by_id", "get_master_scenario",
+    "Scenario",
     
     # Results operations
     "get_solve_results", "get_yearly_results",
+    "SolveResults", "YearlyResults",
     
     # Carrier operations
-    "list_carriers_new", "get_carrier_by_name", "get_carrier_by_id", "get_carrier_colors",
+    "get_carrier_by_name", "get_carrier_by_id", "get_carrier_colors",
+    "Carrier",
 ]
-
-# Expose primary list_scenarios for convenience
-list_scenarios = list_scenarios_primary

pyconvexity/solvers/pypsa/solver.py

@@ -422,9 +422,7 @@ class NetworkSolver:
                     # Removed MSK_DPAR_INTPNT_TOL_INFEAS - was 1000x tighter than other tolerances!
                     'MSK_IPAR_NUM_THREADS': 0,                # Use all available cores (0 = auto)
                     'MSK_IPAR_PRESOLVE_USE': 2,               # Aggressive presolve (match Gurobi Presolve=2)
-                    'MSK_IPAR_PRESOLVE_LINDEP_USE': 1,        # Linear dependency check
                     'MSK_DPAR_MIO_REL_GAP_CONST': 0.05,       # Match Gurobi 5% MIP gap
-                    'MSK_IPAR_MIO_NODE_OPTIMIZER': 4,         # Use interior-point for MIP nodes
                     'MSK_IPAR_MIO_ROOT_OPTIMIZER': 4,         # Use interior-point for MIP root
                     'MSK_DPAR_MIO_MAX_TIME': 36000,            # Max time 10 hour
                 }
@@ -458,7 +456,6 @@ class NetworkSolver:
                     'MSK_IPAR_NUM_THREADS': 0,                # Use all available cores (0 = automatic)
                     'MSK_IPAR_PRESOLVE_USE': 1,               # Force presolve
                     'MSK_DPAR_MIO_REL_GAP_CONST': 0.05,       # Match Gurobi 5% MIP gap (was 1e-6)
-                    'MSK_IPAR_MIO_NODE_OPTIMIZER': 1,         # Use dual simplex for MIP nodes (1 = MSK_OPTIMIZER_DUAL_SIMPLEX)
                     'MSK_IPAR_MIO_ROOT_OPTIMIZER': 1,         # Use dual simplex for MIP root
                     'MSK_DPAR_MIO_MAX_TIME': 36000,            # Max time 10 hour (safety limit)
 

{pyconvexity-0.3.8.post6.dist-info → pyconvexity-0.4.0.dist-info}/METADATA

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

{pyconvexity-0.3.8.post6.dist-info → pyconvexity-0.4.0.dist-info}/RECORD

@@ -1,5 +1,5 @@
 pyconvexity/__init__.py,sha256=eiAFroO4n-z8F0jTLpJgBIO7vtSxu9ovu3G2N-qqpUo,4783
-pyconvexity/_version.py,sha256=jO5GlIb68CD0eDfWJLp-lwidoi1UzGwf4_unGDQim90,27
+pyconvexity/_version.py,sha256=42STGor_9nKYXumfeV5tiyD_M8VdcddX7CEexmibPBk,22
 pyconvexity/timeseries.py,sha256=4p1Tdpa1otqDvCq2zppA4tw660sF_XWb8Xobib-cCms,11340
 pyconvexity/core/__init__.py,sha256=MgVa5rrRWIi2w1UI1P4leiBntvHeeOPv0Thm0DEXBHo,1209
 pyconvexity/core/database.py,sha256=M02q4UkJqAPeTXuwng9I7kHm16reJ7eq7wccWxnhE5I,15227
@@ -7,11 +7,8 @@ pyconvexity/core/errors.py,sha256=HhrrOOEBJrzyB56_pmqh3NWvX6uHqWWNkdE5XM16rYI,28
 pyconvexity/core/types.py,sha256=LkB49qklA-9ObI0br0IazfVxvWvYzQrYMdwzrqqAMYQ,11335
 pyconvexity/data/README.md,sha256=-tyDHVjqzfWbVvgM4yYYx8cysmgvFXI6plVQNxSHBmo,3156
 pyconvexity/data/__init__.py,sha256=BrgC3LGSlReLbC0EpM6UxywwUHxRvts379CvZFE0qWU,514
-pyconvexity/data/__pycache__/__init__.cpython-313.pyc,sha256=F2XXlQZlN5aoFmi7Ar1B3RW-DZjIUqp81fr3zNsPxpY,617
 pyconvexity/data/loaders/__init__.py,sha256=6xPtOmH2n1mNby7ZjA-2Mk9F48Q246RNsyMnCnJ6gwA,60
 pyconvexity/data/loaders/cache.py,sha256=nnz8bV3slSehOT0alexFga9tM1XoJqWHBGqaXvz132U,7299
-pyconvexity/data/loaders/__pycache__/__init__.cpython-313.pyc,sha256=AuT3aXy3v5gssxdD1_CBaKqNAVmDt6GBwFSyAe3jHow,265
-pyconvexity/data/loaders/__pycache__/cache.cpython-313.pyc,sha256=9_xMQN6AciMzbzhCmWAzvEKRXfRINmfRsO8Dyg0_CUQ,9804
 pyconvexity/data/schema/01_core_schema.sql,sha256=2kkEevAhXJtNnC-wca2bnyw0m11mjheh4g9MPZpwBAc,20865
 pyconvexity/data/schema/02_data_metadata.sql,sha256=oOfwa3PLY2_8rxKDD4cpDeqP5I_PdahcF8m6cSKStJM,10732
 pyconvexity/data/schema/03_validation_data.sql,sha256=1rKFi9y6jQ2OnfH32jnIKnZ5WtB8eG43hz0OVJhwn3w,58325
@@ -19,14 +16,12 @@ pyconvexity/data/schema/04_scenario_schema.sql,sha256=sL4PySJNHIthXsnoJ2T5pdXUbp
 pyconvexity/data/schema/migrate_add_geometries.sql,sha256=ljTz2ZIvfRkHCjJiUbZJr7PvUxPv3UeLl3ADb9U7dWc,2710
 pyconvexity/data/sources/__init__.py,sha256=Dn6_oS7wB-vLjMj2YeXlmIl6hNjACbicimSabKxIWnc,108
 pyconvexity/data/sources/gem.py,sha256=Ft2pAYsWe1V9poRge2Q4xdNt15XkG-USSR0XR9KFmsY,14935
-pyconvexity/data/sources/__pycache__/__init__.cpython-313.pyc,sha256=9x5FyLxmTE5ZRaEFNSF375KBd_rDLY6pGHGSWPpcxxA,313
-pyconvexity/data/sources/__pycache__/gem.cpython-313.pyc,sha256=VA7v6miTbKJcSMwKElsRKwuyGP3ek95O3ALa133Lx_U,14476
 pyconvexity/io/__init__.py,sha256=glGzXBRGHROrTS8xe-RTGyRQUgsaksafxXVt9GpW63E,803
 pyconvexity/io/excel_exporter.py,sha256=pjgvTs5vq9K61mNOVutEzaH5Zx4FgrDG4Xc_YmXhE5o,48483
 pyconvexity/io/excel_importer.py,sha256=M7YcBqKUVzOMoR5HN-v8M2UnZgHRfhqgXBMUVD10-IQ,56898
 pyconvexity/io/netcdf_exporter.py,sha256=AMM-uXBj8sh86n5m57aZ6S7LulAyIx_HM-eM-26BrWQ,7428
 pyconvexity/io/netcdf_importer.py,sha256=nv4CYYqnbCBeznwCU_JGBMTbg-BGNpXKlsqbu2R8fTU,72152
-pyconvexity/models/__init__.py,sha256=N8YqEntbF5NrxIgUk1Knj9FiOzmMtD5Kywc6THJVeFk,3528
+pyconvexity/models/__init__.py,sha256=2HMICM5WX1h0MzxGHkKwUrsc5Tm1-P1Yl_PA0OFmyFI,4309
 pyconvexity/models/attributes.py,sha256=LTvYF0hl56HeLjS8ZVocZWLhbLRTNhmZ5gUKxf93eSE,18254
 pyconvexity/models/carriers.py,sha256=-nmasYvsaUeYPY1B0QdzfF_eph2HUFb5n3KF3CFd-YI,3700
 pyconvexity/models/components.py,sha256=wWRdX6vErZrQhhLTnHBLDOnkmLjbHY2e9J9ITZJi3F8,18287
@@ -39,11 +34,11 @@ pyconvexity/solvers/pypsa/api.py,sha256=si2VAvotQKk-hcNtT3bIWV0CE4EzSER94mxehPFm
 pyconvexity/solvers/pypsa/batch_loader.py,sha256=eQb8B11akQYtH3aK93WAOoXEI-ktk4imATw9gaYDNR4,13547
 pyconvexity/solvers/pypsa/builder.py,sha256=WrimcBvG4mNFLTrLq7131Ku0AXY_0oRKxfI81ywc5Cs,24460
 pyconvexity/solvers/pypsa/constraints.py,sha256=qosBSNe0pr4va4dMmQFM-ifJCNGAkhS1R2gerNmhaiQ,16266
-pyconvexity/solvers/pypsa/solver.py,sha256=7jaksRKMaQuFYWb7Pl7rw7Pu0kO5DPysQX2JtWdUbBc,72074
+pyconvexity/solvers/pypsa/solver.py,sha256=YHj-qF_a2A9KdsJDQMXO2Iwl7vNjyeFK5pKsVK0RTEI,71761
 pyconvexity/solvers/pypsa/storage.py,sha256=T-0qEryiEy_8G4KiscPoiiWvTPd_OGqpLczW0_Xm85E,87331
 pyconvexity/validation/__init__.py,sha256=_6SVqXkaDFqmagub_O064Zm_QIdBrOra-Gvvbo9vM4I,549
 pyconvexity/validation/rules.py,sha256=6Kak12BVfUpjmgB5B7Wre55eGc5e1dvIdFca-vN-IFI,9296
-pyconvexity-0.3.8.post6.dist-info/METADATA,sha256=fKPUW65mNFxOCENHZuic30W1bbph8wORCzM56uFoP-U,4886
-pyconvexity-0.3.8.post6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pyconvexity-0.3.8.post6.dist-info/top_level.txt,sha256=wFPEDXVaebR3JO5Tt3HNse-ws5aROCcxEco15d6j64s,12
-pyconvexity-0.3.8.post6.dist-info/RECORD,,
+pyconvexity-0.4.0.dist-info/METADATA,sha256=JrDbolmH3ouwn3xQL03Ij7yQRiwIxGF20cGTEZVUC3E,4880
+pyconvexity-0.4.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pyconvexity-0.4.0.dist-info/top_level.txt,sha256=wFPEDXVaebR3JO5Tt3HNse-ws5aROCcxEco15d6j64s,12
+pyconvexity-0.4.0.dist-info/RECORD,,