pyconvexity 0.3.8.post5__py3-none-any.whl → 0.3.8.post7__py3-none-any.whl

pyconvexity/_version.py

@@ -1 +1 @@
-__version__ = "0.3.8post5"
+__version__ = "0.3.8post7"

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/models/results.py

@@ -59,7 +59,7 @@ def get_solve_results(
         SELECT results_json, metadata_json, solve_status, objective_value, solve_time_seconds
         FROM network_solve_results
         WHERE network_id = ? AND scenario_id = ?
-        ORDER BY created_at DESC
+        ORDER BY solved_at DESC
         LIMIT 1
     """, (network_id, scenario_id))
     

pyconvexity/models/scenarios.py

@@ -23,7 +23,6 @@ class Scenario:
     description: Optional[str]
     is_master: bool
     created_at: str
-    updated_at: Optional[str] = None
 
 
 def list_scenarios(conn: sqlite3.Connection, network_id: int) -> List[Scenario]:
@@ -38,7 +37,7 @@ def list_scenarios(conn: sqlite3.Connection, network_id: int) -> List[Scenario]:
         List of Scenario objects ordered by master first, then by creation date
     """
     cursor = conn.execute("""
-        SELECT id, network_id, name, description, is_master, created_at, updated_at
+        SELECT id, network_id, name, description, is_master, created_at
         FROM scenarios
         WHERE network_id = ?
         ORDER BY is_master DESC, created_at
@@ -52,8 +51,7 @@ def list_scenarios(conn: sqlite3.Connection, network_id: int) -> List[Scenario]:
             name=row[2],
             description=row[3],
             is_master=bool(row[4]),
-            created_at=row[5],
-            updated_at=row[6]
+            created_at=row[5]
         ))
     
     return scenarios
@@ -75,7 +73,7 @@ def get_scenario_by_name(conn: sqlite3.Connection, network_id: int, name: str) -
         ValidationError: If scenario doesn't exist
     """
     cursor = conn.execute("""
-        SELECT id, network_id, name, description, is_master, created_at, updated_at
+        SELECT id, network_id, name, description, is_master, created_at
         FROM scenarios
         WHERE network_id = ? AND name = ?
     """, (network_id, name))
@@ -90,8 +88,7 @@ def get_scenario_by_name(conn: sqlite3.Connection, network_id: int, name: str) -
         name=row[2],
         description=row[3],
         is_master=bool(row[4]),
-        created_at=row[5],
-        updated_at=row[6]
+        created_at=row[5]
     )
 
 
@@ -110,7 +107,7 @@ def get_scenario_by_id(conn: sqlite3.Connection, scenario_id: int) -> Scenario:
         ValidationError: If scenario doesn't exist
     """
     cursor = conn.execute("""
-        SELECT id, network_id, name, description, is_master, created_at, updated_at
+        SELECT id, network_id, name, description, is_master, created_at
         FROM scenarios
         WHERE id = ?
     """, (scenario_id,))
@@ -125,8 +122,7 @@ def get_scenario_by_id(conn: sqlite3.Connection, scenario_id: int) -> Scenario:
         name=row[2],
         description=row[3],
         is_master=bool(row[4]),
-        created_at=row[5],
-        updated_at=row[6]
+        created_at=row[5]
     )
 
 
@@ -145,7 +141,7 @@ def get_master_scenario(conn: sqlite3.Connection, network_id: int) -> Scenario:
         ValidationError: If master scenario doesn't exist
     """
     cursor = conn.execute("""
-        SELECT id, network_id, name, description, is_master, created_at, updated_at
+        SELECT id, network_id, name, description, is_master, created_at
         FROM scenarios
         WHERE network_id = ? AND is_master = TRUE
     """, (network_id,))
@@ -160,6 +156,5 @@ def get_master_scenario(conn: sqlite3.Connection, network_id: int) -> Scenario:
         name=row[2],
         description=row[3],
         is_master=bool(row[4]),
-        created_at=row[5],
-        updated_at=row[6]
+        created_at=row[5]
     )

