@drico2008/fincli 0.1.3 → 0.2.2

package/fincli/app/tui/layout.py

@@ -1,261 +1,273 @@
-"""Textual layout for FinCLI."""
-
-from __future__ import annotations
-
-from collections.abc import Iterable
-from threading import Lock
-
-from textual.app import App, ComposeResult, SystemCommand
-from textual.containers import Horizontal, Vertical, VerticalScroll
-from textual.screen import Screen
-from textual.worker import Worker, WorkerState
-from textual.widgets import Header, Input, RichLog, Static
-
-from fincli import __version__
-from fincli.app.cli.autocomplete import SlashAutocomplete
-from fincli.app.cli.commands import CommandRegistry
-from fincli.app.cli.router import CommandResult, CommandRouter
-from fincli.app.providers.ai.manager import AIProviderManager
-from fincli.app.tui.components import CommandPalette, format_ai_message, format_thinking_message, format_user_message
-from fincli.app.tui.market_provider_selector import MarketProviderSelectorScreen
-from fincli.app.tui.model_selector import AIModelSelectorScreen
-from fincli.app.tui.theme import APP_CSS
-
-
-class FinCLIApp(App[None]):
-    """Modern terminal dashboard for FinCLI v0.1."""
-
-    CSS = APP_CSS
-    TITLE = f"FinCLI v{__version__}"
-    SUB_TITLE = "Financial terminal MVP"
-    BINDINGS = [
-        ("ctrl+c", "quit", "Quit"),
-        ("ctrl+l", "clear_output", "Clear"),
-        ("f1", "help", "Help"),
-    ]
-
-    def __init__(self) -> None:
-        super().__init__()
-        self.registry = CommandRegistry()
-        self.autocomplete = SlashAutocomplete(self.registry)
-        self.router = CommandRouter(registry=self.registry)
-        self._route_lock = Lock()
-        self._worker_index = 0
-        self._latest_worker_sequence = 0
-        self._worker_meta: dict[str, dict[str, str | bool]] = {}
-
-    def compose(self) -> ComposeResult:
-        yield Header(show_clock=True)
-        with Vertical(id="workspace"):
-            with Vertical(id="main"):
+"""Textual layout for FinCLI."""
+
+from __future__ import annotations
+
+from collections.abc import Iterable
+from threading import Lock
+
+from textual.app import App, ComposeResult, SystemCommand
+from textual.containers import Horizontal, Vertical, VerticalScroll
+from textual.css.query import NoMatches
+from textual.screen import Screen
+from textual.worker import Worker, WorkerState
+from textual.widgets import Header, Input, RichLog, Static
+
+from fincli import __version__
+from fincli.app.cli.autocomplete import SlashAutocomplete
+from fincli.app.cli.commands import CommandRegistry
+from fincli.app.cli.router import CommandResult, CommandRouter
+from fincli.app.providers.ai.manager import AIProviderManager
+from fincli.app.tui.components import CommandPalette, format_thinking_message, format_user_message
+from fincli.app.tui.components import write_output_entry
+from fincli.app.tui.market_provider_selector import MarketProviderSelectorScreen
+from fincli.app.tui.model_selector import AIModelSelectorScreen
+from fincli.app.tui.theme import APP_CSS
+
+
+class FinCLIApp(App[None]):
+    """Modern terminal dashboard for FinCLI v0.1."""
+
+    CSS = APP_CSS
+    TITLE = f"FinCLI v{__version__}"
+    SUB_TITLE = "Financial terminal MVP"
+    BINDINGS = [
+        ("ctrl+c", "quit", "Quit"),
+        ("ctrl+l", "clear_output", "Clear"),
+        ("f1", "help", "Help"),
+    ]
+
+    def __init__(self) -> None:
+        super().__init__()
+        self.registry = CommandRegistry()
+        self.autocomplete = SlashAutocomplete(self.registry)
+        self.router = CommandRouter(registry=self.registry)
+        self._route_lock = Lock()
+        self._worker_index = 0
+        self._latest_worker_sequence = 0
+        self._worker_meta: dict[str, dict[str, str | bool]] = {}
+
+    def compose(self) -> ComposeResult:
+        yield Header(show_clock=True)
+        with Vertical(id="workspace"):
+            yield Static(
+                f"FINCLI v{__version__} | PROFESSIONAL RESEARCH TERMINAL | LIVE WORKSPACE",
+                id="top_strip",
+            )
+            yield Static(
+                "MARKET DESK  /research  /news  /macro    ANALYSIS  /technical  /analyze  /mtf    RISK  /profile  /portfolio  /journal",
+                id="market_ribbon",
+            )
+            yield Static("OUTPUT STREAM | green=bullish/positive | red=bearish/negative | yellow=caution/wait", id="output_header")
+            with Vertical(id="output_frame"):
                 yield RichLog(id="output", wrap=True, markup=True, highlight=True)
