Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make the prints the same for all brokers #331

Open
wants to merge 15 commits into
base: main
Choose a base branch
from
+98 −132
Open

Make the prints the same for all brokers #331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
8bf1a41
print same for all
PZES Aug 21, 2024
4ceb532
format printConfirm properly
PZES Aug 21, 2024
59de162
tradier printConfirm
PZES Aug 21, 2024
a958cd8
webull printConfirm
PZES Aug 21, 2024
98e12e6
fix loop
PZES Aug 21, 2024
a85b6e8
Tradier printConfirm
PZES Aug 21, 2024
2f71b8d
fidelity printConfirm
PZES Aug 21, 2024
392f20b
printConfirm
PZES Aug 21, 2024
e9a5659
fix copied vars
PZES Aug 26, 2024
c03f848
fix helper
PZES Aug 26, 2024
1a41a27
Merge branch 'NelsonDane:main' into prints
PZES Aug 27, 2024
f8d33e9
final list transactions
PZES Aug 27, 2024
d6ff269
Merge branch 'NelsonDane:main' into prints
PZES Aug 28, 2024
726a504
transactions error
PZES Aug 28, 2024
7757e86
Merge branch 'NelsonDane:main' into prints
PZES Sep 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions autoRSA.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
printAndDiscord,
stockOrder,
updater,
printFinalTransactions,
)
from publicAPI import *
from robinhoodAPI import *
Expand Down Expand Up @@ -182,6 +183,8 @@ def fun_run(orderObj: stockOrder, command, botObj=None, loop=None):
print(f"Error in {fun_name} with {broker}: {ex}")
print(orderObj)
print()
if second_command == "_transaction":
printFinalTransactions(loop)
printAndDiscord("All commands complete in all brokers", loop)
else:
print(f"Error: {command} is not a valid command")
Expand Down
30 changes: 8 additions & 22 deletions chaseAPI.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
printAndDiscord,
printHoldings,
stockOrder,
printConfirm,
)


Expand Down Expand Up @@ -318,31 +319,16 @@ def chase_transaction(
)
else:
pprint.pprint(messages["ORDER CONFIRMATION"])
printAndDiscord(
(
f"{key} account {account}: The order verification was "
+ (
"successful"
if messages["ORDER CONFIRMATION"]
not in [
if messages["ORDER CONFIRMATION"] not in [
"",
"No order confirmation page found. Order Failed.",
]
else "unsuccessful"
)
),
loop,
)
if (
messages["ORDER INVALID"]
!= "No invalid order message found."
):
printAndDiscord(
f"{key} account {account}: The order verification produced the following messages: {messages['ORDER INVALID']}",
loop,
)
]:
printConfirm(key, account, orderObj.get_action(), orderObj.get_amount(), ticker, loop, False)
else:
printConfirm(key, account, orderObj.get_action(), orderObj.get_amount(), ticker, loop, True, messages['ORDER INVALID'])

except Exception as e:
printAndDiscord(f"{key} {account}: Error submitting order: {e}", loop)
printConfirm(key, account, orderObj.get_action(), orderObj.get_amount(), ticker, loop, True, e)
print(traceback.format_exc())
continue
ch_session.close_browser()
Expand Down
8 changes: 3 additions & 5 deletions fennelAPI.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
printAndDiscord,
printHoldings,
stockOrder,
printConfirm,
)


Expand Down Expand Up @@ -140,11 +141,8 @@ def fennel_transaction(fbo: Brokerage, orderObj: stockOrder, loop=None):
message = "Success"
if order.get("data", {}).get("createOrder") != "pending":
message = order.get("data", {}).get("createOrder")
printAndDiscord(
f"{key}: {orderObj.get_action()} {orderObj.get_amount()} of {s} in {account}: {message}",
loop,
)
printConfirm(key, account, orderObj.get_action(), orderObj.get_amount(), s, loop, False, message)
except Exception as e:
printAndDiscord(f"{key} {account}: Error placing order: {e}", loop)
printConfirm(key, account, orderObj.get_action(), orderObj.get_amount(), s, loop, True, e)
print(traceback.format_exc())
continue
12 changes: 4 additions & 8 deletions fidelityAPI.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
printHoldings,
stockOrder,
type_slowly,
printConfirm,
)


