diff --git a/api/db/logs.py b/api/db/logs.py index 9e54bc4..023f3c4 100644 --- a/api/db/logs.py +++ b/api/db/logs.py @@ -53,7 +53,7 @@ async def log_api_request(user: dict, incoming_request, target_url: str): model = payload.get('model') ip_address = await network.get_ip(incoming_request) - useragent = await replacer(incoming_request.headers.get('User-Agent'), UA_SIMPLIFY) + useragent = await replacer(incoming_request.headers.get('User-Agent', ''), UA_SIMPLIFY) new_log_item = { 'timestamp': time.time(), diff --git a/api/main.py b/api/main.py index ff9b149..b157c2a 100644 --- a/api/main.py +++ b/api/main.py @@ -39,4 +39,4 @@ async def root(): 'core_api_docs_for_nova_developers': '/docs' } -app.add_route('/{path:path}', transfer.handle, ['GET', 'POST', 'PUT', 'DELETE', 'PATCH']) +app.add_route('/v1/{path:path}', transfer.handle, ['GET', 'POST', 'PUT', 'DELETE', 'PATCH']) diff --git a/api/streaming.py b/api/streaming.py index 996b44a..c0a1b81 100644 --- a/api/streaming.py +++ b/api/streaming.py @@ -116,7 +116,7 @@ async def stream( cookies=target_request.get('cookies'), ssl=False, timeout=aiohttp.ClientTimeout( - connect=3.0, + connect=60, total=float(os.getenv('TRANSFER_TIMEOUT', '120')) ), ) as response: diff --git a/api/transfer.py b/api/transfer.py index 9fea652..3a03524 100644 --- a/api/transfer.py +++ b/api/transfer.py @@ -14,7 +14,7 @@ from helpers import tokens, errors load_dotenv() -models_list = json.load(open('models.json')) +models_list = json.load(open('models.json', encoding='utf8')) with open('config/config.yml', encoding='utf8') as f: config = yaml.safe_load(f) @@ -26,7 +26,7 @@ async def handle(incoming_request): Checks method, token amount, auth and cost along with if request is NSFW. """ users = UserManager() - path = incoming_request.url.path.replace('v1/v1/', 'v1/') + path = incoming_request.url.path if '/models' in path: return fastapi.responses.JSONResponse(content=models_list)