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
fb806912
Commit
fb806912
authored
May 11, 2024
by
Jun Siang Cheah
Browse files
feat: add WEB_SEARCH_RESULT_COUNT to control max number of results
parent
635951b5
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
12 additions
and
11 deletions
+12
-11
backend/apps/rag/search/brave.py
backend/apps/rag/search/brave.py
+3
-3
backend/apps/rag/search/google_pse.py
backend/apps/rag/search/google_pse.py
+2
-2
backend/apps/rag/search/searxng.py
backend/apps/rag/search/searxng.py
+2
-2
backend/apps/rag/search/serper.py
backend/apps/rag/search/serper.py
+2
-2
backend/apps/rag/search/serpstack.py
backend/apps/rag/search/serpstack.py
+2
-2
backend/config.py
backend/config.py
+1
-0
No files found.
backend/apps/rag/search/brave.py
View file @
fb806912
...
@@ -3,7 +3,7 @@ import logging
...
@@ -3,7 +3,7 @@ import logging
import
requests
import
requests
from
apps.rag.search.main
import
SearchResult
from
apps.rag.search.main
import
SearchResult
from
config
import
SRC_LOG_LEVELS
from
config
import
SRC_LOG_LEVELS
,
WEB_SEARCH_RESULT_COUNT
log
=
logging
.
getLogger
(
__name__
)
log
=
logging
.
getLogger
(
__name__
)
log
.
setLevel
(
SRC_LOG_LEVELS
[
"RAG"
])
log
.
setLevel
(
SRC_LOG_LEVELS
[
"RAG"
])
...
@@ -22,7 +22,7 @@ def search_brave(api_key: str, query: str) -> list[SearchResult]:
...
@@ -22,7 +22,7 @@ def search_brave(api_key: str, query: str) -> list[SearchResult]:
"Accept-Encoding"
:
"gzip"
,
"Accept-Encoding"
:
"gzip"
,
"X-Subscription-Token"
:
api_key
,
"X-Subscription-Token"
:
api_key
,
}
}
params
=
{
"q"
:
query
,
"count"
:
5
}
params
=
{
"q"
:
query
,
"count"
:
WEB_SEARCH_RESULT_COUNT
}
response
=
requests
.
get
(
url
,
headers
=
headers
,
params
=
params
)
response
=
requests
.
get
(
url
,
headers
=
headers
,
params
=
params
)
response
.
raise_for_status
()
response
.
raise_for_status
()
...
@@ -33,5 +33,5 @@ def search_brave(api_key: str, query: str) -> list[SearchResult]:
...
@@ -33,5 +33,5 @@ def search_brave(api_key: str, query: str) -> list[SearchResult]:
SearchResult
(
SearchResult
(
link
=
result
[
"url"
],
title
=
result
.
get
(
"title"
),
snippet
=
result
.
get
(
"snippet"
)
link
=
result
[
"url"
],
title
=
result
.
get
(
"title"
),
snippet
=
result
.
get
(
"snippet"
)
)
)
for
result
in
results
[:
5
]
for
result
in
results
[:
WEB_SEARCH_RESULT_COUNT
]
]
]
backend/apps/rag/search/google_pse.py
View file @
fb806912
...
@@ -4,7 +4,7 @@ import logging
...
@@ -4,7 +4,7 @@ import logging
import
requests
import
requests
from
apps.rag.search.main
import
SearchResult
from
apps.rag.search.main
import
SearchResult
from
config
import
SRC_LOG_LEVELS
from
config
import
SRC_LOG_LEVELS
,
WEB_SEARCH_RESULT_COUNT
log
=
logging
.
getLogger
(
__name__
)
log
=
logging
.
getLogger
(
__name__
)
log
.
setLevel
(
SRC_LOG_LEVELS
[
"RAG"
])
log
.
setLevel
(
SRC_LOG_LEVELS
[
"RAG"
])
...
@@ -27,7 +27,7 @@ def search_google_pse(
...
@@ -27,7 +27,7 @@ def search_google_pse(
"cx"
:
search_engine_id
,
"cx"
:
search_engine_id
,
"q"
:
query
,
"q"
:
query
,
"key"
:
api_key
,
"key"
:
api_key
,
"num"
:
5
,
"num"
:
WEB_SEARCH_RESULT_COUNT
,
}
}
response
=
requests
.
request
(
"GET"
,
url
,
headers
=
headers
,
params
=
params
)
response
=
requests
.
request
(
"GET"
,
url
,
headers
=
headers
,
params
=
params
)
...
...
backend/apps/rag/search/searxng.py
View file @
fb806912
...
@@ -3,7 +3,7 @@ import logging
...
@@ -3,7 +3,7 @@ import logging
import
requests
import
requests
from
apps.rag.search.main
import
SearchResult
from
apps.rag.search.main
import
SearchResult
from
config
import
SRC_LOG_LEVELS
from
config
import
SRC_LOG_LEVELS
,
WEB_SEARCH_RESULT_COUNT
log
=
logging
.
getLogger
(
__name__
)
log
=
logging
.
getLogger
(
__name__
)
log
.
setLevel
(
SRC_LOG_LEVELS
[
"RAG"
])
log
.
setLevel
(
SRC_LOG_LEVELS
[
"RAG"
])
...
@@ -40,5 +40,5 @@ def search_searxng(query_url: str, query: str) -> list[SearchResult]:
...
@@ -40,5 +40,5 @@ def search_searxng(query_url: str, query: str) -> list[SearchResult]:
SearchResult
(
SearchResult
(
link
=
result
[
"url"
],
title
=
result
.
get
(
"title"
),
snippet
=
result
.
get
(
"content"
)
link
=
result
[
"url"
],
title
=
result
.
get
(
"title"
),
snippet
=
result
.
get
(
"content"
)
)
)
for
result
in
sorted_results
[:
5
]
for
result
in
sorted_results
[:
WEB_SEARCH_RESULT_COUNT
]
]
]
backend/apps/rag/search/serper.py
View file @
fb806912
...
@@ -4,7 +4,7 @@ import logging
...
@@ -4,7 +4,7 @@ import logging
import
requests
import
requests
from
apps.rag.search.main
import
SearchResult
from
apps.rag.search.main
import
SearchResult
from
config
import
SRC_LOG_LEVELS
from
config
import
SRC_LOG_LEVELS
,
WEB_SEARCH_RESULT_COUNT
log
=
logging
.
getLogger
(
__name__
)
log
=
logging
.
getLogger
(
__name__
)
log
.
setLevel
(
SRC_LOG_LEVELS
[
"RAG"
])
log
.
setLevel
(
SRC_LOG_LEVELS
[
"RAG"
])
...
@@ -35,5 +35,5 @@ def search_serper(api_key: str, query: str) -> list[SearchResult]:
...
@@ -35,5 +35,5 @@ def search_serper(api_key: str, query: str) -> list[SearchResult]:
title
=
result
.
get
(
"title"
),
title
=
result
.
get
(
"title"
),
snippet
=
result
.
get
(
"description"
),
snippet
=
result
.
get
(
"description"
),
)
)
for
result
in
results
[:
5
]
for
result
in
results
[:
WEB_SEARCH_RESULT_COUNT
]
]
]
backend/apps/rag/search/serpstack.py
View file @
fb806912
...
@@ -4,7 +4,7 @@ import logging
...
@@ -4,7 +4,7 @@ import logging
import
requests
import
requests
from
apps.rag.search.main
import
SearchResult
from
apps.rag.search.main
import
SearchResult
from
config
import
SRC_LOG_LEVELS
from
config
import
SRC_LOG_LEVELS
,
WEB_SEARCH_RESULT_COUNT
log
=
logging
.
getLogger
(
__name__
)
log
=
logging
.
getLogger
(
__name__
)
log
.
setLevel
(
SRC_LOG_LEVELS
[
"RAG"
])
log
.
setLevel
(
SRC_LOG_LEVELS
[
"RAG"
])
...
@@ -39,5 +39,5 @@ def search_serpstack(
...
@@ -39,5 +39,5 @@ def search_serpstack(
SearchResult
(
SearchResult
(
link
=
result
[
"url"
],
title
=
result
.
get
(
"title"
),
snippet
=
result
.
get
(
"snippet"
)
link
=
result
[
"url"
],
title
=
result
.
get
(
"title"
),
snippet
=
result
.
get
(
"snippet"
)
)
)
for
result
in
results
[:
5
]
for
result
in
results
[:
WEB_SEARCH_RESULT_COUNT
]
]
]
backend/config.py
View file @
fb806912
...
@@ -549,6 +549,7 @@ BRAVE_SEARCH_API_KEY = os.getenv("BRAVE_SEARCH_API_KEY", "")
...
@@ -549,6 +549,7 @@ BRAVE_SEARCH_API_KEY = os.getenv("BRAVE_SEARCH_API_KEY", "")
SERPSTACK_API_KEY
=
os
.
getenv
(
"SERPSTACK_API_KEY"
,
""
)
SERPSTACK_API_KEY
=
os
.
getenv
(
"SERPSTACK_API_KEY"
,
""
)
SERPSTACK_HTTPS
=
os
.
getenv
(
"SERPSTACK_HTTPS"
,
"True"
).
lower
()
==
"true"
SERPSTACK_HTTPS
=
os
.
getenv
(
"SERPSTACK_HTTPS"
,
"True"
).
lower
()
==
"true"
SERPER_API_KEY
=
os
.
getenv
(
"SERPER_API_KEY"
,
""
)
SERPER_API_KEY
=
os
.
getenv
(
"SERPER_API_KEY"
,
""
)
WEB_SEARCH_RESULT_COUNT
=
int
(
os
.
getenv
(
"WEB_SEARCH_RESULT_COUNT"
,
"10"
))
####################################
####################################
# Transcribe
# Transcribe
...
...
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