mirror of
https://github.com/BerriAI/litellm.git
synced 2026-11-15 09:12:18 +00:00
Merge edb92d648f into add7dea9aa
This commit is contained in:
commit
8fa4e29cd0
847 changed files with 33 additions and 33 deletions
|
|
@ -854,8 +854,8 @@ jobs:
|
|||
- run:
|
||||
name: Use built UI bundle
|
||||
command: |
|
||||
rm -rf litellm/proxy/_experimental/out
|
||||
cp -r ui-bundle/out litellm/proxy/_experimental/out
|
||||
rm -rf litellm/proxy/ui/out
|
||||
cp -r ui-bundle/out litellm/proxy/ui/out
|
||||
- wait_for_service:
|
||||
url: tcp://localhost:5432
|
||||
timeout: "30"
|
||||
|
|
@ -995,8 +995,8 @@ jobs:
|
|||
- run:
|
||||
name: Use built UI bundle
|
||||
command: |
|
||||
rm -rf litellm/proxy/_experimental/out
|
||||
cp -r ui-bundle/out litellm/proxy/_experimental/out
|
||||
rm -rf litellm/proxy/ui/out
|
||||
cp -r ui-bundle/out litellm/proxy/ui/out
|
||||
- wait_for_service:
|
||||
url: tcp://localhost:5432
|
||||
timeout: "30"
|
||||
|
|
|
|||
|
|
@ -79,7 +79,7 @@ export INTEGRATION_PROXY_URL=http://127.0.0.1:4000
|
|||
export INTEGRATION_PEER_URL=""
|
||||
export INTEGRATION_UPSTREAM_URL=http://127.0.0.1:8190
|
||||
export INTEGRATION_MASTER_KEY="$LITELLM_MASTER_KEY"
|
||||
export LITELLM_UI_PATH="$PWD/litellm/proxy/_experimental/out"
|
||||
export LITELLM_UI_PATH="$PWD/litellm/proxy/ui/out"
|
||||
if [ "$suite" = browser ]; then
|
||||
export LITELLM_UI_PATH="$PWD/ui/litellm-dashboard/out"
|
||||
test -f "$LITELLM_UI_PATH/index.html"
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ secret:
|
|||
- "miniconda.sh"
|
||||
|
||||
# Build outputs and static assets
|
||||
- "litellm/proxy/_experimental/out/**"
|
||||
- "litellm/proxy/ui/out/**"
|
||||
- "ui/litellm-dashboard/public/**"
|
||||
- "**/swagger/*.js"
|
||||
- "**/*.woff"
|
||||
|
|
|
|||
|
|
@ -94,8 +94,8 @@ COPY . .
|
|||
# Replace the committed UI bundle with the one built from this exact source.
|
||||
# Clearing first drops the committed bundle's content-hashed chunks that COPY
|
||||
# would otherwise leave behind alongside the fresh ones.
|
||||
RUN rm -rf litellm/proxy/_experimental/out
|
||||
COPY --from=ui-builder /ui/out/. litellm/proxy/_experimental/out/
|
||||
RUN rm -rf litellm/proxy/ui/out
|
||||
COPY --from=ui-builder /ui/out/. litellm/proxy/ui/out/
|
||||
|
||||
# Build Admin UI before final sync (applies the enterprise color override when present)
|
||||
RUN sed -i 's/\r$//' docker/build_admin_ui.sh && chmod +x docker/build_admin_ui.sh && ./docker/build_admin_ui.sh
|
||||
|
|
|
|||
|
|
@ -92,8 +92,8 @@ COPY . .
|
|||
# Replace the committed UI bundle with the one built from this exact source.
|
||||
# Clearing first drops the committed bundle's content-hashed chunks that COPY
|
||||
# would otherwise leave behind alongside the fresh ones.
|
||||
RUN rm -rf litellm/proxy/_experimental/out
|
||||
COPY --from=ui-builder /ui/out/. litellm/proxy/_experimental/out/
|
||||
RUN rm -rf litellm/proxy/ui/out
|
||||
COPY --from=ui-builder /ui/out/. litellm/proxy/ui/out/
|
||||
|
||||
# Build Admin UI before final sync (applies the enterprise color override when present)
|
||||
RUN sed -i 's/\r$//' docker/build_admin_ui.sh && chmod +x docker/build_admin_ui.sh && ./docker/build_admin_ui.sh
|
||||
|
|
|
|||
|
|
@ -96,14 +96,14 @@ COPY . .
|
|||
# Replace the committed UI bundle with the one built from this exact source.
|
||||
# Clearing first drops the committed bundle's content-hashed chunks that COPY
|
||||
# would otherwise leave behind alongside the fresh ones.
|
||||
RUN rm -rf litellm/proxy/_experimental/out
|
||||
COPY --from=ui-builder /ui/out/. litellm/proxy/_experimental/out/
|
||||
RUN rm -rf litellm/proxy/ui/out
|
||||
COPY --from=ui-builder /ui/out/. litellm/proxy/ui/out/
|
||||
|
||||
# Set non-root flag for build time consistency
|
||||
ENV LITELLM_NON_ROOT=true
|
||||
|
||||
RUN mkdir -p /var/lib/litellm/ui /var/lib/litellm/assets && \
|
||||
cp -r /app/litellm/proxy/_experimental/out/. /var/lib/litellm/ui/ && \
|
||||
cp -r /app/litellm/proxy/ui/out/. /var/lib/litellm/ui/ && \
|
||||
cp /app/litellm/proxy/logo.png /var/lib/litellm/assets/logo.png && \
|
||||
touch /var/lib/litellm/ui/.litellm_ui_ready
|
||||
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ Run from `litellm-rust` with an existing dashboard export and a gateway config:
|
|||
|
||||
```sh
|
||||
export LITELLM_CONFIG=/path/to/config.yaml
|
||||
export LITELLM_UI_PATH=/path/to/litellm/proxy/_experimental/out
|
||||
export LITELLM_UI_PATH=/path/to/litellm/proxy/ui/out
|
||||
export UI_USERNAME=admin
|
||||
read -rs UI_PASSWORD
|
||||
export UI_PASSWORD
|
||||
|
|
|
|||
|
|
@ -225,8 +225,8 @@ async fn unknown_logo_theme_is_rejected_in_the_ui_envelope(dashboard: App) {
|
|||
#[case::monogram_dark("/get_image?theme=dark&variant=monogram")]
|
||||
#[tokio::test]
|
||||
async fn committed_dashboard_export_serves_every_logo(#[case] path: &str) {
|
||||
let export = std::path::Path::new(env!("CARGO_MANIFEST_DIR"))
|
||||
.join("../../../litellm/proxy/_experimental/out");
|
||||
let export =
|
||||
std::path::Path::new(env!("CARGO_MANIFEST_DIR")).join("../../../litellm/proxy/ui/out");
|
||||
let response = litellm_gateway_ui::dashboard_assets(export)
|
||||
.oneshot(Request::get(path).body(Body::empty()).unwrap())
|
||||
.await
|
||||
|
|
|
|||
|
|
@ -2625,7 +2625,7 @@ origins, allow_cors_credentials = _get_cors_config()
|
|||
# get current directory
|
||||
try:
|
||||
current_dir = os.path.dirname(os.path.abspath(__file__))
|
||||
packaged_ui_path: Final = os.path.join(current_dir, "_experimental", "out")
|
||||
packaged_ui_path: Final = os.path.join(current_dir, "ui", "out")
|
||||
ui_path = packaged_ui_path
|
||||
litellm_asset_prefix: Final = "/litellm-asset-prefix"
|
||||
|
||||
|
|
@ -2919,7 +2919,7 @@ try:
|
|||
except Exception:
|
||||
pass
|
||||
current_dir = os.path.dirname(os.path.abspath(__file__))
|
||||
# ui_path = os.path.join(current_dir, "_experimental", "out")
|
||||
# ui_path = os.path.join(current_dir, "ui", "out")
|
||||
# # Mount this test directory instead
|
||||
# app.mount("/ui", StaticFiles(directory=ui_path, html=True), name="ui")
|
||||
|
||||
|
|
@ -20028,7 +20028,7 @@ async def get_favicon():
|
|||
)
|
||||
|
||||
current_dir: Final = os.path.dirname(os.path.abspath(__file__))
|
||||
default_favicon: Final = os.path.join(current_dir, "_experimental", "out", "favicon.ico")
|
||||
default_favicon: Final = os.path.join(current_dir, "ui", "out", "favicon.ico")
|
||||
|
||||
favicon_url: Final = os.getenv("LITELLM_FAVICON_URL", "")
|
||||
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Reference in a new issue