@drico2008/fincli 0.1.3 → 0.2.2

package/fincli/app/storage/database.py

@@ -1,101 +1,217 @@
-"""SQLite storage for FinCLI local data."""
-
-from __future__ import annotations
-
-from pathlib import Path
-from contextlib import closing
-import sqlite3
-from typing import Iterable
-
-from fincli.app.storage.config import APP_DIR
-from fincli.app.utils.errors import StorageError
-
-
-DB_FILE = APP_DIR / "fincli.db"
-
-
-class FinCLIDatabase:
-    """Small SQLite wrapper for watchlist, portfolio, and journal data."""
-
-    def __init__(self, db_file: Path = DB_FILE) -> None:
-        self.db_file = db_file
-        self.db_file.parent.mkdir(parents=True, exist_ok=True)
-        self.initialize()
-
-    def connect(self) -> sqlite3.Connection:
-        connection = sqlite3.connect(self.db_file)
-        connection.row_factory = sqlite3.Row
-        return connection
-
-    def initialize(self) -> None:
-        try:
-            with closing(self.connect()) as db:
-                with db:
-                    db.executescript(
-                        """
-                        CREATE TABLE IF NOT EXISTS watchlist (
-                            symbol TEXT PRIMARY KEY,
-                            group_name TEXT DEFAULT 'default',
-                            created_at TEXT DEFAULT CURRENT_TIMESTAMP
-                        );
-
-                        CREATE TABLE IF NOT EXISTS portfolio_positions (
-                            symbol TEXT PRIMARY KEY,
-                            quantity REAL NOT NULL,
-                            average_price REAL NOT NULL,
-                            currency TEXT DEFAULT 'USD',
-                            created_at TEXT DEFAULT CURRENT_TIMESTAMP,
-                            updated_at TEXT DEFAULT CURRENT_TIMESTAMP
-                        );
-
-                        CREATE TABLE IF NOT EXISTS journal_entries (
-                            id INTEGER PRIMARY KEY AUTOINCREMENT,
-                            instrument TEXT NOT NULL,
-                            bias TEXT DEFAULT '',
-                            entry_reason TEXT DEFAULT '',
-                            exit_reason TEXT DEFAULT '',
-                            result TEXT DEFAULT '',
-                            emotion TEXT DEFAULT '',
-                            lesson TEXT DEFAULT '',
-                            tags TEXT DEFAULT '',
-                            created_at TEXT DEFAULT CURRENT_TIMESTAMP
-                        );
-
-                        CREATE TABLE IF NOT EXISTS portfolio_transactions (
+"""SQLite storage for FinCLI local data."""
+
+from __future__ import annotations
+
+from pathlib import Path
+from contextlib import closing
+import sqlite3
+from typing import Iterable
+
+from fincli.app.storage.config import APP_DIR
+from fincli.app.utils.errors import StorageError
+
+
+DB_FILE = APP_DIR / "fincli.db"
+
+
+class FinCLIDatabase:
+    """Small SQLite wrapper for watchlist, portfolio, and journal data."""
+
+    def __init__(self, db_file: Path = DB_FILE) -> None:
+        self.db_file = db_file
+        self.db_file.parent.mkdir(parents=True, exist_ok=True)
+        self.initialize()
+
+    def connect(self) -> sqlite3.Connection:
+        connection = sqlite3.connect(self.db_file)
+        connection.row_factory = sqlite3.Row
+        return connection
+
+    def initialize(self) -> None:
+        try:
+            with closing(self.connect()) as db:
+                with db:
+                    db.executescript(
+                        """
+                        CREATE TABLE IF NOT EXISTS watchlist (
+                            symbol TEXT PRIMARY KEY,
+                            group_name TEXT DEFAULT 'default',
+                            created_at TEXT DEFAULT CURRENT_TIMESTAMP
+                        );
+
+                        CREATE TABLE IF NOT EXISTS portfolio_positions (
+                            symbol TEXT PRIMARY KEY,
+                            quantity REAL NOT NULL,
+                            average_price REAL NOT NULL,
+                            currency TEXT DEFAULT 'USD',
+                            created_at TEXT DEFAULT CURRENT_TIMESTAMP,
+                            updated_at TEXT DEFAULT CURRENT_TIMESTAMP
+                        );
+
+                        CREATE TABLE IF NOT EXISTS journal_entries (
+                            id INTEGER PRIMARY KEY AUTOINCREMENT,
+                            instrument TEXT NOT NULL,
+                            bias TEXT DEFAULT '',
+                            entry_reason TEXT DEFAULT '',
+                            exit_reason TEXT DEFAULT '',
+                            result TEXT DEFAULT '',
+                            emotion TEXT DEFAULT '',
+                            lesson TEXT DEFAULT '',
+                            tags TEXT DEFAULT '',
+                            created_at TEXT DEFAULT CURRENT_TIMESTAMP
+                        );
+
+                        CREATE TABLE IF NOT EXISTS portfolio_transactions (
+                            id INTEGER PRIMARY KEY AUTOINCREMENT,
+                            action TEXT NOT NULL,
+                            symbol TEXT NOT NULL,
+                            quantity REAL NOT NULL,
+                            price REAL NOT NULL,
+                            currency TEXT DEFAULT 'USD',
+                            realized_pnl REAL DEFAULT 0,
+                            created_at TEXT DEFAULT CURRENT_TIMESTAMP
+                        );
+
+                        CREATE TABLE IF NOT EXISTS market_cache (
+                            namespace TEXT NOT NULL,
+                            cache_key TEXT NOT NULL,
+                            payload TEXT NOT NULL,
+                            expires_at REAL NOT NULL,
+                            created_at TEXT DEFAULT CURRENT_TIMESTAMP,
+                            PRIMARY KEY (namespace, cache_key)
+                        );
+
+                        CREATE TABLE IF NOT EXISTS sessions (
+                            id TEXT PRIMARY KEY,
+                            title TEXT NOT NULL,
+                            created_at TEXT DEFAULT CURRENT_TIMESTAMP,
+                            updated_at TEXT DEFAULT CURRENT_TIMESTAMP
+                        );
+
+                        CREATE TABLE IF NOT EXISTS session_events (
+                            id INTEGER PRIMARY KEY AUTOINCREMENT,
+                            session_id TEXT NOT NULL,
+                            command TEXT NOT NULL,
+                            status TEXT NOT NULL,
+                            output_preview TEXT DEFAULT '',
+                            created_at TEXT DEFAULT CURRENT_TIMESTAMP,
+                            FOREIGN KEY (session_id) REFERENCES sessions(id) ON DELETE CASCADE
+                        );
+
+                        CREATE TABLE IF NOT EXISTS alerts (
                             id INTEGER PRIMARY KEY AUTOINCREMENT,
-                            action TEXT NOT NULL,
                             symbol TEXT NOT NULL,
-                            quantity REAL NOT NULL,
-                            price REAL NOT NULL,
-                            currency TEXT DEFAULT 'USD',
-                            realized_pnl REAL DEFAULT 0,
+                            condition TEXT NOT NULL,
+                            target REAL NOT NULL,
+                            note TEXT DEFAULT '',
+                            active INTEGER DEFAULT 1,
+                            triggered_at TEXT DEFAULT '',
                             created_at TEXT DEFAULT CURRENT_TIMESTAMP
                         );
 
-                        CREATE TABLE IF NOT EXISTS market_cache (
-                            namespace TEXT NOT NULL,
-                            cache_key TEXT NOT NULL,
-                            payload TEXT NOT NULL,
-                            expires_at REAL NOT NULL,
-                            created_at TEXT DEFAULT CURRENT_TIMESTAMP,
-                            PRIMARY KEY (namespace, cache_key)
+                        CREATE TABLE IF NOT EXISTS user_profile (
+                            id INTEGER PRIMARY KEY CHECK (id = 1),
+                            name TEXT NOT NULL,
+                            equity REAL NOT NULL,
+                            currency TEXT NOT NULL,
+                            leverage TEXT NOT NULL,
+                            years_in_investment REAL NOT NULL,
+                            gameplay TEXT NOT NULL,
+                            updated_at TEXT DEFAULT CURRENT_TIMESTAMP
                         );
                         """
                     )
+                    _migrate_user_profile_schema(db)
         except sqlite3.Error as exc:
             raise StorageError("Database lokal gagal diinisialisasi.") from exc
-
-    def execute(self, sql: str, params: Iterable[object] = ()) -> None:
-        try:
-            with closing(self.connect()) as db:
-                with db:
-                    db.execute(sql, tuple(params))
-        except sqlite3.Error as exc:
-            raise StorageError("Operasi database gagal.") from exc
-
+
+    def execute(self, sql: str, params: Iterable[object] = ()) -> None:
+        try:
+            with closing(self.connect()) as db:
+                with db:
+                    db.execute(sql, tuple(params))
+        except sqlite3.Error as exc:
+            raise StorageError("Operasi database gagal.") from exc
+
     def query(self, sql: str, params: Iterable[object] = ()) -> list[sqlite3.Row]:
         try:
             with closing(self.connect()) as db:
                 return list(db.execute(sql, tuple(params)).fetchall())
         except sqlite3.Error as exc:
             raise StorageError("Query database gagal.") from exc
+
+
+def _migrate_user_profile_schema(db: sqlite3.Connection) -> None:
+    """Normalize older user_profile schemas to the v0.2.2 canonical shape."""
+
+    columns = {str(row["name"]) for row in db.execute("PRAGMA table_info(user_profile)").fetchall()}
+    canonical = {"id", "name", "equity", "currency", "leverage", "years_in_investment", "gameplay", "updated_at"}
+    if canonical.issubset(columns):
+        return
+
+    rows = list(db.execute("SELECT * FROM user_profile").fetchall())
+    legacy_profile = _legacy_profile_payload(rows[0]) if rows else None
+    db.execute("DROP TABLE user_profile")
+    db.execute(
+        """
+        CREATE TABLE user_profile (
+            id INTEGER PRIMARY KEY CHECK (id = 1),
+            name TEXT NOT NULL,
+            equity REAL NOT NULL,
+            currency TEXT NOT NULL,
+            leverage TEXT NOT NULL,
+            years_in_investment REAL NOT NULL,
+            gameplay TEXT NOT NULL,
+            updated_at TEXT DEFAULT CURRENT_TIMESTAMP
+        )
+        """
+    )
+    if legacy_profile is None:
+        return
+    db.execute(
+        """
+        INSERT INTO user_profile (id, name, equity, currency, leverage, years_in_investment, gameplay, updated_at)
+        VALUES (1, ?, ?, ?, ?, ?, ?, CURRENT_TIMESTAMP)
+        """,
+        legacy_profile,
+    )
+
+
+def _legacy_profile_payload(row: sqlite3.Row) -> tuple[object, ...]:
+    keys = set(row.keys())
+    name = row["name"] if "name" in keys else "User"
+    equity = row["equity"] if "equity" in keys else row["equity_amount"] if "equity_amount" in keys else 0
+    currency = row["currency"] if "currency" in keys else row["equity_currency"] if "equity_currency" in keys else "USD"
+    leverage = row["leverage"] if "leverage" in keys else "1:1"
+    years = (
+        row["years_in_investment"]
+        if "years_in_investment" in keys
+        else row["experience_years"]
+        if "experience_years" in keys
+        else 0
+    )
+    gameplay = _normalize_legacy_gameplay(str(row["gameplay"])) if "gameplay" in keys else _classify_legacy_gameplay(float(equity))
+    return (name, equity, currency, leverage, years, gameplay)
+
+
+def _normalize_legacy_gameplay(value: str) -> str:
+    normalized = value.strip().lower().replace("-", "_").replace(" ", "_")
+    return {
+        "scalper": "Scalper",
+        "intra_day": "Intra day",
+        "intraday": "Intra day",
+        "day_trade": "Day trade",
+        "day_trader": "Day trade",
+        "swing": "Swing/Investor",
+        "investor": "Swing/Investor",
+    }.get(normalized, value.strip() or "Scalper")
+
+
+def _classify_legacy_gameplay(equity: float) -> str:
+    if equity <= 400:
+        return "Scalper"
+    if equity <= 1000:
+        return "Intra day"
+    if equity <= 5000:
+        return "Day trade"
+    return "Swing/Investor"

package/fincli/app/storage/secrets.py

@@ -12,9 +12,15 @@ from fincli.app.utils.errors import ConfigError
 SECRETS_FILE = APP_DIR / "secrets.env"
 
 
-def load_local_secrets(path: Path | None = None, *, override: bool = False) -> None:
+def load_local_secrets(
+    path: Path | None = None,
+    *,
+    override: bool = False,
+    override_keys: set[str] | None = None,
+) -> None:
     """Load persisted secrets into process environment."""
     path = path or SECRETS_FILE
+    override_keys = override_keys or set()
     if not path.exists():
         return
     for line in path.read_text(encoding="utf-8").splitlines():
@@ -24,7 +30,7 @@ def load_local_secrets(path: Path | None = None, *, override: bool = False) -> N
         key, value = stripped.split("=", 1)
         key = key.strip()
         value = _unquote(value.strip())
-        if key and (override or key not in os.environ):
+        if key and (override or key in override_keys or key not in os.environ or os.environ.get(key, "") == ""):
             os.environ[key] = value
 
 
@@ -72,8 +78,11 @@ def read_secrets(path: Path | None = None) -> dict[str, str]:
 def secret_source(env_key: str, path: Path | None = None) -> str:
     """Return a display-safe source for a secret."""
     path = path or SECRETS_FILE
+    current = os.getenv(env_key)
+    if not current:
+        return "-"
     if env_key in os.environ:
-        if env_key in read_secrets(path):
+        if read_secrets(path).get(env_key) == current:
             return "~/.fincli/secrets.env"
         return "environment/.env"
     return "-"

package/fincli/app/tui/components.py

@@ -1,55 +1,73 @@
-"""Reusable TUI components."""
-
-from __future__ import annotations
-
-from rich.markdown import Markdown
-from rich.panel import Panel
-from rich.table import Table
-from rich.text import Text
+"""Reusable TUI components."""
+
+from __future__ import annotations
+
+from rich.markdown import Markdown
+from rich.panel import Panel
+from rich.table import Table
+from rich.text import Text
 from textual.widgets import Static
-
-from fincli.app.cli.commands import CommandSpec
-
-
-class CommandPalette(Static):
-    """Slash command palette shown near the command input."""
-
-    def render_commands(self, commands: list[CommandSpec], query: str = "") -> None:
-        table = Table.grid(expand=True)
-        table.add_column("Command", style="white", no_wrap=True, ratio=1)
-        table.add_column("Description", style="bright_black", justify="right", ratio=3)
-
-        for index, command in enumerate(commands):
-            command_text = command.name
-            description = command.description
-            if index == 0:
-                command_text = f"[black on cyan]> {command.name}[/]"
-                description = f"[black on cyan]{command.description}[/]"
-            table.add_row(command_text, description)
-
-        if len(commands) > 6:
-            table.add_row("[bright_black]v more[/]", "[bright_black]Ketik command lebih spesifik[/]")
-
-        title = f"[cyan]>[/] {query or '/'}"
-        self.update(Panel(table, title=title, border_style="bright_black", padding=(0, 1)))
-
-    def clear_palette(self) -> None:
-        self.update("")
-
-
-def format_user_message(message: str) -> Panel:
-    text = Text()
-    text.append("> ", style="bold cyan")
-    text.append(message, style="bold white")
-    return Panel(text, border_style="#2f332f", style="on #2b2f2b", padding=(0, 1))
+
+from fincli.app.cli.commands import CommandSpec
+
+
+class CommandPalette(Static):
+    """Slash command palette shown near the command input."""
+
+    def render_commands(self, commands: list[CommandSpec], query: str = "") -> None:
+        table = Table.grid(expand=True)
+        table.add_column("Command", style="white", no_wrap=True, ratio=1)
+        table.add_column("Description", style="bright_black", justify="right", ratio=3)
+
+        for index, command in enumerate(commands):
+            command_text = command.name
+            description = command.description
+            if index == 0:
+                command_text = f"[black on cyan]> {command.name}[/]"
+                description = f"[black on cyan]{command.description}[/]"
+            table.add_row(command_text, description)
+
+        if len(commands) > 6:
+            table.add_row("[bright_black]v more[/]", "[bright_black]Ketik command lebih spesifik[/]")
+
+        title = f"[cyan]>[/] {query or '/'}"
+        self.update(Panel(table, title=title, border_style="bright_black", padding=(0, 1)))
+
+    def clear_palette(self) -> None:
+        self.update("")
+
+
+def format_user_message(message: str) -> Panel:
+    text = Text()
+    text.append("> ", style="bold cyan")
+    text.append(message, style="bold white")
+    return Panel(text, border_style="#2f332f", style="on #2b2f2b", padding=(0, 1))
+
+
+def format_thinking_message(message: str) -> Text:
+    text = Text()
+    text.append("> Thinking: ", style="dim")
+    text.append(message, style="italic dim")
+    return text
+
+
+def format_ai_message(message: str) -> Markdown:
+    return Markdown(message)
 
 
-def format_thinking_message(message: str) -> Text:
-    text = Text()
-    text.append("> Thinking: ", style="dim")
-    text.append(message, style="italic dim")
-    return text
+def write_output_entry(log: object, renderable: object) -> None:
+    """Write one output entry with a single blank line separator.
 
+    No visual barrier characters are emitted here; Rich/Textual renderables keep
+    their own borders if they need one.
+    """
 
-def format_ai_message(message: str) -> Markdown:
-    return Markdown(f"* {message}")
+    items = getattr(log, "items", None)
+    if isinstance(items, list) and items:
+        log.write("")
+        log.write(renderable)
+        return
+    line_count = getattr(log, "line_count", 0)
+    if isinstance(line_count, int) and line_count > 0:
+        log.write("")
+    log.write(renderable)