From 308351458b3ba159d80bc55f61f5fbd17eb0a60c Mon Sep 17 00:00:00 2001
From: ishaan-jaff <ishaanjaffer0324@gmail.com>
Date: Sat, 27 Jan 2024 16:47:10 -0800
Subject: [PATCH] Revert "Merge branch 'main' into main"

This reverts commit a92461caa5352bd06ca40962e3bed7f36c7e669c, reversing
changes made to 9dd857e0a6d44a9b4c2f68395e086ad357ffb3bd.
---
 Dockerfile                    | 14 ++------------
 litellm/proxy/proxy_server.py |  2 +-
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 39d88d4eb..e18d5d979 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -47,19 +47,9 @@ 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
-RUN echo "app contents"
-
-# List contents of /app
-RUN ls -la /app
-
-
-ENTRYPOINT ["python3", "/app/litellm/proxy/proxy_cli.py"]
-
-CMD ["--port", "4000"]
+ENTRYPOINT ["litellm"]
+CMD ["--port", "4000", "--config", "./proxy_server_config.yaml", "--detailed_debug"]
\ No newline at end of file
diff --git a/litellm/proxy/proxy_server.py b/litellm/proxy/proxy_server.py
index 664dabd10..1154cf816 100644
--- a/litellm/proxy/proxy_server.py
+++ b/litellm/proxy/proxy_server.py
@@ -2859,7 +2859,6 @@ async def user_auth(request: Request):
 
 @app.get("/google-login/key/generate", tags=["experimental"])
 async def google_login(request: Request):
-
     GOOGLE_REDIRECT_URI = os.getenv("GOOGLE_REDIRECT_URI")
     GOOGLE_CLIENT_ID = (
         "246483686424-clje5sggkjma26ilktj6qssakqhoon0m.apps.googleusercontent.com"
@@ -2871,6 +2870,7 @@ async def google_login(request: Request):
 @app.get("/google-callback", tags=["experimental"], response_model=GenerateKeyResponse)
 async def google_callback(code: str, request: Request):
     import httpx
+
     GOOGLE_REDIRECT_URI = os.getenv("GOOGLE_REDIRECT_URI")
     GOOGLE_CLIENT_ID = (
         "246483686424-clje5sggkjma26ilktj6qssakqhoon0m.apps.googleusercontent.com"