detquantlib 5.1.0__tar.gz → 5.1.2__tar.gz

{detquantlib-5.1.0 → detquantlib-5.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: detquantlib
-Version: 5.1.0
+Version: 5.1.2
 Summary: An internal library containing functions and classes that can be used across Quant models.
 License-File: LICENSE.txt
 Author: Dynamic Energy Trading

{detquantlib-5.1.0 → detquantlib-5.1.2}/detquantlib/data/databases/detdatabase.py

@@ -35,26 +35,32 @@ class DetDatabase:
                 initialized.
             driver: ODBC driver
         """
-        # Store database name if it is provided
-        if db_name:
-            os.environ["DET_DB_NAME"] = db_name
-
         # Only allow object creation if mandatory environment variables exist
-        DetDatabase.check_environment_variables()
+        skip_db_name = db_name is not None
+        DetDatabase.check_environment_variables(skip_db_name)
 
+        self.db_name = db_name if db_name else os.environ["DET_DB_NAME"]
         self.driver = driver
         self.engine = engine if engine is not None else self.initialize_engine()
 
     @staticmethod
-    def check_environment_variables():
+    def check_environment_variables(skip_db_name: bool):
         """
         Checks if environment variables needed by the class are defined.
 
+        Args:
+            skip_db_name: If true, does not check if the environment variable containing the
+                database name is defined
+
         Raises:
             ConnectionError: Raises an error if environment variables are not defined.
         """
-        required_env_vars = [
-            dict(name="DET_DB_NAME", value=None, description="Database name"),
+        required_env_vars = (
+            []
+            if skip_db_name
+            else [dict(name="DET_DB_NAME", value=None, description="Database name")]
+        )
+        required_env_vars += [
             dict(name="DET_DB_SERVER", value=None, description="Server name"),
             dict(name="DET_DB_USERNAME", value=None, description="Username"),
             dict(name="DET_DB_PASSWORD", value=None, description="Password"),
@@ -81,7 +87,7 @@ class DetDatabase:
         connection_str = (
             f"DRIVER={self.driver};"
             f"SERVER={os.getenv('DET_DB_SERVER')};"
-            f"DATABASE={os.getenv('DET_DB_NAME')};"
+            f"DATABASE={self.db_name};"
             f"UID={os.getenv('DET_DB_USERNAME')};"
             f"PWD={quote_plus(os.getenv('DET_DB_PASSWORD'))}"
         )
@@ -872,15 +878,20 @@ class DetDatabase:
         Args:
             profile: Customer/profile name.
                 Note on the 'Portfolio' and 'Portfolioweekend' profiles:
-                - Profile names 'Portfolio' and 'Portfolioweekend' refer to the same set of
-                    connection points.
-                - In the database, the profile name is set to 'Portfolio' when the forecast date
-                    is between Monday and Friday.
-                - In the database, the profile name is set to 'Portfolioweekend' when the forecast
-                    date is Saturday or Sunday.
-                - When calling this method, the input argument 'profile' can be set to
-                    'PortfolioAll' to automatically let the method switch between 'Portfolio' and
-                    'Portfolioweekend', based on the used-input forecast date.
+                    - [Legacy data until March 2026]:
+                        - Profile names 'Portfolio' and 'Portfolioweekend' refer to the same set
+                            of connection points.
+                        - In the database, the profile name is set to 'Portfolio' when the
+                            forecast date is between Monday and Friday.
+                        - In the database, the profile name is set to 'Portfolioweekend' when
+                            the forecast date is Saturday or Sunday.
+                    - [Data since March 2026]:
+                        - The 'Portfolioweekend' name is deprecated. Day-ahead forecasts are
+                            now stored under the 'Portfolio' profile only.
+                    - When calling this method, set the input argument 'profile' to
+                        'PortfolioAll' to automatically switch between 'Portfolio' and
+                            'Portfolioweekend', based on the used-input forecast date.
+                            'PortfolioAll' supports both the legacy and new data structure.
             forecast_date: Date on which customer volume forecast is generated.
             start_delivery_date: First delivery date included.
             end_delivery_date: Last delivery date included.
@@ -896,13 +907,6 @@ class DetDatabase:
         Raises:
             ValueError: Raises an error if no volume forecast data is found for user inputs.
         """
-        # Convert profile if set to "PortfolioAll"
-        if profile == "PortfolioAll":
-            if forecast_date.weekday() > 4:
-                profile = "Portfolioweekend"
-            else:
-                profile = "Portfolio"
-
         # Convert start delivery date from local timezone to UTC and string
         start_delivery_date = start_delivery_date.replace(tzinfo=ZoneInfo(local_timezone))
         start_delivery_date = start_delivery_date.astimezone(ZoneInfo("UTC"))
@@ -924,17 +928,34 @@ class DetDatabase:
         # Convert dates from datetime to string
         forecast_date_str = forecast_date.strftime("%Y-%m-%d")
 
+        # Define query profile name. If 'PortfolioAll', first try with 'Portfolio' (compatibility
+        # with new data).
+        query_profile = "Portfolio" if profile == "PortfolioAll" else profile
+
         # Query db
         table = DetDatabase.get_table_name("client_volume_forecast")
         query = (
             f"SELECT {columns_str} FROM {table} "
-            f"WHERE Profile='{profile}' "
+            f"WHERE Profile='{query_profile}' "
             f"AND ForecastDate='{forecast_date_str}' "
             f"AND Datetime>='{start_date_str}' "
             f"AND Datetime<'{end_date_str}'"
         )
         df = self.query_db(query)
 
+        if profile == "PortfolioAll" and df.empty and forecast_date.weekday() > 4:
+            # If 'Portfolio' not found, try with 'Portfolioweekend' (backward compatibility with
+            # legacy data)
+            query_profile = "Portfolioweekend"
+            query = (
+                f"SELECT {columns_str} FROM {table} "
+                f"WHERE Profile='{query_profile}' "
+                f"AND ForecastDate='{forecast_date_str}' "
+                f"AND Datetime>='{start_date_str}' "
+                f"AND Datetime<'{end_date_str}'"
+            )
+            df = self.query_db(query)
+
         # Assert data
         if df.empty:
             raise ValueError("No volume forecast data found for user-defined inputs.")

{detquantlib-5.1.0 → detquantlib-5.1.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "detquantlib"
-version = "5.1.0"
+version = "5.1.2"
 description = "An internal library containing functions and classes that can be used across Quant models."
 authors = ["Dynamic Energy Trading"]
 readme = "README.md"