pyconvexity 0.3.8.post4__tar.gz → 0.3.8.post6__tar.gz

{pyconvexity-0.3.8.post4 → pyconvexity-0.3.8.post6}/PKG-INFO

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

{pyconvexity-0.3.8.post4 → pyconvexity-0.3.8.post6}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pyconvexity"
-version = "0.3.8post4"
+version = "0.3.8post6"
 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.8post4"
+python_version = "0.3.8post6"
 warn_return_any = true
 warn_unused_configs = true
 disallow_untyped_defs = true

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

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

{pyconvexity-0.3.8.post4 → pyconvexity-0.3.8.post6}/src/pyconvexity/data/schema/01_core_schema.sql

@@ -361,6 +361,57 @@ BEGIN
     WHERE id = NEW.component_id;
 END;
 
+-- ============================================================================
+-- COMPONENT GEOMETRIES - Optional GeoJSON geometries for spatial representation
+-- ============================================================================
+
+-- Component geometries - stores optional GeoJSON geometries for components
+-- Enables real spatial representation (e.g., actual line routes, generator footprints)
+CREATE TABLE component_geometries (
+    id INTEGER PRIMARY KEY AUTOINCREMENT,
+    component_id INTEGER NOT NULL UNIQUE,
+    
+    -- GeoJSON geometry stored as JSON text
+    -- Supports: Point, LineString, Polygon, MultiPolygon, MultiPoint, MultiLineString, GeometryCollection
+    geometry TEXT NOT NULL,
+    
+    -- Cache the geometry type for faster queries and validation
+    geometry_type TEXT NOT NULL CHECK (geometry_type IN (
+        'Point', 'LineString', 'Polygon', 'MultiPolygon', 
+        'MultiPoint', 'MultiLineString', 'GeometryCollection'
+    )),
+    
+    -- Cache bounding box for spatial indexing and quick filtering
+    bbox_min_lng REAL,
+    bbox_min_lat REAL,
+    bbox_max_lng REAL,
+    bbox_max_lat REAL,
+    
+    -- Metadata
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+    updated_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+    
+    CONSTRAINT fk_geometry_component 
+        FOREIGN KEY (component_id) REFERENCES components(id) ON DELETE CASCADE
+);
+
+-- Indexes for efficient geometry queries
+CREATE INDEX idx_component_geometries_component ON component_geometries(component_id);
+CREATE INDEX idx_component_geometries_type ON component_geometries(geometry_type);
+CREATE INDEX idx_component_geometries_bbox ON component_geometries(
+    bbox_min_lng, bbox_min_lat, bbox_max_lng, bbox_max_lat
+);
+
+-- Trigger to update timestamp on geometry changes
+CREATE TRIGGER update_component_geometries_timestamp
+    BEFORE UPDATE ON component_geometries
+    FOR EACH ROW
+BEGIN
+    UPDATE component_geometries 
+    SET updated_at = CURRENT_TIMESTAMP 
+    WHERE id = NEW.id;
+END;
+
 -- ============================================================================
 -- NETWORK CONFIGURATION
 -- ============================================================================

pyconvexity-0.3.8.post6/src/pyconvexity/data/schema/migrate_add_geometries.sql

