pyconvexity 0.4.2.post1__tar.gz → 0.4.3__tar.gz

{pyconvexity-0.4.2.post1 → pyconvexity-0.4.3}/PKG-INFO

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

{pyconvexity-0.4.2.post1 → pyconvexity-0.4.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pyconvexity"
-version = "0.4.2.post1"
+version = "0.4.3"
 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.2.post1"
+python_version = "0.4.3"
 warn_return_any = true
 warn_unused_configs = true
 disallow_untyped_defs = true

pyconvexity-0.4.3/src/pyconvexity/_version.py

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

{pyconvexity-0.4.2.post1 → pyconvexity-0.4.3}/src/pyconvexity/models/network.py

@@ -19,7 +19,7 @@ logger = logging.getLogger(__name__)
 
 def create_network(conn: sqlite3.Connection, request: CreateNetworkRequest) -> None:
     """
-    Create network metadata (single network per database).
+    Create network metadata and time periods (single network per database).
 
     Args:
         conn: Database connection
@@ -36,6 +36,8 @@ def create_network(conn: sqlite3.Connection, request: CreateNetworkRequest) -> N
     if not request.end_time:
         raise ValidationError("end_time is required")
 
+    time_resolution = request.time_resolution or "PT1H"
+
     # Insert into network_metadata table (single row per database)
     conn.execute(
         """
@@ -48,10 +50,99 @@ def create_network(conn: sqlite3.Connection, request: CreateNetworkRequest) -> N
             or f"Created on {datetime.now().strftime('%Y-%m-%d %H:%M:%S')}",
             request.start_time,
             request.end_time,
-            request.time_resolution or "PT1H",  # ISO 8601 duration format
+            time_resolution,
         ),
     )
 
