From 5a6d59e1711aa394a09a1c5a6ba9e337b11626e0 Mon Sep 17 00:00:00 2001 From: razrab Date: Mon, 13 Nov 2023 09:17:13 +0300 Subject: Refactor item_data update to handle byte keys and convert messages to dict. --- g4f/api/__init__.py | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'g4f') diff --git a/g4f/api/__init__.py b/g4f/api/__init__.py index ad3b0db4..de05c377 100644 --- a/g4f/api/__init__.py +++ b/g4f/api/__init__.py @@ -1,3 +1,6 @@ +import ast +import logging + from fastapi import FastAPI, Response, Request from fastapi.responses import StreamingResponse from typing import List, Union, Any, Dict, AnyStr @@ -68,14 +71,20 @@ class Api: 'stream': False, } - item_data.update(item or {}) + # item contains byte keys, and dict.get suppresses error + item_data.update({key.decode('utf-8') if isinstance(key, bytes) else key: str(value) for key, value in (item or {}).items()}) + # messages is str, need dict + if isinstance(item_data.get('messages'), str): + item_data['messages'] = ast.literal_eval(item_data.get('messages')) + model = item_data.get('model') stream = item_data.get('stream') messages = item_data.get('messages') try: response = g4f.ChatCompletion.create(model=model, stream=stream, messages=messages) - except: + 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") completion_id = ''.join(random.choices(string.ascii_letters + string.digits, k=28)) -- cgit v1.2.3