Merge f5715df218 into a7b2ce7aa5

LICENSE

@@ -12,7 +12,7 @@ software and other kinds of works, specifically designed to ensure
 cooperation with the community in the case of network server software.
 
   The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
+to take away your freedom to share and change the works.  By contrast
 our General Public Licenses are intended to guarantee your freedom to
 share and change all versions of a program--to make sure it remains free
 software for all its users.

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(),

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'])

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:

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)

rewards/__main__.py

@@ -1,2 +1,3 @@
 import main
+
 main.launch()