detquantlib 5.7.0__tar.gz → 5.7.1__tar.gz

{detquantlib-5.7.0 → detquantlib-5.7.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: detquantlib
-Version: 5.7.0
+Version: 5.7.1
 Summary: An internal library containing functions and classes that can be used across Quant models.
 License-File: LICENSE.txt
 Author: Dynamic Energy Trading
@@ -15,6 +15,7 @@ Classifier: Programming Language :: Python :: 3.15
 Requires-Dist: colorlog (>=6.10.1,<7.0.0)
 Requires-Dist: cryptography (>=50.0.2,<51.0.0)
 Requires-Dist: numpy (>=2.2.6,<3.0.0)
+Requires-Dist: openpyxl (>=3.1.5,<4.0.0)
 Requires-Dist: pandas (>=2.3.3,<3.0.0)
 Requires-Dist: paramiko (>=4.0.0,<5.0.0)
 Requires-Dist: plotly (>=6.3.1,<7.0.0)

{detquantlib-5.7.0 → detquantlib-5.7.1}/detquantlib/assets/battery.py

@@ -284,6 +284,12 @@ class BatteryState:
             .rename(columns={"site_node_id": "site_node_ids"})
         )
 
+        # Filter on desired capacity:power ratio
+        if cp_ratio is not None:
+            df_vpp = df_vpp[df_vpp["cp_ratio"] == cp_ratio]
+            if df_vpp.empty:
+                raise ValueError(f"Capacity:power ratio of {cp_ratio} not found.")
+
         df_vpp.drop(columns="cp_ratio", inplace=True)
 
         # Round to avoid machine precision issues caused by 'group by'
@@ -299,12 +305,6 @@ class BatteryState:
         # Create battery objects
         batteries = [BatteryState(**df_vpp.loc[i, :].to_dict()) for i in df_vpp.index]
 
-        # Filter on desired capacity:power ratio
-        if cp_ratio is not None:
-            batteries = next((b for b in batteries if b.cp_ratio == cp_ratio), None)
-            if batteries is None:
-                raise ValueError(f"Capacity:power ratio of {cp_ratio} not found.")
-
         return batteries
 
     @staticmethod

{detquantlib-5.7.0 → detquantlib-5.7.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "detquantlib"
-version = "5.7.0"
+version = "5.7.1"
 description = "An internal library containing functions and classes that can be used across Quant models."
 authors = ["Dynamic Energy Trading"]
 readme = "README.md"
@@ -23,6 +23,7 @@ colorlog = "^6.10.1"
 redis = "^7.4.0"
 snowflake-connector-python = {extras = ["pandas"], version = "^4.8.0"}
 cryptography = "^50.0.2"
+openpyxl = "^3.1.5"
 
 [tool.poetry.group.dev.dependencies]
 toml = "^0.10.2"