fix(cli): fix bugs about doc2anki list

Author: SOV710

README.md

@@ -113,8 +113,6 @@ default_model = "deepseek-chat"
 
 配置完成后，通过 `doc2anki list` 列出当前配置文件中被 enable 的 api providers, `doc2anki list --all` 列出所有 providers
 
-注：现在的 `doc2anki list` 还无法无法读 dotenv 文件中的 providers, 只能读到 `default_base_url` 和 `default_model`
-
 ## 使用
 
 ### 查看可用的模型提供商
@@ -145,6 +143,12 @@ doc2anki generate docs/ -p provider_name -o output.apkg
 
 ### 命令行选项
 
+**全局选项:**
+
+| 选项 | 说明 |
+|-----|------|
+| `-v, --version` | 显示版本号并退出 |
+
 **基本选项:**
 
 | 选项 | 默认值 | 说明 |

docs/cli-reference.md

@@ -26,6 +26,9 @@ uv run doc2anki --help
 ```
 doc2anki [OPTIONS] COMMAND [ARGS]
 
+Options:
+  -v, --version  显示版本号并退出
+
 Commands:
   list      列出可用的 AI 提供商
   validate  验证配置文件
@@ -34,6 +37,22 @@ Commands:
 
 ---
 
+## 全局选项
+
+| 选项 | 说明 |
+|-----|------|
+| `-v, --version` | 显示版本号并退出 |
+
+### 示例
+
+```sh
+# 显示版本号
+doc2anki --version
+doc2anki -v
+```
+
+---
+
 ## doc2anki list
 
 列出配置文件中的 AI 提供商。

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "doc2anki"
-version = "0.1.1"
+version = "0.1.2"
 description = "Convert knowledge base documents to Anki flashcards"
 readme = "README.md"
 requires-python = ">=3.12"

src/doc2anki/cli.py

@@ -1,6 +1,7 @@
 """CLI interface for doc2anki."""
 
 import os
+from importlib.metadata import version as get_version
 from pathlib import Path
 from typing import Optional
 
@@ -15,13 +16,37 @@
     fatal_exit,
 )
 
+
+def version_callback(value: bool) -> None:
+    """Print version and exit."""
+    if value:
+        pkg_version = get_version("doc2anki")
+        print(f"doc2anki {pkg_version}")
+        raise typer.Exit()
+
+
 app = typer.Typer(
     name="doc2anki",
     help="Convert knowledge base documents to Anki flashcards",
     no_args_is_help=True,
 )
 console = Console()
 
+
+@app.callback()
+def main(
+    version: bool = typer.Option(
+        False,
+        "-v",
+        "--version",
+        help="Show version and exit",
+        callback=version_callback,
+        is_eager=True,
+    ),
+) -> None:
+    """doc2anki - Convert knowledge base documents to Anki flashcards."""
+    pass
+
 # Config file name
 CONFIG_FILENAME = "ai_providers.toml"
 

src/doc2anki/config/loader.py

@@ -90,9 +90,10 @@ def _resolve_env_auth(provider_name: str, config: dict[str, Any]) -> ProviderCon
             f"'{config['api_key']}' not set or empty"
         )
 
+    # base_url field contains the env var name to look up
     base_url = None
-    if "base_url_env" in config:
-        base_url = os.getenv(config["base_url_env"])
+    if "base_url" in config:
+        base_url = os.getenv(config["base_url"])
     if not base_url:
         base_url = config.get("default_base_url")
     if not base_url:
@@ -101,9 +102,10 @@ def _resolve_env_auth(provider_name: str, config: dict[str, Any]) -> ProviderCon
             f"(env var not set and no default)"
         )
 
+    # model field contains the env var name to look up
     model = None
-    if "model_env" in config:
-        model = os.getenv(config["model_env"])
+    if "model" in config:
+        model = os.getenv(config["model"])
     if not model:
         model = config.get("default_model")
     if not model:
@@ -142,9 +144,10 @@ def _resolve_dotenv_auth(provider_name: str, config: dict[str, Any]) -> Provider
             f"not found in {dotenv_path}"
         )
 
+    # base_url field contains the key name to look up in dotenv
     base_url = None
-    if "base_url_key" in config:
-        base_url = os.getenv(config["base_url_key"])
+    if "base_url" in config:
+        base_url = os.getenv(config["base_url"])
     if not base_url:
         base_url = config.get("default_base_url")
     if not base_url:
@@ -153,9 +156,10 @@ def _resolve_dotenv_auth(provider_name: str, config: dict[str, Any]) -> Provider
             f"(not in dotenv and no default)"
         )
 
+    # model field contains the key name to look up in dotenv
     model = None
-    if "model_key" in config:
-        model = os.getenv(config["model_key"])
+    if "model" in config:
+        model = os.getenv(config["model"])
     if not model:
         model = config.get("default_model")
     if not model:
@@ -201,6 +205,53 @@ def get_provider_config(config_path: Path, provider_name: str) -> ProviderConfig
     return resolve_provider_config(provider_name, provider_config)
 
 
+def _resolve_display_values_env(config: dict[str, Any]) -> tuple[str | None, str | None]:
+    """Resolve base_url and model for env auth type for display purposes."""
+    base_url = None
+    model = None
+
+    # base_url/model fields contain env var names
+    if "base_url" in config:
+        base_url = os.getenv(config["base_url"])
+    if not base_url:
+        base_url = config.get("default_base_url")
+
+    if "model" in config:
+        model = os.getenv(config["model"])
+    if not model:
+        model = config.get("default_model")
+
+    return base_url, model
+
+
+def _resolve_display_values_dotenv(
+    config: dict[str, Any],
+) -> tuple[str | None, str | None]:
+    """Resolve base_url and model for dotenv auth type for display purposes."""
+    base_url = None
+    model = None
+
+    # Try to load dotenv file if it exists
+    if "dotenv_path" in config:
+        dotenv_path = Path(config["dotenv_path"])
+        if dotenv_path.exists():
+            load_dotenv(dotenv_path, override=True)
+
+            # base_url/model fields contain key names in dotenv
+            if "base_url" in config:
+                base_url = os.getenv(config["base_url"])
+            if "model" in config:
+                model = os.getenv(config["model"])
+
+    # Fallback to defaults
+    if not base_url:
+        base_url = config.get("default_base_url")
+    if not model:
+        model = config.get("default_model")
+
+    return base_url, model
+
+
 def list_providers(config_path: Path, show_all: bool = False) -> list[ProviderInfo]:
     """
     List all providers from configuration.
@@ -225,16 +276,17 @@ def list_providers(config_path: Path, show_all: bool = False) -> list[ProviderIn
 
         auth_type = config.get("auth_type", "unknown")
 
-        # Try to get model info without resolving full config
+        # Resolve actual model and base_url values
         model = None
         base_url = None
 
         if auth_type == "direct":
             model = config.get("model")
             base_url = config.get("base_url")
-        elif auth_type in ("env", "dotenv"):
-            model = config.get("default_model")
-            base_url = config.get("default_base_url")
+        elif auth_type == "env":
+            base_url, model = _resolve_display_values_env(config)
+        elif auth_type == "dotenv":
+            base_url, model = _resolve_display_values_dotenv(config)
 
         providers.append(
             ProviderInfo(

src/doc2anki/config/models.py

@@ -27,24 +27,24 @@ class EnvAuthConfig(BaseModel):
 
     enable: bool = False
     auth_type: Literal["env"]
-    base_url_env: Optional[str] = None
-    model_env: Optional[str] = None
-    api_key: str  # Environment variable name containing the API key
-    default_base_url: Optional[str] = None
-    default_model: Optional[str] = None
+    base_url: str  # Environment variable name for base URL
+    model: str  # Environment variable name for model
+    api_key: str  # Environment variable name for API key
+    default_base_url: Optional[str] = None  # Fallback if env var not set
+    default_model: Optional[str] = None  # Fallback if env var not set
 
 
 class DotenvAuthConfig(BaseModel):
     """Dotenv file authentication."""
 
     enable: bool = False
     auth_type: Literal["dotenv"]
-    dotenv_path: str
-    base_url_key: Optional[str] = None
-    model_key: Optional[str] = None
-    api_key: str  # Key name in the dotenv file containing the API key
-    default_base_url: Optional[str] = None
-    default_model: Optional[str] = None
+    dotenv_path: str  # Path to .env file
+    base_url: str  # Key name in .env file for base URL
+    model: str  # Key name in .env file for model
+    api_key: str  # Key name in .env file for API key
+    default_base_url: Optional[str] = None  # Fallback if key not in .env
+    default_model: Optional[str] = None  # Fallback if key not in .env
 
 
 class ProviderInfo(BaseModel):