From 8d3e818fb15fe259593c60a49e4596bc57075d31 Mon Sep 17 00:00:00 2001 From: Ishaan Jaff Date: Sat, 27 Jan 2024 14:36:30 -0800 Subject: [PATCH 1/8] Update Dockerfile --- Dockerfile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index e18d5d979..5c0c4ad36 100644 --- a/Dockerfile +++ b/Dockerfile @@ -47,9 +47,13 @@ COPY --from=builder /wheels/ /wheels/ # Install the built wheel using pip; again using a wildcard if it's the only file RUN pip install *.whl /wheels/* --no-index --find-links=/wheels/ && rm -f *.whl && rm -rf /wheels +# Generate prisma client +RUN prisma generate RUN chmod +x entrypoint.sh EXPOSE 4000/tcp +# # Set your entrypoint and command + ENTRYPOINT ["litellm"] -CMD ["--port", "4000", "--config", "./proxy_server_config.yaml", "--detailed_debug"] \ No newline at end of file +CMD ["--port", "4000"] From ad6607b530fd698e479e737d5e09517da6d6a81e Mon Sep 17 00:00:00 2001 From: Ishaan Jaff Date: Sat, 27 Jan 2024 14:37:38 -0800 Subject: [PATCH 2/8] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 5c0c4ad36..8bc6e5783 100644 --- a/Dockerfile +++ b/Dockerfile @@ -55,5 +55,5 @@ EXPOSE 4000/tcp # # Set your entrypoint and command -ENTRYPOINT ["litellm"] +ENTRYPOINT ["python3 litellm/proxy/proxy_cli.py"] CMD ["--port", "4000"] From 4a98104af343cd0f529ce157ab140ec203ab01f5 Mon Sep 17 00:00:00 2001 From: Ishaan Jaff Date: Sat, 27 Jan 2024 14:43:50 -0800 Subject: [PATCH 3/8] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 8bc6e5783..897736bb5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -55,5 +55,5 @@ EXPOSE 4000/tcp # # Set your entrypoint and command -ENTRYPOINT ["python3 litellm/proxy/proxy_cli.py"] +ENTRYPOINT ["python3 litellm/litellm/proxy/proxy_cli.py"] CMD ["--port", "4000"] From 18906e6aff2ad04ead94f522794450536998bbf8 Mon Sep 17 00:00:00 2001 From: Ishaan Jaff Date: Sat, 27 Jan 2024 14:57:41 -0800 Subject: [PATCH 4/8] Update Dockerfile --- Dockerfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Dockerfile b/Dockerfile index 897736bb5..ac7b21e5c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -54,6 +54,10 @@ RUN chmod +x entrypoint.sh EXPOSE 4000/tcp # # Set your entrypoint and command +RUN echo "app contents" + +# List contents of /app +RUN ls -la /app ENTRYPOINT ["python3 litellm/litellm/proxy/proxy_cli.py"] CMD ["--port", "4000"] From 7f2e4036d6e16faaa21b6d2d93b28b4d265a7d56 Mon Sep 17 00:00:00 2001 From: Ishaan Jaff Date: Sat, 27 Jan 2024 14:59:36 -0800 Subject: [PATCH 5/8] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ac7b21e5c..de47b6019 100644 --- a/Dockerfile +++ b/Dockerfile @@ -59,5 +59,5 @@ RUN echo "app contents" # List contents of /app RUN ls -la /app -ENTRYPOINT ["python3 litellm/litellm/proxy/proxy_cli.py"] +ENTRYPOINT ["python3 litellm/proxy/proxy_cli.py"] CMD ["--port", "4000"] From 6b0024a7d3fa3ae775b817302fbee334b72fd4c4 Mon Sep 17 00:00:00 2001 From: Ishaan Jaff Date: Sat, 27 Jan 2024 15:01:02 -0800 Subject: [PATCH 6/8] Update Dockerfile --- Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index de47b6019..39d88d4eb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -59,5 +59,7 @@ RUN echo "app contents" # List contents of /app RUN ls -la /app -ENTRYPOINT ["python3 litellm/proxy/proxy_cli.py"] + +ENTRYPOINT ["python3", "/app/litellm/proxy/proxy_cli.py"] + CMD ["--port", "4000"] From b522edcdf1f097b1668fed3d7e4e4f0392165d2b Mon Sep 17 00:00:00 2001 From: Ishaan Jaff Date: Sat, 27 Jan 2024 15:36:52 -0800 Subject: [PATCH 7/8] Update proxy_server.py --- litellm/proxy/proxy_server.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/litellm/proxy/proxy_server.py b/litellm/proxy/proxy_server.py index 3da2e40e3..10748042c 100644 --- a/litellm/proxy/proxy_server.py +++ b/litellm/proxy/proxy_server.py @@ -2862,6 +2862,8 @@ async def google_login(request: Request): scheme = request.url.scheme host = request.url.hostname port = request.url.port or 4000 + if "localhost" not in host: + scheme = "https" GOOGLE_REDIRECT_URI = f"{scheme}://{host}:{port}/google-callback" GOOGLE_CLIENT_ID = ( "246483686424-clje5sggkjma26ilktj6qssakqhoon0m.apps.googleusercontent.com" From d8690e50ea3f823904258686faa2e7a31bc23729 Mon Sep 17 00:00:00 2001 From: Ishaan Jaff Date: Sat, 27 Jan 2024 16:26:12 -0800 Subject: [PATCH 8/8] Update proxy_server.py --- litellm/proxy/proxy_server.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/litellm/proxy/proxy_server.py b/litellm/proxy/proxy_server.py index d54eb3990..125701528 100644 --- a/litellm/proxy/proxy_server.py +++ b/litellm/proxy/proxy_server.py @@ -2864,7 +2864,7 @@ async def google_login(request: Request): port = request.url.port or 4000 if "localhost" not in host: scheme = "https" - GOOGLE_REDIRECT_URI = f"{scheme}://{host}:{port}/google-callback" + GOOGLE_REDIRECT_URI = f"https://litellm-production-7002.up.railway.app/google-callback" GOOGLE_CLIENT_ID = ( "246483686424-clje5sggkjma26ilktj6qssakqhoon0m.apps.googleusercontent.com" ) @@ -2882,7 +2882,7 @@ async def google_callback(code: str, request: Request): if "localhost" not in host: scheme = "https" - GOOGLE_REDIRECT_URI = f"{scheme}://{host}:{port}/google-callback" + GOOGLE_REDIRECT_URI = f"https://litellm-production-7002.up.railway.app/google-callback" GOOGLE_CLIENT_ID = ( "246483686424-clje5sggkjma26ilktj6qssakqhoon0m.apps.googleusercontent.com" )