Skip to content

Commit

Permalink
Merge branch 'master' into fix-corporate-action-announcement
Browse files Browse the repository at this point in the history
  • Loading branch information
hiohiohio committed Mar 22, 2024
2 parents 1d174f6 + 881b5de commit 069bc56
Show file tree
Hide file tree
Showing 6 changed files with 375 additions and 469 deletions.
12 changes: 6 additions & 6 deletions alpaca/broker/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -126,9 +126,7 @@ def __init__(
base_url = (
url_override
if url_override is not None
else BaseURL.BROKER_SANDBOX.value
if sandbox
else BaseURL.BROKER_PRODUCTION
else BaseURL.BROKER_SANDBOX.value if sandbox else BaseURL.BROKER_PRODUCTION
)

super().__init__(
Expand Down Expand Up @@ -887,9 +885,11 @@ def get_transfers_for_account(

iterator = self._get_transfers_iterator(
account_id=account_id,
transfers_filter=transfers_filter
if transfers_filter is not None
else GetTransfersRequest(),
transfers_filter=(
transfers_filter
if transfers_filter is not None
else GetTransfersRequest()
),
max_items_limit=max_items_limit,
)

Expand Down
8 changes: 5 additions & 3 deletions alpaca/data/historical/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -97,9 +97,11 @@ def format_dataset_response(
# for non-list types, add as element of a list.
# list comprehension used for speed
[
data_by_symbol[symbol].extend(data)
if isinstance(data, list)
else data_by_symbol[symbol].append(data)
(
data_by_symbol[symbol].extend(data)
if isinstance(data, list)
else data_by_symbol[symbol].append(data)
)
for symbol, data in response_data.items()
]

Expand Down
10 changes: 5 additions & 5 deletions alpaca/trading/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -74,11 +74,11 @@ def __init__(
secret_key=secret_key,
oauth_token=oauth_token,
api_version="v2",
base_url=url_override
if url_override
else BaseURL.TRADING_PAPER
if paper
else BaseURL.TRADING_LIVE,
base_url=(
url_override
if url_override
else BaseURL.TRADING_PAPER if paper else BaseURL.TRADING_LIVE
),
sandbox=paper,
raw_data=raw_data,
)
Expand Down
4 changes: 1 addition & 3 deletions alpaca/trading/stream.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,7 @@ def __init__(
self._endpoint = (
url_override
if url_override
else BaseURL.TRADING_STREAM_PAPER
if paper
else BaseURL.TRADING_STREAM_LIVE
else BaseURL.TRADING_STREAM_PAPER if paper else BaseURL.TRADING_STREAM_LIVE
)
self._ws = None
self._running = False
Expand Down
Loading

0 comments on commit 069bc56

Please sign in to comment.