From 0ca946836c05bd59ec967fd23a6acd21b6d7ada1 Mon Sep 17 00:00:00 2001 From: superobk Date: Thu, 16 May 2024 16:02:13 +0800 Subject: [PATCH] wip: temp --- main.py | 5 +++-- src/blackbox/blackbox_factory.py | 14 ++++++-------- src/blackbox/g2e.py | 7 ++++--- src/log/handler.py | 6 +++--- 4 files changed, 16 insertions(+), 16 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 af29e45..a4b0b52 100644 --- a/src/blackbox/blackbox_factory.py +++ b/src/blackbox/blackbox_factory.py @@ -34,10 +34,9 @@ class BlackboxFactory: audio_chat: AudioChat, g2e: G2E, text_and_image: TextAndImage, - chroma_query: ChromaQuery, - chroma_upsert: ChromaUpsert, - chroma_chat: ChromaChat, - melotts: MeloTTS, + #chroma_query: ChromaQuery, + #chroma_upsert: ChromaUpsert, + #chroma_chat: ChromaChat, 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 8bd5507..4a6640a 100755 --- a/src/blackbox/g2e.py +++ b/src/blackbox/g2e.py @@ -22,8 +22,8 @@ class G2E(Blackbox): def processing(self, model_name, prompt, template, context: list) -> str: if context == None: context = [] - url = 'http://120.196.116.194:48890/v1' - #url = 'http://120.196.116.194:48892/v1' + #url = 'http://120.196.116.194:48890/v1' + url = 'http://120.196.116.194:48892/v1' background_prompt = '''KOMBUKIKI是一款茶饮料，目标受众 年龄：20-35岁 性别：女性 地点：一线城市、二线城市 职业：精英中产、都市白领 收入水平：中高收入，有一定消费能力 兴趣和爱好：注重健康，有运动习惯 @@ -65,7 +65,8 @@ 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[0].id + model_name = client.models.list().data[1].id print(model_name) response = client.chat.completions.create( model=model_name, 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