1 files changed, 11 insertions, 9 deletions
diff --git a/cli/src/trading_cli/commands/data.py b/cli/src/trading_cli/commands/data.py
index 1ecc15f..64639cf 100644
--- a/cli/src/trading_cli/commands/data.py
+++ b/cli/src/trading_cli/commands/data.py
@@ -1,5 +1,6 @@
 import asyncio
 import sys
+from datetime import UTC
 from pathlib import Path
 
 import click
@@ -39,23 +40,23 @@ def history(symbol, timeframe, since, limit):
     """Download historical stock market data for a symbol."""
     try:
         from shared.alpaca_client import AlpacaClient
-        from shared.db import Database
         from shared.config import Settings
+        from shared.db import Database
     except ImportError as e:
         click.echo(f"Error: Could not import required modules: {e}", err=True)
         sys.exit(1)
 
     async def _fetch():
-        from datetime import datetime, timezone
+        from datetime import datetime
 
         settings = Settings()
-        db = Database(settings.database_url)
+        db = Database(settings.database_url.get_secret_value())
         await db.connect()
 
         start = None
         if since:
             try:
-                start = datetime.fromisoformat(since).replace(tzinfo=timezone.utc)
+                start = datetime.fromisoformat(since).replace(tzinfo=UTC)
             except ValueError:
                 click.echo(
                     f"Error: Invalid date format '{since}'. Use ISO format (e.g. 2024-01-01).",
@@ -64,8 +65,8 @@ def history(symbol, timeframe, since, limit):
                 sys.exit(1)
 
         client = AlpacaClient(
-            api_key=settings.alpaca_api_key,
-            api_secret=settings.alpaca_api_secret,
+            api_key=settings.alpaca_api_key.get_secret_value(),
+            api_secret=settings.alpaca_api_secret.get_secret_value(),
             base_url=getattr(settings, "alpaca_base_url", "https://paper-api.alpaca.markets"),
         )
 
@@ -97,17 +98,18 @@ def history(symbol, timeframe, since, limit):
 def list_():
     """List available data streams and symbols."""
     try:
-        from shared.db import Database
+        from sqlalchemy import func, select
+
         from shared.config import Settings
+        from shared.db import Database
         from shared.sa_models import CandleRow
-        from sqlalchemy import select, func
     except ImportError as e:
         click.echo(f"Error: Could not import required modules: {e}", err=True)
         sys.exit(1)
 
     async def _list():
         settings = Settings()
-        db = Database(settings.database_url)
+        db = Database(settings.database_url.get_secret_value())
         await db.connect()
         try:
             stmt = (