Removed overwrite option

This commit is contained in:
Fredrik81 2020-03-09 18:53:30 +01:00
parent cb419614cd
commit 2f5fc731bb
5 changed files with 14 additions and 19 deletions

View File

@ -429,6 +429,7 @@ usage: freqtrade hyperopt-list [-h] [-v] [--logfile FILE] [-V] [-c PATH]
[--min-total-profit FLOAT] [--min-total-profit FLOAT]
[--max-total-profit FLOAT] [--no-color] [--max-total-profit FLOAT] [--no-color]
[--print-json] [--no-details] [--print-json] [--no-details]
[--export-csv FILE]
optional arguments: optional arguments:
-h, --help show this help message and exit -h, --help show this help message and exit
@ -450,9 +451,8 @@ optional arguments:
useful if you are redirecting output to a file. useful if you are redirecting output to a file.
--print-json Print best result detailization in JSON format. --print-json Print best result detailization in JSON format.
--no-details Do not print best epoch details. --no-details Do not print best epoch details.
--export-csv FILE Export to CSV-File. Put + in front of filename to --export-csv FILE Export to CSV-File. This will disable table print.
overwrite. This will disable table print. Example: Example: --export-csv hyperopt.csv
--export-csv +hyperopt.csv
Common arguments: Common arguments:
-v, --verbose Verbose mode (-vv for more, -vvv to get all messages). -v, --verbose Verbose mode (-vv for more, -vvv to get all messages).
@ -461,9 +461,10 @@ Common arguments:
details. details.
-V, --version show program's version number and exit -V, --version show program's version number and exit
-c PATH, --config PATH -c PATH, --config PATH
Specify configuration file (default: `config.json`). Specify configuration file (default:
Multiple --config options may be used. Can be set to `userdir/config.json` or `config.json` whichever
`-` to read config from stdin. exists). Multiple --config options may be used. Can be
set to `-` to read config from stdin.
-d PATH, --datadir PATH -d PATH, --datadir PATH
Path to directory with historical backtesting data. Path to directory with historical backtesting data.
--userdir PATH, --user-data-dir PATH --userdir PATH, --user-data-dir PATH

View File

@ -223,9 +223,9 @@ AVAILABLE_CLI_OPTIONS = {
), ),
"export_csv": Arg( "export_csv": Arg(
'--export-csv', '--export-csv',
help='Export to CSV-File. Put + in front of filename to overwrite.' help='Export to CSV-File.'
' This will disable table print.' ' This will disable table print.'
' Example: --export-csv +hyperopt.csv', ' Example: --export-csv hyperopt.csv',
metavar='FILE', metavar='FILE',
), ),
"hyperopt_jobs": Arg( "hyperopt_jobs": Arg(

View File

@ -63,14 +63,8 @@ def start_hyperopt_list(args: Dict[str, Any]) -> None:
Hyperopt.print_epoch_details(results, total_epochs, print_json, no_header) Hyperopt.print_epoch_details(results, total_epochs, print_json, no_header)
if trials and export_csv: if trials and export_csv:
overwrite_csv = False
if export_csv[0] == '+':
overwrite_csv = True
export_csv = export_csv[1:]
Hyperopt.export_csv_file( Hyperopt.export_csv_file(
config, trials, total_epochs, config, trials, total_epochs, not filteroptions['only_best'], export_csv
not filteroptions['only_best'], export_csv, overwrite_csv
) )

View File

@ -385,7 +385,7 @@ class Hyperopt:
@staticmethod @staticmethod
def export_csv_file(config: dict, results: list, total_epochs: int, highlight_best: bool, def export_csv_file(config: dict, results: list, total_epochs: int, highlight_best: bool,
csv_file: str, overwrite: bool) -> None: csv_file: str) -> None:
""" """
Log result to csv-file Log result to csv-file
""" """
@ -393,8 +393,8 @@ class Hyperopt:
return return
# Verification for overwrite # Verification for overwrite
if not overwrite and path.isfile(csv_file): if path.isfile(csv_file):
logging.error("CSV-File already exists and no overwrite specified!") logging.error("CSV-File already exists!")
return return
try: try:

View File

@ -905,7 +905,7 @@ def test_hyperopt_list(mocker, capsys, hyperopt_results):
args = [ args = [
"hyperopt-list", "hyperopt-list",
"--no-details", "--no-details",
"--export-csv", "+test_file.csv" "--export-csv", "test_file.csv"
] ]
pargs = get_args(args) pargs = get_args(args)
pargs['config'] = None pargs['config'] = None