@drico2008/fincli 0.1.2 → 0.1.9

package/fincli/app/tui/market_provider_selector.py

@@ -15,6 +15,7 @@ from textual.widgets import Input, Static
 
 from fincli.app.providers.market.manager import MarketProviderManager
 from fincli.app.storage.config import ConfigManager
+from fincli.app.storage.secrets import save_secret
 from fincli.app.utils.formatting import mask_secret
 
 
@@ -109,6 +110,7 @@ class MarketProviderSelectorScreen(ModalScreen[tuple[str, ...] | None]):
         self.selected_index = 0
         self.selected_provider = config.settings.market_provider
         self.search = ""
+        self.pending_env_keys: list[str] = []
 
     def compose(self) -> ComposeResult:
         with Vertical(id="ai_selector_card"):
@@ -131,6 +133,9 @@ class MarketProviderSelectorScreen(ModalScreen[tuple[str, ...] | None]):
 
     def on_input_submitted(self, event: Input.Submitted) -> None:
         event.stop()
+        if self.mode == "key":
+            self._save_key(event.value)
+            return
         self.action_select()
 
     def on_key(self, event: Key) -> None:
@@ -170,7 +175,11 @@ class MarketProviderSelectorScreen(ModalScreen[tuple[str, ...] | None]):
         if self.mode == "provider":
             provider = selected.provider  # type: ignore[attr-defined]
             self.selected_provider = provider
-            self._set_mode("priority")
+            self.pending_env_keys = [key for key in PROVIDER_ENV_KEYS.get(provider, ()) if not os.getenv(key)]
+            if self.pending_env_keys:
+                self._set_mode("key")
+            else:
+                self._set_mode("priority")
             return
 
         providers = selected.providers  # type: ignore[attr-defined]
@@ -191,9 +200,16 @@ class MarketProviderSelectorScreen(ModalScreen[tuple[str, ...] | None]):
 
     def _sync_search_placeholder(self) -> None:
         search = self.query_one("#ai_selector_search", Input)
-        search.placeholder = "Search fallback presets..." if self.mode == "priority" else "Search providers..."
+        search.password = self.mode == "key"
+        if self.mode == "key":
+            env_key = self.pending_env_keys[0] if self.pending_env_keys else "API_KEY"
+            search.placeholder = f"Paste {env_key}..."
+        else:
+            search.placeholder = "Search fallback presets..." if self.mode == "priority" else "Search providers..."
 
     def _visible_items(self) -> list[MarketProviderChoice] | list[PriorityChoice]:
+        if self.mode == "key":
+            return []
         if self.mode == "priority":
             presets = list(priority_presets(self.selected_provider))
             if self.search:
@@ -222,6 +238,10 @@ class MarketProviderSelectorScreen(ModalScreen[tuple[str, ...] | None]):
         if self.mode == "priority":
             title.update("Select Provider Priority")
             provider.update(f"[cyan]Primary:[/] {self.selected_provider} [dim](tab to change provider)[/]")
+        elif self.mode == "key":
+            env_key = self.pending_env_keys[0] if self.pending_env_keys else "API_KEY"
+            title.update("Configure Market API Key")
+            provider.update(f"[cyan]Provider:[/] {self.selected_provider} [dim]{env_key} saved to ~/.fincli/secrets.env[/]")
         else:
             title.update("Select Market/News Provider")
             provider.update("")
@@ -231,6 +251,11 @@ class MarketProviderSelectorScreen(ModalScreen[tuple[str, ...] | None]):
 
     def _items_text(self, items: list[MarketProviderChoice] | list[PriorityChoice]) -> Text:
         text = Text()
+        if self.mode == "key":
+            env_key = self.pending_env_keys[0] if self.pending_env_keys else "API_KEY"
+            text.append(f"Paste {env_key} above, then press Enter.\n", style="bold")
+            text.append("The value is stored locally and will not be printed in output.\n", style="dim")
+            return text
         text.append("Providers\n" if self.mode == "provider" else "Fallback presets\n", style="bold dim")
         for index, item in enumerate(items):
             selected = index == self.selected_index
@@ -252,10 +277,25 @@ class MarketProviderSelectorScreen(ModalScreen[tuple[str, ...] | None]):
         return text
 
     def _help_text(self) -> str:
