Skip to content

Commit

Permalink
Merge branch 'tweaks' into refactor-pipeline-downloads
Browse files Browse the repository at this point in the history
  • Loading branch information
jedwards1230 authored Nov 16, 2024
2 parents ef9bf63 + bf24cfb commit dadc74a
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 4 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/docker-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ on:
branches:
- main
- dev
- tweaks

jobs:
build-main-image:
Expand All @@ -16,6 +17,7 @@ jobs:

build-cuda-image:
uses: ./.github/workflows/build-docker-image.yaml
if: false
with:
image_name: ${{ github.repository }}
cache_id: cuda
Expand Down
2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,7 @@ __pycache__

/litellm


pipelines/*
!pipelines/.gitignore
.DS_Store

.venv
Expand Down
6 changes: 4 additions & 2 deletions main.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

from schemas import FilterForm, OpenAIChatCompletionForm


from utils.pipelines.logger import setup_logger

logger = setup_logger(__name__)
Expand All @@ -40,6 +41,7 @@
RESET_PIPELINES_DIR,
)

DEBUG_PIP = os.getenv("DEBUG_PIP", "false").lower() == "true"

PIPELINES = {}
PIPELINE_MODULES = {}
Expand Down Expand Up @@ -112,7 +114,7 @@ def get_all_pipelines():

return pipelines


async def load_module_from_path(module_name, module_path):
try:
await install_requirements_from_file(module_path)
Expand Down Expand Up @@ -629,7 +631,7 @@ def job():

pipeline = app.state.PIPELINES[form_data.model]
pipeline_id = form_data.model

logger.info(f"stream:true:{res}")

if pipeline["type"] == "manifold":
Expand Down
1 change: 1 addition & 0 deletions pipelines
Submodule pipelines added at 6ab7c6
Empty file removed pipelines/.gitignore
Empty file.
6 changes: 6 additions & 0 deletions start.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
#!/usr/bin/env bash

# Check for required commands
command -v git >/dev/null 2>&1 || { echo >&2 "git is not installed. Aborting."; exit 1; }
command -v curl >/dev/null 2>&1 || { echo >&2 "curl is not installed. Aborting."; exit 1; }
command -v pip >/dev/null 2>&1 || { echo >&2 "pip is not installed. Aborting."; exit 1; }

PORT="${PORT:-9099}"
HOST="${HOST:-0.0.0.0}"

Expand Down

0 comments on commit dadc74a

Please sign in to comment.