This commit is contained in:
wataru 2022-10-30 01:42:01 +09:00
parent c01b7331b5
commit 7adfe74ffd
3 changed files with 51 additions and 50 deletions

View File

@ -86,6 +86,7 @@ def setupArgParser():
parser.add_argument("--httpsKey", type=str, default="ssl.key", help="path for the key of https") parser.add_argument("--httpsKey", type=str, default="ssl.key", help="path for the key of https")
parser.add_argument("--httpsCert", type=str, default="ssl.cert", help="path for the cert of https") parser.add_argument("--httpsCert", type=str, default="ssl.cert", help="path for the cert of https")
parser.add_argument("--httpsSelfSigned", type=strtobool, default=True, help="generate self-signed certificate") parser.add_argument("--httpsSelfSigned", type=strtobool, default=True, help="generate self-signed certificate")
parser.add_argument("--colab", type=strtobool, default=False, help="run on colab")
return parser return parser
def printMessage(message, level=0): def printMessage(message, level=0):
@ -136,7 +137,7 @@ if __name__ == thisFilename:
return {"result": "Index"} return {"result": "Index"}
@app_fastapi.post("/api/uploadfile/model") @app_fastapi.post("/upload_model_file")
async def upload_file(configFile:UploadFile = File(...), modelFile: UploadFile = File(...)): async def upload_file(configFile:UploadFile = File(...), modelFile: UploadFile = File(...)):
if configFile and modelFile: if configFile and modelFile:
for file in [modelFile, configFile]: for file in [modelFile, configFile]:
@ -205,13 +206,14 @@ if __name__ == '__main__':
printMessage(f"Start MMVC SocketIO Server", level=0) printMessage(f"Start MMVC SocketIO Server", level=0)
printMessage(f"CONFIG:{CONFIG}, MODEL:{MODEL}", level=1) printMessage(f"CONFIG:{CONFIG}, MODEL:{MODEL}", level=1)
if os.environ["EX_PORT"]: if args.colab == False:
if os.getenv("EX_PORT"):
EX_PORT = os.environ["EX_PORT"] EX_PORT = os.environ["EX_PORT"]
printMessage(f"External_Port:{EX_PORT} Internal_Port:{PORT}", level=1) printMessage(f"External_Port:{EX_PORT} Internal_Port:{PORT}", level=1)
else: else:
printMessage(f"Internal_Port:{PORT}", level=1) printMessage(f"Internal_Port:{PORT}", level=1)
if os.environ["EX_IP"]: if os.getenv("EX_IP"):
EX_IP = os.environ["EX_IP"] EX_IP = os.environ["EX_IP"]
printMessage(f"External_IP:{EX_IP}", level=1) printMessage(f"External_IP:{EX_IP}", level=1)
@ -277,4 +279,3 @@ if __name__ == '__main__':
reload=True, reload=True,
log_level="critical" log_level="critical"
) )

File diff suppressed because one or more lines are too long

View File

@ -1,4 +1,4 @@
FROM dannadori/voice-changer-internal:20221029_231527 as front FROM dannadori/voice-changer-internal:20221030_013959 as front
FROM debian:bullseye-slim as base FROM debian:bullseye-slim as base
ARG DEBIAN_FRONTEND=noninteractive ARG DEBIAN_FRONTEND=noninteractive