+        if self.mode == "key":
+            return "Paste key/value, Enter to save, Esc to close"
         if self.mode == "priority":
             return "Type to search, up/down navigate, Enter to save priority, Tab to change provider, Esc to close"
         return "Type to search, up/down navigate, Enter to select provider, Esc to close"
 
+    def _save_key(self, value: str) -> None:
+        if not self.pending_env_keys or not value.strip():
+            return
+        env_key = self.pending_env_keys.pop(0)
+        save_secret(env_key, value)
+        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")
+
 
 def _provider_key_status(choice: MarketProviderChoice) -> str:
     if not choice.env_keys:

package/fincli/app/tui/model_selector.py

@@ -13,9 +13,10 @@ from textual.events import Key
 from textual.screen import ModalScreen
 from textual.widgets import Input, Static
 
-from fincli.app.providers.ai.manager import AIProviderManager
-from fincli.app.storage.config import ConfigManager
-from fincli.app.utils.formatting import mask_secret
+from fincli.app.providers.ai.manager import AIProviderManager
+from fincli.app.storage.config import ConfigManager
+from fincli.app.storage.secrets import save_secret
+from fincli.app.utils.formatting import mask_secret
 
 
 @dataclass(frozen=True, slots=True)
@@ -248,9 +249,12 @@ class AIModelSelectorScreen(ModalScreen[tuple[str, str] | None]):
         self.selected_index = 0
         self._render_selector()
 
-    def on_input_submitted(self, event: Input.Submitted) -> None:
-        event.stop()
-        self.action_select()
+    def on_input_submitted(self, event: Input.Submitted) -> None:
+        event.stop()
+        if self.mode == "key":
+            self._save_key(event.value)
+            return
+        self.action_select()
 
     def on_key(self, event: Key) -> None:
         if event.key == "up":
@@ -286,20 +290,22 @@ class AIModelSelectorScreen(ModalScreen[tuple[str, str] | None]):
         if not items:
             return
         selected = items[self.selected_index]
-        if self.mode == "provider":
-            provider = selected.provider  # type: ignore[attr-defined]
-            self.selected_provider = provider
-            if _has_key(provider):
-                self._set_mode("configured")
-            else:
-                self._set_mode("model")
-            return
-        if self.mode == "configured":
-            if selected == "Configure again":
-                self._set_mode("model")
-            else:
-                self._set_mode("model")
-            return
+        if self.mode == "provider":
+            provider = selected.provider  # type: ignore[attr-defined]
+            self.selected_provider = provider
+            if _has_key(provider):
+                self._set_mode("configured")
+            else:
+                self._set_mode("key")
+            return
+        if self.mode == "configured":
+            if selected == "Configure API key":
+                self._set_mode("key")
+            elif selected == "Change model":
+                self._set_mode("model")
+            else:
+                self._set_mode("model")
+            return
         model = selected.model  # type: ignore[attr-defined]
         self.config.set_ai_model(self.selected_provider, model)
         self.on_selected(self.selected_provider, model)
@@ -312,23 +318,31 @@ class AIModelSelectorScreen(ModalScreen[tuple[str, str] | None]):
         self.mode = mode
         self.selected_index = 0
         self.search = ""