-        yield Static("ready | /dashboard | /market AAPL | /provider status", id="status_bar")
+        yield Static("ready | /research AAPL --quick | /analyze XAUUSD | /provider status", id="status_bar")
         with Vertical(id="command_area"):
+            yield Static("Type a question for AI chat or use slash commands. Start with / for autocomplete.", id="command_hint")
             with Horizontal(id="command_line"):
-                yield Static("> ", id="command_prompt")
-                yield Input(placeholder="/", id="command_input")
-            with VerticalScroll(id="command_palette_scroll"):
-                yield CommandPalette(id="command_palette")
-
-    def on_mount(self) -> None:
-        palette = self.query_one(CommandPalette)
-        palette.clear_palette()
-        self.query_one("#command_palette_scroll", VerticalScroll).styles.display = "none"
-        output = self.query_one("#output", RichLog)
-        output.write("Loading dashboard...")
-        self._submit_route("/dashboard", display_raw="/dashboard", clear_output_before_result=True)
-        self.query_one("#command_input", Input).focus()
-
-    def on_input_changed(self, event: Input.Changed) -> None:
-        palette = self.query_one(CommandPalette)
-        palette_scroll = self.query_one("#command_palette_scroll", VerticalScroll)
-        value = event.value.strip()
-        if not value.startswith("/"):
-            palette.clear_palette()
-            palette_scroll.styles.display = "none"
-            return
-
-        suggestions = self.autocomplete.suggestions_for(value)
-        palette_scroll.styles.display = "block"
-        palette_scroll.scroll_home(animate=False)
-        palette.render_commands(suggestions, value)
-
-    def on_input_submitted(self, event: Input.Submitted) -> None:
-        event.input.value = ""
-        palette = self.query_one(CommandPalette)
-        palette.clear_palette()
-        self.query_one("#command_palette_scroll", VerticalScroll).styles.display = "none"
-        raw = event.value.strip()
-        output = self.query_one("#output", RichLog)
-        status = self.query_one("#status_bar", Static)
-        if raw.lower() == "/ai_model":
-            self.push_screen(AIModelSelectorScreen(self.router.config, self._set_ai_model_from_selector))
-            status.update("selecting ai model | esc to close")
-            return
-        if raw.lower() == "/news_model":
-            self.push_screen(MarketProviderSelectorScreen(self.router.config, self._set_market_provider_from_selector))
-            status.update("selecting market/news provider | esc to close")
-            return
-
-        if raw and (not raw.startswith("/") or raw.lower().startswith("/ai ")):
-            prompt = raw[4:].strip() if raw.lower().startswith("/ai ") else raw
-            self._handle_ai_chat(prompt)
-            return
-
-        if raw.lower() == "/clear":
-            self._invalidate_pending_workers()
-            output.clear()
-            status.update("cleared | /help untuk command")
-            return
-        if raw.lower() == "/exit":
-            self.exit()
-            return
-
-        self._submit_route(raw, display_raw=raw)
-
-    def action_clear_output(self) -> None:
-        self._invalidate_pending_workers()
-        self.query_one("#output", RichLog).clear()
-        self.query_one("#status_bar", Static).update("cleared | /help untuk command")
-
-    def action_help(self) -> None:
-        output = self.query_one("#output", RichLog)
-        output.write(self.router.route("/help").renderable)
-
-    def get_system_commands(self, screen: Screen) -> Iterable[SystemCommand]:
-        """Return a curated command palette for FinCLI."""
-        yield SystemCommand(
-            "Keys",
-            "Show or hide FinCLI keyboard shortcuts.",
-            self._toggle_help_panel,
-        )
-        yield SystemCommand(
-            "Maximize Panel",
-            "Maximize the active FinCLI panel.",
-            screen.action_maximize,
-        )
-        yield SystemCommand(
-            "Save Screenshot",
-            "Save the current FinCLI screen as an SVG file.",
-            lambda: self.set_timer(0.1, self.deliver_screenshot),
-        )
-        yield SystemCommand(
-            "Change Theme",
-            "Open Textual theme selector for the terminal UI.",
-            self.action_change_theme,
-        )
-        yield SystemCommand(
-            "Clear Output",
-            "Clear the main output log.",
-            self.action_clear_output,
-        )
-        yield SystemCommand(
-            "Quit FinCLI",
-            "Exit FinCLI and return to the terminal.",
-            self.action_quit,
-        )
-
-    def _toggle_help_panel(self) -> None:
-        if self.screen.query("HelpPanel"):
-            self.action_hide_help_panel()
-        else:
-            self.action_show_help_panel()
-
-    def _set_ai_model_from_selector(self, provider: str, model: str) -> None:
-        self.router.ai_provider = AIProviderManager().create(provider)
-        output = self.query_one("#output", RichLog)
-        status = self.query_one("#status_bar", Static)
-        output.write(f"AI model aktif: {provider} / {model}")
-        status.update(f"ready | ai model: {provider}/{model}")
-
-    def _set_market_provider_from_selector(self, providers: tuple[str, ...]) -> None:
-        self.router._refresh_market_service()
-        self.router.cache.clear()
-        output = self.query_one("#output", RichLog)
-        status = self.query_one("#status_bar", Static)
-        output.write(f"Provider market/news priority aktif: {', '.join(providers)}")
-        status.update(f"ready | market provider: {providers[0] if providers else 'yfinance'}")
-
-    def _handle_ai_chat(self, prompt: str) -> None:
-        output = self.query_one("#output", RichLog)
-        status = self.query_one("#status_bar", Static)
-        output.write(format_user_message(prompt))
-        output.write(format_thinking_message("routing prompt to active AI provider..."))
-        self._submit_route(f"/ai {prompt}", display_raw="/ai", chat=True)
-
-    def _submit_route(
-        self,
-        raw: str,
-        *,
-        display_raw: str,
-        chat: bool = False,
-        clear_output_before_result: bool = False,
-    ) -> None:
-        """Run a router command without blocking Textual's UI thread."""
-        self._worker_index += 1
-        worker_name = f"route-{self._worker_index}"
-        self._latest_worker_sequence = self._worker_index
-        self._worker_meta[worker_name] = {
-            "raw": raw,
-            "display_raw": display_raw,
-            "chat": chat,
-            "clear_output_before_result": clear_output_before_result,
-            "sequence": str(self._worker_index),
-        }
-        self.query_one("#status_bar", Static).update(f"running | {display_raw}")
-        self.run_worker(
-            lambda: self._route_in_worker(raw),
-            name=worker_name,
-            group="router",
-            description=display_raw,
-            thread=True,
-        )
-
-    def _invalidate_pending_workers(self) -> None:
-        self._latest_worker_sequence = max(self._latest_worker_sequence, self._worker_index) + 1
-
-    def _route_in_worker(self, raw: str) -> CommandResult:
-        with self._route_lock:
-            return self.router.route(raw)
-
-    def on_worker_state_changed(self, event: Worker.StateChanged) -> None:
-        worker = event.worker
-        meta = self._worker_meta.get(worker.name or "")
-        if meta is None:
-            return
-        if event.state not in {WorkerState.SUCCESS, WorkerState.ERROR, WorkerState.CANCELLED}:
-            return
-
-        self._worker_meta.pop(worker.name or "", None)
-        sequence = int(str(meta.get("sequence", "0")))
-        if sequence < self._latest_worker_sequence:
-            return
-        output = self.query_one("#output", RichLog)
-        status = self.query_one("#status_bar", Static)
-        display_raw = str(meta["display_raw"])
-
-        if event.state == WorkerState.CANCELLED:
-            status.update(f"cancelled | {display_raw}")
-            return
-        if event.state == WorkerState.ERROR:
-            output.write(f"Error menjalankan {display_raw}: {worker.error}")
-            status.update(f"error | {display_raw}")
-            return
-
-        result = worker.result
-        if bool(meta.get("clear_output_before_result")):
-            output.clear()
-        if result.clear:
-            output.clear()
-        elif result.renderable:
-            if bool(meta.get("chat")) and result.status == "ready":
-                output.write(format_ai_message(str(result.renderable)))
-            else:
-                output.write(result.renderable)
-
-        if bool(meta.get("chat")):
-            status.update(f"{result.status} | ai chat")
-        else:
-            status.update(f"{result.status} | last: {display_raw or 'empty'}")
-        if result.should_exit:
-            self.exit()
+                yield Static("F> ", id="command_prompt")
+                yield Input(placeholder="Ask FinCLI or type /help", id="command_input")
+            with VerticalScroll(id="command_palette_scroll"):
+                yield CommandPalette(id="command_palette")
+
+    def on_mount(self) -> None:
+        palette = self.query_one(CommandPalette)
+        palette.clear_palette()
+        self.query_one("#command_palette_scroll", VerticalScroll).styles.display = "none"
+        output = self.query_one("#output", RichLog)
+        write_output_entry(output, "Loading dashboard...")
+        self._submit_route("/dashboard", display_raw="/dashboard", clear_output_before_result=True)
+        self.query_one("#command_input", Input).focus()
+
+    def on_input_changed(self, event: Input.Changed) -> None:
+        palette = self.query_one(CommandPalette)
+        palette_scroll = self.query_one("#command_palette_scroll", VerticalScroll)
+        value = event.value.strip()
+        if not value.startswith("/"):
+            palette.clear_palette()
+            palette_scroll.styles.display = "none"
+            return
+
+        suggestions = self.autocomplete.suggestions_for(value)
+        palette_scroll.styles.display = "block"
+        palette_scroll.scroll_home(animate=False)
+        palette.render_commands(suggestions, value)
+
+    def on_input_submitted(self, event: Input.Submitted) -> None:
+        event.input.value = ""
+        palette = self.query_one(CommandPalette)
+        palette.clear_palette()
+        self.query_one("#command_palette_scroll", VerticalScroll).styles.display = "none"
+        raw = event.value.strip()
+        output = self.query_one("#output", RichLog)
+        status = self.query_one("#status_bar", Static)
+        if raw.lower() == "/ai_model":
+            self.push_screen(AIModelSelectorScreen(self.router.config, self._set_ai_model_from_selector))
+            status.update("selecting ai model | esc to close")
+            return
+        if raw.lower() == "/news_model":
+            self.push_screen(MarketProviderSelectorScreen(self.router.config, self._set_market_provider_from_selector))
+            status.update("selecting market/news provider | esc to close")
+            return
+
+        if raw and (not raw.startswith("/") or raw.lower().startswith("/ai ")):
+            prompt = raw[4:].strip() if raw.lower().startswith("/ai ") else raw
+            self._handle_ai_chat(prompt)
+            return
+
+        if raw.lower() == "/clear":
+            self._invalidate_pending_workers()
+            output.clear()
+            status.update("cleared | /help untuk command")
+            return
+        if raw.lower() == "/exit":
+            self.exit()
+            return
+
+        self._submit_route(raw, display_raw=raw)
+
+    def action_clear_output(self) -> None:
+        self._invalidate_pending_workers()
+        self.query_one("#output", RichLog).clear()
+        self.query_one("#status_bar", Static).update("cleared | /help untuk command")
+
+    def action_help(self) -> None:
+        output = self.query_one("#output", RichLog)
+        write_output_entry(output, self.router.route("/help").renderable)
+
+    def get_system_commands(self, screen: Screen) -> Iterable[SystemCommand]:
+        """Return a curated command palette for FinCLI."""
+        yield SystemCommand(
+            "Keys",
+            "Show or hide FinCLI keyboard shortcuts.",
+            self._toggle_help_panel,
+        )
+        yield SystemCommand(
+            "Maximize Panel",
+            "Maximize the active FinCLI panel.",
+            screen.action_maximize,
+        )
+        yield SystemCommand(
+            "Save Screenshot",
+            "Save the current FinCLI screen as an SVG file.",
+            lambda: self.set_timer(0.1, self.deliver_screenshot),
+        )
+        yield SystemCommand(
+            "Change Theme",
+            "Open Textual theme selector for the terminal UI.",
+            self.action_change_theme,
+        )
+        yield SystemCommand(
+            "Clear Output",
+            "Clear the main output log.",
+            self.action_clear_output,
+        )
+        yield SystemCommand(
+            "Quit FinCLI",
+            "Exit FinCLI and return to the terminal.",
+            self.action_quit,
+        )
+
+    def _toggle_help_panel(self) -> None:
+        if self.screen.query("HelpPanel"):
+            self.action_hide_help_panel()
+        else:
+            self.action_show_help_panel()
+
+    def _set_ai_model_from_selector(self, provider: str, model: str) -> None:
+        self.router.ai_provider = AIProviderManager().create(provider)
+        output = self.query_one("#output", RichLog)
+        status = self.query_one("#status_bar", Static)
+        write_output_entry(output, f"AI model aktif: {provider} / {model}")
+        status.update(f"ready | ai model: {provider}/{model}")
+
+    def _set_market_provider_from_selector(self, providers: tuple[str, ...]) -> None:
+        self.router._refresh_market_service()
+        self.router.cache.clear()
+        output = self.query_one("#output", RichLog)
+        status = self.query_one("#status_bar", Static)
+        write_output_entry(output, f"Provider market/news priority aktif: {', '.join(providers)}")
+        status.update(f"ready | market provider: {providers[0] if providers else 'yfinance'}")
+
+    def _handle_ai_chat(self, prompt: str) -> None:
+        output = self.query_one("#output", RichLog)
+        status = self.query_one("#status_bar", Static)
+        write_output_entry(output, format_user_message(prompt))
+        write_output_entry(output, format_thinking_message("routing prompt to active AI provider..."))
+        self._submit_route(f"/ai {prompt}", display_raw="/ai", chat=True)
+
+    def _submit_route(
+        self,
+        raw: str,
+        *,
+        display_raw: str,
+        chat: bool = False,
+        clear_output_before_result: bool = False,
+    ) -> None:
+        """Run a router command without blocking Textual's UI thread."""
+        self._worker_index += 1
+        worker_name = f"route-{self._worker_index}"
+        self._latest_worker_sequence = self._worker_index
+        self._worker_meta[worker_name] = {
+            "raw": raw,
+            "display_raw": display_raw,
+            "chat": chat,
+            "clear_output_before_result": clear_output_before_result,
+            "sequence": str(self._worker_index),
+        }
+        self.query_one("#status_bar", Static).update(f"running | {display_raw}")
+        self.run_worker(
+            lambda: self._route_in_worker(raw),
+            name=worker_name,
+            group="router",
+            description=display_raw,
+            thread=True,
+        )
+
+    def _invalidate_pending_workers(self) -> None:
+        self._latest_worker_sequence = max(self._latest_worker_sequence, self._worker_index) + 1
+
+    def _route_in_worker(self, raw: str) -> CommandResult:
+        with self._route_lock:
+            return self.router.route(raw)
+
+    def on_worker_state_changed(self, event: Worker.StateChanged) -> None:
+        worker = event.worker
+        meta = self._worker_meta.get(worker.name or "")
+        if meta is None:
+            return
+        if event.state not in {WorkerState.SUCCESS, WorkerState.ERROR, WorkerState.CANCELLED}:
+            return
+
+        self._worker_meta.pop(worker.name or "", None)
+        sequence = int(str(meta.get("sequence", "0")))
+        if sequence < self._latest_worker_sequence:
+            return
+        try:
+            output = self.query_one("#output", RichLog)
+            status = self.query_one("#status_bar", Static)
+        except NoMatches:
+            return
+        display_raw = str(meta["display_raw"])
+
+        if event.state == WorkerState.CANCELLED:
+            status.update(f"cancelled | {display_raw}")
+            return
+        if event.state == WorkerState.ERROR:
+            write_output_entry(output, f"Error menjalankan {display_raw}: {worker.error}")
+            status.update(f"error | {display_raw}")
+            return
+
+        result = worker.result
+        if bool(meta.get("clear_output_before_result")):
+            output.clear()
+        if result.clear:
+            output.clear()
+        elif result.renderable:
+            write_output_entry(output, result.renderable)
+
+        if bool(meta.get("chat")):
+            status.update(f"{result.status} | ai chat")
+        else:
+            status.update(f"{result.status} | last: {display_raw or 'empty'}")
+        if result.should_exit:
+            self.exit()

