mirror of
https://github.com/ParisNeo/ollama_proxy_server.git
synced 2026-01-11 07:28:01 -05:00
5fee479644
- Ajout de la gestion des fichiers .env dans le script d'installation pour garantir une configuration correcte. - Révision de la logique de création de l'environnement virtuel et d'installation des dépendances dans run.sh et run_windows.bat. - Modification de la route API pour la création de clés utilisateur dans admin.py. - Ajout de la gestion des fichiers .setup_state pour suivre l'état de l'installation.
76 lines
3.1 KiB
Python
76 lines
3.1 KiB
Python
import sys
|
|
import secrets
|
|
|
|
def print_info(message):
|
|
print(f"[INFO] {message}")
|
|
|
|
def print_error(message):
|
|
print(f"[ERROR] {message}", file=sys.stderr)
|
|
|
|
def get_user_input(prompt, default=None):
|
|
"""Gets user input with a default value."""
|
|
default_text = f"[{default}]" if default is not None else ""
|
|
prompt_text = f" -> {prompt} {default_text}: "
|
|
user_value = input(prompt_text)
|
|
return user_value.strip() if user_value.strip() else default
|
|
|
|
def create_env_file():
|
|
"""
|
|
Guides the user through creating a .env file and writes it.
|
|
This version omits empty optional fields to prevent parsing errors.
|
|
"""
|
|
print_info("Please provide the following configuration (press Enter for defaults):")
|
|
|
|
config = {
|
|
"PROXY_PORT": get_user_input("Port for the proxy server", "8080"),
|
|
"OLLAMA_SERVERS": get_user_input("Backend Ollama server(s)", "http://127.0.0.1:11434"),
|
|
"REDIS_URL": get_user_input("Redis URL for rate limiting", "redis://localhost:6379/0"),
|
|
"ADMIN_USER": get_user_input("Username for the admin dashboard", "admin"),
|
|
"ALLOWED_IPS": get_user_input("Allowed IPs (comma-separated, leave empty for all)", ""),
|
|
"DENIED_IPS": get_user_input("Denied IPs (comma-separated, leave empty for none)", ""),
|
|
}
|
|
|
|
# --- Password Loop ---
|
|
admin_password = ""
|
|
while not admin_password:
|
|
admin_password = input(" -> Password for the admin user (cannot be empty): ").strip()
|
|
if not admin_password:
|
|
print_error(" Password cannot be empty. Please try again.")
|
|
config["ADMIN_PASSWORD"] = admin_password
|
|
|
|
# --- Generate Secret Key ---
|
|
config["SECRET_KEY"] = secrets.token_hex(32)
|
|
|
|
# --- Write the .env file ---
|
|
print_info("Generating .env configuration file...")
|
|
try:
|
|
with open(".env", "w", encoding="utf-8") as f:
|
|
f.write('APP_NAME="Ollama Proxy Server"\n')
|
|
f.write('APP_VERSION="8.0.0"\n')
|
|
f.write('LOG_LEVEL="info"\n')
|
|
f.write(f'PROXY_PORT="{config["PROXY_PORT"]}"\n')
|
|
f.write(f'OLLAMA_SERVERS="{config["OLLAMA_SERVERS"]}"\n')
|
|
f.write('DATABASE_URL="sqlite+aiosqlite:///./ollama_proxy.db"\n')
|
|
f.write(f'ADMIN_USER="{config["ADMIN_USER"]}"\n')
|
|
f.write(f'ADMIN_PASSWORD="{config["ADMIN_PASSWORD"]}"\n')
|
|
f.write(f'SECRET_KEY="{config["SECRET_KEY"]}"\n')
|
|
f.write(f'REDIS_URL="{config["REDIS_URL"]}"\n')
|
|
f.write('RATE_LIMIT_REQUESTS="100"\n')
|
|
f.write('RATE_LIMIT_WINDOW_MINUTES="1"\n')
|
|
|
|
# --- CRITICAL FIX: Only write these lines if they have a value ---
|
|
if config["ALLOWED_IPS"]:
|
|
f.write(f'ALLOWED_IPS="{config["ALLOWED_IPS"]}"\n')
|
|
if config["DENIED_IPS"]:
|
|
f.write(f'DENIED_IPS="{config["DENIED_IPS"]}"\n')
|
|
|
|
print_info(".env file created successfully.")
|
|
return True
|
|
except IOError as e:
|
|
print_error(f"Failed to write to .env file: {e}")
|
|
return False
|
|
|
|
if __name__ == "__main__":
|
|
if not create_env_file():
|
|
# Exit with a non-zero code to signal failure to the batch script
|
|
sys.exit(1) |