aipa-cli 0.1.7__tar.gz → 0.1.8__tar.gz

{aipa_cli-0.1.7 → aipa_cli-0.1.8}/CHANGELOG.md

@@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.1.8] - 2026-05-09
+
+### Fixed
+- Respect `.env` file priority over `settings.json` by parsing `.env` first in `apply_settings_to_env()`, giving correct order: real env vars > `.env` > `settings.json`
+- Fix `_value_from_env_or_dotenv()` inverted logic and check `.env` directly when both sources match, so settings tab hints show the correct source
+- Guard AnalyzePane with `_ensure_agent()` to prevent `'NoneType' has no attribute 'stream'` crash when no API key is configured at TUI launch
+
 ## [0.1.7] - 2026-05-09
 
 ### Fixed

{aipa_cli-0.1.7 → aipa_cli-0.1.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aipa-cli
-Version: 0.1.7
+Version: 0.1.8
 Summary: Terminal TUI for AI-powered ticker analysis
 Project-URL: Homepage, https://github.com/quanhua92/aipriceaction
 Project-URL: Repository, https://github.com/quanhua92/aipriceaction

{aipa_cli-0.1.7 → aipa_cli-0.1.8}/src/aipriceaction_terminal/__init__.py

@@ -1,4 +1,4 @@
 """AIPriceAction Terminal - TUI chat interface for ticker analysis."""
 
-__version__ = "0.1.7"
+__version__ = "0.1.8"
 

{aipa_cli-0.1.7 → aipa_cli-0.1.8}/src/aipriceaction_terminal/settings_tab.py

@@ -22,15 +22,22 @@ def _value_from_env_or_dotenv(sdk_attr: str, settings_json_key: str) -> bool:
     sdk_val = getattr(settings, sdk_attr, "")
     if not sdk_val:
         return False
-    # If settings.json has a different (non-empty) value, the user explicitly
-    # configured it there — treat settings.json as the source.
     saved_val = load_settings().get(settings_json_key, "")
-    if saved_val and saved_val != sdk_val:
-        return False
-    # If settings.json is empty (or matches SDK), the value originates from
-    # .env / env / SDK default.
+    # No value in settings.json → effective value is from env/.env/SDK default.
     if not saved_val:
         return True
+    # settings.json has a different value → env/.env overrode it.
+    if saved_val != sdk_val:
+        return True
+    # Both match — check if .env also provides this value (it has higher
+    # priority than settings.json, so .env is the real source).
+    from .user_settings import _load_dotenv_values, _find_dotenv
+    env_var = next((ev for _, jk, ev, _ in _API_FIELDS if jk == settings_json_key), None)
+    if env_var:
+        dotenv_val = _load_dotenv_values(_find_dotenv()).get(env_var, "")
+        if dotenv_val == sdk_val:
+            return True
+    # Value only exists in settings.json.
     return False
 
 

aipa_cli-0.1.8/src/aipriceaction_terminal/user_settings.py

@@ -0,0 +1,86 @@
+"""Persistent user settings stored in ~/.aipriceaction/settings.json."""
+
+import json
+import os
+from pathlib import Path
+
+_CONFIG_DIR = Path.home() / ".aipriceaction"
+_SETTINGS_FILE = _CONFIG_DIR / "settings.json"
+
+_DEFAULTS = {
+    "ticker": "VNINDEX",
+    "interval": "1D",
+    "language": "en",
+    "api_key": "",
+    "openai_base_url": "",
+    "openai_model": "",
+    "setup_done": False,
+}
+
+
+def load_settings() -> dict:
+    """Load settings from disk, falling back to defaults for missing keys."""
+    if _SETTINGS_FILE.exists():
+        data = json.loads(_SETTINGS_FILE.read_text())
+        return {**_DEFAULTS, **data}
+    return dict(_DEFAULTS)
+
+
+def save_settings(data: dict) -> None:
+    """Persist settings to disk, creating the config directory if needed."""
+    _CONFIG_DIR.mkdir(parents=True, exist_ok=True)
+    _SETTINGS_FILE.write_text(json.dumps(data, indent=2))
+
+
+def _load_dotenv_values(path: Path) -> dict[str, str]:
+    """Parse a .env file into a dict (key=value per line, ignores blanks/comments)."""
+    values: dict[str, str] = {}
+    if not path.exists():
+        return values
+    for line in path.read_text().splitlines():
+        line = line.strip()
+        if not line or line.startswith("#"):
+            continue
+        if "=" not in line:
+            continue
+        key, _, value = line.partition("=")
+        values[key.strip()] = value.strip().strip("\"'")
+    return values
+
+
+def _find_dotenv() -> Path:
+    """Walk up from CWD to find .env, falling back to home directory."""
+    current = Path.cwd()
+    for _ in range(5):
+        candidate = current / ".env"
+        if candidate.exists():
+            return candidate
+        current = current.parent
+    return Path.home() / ".env"
+
+
+def apply_settings_to_env() -> None:
+    """Seed environment variables so CLI commands pick up config from .env and settings.json.
+
+    Priority (highest wins): real env vars > .env file > settings.json.
+    All seeding uses ``os.environ.setdefault`` so real env vars are never overwritten.
+    Must be called before any SDK import that reads env vars.
+    """
+    _env_keys = {"OPENAI_API_KEY", "OPENAI_BASE_URL", "OPENAI_MODEL"}
+
+    # 1. Seed from .env file (middle priority)
+    for key, value in _load_dotenv_values(_find_dotenv()).items():
+        if key in _env_keys and value:
+            os.environ.setdefault(key, value)
+
+    # 2. Seed from settings.json (lowest priority)
+    settings = load_settings()
+    _mapping = {
+        "OPENAI_API_KEY": "api_key",
+        "OPENAI_BASE_URL": "openai_base_url",
+        "OPENAI_MODEL": "openai_model",
+    }
+    for env_key, settings_key in _mapping.items():
+        value = settings.get(settings_key, "")
+        if value:
+            os.environ.setdefault(env_key, value)

{aipa_cli-0.1.7 → aipa_cli-0.1.8}/src/aipriceaction_terminal/workflows.py

@@ -125,6 +125,9 @@ class AnalyzePane(Vertical):
         """Build context and stream AI analysis for a ticker."""
         log = self.query_one("#wf-output", RichLog)
         try:
+            if not self.app._ensure_agent():
+                log.write("[red]Error: No API key configured. Run 'aipa setup' or set OPENAI_API_KEY.[/red]")
+                return
             builder = self.app.builder
 
             # Build context without system prompt (agent has it already)

aipa_cli-0.1.7/src/aipriceaction_terminal/user_settings.py

@@ -1,50 +0,0 @@
-"""Persistent user settings stored in ~/.aipriceaction/settings.json."""
-
-import json
-import os
-from pathlib import Path
-
-_CONFIG_DIR = Path.home() / ".aipriceaction"
-_SETTINGS_FILE = _CONFIG_DIR / "settings.json"
-
-_DEFAULTS = {
-    "ticker": "VNINDEX",
-    "interval": "1D",
-    "language": "en",
-    "api_key": "",
-    "openai_base_url": "",
-    "openai_model": "",
-    "setup_done": False,
-}
-
-
-def load_settings() -> dict:
-    """Load settings from disk, falling back to defaults for missing keys."""
-    if _SETTINGS_FILE.exists():
-        data = json.loads(_SETTINGS_FILE.read_text())
-        return {**_DEFAULTS, **data}
-    return dict(_DEFAULTS)
-
-
-def save_settings(data: dict) -> None:
-    """Persist settings to disk, creating the config directory if needed."""
-    _CONFIG_DIR.mkdir(parents=True, exist_ok=True)
-    _SETTINGS_FILE.write_text(json.dumps(data, indent=2))
-
-
-def apply_settings_to_env() -> None:
-    """Seed environment variables from settings.json.
-
-    Uses ``os.environ.setdefault`` so that existing env vars always win.
-    Must be called before any SDK import that reads env vars.
-    """
-    settings = load_settings()
-    _mapping = {
-        "OPENAI_API_KEY": "api_key",
-        "OPENAI_BASE_URL": "openai_base_url",
-        "OPENAI_MODEL": "openai_model",
-    }
-    for env_key, settings_key in _mapping.items():
-        value = settings.get(settings_key, "")
-        if value:
-            os.environ.setdefault(env_key, value)