package/fincli/app/tui/market_provider_selector.py

@@ -39,14 +39,16 @@ PROVIDER_LABELS = {
     "custom": "Custom API",
     "finnhub": "Finnhub",
     "twelvedata": "Twelve Data",
+    "alphavantage": "Alpha Vantage",
 }
 PROVIDER_ENV_KEYS = {
     "yfinance": (),
     "custom": ("MARKET_DATA_API_KEY", "MARKET_DATA_BASE_URL"),
     "finnhub": ("FINNHUB_API_KEY",),
     "twelvedata": ("TWELVE_DATA_API_KEY",),
+    "alphavantage": ("ALPHA_VANTAGE_API_KEY",),
 }
-DEFAULT_FALLBACK_ORDER = ("twelvedata", "finnhub", "custom", "yfinance")
+DEFAULT_FALLBACK_ORDER = ("twelvedata", "finnhub", "alphavantage", "custom", "yfinance")
 
 
 def market_provider_choices() -> tuple[MarketProviderChoice, ...]:
@@ -291,6 +293,9 @@ class MarketProviderSelectorScreen(ModalScreen[tuple[str, ...] | None]):
         if self.pending_env_keys:
             self._set_mode("key")
         else:
+            providers = recommended_provider_priority(self.selected_provider)
+            self.config.set_market_provider_priority(list(providers))
+            self.on_selected(providers)
             self._set_mode("priority")
 
 

package/fincli/app/tui/model_selector.py

@@ -425,6 +425,9 @@ class AIModelSelectorScreen(ModalScreen[tuple[str, str] | None]):
         if choice is None or not value.strip():
             return
         save_secret(choice.env_key, value)
+        model = self.config.settings.ai_model if self.config.settings.ai_provider == choice.provider else _default_model(choice.provider)
+        self.config.set_ai_model(choice.provider, model)
+        self.on_selected(choice.provider, model)
         self._set_mode("model")
 
 
@@ -438,9 +441,14 @@ def _has_key(provider: str) -> bool:
     return bool(choice and os.getenv(choice.env_key))
 
 
-def _masked_key(provider: str) -> str:
+def _masked_key(provider: str) -> str:
     choice = _provider_choice(provider)
     if choice is None:
         return "not configured"
-    masked = mask_secret(os.getenv(choice.env_key))
-    return "not configured" if masked == "not set" else f"configured {masked}"
+    masked = mask_secret(os.getenv(choice.env_key))
+    return "not configured" if masked == "not set" else f"configured {masked}"
+
+
+def _default_model(provider: str) -> str:
+    info = AIProviderManager().get(provider)
+    return info.default_model if info else provider