@@ -0,0 +1,73 @@
+-- ============================================================================
+-- MIGRATION: Add Component Geometries Support
+-- Adds the component_geometries table to existing databases
+-- This migration is safe and backwards compatible - existing functionality is unchanged
+-- ============================================================================
+
+-- Check if the table already exists before creating
+CREATE TABLE IF NOT EXISTS component_geometries (
+    id INTEGER PRIMARY KEY AUTOINCREMENT,
+    component_id INTEGER NOT NULL UNIQUE,
+    
+    -- GeoJSON geometry stored as JSON text
+    -- Supports: Point, LineString, Polygon, MultiPolygon, MultiPoint, MultiLineString, GeometryCollection
+    geometry TEXT NOT NULL,
+    
+    -- Cache the geometry type for faster queries and validation
+    geometry_type TEXT NOT NULL CHECK (geometry_type IN (
+        'Point', 'LineString', 'Polygon', 'MultiPolygon', 
+        'MultiPoint', 'MultiLineString', 'GeometryCollection'
+    )),
+    
+    -- Cache bounding box for spatial indexing and quick filtering
+    bbox_min_lng REAL,
+    bbox_min_lat REAL,
+    bbox_max_lng REAL,
+    bbox_max_lat REAL,
+    
+    -- Metadata
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+    updated_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+    
+    CONSTRAINT fk_geometry_component 
+        FOREIGN KEY (component_id) REFERENCES components(id) ON DELETE CASCADE
+);
+
+-- Create indexes if they don't exist
+CREATE INDEX IF NOT EXISTS idx_component_geometries_component 
+    ON component_geometries(component_id);
+
+CREATE INDEX IF NOT EXISTS idx_component_geometries_type 
+    ON component_geometries(geometry_type);
+
+CREATE INDEX IF NOT EXISTS idx_component_geometries_bbox 
+    ON component_geometries(bbox_min_lng, bbox_min_lat, bbox_max_lng, bbox_max_lat);
+
+-- Create trigger for automatic timestamp updates
+DROP TRIGGER IF EXISTS update_component_geometries_timestamp;
+
+CREATE TRIGGER update_component_geometries_timestamp
+    BEFORE UPDATE ON component_geometries
+    FOR EACH ROW
+BEGIN
+    UPDATE component_geometries 
+    SET updated_at = CURRENT_TIMESTAMP 
+    WHERE id = NEW.id;
+END;
+
+-- Update schema version
+UPDATE system_metadata 
+SET value = '2.5.0', 
+    updated_at = CURRENT_TIMESTAMP,
+    description = 'Database schema version - Added component_geometries table'
+WHERE key = 'schema_version';
+
+-- Add metadata about the migration
+INSERT OR REPLACE INTO system_metadata (key, value, description) 
+VALUES ('geometries_migration_applied', datetime('now'), 'Timestamp when component geometries migration was applied');
+
+-- Verify the migration
+SELECT 
+    'Migration completed successfully!' as message,
+    COUNT(*) as existing_geometries
+FROM component_geometries;

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

@@ -0,0 +1,87 @@
+"""
+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

pyconvexity-0.3.8.post6/src/pyconvexity/models/carriers.py

@@ -0,0 +1,156 @@
+"""
+Carrier management operations for PyConvexity.
+
+Provides operations for querying carriers and their properties.
+"""
+
+import sqlite3
+import logging
+from typing import Dict, List, Optional
+from dataclasses import dataclass
+
+from pyconvexity.core.errors import ValidationError
+
+logger = logging.getLogger(__name__)
+
+
+@dataclass
+class Carrier:
+    """Represents an energy carrier in the network."""
+    id: int
+    network_id: int
+    name: str
+    co2_emissions: float
+    color: Optional[str]
+    nice_name: Optional[str]
+
+
+def list_carriers(conn: sqlite3.Connection, network_id: int) -> List[Carrier]:
+    """
+    List all carriers for a network.
+    
+    Args:
+        conn: Database connection
+        network_id: Network ID
+        
+    Returns:
+        List of Carrier objects ordered by name
+    """
+    cursor = conn.execute("""
+        SELECT id, network_id, name, co2_emissions, color, nice_name
+        FROM carriers
+        WHERE network_id = ?
+        ORDER BY name
+    """, (network_id,))
+    
+    carriers = []
+    for row in cursor.fetchall():
+        carriers.append(Carrier(
+            id=row[0],
+            network_id=row[1],
+            name=row[2],
+            co2_emissions=row[3] or 0.0,
+            color=row[4],
+            nice_name=row[5]
+        ))
+    
+    return carriers
+
+
+def get_carrier_by_name(conn: sqlite3.Connection, network_id: int, name: str) -> Carrier:
+    """
+    Get a carrier by name.
+    
+    Args:
+        conn: Database connection
+        network_id: Network ID
+        name: Carrier name
+        
+    Returns:
+        Carrier object
+        
+    Raises:
+        ValidationError: If carrier doesn't exist
+    """
+    cursor = conn.execute("""
+        SELECT id, network_id, name, co2_emissions, color, nice_name
+        FROM carriers
+        WHERE network_id = ? AND name = ?
+    """, (network_id, name))
+    
+    row = cursor.fetchone()
+    if not row:
+        raise ValidationError(f"Carrier '{name}' not found for network {network_id}")
+    
+    return Carrier(
+        id=row[0],
+        network_id=row[1],
+        name=row[2],
+        co2_emissions=row[3] or 0.0,
+        color=row[4],
+        nice_name=row[5]
+    )
+
+
+def get_carrier_by_id(conn: sqlite3.Connection, carrier_id: int) -> Carrier:
+    """
+    Get a carrier by ID.
+    
+    Args:
+        conn: Database connection
+        carrier_id: Carrier ID
+        
+    Returns:
+        Carrier object
+        
+    Raises:
+        ValidationError: If carrier doesn't exist
+    """
+    cursor = conn.execute("""
+        SELECT id, network_id, name, co2_emissions, color, nice_name
+        FROM carriers
+        WHERE id = ?
+    """, (carrier_id,))
+    
+    row = cursor.fetchone()
+    if not row:
+        raise ValidationError(f"Carrier with ID {carrier_id} not found")
+    
+    return Carrier(
+        id=row[0],
+        network_id=row[1],
+        name=row[2],
+        co2_emissions=row[3] or 0.0,
+        color=row[4],
+        nice_name=row[5]
+    )
+
+
+def get_carrier_colors(conn: sqlite3.Connection, network_id: int) -> Dict[str, str]:
+    """
+    Get carrier colors for visualization.
+    
+    Args:
+        conn: Database connection
+        network_id: Network ID
+        
+    Returns:
+        Dictionary mapping carrier names to color strings
+    """
+    cursor = conn.execute("""
+        SELECT name, color
+        FROM carriers
+        WHERE network_id = ?
+    """, (network_id,))
+    
+    colors = {}
+    for row in cursor.fetchall():
+        if row[1]:  # Only include if color is defined
+            colors[row[0]] = row[1]
+    
+    # Add default color for Unmet Load if not present
+    if 'Unmet Load' not in colors:
+        colors['Unmet Load'] = '#FF0000'
+    
+    return colors
+

{pyconvexity-0.3.8.post4 → pyconvexity-0.3.8.post6}/src/pyconvexity/models/components.py

@@ -364,6 +364,126 @@ def list_component_attributes(
     return [row[0] for row in cursor.fetchall()]
 
 
+def get_component_by_name(conn: sqlite3.Connection, network_id: int, name: str) -> Component:
+    """
+    Get a component by name.
+    
+    Args:
+        conn: Database connection
+        network_id: Network ID
+        name: Component name
+        
+    Returns:
+        Component object
+        
+    Raises:
+        ComponentNotFound: If component doesn't exist
+    """
+    cursor = conn.execute("""
+        SELECT id, network_id, component_type, name, longitude, latitude, 
+               carrier_id, bus_id, bus0_id, bus1_id
+        FROM components 
+        WHERE network_id = ? AND name = ?
+    """, (network_id, name))
+    
+    row = cursor.fetchone()
+    if not row:
+        raise ComponentNotFound(f"Component '{name}' not found in network {network_id}")
+    
+    return Component(
+        id=row[0],
+        network_id=row[1],
+        component_type=row[2],
+        name=row[3],
+        longitude=row[4],
+        latitude=row[5],
+        carrier_id=row[6],
+        bus_id=row[7],
+        bus0_id=row[8],
+        bus1_id=row[9]
+    )
+
+
+def get_component_id(conn: sqlite3.Connection, network_id: int, name: str) -> int:
+    """
+    Get component ID by name.
+    
+    Args:
+        conn: Database connection
+        network_id: Network ID
+        name: Component name
+        
+    Returns:
+        Component ID
+        
+    Raises:
+        ComponentNotFound: If component doesn't exist
+    """
+    component = get_component_by_name(conn, network_id, name)
+    return component.id
+
+
+def component_exists(conn: sqlite3.Connection, network_id: int, name: str) -> bool:
+    """
+    Check if a component exists.
+    
+    Args:
+        conn: Database connection
+        network_id: Network ID
+        name: Component name
+        
+    Returns:
+        True if component exists, False otherwise
+    """
+    cursor = conn.execute("""
+        SELECT 1 FROM components WHERE network_id = ? AND name = ?
+    """, (network_id, name))
+    
+    return cursor.fetchone() is not None
+
+
+def get_component_carrier_map(
+    conn: sqlite3.Connection, 
+    network_id: int, 
+    component_type: Optional[str] = None
+) -> Dict[str, str]:
+    """
+    Get mapping from component names to carrier names.
+    
+    Args:
+        conn: Database connection
+        network_id: Network ID
+        component_type: Optional component type filter
+        
+    Returns:
+        Dictionary mapping component names to carrier names
+    """
+    if component_type:
+        cursor = conn.execute("""
+            SELECT c.name,
+                   CASE 
+                       WHEN c.component_type = 'UNMET_LOAD' THEN 'Unmet Load'
+                       ELSE carr.name
+                   END as carrier_name
+            FROM components c
+            LEFT JOIN carriers carr ON c.carrier_id = carr.id
+            WHERE c.network_id = ? AND c.component_type = ?
+        """, (network_id, component_type.upper()))
+    else:
+        cursor = conn.execute("""
+            SELECT c.name,
+                   CASE 
+                       WHEN c.component_type = 'UNMET_LOAD' THEN 'Unmet Load'
+                       ELSE carr.name
+                   END as carrier_name
+            FROM components c
+            LEFT JOIN carriers carr ON c.carrier_id = carr.id
+            WHERE c.network_id = ?
+        """, (network_id,))
+    
+    return {row[0]: row[1] for row in cursor.fetchall()}
+
+
 # Helper functions
 
 def get_default_carrier_id(

{pyconvexity-0.3.8.post4 → pyconvexity-0.3.8.post6}/src/pyconvexity/models/network.py

@@ -176,6 +176,72 @@ def list_networks(conn: sqlite3.Connection) -> List[Dict[str, Any]]:
     return networks
 
 
+def get_first_network(conn: sqlite3.Connection) -> Optional[Dict[str, Any]]:
+    """
+    Get the first network (useful for single-network databases).
+    
+    Args:
+        conn: Database connection
+        
+    Returns:
+        Network dictionary or None if no networks exist
+    """
+    cursor = conn.execute("""
+        SELECT id, name, description, created_at, updated_at, time_interval, time_start, time_end 
+        FROM networks 
+        ORDER BY created_at DESC
+        LIMIT 1
+    """)
+    
+    row = cursor.fetchone()
+    if not row:
+        return None
+    
+    return {
+        "id": row[0],
+        "name": row[1],
+        "description": row[2],
+        "created_at": row[3],
+        "updated_at": row[4],
+        "time_resolution": row[5],
+        "start_time": row[6],
+        "end_time": row[7],
+    }
+
+
+def get_network_by_name(conn: sqlite3.Connection, name: str) -> Optional[Dict[str, Any]]:
+    """
+    Get a network by name.
+    
+    Args:
+        conn: Database connection
+        name: Network name
+        
+    Returns:
+        Network dictionary or None if not found
+    """
+    cursor = conn.execute("""
+        SELECT id, name, description, created_at, updated_at, time_interval, time_start, time_end 
+        FROM networks 
+        WHERE name = ?
+    """, (name,))
+    
+    row = cursor.fetchone()
+    if not row:
+        return None
+    
+    return {
+        "id": row[0],
+        "name": row[1],
+        "description": row[2],
+        "created_at": row[3],
+        "updated_at": row[4],
+        "time_resolution": row[5],
+        "start_time": row[6],
+        "end_time": row[7],
+    }
+
+
 def create_carrier(
     conn: sqlite3.Connection, 
     network_id: int, 
@@ -309,7 +375,7 @@ def get_network_config(
     # Apply system defaults for missing parameters
     defaults = {
         'unmet_load_active': True,
-        'discount_rate': 0.01,
+        'discount_rate': 0.0,  # No discounting by default
         'solver_name': 'default'
     }