{pyconvexity-0.3.8.post5.dist-info → pyconvexity-0.3.8.post7.dist-info}/METADATA

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

{pyconvexity-0.3.8.post5.dist-info → pyconvexity-0.3.8.post7.dist-info}/RECORD

@@ -1,5 +1,5 @@
 pyconvexity/__init__.py,sha256=eiAFroO4n-z8F0jTLpJgBIO7vtSxu9ovu3G2N-qqpUo,4783
-pyconvexity/_version.py,sha256=hAXE8ndUYHyK3gOK1hBR1ri9H4YX_KTmcufHouTLgTo,27
+pyconvexity/_version.py,sha256=TT4-Unz31te2wVt1PTzfm8_E_k8zxoNBZUtkxDpvnl0,27
 pyconvexity/timeseries.py,sha256=4p1Tdpa1otqDvCq2zppA4tw660sF_XWb8Xobib-cCms,11340
 pyconvexity/core/__init__.py,sha256=MgVa5rrRWIi2w1UI1P4leiBntvHeeOPv0Thm0DEXBHo,1209
 pyconvexity/core/database.py,sha256=M02q4UkJqAPeTXuwng9I7kHm16reJ7eq7wccWxnhE5I,15227
@@ -26,13 +26,13 @@ pyconvexity/io/excel_exporter.py,sha256=pjgvTs5vq9K61mNOVutEzaH5Zx4FgrDG4Xc_YmXh
 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
 pyconvexity/models/network.py,sha256=2oEZOeVotyAs-SJl-b73zJKzSBvJEa6n1ryM0wV-Nko,14762
-pyconvexity/models/results.py,sha256=9IKgO4bve94OGHgUGUcxvFpySGRW8-K3Wwvv9RXEF2k,4031
-pyconvexity/models/scenarios.py,sha256=oF_xSOjrKMmUTzSR4oBAKKqWyudOGewW6DvZBa5IKXw,4125
+pyconvexity/models/results.py,sha256=zEbrFj7ReEBnKJz_Kpf__HfIuHoVsZvLpMoL4RobCYE,4030
+pyconvexity/models/scenarios.py,sha256=6pTfMusCQ6bwPUUFR_Wi1PUk3ZgCwG21uoTy667mZaM,3928
 pyconvexity/solvers/__init__.py,sha256=zoVf6T2Tmyj2XOeiVbEvaIMOX584orqCz1q9t1oXy0M,674
 pyconvexity/solvers/pypsa/__init__.py,sha256=KZqYDo7CvwB-5Kp784xxxtdn5kRcmn3gGSRlaQdDA4c,554
 pyconvexity/solvers/pypsa/api.py,sha256=si2VAvotQKk-hcNtT3bIWV0CE4EzSER94mxehPFm7M8,18015
@@ -43,7 +43,7 @@ pyconvexity/solvers/pypsa/solver.py,sha256=7jaksRKMaQuFYWb7Pl7rw7Pu0kO5DPysQX2Jt
 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.post5.dist-info/METADATA,sha256=Sls9yFmzwrnujuODybzOPn5Z7s-8DoikRaHfto5sbuM,4886
-pyconvexity-0.3.8.post5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pyconvexity-0.3.8.post5.dist-info/top_level.txt,sha256=wFPEDXVaebR3JO5Tt3HNse-ws5aROCcxEco15d6j64s,12
-pyconvexity-0.3.8.post5.dist-info/RECORD,,
+pyconvexity-0.3.8.post7.dist-info/METADATA,sha256=pABuFQ8YuN_H4j8ATRJqO4QjBuYRB-RRVyPDNJxdLOI,4886
+pyconvexity-0.3.8.post7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pyconvexity-0.3.8.post7.dist-info/top_level.txt,sha256=wFPEDXVaebR3JO5Tt3HNse-ws5aROCcxEco15d6j64s,12
+pyconvexity-0.3.8.post7.dist-info/RECORD,,