Skip to content

Commit

Permalink
feat(api): include version number in logs
Browse files Browse the repository at this point in the history
  • Loading branch information
ssube committed Jun 26, 2023
1 parent 01811ab commit 003a350
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 2 deletions.
12 changes: 10 additions & 2 deletions api/onnx_web/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,11 @@ def quit(p: DevicePoolExecutor):
logger.info("shutting down workers")
p.join()

logger.info("starting API server with admin token: %s", server.admin_token)
logger.info(
"starting %s API server with admin token: %s",
server.server_version,
server.admin_token,
)
atexit.register(partial(quit, pool))
return app

Expand All @@ -89,7 +93,11 @@ def quit(p: DevicePoolExecutor):
server, app, pool = main()
logger.info("starting image workers")
pool.start()
logger.info("starting API server with admin token: %s", server.admin_token)
logger.info(
"starting %s API server with admin token: %s",
server.server_version,
server.admin_token,
)
app.run("0.0.0.0", 5000, debug=is_debug())
logger.info("shutting down workers")
pool.join()
6 changes: 6 additions & 0 deletions api/onnx_web/server/context.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
DEFAULT_CACHE_LIMIT = 5
DEFAULT_JOB_LIMIT = 10
DEFAULT_IMAGE_FORMAT = "png"
DEFAULT_SERVER_VERSION = "v0.10.0"


class ServerContext:
Expand All @@ -35,6 +36,7 @@ def __init__(
job_limit: int = DEFAULT_JOB_LIMIT,
memory_limit: Optional[int] = None,
admin_token: Optional[str] = None,
server_version: Optional[str] = DEFAULT_SERVER_VERSION,
) -> None:
self.bundle_path = bundle_path
self.model_path = model_path
Expand All @@ -53,6 +55,7 @@ def __init__(
self.job_limit = job_limit
self.memory_limit = memory_limit
self.admin_token = admin_token or token_urlsafe()
self.server_version = server_version

self.cache = ModelCache(self.cache_limit)

Expand Down Expand Up @@ -82,6 +85,9 @@ def from_environ(cls):
job_limit=int(environ.get("ONNX_WEB_JOB_LIMIT", DEFAULT_JOB_LIMIT)),
memory_limit=memory_limit,
admin_token=environ.get("ONNX_WEB_ADMIN_TOKEN", None),
server_version=environ.get(
"ONNX_WEB_SERVER_VERSION", DEFAULT_SERVER_VERSION
),
)

def torch_dtype(self):
Expand Down

0 comments on commit 003a350

Please sign in to comment.