pyconvexity 0.3.8.post5__tar.gz → 0.3.8.post7__tar.gz

{pyconvexity-0.3.8.post5 → pyconvexity-0.3.8.post7}/PKG-INFO

@@ -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 → pyconvexity-0.3.8.post7}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pyconvexity"
-version = "0.3.8post5"
+version = "0.3.8post7"
 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 = 100
 
 [tool.mypy]
-python_version = "0.3.8post5"
+python_version = "0.3.8post7"
 warn_return_any = true
 warn_unused_configs = true
 disallow_untyped_defs = true

pyconvexity-0.3.8.post7/src/pyconvexity/_version.py

@@ -0,0 +1 @@
+__version__ = "0.3.8post7"

pyconvexity-0.3.8.post7/src/pyconvexity/models/__init__.py

@@ -0,0 +1,124 @@
+"""
+Model management module for PyConvexity.
+
+Contains high-level operations for networks, components, and attributes.
+"""
+
+from pyconvexity.models.components import (
+    get_component_type, get_component, list_components_by_type,
+    insert_component, create_component, update_component, delete_component,
+    list_component_attributes, get_default_carrier_id, get_bus_name_to_id_map,
+    get_component_by_name, get_component_id, component_exists, get_component_carrier_map
+)
+
+from pyconvexity.models.attributes import (
+    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, 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,
+    get_scenario_by_name, get_scenario_by_id, get_master_scenario,
+    Scenario
+)
+
+from pyconvexity.models.results import (
+    get_solve_results, get_yearly_results,
+    SolveResults, YearlyResults
+)
+
+from pyconvexity.models.carriers import (
+    list_carriers,
+    get_carrier_by_name, get_carrier_by_id, get_carrier_colors,
+    Carrier
+)
+
+# 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
+    "get_component_type", "get_component", "list_components_by_type",
+    "insert_component", "create_component", "update_component", "delete_component",
+    "list_component_attributes", "get_default_carrier_id", "get_bus_name_to_id_map",
+    "get_component_by_name", "get_component_id", "component_exists", "get_component_carrier_map",
+    
+    # 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",
+    "create_carrier", "list_carriers", "get_network_config", "set_network_config",
+    "get_component_counts", "get_master_scenario_id", "resolve_scenario_id",
+    "get_first_network", "get_network_by_name",
+    
+    # Scenario operations (backward compatible)
+    "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
+    "get_carrier_by_name", "get_carrier_by_id", "get_carrier_colors",
+    "Carrier",
+]

{pyconvexity-0.3.8.post5 → pyconvexity-0.3.8.post7}/src/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-0.3.8.post5 → pyconvexity-0.3.8.post7}/src/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 → pyconvexity-0.3.8.post7}/src/pyconvexity.egg-info/PKG-INFO

@@ -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/src/pyconvexity/_version.py

@@ -1 +0,0 @@
-__version__ = "0.3.8post5"

pyconvexity-0.3.8.post5/src/pyconvexity/models/__init__.py

@@ -1,87 +0,0 @@
-"""
-Model management module for PyConvexity.
-
-Contains high-level operations for networks, components, and attributes.
-"""
-
-from pyconvexity.models.components import (
-    get_component_type, get_component, list_components_by_type,
-    insert_component, create_component, update_component, delete_component,
-    list_component_attributes, get_default_carrier_id, get_bus_name_to_id_map,
-    get_component_by_name, get_component_id, component_exists, get_component_carrier_map
-)
-
-from pyconvexity.models.attributes import (
-    set_static_attribute, set_timeseries_attribute, get_attribute, delete_attribute
-)
-
-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,
-    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
-)
-
-from pyconvexity.models.results import (
-    get_solve_results, get_yearly_results
-)
-
-from pyconvexity.models.carriers import (
-    list_carriers as list_carriers_new,
-    get_carrier_by_name, get_carrier_by_id, get_carrier_colors
-)
-
-# 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")
-
-__all__ = [
-    # Component operations
-    "get_component_type", "get_component", "list_components_by_type",
-    "insert_component", "create_component", "update_component", "delete_component",
-    "list_component_attributes", "get_default_carrier_id", "get_bus_name_to_id_map",
-    "get_component_by_name", "get_component_id", "component_exists", "get_component_carrier_map",
-    
-    # Attribute operations
-    "set_static_attribute", "set_timeseries_attribute", "get_attribute", "delete_attribute",
-    
-    # Network operations
-    "create_network", "get_network_info", "get_network_time_periods", "list_networks",
-    "create_carrier", "list_carriers", "get_network_config", "set_network_config",
-    "get_component_counts", "get_master_scenario_id", "resolve_scenario_id",
-    "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",
-    
-    # Results operations
-    "get_solve_results", "get_yearly_results",
-    
-    # Carrier operations
-    "list_carriers_new", "get_carrier_by_name", "get_carrier_by_id", "get_carrier_colors",
-]
-
-# Expose primary list_scenarios for convenience
-list_scenarios = list_scenarios_primary