-        self.query_one("#ai_selector_search", Input).value = ""
-        self._sync_search_placeholder()
-        self._render_selector()
-
-    def _sync_search_placeholder(self) -> None:
-        search = self.query_one("#ai_selector_search", Input)
-        search.placeholder = "Search models..." if self.mode == "model" else "Search providers..."
-
-    def _visible_items(self) -> list[ProviderChoice] | list[ModelChoice] | list[str]:
-        if self.mode == "provider":
-            items = list(PROVIDERS)
-            if self.search:
-                items = [item for item in items if self.search in item.label.lower() or self.search in item.provider]
-            return items
-        if self.mode == "configured":
-            return ["Use existing configuration", "Configure again"]
-        models = list(MODEL_CATALOG.get(self.selected_provider, ()))
+        self.query_one("#ai_selector_search", Input).value = ""
+        self._sync_search_placeholder()
+        self._render_selector()
+
+    def _sync_search_placeholder(self) -> None:
+        search = self.query_one("#ai_selector_search", Input)
+        search.password = self.mode == "key"
+        if self.mode == "key":
+            choice = _provider_choice(self.selected_provider)
+            env_key = choice.env_key if choice else "API_KEY"
+            search.placeholder = f"Paste {env_key}..."
+        else:
+            search.placeholder = "Search models..." if self.mode == "model" else "Search providers..."
+
+    def _visible_items(self) -> list[ProviderChoice] | list[ModelChoice] | list[str]:
+        if self.mode == "provider":
+            items = list(PROVIDERS)
+            if self.search:
+                items = [item for item in items if self.search in item.label.lower() or self.search in item.provider]
+            return items
+        if self.mode == "configured":
+            return ["Use existing configuration", "Configure API key", "Change model"]
+        if self.mode == "key":
+            return []
+        models = list(MODEL_CATALOG.get(self.selected_provider, ()))
         if self.search:
             models = [item for item in models if self.search in item.label.lower() or self.search in item.model.lower()]
         if not models:
@@ -344,12 +358,17 @@ class AIModelSelectorScreen(ModalScreen[tuple[str, str] | None]):
         if self.mode == "provider":
             title.update("Select Provider")
             provider.update("")
-        elif self.mode == "configured":
-            choice = _provider_choice(self.selected_provider)
-            label = choice.label if choice else self.selected_provider
-            title.update(f"{label} is already configured")
-            provider.update(f"[cyan]Provider:[/] {label} [dim]{_masked_key(self.selected_provider)}[/]")
-        else:
+        elif self.mode == "configured":
+            choice = _provider_choice(self.selected_provider)
+            label = choice.label if choice else self.selected_provider
+            title.update(f"{label} is already configured")
+            provider.update(f"[cyan]Provider:[/] {label} [dim]{_masked_key(self.selected_provider)}[/]")
+        elif self.mode == "key":
+            choice = _provider_choice(self.selected_provider)
+            label = choice.label if choice else self.selected_provider
+            title.update("Configure API Key")
+            provider.update(f"[cyan]Provider:[/] {label} [dim](saved to ~/.fincli/secrets.env)[/]")
+        else:
             choice = _provider_choice(self.selected_provider)
             label = choice.label if choice else self.selected_provider
             title.update("Select Model")
@@ -361,11 +380,17 @@ class AIModelSelectorScreen(ModalScreen[tuple[str, str] | None]):
 
     def _items_text(self, items: list[ProviderChoice] | list[ModelChoice] | list[str]) -> Text:
         text = Text()
-        if self.mode == "provider":
-            text.append("Popular\n", style="bold dim")
-        elif self.mode == "model":
-            hidden = max(0, len(MODEL_CATALOG.get(self.selected_provider, ())) - len(items))
-            text.append(f"{hidden} filtered\n" if self.search else "Available models\n", style="bold dim")
+        if self.mode == "provider":
+            text.append("Popular\n", style="bold dim")
+        elif self.mode == "model":
+            hidden = max(0, len(MODEL_CATALOG.get(self.selected_provider, ())) - len(items))
+            text.append(f"{hidden} filtered\n" if self.search else "Available models\n", style="bold dim")
+        elif self.mode == "key":
+            choice = _provider_choice(self.selected_provider)
+            env_key = choice.env_key if choice else "API_KEY"
+            text.append(f"Paste {env_key} above, then press Enter.\n", style="bold")
+            text.append("The key is stored locally and will not be printed in output.\n", style="dim")
+            return text
 
         for index, item in enumerate(items):
             selected = index == self.selected_index
@@ -386,12 +411,24 @@ class AIModelSelectorScreen(ModalScreen[tuple[str, str] | None]):
             text.append("No matches.\n", style="dim")
         return text
 
-    def _help_text(self) -> str:
-        if self.mode == "configured":
-            return "Up/down navigate, Enter to select, Esc to go back"
+    def _help_text(self) -> str:
+        if self.mode == "key":
+            return "Paste API key, Enter to save, Esc to close"
+        if self.mode == "configured":
+            return "Up/down navigate, Enter to select, Esc to go back"
         if self.mode == "model":
             return "Type to search, up/down navigate, Enter to select, Tab to change provider, Esc to close"
