Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
chenpangpang
open-webui
Commits
d2c5f3d5
"test/git@developer.sourcefind.cn:OpenDAS/nni.git" did not exist on "9f32a06f16774fe2226f6c4b9b0da014fbcb77c1"
Commit
d2c5f3d5
authored
Jan 22, 2024
by
Timothy J. Baek
Browse files
refac: convert str var to f-string
parent
5b26d2a6
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
14 additions
and
9 deletions
+14
-9
backend/apps/web/internal/db.py
backend/apps/web/internal/db.py
+1
-1
backend/apps/web/routers/utils.py
backend/apps/web/routers/utils.py
+2
-2
backend/config.py
backend/config.py
+5
-4
backend/main.py
backend/main.py
+6
-2
No files found.
backend/apps/web/internal/db.py
View file @
d2c5f3d5
...
@@ -2,5 +2,5 @@ from peewee import *
...
@@ -2,5 +2,5 @@ from peewee import *
from
config
import
DATA_DIR
from
config
import
DATA_DIR
DB
=
SqliteDatabase
(
str
(
DATA_DIR
/
"
ollama.db"
)
)
DB
=
SqliteDatabase
(
f
"
{
DATA_DIR
}
/
ollama.db"
)
DB
.
connect
()
DB
.
connect
()
backend/apps/web/routers/utils.py
View file @
d2c5f3d5
...
@@ -96,7 +96,7 @@ async def download(
...
@@ -96,7 +96,7 @@ async def download(
file_name
=
parse_huggingface_url
(
url
)
file_name
=
parse_huggingface_url
(
url
)
if
file_name
:
if
file_name
:
file_path
=
str
(
UPLOAD_DIR
/
file_name
)
file_path
=
f
"
{
UPLOAD_DIR
}
/
{
file_name
}
"
return
StreamingResponse
(
return
StreamingResponse
(
download_file_stream
(
url
,
file_path
,
file_name
),
download_file_stream
(
url
,
file_path
,
file_name
),
...
@@ -108,7 +108,7 @@ async def download(
...
@@ -108,7 +108,7 @@ async def download(
@
router
.
post
(
"/upload"
)
@
router
.
post
(
"/upload"
)
def
upload
(
file
:
UploadFile
=
File
(...)):
def
upload
(
file
:
UploadFile
=
File
(...)):
file_path
=
UPLOAD_DIR
/
file
.
filename
file_path
=
f
"
{
UPLOAD_DIR
}
/
{
file
.
filename
}
"
# Save file in chunks
# Save file in chunks
with
file_path
.
open
(
"wb+"
)
as
f
:
with
file_path
.
open
(
"wb+"
)
as
f
:
...
...
backend/config.py
View file @
d2c5f3d5
...
@@ -15,6 +15,7 @@ from pathlib import Path
...
@@ -15,6 +15,7 @@ from pathlib import Path
try
:
try
:
from
dotenv
import
load_dotenv
,
find_dotenv
from
dotenv
import
load_dotenv
,
find_dotenv
load_dotenv
(
find_dotenv
(
"../.env"
))
load_dotenv
(
find_dotenv
(
"../.env"
))
except
ImportError
:
except
ImportError
:
print
(
"dotenv not installed, skipping..."
)
print
(
"dotenv not installed, skipping..."
)
...
@@ -24,12 +25,12 @@ except ImportError:
...
@@ -24,12 +25,12 @@ except ImportError:
# File Upload
# File Upload
####################################
####################################
DATA_DIR
=
Path
(
os
.
getenv
(
"DATA_DIR"
,
'
./data
'
)).
resolve
()
DATA_DIR
=
Path
(
os
.
getenv
(
"DATA_DIR"
,
"
./data
"
)).
resolve
()
UPLOAD_DIR
=
DATA_DIR
/
"
uploads"
UPLOAD_DIR
=
f
"
{
DATA_DIR
}
/
uploads"
UPLOAD_DIR
.
mkdir
(
parents
=
True
,
exist_ok
=
True
)
UPLOAD_DIR
.
mkdir
(
parents
=
True
,
exist_ok
=
True
)
WEB
_DIR
=
Path
(
os
.
getenv
(
"
WEB
_DIR"
,
"../build"
))
FRONTEND_BUILD
_DIR
=
Path
(
os
.
getenv
(
"
FRONTEND_BUILD
_DIR"
,
"../build"
))
####################################
####################################
# ENV (dev,test,prod)
# ENV (dev,test,prod)
...
@@ -84,7 +85,7 @@ if WEBUI_AUTH and WEBUI_JWT_SECRET_KEY == "":
...
@@ -84,7 +85,7 @@ if WEBUI_AUTH and WEBUI_JWT_SECRET_KEY == "":
# RAG
# RAG
####################################
####################################
CHROMA_DATA_PATH
=
DATA_DIR
/
"
vector_db"
CHROMA_DATA_PATH
=
f
"
{
DATA_DIR
}
/
vector_db"
EMBED_MODEL
=
"all-MiniLM-L6-v2"
EMBED_MODEL
=
"all-MiniLM-L6-v2"
CHROMA_CLIENT
=
chromadb
.
PersistentClient
(
CHROMA_CLIENT
=
chromadb
.
PersistentClient
(
path
=
str
(
CHROMA_DATA_PATH
),
settings
=
Settings
(
allow_reset
=
True
)
path
=
str
(
CHROMA_DATA_PATH
),
settings
=
Settings
(
allow_reset
=
True
)
...
...
backend/main.py
View file @
d2c5f3d5
...
@@ -14,7 +14,7 @@ from apps.openai.main import app as openai_app
...
@@ -14,7 +14,7 @@ from apps.openai.main import app as openai_app
from
apps.web.main
import
app
as
webui_app
from
apps.web.main
import
app
as
webui_app
from
apps.rag.main
import
app
as
rag_app
from
apps.rag.main
import
app
as
rag_app
from
config
import
ENV
,
WEB
_DIR
from
config
import
ENV
,
FRONTEND_BUILD
_DIR
class
SPAStaticFiles
(
StaticFiles
):
class
SPAStaticFiles
(
StaticFiles
):
...
@@ -58,4 +58,8 @@ app.mount("/openai/api", openai_app)
...
@@ -58,4 +58,8 @@ app.mount("/openai/api", openai_app)
app
.
mount
(
"/rag/api/v1"
,
rag_app
)
app
.
mount
(
"/rag/api/v1"
,
rag_app
)
app
.
mount
(
"/"
,
SPAStaticFiles
(
directory
=
str
(
WEB_DIR
),
html
=
True
),
name
=
"spa-static-files"
)
app
.
mount
(
"/"
,
SPAStaticFiles
(
directory
=
str
(
FRONTEND_BUILD_DIR
),
html
=
True
),
name
=
"spa-static-files"
,
)
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment