Revert "build(Dockerfile): move prisma build to dockerfile"

This reverts commit 2741835605.
This commit is contained in:
ishaan-jaff 2024-01-06 09:51:44 +05:30
parent ae54e6d8b0
commit 357c6c56bd
7 changed files with 34 additions and 147 deletions

1
.gitignore vendored
View file

@ -31,4 +31,3 @@ proxy_server_config_@.yaml
.gitignore
proxy_server_config_2.yaml
litellm/proxy/secret_managers/credentials.json
hosted_config.yaml

View file

@ -3,6 +3,7 @@ ARG LITELLM_BUILD_IMAGE=python:3.9
# Runtime image
ARG LITELLM_RUNTIME_IMAGE=python:3.9-slim
# Builder stage
FROM $LITELLM_BUILD_IMAGE as builder
@ -34,12 +35,8 @@ RUN pip wheel --no-cache-dir --wheel-dir=/wheels/ -r requirements.txt
# Runtime stage
FROM $LITELLM_RUNTIME_IMAGE as runtime
ARG with_database
WORKDIR /app
# Copy the current directory contents into the container at /app
COPY . .
RUN ls -la /app
# Copy the built wheel from the builder stage to the runtime stage; assumes only one wheel file is present
COPY --from=builder /app/dist/*.whl .
@ -48,14 +45,6 @@ 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
# Check if the with_database argument is set to 'true'
RUN echo "Value of with_database is: ${with_database}"
# If true, execute the following instructions
RUN if [ "$with_database" = "true" ]; then \
prisma generate; \
chmod +x /app/retry_push.sh; \
/app/retry_push.sh; \
fi
EXPOSE 4000/tcp

View file

@ -6,7 +6,7 @@
LITELLM_MASTER_KEY="sk-1234"
############
# Database - You can change these to any PostgreSQL database.
# Database - You can change these to any PostgreSQL database that has logical replication enabled.
############
DATABASE_URL="your-postgres-db-url"

View file

@ -519,12 +519,16 @@ class ProxyConfig:
user_config_file_path = config_file_path
# Load existing config
## Yaml
if file_path is not None:
if os.path.exists(f"{file_path}"):
with open(f"{file_path}", "r") as config_file:
config = yaml.safe_load(config_file)
else:
raise Exception(f"File not found! - {file_path}")
config = {
"model_list": [],
"general_settings": {},
"router_settings": {},
"litellm_settings": {},
}
## DB
if (
@ -2326,21 +2330,6 @@ async def update_config(config_info: ConfigYAML):
raise HTTPException(status_code=500, detail=f"An error occurred - {str(e)}")
@router.get(
"/config/get",
tags=["config.yaml"],
dependencies=[Depends(user_api_key_auth)],
)
async def get_config():
"""
Master key only.
Returns the config. Mainly used for testing.
"""
global proxy_config
return await proxy_config.get_config()
@router.get("/config/yaml", tags=["config.yaml"])
async def config_yaml_endpoint(config_info: ConfigYAML):
"""
@ -2429,28 +2418,6 @@ async def health_endpoint(
}
@router.get("/health/readiness", tags=["health"])
async def health_readiness():
"""
Unprotected endpoint for checking if worker can receive requests
"""
global prisma_client
if prisma_client is not None: # if db passed in, check if it's connected
if prisma_client.db.is_connected() == True:
return {"status": "healthy"}
else:
return {"status": "healthy"}
raise HTTPException(status_code=503, detail="Service Unhealthy")
@router.get("/health/liveliness", tags=["health"])
async def health_liveliness():
"""
Unprotected endpoint for checking if worker is alive
"""
return "I'm alive!"
@router.get("/")
async def home(request: Request):
return "LiteLLM: RUNNING"

View file

@ -250,13 +250,6 @@ def on_backoff(details):
class PrismaClient:
def __init__(self, database_url: str, proxy_logging_obj: ProxyLogging):
### Check if prisma client can be imported (setup done in Docker build)
try:
from prisma import Client # type: ignore
os.environ["DATABASE_URL"] = database_url
self.db = Client() # Client to connect to Prisma db
except: # if not - go through normal setup process
print_verbose(
"LiteLLM: DATABASE_URL Set in config, trying to 'pip install prisma'"
)

View file

@ -1,28 +0,0 @@
#!/bin/bash
retry_count=0
max_retries=3
exit_code=1
until [ $retry_count -ge $max_retries ] || [ $exit_code -eq 0 ]
do
retry_count=$((retry_count+1))
echo "Attempt $retry_count..."
# Run the Prisma db push command
prisma db push --accept-data-loss
exit_code=$?
if [ $exit_code -ne 0 ] && [ $retry_count -lt $max_retries ]; then
echo "Retrying in 10 seconds..."
sleep 10
fi
done
if [ $exit_code -ne 0 ]; then
echo "Unable to push database changes after $max_retries retries."
exit 1
fi
echo "Database push successful!"

View file

@ -1,33 +0,0 @@
datasource client {
provider = "postgresql"
url = env("DATABASE_URL")
}
generator client {
provider = "prisma-client-py"
}
model LiteLLM_UserTable {
user_id String @unique
max_budget Float?
spend Float @default(0.0)
user_email String?
}
// required for token gen
model LiteLLM_VerificationToken {
token String @unique
spend Float @default(0.0)
expires DateTime?
models String[]
aliases Json @default("{}")
config Json @default("{}")
user_id String?
max_parallel_requests Int?
metadata Json @default("{}")
}
model LiteLLM_Config {
param_name String @id
param_value Json?
}