Expand Down Expand Up @@ -588,10 +589,7 @@ def fidelity_transaction(fidelity_o: Brokerage, orderObj: stockOrder, loop=None)
WebDriverWait(driver, 10).until(check_if_page_loaded)
sleep(1)
# Send confirmation
printAndDiscord(
f"{key} {account_label}: {orderObj.get_action()} {orderObj.get_amount()} shares of {s}",
loop,
)
printConfirm(key, account_label, orderObj.get_action(), orderObj.get_amount(), s, loop, False)
except NoSuchElementException:
# Check for error
WebDriverWait(driver, 10).until(
Expand All @@ -609,10 +607,7 @@ def fidelity_transaction(fidelity_o: Brokerage, orderObj: stockOrder, loop=None)
driver.execute_script(
"arguments[0].click();", error_dismiss
)
printAndDiscord(
f"{key} account {account_label}: {orderObj.get_action()} {orderObj.get_amount()} shares of {s}. DID NOT COMPLETE! \nEither this account does not have enough shares, or an order is already pending.",
loop,
)
printConfirm(key, account_label, orderObj.get_action(), orderObj.get_amount(), s, loop, True, "\nEither this account does not have enough shares, or an order is already pending.")
# Send confirmation
else:
printAndDiscord(
Expand All @@ -621,6 +616,7 @@ def fidelity_transaction(fidelity_o: Brokerage, orderObj: stockOrder, loop=None)
)
sleep(3)
except Exception as err:
printConfirm(key, account_label, orderObj.get_action(), orderObj.get_amount(), s, loop, True, err)
fidelity_error(driver, err)
continue
print()
Expand Down
20 changes: 6 additions & 14 deletions firstradeAPI.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
printAndDiscord,
printHoldings,
stockOrder,
printConfirm,
)


Expand Down Expand Up @@ -159,24 +160,15 @@ def firstrade_transaction(firstrade_o: Brokerage, orderObj: stockOrder, loop=Non

print("The order verification produced the following messages: ")
pprint.pprint(order_conf)
printAndDiscord(
(
f"{key} account {print_account}: The order verification was "
+ "successful"
if order_conf["error"] == ""
else "unsuccessful"
),
loop,
)
if not order_conf["error"] == "":
printAndDiscord(
f"{key} account {print_account}: The order verification produced the following messages: {order_conf}",
loop,
)
if order_conf["error"] == "":
printConfirm(key, print_account, orderObj.get_action(), orderObj.get_amount(), s, loop, False)
else:
printConfirm(key, print_account, orderObj.get_action(), orderObj.get_amount(), s, loop, True, order_conf)
except Exception as e:
printAndDiscord(
f"{key} {print_account}: Error submitting order: {e}", loop
)
printConfirm(key, print_account, orderObj.get_action(), orderObj.get_amount(), s, loop, True, f"Error submitting order: {e}")
print(traceback.format_exc())
continue
sleep(1)
Expand Down
43 changes: 43 additions & 0 deletions helperAPI.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@
# Create task queue
task_queue = Queue()

transactions = {}


class stockOrder:
def __init__(self):
Expand Down Expand Up @@ -760,3 +762,44 @@ def printHoldings(brokerObj: Brokerage, loop=None, mask=True):
EMBED["fields"].append(field)
printAndDiscord(EMBED, loop, True)
print("==============================")


def printConfirm(key, account, action, amount, ticker, loop, error, prints=None):
if key not in transactions:
transactions[key] = [0, 1] if error else [1, 1]
else:
if not error:
transactions[key][0] += 1
transactions[key][1] += 1

message = f"{':green_square:' if not error else ':red_square:'} {key} {account}: {action} {amount} shares of {ticker}"
if error:
message += "DID NOT COMPLETE!"
if prints is not None:
message += f": {prints}"
printAndDiscord(message, loop)


def printFinalTransactions(loop):
EMBED = {
"title": "Transactions",
"color": 3447003,
"fields": [],
}
for key, value in transactions.items():
field = {
"name": key,
"inline": False,
}
if value[0] == 0:
message = ":red_square:"
elif value[0] < value[1]:
message = ":orange_square:"
elif value[0] == value[1]:
message = ":green_square:"
else:
message = "?????"

field["value"] = f"{message} {value[0]}/{value[1]}"
EMBED["fields"].append(field)
printAndDiscord(EMBED, loop, True)
9 changes: 3 additions & 6 deletions publicAPI.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
printAndDiscord,
printHoldings,
stockOrder,
printConfirm,
)


Expand Down Expand Up @@ -133,12 +134,8 @@ def public_transaction(pbo: Brokerage, orderObj: stockOrder, loop=None):
is_dry_run=orderObj.get_dry(),
)
if order["success"] is True:
order = "Success"
printAndDiscord(
f"{key}: {orderObj.get_action()} {orderObj.get_amount()} of {s} in {print_account}: {order}",
loop,
)
printConfirm(key, print_account, orderObj.get_action(), orderObj.get_amount(), s, loop, False)
except Exception as e:
printAndDiscord(f"{print_account}: Error placing order: {e}", loop)
printConfirm(key, print_account, orderObj.get_action(), orderObj.get_amount(), s, loop, True, e)
traceback.print_exc()
continue
14 changes: 4 additions & 10 deletions robinhoodAPI.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import robin_stocks.robinhood as rh
from dotenv import load_dotenv

from helperAPI import Brokerage, maskString, printAndDiscord, printHoldings, stockOrder
from helperAPI import Brokerage, maskString, printAndDiscord, printHoldings, stockOrder, printConfirm


