local-openai2anthropic 0.3.5__tar.gz → 0.3.7__tar.gz

local_openai2anthropic-0.3.7/.claude/CLAUDE.md

@@ -0,0 +1,163 @@
+# Claude 开发指南
+
+## Configuration File
+
+### Config File Location
+
+- **Linux/macOS**: `~/.oa2a/config.toml`
+- **Windows**: `%USERPROFILE%\.oa2a\config.toml`
+
+### First Run
+
+A default config file will be created automatically on first startup. Edit this file to add your API keys.
+
+### Configuration Example
+
+```toml
+# OA2A Configuration File
+# Place this file at ~/.oa2a/config.toml
+
+# OpenAI API Configuration
+openai_api_key = "your-openai-api-key"
+openai_base_url = "https://api.openai.com/v1"
+openai_org_id = ""
+openai_project_id = ""
+
+# Server Configuration
+host = "0.0.0.0"
+port = 8080
+request_timeout = 300.0
+
+# API Key for authenticating requests to this server (optional)
+api_key = ""
+
+# CORS settings
+cors_origins = ["*"]
+cors_credentials = true
+cors_methods = ["*"]
+cors_headers = ["*"]
+
+# Logging
+log_level = "DEBUG"
+log_dir = ""  # Empty uses platform-specific default
+
+# Tavily Web Search Configuration
+tavily_api_key = ""
+tavily_timeout = 30.0
+tavily_max_results = 5
+websearch_max_uses = 5
+```
+
+## 版本号更新清单
+
+当修改项目版本号时，需要同步更新以下所有位置：
+
+### 1. pyproject.toml
+- **位置**: 第3行
+- **格式**: `version = "x.y.z"`
+- **示例**: `version = "0.3.5"`
+
+### 2. src/local_openai2anthropic/__init__.py
+- **位置**: 第6行
+- **格式**: `__version__ = "x.y.z"`
+- **示例**: `__version__ = "0.3.5"`
+
+### 3. src/local_openai2anthropic/main.py (FastAPI 应用版本)
+- **位置**: 第104行
+- **格式**: `version="x.y.z"`
+- **示例**: `version="0.3.5"`
+
+### 4. src/local_openai2anthropic/main.py (命令行 --version)
+- **位置**: 第254行
+- **格式**: `version="%(prog)s x.y.z"`
+- **示例**: `version="%(prog)s 0.3.5"`
+
+### 5. tests/test_main.py (测试断言)
+- **位置**: 第26行
+- **格式**: `assert app.version == "x.y.z"`
+- **示例**: `assert app.version == "0.3.5"`
+
+### 6. Git Tag
+- **格式**: `vx.y.z`
+- **示例**: `v0.3.5`
+- **命令**:
+  ```bash
+  git tag v0.3.5
+  git push origin v0.3.5
+  ```
+
+## 版本号格式
+
+使用语义化版本控制 (Semantic Versioning)：
+- **MAJOR**: 不兼容的 API 修改
+- **MINOR**: 向下兼容的功能新增
+- **PATCH**: 向下兼容的问题修复
+
+## 发布流程
+
+1. 更新上述所有文件中的版本号
+2. 运行测试确保通过: `pytest`
+3. 提交更改: `git commit -m "chore(release): bump version to x.y.z"`
+4. 创建标签: `git tag vx.y.z`
+5. 推送代码和标签: `git push && git push origin vx.y.z`
+6. GitHub Actions 将自动发布到 PyPI
+
+## 代码提交规范
+
+### 测试覆盖率要求
+
+在提交任何新代码之前，必须满足以下测试要求：
+
+#### 1. 新代码单元测试
+- **必须**为所有未提交的新代码编写单元测试
+- 新代码的测试覆盖率**必须 > 90%**
+- 测试文件命名规范: `test_<module_name>.py`
+- 测试函数命名规范: `test_<function_name>_<scenario>`
+
+#### 2. 总体覆盖率检查
+- 运行 `/everything-claude-code:test-coverage` 检查总体覆盖率
+- **总体覆盖率必须 ≥ 80%**
+- 如果总体覆盖率低于 80%，需要补充测试或优化现有代码
+
+#### 3. 代码审查
+
+在提交代码前，必须进行代码审查：
+
+```bash
+# 运行代码审查（检查安全漏洞、代码质量、最佳实践）
+/code-review:code-review
+
+# 根据审查结果修复问题
+# - CRITICAL/HIGH 级别问题必须修复
+# - MEDIUM/LOW 级别问题根据情况处理
+```
+
+代码审查将检查：
+- **安全问题**: 硬编码凭证、SQL注入、XSS、路径遍历等
+- **代码质量**: 函数长度、嵌套深度、错误处理、console.log等
+- **最佳实践**: 不可变模式、emoji使用、测试覆盖、可访问性等
+
+#### 4. 提交流程
+```bash
+# 1. 编写新代码
+# 2. 编写对应的单元测试
+# 3. 运行测试并检查覆盖率
+pytest --cov=src/local_openai2anthropic --cov-report=term-missing
+
+# 4. 运行 Claude Code 覆盖率检查
+/everything-claude-code:test-coverage
+
+# 5. 运行代码审查
+/code-review:code-review
+
+# 6. 确认新代码覆盖率 > 90% 且总体覆盖率 ≥ 80%，且无 CRITICAL/HIGH 问题
+# 7. 提交代码
+git add .
+git commit -m "feat: your commit message"
+```
+
+#### 4. 测试质量标准
+- 测试用例应覆盖正常路径、边界条件和异常情况
+- 使用 `pytest` 作为测试框架
+- 异步代码使用 `pytest-asyncio`
+- 适当的测试夹具 (fixtures) 和参数化测试