+    # Automatically create time periods from the request parameters
+    _create_time_periods_from_request(conn, request.start_time, request.end_time, time_resolution)
+
+
+def _create_time_periods_from_request(
+    conn: sqlite3.Connection,
+    start_time: str,
+    end_time: str,
+    time_resolution: str,
+) -> None:
+    """
+    Create time periods from network request parameters.
+
+    Args:
+        conn: Database connection
+        start_time: Start time string (YYYY-MM-DD HH:MM:SS)
+        end_time: End time string (YYYY-MM-DD HH:MM:SS)
+        time_resolution: ISO 8601 duration (PT1H, PT30M, PT2H, etc.)
+    """
+    # Parse start and end times
+    start_dt = datetime.strptime(start_time, "%Y-%m-%d %H:%M:%S")
+    end_dt = datetime.strptime(end_time, "%Y-%m-%d %H:%M:%S")
+
+    # Parse time resolution to seconds
+    interval_seconds = _parse_iso8601_duration_to_seconds(time_resolution)
+
+    # Calculate period count (inclusive of both start and end)
+    total_seconds = int((end_dt - start_dt).total_seconds())
+    period_count = (total_seconds // interval_seconds) + 1
+
+    # Get Unix timestamp for start
+    start_timestamp = int(start_dt.timestamp())
+
+    # Insert time periods
+    conn.execute(
+        """
+        INSERT INTO network_time_periods (period_count, start_timestamp, interval_seconds)
+        VALUES (?, ?, ?)
+        """,
+        (period_count, start_timestamp, interval_seconds),
+    )
+
+
+def _parse_iso8601_duration_to_seconds(duration: str) -> int:
+    """
+    Parse ISO 8601 duration string to seconds.
+
+    Supports: PT1H (1 hour), PT30M (30 minutes), PT2H (2 hours), PT15M (15 minutes), etc.
+
+    Args:
+        duration: ISO 8601 duration string
+
+    Returns:
+        Duration in seconds
+
+    Raises:
+        ValidationError: If duration format is invalid
+    """
+    if not duration.startswith("PT"):
+        raise ValidationError(f"Invalid ISO 8601 duration format: {duration}. Must start with 'PT'")
+
+    remaining = duration[2:]  # Remove 'PT' prefix
+    total_seconds = 0
+
+    # Parse hours
+    if "H" in remaining:
+        parts = remaining.split("H")
+        hours = int(parts[0]) if parts[0] else 0
+        total_seconds += hours * 3600
+        remaining = parts[1] if len(parts) > 1 else ""
+
+    # Parse minutes
+    if "M" in remaining:
+        parts = remaining.split("M")
+        minutes = int(parts[0]) if parts[0] else 0
+        total_seconds += minutes * 60
+        remaining = parts[1] if len(parts) > 1 else ""
+
+    # Parse seconds
+    if "S" in remaining:
+        parts = remaining.split("S")
+        seconds = int(parts[0]) if parts[0] else 0
+        total_seconds += seconds
+
+    if total_seconds == 0:
+        raise ValidationError(f"Invalid ISO 8601 duration: {duration}. Could not parse any time components.")
+
+    return total_seconds
+
 
 def get_network_info(conn: sqlite3.Connection) -> Dict[str, Any]:
     """

{pyconvexity-0.4.2.post1 → pyconvexity-0.4.3}/src/pyconvexity/solvers/pypsa/api.py

@@ -27,6 +27,7 @@ def solve_network(
     return_detailed_results: bool = True,
     custom_solver_config: Optional[Dict[str, Any]] = None,
     include_unmet_loads: bool = True,
+    verbose: bool = False,
 ) -> Dict[str, Any]:
     """
     Complete solve workflow: build PyPSA network from database, solve, store results (single network per database).
@@ -48,6 +49,7 @@ def solve_network(
             Format: {"solver": "actual_solver_name", "solver_options": {...}}
             Example: {"solver": "gurobi", "solver_options": {"Method": 2, "Crossover": 0}}
         include_unmet_loads: Whether to include unmet load components in the network (default: True)
+        verbose: Enable detailed logging output (default: False)
 
     Returns:
         Dictionary with solve results - comprehensive if return_detailed_results=True, simple status otherwise
@@ -75,15 +77,12 @@ def solve_network(
             if discount_rate is not None
             else network_config.get("discount_rate")
         )
-        logger.info(
-            f"Using discount rate: {effective_discount_rate} (from {'parameter override' if discount_rate is not None else 'network config'})"
-        )
 
         # Build network
         if progress_callback:
             progress_callback(10, "Building PyPSA network...")
 
-        builder = NetworkBuilder()
+        builder = NetworkBuilder(verbose=verbose)
         network = builder.build_network(
             conn, scenario_id, progress_callback, include_unmet_loads
         )
@@ -109,7 +108,7 @@ def solve_network(
         if progress_callback:
             progress_callback(70, f"Solving with {solver_name}...")
 
-        solver = NetworkSolver()
+        solver = NetworkSolver(verbose=verbose)
         solve_result = solver.solve_network(
             network,
             solver_name=solver_name,
@@ -125,7 +124,7 @@ def solve_network(
             progress_callback(85, "Storing results...")
 
         # Store results - ALWAYS store results regardless of return_detailed_results flag
-        storage = ResultStorage()
+        storage = ResultStorage(verbose=verbose)
         storage_result = storage.store_results(conn, network, solve_result, scenario_id)
 
         if progress_callback:
@@ -194,6 +193,7 @@ def build_pypsa_network(
     db_path: str,
     scenario_id: Optional[int] = None,
     progress_callback: Optional[Callable[[int, str], None]] = None,
+    verbose: bool = False,
 ) -> "pypsa.Network":
     """
     Build PyPSA network object from database (single network per database).
@@ -206,6 +206,7 @@ def build_pypsa_network(
         db_path: Path to the database file
         scenario_id: Optional scenario ID (NULL for base network)
         progress_callback: Optional callback for progress updates
+        verbose: Enable detailed logging output (default: False)
 
     Returns:
         PyPSA Network object ready for solving
@@ -216,7 +217,7 @@ def build_pypsa_network(
         ImportError: If PyPSA is not available
     """
     with database_context(db_path) as conn:
-        builder = NetworkBuilder()
+        builder = NetworkBuilder(verbose=verbose)
         return builder.build_network(conn, scenario_id, progress_callback)
 
 
@@ -230,6 +231,7 @@ def solve_pypsa_network(
     store_results: bool = True,
     progress_callback: Optional[Callable[[int, str], None]] = None,
     custom_solver_config: Optional[Dict[str, Any]] = None,
+    verbose: bool = False,
 ) -> Dict[str, Any]:
     """
     Solve PyPSA network and optionally store results back to database (single network per database).
@@ -248,6 +250,7 @@ def solve_pypsa_network(
         progress_callback: Optional callback for progress updates
         custom_solver_config: Optional custom solver configuration when solver_name="custom"
             Format: {"solver": "actual_solver_name", "solver_options": {...}}
+        verbose: Enable detailed logging output (default: False)
 
     Returns:
         Dictionary with solve results and statistics
@@ -260,7 +263,7 @@ def solve_pypsa_network(
         progress_callback(0, f"Solving network with {solver_name}...")
 
     # Solve network
-    solver = NetworkSolver()
+    solver = NetworkSolver(verbose=verbose)
     solve_result = solver.solve_network(
         network,
         solver_name=solver_name,
@@ -278,7 +281,7 @@ def solve_pypsa_network(
             progress_callback(80, "Storing results...")
 
         with database_context(db_path) as conn:
-            storage = ResultStorage()
+            storage = ResultStorage(verbose=verbose)
             storage_result = storage.store_results(
                 conn, network, solve_result, scenario_id
             )
@@ -348,6 +351,7 @@ def store_solve_results(
     db_path: str,
     scenario_id: Optional[int],
     solve_metadata: Dict[str, Any],
+    verbose: bool = False,
 ) -> Dict[str, Any]:
     """
     Store PyPSA solve results back to database (single network per database).
@@ -361,6 +365,7 @@ def store_solve_results(
         db_path: Path to the database file
         scenario_id: Scenario ID for result storage (NULL for base network)
         solve_metadata: Dictionary with solve metadata (solver_name, solve_time, etc.)
+        verbose: Enable detailed logging output (default: False)
 
     Returns:
         Dictionary with storage statistics
@@ -369,7 +374,7 @@ def store_solve_results(
         DatabaseError: If database operations fail
     """
     with database_context(db_path) as conn:
-        storage = ResultStorage()
+        storage = ResultStorage(verbose=verbose)
         return storage.store_results(conn, network, solve_metadata, scenario_id)
 
 

{pyconvexity-0.4.2.post1 → pyconvexity-0.4.3}/src/pyconvexity/solvers/pypsa/builder.py

@@ -26,7 +26,15 @@ class NetworkBuilder:
     even for single-year models.
     """
 
-    def __init__(self):
+    def __init__(self, verbose: bool = False):
+        """
+        Initialize NetworkBuilder.
+
+        Args:
+            verbose: Enable detailed logging output
+        """
+        self.verbose = verbose
+
         # Import PyPSA with error handling
         try:
             import pypsa
@@ -188,7 +196,6 @@ class NetworkBuilder:
 
             # Extract unique years for investment periods
             years = sorted(list(set([ts.year for ts in timestamps])))
-            logger.info(f"Found {len(years)} investment periods: {years}")
 
             # Always create MultiIndex following PyPSA multi-investment tutorial format
             # First level: investment periods (years), Second level: timesteps
@@ -206,7 +213,6 @@ class NetworkBuilder:
                     f"Created MultiIndex is not unique! Check timestamp generation."
                 )
 
-            logger.info(f"Created MultiIndex with {len(multi_index)} snapshots")
             network.set_snapshots(multi_index)
 
             # Set investment periods for multi-period optimization
@@ -216,9 +222,8 @@ class NetworkBuilder:
             network._available_years = years
 
             logger.info(
-                f"Created MultiIndex with {len(multi_index)} snapshots across {len(years)} periods"
+                f"Time index: {len(multi_index)} snapshots across {len(years)} investment periods: {years}"
             )
-            logger.info(f"Investment periods: {network.investment_periods}")
 
         except Exception as e:
             logger.error(f"Failed to set time index: {e}")
@@ -376,12 +381,14 @@ class NetworkBuilder:
         if include_unmet_loads:
             unmet_loads = list_components_by_type(conn, "UNMET_LOAD")
             all_generators = generators + unmet_loads
-            logger.info(
-                f"Loading {len(generators)} generators and {len(unmet_loads)} unmet loads"
-            )
+            if self.verbose:
+                logger.info(
+                    f"Loading {len(generators)} generators and {len(unmet_loads)} unmet loads"
+                )
         else:
             all_generators = generators
-            logger.info(f"Loading {len(generators)} generators (unmet loads disabled)")
+            if self.verbose:
+                logger.info(f"Loading {len(generators)} generators (unmet loads disabled)")
 
         generator_ids = [gen.id for gen in all_generators]
 
@@ -628,9 +635,6 @@ class NetworkBuilder:
                     network.snapshot_weightings.loc[:, "objective"] = weightings
                     network.snapshot_weightings.loc[:, "generators"] = weightings
                     network.snapshot_weightings.loc[:, "stores"] = weightings
-                    logger.info(
-                        f"Set snapshot weightings for {len(weightings)} time periods (objective, generators, stores)"
-                    )
                 else:
                     logger.warning(
                         f"Mismatch between weightings ({len(weightings)}) and snapshots ({len(network.snapshots)})"