Revert "Merge branch 'main' into main"

This reverts commit a92461caa5, reversing
changes made to 9dd857e0a6.
This commit is contained in:
ishaan-jaff 2024-01-27 16:47:10 -08:00
parent a92461caa5
commit 308351458b
2 changed files with 3 additions and 13 deletions

View file

@ -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"]

View file

@ -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"