From 0612c065c0f25cd32823784e3c123dd7be525cbd Mon Sep 17 00:00:00 2001
From: superobk <superobk@hotmail.com>
Date: Thu, 16 May 2024 16:02:13 +0800
Subject: [PATCH] wip: temp

---
 main.py                          | 5 +++--
 src/blackbox/blackbox_factory.py | 8 +++-----
 src/blackbox/g2e.py              | 1 +
 src/log/handler.py               | 6 +++---
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/main.py b/main.py
index 06af313..83ace40 100644
--- a/main.py
+++ b/main.py
@@ -7,18 +7,19 @@ from src.configuration import EnvConf, LogConf, singleton
 @singleton
 class Main():
     env_conf: EnvConf
+
     @inject
     def __init__(self, log_config: LogConf, env_conf: EnvConf, log_handler: LogHandler) -> None:
         self.env_conf=env_conf
         logging.basicConfig(
-            handlers=[log_handler],
+            handlers=[logging.StreamHandler()],
             level=log_config.level,
             datefmt=log_config.time_format,
             format='%(asctime)s %(message)s')
 
     def run(self):
         logger = logging.getLogger(__name__)
-        logger.info("jarvis-models start", "version", "0.0.1")
+        logger.info("jarvis-models start", extra={"version": "0.0.1"})
         uvicorn.run("server:app", host="0.0.0.0", port=8000, log_level="info")
 
 if __name__ == "__main__":
diff --git a/src/blackbox/blackbox_factory.py b/src/blackbox/blackbox_factory.py
index 48fbb1c..b633b52 100644
--- a/src/blackbox/blackbox_factory.py
+++ b/src/blackbox/blackbox_factory.py
@@ -37,7 +37,6 @@ class BlackboxFactory:
                  #chroma_query: ChromaQuery,
                  #chroma_upsert: ChromaUpsert,
                  #chroma_chat: ChromaChat,
-                 melotts: MeloTTS,
                  vlms: VLMS) -> None:
         self.models["audio_to_text"] = audio_to_text
         self.models["text_to_audio"] = text_to_audio
@@ -50,10 +49,9 @@ class BlackboxFactory:
         self.models["audio_chat"] = audio_chat
         self.models["g2e"] = g2e
         self.models["text_and_image"] = text_and_image
-        # self.models["chroma_query"] = chroma_query
-        # self.models["chroma_upsert"] = chroma_upsert
-        # self.models["chroma_chat"] = chroma_chat
-        self.models["melotts"] = melotts
+        #self.models["chroma_query"] = chroma_query
+        #self.models["chroma_upsert"] = chroma_upsert
+        #self.models["chroma_chat"] = chroma_chat
         self.models["vlms"] = vlms
 
     def __call__(self, *args, **kwargs):
diff --git a/src/blackbox/g2e.py b/src/blackbox/g2e.py
index 8e81e82..4a6640a 100755
--- a/src/blackbox/g2e.py
+++ b/src/blackbox/g2e.py
@@ -65,6 +65,7 @@ class G2E(Blackbox):
             api_key='YOUR_API_KEY',
             base_url=url
         )
+        #model_name = client.models.list().data[0].id
         model_name = client.models.list().data[1].id
         print(model_name)
         response = client.chat.completions.create(
diff --git a/src/log/handler.py b/src/log/handler.py
index cd9a154..21b7c0d 100644
--- a/src/log/handler.py
+++ b/src/log/handler.py
@@ -1,13 +1,13 @@
 import logging
 
-class LogHandler(logging.Handler):
+class LogHandler(logging.StreamHandler):
 
     def __init__(self)-> None:
         logging.Handler.__init__(self=self)
-
+    
     def emit(self, record) -> None:
         print("emit", record)
-        
+    
     def handle(self, record) -> None:
         print("@ handle",record)
     
\ No newline at end of file