From 43186ad08407c08835f5678d10c7600e23b7fe8f Mon Sep 17 00:00:00 2001 From: Garrett Sutula Date: Thu, 27 Apr 2023 20:29:21 -0400 Subject: [PATCH 1/5] Add tls_verify arg for use with self-signed certs --- modules/cmd_args.py | 1 + webui.py | 1 + 2 files changed, 2 insertions(+) diff --git a/modules/cmd_args.py b/modules/cmd_args.py index 81c0b82a..3aeecdcc 100644 --- a/modules/cmd_args.py +++ b/modules/cmd_args.py @@ -95,6 +95,7 @@ parser.add_argument("--cors-allow-origins", type=str, help="Allowed CORS origin( parser.add_argument("--cors-allow-origins-regex", type=str, help="Allowed CORS origin(s) in the form of a single regular expression", default=None) parser.add_argument("--tls-keyfile", type=str, help="Partially enables TLS, requires --tls-certfile to fully function", default=None) parser.add_argument("--tls-certfile", type=str, help="Partially enables TLS, requires --tls-keyfile to fully function", default=None) +parser.add_argument("--tls-verify", type=bool, help="Enables the use of self-signed certificates when set to False", default=None) parser.add_argument("--server-name", type=str, help="Sets hostname of server", default=None) parser.add_argument("--gradio-queue", action='store_true', help="does not do anything", default=True) parser.add_argument("--no-gradio-queue", action='store_true', help="Disables gradio queue; causes the webpage to use http requests instead of websockets; was the defaul in earlier versions") diff --git a/webui.py b/webui.py index b570895f..c86d3d49 100644 --- a/webui.py +++ b/webui.py @@ -260,6 +260,7 @@ def webui(): server_port=cmd_opts.port, ssl_keyfile=cmd_opts.tls_keyfile, ssl_certfile=cmd_opts.tls_certfile, + ssl_verify=cmd_opts.tls_verify, debug=cmd_opts.gradio_debug, auth=[tuple(cred.split(':')) for cred in gradio_auth_creds] if gradio_auth_creds else None, inbrowser=cmd_opts.autolaunch, From fa74daacbd98dbcaefeca39a0d0f10ae19d227e8 Mon Sep 17 00:00:00 2001 From: Garrett Sutula Date: Thu, 27 Apr 2023 20:31:17 -0400 Subject: [PATCH 2/5] Update gradio version to version that adds ssl_verify --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index c72b2927..21337522 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ basicsr fonts font-roboto gfpgan -gradio==3.23 +gradio==3.28 invisible-watermark numpy omegaconf From d1e62b296146bd158630b8444e4720a1ae445151 Mon Sep 17 00:00:00 2001 From: Garrett Sutula Date: Thu, 27 Apr 2023 21:30:19 -0400 Subject: [PATCH 3/5] Improve param semantics, --- modules/cmd_args.py | 2 +- webui.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/cmd_args.py b/modules/cmd_args.py index 3aeecdcc..f47c21bb 100644 --- a/modules/cmd_args.py +++ b/modules/cmd_args.py @@ -95,7 +95,7 @@ parser.add_argument("--cors-allow-origins", type=str, help="Allowed CORS origin( parser.add_argument("--cors-allow-origins-regex", type=str, help="Allowed CORS origin(s) in the form of a single regular expression", default=None) parser.add_argument("--tls-keyfile", type=str, help="Partially enables TLS, requires --tls-certfile to fully function", default=None) parser.add_argument("--tls-certfile", type=str, help="Partially enables TLS, requires --tls-keyfile to fully function", default=None) -parser.add_argument("--tls-verify", type=bool, help="Enables the use of self-signed certificates when set to False", default=None) +parser.add_argument("--disable-tls-verify", action="store_false", help="When passed, enables the use of self-signed certificates.", default=None) parser.add_argument("--server-name", type=str, help="Sets hostname of server", default=None) parser.add_argument("--gradio-queue", action='store_true', help="does not do anything", default=True) parser.add_argument("--no-gradio-queue", action='store_true', help="Disables gradio queue; causes the webpage to use http requests instead of websockets; was the defaul in earlier versions") diff --git a/webui.py b/webui.py index c86d3d49..a4709032 100644 --- a/webui.py +++ b/webui.py @@ -260,7 +260,7 @@ def webui(): server_port=cmd_opts.port, ssl_keyfile=cmd_opts.tls_keyfile, ssl_certfile=cmd_opts.tls_certfile, - ssl_verify=cmd_opts.tls_verify, + ssl_verify=cmd_opts.disable_tls_verify, debug=cmd_opts.gradio_debug, auth=[tuple(cred.split(':')) for cred in gradio_auth_creds] if gradio_auth_creds else None, inbrowser=cmd_opts.autolaunch, From ed46abea356931ab051bee0622d2568deaad5f98 Mon Sep 17 00:00:00 2001 From: Garrett Sutula Date: Thu, 27 Apr 2023 21:30:55 -0400 Subject: [PATCH 4/5] fix for method moved to gradio_client --- modules/api/api.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/api/api.py b/modules/api/api.py index 518b2a61..8134fe58 100644 --- a/modules/api/api.py +++ b/modules/api/api.py @@ -6,7 +6,7 @@ import uvicorn import gradio as gr from threading import Lock from io import BytesIO -from gradio.processing_utils import decode_base64_to_file +from gradio_client.processing_utils import decode_base64_to_file from fastapi import APIRouter, Depends, FastAPI, Request, Response from fastapi.security import HTTPBasic, HTTPBasicCredentials from fastapi.exceptions import HTTPException From aac478cb9d39354bdb7778a37529d931dc3f87d6 Mon Sep 17 00:00:00 2001 From: Garrett Sutula Date: Thu, 27 Apr 2023 21:40:16 -0400 Subject: [PATCH 5/5] Should be "utils" --- modules/api/api.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/api/api.py b/modules/api/api.py index 8134fe58..2346efd2 100644 --- a/modules/api/api.py +++ b/modules/api/api.py @@ -6,7 +6,7 @@ import uvicorn import gradio as gr from threading import Lock from io import BytesIO -from gradio_client.processing_utils import decode_base64_to_file +from gradio_client.utils import decode_base64_to_file from fastapi import APIRouter, Depends, FastAPI, Request, Response from fastapi.security import HTTPBasic, HTTPBasicCredentials from fastapi.exceptions import HTTPException