def login_with_cache(pickle_path, pickle_name):
Expand Down Expand Up @@ -179,21 +179,15 @@ def robinhood_transaction(rho: Brokerage, orderObj: stockOrder, loop=None):
message = "Success"
if limit_order.get("non_field_errors") is not None:
message = limit_order["non_field_errors"]
printAndDiscord(
f"{key}: {orderObj.get_action()} {orderObj.get_amount()} of {s} in {print_account} @ {price}: {message}",
loop,
)
printConfirm(key, print_account, orderObj.get_action(), orderObj.get_amount(), s, loop, False, f"@ {price}: {message}")
else:
message = "Success"
if market_order.get("non_field_errors") is not None:
message = market_order["non_field_errors"]
printAndDiscord(
f"{key}: {orderObj.get_action()} {orderObj.get_amount()} of {s} in {print_account}: {message}",
loop,
)
printConfirm(key, print_account, orderObj.get_action(), orderObj.get_amount(), s, loop, False, message)
except Exception as e:
traceback.format_exc()
printAndDiscord(f"{key} Error submitting order: {e}", loop)
printConfirm(key, print_account, orderObj.get_action(), orderObj.get_amount(), s, loop, True, e)
else:
printAndDiscord(
f"{key} {print_account} Running in DRY mode. Transaction would've been: {orderObj.get_action()} {orderObj.get_amount()} of {s}",
Expand Down
36 changes: 10 additions & 26 deletions schwabAPI.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
from dotenv import load_dotenv
from schwab_api import Schwab

from helperAPI import Brokerage, maskString, printAndDiscord, printHoldings, stockOrder
from helperAPI import Brokerage, maskString, printAndDiscord, printHoldings, stockOrder, printConfirm


def schwab_init(SCHWAB_EXTERNAL=None):
Expand Down Expand Up @@ -110,15 +110,10 @@ def schwab_transaction(schwab_o: Brokerage, orderObj: stockOrder, loop=None):
account_id=account,
dry_run=orderObj.get_dry(),
)
printAndDiscord(
(
f"{key} account {print_account}: The order verification was "
+ "successful"
if success
else "unsuccessful, retrying..."
),
loop,
)
if success:
printConfirm(key, print_account, orderObj.get_action(), orderObj.get_amount(), s, loop, False, messages)
else:
printConfirm(key, print_account, orderObj.get_action(), orderObj.get_amount(), s, loop, True, "unsuccessful, retrying...")
if not success:
messages, success = obj.trade(
ticker=s,
Expand All @@ -127,22 +122,11 @@ def schwab_transaction(schwab_o: Brokerage, orderObj: stockOrder, loop=None):
account_id=account,
dry_run=orderObj.get_dry(),
)
printAndDiscord(
(
f"{key} account {print_account}: The order verification was "
+ "retry successful"
if success
else "retry unsuccessful"
),
loop,
)
printAndDiscord(
f"{key} account {print_account}: The order verification produced the following messages: {messages}",
loop,
)
if success:
printConfirm(key, print_account, orderObj.get_action(), orderObj.get_amount(), s, loop, False, messages)
else:
printConfirm(key, print_account, orderObj.get_action(), orderObj.get_amount(), s, loop, True, messages)
except Exception as e:
printAndDiscord(
f"{key} {print_account}: Error submitting order: {e}", loop
)
printConfirm(key, print_account, orderObj.get_action(), orderObj.get_amount(), s, loop, True, e)
print(traceback.format_exc())
sleep(1)
12 changes: 3 additions & 9 deletions tradierAPI.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import requests
from dotenv import load_dotenv

from helperAPI import Brokerage, maskString, printAndDiscord, printHoldings, stockOrder
from helperAPI import Brokerage, maskString, printAndDiscord, printHoldings, stockOrder, printConfirm


def make_request(
Expand Down Expand Up @@ -203,15 +203,9 @@ def tradier_transaction(tradier_o: Brokerage, orderObj: stockOrder, loop=None):
)
continue
if json_response.get("order", {}).get("status") is not None:
printAndDiscord(
f"Tradier account {print_account}: {orderObj.get_action()} {orderObj.get_amount()} of {s}: {json_response['order']['status']}",
loop=loop,
)
printConfirm(key, print_account, orderObj.get_action(), orderObj.get_amount(), s, loop, False, json_response['order']['status'])
continue
printAndDiscord(
f"Tradier account {print_account} Error: This order did not route. JSON response: {json.dumps(json_response, indent=2)}",
loop=loop,
)
printConfirm(key, print_account, orderObj.get_action(), orderObj.get_amount(), s, loop, True, f"Error: This order did not route. JSON response: {json.dumps(json_response, indent=2)}")
except Exception as e:
printAndDiscord(
f"Tradier account {print_account} Error: {e}", loop=loop
Expand Down
Loading