Sourcery refactored master branch #1
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![sourcery-ai[bot]](https://avatars.githubusercontent.com/in/48477?s=60&v=4){kind=small}
Comment on lines
-99
to
+104
| if hb.strategy_name and hb.strategy_file_name: | ||
| if not all_configs_complete(hb.strategy_name): | ||
| hb.status() | ||
| if ( | ||
| hb.strategy_name | ||
| and hb.strategy_file_name | ||
| and not all_configs_complete(hb.strategy_name) | ||
| ): | ||
| hb.status() |
There was a problem hiding this comment.
Function quick_start refactored with the following changes:
- Merge nested if conditions (
merge-nested-ifs)
Comment on lines
-138
to
+142
| if args.config_password is None: | ||
| if not login_prompt(): | ||
| return | ||
| if args.config_password is None and not login_prompt(): | ||
| return |
There was a problem hiding this comment.
Function main refactored with the following changes:
- Merge nested if conditions (
merge-nested-ifs)
Comment on lines
+3
to
-6
| import sys | ||
| if "hummingbot-dist" in __file__: | ||
| # Dist environment. | ||
| import os | ||
| import sys |
There was a problem hiding this comment.
Lines 6-15 refactored with the following changes:
- Hoist repeated code outside conditional statement (
hoist-statement-from-if)
Comment on lines
-17
to
+20
| if isinstance(n, decimal.Decimal): | ||
| n = round(n, FLOAT_PRINTOUT_PRECISION) | ||
| return format(n.normalize(), 'f') | ||
| else: | ||
| if not isinstance(n, decimal.Decimal): | ||
| return str(n) | ||
| n = round(n, FLOAT_PRINTOUT_PRECISION) | ||
| return format(n.normalize(), 'f') |
There was a problem hiding this comment.
Function format_decimal refactored with the following changes:
- Swap if/else branches (
swap-if-else-branches) - Remove unnecessary else after guard condition (
remove-unnecessary-else)
| if self.placeholder_mode: | ||
| pass | ||
| else: | ||
| if not self.placeholder_mode: |
There was a problem hiding this comment.
Function HummingbotApplication._handle_command refactored with the following changes:
- Swap if/else to remove empty if body (
remove-pass-body) - Simplify boolean if expression (
boolean-if-exp-identity) - Simplify comparison to boolean (
simplify-boolean-comparison)
This removes the following comments ( why? ):
# regular command
Comment on lines
-183
to
+189
| for token, bal in bals.items(): | ||
| rows.append({"Asset": token, "Amount": round(bal, 4)}) | ||
| rows.extend( | ||
| {"Asset": token, "Amount": round(bal, 4)} | ||
| for token, bal in bals.items() | ||
| ) | ||
|
|
There was a problem hiding this comment.
Function BalanceCommand.ethereum_balances_df refactored with the following changes:
- Replace a for append loop with list extend (
for-append-to-extend)
Comment on lines
-194
to
+204
| rows = [] | ||
| bals = await UserBalances.xdai_balances() | ||
| for token, bal in bals.items(): | ||
| rows.append({"Asset": token, "Amount": round(bal, 4)}) | ||
| rows = [ | ||
| {"Asset": token, "Amount": round(bal, 4)} | ||
| for token, bal in bals.items() | ||
| ] | ||
|
|
There was a problem hiding this comment.
Function BalanceCommand.xdai_balances_df refactored with the following changes:
- Move assignment closer to its usage within a block (
move-assign-in-block) - Convert for loop into list comprehension (
list-comprehension)
Comment on lines
-204
to
+214
| rows = [] | ||
| for token, amount in asset_limit_conf.items(): | ||
| rows.append({"Asset": token, "Limit": round(Decimal(amount), 4)}) | ||
| rows = [ | ||
| {"Asset": token, "Limit": round(Decimal(amount), 4)} | ||
| for token, amount in asset_limit_conf.items() | ||
| ] |
There was a problem hiding this comment.
Function BalanceCommand.asset_limits_df refactored with the following changes:
- Convert for loop into list comprehension (
list-comprehension)
Comment on lines
-232
to
+240
| lines = [" " + line for line in df.to_string(index=False).split("\n")] | ||
| lines = [f" {line}" for line in df.to_string(index=False).split("\n")] |
There was a problem hiding this comment.
Function BalanceCommand.show_asset_limits refactored with the following changes:
- Use f-string instead of string concatenation (
use-fstring-for-concatenation)
Comment on lines
-238
to
+250
| rows = [] | ||
| for asset, balance in paper_balances.items(): | ||
| rows.append({"Asset": asset, "Balance": round(Decimal(str(balance)), 4)}) | ||
| rows = [ | ||
| {"Asset": asset, "Balance": round(Decimal(str(balance)), 4)} | ||
| for asset, balance in paper_balances.items() | ||
| ] | ||
|
|
There was a problem hiding this comment.
Function BalanceCommand.paper_acccount_balance_df refactored with the following changes:
- Convert for loop into list comprehension (
list-comprehension)
Comment on lines
-263
to
+273
| lines = [" " + line for line in df.to_string(index=False).split("\n")] | ||
| lines = [f" {line}" for line in df.to_string(index=False).split("\n")] |
There was a problem hiding this comment.
Function BalanceCommand.show_paper_account_balance refactored with the following changes:
- Use f-string instead of string concatenation (
use-fstring-for-concatenation)
Comment on lines
-90
to
+116
| lines = [" " + line for line in df.to_string(index=False, max_colwidth=50).split("\n")] | ||
| lines = [ | ||
| f" {line}" | ||
| for line in df.to_string(index=False, max_colwidth=50).split("\n") | ||
| ] | ||
|
|
||
| self._notify("\n".join(lines)) | ||
|
|
||
| data = [[cv.key, cv.value] for cv in global_config_map.values() | ||
| if cv.key in color_settings_to_display and not cv.is_secure] | ||
| df = map_df_to_str(pd.DataFrame(data=data, columns=columns)) | ||
| self._notify("\nColor Settings:") | ||
| lines = [" " + line for line in df.to_string(index=False, max_colwidth=50).split("\n")] | ||
| lines = [ | ||
| f" {line}" | ||
| for line in df.to_string(index=False, max_colwidth=50).split("\n") | ||
| ] | ||
|
|
||
| self._notify("\n".join(lines)) | ||
|
|
||
| if self.strategy_name is not None: | ||
| data = [[cv.printable_key or cv.key, cv.value] for cv in self.strategy_config_map.values() if not cv.is_secure] | ||
| df = map_df_to_str(pd.DataFrame(data=data, columns=columns)) | ||
| self._notify("\nStrategy Configurations:") | ||
| lines = [" " + line for line in df.to_string(index=False, max_colwidth=50).split("\n")] | ||
| lines = [ | ||
| f" {line}" | ||
| for line in df.to_string(index=False, max_colwidth=50).split("\n") | ||
| ] | ||
|
|
There was a problem hiding this comment.
Function ConfigCommand.list_configs refactored with the following changes:
- Use f-string instead of string concatenation (
use-fstring-for-concatenation)
Comment on lines
-121
to
+136
| if password != Security.password: | ||
| self._notify("Invalid password, please try again.") | ||
| return False | ||
| else: | ||
| if password == Security.password: | ||
| return True | ||
| self._notify("Invalid password, please try again.") | ||
| return False |
There was a problem hiding this comment.
Function ConfigCommand.check_password refactored with the following changes:
- Swap if/else branches (
swap-if-else-branches) - Remove unnecessary else after guard condition (
remove-unnecessary-else)
Comment on lines
-180
to
+194
| if isinstance(self.strategy, PureMarketMakingStrategy) or \ | ||
| isinstance(self.strategy, PerpetualMarketMakingStrategy): | ||
| if isinstance( | ||
| self.strategy, | ||
| (PureMarketMakingStrategy, PerpetualMarketMakingStrategy), | ||
| ): |
There was a problem hiding this comment.
Function ConfigCommand._config_single_key refactored with the following changes:
- Merge isinstance calls (
merge-isinstance)
Comment on lines
-45
to
+47
| api_key_config = [c for c in exchange_configs if "api_key" in c.key] | ||
| if api_key_config: | ||
| if api_key_config := [ | ||
| c for c in exchange_configs if "api_key" in c.key | ||
| ]: |
There was a problem hiding this comment.
Function ConnectCommand.connect_exchange refactored with the following changes:
- Use named expression to simplify assignment and conditional (
use-named-expression)
Comment on lines
-131
to
+134
| lines = [] | ||
| base, quote = trading_pair.split("-") | ||
| lines.extend( | ||
| [f"\n{market} / {trading_pair}"] | ||
| ) | ||
|
|
||
| lines = list([f"\n{market} / {trading_pair}"]) |
There was a problem hiding this comment.
Function HistoryCommand.report_performance_by_market refactored with the following changes:
- Merge extend into list declaration (
merge-list-extend) - Move assignment closer to its usage within a block (
move-assign-in-block) - Use f-string instead of string concatenation (
use-fstring-for-concatenation)
Comment on lines
-237
to
+270
| queried_trades = queried_trades + celo_trades | ||
| queried_trades += celo_trades |
There was a problem hiding this comment.
Function HistoryCommand.list_trades refactored with the following changes:
- Replace assignment with augmented assignment (
aug-assign) - Use f-string instead of string concatenation (
use-fstring-for-concatenation)
Comment on lines
-60
to
+69
| example = f"{CONF_PREFIX}{short_strategy_name('pure_market_making')}_{1}.yml" | ||
| example = f'{CONF_PREFIX}{short_strategy_name("pure_market_making")}_1.yml' | ||
| file_name = await self.app.prompt(prompt=f'Enter path to your strategy file (e.g. "{example}") >>> ') | ||
| if self.app.to_stop_config: | ||
| return | ||
| file_path = os.path.join(CONF_FILE_PATH, file_name) | ||
| err_msg = validate_strategy_file(file_path) | ||
| if err_msg is not None: | ||
| self._notify(f"Error: {err_msg}") | ||
| return await self.prompt_a_file_name() | ||
| else: | ||
| if err_msg is None: | ||
| return file_name | ||
| self._notify(f"Error: {err_msg}") | ||
| return await self.prompt_a_file_name() |
There was a problem hiding this comment.
Function ImportCommand.prompt_a_file_name refactored with the following changes:
- Simplify unnecessary nesting, casting and constant values in f-strings (
simplify-fstring-formatting) - Swap if/else branches (
swap-if-else-branches) - Remove unnecessary else after guard condition (
remove-unnecessary-else)
Comment on lines
-50
to
+53
| text_lines = [" " + line for line in joined_df.to_string(index=False).split("\n")] | ||
| text_lines = [ | ||
| f" {line}" for line in joined_df.to_string(index=False).split("\n") | ||
| ] | ||
|
|
There was a problem hiding this comment.
Function OrderBookCommand.show_order_book.get_order_book refactored with the following changes:
- Use f-string instead of string concatenation (
use-fstring-for-concatenation)
Comment on lines
-85
to
+95
| for _ in range(0, 3): | ||
| for _ in range(3): | ||
| await self.cls_display_delay(self.display_alert()) | ||
| hb_with_flower_1 = open(f"{RESOURCES_PATH}hb_with_flower_1.txt").readlines() | ||
| hb_with_flower_2 = open(f"{RESOURCES_PATH}hb_with_flower_2.txt").readlines() | ||
| hb_with_flower_up_close_1 = open(f"{RESOURCES_PATH}hb_with_flower_up_close_1.txt").readlines() | ||
| hb_with_flower_up_close_2 = open(f"{RESOURCES_PATH}hb_with_flower_up_close_2.txt").readlines() | ||
| for _ in range(0, 2): | ||
| for _ in range(0, 5): | ||
| for _ in range(2): | ||
| for _ in range(5): | ||
| await self.cls_display_delay(hb_with_flower_1, 0.125) | ||
| await self.cls_display_delay(hb_with_flower_2, 0.125) | ||
| for _ in range(0, 5): | ||
| for _ in range(5): |
There was a problem hiding this comment.
Function SillyCommands.silly_hummingbot refactored with the following changes:
- Replace range(0, x) with range(x) (
remove-zero-from-range)
Comment on lines
-105
to
+112
| for _ in range(0, 3): | ||
| for _ in range(3): | ||
| await self.cls_display_delay(self.display_alert("roger")) | ||
| roger_1 = open(f"{RESOURCES_PATH}roger_1.txt").readlines() | ||
| roger_2 = open(f"{RESOURCES_PATH}roger_2.txt").readlines() | ||
| roger_3 = open(f"{RESOURCES_PATH}roger_3.txt").readlines() | ||
| roger_4 = open(f"{RESOURCES_PATH}roger_4.txt").readlines() | ||
| for _ in range(0, 2): | ||
| for _ in range(0, 3): | ||
| for _ in range(2): | ||
| for _ in range(3): |
There was a problem hiding this comment.
Function SillyCommands.silly_roger refactored with the following changes:
- Replace range(0, x) with range(x) (
remove-zero-from-range)
Comment on lines
-134
to
+135
| for _ in range(0, 5): | ||
| for _ in range(0, 5): | ||
| for _ in range(5): | ||
| for _ in range(5): |
There was a problem hiding this comment.
Function SillyCommands.silly_victor refactored with the following changes:
- Replace range(0, x) with range(x) (
remove-zero-from-range)
Comment on lines
-146
to
+151
| for _ in range(0, 2): | ||
| for _ in range(2): | ||
| await self.cls_display_delay(self.display_alert("rein")) | ||
| rein_1 = open(f"{RESOURCES_PATH}rein_1.txt").readlines() | ||
| rein_2 = open(f"{RESOURCES_PATH}rein_2.txt").readlines() | ||
| rein_3 = open(f"{RESOURCES_PATH}rein_3.txt").readlines() | ||
| for _ in range(0, 2): | ||
| for _ in range(2): |
There was a problem hiding this comment.
Function SillyCommands.silly_rein refactored with the following changes:
- Replace range(0, x) with range(x) (
remove-zero-from-range)
| for _ in range(0, 1): | ||
| for _ in range(1): |
There was a problem hiding this comment.
Function SillyCommands.silly_dennis refactored with the following changes:
- Replace range(0, x) with range(x) (
remove-zero-from-range)
| all_ready = all([market.ready for market in self.markets.values()]) | ||
| all_ready = all(market.ready for market in self.markets.values()) |
There was a problem hiding this comment.
Function StartCommand.wait_till_ready refactored with the following changes:
- Replace unneeded comprehension with generator (
comprehension-to-generator)
Comment on lines
-108
to
+111
| if inclusive: | ||
| if min_value is not None and max_value is not None: | ||
| if min_value is not None and max_value is not None: | ||
| if inclusive: | ||
| if not (min_value <= int_value <= max_value): | ||
| return f"Value must be between {min_value} and {max_value}." | ||
| elif min_value is not None and not int_value >= min_value: | ||
| return f"Value cannot be less than {min_value}." | ||
| elif max_value is not None and not int_value <= max_value: | ||
| return f"Value cannot be more than {max_value}." | ||
| else: | ||
| if min_value is not None and max_value is not None: | ||
| if not (min_value < int_value < max_value): | ||
| return f"Value must be between {min_value} and {max_value} (exclusive)." | ||
| elif min_value is not None and not int_value > min_value: | ||
| return f"Value must be more than {min_value}." | ||
| elif max_value is not None and not int_value < max_value: | ||
| return f"Value must be less than {max_value}." | ||
| elif not (min_value < int_value < max_value): | ||
| return f"Value must be between {min_value} and {max_value} (exclusive)." | ||
| elif min_value is not None and int_value < min_value: | ||
| return f"Value cannot be less than {min_value}." | ||
| elif max_value is not None and int_value > max_value: | ||
| return f"Value cannot be more than {max_value}." |
There was a problem hiding this comment.
Function validate_int refactored with the following changes:
- Hoist repeated code outside conditional statement (
hoist-statement-from-if) - Simplify logical expression using De Morgan identities (
de-morgan) - Merge else clause's nested if statement into elif (
merge-else-if-into-elif)
| if self.required and (value is None or value == ""): | ||
| if self.required and (value is None or not value): |
There was a problem hiding this comment.
Function ConfigVar.validate refactored with the following changes:
- Replaces an empty collection equality with a boolean operation. (
simplify-empty-collection-comparison)
Comment on lines
-9
to
+33
| all_dict.update({f"{name}_percent_fee_token": new_fee_config_var(f"{name}_percent_fee_token", type_str="str")}) | ||
| all_dict.update( | ||
| {f"{name}_maker_percent_fee": new_fee_config_var(f"{name}_maker_percent_fee", type_str="decimal")} | ||
| all_dict[f"{name}_percent_fee_token"] = new_fee_config_var( | ||
| f"{name}_percent_fee_token", type_str="str" | ||
| ) | ||
| all_dict.update( | ||
| {f"{name}_taker_percent_fee": new_fee_config_var(f"{name}_taker_percent_fee", type_str="decimal")} | ||
|
|
||
| all_dict[f"{name}_maker_percent_fee"] = new_fee_config_var( | ||
| f"{name}_maker_percent_fee", type_str="decimal" | ||
| ) | ||
|
|
||
| all_dict[f"{name}_taker_percent_fee"] = new_fee_config_var( | ||
| f"{name}_taker_percent_fee", type_str="decimal" | ||
| ) | ||
|
|
||
| fee_application = f"{name}_buy_percent_fee_deducted_from_returns" | ||
| all_dict.update({fee_application: new_fee_config_var(fee_application, type_str="bool")}) | ||
| all_dict.update( | ||
| {f"{name}_maker_fixed_fees": new_fee_config_var(f"{name}_maker_fixed_fees", type_str="list")} | ||
| all_dict[fee_application] = new_fee_config_var( | ||
| fee_application, type_str="bool" | ||
| ) | ||
| all_dict.update( | ||
| {f"{name}_taker_fixed_fees": new_fee_config_var(f"{name}_taker_fixed_fees", type_str="list")} | ||
|
|
||
| all_dict[f"{name}_maker_fixed_fees"] = new_fee_config_var( | ||
| f"{name}_maker_fixed_fees", type_str="list" | ||
| ) | ||
|
|
||
| all_dict[f"{name}_taker_fixed_fees"] = new_fee_config_var( | ||
| f"{name}_taker_fixed_fees", type_str="list" | ||
| ) | ||
|
|
There was a problem hiding this comment.
Function fee_overrides_dict refactored with the following changes:
- Add single value to dictionary directly rather than using update() (
simplify-dictionary-update)
| vals = [random.choice(range(0, 256)) for i in range(0, 20)] | ||
| vals = [random.choice(range(256)) for _ in range(20)] |
There was a problem hiding this comment.
Function generate_client_id refactored with the following changes:
- Replace unused for index with underscore (
for-index-underscore) - Replace range(0, x) with range(x) (
remove-zero-from-range)
Comment on lines
-63
to
+66
| text_lines = ["" + line for line in joined_df.to_string(index=False).split("\n")] | ||
| text_lines = [ | ||
| f"{line}" for line in joined_df.to_string(index=False).split("\n") | ||
| ] | ||
|
|
There was a problem hiding this comment.
Function OrderBookTab.display.get_order_book_text refactored with the following changes:
- Use f-string instead of string concatenation (
use-fstring-for-concatenation)
Sourcery Code Quality Report✅ Merging this PR will increase code quality in the affected files by 0.36%.
Here are some functions in these files that still need a tune-up:
Legend and ExplanationThe emojis denote the absolute quality of the code:
The 👍 and 👎 indicate whether the quality has improved or gotten worse with this pull request. Please see our documentation here for details on how these metrics are calculated. We are actively working on this report - lots more documentation and extra metrics to come! Help us improve this quality report! |
litepresence
force-pushed
the
master
branch
2 times, most recently
from
4383d99 to
691913f
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Branch
masterrefactored by Sourcery.If you're happy with these changes, merge this Pull Request using the Squash and merge strategy.
See our documentation here.
Run Sourcery locally
Reduce the feedback loop during development by using the Sourcery editor plugin:
Review changes via command line
To manually merge these changes, make sure you're on the
masterbranch, then run:Help us improve this pull request!