allow sdapi to use authenticated server

This commit is contained in:
Vladimir Mandic
2023-06-09 11:22:41 -04:00
parent 2396d43df0
commit 0109052fdd
2 changed files with 8 additions and 5 deletions
+2 -5
View File
@@ -17,6 +17,8 @@ from util import Map, log
sd_url = os.environ.get('SDAPI_URL', "http://127.0.0.1:7860") # automatic1111 api url root
sd_username = os.environ.get('SDAPI_USR', None)
sd_password = os.environ.get('SDAPI_PWD', None)
use_session = True
urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
@@ -40,22 +42,17 @@ asyncio.set_event_loop_policy(AnyThreadEventLoopPolicy())
def authsync():
sd_username = os.environ.get('SDAPI_USR', None)
sd_password = os.environ.get('SDAPI_PWD', None)
if sd_username is not None and sd_password is not None:
return requests.auth.HTTPBasicAuth(sd_username, sd_password)
return None
def auth():
sd_username = os.environ.get('SDAPI_USR', None)
sd_password = os.environ.get('SDAPI_PWD', None)
if sd_username is not None and sd_password is not None:
return aiohttp.BasicAuth(sd_username, sd_password)
return None
async def result(req):
if req.status != 200:
if not quiet:
+6
View File
@@ -90,6 +90,8 @@ def parse_args():
group_server = parser.add_argument_group('Server')
group_server.add_argument('--server', type=str, default='http://127.0.0.1:7860', required=False, help='server url, default: %(default)s')
group_server.add_argument('--user', type=str, default=None, required=False, help='server url, default: %(default)s')
group_server.add_argument('--password', type=str, default=None, required=False, help='server url, default: %(default)s')
group_main = parser.add_argument_group('Main')
group_main.add_argument('--type', type=str, choices=['embedding', 'ti', 'lora', 'lyco', 'dreambooth', 'hypernetwork'], default=None, required=True, help='training type')
@@ -381,6 +383,10 @@ if __name__ == '__main__':
log.info('SD.Next train script')
parse_args()
sdapi.sd_url = args.server
if args.user is not None:
sdapi.sd_username = args.user
if args.password is not None:
sdapi.sd_password = args.password
setup_logging()
prepare_server()
verify_args()