wx44wx/pipecat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hopefully the right version of openai.py

Browse Source
This commit is contained in:
Ubuntu
2024-07-05 01:28:10 +00:00
parent 61a0799faa
commit 4942c42384
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/pipecat/services/openai.py
View File

@@ -9,7 +9,7 @@ import base64
import io import io
import json import json
from typing import AsyncGenerator, List, Literal from typing import Any, AsyncGenerator, List, Literal
from loguru import logger from loguru import logger
from PIL import Image from PIL import Image
@@ -53,7 +53,7 @@ except ModuleNotFoundError as e:
raise Exception(f"Missing module: {e}") raise Exception(f"Missing module: {e}")
class OpenAIUnhandledFunctionException(Exception): class OpenAIUnhandledFunctionException(BaseException):
pass pass
@@ -67,7 +67,7 @@ class BaseOpenAILLMService(LLMService):
calls from the LLM. calls from the LLM.
""" """
def __init__(self, *, model: str, api_key=None, base_url=None, **kwargs): def __init__(self, model: str, api_key=None, base_url=None, **kwargs):
super().__init__(**kwargs) super().__init__(**kwargs)
self._model: str = model self._model: str = model
self._client = self.create_client(api_key=api_key, base_url=base_url, **kwargs) self._client = self.create_client(api_key=api_key, base_url=base_url, **kwargs)
@@ -109,7 +109,10 @@ class BaseOpenAILLMService(LLMService):
del message["data"] del message["data"]
del message["mime_type"] del message["mime_type"]
chunks = await self.get_chat_completions(context, messages) try:
chunks = await self.get_chat_completions(context, messages)
except Exception as e:
logger.error(f"{self} exception: {e}")
return chunks return chunks
@@ -211,7 +214,7 @@ class BaseOpenAILLMService(LLMService):
elif isinstance(result, type(None)): elif isinstance(result, type(None)):
pass pass
else: else:
raise TypeError(f"Unknown return type from function callback: {type(result)}") raise BaseException(f"Unknown return type from function callback: {type(result)}")
async def process_frame(self, frame: Frame, direction: FrameDirection): async def process_frame(self, frame: Frame, direction: FrameDirection):
await super().process_frame(frame, direction) await super().process_frame(frame, direction)
@@ -228,16 +231,14 @@ class BaseOpenAILLMService(LLMService):
if context: if context:
await self.push_frame(LLMFullResponseStartFrame()) await self.push_frame(LLMFullResponseStartFrame())
await self.start_processing_metrics()
await self._process_context(context) await self._process_context(context)
await self.stop_processing_metrics()
await self.push_frame(LLMFullResponseEndFrame()) await self.push_frame(LLMFullResponseEndFrame())
class OpenAILLMService(BaseOpenAILLMService): class OpenAILLMService(BaseOpenAILLMService):
def __init__(self, *, model: str = "gpt-4o", **kwargs): def __init__(self, model="gpt-4o", **kwargs):
super().__init__(model=model, **kwargs) super().__init__(model, **kwargs)
class OpenAIImageGenService(ImageGenService): class OpenAIImageGenService(ImageGenService):
@@ -333,4 +334,4 @@ class OpenAITTSService(TTSService):
frame = AudioRawFrame(chunk, 24_000, 1) frame = AudioRawFrame(chunk, 24_000, 1)
yield frame yield frame
except BadRequestError as e: except BadRequestError as e:
logger.exception(f"{self} error generating TTS: {e}") logger.error(f"{self} error generating TTS: {e}")