tdpeuter/open-webui
tdpeuter/open-webui
1
Fork 0
forked from open-webui/open-webui
Code Issues Pull requests 1 Releases 2 Packages Activity Actions

Merge pull request #409 from ollama-webui/prompt-create-fix

Browse source 
fix: allow command named create
This commit is contained in:
Timothy Jaeryang Baek 2024-01-06 17:56:32 -08:00 committed by GitHub
commit acd290431a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
backend/apps/web/routers/prompts.py
View file

@ -29,8 +29,7 @@ async def get_prompts(user=Depends(get_current_user)):
@router.post("/create", response_model=Optional[PromptModel]) @router.post("/create", response_model=Optional[PromptModel])
async def create_new_prompt(form_data: PromptForm, async def create_new_prompt(form_data: PromptForm, user=Depends(get_current_user)):
user=Depends(get_current_user)):
if user.role != "admin": if user.role != "admin":
raise HTTPException( raise HTTPException(
status_code=status.HTTP_401_UNAUTHORIZED, status_code=status.HTTP_401_UNAUTHORIZED,
@ -60,7 +59,7 @@ async def create_new_prompt(form_data: PromptForm,
############################ ############################
@router.get("/{command}", response_model=Optional[PromptModel]) @router.get("/command/{command}", response_model=Optional[PromptModel])
async def get_prompt_by_command(command: str, user=Depends(get_current_user)): async def get_prompt_by_command(command: str, user=Depends(get_current_user)):
prompt = Prompts.get_prompt_by_command(f"/{command}") prompt = Prompts.get_prompt_by_command(f"/{command}")
@ -78,10 +77,10 @@ async def get_prompt_by_command(command: str, user=Depends(get_current_user)):
############################ ############################
@router.post("/{command}/update", response_model=Optional[PromptModel]) @router.post("/command/{command}/update", response_model=Optional[PromptModel])
async def update_prompt_by_command(command: str, async def update_prompt_by_command(
form_data: PromptForm, command: str, form_data: PromptForm, user=Depends(get_current_user)
user=Depends(get_current_user)): ):
if user.role != "admin": if user.role != "admin":
raise HTTPException( raise HTTPException(
status_code=status.HTTP_401_UNAUTHORIZED, status_code=status.HTTP_401_UNAUTHORIZED,
@ -103,9 +102,8 @@ async def update_prompt_by_command(command: str,
############################ ############################
@router.delete("/{command}/delete", response_model=bool) @router.delete("/command/{command}/delete", response_model=bool)
async def delete_prompt_by_command(command: str, async def delete_prompt_by_command(command: str, user=Depends(get_current_user)):
user=Depends(get_current_user)):
if user.role != "admin": if user.role != "admin":
raise HTTPException( raise HTTPException(
status_code=status.HTTP_401_UNAUTHORIZED, status_code=status.HTTP_401_UNAUTHORIZED,

6
src/lib/apis/prompts/index.ts
View file

@ -72,7 +72,7 @@ export const getPrompts = async (token: string = '') => {
export const getPromptByCommand = async (token: string, command: string) => { export const getPromptByCommand = async (token: string, command: string) => {
let error = null; let error = null;
const res = await fetch(`${WEBUI_API_BASE_URL}/prompts/${command}`, { const res = await fetch(`${WEBUI_API_BASE_URL}/prompts/command/${command}`, {
method: 'GET', method: 'GET',
headers: { headers: {
Accept: 'application/json', Accept: 'application/json',
@ -109,7 +109,7 @@ export const updatePromptByCommand = async (
) => { ) => {
let error = null; let error = null;
const res = await fetch(`${WEBUI_API_BASE_URL}/prompts/${command}/update`, { const res = await fetch(`${WEBUI_API_BASE_URL}/prompts/command/${command}/update`, {
method: 'POST', method: 'POST',
headers: { headers: {
Accept: 'application/json', Accept: 'application/json',
@ -148,7 +148,7 @@ export const deletePromptByCommand = async (token: string, command: string) => {
command = command.charAt(0) === '/' ? command.slice(1) : command; command = command.charAt(0) === '/' ? command.slice(1) : command;
const res = await fetch(`${WEBUI_API_BASE_URL}/prompts/${command}/delete`, { const res = await fetch(`${WEBUI_API_BASE_URL}/prompts/command/${command}/delete`, {
method: 'DELETE', method: 'DELETE',
headers: { headers: {
Accept: 'application/json', Accept: 'application/json',