services: allow internal http sessions if none is given
This commit is contained in:
@@ -171,12 +171,12 @@ class AzureImageGenServiceREST(ImageGenService):
|
|||||||
def __init__(
|
def __init__(
|
||||||
self,
|
self,
|
||||||
*,
|
*,
|
||||||
aiohttp_session: aiohttp.ClientSession,
|
|
||||||
image_size: str,
|
image_size: str,
|
||||||
api_key: str,
|
api_key: str,
|
||||||
endpoint: str,
|
endpoint: str,
|
||||||
model: str,
|
model: str,
|
||||||
api_version="2023-06-01-preview",
|
api_version="2023-06-01-preview",
|
||||||
|
aiohttp_session: aiohttp.ClientSession | None = None,
|
||||||
):
|
):
|
||||||
super().__init__()
|
super().__init__()
|
||||||
|
|
||||||
@@ -184,8 +184,14 @@ class AzureImageGenServiceREST(ImageGenService):
|
|||||||
self._azure_endpoint = endpoint
|
self._azure_endpoint = endpoint
|
||||||
self._api_version = api_version
|
self._api_version = api_version
|
||||||
self._model = model
|
self._model = model
|
||||||
self._aiohttp_session = aiohttp_session
|
|
||||||
self._image_size = image_size
|
self._image_size = image_size
|
||||||
|
self._aiohttp_session = aiohttp_session or aiohttp.ClientSession()
|
||||||
|
self._close_aiohttp_session = aiohttp_session is None
|
||||||
|
|
||||||
|
async def cleanup(self):
|
||||||
|
await super().cleanup()
|
||||||
|
if self._close_aiohttp_session:
|
||||||
|
await self._aiohttp_session.close()
|
||||||
|
|
||||||
async def run_image_gen(self, prompt: str) -> AsyncGenerator[Frame, None]:
|
async def run_image_gen(self, prompt: str) -> AsyncGenerator[Frame, None]:
|
||||||
url = f"{self._azure_endpoint}openai/images/generations:submit?api-version={self._api_version}"
|
url = f"{self._azure_endpoint}openai/images/generations:submit?api-version={self._api_version}"
|
||||||
|
|||||||
@@ -45,25 +45,31 @@ class DeepgramTTSService(TTSService):
|
|||||||
def __init__(
|
def __init__(
|
||||||
self,
|
self,
|
||||||
*,
|
*,
|
||||||
aiohttp_session: aiohttp.ClientSession,
|
|
||||||
api_key: str,
|
api_key: str,
|
||||||
voice: str = "aura-helios-en",
|
voice: str = "aura-helios-en",
|
||||||
base_url: str = "https://api.deepgram.com/v1/speak",
|
base_url: str = "https://api.deepgram.com/v1/speak",
|
||||||
sample_rate: int = 16000,
|
sample_rate: int = 16000,
|
||||||
encoding: str = "linear16",
|
encoding: str = "linear16",
|
||||||
|
aiohttp_session: aiohttp.ClientSession | None = None,
|
||||||
**kwargs):
|
**kwargs):
|
||||||
super().__init__(**kwargs)
|
super().__init__(**kwargs)
|
||||||
|
|
||||||
self._voice = voice
|
self._voice = voice
|
||||||
self._api_key = api_key
|
self._api_key = api_key
|
||||||
self._aiohttp_session = aiohttp_session
|
|
||||||
self._base_url = base_url
|
self._base_url = base_url
|
||||||
self._sample_rate = sample_rate
|
self._sample_rate = sample_rate
|
||||||
self._encoding = encoding
|
self._encoding = encoding
|
||||||
|
self._aiohttp_session = aiohttp_session or aiohttp.ClientSession()
|
||||||
|
self._close_aiohttp_session = aiohttp_session is None
|
||||||
|
|
||||||
def can_generate_metrics(self) -> bool:
|
def can_generate_metrics(self) -> bool:
|
||||||
return True
|
return True
|
||||||
|
|
||||||
|
async def cleanup(self):
|
||||||
|
await super().cleanup()
|
||||||
|
if self._close_aiohttp_session:
|
||||||
|
await self._aiohttp_session.close()
|
||||||
|
|
||||||
async def set_voice(self, voice: str):
|
async def set_voice(self, voice: str):
|
||||||
logger.debug(f"Switching TTS voice to: [{voice}]")
|
logger.debug(f"Switching TTS voice to: [{voice}]")
|
||||||
self._voice = voice
|
self._voice = voice
|
||||||
|
|||||||
@@ -19,21 +19,27 @@ class ElevenLabsTTSService(TTSService):
|
|||||||
def __init__(
|
def __init__(
|
||||||
self,
|
self,
|
||||||
*,
|
*,
|
||||||
aiohttp_session: aiohttp.ClientSession,
|
|
||||||
api_key: str,
|
api_key: str,
|
||||||
voice_id: str,
|
voice_id: str,
|
||||||
model: str = "eleven_turbo_v2",
|
model: str = "eleven_turbo_v2",
|
||||||
|
aiohttp_session: aiohttp.ClientSession | None = None,
|
||||||
**kwargs):
|
**kwargs):
|
||||||
super().__init__(**kwargs)
|
super().__init__(**kwargs)
|
||||||
|
|
||||||
self._api_key = api_key
|
self._api_key = api_key
|
||||||
self._voice_id = voice_id
|
self._voice_id = voice_id
|
||||||
self._aiohttp_session = aiohttp_session
|
|
||||||
self._model = model
|
self._model = model
|
||||||
|
self._aiohttp_session = aiohttp_session or aiohttp.ClientSession()
|
||||||
|
self._close_aiohttp_session = aiohttp_session is None
|
||||||
|
|
||||||
def can_generate_metrics(self) -> bool:
|
def can_generate_metrics(self) -> bool:
|
||||||
return True
|
return True
|
||||||
|
|
||||||
|
async def cleanup(self):
|
||||||
|
await super().cleanup()
|
||||||
|
if self._close_aiohttp_session:
|
||||||
|
await self._aiohttp_session.close()
|
||||||
|
|
||||||
async def set_voice(self, voice: str):
|
async def set_voice(self, voice: str):
|
||||||
logger.debug(f"Switching TTS voice to: [{voice}]")
|
logger.debug(f"Switching TTS voice to: [{voice}]")
|
||||||
self._voice_id = voice
|
self._voice_id = voice
|
||||||
|
|||||||
@@ -39,18 +39,24 @@ class FalImageGenService(ImageGenService):
|
|||||||
def __init__(
|
def __init__(
|
||||||
self,
|
self,
|
||||||
*,
|
*,
|
||||||
aiohttp_session: aiohttp.ClientSession,
|
|
||||||
params: InputParams,
|
params: InputParams,
|
||||||
model: str = "fal-ai/fast-sdxl",
|
model: str = "fal-ai/fast-sdxl",
|
||||||
key: str | None = None,
|
key: str | None = None,
|
||||||
|
aiohttp_session: aiohttp.ClientSession | None = None,
|
||||||
):
|
):
|
||||||
super().__init__()
|
super().__init__()
|
||||||
self._model = model
|
self._model = model
|
||||||
self._params = params
|
self._params = params
|
||||||
self._aiohttp_session = aiohttp_session
|
self._aiohttp_session = aiohttp_session or aiohttp.ClientSession()
|
||||||
|
self._close_aiohttp_session = aiohttp_session is None
|
||||||
if key:
|
if key:
|
||||||
os.environ["FAL_KEY"] = key
|
os.environ["FAL_KEY"] = key
|
||||||
|
|
||||||
|
async def cleanup(self):
|
||||||
|
await super().cleanup()
|
||||||
|
if self._close_aiohttp_session:
|
||||||
|
await self._aiohttp_session.close()
|
||||||
|
|
||||||
async def run_image_gen(self, prompt: str) -> AsyncGenerator[Frame, None]:
|
async def run_image_gen(self, prompt: str) -> AsyncGenerator[Frame, None]:
|
||||||
logger.debug(f"Generating image from prompt: {prompt}")
|
logger.debug(f"Generating image from prompt: {prompt}")
|
||||||
|
|
||||||
|
|||||||
@@ -253,16 +253,22 @@ class OpenAIImageGenService(ImageGenService):
|
|||||||
def __init__(
|
def __init__(
|
||||||
self,
|
self,
|
||||||
*,
|
*,
|
||||||
image_size: Literal["256x256", "512x512", "1024x1024", "1792x1024", "1024x1792"],
|
|
||||||
aiohttp_session: aiohttp.ClientSession,
|
|
||||||
api_key: str,
|
api_key: str,
|
||||||
model: str = "dall-e-3",
|
model: str = "dall-e-3",
|
||||||
|
image_size: Literal["256x256", "512x512", "1024x1024", "1792x1024", "1024x1792"],
|
||||||
|
aiohttp_session: aiohttp.ClientSession | None = None,
|
||||||
):
|
):
|
||||||
super().__init__()
|
super().__init__()
|
||||||
self._model = model
|
self._model = model
|
||||||
self._image_size = image_size
|
self._image_size = image_size
|
||||||
self._client = AsyncOpenAI(api_key=api_key)
|
self._client = AsyncOpenAI(api_key=api_key)
|
||||||
self._aiohttp_session = aiohttp_session
|
self._aiohttp_session = aiohttp_session or aiohttp.ClientSession()
|
||||||
|
self._close_aiohttp_session = aiohttp_session is None
|
||||||
|
|
||||||
|
async def cleanup(self):
|
||||||
|
await super().cleanup()
|
||||||
|
if self._close_aiohttp_session:
|
||||||
|
await self._aiohttp_session.close()
|
||||||
|
|
||||||
async def run_image_gen(self, prompt: str) -> AsyncGenerator[Frame, None]:
|
async def run_image_gen(self, prompt: str) -> AsyncGenerator[Frame, None]:
|
||||||
logger.debug(f"Generating image from prompt: {prompt}")
|
logger.debug(f"Generating image from prompt: {prompt}")
|
||||||
|
|||||||
@@ -38,22 +38,28 @@ class XTTSService(TTSService):
|
|||||||
def __init__(
|
def __init__(
|
||||||
self,
|
self,
|
||||||
*,
|
*,
|
||||||
aiohttp_session: aiohttp.ClientSession,
|
|
||||||
voice_id: str,
|
voice_id: str,
|
||||||
language: str,
|
language: str,
|
||||||
base_url: str,
|
base_url: str,
|
||||||
|
aiohttp_session: aiohttp.ClientSession | None = None,
|
||||||
**kwargs):
|
**kwargs):
|
||||||
super().__init__(**kwargs)
|
super().__init__(**kwargs)
|
||||||
|
|
||||||
self._voice_id = voice_id
|
self._voice_id = voice_id
|
||||||
self._language = language
|
self._language = language
|
||||||
self._base_url = base_url
|
self._base_url = base_url
|
||||||
self._aiohttp_session = aiohttp_session
|
|
||||||
self._studio_speakers = requests.get(self._base_url + "/studio_speakers").json()
|
self._studio_speakers = requests.get(self._base_url + "/studio_speakers").json()
|
||||||
|
self._aiohttp_session = aiohttp_session or aiohttp.ClientSession()
|
||||||
|
self._close_aiohttp_session = aiohttp_session is None
|
||||||
|
|
||||||
def can_generate_metrics(self) -> bool:
|
def can_generate_metrics(self) -> bool:
|
||||||
return True
|
return True
|
||||||
|
|
||||||
|
async def cleanup(self):
|
||||||
|
await super().cleanup()
|
||||||
|
if self._close_aiohttp_session:
|
||||||
|
await self._aiohttp_session.close()
|
||||||
|
|
||||||
async def set_voice(self, voice: str):
|
async def set_voice(self, voice: str):
|
||||||
logger.debug(f"Switching TTS voice to: [{voice}]")
|
logger.debug(f"Switching TTS voice to: [{voice}]")
|
||||||
self._voice_id = voice
|
self._voice_id = voice
|
||||||
|
|||||||
Reference in New Issue
Block a user