refac: pipe function support

This commit is contained in:
Timothy J. Baek 2024-06-20 04:47:40 -07:00
parent d6e4aef607
commit 59fa2f8f26
2 changed files with 10 additions and 4 deletions

View File

@ -120,16 +120,16 @@ async def get_pipe_models():
manifold_pipes = [] manifold_pipes = []
# Check if pipes is a function or a list # Check if pipes is a function or a list
if callable(pipe.pipes): if callable(function_module.pipes):
manifold_pipes = pipe.pipes() manifold_pipes = function_module.pipes()
else: else:
manifold_pipes = pipe.pipes manifold_pipes = function_module.pipes
for p in manifold_pipes: for p in manifold_pipes:
manifold_pipe_id = f'{pipe.id}.{p["id"]}' manifold_pipe_id = f'{pipe.id}.{p["id"]}'
manifold_pipe_name = p["name"] manifold_pipe_name = p["name"]
if hasattr(pipe, "name"): if hasattr(function_module, "name"):
manifold_pipe_name = f"{pipe.name}{manifold_pipe_name}" manifold_pipe_name = f"{pipe.name}{manifold_pipe_name}"
pipe_models.append( pipe_models.append(

View File

@ -802,6 +802,12 @@ async def generate_chat_completions(form_data: dict, user=Depends(get_verified_u
pipe = model.get("pipe") pipe = model.get("pipe")
if pipe: if pipe:
form_data["user"] = {
"id": user.id,
"email": user.email,
"name": user.name,
"role": user.role,
}
def job(): def job():
pipe_id = form_data["model"] pipe_id = form_data["model"]