Refactor code for improved readability and consistency
- Cleaned up whitespace and formatting in various files including http.py, language.py, logger.py, safe_exec.py, and SQL migration scripts. - Consolidated import statements and removed unnecessary blank lines. - Updated logging configuration for better clarity. - Enhanced the safe execution code with improved error handling and logging. - Removed commented-out code and unnecessary variables in backfill_zero_trades.py and other scripts. - Added a pyproject.toml for Ruff and Vulture configuration. - Introduced requirements-dev.txt for development dependencies. - Removed commented-out stock entries in init.sql for cleaner migration scripts.
This commit is contained in:
@@ -2,103 +2,106 @@
|
||||
API key configuration.
|
||||
All third-party keys should be provided via environment variables (recommended: backend_api_python/.env).
|
||||
"""
|
||||
|
||||
import os
|
||||
|
||||
|
||||
class MetaAPIKeys(type):
|
||||
"""API Keys metaclass, used to support dynamic acquisition of class attributes"""
|
||||
|
||||
@property
|
||||
def FINNHUB_API_KEY(cls):
|
||||
from app.utils.config_loader import load_addon_config
|
||||
val = load_addon_config().get('finnhub', {}).get('api_key')
|
||||
return val if val else os.getenv('FINNHUB_API_KEY', '')
|
||||
|
||||
|
||||
val = load_addon_config().get("finnhub", {}).get("api_key")
|
||||
return val if val else os.getenv("FINNHUB_API_KEY", "")
|
||||
|
||||
@property
|
||||
def TIINGO_API_KEY(cls):
|
||||
from app.utils.config_loader import load_addon_config
|
||||
val = load_addon_config().get('tiingo', {}).get('api_key')
|
||||
return val if val else os.getenv('TIINGO_API_KEY', '')
|
||||
|
||||
@property
|
||||
def TWELVE_DATA_API_KEY(cls):
|
||||
env_val = os.getenv('TWELVE_DATA_API_KEY', '').strip()
|
||||
if env_val:
|
||||
return env_val
|
||||
from app.utils.config_loader import load_addon_config
|
||||
val = load_addon_config().get('twelve_data', {}).get('api_key')
|
||||
return val if val else ''
|
||||
|
||||
val = load_addon_config().get("tiingo", {}).get("api_key")
|
||||
return val if val else os.getenv("TIINGO_API_KEY", "")
|
||||
|
||||
@property
|
||||
def OPENROUTER_API_KEY(cls):
|
||||
# Always check env var first to avoid stale cache issues
|
||||
env_val = os.getenv('OPENROUTER_API_KEY', '').strip()
|
||||
env_val = os.getenv("OPENROUTER_API_KEY", "").strip()
|
||||
if env_val:
|
||||
return env_val
|
||||
from app.utils.config_loader import load_addon_config
|
||||
val = load_addon_config().get('openrouter', {}).get('api_key')
|
||||
return val if val else ''
|
||||
|
||||
|
||||
val = load_addon_config().get("openrouter", {}).get("api_key")
|
||||
return val if val else ""
|
||||
|
||||
@property
|
||||
def OPENAI_API_KEY(cls):
|
||||
"""OpenAI direct API key"""
|
||||
env_val = os.getenv('OPENAI_API_KEY', '').strip()
|
||||
env_val = os.getenv("OPENAI_API_KEY", "").strip()
|
||||
if env_val:
|
||||
return env_val
|
||||
from app.utils.config_loader import load_addon_config
|
||||
val = load_addon_config().get('openai', {}).get('api_key')
|
||||
return val if val else ''
|
||||
|
||||
|
||||
val = load_addon_config().get("openai", {}).get("api_key")
|
||||
return val if val else ""
|
||||
|
||||
@property
|
||||
def GOOGLE_API_KEY(cls):
|
||||
"""Google Gemini API key"""
|
||||
env_val = os.getenv('GOOGLE_API_KEY', '').strip()
|
||||
env_val = os.getenv("GOOGLE_API_KEY", "").strip()
|
||||
if env_val:
|
||||
return env_val
|
||||
from app.utils.config_loader import load_addon_config
|
||||
val = load_addon_config().get('google', {}).get('api_key')
|
||||
return val if val else ''
|
||||
|
||||
|
||||
val = load_addon_config().get("google", {}).get("api_key")
|
||||
return val if val else ""
|
||||
|
||||
@property
|
||||
def DEEPSEEK_API_KEY(cls):
|
||||
"""DeepSeek API key"""
|
||||
env_val = os.getenv('DEEPSEEK_API_KEY', '').strip()
|
||||
env_val = os.getenv("DEEPSEEK_API_KEY", "").strip()
|
||||
if env_val:
|
||||
return env_val
|
||||
from app.utils.config_loader import load_addon_config
|
||||
val = load_addon_config().get('deepseek', {}).get('api_key')
|
||||
return val if val else ''
|
||||
|
||||
|
||||
val = load_addon_config().get("deepseek", {}).get("api_key")
|
||||
return val if val else ""
|
||||
|
||||
@property
|
||||
def GROK_API_KEY(cls):
|
||||
"""xAI Grok API key"""
|
||||
env_val = os.getenv('GROK_API_KEY', '').strip()
|
||||
env_val = os.getenv("GROK_API_KEY", "").strip()
|
||||
if env_val:
|
||||
return env_val
|
||||
from app.utils.config_loader import load_addon_config
|
||||
val = load_addon_config().get('grok', {}).get('api_key')
|
||||
return val if val else ''
|
||||
|
||||
|
||||
val = load_addon_config().get("grok", {}).get("api_key")
|
||||
return val if val else ""
|
||||
|
||||
@property
|
||||
def TAVILY_API_KEYS(cls):
|
||||
"""Tavily Search API keys (comma-separated for rotation)"""
|
||||
env_val = os.getenv('TAVILY_API_KEYS', '').strip()
|
||||
env_val = os.getenv("TAVILY_API_KEYS", "").strip()
|
||||
if env_val:
|
||||
return [k.strip() for k in env_val.split(',') if k.strip()]
|
||||
return [k.strip() for k in env_val.split(",") if k.strip()]
|
||||
from app.utils.config_loader import load_addon_config
|
||||
val = load_addon_config().get('tavily', {}).get('api_keys', '')
|
||||
|
||||
val = load_addon_config().get("tavily", {}).get("api_keys", "")
|
||||
if val:
|
||||
return [k.strip() for k in val.split(',') if k.strip()]
|
||||
return [k.strip() for k in val.split(",") if k.strip()]
|
||||
return []
|
||||
|
||||
|
||||
@property
|
||||
def SERPAPI_KEYS(cls):
|
||||
"""SerpAPI keys (comma-separated for rotation)"""
|
||||
env_val = os.getenv('SERPAPI_KEYS', '').strip()
|
||||
env_val = os.getenv("SERPAPI_KEYS", "").strip()
|
||||
if env_val:
|
||||
return [k.strip() for k in env_val.split(',') if k.strip()]
|
||||
return [k.strip() for k in env_val.split(",") if k.strip()]
|
||||
from app.utils.config_loader import load_addon_config
|
||||
val = load_addon_config().get('serpapi', {}).get('api_keys', '')
|
||||
|
||||
val = load_addon_config().get("serpapi", {}).get("api_keys", "")
|
||||
if val:
|
||||
return [k.strip() for k in val.split(',') if k.strip()]
|
||||
return [k.strip() for k in val.split(",") if k.strip()]
|
||||
return []
|
||||
|
||||
|
||||
@@ -106,13 +109,13 @@ class APIKeys(metaclass=MetaAPIKeys):
|
||||
"""API key configuration class"""
|
||||
|
||||
@classmethod
|
||||
def get(cls, key_name: str, default: str = '') -> str:
|
||||
def get(cls, key_name: str, default: str = "") -> str:
|
||||
"""Get API key"""
|
||||
# Try to get from class attribute
|
||||
if hasattr(cls, key_name):
|
||||
return getattr(cls, key_name)
|
||||
return default
|
||||
|
||||
|
||||
@classmethod
|
||||
def is_configured(cls, key_name: str) -> bool:
|
||||
"""Check if the API key is configured"""
|
||||
|
||||
Reference in New Issue
Block a user