summaryrefslogtreecommitdiffstats
path: root/g4f/api
diff options
context:
space:
mode:
authorH Lohaus <hlohaus@users.noreply.github.com>2023-12-23 20:51:30 +0100
committerGitHub <noreply@github.com>2023-12-23 20:51:30 +0100
commit6d09dbf4a961c098bdc9889c726479e403cb9059 (patch)
tree997027804ee8412e5ddbf1b015f795eaf72cb435 /g4f/api
parentMerge pull request #1382 from xtekky/aura (diff)
parentFix api and None provider (diff)
downloadgpt4free-6d09dbf4a961c098bdc9889c726479e403cb9059.tar
gpt4free-6d09dbf4a961c098bdc9889c726479e403cb9059.tar.gz
gpt4free-6d09dbf4a961c098bdc9889c726479e403cb9059.tar.bz2
gpt4free-6d09dbf4a961c098bdc9889c726479e403cb9059.tar.lz
gpt4free-6d09dbf4a961c098bdc9889c726479e403cb9059.tar.xz
gpt4free-6d09dbf4a961c098bdc9889c726479e403cb9059.tar.zst
gpt4free-6d09dbf4a961c098bdc9889c726479e403cb9059.zip
Diffstat (limited to 'g4f/api')
-rw-r--r--g4f/api/__init__.py32
1 files changed, 12 insertions, 20 deletions
diff --git a/g4f/api/__init__.py b/g4f/api/__init__.py
index a79da7b0..8369d70f 100644
--- a/g4f/api/__init__.py
+++ b/g4f/api/__init__.py
@@ -83,28 +83,17 @@ class Api:
model = item_data.get('model')
stream = True if item_data.get("stream") == "True" else False
messages = item_data.get('messages')
- conversation = item_data.get('conversation') if item_data.get('conversation') != None else None
- provider = item_data.get('provider').replace('g4f.Provider.', '')
+ provider = item_data.get('provider', '').replace('g4f.Provider.', '')
provider = provider if provider and provider != "Auto" else None
- if provider != None:
- provider = g4f.Provider.ProviderUtils.convert.get(provider)
try:
- if model == 'pi':
- response = g4f.ChatCompletion.create(
- model=model,
- stream=stream,
- messages=messages,
- conversation=conversation,
- provider = provider,
- ignored=self.list_ignored_providers)
- else:
- response = g4f.ChatCompletion.create(
- model=model,
- stream=stream,
- messages=messages,
- provider = provider,
- ignored=self.list_ignored_providers)
+ response = g4f.ChatCompletion.create(
+ model=model,
+ stream=stream,
+ messages=messages,
+ provider = provider,
+ ignored=self.list_ignored_providers
+ )
except Exception as e:
logging.exception(e)
return Response(content=json.dumps({"error": "An error occurred while generating the response."}, indent=4), media_type="application/json")
@@ -179,9 +168,12 @@ class Api:
content = json.dumps(end_completion_data, separators=(',', ':'))
yield f'data: {content}\n\n'
-
except GeneratorExit:
pass
+ except Exception as e:
+ logging.exception(e)
+ content=json.dumps({"error": "An error occurred while generating the response."}, indent=4)
+ yield f'data: {content}\n\n'
return StreamingResponse(streaming(), media_type="text/event-stream")