fix: fix render deploy

0x8A63F77D · Aug 10, 2023 · dcb16a7 · dcb16a7
1 parent 0997830
commit dcb16a7
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 12 deletions.
diff --git a/Makefile b/Makefile
@@ -5,14 +5,14 @@ container := "openai-forward-container"
 compose_path := "docker-compose.yaml"
 
 start:
-	docker run -d \
+	@docker run -d \
     --name $(container) \
     --env-file .env \
     -p 8000:8000 \
     -v $(shell pwd)/Log:/home/openai-forward/Log \
     -v $(shell pwd)/openai_forward:/home/openai-forward/openai_forward \
     $(image)
-
+	@make log
 
 exec:
 	docker exec -it $(container) sh

diff --git a/openai_forward/__init__.py b/openai_forward/__init__.py
@@ -1,4 +1,4 @@
-__version__ = "0.4.0"
+__version__ = "0.4.1"
 
 from dotenv import load_dotenv
 

diff --git a/openai_forward/forwarding/base.py b/openai_forward/forwarding/base.py
@@ -160,7 +160,7 @@ async def reverse_proxy(self, request: Request):
                         uid = chat_info.get("uid")
             except Exception as e:
                 logger.debug(
-                    f"log chat error:\n{request.client.host=} {request.method=}: {traceback.format_exc()}"
+                    f"log chat error:\nhost:{request.client.host} method:{request.method}: {traceback.format_exc()}"
                 )
 
         req = self.client.build_request(

diff --git a/openai_forward/forwarding/settings.py b/openai_forward/forwarding/settings.py
@@ -4,12 +4,13 @@
 from ..helper import env2list, format_route_prefix
 
 ENV_VAR_SEP = ","
-OPENAI_BASE_URL = env2list("OPENAI_BASE_URL", sep=ENV_VAR_SEP)
+OPENAI_BASE_URL = env2list("OPENAI_BASE_URL", sep=ENV_VAR_SEP) or [
+    "https://api.openai.com"
+]
+
 OPENAI_ROUTE_PREFIX = [
     format_route_prefix(i) for i in env2list("OPENAI_ROUTE_PREFIX", sep=ENV_VAR_SEP)
-]
-if not OPENAI_ROUTE_PREFIX:
-    OPENAI_ROUTE_PREFIX = ['/']
+] or ['/']
 
 EXTRA_BASE_URL = env2list("EXTRA_BASE_URL", sep=ENV_VAR_SEP)
 EXTRA_ROUTE_PREFIX = [

diff --git a/openai_forward/helper.py b/openai_forward/helper.py
@@ -132,7 +132,7 @@ def convert_folder_to_jsonl(folder_path: str, target_path: str):
         msg_len, ass_len = len(msg), len(ass)
         if msg_len != ass_len:
             print(
-                f"{log_path=} Length mismatch between message({msg_len}) and assistant({ass_len}) "
+                f"{log_path}: Length mismatch between message({msg_len}) and assistant({ass_len}) "
             )
         messages.extend(msg)
         assistants.extend(ass)

diff --git a/pyproject.toml b/pyproject.toml
@@ -21,10 +21,10 @@ classifiers = [
 dependencies = [
     "loguru>=0.7.0",
     "fastapi>=0.90.0",
-    "uvicorn>=0.23.1",
-    "orjson>=3.9.2",
+    "uvicorn>=0.21.0",
+    "orjson>=3.9",
     "python-dotenv",
-    "httpx>=0.24.1",
+    "httpx>=0.24",
     "rich",
     "fire",
     "pytz",