Skip to content

Add Optional SSL Support to controller.py #2448

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merrymercy merged 3 commits into from
Sep 19, 2023
Merged

Add Optional SSL Support to controller.py #2448

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
27f2165
Add optional SSL support
brandonbiggs Sep 19, 2023
4693ee1
Formatting..
brandonbiggs Sep 19, 2023
6ebc7cd
imported OS for the environment variables
brandonbiggs Sep 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 19 additions & 1 deletion fastchat/serve/controller.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
from enum import Enum, auto
import json
import logging
import os
import time
from typing import List, Union
import threading
Expand Down Expand Up @@ -318,6 +319,13 @@ def create_controller():
choices=["lottery", "shortest_queue"],
default="shortest_queue",
)
parser.add_argument(
"--ssl",
action="store_true",
required=False,
default=False,
help="Enable SSL. Requires OS Environment variables 'SSL_KEYFILE' and 'SSL_CERTFILE'.",
)
args = parser.parse_args()
logger.info(f"args: {args}")

Expand All @@ -327,4 +335,14 @@ def create_controller():

if __name__ == "__main__":
args, controller = create_controller()
uvicorn.run(app, host=args.host, port=args.port, log_level="info")
if args.ssl:
uvicorn.run(
app,
host=args.host,
port=args.port,
log_level="info",
ssl_keyfile=os.environ["SSL_KEYFILE"],
ssl_certfile=os.environ["SSL_CERTFILE"]
)
else:
uvicorn.run(app, host=args.host, port=args.port, log_level="info")