vrr/koboldcpp
2
0
Fork 0
mirror of https://github.com/LostRuins/koboldcpp.git synced 2025-09-10 17:14:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix url params parse search

Browse source
This commit is contained in:
Concedo 2025-07-27 16:41:42 +08:00
parent fd0eecd62d
commit ecb2cbf547
1 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
koboldcpp.py
View file

@ -1969,6 +1969,7 @@ def websearch(query):
utfprint("Performing new websearch...",1) utfprint("Performing new websearch...",1)
def fetch_searched_webpage(url, random_agent=False): def fetch_searched_webpage(url, random_agent=False):
from urllib.parse import quote, urlsplit, urlunsplit
uagent = 'Mozilla/5.0 (compatible; Googlebot/2.1; +http://www.google.com/bot.html)' uagent = 'Mozilla/5.0 (compatible; Googlebot/2.1; +http://www.google.com/bot.html)'
if random_agent: if random_agent:
agents = ["Mozilla/5.0 (Macintosh; Intel Mac OS X 13_2) Gecko/20100101 Firefox/114.0", agents = ["Mozilla/5.0 (Macintosh; Intel Mac OS X 13_2) Gecko/20100101 Firefox/114.0",
@ -1979,17 +1980,23 @@ def websearch(query):
uagent = random.choice(agents) uagent = random.choice(agents)
if args.debugmode: if args.debugmode:
utfprint(f"WebSearch URL: {url}") utfprint(f"WebSearch URL: {url}")
# Encode non-ASCII parts of the URL
try: try:
split_url = urlsplit(url)
encoded_path = quote(split_url.path)
encoded_url = urlunsplit((split_url.scheme, split_url.netloc, encoded_path, split_url.query, split_url.fragment))
ssl_cert_dir = os.environ.get('SSL_CERT_DIR') ssl_cert_dir = os.environ.get('SSL_CERT_DIR')
if not ssl_cert_dir and not nocertify and os.name != 'nt': if not ssl_cert_dir and not nocertify and os.name != 'nt':
os.environ['SSL_CERT_DIR'] = '/etc/ssl/certs' os.environ['SSL_CERT_DIR'] = '/etc/ssl/certs'
req = urllib.request.Request(url, headers={'User-Agent': uagent})
req = urllib.request.Request(encoded_url, headers={'User-Agent': uagent})
with urllib.request.urlopen(req, timeout=15) as response: with urllib.request.urlopen(req, timeout=15) as response:
html_content = response.read().decode('utf-8', errors='ignore') html_content = response.read().decode('utf-8', errors='ignore')
return html_content return html_content
except urllib.error.HTTPError: #we got blocked? try 1 more time with a different user agent except urllib.error.HTTPError: #we got blocked? try 1 more time with a different user agent
try: try:
req = urllib.request.Request(url, headers={'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/109.0.0.0 Safari/537.36'}) req = urllib.request.Request(encoded_url, headers={'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/109.0.0.0 Safari/537.36'})
with urllib.request.urlopen(req, timeout=15) as response: with urllib.request.urlopen(req, timeout=15) as response:
html_content = response.read().decode('utf-8', errors='ignore') html_content = response.read().decode('utf-8', errors='ignore')
return html_content return html_content