{local_openai2anthropic-0.3.5 → local_openai2anthropic-0.3.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: local-openai2anthropic
-Version: 0.3.5
+Version: 0.3.7
 Summary: A lightweight proxy server that converts Anthropic Messages API to OpenAI API
 Project-URL: Homepage, https://github.com/dongfangzan/local-openai2anthropic
 Project-URL: Repository, https://github.com/dongfangzan/local-openai2anthropic
@@ -24,6 +24,7 @@ Requires-Dist: httpx>=0.25.0
 Requires-Dist: openai>=1.30.0
 Requires-Dist: pydantic-settings>=2.0.0
 Requires-Dist: pydantic>=2.0.0
+Requires-Dist: tomli-w>=1.0.0
 Requires-Dist: uvicorn[standard]>=0.23.0
 Provides-Extra: dev
 Requires-Dist: black>=23.0.0; extra == 'dev'

{local_openai2anthropic-0.3.5 → local_openai2anthropic-0.3.7}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "local-openai2anthropic"
-version = "0.3.5"
+version = "0.3.7"
 description = "A lightweight proxy server that converts Anthropic Messages API to OpenAI API"
 readme = "README.md"
 license = { text = "Apache-2.0" }
@@ -29,6 +29,7 @@ dependencies = [
     "pydantic-settings>=2.0.0",
     "anthropic>=0.30.0",
     "openai>=1.30.0",
+    "tomli-w>=1.0.0",
 ]
 
 [project.optional-dependencies]

{local_openai2anthropic-0.3.5 → local_openai2anthropic-0.3.7}/src/local_openai2anthropic/__init__.py

@@ -3,7 +3,7 @@
 local-openai2anthropic: A proxy server that converts Anthropic Messages API to OpenAI API.
 """
 
-__version__ = "0.3.5"
+__version__ = "0.3.7"
 
 from local_openai2anthropic.protocol import (
     AnthropicError,

local_openai2anthropic-0.3.7/src/local_openai2anthropic/config.py

@@ -0,0 +1,328 @@
+# SPDX-License-Identifier: Apache-2.0
+"""
+Configuration settings for the proxy server.
+"""
+
+import sys
+from functools import lru_cache
+from pathlib import Path
+from typing import Optional
+
+from pydantic import BaseModel, ConfigDict
+
+
+def get_config_dir() -> Path:
+    """Get platform-specific config directory.
+
+    Returns:
+        Path to the config directory (~/.oa2a)
+    """
+    return Path.home() / ".oa2a"
+
+
+def get_config_file() -> Path:
+    """Get config file path.
+
+    Returns:
+        Path to the config file (~/.oa2a/config.toml)
+    """
+    return get_config_dir() / "config.toml"
+
+
+def create_default_config() -> bool:
+    """Create default config file if not exists.
+
+    Returns:
+        True if a new config file was created, False if it already exists
+    """
+    config_file = get_config_file()
+    if config_file.exists():
+        return False
+
+    config_dir = get_config_dir()
+    config_dir.mkdir(parents=True, exist_ok=True)
+
+    # Set restrictive permissions (0o600) for the config directory on Unix-like systems
+    if sys.platform != "win32":
+        config_dir.chmod(0o700)
+
+    default_config = """# OA2A Configuration File
+# Place this file at ~/.oa2a/config.toml
+
+# OpenAI API Configuration
+openai_api_key = ""
+openai_base_url = "https://api.openai.com/v1"
+openai_org_id = ""
+openai_project_id = ""
+
+# Server Configuration
+host = "0.0.0.0"
+port = 8080
+request_timeout = 300.0
+
+# API Key for authenticating requests to this server (optional)
+api_key = ""
+
+# CORS settings
+cors_origins = ["*"]
+cors_credentials = true
+cors_methods = ["*"]
+cors_headers = ["*"]
+
+# Logging
+log_level = "INFO"
+log_dir = ""  # Empty uses platform-specific default
+
+# Tavily Web Search Configuration
+tavily_api_key = ""
+tavily_timeout = 30.0
+tavily_max_results = 5
+websearch_max_uses = 5
+"""
+    config_file.write_text(default_config, encoding="utf-8")
+
+    # Set restrictive permissions (0o600) for the config file on Unix-like systems
+    if sys.platform != "win32":
+        config_file.chmod(0o600)
+
+    return True
+
+
+def interactive_setup() -> dict:
+    """Interactive configuration setup wizard.
+
+    Guides user through setting up essential configuration values.
+
+    Returns:
+        Dictionary containing user-provided configuration
+    """
+    print("=" * 60)
+    print("  Welcome to local-openai2anthropic Setup Wizard")
+    print("=" * 60)
+    print()
+    print("This wizard will help you create the initial configuration.")
+    print(f"Config file will be saved to: {get_config_file()}")
+    print()
+
+    config = {}
+
+    # OpenAI API Key (required)
+    print("[1/3] OpenAI API Configuration")
+    print("-" * 40)
+    while True:
+        api_key = input("Enter your OpenAI API Key (required): ").strip()
+        if api_key:
+            config["openai_api_key"] = api_key
+            break
+        print("API Key is required. Please enter a valid key.")
+
+    # Base URL (optional, with default)
+    default_url = "https://api.openai.com/v1"
+    base_url = input(f"Enter OpenAI Base URL [{default_url}]: ").strip()
+    config["openai_base_url"] = base_url if base_url else default_url
+
+    print()
+    print("[2/3] Server Configuration")
+    print("-" * 40)
+
+    # Host (with default)
+    default_host = "0.0.0.0"
+    host = input(f"Enter server host [{default_host}]: ").strip()
+    config["host"] = host if host else default_host
+
+    # Port (with default)
+    default_port = "8080"
+    port_input = input(f"Enter server port [{default_port}]: ").strip()
+    try:
+        config["port"] = int(port_input) if port_input else int(default_port)
+    except ValueError:
+        print(f"Invalid port number, using default: {default_port}")
+        config["port"] = int(default_port)
+
+    # API Key for server authentication (optional)
+    print()
+    print("[3/3] Server API Authentication (Optional)")
+    print("-" * 40)
+    print("Set an API key to authenticate requests to this server.")
+    print(
+        "Leave empty to allow unauthenticated access (not recommended for production)."
+    )
+    server_api_key = input("Enter server API key (optional): ").strip()
+    if server_api_key:
+        config["api_key"] = server_api_key
+
+    print()
+    print("=" * 60)
+    print("  Configuration Summary")
+    print("=" * 60)
+    print(f"OpenAI Base URL: {config.get('openai_base_url', default_url)}")
+    print(
+        f"Server: {config.get('host', default_host)}:{config.get('port', default_port)}"
+    )
+    print(f"OpenAI API Key: {config.get('openai_api_key', '')[:8]}... (configured)")
+    if config.get("api_key"):
+        print(f"Server Auth: {config['api_key'][:8]}... (configured)")
+    print()
+
+    return config
+
+
+def create_config_from_dict(config: dict) -> None:
+    """Create config file from dictionary.
+
+    Args:
+        config: Dictionary containing configuration values
+    """
+    import tomli_w
+
+    config_file = get_config_file()
+    config_dir = get_config_dir()
+    config_dir.mkdir(parents=True, exist_ok=True)
+
+    # Set restrictive permissions for the config directory on Unix-like systems
+    if sys.platform != "win32":
+        config_dir.chmod(0o700)
+
+    # Build config dict with proper structure
+    toml_config: dict = {
+        "openai_api_key": config.get("openai_api_key", ""),
+        "openai_base_url": config.get("openai_base_url", "https://api.openai.com/v1"),
+        "host": config.get("host", "0.0.0.0"),
+        "port": config.get("port", 8080),
+        "request_timeout": config.get("request_timeout", 300.0),
+        "cors_origins": ["*"],
+        "cors_credentials": True,
+        "cors_methods": ["*"],
+        "cors_headers": ["*"],
+        "log_level": "INFO",
+        "log_dir": "",
+        "tavily_timeout": 30.0,
+        "tavily_max_results": 5,
+        "websearch_max_uses": 5,
+    }
+
+    # Add optional values only if present
+    if config.get("api_key"):
+        toml_config["api_key"] = config["api_key"]
+
+    if config.get("tavily_api_key"):
+        toml_config["tavily_api_key"] = config["tavily_api_key"]
+
+    # Write using proper TOML serialization (prevents injection attacks)
+    with open(config_file, "wb") as f:
+        tomli_w.dump(toml_config, f)
+
+    # Set restrictive permissions for the config file on Unix-like systems
+    if sys.platform != "win32":
+        config_file.chmod(0o600)
+
+
+def load_config_from_file() -> dict:
+    """Load configuration from TOML file.
+
+    Returns:
+        Dictionary containing configuration values, empty dict if file doesn't exist
+    """
+    if sys.version_info >= (3, 11):
+        import tomllib
+    else:
+        import tomli as tomllib
+
+    config_file = get_config_file()
+    if not config_file.exists():
+        return {}
+    with open(config_file, "rb") as f:
+        return tomllib.load(f)
+
+
+class Settings(BaseModel):
+    """Application settings loaded from config file."""
+
+    model_config = ConfigDict(extra="ignore")
+
+    # OpenAI API Configuration
+    openai_api_key: Optional[str] = None
+    openai_base_url: str = "https://api.openai.com/v1"
+    openai_org_id: Optional[str] = None
+    openai_project_id: Optional[str] = None
+
+    # Server Configuration
+    host: str = "0.0.0.0"
+    port: int = 8080
+    request_timeout: float = 300.0  # 5 minutes
+
+    # API Key for authenticating requests to this server (optional)
+    api_key: Optional[str] = None
+
+    # CORS settings
+    cors_origins: list[str] = ["*"]
+    cors_credentials: bool = True
+    cors_methods: list[str] = ["*"]
+    cors_headers: list[str] = ["*"]
+
+    # Logging
+    log_level: str = "INFO"
+    log_dir: str = ""  # Empty means use platform-specific default
+
+    # Tavily Web Search Configuration
+    tavily_api_key: Optional[str] = None
+    tavily_timeout: float = 30.0
+    tavily_max_results: int = 5
+    websearch_max_uses: int = 5  # Default max_uses per request
+
+    @property
+    def openai_auth_headers(self) -> dict[str, str]:
+        """Get OpenAI authentication headers."""
+        headers = {
+            "Authorization": f"Bearer {self.openai_api_key}",
+        }
+        if self.openai_org_id:
+            headers["OpenAI-Organization"] = self.openai_org_id
+        if self.openai_project_id:
+            headers["OpenAI-Project"] = self.openai_project_id
+        return headers
+
+    @classmethod
+    def from_toml(cls) -> "Settings":
+        """Load settings from TOML config file.
+
+        Returns:
+            Settings instance populated from config file
+        """
+        config_data = load_config_from_file()
+        return cls(**config_data)
+
+
+def is_interactive() -> bool:
+    """Check if running in an interactive terminal.
+
+    Returns:
+        True if stdin is a TTY (interactive), False otherwise
+    """
+    return sys.stdin.isatty()
+
+
+@lru_cache
+def get_settings() -> Settings:
+    """Get cached settings instance.
+
+    Creates config file interactively if it doesn't exist and running in a TTY.
+    Falls back to creating a default config file in non-interactive environments.
+
+    Returns:
+        Settings instance loaded from config file
+    """
+    config_file = get_config_file()
+    if not config_file.exists():
+        if is_interactive():
+            # Interactive setup wizard
+            config = interactive_setup()
+            create_config_from_dict(config)
+            print(f"\nConfiguration saved to: {config_file}")
+            print("You can edit this file later to change settings.\n")
+        else:
+            # Non-interactive environment: create default config
+            create_default_config()
+            print(f"Created default config file: {config_file}")
+            print("Please edit it to add your API keys and settings.")
+    return Settings.from_toml()

{local_openai2anthropic-0.3.5 → local_openai2anthropic-0.3.7}/src/local_openai2anthropic/main.py

@@ -15,7 +15,7 @@ from fastapi import FastAPI, HTTPException, Request
 from fastapi.middleware.cors import CORSMiddleware
 from fastapi.responses import JSONResponse
 
-from local_openai2anthropic.config import Settings, get_settings
+from local_openai2anthropic.config import Settings, get_config_file, get_settings
 from local_openai2anthropic.protocol import AnthropicError, AnthropicErrorResponse
 from local_openai2anthropic.router import router
 
@@ -101,7 +101,7 @@ def create_app(settings: Settings | None = None) -> FastAPI:
     app = FastAPI(
         title="local-openai2anthropic",
         description="A proxy server that converts Anthropic Messages API to OpenAI API",
-        version="0.3.5",
+        version="0.3.7",
         docs_url="/docs",
         redoc_url="/redoc",
     )
@@ -203,11 +203,13 @@ def run_foreground(settings: Settings) -> None:
     """Run server in foreground mode (blocking)."""
     # Validate required settings
     if not settings.openai_api_key:
+        config_file = get_config_file()
         print(
-            "Error: OA2A_OPENAI_API_KEY environment variable is required.\n"
-            "Set it via:\n"
-            "  - Environment variable: export OA2A_OPENAI_API_KEY='your-key'\n"
-            "  - Or create a .env file with OA2A_OPENAI_API_KEY=your-key",
+            f"Error: openai_api_key is required.\n"
+            f"Please edit the configuration file:\n"
+            f"  {config_file}\n"
+            f"\nSet your OpenAI API key:\n"
+            f'  openai_api_key = "your-api-key"',
             file=sys.stderr,
         )
         sys.exit(1)
@@ -251,7 +253,7 @@ Examples:
     parser.add_argument(
         "--version",
         action="version",
-        version="%(prog)s 0.2.5",
+        version="%(prog)s 0.3.7",
     )
 
     # Create subparsers for commands