@drico2008/fincli 0.1.3 → 0.2.2

package/fincli/app/tui/theme.py

@@ -1,157 +1,217 @@
-"""Theme constants for the Textual UI."""
-
-APP_CSS = """
+"""Theme constants for the Textual UI."""
+
+APP_CSS = """
 Screen {
-    background: #050505;
-    color: #e5e7eb;
+    background: #00110b;
+    color: #d9f99d;
 }
 
 Header {
-    background: #0b0f14;
-    color: #22d3ee;
+    background: #000805;
+    color: #22c55e;
     text-style: bold;
 }
-
-#workspace {
+
+#workspace {
+    height: 1fr;
+    width: 100%;
+}
+
+#main {
+    width: 1fr;
     height: 1fr;
-    width: 100%;
+    padding: 1 4 0 4;
+    background: #00110b;
 }
 
-#main {
-    width: 1fr;
+#top_strip {
+    height: 3;
+    content-align: center middle;
+    background: #031b10;
+    color: #86efac;
+    border: heavy #15803d;
+    text-style: bold;
+    margin: 0 0 1 0;
+}
+
+#market_ribbon {
+    height: 1;
+    content-align: center middle;
+    background: #020d08;
+    color: #22c55e;
+    text-style: bold;
+    margin: 0 0 1 0;
+}
+
+#output_header {
+    height: 1;
+    background: #052e16;
+    color: #bbf7d0;
+    text-style: bold;
+    padding: 0 1;
+}
+
+#output_frame {
     height: 1fr;
-    padding: 1 6;
-    background: #050505;
+    background: #000805;
+    border: heavy #166534;
+    padding: 1 2;
 }
 
 #output {
-    background: #050505;
+    background: #000805;
     color: #e5e7eb;
     border: none;
+    scrollbar-size: 1 1;
+    scrollbar-background: #000805;
+    scrollbar-color: #22c55e;
 }
 
 #command_area {
     dock: bottom;
     height: auto;
-    background: #050505;
-    padding: 0 6 1 6;
+    background: #00110b;
+    padding: 0 4 1 4;
+}
+
+#command_hint {
+    height: 1;
+    background: #020d08;
+    color: #84cc16;
+    padding: 0 1;
 }
 
 #command_line {
     height: 3;
     margin: 0 0 1 0;
-    border: none;
-    background: #262a27;
+    border: heavy #15803d;
+    background: #031b10;
     color: #f8fafc;
 }
 
 #command_prompt {
-    width: 3;
-    height: 3;
-    background: #262a27;
-    color: #22d3ee;
+    width: 4;
+    height: 1;
+    background: #031b10;
+    color: #22c55e;
     text-style: bold;
-    padding: 0 0 0 2;
+    padding: 0 0 0 1;
 }
 
 #command_input {
     width: 1fr;
-    height: 3;
+    height: 1;
     border: none;
-    background: #262a27;
+    background: #031b10;
     color: #f8fafc;
-    padding: 0 2 0 0;
-}
-
-#command_input:focus {
-    border: none;
+    padding: 0 1 0 0;
 }
-
+
+#command_input:focus {
+    border: none;
+}
+
 #command_palette_scroll {
     height: 9;
     margin: 0 0 0 0;
-    background: #050505;
+    background: #00110b;
     color: #f8fafc;
     scrollbar-size: 1 1;
-    scrollbar-background: #050505;
-    scrollbar-color: #22d3ee;
+    scrollbar-background: #00110b;
+    scrollbar-color: #22c55e;
 }
-
-#command_palette {
+
+#command_palette {
     height: auto;
     margin: 0 0 0 0;
-    background: #050505;
+    background: #00110b;
     color: #f8fafc;
 }
 
 #status_bar {
     dock: bottom;
     height: 1;
-    background: #0b0f14;
-    color: #64748b;
-    padding: 0 6;
+    background: #000805;
+    color: #86efac;
+    padding: 0 4;
 }
 
 .section-title {
-    color: #7dd3fc;
+    color: #86efac;
     text-style: bold;
 }
 
 .muted {
-    color: #94a3b8;
+    color: #64748b;
 }
 
