Skip to content

Commit

Permalink
Tidy logs
Browse files Browse the repository at this point in the history
  • Loading branch information
ElliottKasoar committed Jun 11, 2024
1 parent 3a882b5 commit 8980a56
Showing 1 changed file with 10 additions and 12 deletions.
22 changes: 10 additions & 12 deletions abcd/frontends/commandline/commands.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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

Expand All @@ -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(
Expand Down Expand Up @@ -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:
Expand All @@ -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
Expand Down Expand Up @@ -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!")
Expand Down Expand Up @@ -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:
Expand Down

0 comments on commit 8980a56

Please sign in to comment.