X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=main.py;h=6383ed17775f185ad3973358a9bbcbc3a83b3a0c;hb=e6015816224f8f405e9b1c9557f22e73b21246e8;hp=dcbc2a34c197e6540d8420cfb219d8152bdfa8c6;hpb=1f117ac79e10c3c9728d3b267d134dec2a165603;p=perso%2FImmae%2FProjets%2FCryptomonnaies%2FCryptoportfolio%2FTrader.git diff --git a/main.py b/main.py index dcbc2a3..6383ed1 100644 --- a/main.py +++ b/main.py @@ -1,6 +1,5 @@ from datetime import datetime -import argparse -import configparser +import configargparse import psycopg2 import os import sys @@ -61,47 +60,57 @@ def make_order(market, value, currency, action="acquire", market.report.log_stage("make_order_end") def get_user_market(config_path, user_id, debug=False): - pg_config, report_path = parse_config(config_path) - market_config = list(fetch_markets(pg_config, str(user_id)))[0][0] - return market.Market.from_config(market_config, debug=debug) + args = ["--config", config_path] + if debug: + args.append("--debug") + args = parse_args(args) + pg_config = parse_config(args) + market_id, market_config, user_id = list(fetch_markets(pg_config, str(user_id)))[0] + return market.Market.from_config(market_config, args, + pg_config=pg_config, market_id=market_id, + user_id=user_id) def fetch_markets(pg_config, user): connection = psycopg2.connect(**pg_config) cursor = connection.cursor() if user is None: - cursor.execute("SELECT config,user_id FROM market_configs") + cursor.execute("SELECT id,config,user_id FROM market_configs") else: - cursor.execute("SELECT config,user_id FROM market_configs WHERE user_id = %s", user) + cursor.execute("SELECT id,config,user_id FROM market_configs WHERE user_id = %s", user) for row in cursor: yield row -def parse_config(config_file): - config = configparser.ConfigParser() - config.read(config_file) +def parse_config(args): + pg_config = { + "host": args.db_host, + "port": args.db_port, + "user": args.db_user, + "password": args.db_password, + "database": args.db_database, + } + del(args.db_host) + del(args.db_port) + del(args.db_user) + del(args.db_password) + del(args.db_database) - if "postgresql" not in config: - print("no configuration for postgresql in config file") - sys.exit(1) + report_path = args.report_path - if "app" in config and "report_path" in config["app"]: - report_path = config["app"]["report_path"] + if report_path is not None and not \ + os.path.exists(report_path): + os.makedirs(report_path) - if not os.path.exists(report_path): - os.makedirs(report_path) - else: - report_path = None - - return [config["postgresql"], report_path] + return pg_config def parse_args(argv): - parser = argparse.ArgumentParser( - description="Run the trade bot") + parser = configargparse.ArgumentParser( + description="Run the trade bot.") parser.add_argument("-c", "--config", default="config.ini", - required=False, + required=False, is_config_file=True, help="Config file to load (default: config.ini)") parser.add_argument("--before", default=False, action='store_const', const=True, @@ -109,6 +118,9 @@ def parse_args(argv): parser.add_argument("--after", default=False, action='store_const', const=True, help="Run the steps after the cryptoportfolio update") + parser.add_argument("--quiet", + default=False, action='store_const', const=True, + help="Don't print messages") parser.add_argument("--debug", default=False, action='store_const', const=True, help="Run in debug mode") @@ -117,27 +129,54 @@ def parse_args(argv): parser.add_argument("--action", action='append', help="Do a different action than trading (add several times to chain)") - - args = parser.parse_args(argv) - - if not os.path.exists(args.config): - print("no config file found, exiting") - sys.exit(1) - - return args + parser.add_argument("--parallel", action='store_true', default=True, dest="parallel") + parser.add_argument("--no-parallel", action='store_false', dest="parallel") + parser.add_argument("--report-db", action='store_true', default=True, dest="report_db", + help="Store report to database (default)") + parser.add_argument("--no-report-db", action='store_false', dest="report_db", + help="Don't store report to database") + parser.add_argument("--report-path", required=False, + help="Where to store the reports (default: absent, don't store)") + parser.add_argument("--no-report-path", action='store_const', dest='report_path', const=None, + help="Don't store the report to file (default)") + parser.add_argument("--db-host", default="localhost", + help="Host access to database (default: localhost)") + parser.add_argument("--db-port", default=5432, + help="Port access to database (default: 5432)") + parser.add_argument("--db-user", default="cryptoportfolio", + help="User access to database (default: cryptoportfolio)") + parser.add_argument("--db-password", default="cryptoportfolio", + help="Password access to database (default: cryptoportfolio)") + parser.add_argument("--db-database", default="cryptoportfolio", + help="Database access to database (default: cryptoportfolio)") + + return parser.parse_args(argv) + +def process(market_config, market_id, user_id, args, pg_config): + try: + market.Market\ + .from_config(market_config, args, market_id=market_id, + pg_config=pg_config, user_id=user_id)\ + .process(args.action, before=args.before, after=args.after) + except Exception as e: + print("{}: {}".format(e.__class__.__name__, e)) def main(argv): args = parse_args(argv) - pg_config, report_path = parse_config(args.config) + pg_config = parse_config(args) + + if args.parallel: + import threading + market.Portfolio.start_worker() + + def process_(*args): + threading.Thread(target=process, args=args).start() + else: + process_ = process - for market_config, user_id in fetch_markets(pg_config, args.user): - try: - market.Market\ - .from_config(market_config, debug=args.debug, user_id=user_id, report_path=report_path)\ - .process(args.action, before=args.before, after=args.after) - except Exception as e: - print("{}: {}".format(e.__class__.__name__, e)) + for market_id, market_config, user_id in fetch_markets(pg_config, args.user): + process_(market_config, market_id, user_id, args, pg_config) if __name__ == '__main__': # pragma: no cover main(sys.argv[1:])