-#ai_selector_card {
-    width: 78;
-    height: 30;
-    background: #252525;
-    color: #f8fafc;
-    padding: 1;
+.semantic-positive {
+    color: #22c55e;
+    text-style: bold;
 }
 
-#ai_selector_title {
-    height: 2;
-    color: #f8fafc;
+.semantic-negative {
+    color: #ef4444;
     text-style: bold;
 }
 
-#ai_selector_provider {
-    height: 2;
-    color: #f8fafc;
-    padding: 0 2;
+.semantic-caution {
+    color: #facc15;
+    text-style: bold;
 }
-
+
+#ai_selector_card {
+    width: 78;
+    height: 30;
+    background: #031b10;
+    color: #f8fafc;
+    padding: 1;
+    border: heavy #15803d;
+}
+
+#ai_selector_title {
+    height: 2;
+    color: #f8fafc;
+    text-style: bold;
+}
+
+#ai_selector_provider {
+    height: 2;
+    color: #f8fafc;
+    padding: 0 2;
+}
+
 #ai_selector_search {
     height: 3;
     margin: 0 1 1 1;
-    border: solid #8a8a8a;
-    background: #252525;
+    border: solid #22c55e;
+    background: #020d08;
     color: #f8fafc;
     padding: 0 1;
 }
-
+
 #ai_selector_search:focus {
-    border: solid #a3a3a3;
+    border: solid #86efac;
 }
-
-#ai_selector_scroll {
+
+#ai_selector_scroll {
     height: 1fr;
     margin: 0 1;
-    background: #252525;
+    background: #031b10;
     scrollbar-size: 1 1;
-    scrollbar-background: #252525;
-    scrollbar-color: #22d3ee;
+    scrollbar-background: #031b10;
+    scrollbar-color: #22c55e;
 }
 
 #ai_selector_list {
     height: auto;
-    background: #252525;
+    background: #031b10;
     color: #f8fafc;
 }
-
-#ai_selector_help {
-    height: 3;
-    color: #9ca3af;
-    padding: 1 0 0 0;
-}
-"""
+
+#ai_selector_help {
+    height: 3;
+    color: #9ca3af;
+    padding: 1 0 0 0;
+}
+"""

package/fincli/app/utils/formatting.py

