From 68c453b2196f524aaf147fb2a6eb00bf691a23d1 Mon Sep 17 00:00:00 2001
From: superobk <superobk@hotmail.com>
Date: Fri, 24 May 2024 10:50:45 +0800
Subject: [PATCH] rebase

---
 src/blackbox/blackbox_factory.py | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/blackbox/blackbox_factory.py b/src/blackbox/blackbox_factory.py
index 8df0d38..7dd8754 100644
--- a/src/blackbox/blackbox_factory.py
+++ b/src/blackbox/blackbox_factory.py
@@ -1,11 +1,11 @@
+from blackbox.emotion import Emotion
+from .chat import Chat
 from .audio_chat import AudioChat
 from .sentiment import Sentiment
 from .tts import TTS
 from .asr import ASR
 from .audio_to_text import AudioToText
 from .blackbox import Blackbox
-# from .text_to_audio import TextToAudio
-# from .tesou import Tesou
 from .fastchat import Fastchat
 from .g2e import G2E
 from .text_and_image import TextAndImage
@@ -26,24 +26,22 @@ class BlackboxFactory:
                  asr: ASR,
                  tts: TTS, 
                  sentiment_engine: Sentiment, 
-                 #emotion: Emotion,
+                 emotion: Emotion,
                  fastchat: Fastchat,
                  audio_chat: AudioChat,
                  g2e: G2E,
                  text_and_image: TextAndImage,
-                 #chroma_query: ChromaQuery,
-                 #chroma_upsert: ChromaUpsert,
-                 #chroma_chat: ChromaChat,
                  melotts: MeloTTS,
                  vlms: VLMS,
                  chroma_query: ChromaQuery,
                  chroma_upsert: ChromaUpsert,
-                 chroma_chat: ChromaChat) -> None:
+                 chroma_chat: ChromaChat,
+                 chat: Chat) -> None:
         self.models["audio_to_text"] = audio_to_text
         self.models["asr"] = asr
         self.models["tts"] = tts
         self.models["sentiment_engine"] = sentiment_engine
-        #self.models["emotion"] = emotion
+        self.models["emotion"] = emotion
         self.models["fastchat"] = fastchat
         self.models["audio_chat"] = audio_chat
         self.models["g2e"] = g2e
@@ -51,6 +49,9 @@ class BlackboxFactory:
         self.models["chroma_query"] = chroma_query
         self.models["chroma_upsert"] = chroma_upsert
         self.models["chroma_chat"] = chroma_chat
+        self.models["melotts"] = melotts
+        self.models["vlms"] = vlms
+        self.models["chat"] = chat
 
     def __call__(self, *args, **kwargs):
         return self.processing(*args, **kwargs)