From 0cd8380d28575bde7dec9db6cef0396f65f1399d Mon Sep 17 00:00:00 2001 From: Dan Chen Date: Tue, 30 Apr 2024 16:21:17 +0800 Subject: [PATCH] tmp --- router.py | 8 ++------ src/blackbox/asr.py | 8 ++++++-- src/configuration.py | 7 +++++++ src/log/log.py | 15 +++++++++++++++ 4 files changed, 30 insertions(+), 8 deletions(-) create mode 100644 src/log/log.py diff --git a/router.py b/router.py index fc8c3fd..18a729d 100644 --- a/router.py +++ b/router.py @@ -1,13 +1,9 @@ -from typing import Annotated, Union +from typing import Union -from fastapi import FastAPI, Request, status, Form +from fastapi import FastAPI, Request, status from fastapi.responses import JSONResponse -from src.dotchain.runtime.interpreter import program_parser -from src.dotchain.runtime.tokenizer import Tokenizer -from src.dotchain.runtime.runtime import Runtime from src.blackbox.blackbox_factory import BlackboxFactory -import uvicorn from fastapi.middleware.cors import CORSMiddleware from injector import Injector diff --git a/src/blackbox/asr.py b/src/blackbox/asr.py index 4f92659..9fc55dc 100644 --- a/src/blackbox/asr.py +++ b/src/blackbox/asr.py @@ -4,15 +4,19 @@ from typing import Any, Coroutine from fastapi import Request, Response, status from fastapi.responses import JSONResponse +from ..log.log import Logger + from ..asr.rapid_paraformer.utils import read_yaml from ..asr.rapid_paraformer import RapidParaformer from .blackbox import Blackbox -from injector import singleton +from injector import singleton, inject @singleton class ASR(Blackbox): - def __init__(self, path = ".env.yaml") -> None: + @inject + def __init__(self,logger: Logger,path = ".env.yaml") -> None: + logger.info("ASR init") config = read_yaml(path) self.paraformer = RapidParaformer(config) diff --git a/src/configuration.py b/src/configuration.py index 8c3e6fb..f14439f 100644 --- a/src/configuration.py +++ b/src/configuration.py @@ -45,3 +45,10 @@ class TesouConf(): @inject def __init__(self,config: Configuration) -> None: self.url = config.get("tesou.url") + +class LogConf(): + level: str + + @inject + def __init__(self,config: Configuration) -> None: + self.level = config.get("log.level") \ No newline at end of file diff --git a/src/log/log.py b/src/log/log.py new file mode 100644 index 0000000..2c7c0b1 --- /dev/null +++ b/src/log/log.py @@ -0,0 +1,15 @@ +import logging +from injector import singleton, inject + +from ..configuration import LogConf + +@singleton +class Logger(logging.Logger): + + @inject + def __init__(self, config: LogConf) -> None: + super().__init__(__name__) + self.setLevel(config.level) + self.addHandler(logging.StreamHandler()) + self.addHandler(logging.FileHandler('log.log')) +