@@ -1,17 +1,130 @@
-"""Small formatting helpers."""
+"""Small formatting helpers."""
+
+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."""
+    if not value:
+        return "not set"
+    if len(value) <= 8:
+        return "set"
+    return f"{value[:4]}...{value[-4:]}"
+
+
+def normalize_symbol(symbol: str) -> str:
+    """Normalize user-entered market symbols."""
+    return symbol.strip().upper()
 
-from __future__ import annotations
 
+POSITIVE_TERMS = (
+    "bullish",
+    "best to buy",
+    "buy",
+    "breakout",
+    "positive",
+    "gain",
+    "upside",
+    "higher",
+    "profit",
+    "win",
+    "triggered above",
+    "confirmed",
+)
+NEGATIVE_TERMS = (
+    "bearish",
+    "best to sell",
+    "sell",
+    "breakdown",
+    "negative",
+    "loss",
+    "drawdown",
+    "downside",
+    "lower",
+    "decline",
+    "drop",
+    "failed",
+    "unavailable",
+)
+CAUTION_TERMS = (
+    "caution",
+    "hold",
+    "wait",
+    "neutral",
+    "sideways",
+    "mixed",
+    "risk",
+    "warning",
+    "delayed",
+    "fallback",
+    "not confirmed",
+)
 
-def mask_secret(value: str | None) -> str:
-    """Mask API keys and tokens before displaying them."""
-    if not value:
-        return "not set"
-    if len(value) <= 8:
-        return "set"
-    return f"{value[:4]}...{value[-4:]}"
 
+def semantic_style(value: object) -> str:
+    """Map financial meaning to a consistent terminal style."""
+    text = str(value).strip().lower()
+    if not text:
+        return "white"
+    if any(term in text for term in CAUTION_TERMS):
+        return "bold yellow"
+    if any(term in text for term in NEGATIVE_TERMS):
+        return "bold red"
+    if any(term in text for term in POSITIVE_TERMS):
+        return "bold green"
+    return "white"
 
-def normalize_symbol(symbol: str) -> str:
-    """Normalize user-entered market symbols."""
-    return symbol.strip().upper()
+
+def semantic_text(value: object) -> Text:
+    """Return Rich Text styled by financial semantics."""
+    return Text(str(value), style=semantic_style(value))
+
+
+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,23 +1,23 @@
-{
-  "name": "@drico2008/fincli",
-  "version": "0.1.3",
-  "description": "Modern financial CLI/TUI terminal for market monitoring and analysis.",
-  "license": "MIT",
-  "bin": {
-    "fincli": "npm/bin/fincli.js"
-  },
-  "scripts": {
-    "postinstall": "node npm/postinstall.js",
-    "check": "node --check npm/bin/fincli.js && node --check npm/postinstall.js"
-  },
-  "files": [
-    "fincli/**/*.py",
-    "npm",
-    "pyproject.toml",
-    "README.md",
-    "requirements.txt"
-  ],
-  "engines": {
-    "node": ">=18"
-  }
-}
+{
+  "name": "@drico2008/fincli",
+  "version": "0.2.2",
+  "description": "Modern financial CLI/TUI terminal for market monitoring and analysis.",
+  "license": "MIT",
+  "bin": {
+    "fincli": "npm/bin/fincli.js"
+  },
+  "scripts": {
+    "postinstall": "node npm/postinstall.js",
+    "check": "node --check npm/bin/fincli.js && node --check npm/postinstall.js"
+  },
+  "files": [
+    "fincli/**/*.py",
+    "npm",
+    "pyproject.toml",
+    "README.md",
+    "requirements.txt"
+  ],
+  "engines": {
+    "node": ">=18"
+  }
+}

package/pyproject.toml

@@ -1,35 +1,35 @@
-[build-system]
-requires = ["setuptools>=68", "wheel"]
-build-backend = "setuptools.build_meta"
-
-[project]
-name = "fincli"
-version = "0.1.3"
-description = "Modern financial CLI/TUI terminal for market monitoring and analysis."
-readme = "README.md"
-requires-python = ">=3.11"
-dependencies = [
-  "textual>=0.86.0",
-  "rich>=13.9.0",
-  "python-dotenv>=1.0.1",
-  "httpx>=0.27.2",
-  "pydantic>=2.9.2",
-  "yfinance>=0.2.50",
-  "pandas>=2.2.3",
-  "numpy>=2.1.0",
-]
-
-[project.optional-dependencies]
-dev = ["pytest>=8.3.3"]
-market = ["yfinance>=0.2.50", "pandas>=2.2.3", "numpy>=2.1.0"]
-
-[project.scripts]
-fincli = "fincli.app.main:main"
-
-[tool.setuptools.packages.find]
-include = ["fincli*"]
-exclude = ["npm*", "tests*"]
-
-[tool.pytest.ini_options]
-testpaths = ["tests"]
-pythonpath = ["."]
+[build-system]
+requires = ["setuptools>=68", "wheel"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "fincli"
+version = "0.2.2"
+description = "Modern financial CLI/TUI terminal for market monitoring and analysis."
+readme = "README.md"
+requires-python = ">=3.11"
+dependencies = [
+  "textual>=0.86.0",
+  "rich>=13.9.0",
+  "python-dotenv>=1.0.1",
+  "httpx>=0.27.2",
+  "pydantic>=2.9.2",
+  "yfinance>=0.2.50",
+  "pandas>=2.2.3",
+  "numpy>=2.1.0",
+]
+
+[project.optional-dependencies]
+dev = ["pytest>=8.3.3"]
+market = ["yfinance>=0.2.50", "pandas>=2.2.3", "numpy>=2.1.0"]
+
+[project.scripts]
+fincli = "fincli.app.main:main"
+
+[tool.setuptools.packages.find]
+include = ["fincli*"]
+exclude = ["npm*", "tests*"]
+
+[tool.pytest.ini_options]
+testpaths = ["tests"]
+pythonpath = ["."]