refactor: Simplify Dockerfile requirements and enhance health check script with API key validation and connectivity checks
This commit is contained in:
@@ -7,15 +7,16 @@ import os
|
||||
import subprocess
|
||||
import sys
|
||||
|
||||
import openai
|
||||
|
||||
|
||||
def check_process():
|
||||
"""Check if the main server process is running"""
|
||||
try:
|
||||
result = subprocess.run(["pgrep", "-f", "server.py"], capture_output=True, text=True)
|
||||
return result.returncode == 0
|
||||
except Exception as e:
|
||||
print(f"Process check failed: {e}", file=sys.stderr)
|
||||
return False
|
||||
result = subprocess.run(["pgrep", "-f", "server.py"], capture_output=True, text=True, timeout=10)
|
||||
if result.returncode == 0:
|
||||
return True
|
||||
print(f"Process check failed: {result.stderr}", file=sys.stderr)
|
||||
return False
|
||||
|
||||
|
||||
def check_python_imports():
|
||||
@@ -69,6 +70,41 @@ def check_environment():
|
||||
print("No API keys found in environment", file=sys.stderr)
|
||||
return False
|
||||
|
||||
# Validate API key formats (basic checks)
|
||||
for key in api_keys:
|
||||
value = os.getenv(key)
|
||||
if value:
|
||||
if len(value.strip()) < 10:
|
||||
print(f"API key {key} appears too short or invalid", file=sys.stderr)
|
||||
return False
|
||||
|
||||
# Optionally, try a minimal connectivity check for OpenAI and Google Gemini
|
||||
# (only if their API keys are present)
|
||||
try:
|
||||
if os.getenv("OPENAI_API_KEY"):
|
||||
openai.api_key = os.getenv("OPENAI_API_KEY")
|
||||
try:
|
||||
openai.Model.list()
|
||||
except Exception as e:
|
||||
print(f"OpenAI connectivity check failed: {e}", file=sys.stderr)
|
||||
return False
|
||||
except ImportError:
|
||||
pass # Already checked in check_python_imports
|
||||
|
||||
try:
|
||||
if os.getenv("GEMINI_API_KEY") or os.getenv("GOOGLE_API_KEY"):
|
||||
import google.genai as genai
|
||||
|
||||
key = os.getenv("GEMINI_API_KEY") or os.getenv("GOOGLE_API_KEY")
|
||||
genai.configure(api_key=key)
|
||||
try:
|
||||
genai.list_models()
|
||||
except Exception as e:
|
||||
print(f"Google Gemini connectivity check failed: {e}", file=sys.stderr)
|
||||
return False
|
||||
except ImportError:
|
||||
pass # Already checked in check_python_imports
|
||||
|
||||
return True
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user