Refactor OpenAPI fetcher for improved clarity and robustness

Reorganized and enhanced the OpenAPI fetch logic for better maintainability and error handling. Key updates include improved environment variable validation, more detailed error messages, streamlined configuration loading, and additional safety checks for file paths and directories. Added proper logging and ensured the process flow is easy to trace.
This commit is contained in:
GotthardG
2024-12-18 14:22:37 +01:00
parent ea15dbb555
commit ef981d1e45
4 changed files with 96 additions and 36 deletions

View File

@ -36,6 +36,28 @@ def get_project_metadata():
)
def run_server():
import uvicorn
print(f"[INFO] Starting server in {environment} environment...")
print(f"[INFO] SSL Certificate Path: {cert_path}")
print(f"[INFO] SSL Key Path: {key_path}")
port = config.get("PORT", os.getenv("PORT"))
if not port:
print("[ERROR] No port defined in config or environment variables. Aborting!")
sys.exit(1) # Exit if no port is defined
port = int(port)
print(f"[INFO] Running on port {port}")
uvicorn.run(
app,
host="127.0.0.1" if environment in ["dev", "test"] else "0.0.0.0",
port=port,
log_level="debug",
ssl_keyfile=key_path,
ssl_certfile=cert_path,
)
# Get project metadata from pyproject.toml
project_name, project_version = get_project_metadata()
app = FastAPI(
@ -145,7 +167,6 @@ app.include_router(sample.router, prefix="/samples", tags=["samples"])
if __name__ == "__main__":
import sys
import uvicorn
from dotenv import load_dotenv
from multiprocessing import Process
from time import sleep
@ -169,52 +190,28 @@ if __name__ == "__main__":
print("openapi.json generated successfully.")
sys.exit(0) # Exit after generating the file
# Default behavior: Run the server
# Default behavior: Run the server based on the environment
environment = os.getenv("ENVIRONMENT", "dev")
port = int(os.getenv("PORT", 8000))
is_ci = os.getenv("CI", "false").lower() == "true"
def run_server():
print(f"[INFO] Starting server in {environment} environment...")
print(f"[INFO] SSL Certificate Path: {cert_path}")
print(f"[INFO] SSL Key Path: {key_path}")
port = config.get("PORT", os.getenv("PORT"))
if not port:
print(
"[ERROR] No port defined in config or environment variables. Aborting!"
)
sys.exit(1) # Exit if no port is defined
port = int(port)
print(f"[INFO] Running on port {port}")
uvicorn.run(
app,
host="127.0.0.1" if environment in ["dev", "test"] else "0.0.0.0",
port=port,
log_level="debug",
ssl_keyfile=key_path,
ssl_certfile=cert_path,
)
# Run in CI mode
# Generate or use SSL Key and Certificate
if environment in ["test", "dev", "ci"]:
ssl_dir = Path(
cert_path
).parent # Ensure we work with the parent directory of the cert path
ssl_dir.mkdir(
parents=True, exist_ok=True
) # Create the directory structure if it doesn't exist
if is_ci or environment == "test":
# Test or CI Mode: Run server process temporarily for test validation
ssl_dir = Path(cert_path).parent
ssl_dir.mkdir(parents=True, exist_ok=True)
# Generate self-signed certs if missing
if not Path(cert_path).exists() or not Path(key_path).exists():
print(f"[INFO] Generating self-signed SSL certificates at {ssl_dir}")
ssl_heidi.generate_self_signed_cert(cert_path, key_path)
# Start the server as a subprocess, wait, then terminate
server_process = Process(target=run_server)
server_process.start()
sleep(5) # Wait 5 seconds to ensure the server starts without errors
server_process.terminate() # Terminate the server (test purposes)
sleep(5) # Wait for 5 seconds to verify the server is running
server_process.terminate() # Terminate the server process (for CI)
server_process.join() # Ensure proper cleanup
print("CI: Server started and terminated successfully for test validation.")
else:
# Dev or Prod: Start the server as usual
run_server()