pyconvexity 0.4.9.post1__tar.gz → 0.5.0__tar.gz

{pyconvexity-0.4.9.post1 → pyconvexity-0.5.0}/PKG-INFO

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

{pyconvexity-0.4.9.post1 → pyconvexity-0.5.0}/pyproject.toml

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

pyconvexity-0.5.0/src/pyconvexity/_version.py

@@ -0,0 +1 @@
+__version__ = "0.5.0"

{pyconvexity-0.4.9.post1 → pyconvexity-0.5.0}/src/pyconvexity/solvers/pypsa/storage.py

@@ -829,6 +829,7 @@ class ResultStorage:
             # 1. GENERATORS - Generation dispatch (including UNMET_LOAD)
             if hasattr(network, "generators_t") and hasattr(network.generators_t, "p"):
                 # Get generator-carrier mapping (include both GENERATOR and UNMET_LOAD)
+                # Use LEFT JOIN to include UNMET_LOAD components even if they don't have a carrier_id
                 cursor = conn.execute(
                     """
                 SELECT c.name as component_name, 
@@ -837,7 +838,7 @@ class ResultStorage:
                            ELSE carr.name 
                        END as carrier_name
                 FROM components c
-                JOIN carriers carr ON c.carrier_id = carr.id
+                LEFT JOIN carriers carr ON c.carrier_id = carr.id
                 WHERE c.component_type IN ('GENERATOR', 'UNMET_LOAD')
             """
                 )
@@ -1006,19 +1007,16 @@ class ResultStorage:
                 end_year = build_year + lifetime - 1
                 return current_year <= end_year
 
-            # 1. GENERATORS - Capital costs (including UNMET_LOAD)
+            # 1. GENERATORS - Capital costs (excluding UNMET_LOAD)
             if hasattr(network, "generators") and not network.generators.empty:
-                # Get generator info: carrier, capital_cost, build_year, lifetime (include UNMET_LOAD)
+                # Get generator info: carrier, capital_cost, build_year, lifetime
+                # EXCLUDE UNMET_LOAD - their capital cost is not meaningful (usually $0)
                 cursor = conn.execute(
                     """
-                    SELECT c.name as component_name, 
-                           CASE 
-                               WHEN c.component_type = 'UNMET_LOAD' THEN 'Unmet Load'
-                               ELSE carr.name 
-                           END as carrier_name
+                    SELECT c.name as component_name, carr.name as carrier_name
                     FROM components c
-                    JOIN carriers carr ON c.carrier_id = carr.id
-                    WHERE c.component_type IN ('GENERATOR', 'UNMET_LOAD')
+                    LEFT JOIN carriers carr ON c.carrier_id = carr.id
+                    WHERE c.component_type = 'GENERATOR'
                 """
                 )
                 generator_carriers = {row[0]: row[1] for row in cursor.fetchall()}
@@ -1297,19 +1295,16 @@ class ResultStorage:
             # Operational costs = dispatch (MWh) × marginal_cost (currency/MWh)
             # Only for components that are active in this year
 
-            # 1. GENERATORS - Operational costs (including UNMET_LOAD)
+            # 1. GENERATORS - Operational costs (excluding UNMET_LOAD)
             if hasattr(network, "generators_t") and hasattr(network.generators_t, "p"):
-                # Get generator info: carrier, marginal_cost, build_year, lifetime (include UNMET_LOAD)
+                # Get generator info: carrier, marginal_cost, build_year, lifetime
+                # EXCLUDE UNMET_LOAD - their marginal cost is a penalty price, not a real operational cost
                 cursor = conn.execute(
                     """
-                    SELECT c.name as component_name, 
-                           CASE 
-                               WHEN c.component_type = 'UNMET_LOAD' THEN 'Unmet Load'
-                               ELSE carr.name 
-                           END as carrier_name
+                    SELECT c.name as component_name, carr.name as carrier_name
                     FROM components c
-                    JOIN carriers carr ON c.carrier_id = carr.id
-                    WHERE c.component_type IN ('GENERATOR', 'UNMET_LOAD')
+                    LEFT JOIN carriers carr ON c.carrier_id = carr.id
+                    WHERE c.component_type = 'GENERATOR'
                 """
                 )
                 generator_carriers = {row[0]: row[1] for row in cursor.fetchall()}
@@ -1539,19 +1534,16 @@ class ResultStorage:
 
             # Calculate capacity by carrier for this specific year
 
-            # 4. GENERATORS - Power capacity (MW) (including UNMET_LOAD)
+            # 4. GENERATORS - Power capacity (MW) (excluding UNMET_LOAD)
             if hasattr(network, "generators") and not network.generators.empty:
-                # Get generator-carrier mapping (include UNMET_LOAD)
+                # Get generator-carrier mapping for capacity
+                # EXCLUDE UNMET_LOAD - their capacity (often infinite) is not meaningful for capacity stats
                 cursor = conn.execute(
                     """
-                    SELECT c.name as component_name, 
-                           CASE 
-                               WHEN c.component_type = 'UNMET_LOAD' THEN 'Unmet Load'
-                               ELSE carr.name 
-                           END as carrier_name
+                    SELECT c.name as component_name, carr.name as carrier_name
                     FROM components c
-                    JOIN carriers carr ON c.carrier_id = carr.id
-                    WHERE c.component_type IN ('GENERATOR', 'UNMET_LOAD')
+                    LEFT JOIN carriers carr ON c.carrier_id = carr.id
+                    WHERE c.component_type = 'GENERATOR'
                 """
                 )
                 generator_carriers = {row[0]: row[1] for row in cursor.fetchall()}

{pyconvexity-0.4.9.post1 → pyconvexity-0.5.0}/src/pyconvexity.egg-info/PKG-INFO

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

pyconvexity-0.4.9.post1/src/pyconvexity/_version.py

@@ -1 +0,0 @@
-__version__ = "0.4.9.post1"