-        return "Type to search, up/down navigate, Enter to select, Esc to close"
+        return "Type to search, up/down navigate, Enter to select, Esc to close"
+
+    def _save_key(self, value: str) -> None:
+        choice = _provider_choice(self.selected_provider)
+        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")
 
 
 def _provider_choice(provider: str) -> ProviderChoice | None:
@@ -404,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

package/fincli/app/utils/formatting.py

@@ -2,6 +2,12 @@
 
 from __future__ import annotations
 
+from rich.console import Console, ConsoleOptions, RenderResult
+from rich.markdown import Markdown
+from rich.text import Text
+
+from fincli.app.providers.ai.base import AIResponse
+
 
 def mask_secret(value: str | None) -> str:
     """Mask API keys and tokens before displaying them."""
@@ -15,3 +21,47 @@ def mask_secret(value: str | None) -> str:
 def normalize_symbol(symbol: str) -> str:
     """Normalize user-entered market symbols."""
     return symbol.strip().upper()
+
+
+class AIResponseView:
+    """Renderable AI response that preserves Markdown formatting in Rich/Textual."""
+
+    def __init__(self, response: AIResponse) -> None:
+        self.response = response
+
+    def __str__(self) -> str:
+        return (
+            f"Provider: {self.response.provider}\n"
+            f"Model: {self.response.model}\n"
+            f"Response:\n{self.response.content}"
+        )
+
+    def __rich_console__(self, console: Console, options: ConsoleOptions) -> RenderResult:
+        header = Text()
+        header.append("Provider: ", style="bold cyan")
+        header.append(self.response.provider, style="white")
+        header.append("  Model: ", style="bold cyan")
+        header.append(self.response.model, style="white")
+        yield header
+        yield Markdown(self.response.content)
+
+
+class MarkdownBlock:
+    """Small renderable block for titled Markdown content."""
+
+    def __init__(self, title: str, body: object, footer: str | None = None) -> None:
+        self.title = title
+        self.body = body
+        self.footer = footer
+
+    def __str__(self) -> str:
+        parts = [self.title, str(self.body)]
+        if self.footer:
+            parts.append(self.footer)
+        return "\n".join(parts)
+
+    def __rich_console__(self, console: Console, options: ConsoleOptions) -> RenderResult:
+        yield Text(self.title, style="bold cyan")
+        yield self.body
+        if self.footer:
+            yield Text(self.footer, style="dim")

package/npm/bin/fincli.js

@@ -5,20 +5,27 @@ const path = require("path");
 const { spawn } = require("child_process");
 
 const packageRoot = path.resolve(__dirname, "..", "..");
+const packageJson = require(path.join(packageRoot, "package.json"));
 const venvDir = path.join(packageRoot, ".npm-python");
 const pythonBin = process.platform === "win32"
   ? path.join(venvDir, "Scripts", "python.exe")
   : path.join(venvDir, "bin", "python");
 
 function run() {
+  const args = process.argv.slice(2);
+  if (args.includes("--version") || args.includes("-v")) {
+    console.log(packageJson.version);
+    return;
+  }
+
   if (!fs.existsSync(pythonBin)) {
     console.error("FinCLI Python runtime is missing.");
-    console.error("Try reinstalling with: npm install -g fincli");
+    console.error("Try reinstalling with: npm install -g @drico2008/fincli");
     console.error("Python 3.11+ must be available during npm install.");
     process.exit(1);
   }
 
-  const child = spawn(pythonBin, ["-m", "fincli.app.main", ...process.argv.slice(2)], {
+  const child = spawn(pythonBin, ["-m", "fincli.app.main", ...args], {
     cwd: packageRoot,
     stdio: "inherit"
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@drico2008/fincli",
-  "version": "0.1.2",
+  "version": "0.1.9",
   "description": "Modern financial CLI/TUI terminal for market monitoring and analysis.",
   "license": "MIT",
   "bin": {

package/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "fincli"
-version = "0.1.2"
+version = "0.1.9"
 description = "Modern financial CLI/TUI terminal for market monitoring and analysis."
 readme = "README.md"
 requires-python = ">=3.11"