progress. Initial untested version

lib/pt_strategy/results.py

@@ -4,11 +4,13 @@ from datetime import date, datetime
 from typing import Any, Dict, List, Optional, Tuple
 
 import pandas as pd
+# ---
+from cvttpy_tools.config import Config
+# ---
 from cvttpy_trading.trading.instrument import ExchangeInstrument
-
+# ---
 from pairs_trading.lib.pt_strategy.trading_pair import TradingPair
 
-
 # Recommended replacement adapters and converters for Python 3.12+
 # From: https://docs.python.org/3/library/sqlite3.html#sqlite3-adapter-converter-recipes
 def adapt_date_iso(val: date) -> str:
@@ -20,12 +22,10 @@ def adapt_datetime_iso(val: datetime) -> str:
     """Adapt datetime.datetime to timezone-naive ISO 8601 date."""
     return val.isoformat()
 
-
 def convert_date(val: bytes) -> date:
     """Convert ISO 8601 date to datetime.date object."""
     return datetime.fromisoformat(val.decode()).date()
 
-
 def convert_datetime(val: bytes) -> datetime:
     """Convert ISO 8601 datetime to datetime.datetime object."""
     return datetime.fromisoformat(val.decode())
@@ -120,7 +120,7 @@ def create_result_database(db_path: str) -> None:
 def store_config_in_database(
     db_path: str,
     config_file_path: str,
-    config: Dict,
+    config: Config,
     datafiles: List[Tuple[str, str]],
     instruments: List[ExchangeInstrument],
 ) -> None:
@@ -137,7 +137,7 @@ def store_config_in_database(
         cursor = conn.cursor()
 
         # Convert config to JSON string
-        config_json = json.dumps(config, indent=2, default=str)
+        config_json = json.dumps(config.data(), indent=2, default=str)
 
         # Convert lists to comma-separated strings for storage
         datafiles_str = ", ".join([f"{datafile}" for _, datafile in datafiles])
@@ -206,9 +206,9 @@ class PairResearchResult:
     trades_: Dict[DayT, pd.DataFrame]
     outstanding_positions_: Dict[DayT, List[OutstandingPositionT]]
     symbol_roundtrip_trades_: Dict[str, List[Dict[str, Any]]]
-    
+    config_: Config
 
-    def __init__(self, config: Dict[str, Any]) -> None:
+    def __init__(self, config: Config) -> None:
         self.config_ = config
         self.trades_ = {}
         self.outstanding_positions_ = {}
@@ -220,13 +220,6 @@ class PairResearchResult:
         self.trades_[day] = trades
         self.outstanding_positions_[day] = outstanding_positions
 
-    # def all_trades(self) -> List[TradeT]:
-    #     """Get all trades across all days as a flat list."""
-    #     all_trades_list: List[TradeT] = []
-    #     for day_trades in self.trades_.values():
-    #         all_trades_list.extend(day_trades.to_dict(orient="records"))
-    #     return all_trades_list
-    
     def outstanding_positions(self) -> List[OutstandingPositionT]:
         """Get all outstanding positions across all days as a flat list."""
         res: List[Dict[str, Any]] = []