From 8980a56843b849e29bef0218447c8f5f2fcec06f Mon Sep 17 00:00:00 2001 From: ElliottKasoar <45317199+ElliottKasoar@users.noreply.github.com> Date: Tue, 11 Jun 2024 14:10:51 +0100 Subject: [PATCH] Tidy logs --- abcd/frontends/commandline/commands.py | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/abcd/frontends/commandline/commands.py b/abcd/frontends/commandline/commands.py index 03309907..36dc8415 100644 --- a/abcd/frontends/commandline/commands.py +++ b/abcd/frontends/commandline/commands.py @@ -12,9 +12,7 @@ @init_config def login(*, config, name, url, disable_ssl=False, **kwargs): logger.info( - "login args: \nconfig:{}, name:{}, url:{}, kwargs:{}".format( - config, name, url, kwargs - ) + "login args: \nconfig:%s, name:%s, url:%s, kwargs:%s", config, name, url, kwargs ) from abcd import ABCD @@ -37,7 +35,7 @@ def login(*, config, name, url, disable_ssl=False, **kwargs): @init_config @init_db def download(*, db, query, fileformat, filename, **kwargs): - logger.info("download\n kwargs: {}".format(kwargs)) + logger.info("download\n kwargs: %s", kwargs) from ase.io import write @@ -52,7 +50,7 @@ def download(*, db, query, fileformat, filename, **kwargs): @init_db @check_remote def delete(*, db, query, yes, **kwargs): - logger.info("delete\n kwargs: {}".format(kwargs)) + logger.info("delete\n kwargs: %s", kwargs) if not yes: print( @@ -80,10 +78,10 @@ def upload(*, db, path, extra_infos, ignore_calc_results, **kwargs): elif path.is_dir(): for file in path.glob(".xyz"): - logger.info("Uploaded file: {}".format(file)) + logger.info("Uploaded file: %s", file) db.upload(file, extra_infos, store_calc=calculator) else: - logger.info("No file found: {}".format(path)) + logger.info("No file found: %s", path) raise FileNotFoundError() else: @@ -93,8 +91,8 @@ def upload(*, db, path, extra_infos, ignore_calc_results, **kwargs): @init_config @init_db def summary(*, db, query, print_all, bins, truncate, props, **kwargs): - logger.info("summary\n kwargs: {}".format(kwargs)) - logger.info("query: {}".format(query)) + logger.info("summary\n kwargs: %s", kwargs) + logger.info("query: %s", query) if print_all: truncate = None @@ -158,8 +156,8 @@ def summary(*, db, query, print_all, bins, truncate, props, **kwargs): @init_config @init_db def show(*, db, query, print_all, props, **kwargs): - logger.info("show\n kwargs: {}".format(kwargs)) - logger.info("query: {}".format(query)) + logger.info("show\n kwargs: %s", kwargs) + logger.info("query: %s", query) if not props: print("Please define at least on property by using the -p option!") @@ -270,7 +268,7 @@ def server(*, abcd_url, url, api_only, **kwargs): from abcd.server.app import create_app logger.info( - "SERVER - abcd: {}, url: {}, api_only:{}".format(abcd_url, url, api_only) + "SERVER - abcd: %s, url: %s, api_only: %s", abcd_url, url, api_only ) if api_only: