diff options
author | AndPim4912 <52836885+AndPim4912@users.noreply.github.com> | 2023-10-23 14:10:28 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-10-23 14:10:28 +0200 |
commit | 8d7ad98fcb314453c01f6dcd4bfe59016efd78ce (patch) | |
tree | 4d39804e1aa1724560e1688f0b6d4c124b9771c7 /g4f/Provider/helper.py | |
parent | Refactor API initialization to accept a list of ignored providers. (diff) | |
parent | Debug config in api (diff) | |
download | gpt4free-8d7ad98fcb314453c01f6dcd4bfe59016efd78ce.tar gpt4free-8d7ad98fcb314453c01f6dcd4bfe59016efd78ce.tar.gz gpt4free-8d7ad98fcb314453c01f6dcd4bfe59016efd78ce.tar.bz2 gpt4free-8d7ad98fcb314453c01f6dcd4bfe59016efd78ce.tar.lz gpt4free-8d7ad98fcb314453c01f6dcd4bfe59016efd78ce.tar.xz gpt4free-8d7ad98fcb314453c01f6dcd4bfe59016efd78ce.tar.zst gpt4free-8d7ad98fcb314453c01f6dcd4bfe59016efd78ce.zip |
Diffstat (limited to 'g4f/Provider/helper.py')
-rw-r--r-- | g4f/Provider/helper.py | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/g4f/Provider/helper.py b/g4f/Provider/helper.py index 1b00ace5..519a024a 100644 --- a/g4f/Provider/helper.py +++ b/g4f/Provider/helper.py @@ -77,9 +77,8 @@ def get_cookies(domain_name=''): def g4f(domain_name): user_data_dir = user_config_dir("g4f") cookie_file = path.join(user_data_dir, "Default", "Cookies") - if not path.exists(cookie_file): - return [] - return chrome(cookie_file, domain_name) + return [] if not path.exists(cookie_file) else chrome(cookie_file, domain_name) + cookies = {} for cookie_fn in [g4f, chrome, chromium, opera, opera_gx, brave, edge, vivaldi, firefox]: try: @@ -96,16 +95,15 @@ def get_cookies(domain_name=''): def format_prompt(messages: Messages, add_special_tokens=False) -> str: - if add_special_tokens or len(messages) > 1: - formatted = "\n".join( - [ - "%s: %s" % ((message["role"]).capitalize(), message["content"]) - for message in messages - ] - ) - return f"{formatted}\nAssistant:" - else: + if not add_special_tokens and len(messages) <= 1: return messages[0]["content"] + formatted = "\n".join( + [ + f'{message["role"].capitalize()}: {message["content"]}' + for message in messages + ] + ) + return f"{formatted}\nAssistant:" def get_browser(user_data_dir: str = None): |