local-openai2anthropic 0.3.5__py3-none-any.whl → 0.3.7__py3-none-any.whl

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/config.py

@@ -3,22 +3,242 @@
 Configuration settings for the proxy server.
 """
 
+import sys
 from functools import lru_cache
+from pathlib import Path
 from typing import Optional
 
-from pydantic_settings import BaseSettings, SettingsConfigDict
+from pydantic import BaseModel, ConfigDict
 
 
-class Settings(BaseSettings):
-    """Application settings loaded from environment variables."""
+def get_config_dir() -> Path:
+    """Get platform-specific config directory.
 
-    model_config = SettingsConfigDict(
-        env_prefix="OA2A_",  # OpenAI-to-Anthropic prefix
-        env_file=".env",
-        env_file_encoding="utf-8",
-        case_sensitive=False,
-        extra="ignore",
+    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
@@ -41,7 +261,7 @@ class Settings(BaseSettings):
     cors_headers: list[str] = ["*"]
 
     # Logging
-    log_level: str = "DEBUG"
+    log_level: str = "INFO"
     log_dir: str = ""  # Empty means use platform-specific default
 
     # Tavily Web Search Configuration
@@ -62,8 +282,47 @@ class Settings(BaseSettings):
             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."""
-    return 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/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

{local_openai2anthropic-0.3.5.dist-info → local_openai2anthropic-0.3.7.dist-info}/METADATA

@@ -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.dist-info → local_openai2anthropic-0.3.7.dist-info}/RECORD

@@ -1,10 +1,10 @@
-local_openai2anthropic/__init__.py,sha256=YHTno5vTDXG-rjXCkH_JxAJZJNIPMDuAcphmJJV_pQA,1059
+local_openai2anthropic/__init__.py,sha256=ykkqdWKgqvSffE2-GmDcZQFHJRAe0y4d4aeD3fUq_Os,1059
 local_openai2anthropic/__main__.py,sha256=K21u5u7FN8-DbO67TT_XDF0neGqJeFrVNkteRauCRQk,179
-local_openai2anthropic/config.py,sha256=ZOZKbyWL4oCYHkEcfl-HgTmDbgJoqHRahdZQbTXqkVg,1985
+local_openai2anthropic/config.py,sha256=Cjg6J7H7ydKtVSd5m0RlTj-YF6yht3TpF4LcyodqQP4,9621
 local_openai2anthropic/converter.py,sha256=og94I514M9km_Wbk9c1ddU6fyaQNEbpd2zfpfnBQaTQ,16029
 local_openai2anthropic/daemon.py,sha256=pZnRojGFcuIpR8yLDNjV-b0LJRBVhgRAa-dKeRRse44,10017
 local_openai2anthropic/daemon_runner.py,sha256=rguOH0PgpbjqNsKYei0uCQX8JQOQ1wmtQH1CtW95Dbw,3274
-local_openai2anthropic/main.py,sha256=oImU_AhD6mNGf7qUiA7u8R5QddlZDBUpDHADa0EIvpA,12145
+local_openai2anthropic/main.py,sha256=FPCEATNPXvGpkszftdXJh0o0F5sUAOXo2zDagmsWGKI,12174
 local_openai2anthropic/openai_types.py,sha256=jFdCvLwtXYoo5gGRqOhbHQcVaxcsxNnCP_yFPIv7rG4,3823
 local_openai2anthropic/protocol.py,sha256=VW3B1YrbYg5UAo7PveQv0Ny5vfuNa6yG6IlHtkuyXiI,5178
 local_openai2anthropic/router.py,sha256=gwSGCYQGd0tAj4B4cl30UDkIJDIfBP4D8T9KEMKnxyk,16196
@@ -18,8 +18,8 @@ local_openai2anthropic/tools/__init__.py,sha256=OM_6YAwy3G1kbrF7n5NvmBwWPGO0hwq4
 local_openai2anthropic/tools/handler.py,sha256=SO8AmEUfNIg16s6jOKBaYdajYc0fiI8ciOoiKXIJe_c,14106
 local_openai2anthropic/utils/__init__.py,sha256=0Apd3lQCmWpQHol4AfjtQe6A3Cpex9Zn-8dyK_FU8Z0,372
 local_openai2anthropic/utils/tokens.py,sha256=TV3vGAjoGZeyo1xPvwb5jto43p1U1f4HteCApB86X0g,3187
-local_openai2anthropic-0.3.5.dist-info/METADATA,sha256=Z26zrkTqEmfovoEt091Bj702JRNlY-JT3poLb--AEKs,11240
-local_openai2anthropic-0.3.5.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-local_openai2anthropic-0.3.5.dist-info/entry_points.txt,sha256=hdc9tSJUNxyNLXcTYye5SuD2K0bEQhxBhGnWTFup6ZM,116
-local_openai2anthropic-0.3.5.dist-info/licenses/LICENSE,sha256=X3_kZy3lJvd_xp8IeyUcIAO2Y367MXZc6aaRx8BYR_s,11369
-local_openai2anthropic-0.3.5.dist-info/RECORD,,
+local_openai2anthropic-0.3.7.dist-info/METADATA,sha256=ZqgaeWvxJAKD1fDKC0XWiSwf3BI1DbH5UQpjvOzFewo,11270
+local_openai2anthropic-0.3.7.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+local_openai2anthropic-0.3.7.dist-info/entry_points.txt,sha256=hdc9tSJUNxyNLXcTYye5SuD2K0bEQhxBhGnWTFup6ZM,116
+local_openai2anthropic-0.3.7.dist-info/licenses/LICENSE,sha256=X3_kZy3lJvd_xp8IeyUcIAO2Y367MXZc6aaRx8BYR_s,11369
+local_openai2anthropic-0.3.7.dist-info/RECORD,,