Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion logger_config.k8s.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ loggers:
- stderr

ccb:
level: WARNING
level: INFO
handlers:
- stderr
propagate: false
4 changes: 2 additions & 2 deletions logger_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ formatters:
handlers:
stderr:
class: logging.StreamHandler
level: WARNING
level: DEBUG
formatter: default
stream: ext://sys.stderr

Expand All @@ -50,7 +50,7 @@ loggers:
- file_json

ccb:
level: DEBUG
level: INFO
handlers:
- stderr
- file_json
Expand Down
4 changes: 2 additions & 2 deletions logger_config_em.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ formatters:
handlers:
stderr:
class: logging.StreamHandler
level: WARNING
level: DEBUG
formatter: default
stream: ext://sys.stderr

Expand All @@ -50,7 +50,7 @@ loggers:
- file_json

emserver:
level: DEBUG
level: INFO
handlers:
- stderr
- file_json
Expand Down
29 changes: 3 additions & 26 deletions main.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,38 +21,15 @@
LOGGER_CONFIG_NAME = 'logger_config.yaml'
LOGGER_K8S_CONFIG_NAME = 'logger_config.k8s.yaml'

def _setup_log_levels(debug: bool):
'''
Set log levels for the modules at once for a cleaner usage later.
'''
if not debug:
# warning is the default level
return

LOGGERS = (
'ccb',
'ccb.chain',
'ccb.doc_loader',
'ccb.injest',
'ccb.models',
'ccb.vectordb',
'ccb.controller',
'ccb.dyn_loader',
'ccb.ocs_utils',
'ccb.utils',
)

for name in LOGGERS:
logger = logging.getLogger(name)
logger.setLevel(logging.DEBUG)


if __name__ == '__main__':
k8s_env = is_k8s_env()
logging_config = get_logging_config(LOGGER_K8S_CONFIG_NAME if k8s_env else LOGGER_CONFIG_NAME)
setup_logging(logging_config)
app_config: TConfig = app.extra['CONFIG']
_setup_log_levels(app_config.debug)
if app_config.debug:
logger = logging.getLogger('ccb')
logger.setLevel(logging.DEBUG)

# do forks from a clean process that doesn't have any threads or locks
mp.set_start_method('forkserver')
Expand Down
2 changes: 1 addition & 1 deletion main_em.py
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ def _wait_main_app_enabled() -> None:
'model_files',
em_conf.llama['model'],
)
logger.debug(f'Trying model path: {em_conf.llama["model"]}')
logger.info(f'Trying model path: {em_conf.llama["model"]}')

# if the model file is still not found, raise an error
if not os.path.isfile(em_conf.llama['model']):
Expand Down
Loading