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
f87805b4
Unverified
Commit
f87805b4
authored
Apr 04, 2024
by
Timothy Jaeryang Baek
Committed by
GitHub
Apr 04, 2024
Browse files
Merge pull request #1424 from open-webui/dev
fix
parents
46774aa5
7a7d1931
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
18 deletions
+4
-18
backend/apps/rag/main.py
backend/apps/rag/main.py
+3
-17
kubernetes/helm/templates/_helpers.tpl
kubernetes/helm/templates/_helpers.tpl
+1
-1
No files found.
backend/apps/rag/main.py
View file @
f87805b4
...
@@ -448,25 +448,11 @@ def store_doc(
...
@@ -448,25 +448,11 @@ def store_doc(
log
.
info
(
f
"file.content_type:
{
file
.
content_type
}
"
)
log
.
info
(
f
"file.content_type:
{
file
.
content_type
}
"
)
try
:
try
:
is_valid_filename
=
True
unsanitized_filename
=
file
.
filename
unsanitized_filename
=
file
.
filename
if
re
.
search
(
r
'[\\/:"\*\?<>|\n\t ]'
,
unsanitized_filename
)
is
not
None
:
filename
=
os
.
path
.
basename
(
unsanitized_filename
)
is_valid_filename
=
False
unvalidated_file_path
=
f
"
{
UPLOAD_DIR
}
/
{
unsanitized_filename
}
"
file_path
=
f
"
{
UPLOAD_DIR
}
/
{
filename
}
"
dereferenced_file_path
=
str
(
Path
(
unvalidated_file_path
).
resolve
(
strict
=
False
))
if
not
dereferenced_file_path
.
startswith
(
UPLOAD_DIR
):
is_valid_filename
=
False
if
is_valid_filename
:
file_path
=
dereferenced_file_path
else
:
raise
HTTPException
(
status_code
=
status
.
HTTP_400_BAD_REQUEST
,
detail
=
ERROR_MESSAGES
.
DEFAULT
(),
)
filename
=
file
.
filename
contents
=
file
.
file
.
read
()
contents
=
file
.
file
.
read
()
with
open
(
file_path
,
"wb"
)
as
f
:
with
open
(
file_path
,
"wb"
)
as
f
:
f
.
write
(
contents
)
f
.
write
(
contents
)
...
@@ -477,7 +463,7 @@ def store_doc(
...
@@ -477,7 +463,7 @@ def store_doc(
collection_name
=
calculate_sha256
(
f
)[:
63
]
collection_name
=
calculate_sha256
(
f
)[:
63
]
f
.
close
()
f
.
close
()
loader
,
known_type
=
get_loader
(
file
.
filename
,
file
.
content_type
,
file_path
)
loader
,
known_type
=
get_loader
(
filename
,
file
.
content_type
,
file_path
)
data
=
loader
.
load
()
data
=
loader
.
load
()
try
:
try
:
...
...
kubernetes/helm/templates/_helpers.tpl
View file @
f87805b4
...
@@ -7,7 +7,7 @@ ollama
...
@@ -7,7 +7,7 @@ ollama
{{- end -}}
{{- end -}}
{{- define "ollama.url" -}}
{{- define "ollama.url" -}}
{{- printf "http://%s.%s.svc.cluster.local:%d/
api
" (include "ollama.name" .) (.Release.Namespace) (.Values.ollama.service.port | int) }}
{{- printf "http://%s.%s.svc.cluster.local:%d/" (include "ollama.name" .) (.Release.Namespace) (.Values.ollama.service.port | int) }}
{{- end }}
{{- end }}
{{- define "chart.name" -}}
{{- define "chart.name" -}}
...
...
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