update SDK version, add watchlist module

Author: Graeme22

README.md

@@ -19,9 +19,6 @@ You can also install in a virtual environment:
 $ pip install tastytrade-cli
 ```
 
-> [!WARNING]  
-> The CLI is still under active development. Please report any bugs, and contributions are always welcome!
-
 ## Usage
 
 Available commands:
@@ -31,7 +28,7 @@ tt pf (portfolio)      view and close positions, check margin and analyze BP usa
 tt trade               buy or sell stocks/ETFs, crypto, and futures
 tt order               view, replace, and cancel orders
 tt plot                plot charts directly in the terminal! requires `gnuplot` installed
-tt wl (watchlist)      view prices and metrics for symbols in your watchlists (pending further development!)
+tt wl (watchlist)      view prices and metrics for symbols in your watchlists
 ```
 For more options, run `tt --help` or `tt <subcommand> --help`.
 

pyproject.toml

@@ -10,7 +10,7 @@ name = "tastytrade-cli"
 description = "An easy-to-use command line interface for Tastytrade!"
 readme = "README.md"
 classifiers = [
-    "Development Status :: 4 - Beta",
+    "Development Status :: 5 - Production/Stable",
     "Environment :: Console",
     "Intended Audience :: Developers",
     "Intended Audience :: Financial and Insurance Industry",
@@ -34,12 +34,13 @@ classifiers = [
 requires-python = ">=3.10"
 license = {file = "LICENSE"}
 authors = [
-  {name = "Graeme Holliday", email = "graeme.holliday@pm.me"},
+  {name = "Graeme Holliday", email = "graeme@tastyware.dev"},
 ]
 dependencies = [
+    "anyio>=4.6.3",
     "py-gnuplot>=1.3",
     "rich>=13.8.1",
-    "tastytrade>=10.2.0",
+    "tastytrade>=11.0.1",
     "typer>=0.15.3",
     "yaspin>=3.1.0",
 ]

ttcli/__init__.py

@@ -4,5 +4,5 @@
 
 CUSTOM_CONFIG_PATH = ".config/ttcli/ttcli.cfg"
 TOKEN_PATH = ".config/ttcli/.session"
-VERSION = "0.6.3"
+VERSION = "1.0.0"
 __version__ = VERSION

ttcli/app.py

@@ -14,7 +14,7 @@
 from ttcli.utils import config_path
 from ttcli.watchlist import watchlist
 
-cli = Typer(no_args_is_help=True)
+cli = Typer(no_args_is_help=True, pretty_exceptions_show_locals=False)
 
 
 @cli.callback(invoke_without_command=True, no_args_is_help=True)
@@ -40,7 +40,7 @@ def main(
 cli.add_typer(plot, name="plot")
 cli.add_typer(portfolio, name="pf")
 cli.add_typer(trade, name="trade")
-cli.add_typer(watchlist, name=None)
+cli.add_typer(watchlist, name="wl")
 
 
 if __name__ == "__main__":

ttcli/data/ttcli.cfg

@@ -1,9 +1,9 @@
 [general]
 # the username & password can be passed to the CLI in 3 ways: here,
-# through the $TT_USERNAME/$TT_PASSWORD environment variables, or,
-# if neither is present, entered manually.
-# username = foo
-# password = bar
+# through the $TT_REFRESH/$TT_SECRET environment variables, or, if
+# neither is present, entered manually.
+# refresh_token = foo
+# client_secret = bar
 
 # the account number to use by default for trades/portfolio commands.
 # this bypasses the account choice menu.
@@ -50,3 +50,9 @@ show-theta = false
 # font for the plot title and labels
 font = Courier New
 font-size = 11
+
+[watchlist]
+# these control whether the columns show up when running `tt wl` commands
+show-beta = false
+show-dividend-yield = false
+show-indicators = false

ttcli/option.py

@@ -1,25 +1,26 @@
 import asyncio
-from collections import defaultdict
 from datetime import datetime
 from decimal import Decimal
 from typing import Annotated
 
+from anyio import move_on_after
 from rich.console import Console
 from rich.table import Table
 from tastytrade import DXLinkStreamer
-from tastytrade.dxfeed import Greeks, Summary, Quote, Trade
+from tastytrade.dxfeed import Greeks, Quote, Summary, Trade
 from tastytrade.instruments import (
     Future,
     FutureOption,
     NestedFutureOptionChain,
     NestedFutureOptionChainExpiration,
     NestedOptionChain,
     NestedOptionChainExpiration,
+)
+from tastytrade.instruments import (
     Option as TastytradeOption,
 )
-from tastytrade.market_data import get_market_data, get_market_data_by_type
+from tastytrade.market_data import get_market_data_by_type
 from tastytrade.order import (
-    InstrumentType,
     NewOrder,
     OrderAction,
     OrderTimeInForce,
@@ -217,11 +218,11 @@ async def call(
         bid = data_dict[strike_symbol].bid - data_dict[spread_strike.call].ask  # type: ignore
         ask = data_dict[strike_symbol].ask - data_dict[spread_strike.call].bid  # type: ignore
     else:
-        data = get_market_data(
+        data = get_market_data_by_type(
             sesh,
-            strike_symbol,
-            InstrumentType.FUTURE_OPTION if is_future else InstrumentType.EQUITY_OPTION,
-        )
+            future_options=[strike_symbol] if is_future else None,
+            options=[strike_symbol] if not is_future else None,
+        )[0]
         bid = data.bid or 0
         ask = data.ask or 0
     mid = fmt((bid + ask) / Decimal(2))
@@ -453,11 +454,11 @@ async def put(
         bid = data_dict[strike_symbol].bid - data_dict[spread_strike.call].ask  # type: ignore
         ask = data_dict[strike_symbol].ask - data_dict[spread_strike.call].bid  # type: ignore
     else:
-        data = get_market_data(
+        data = get_market_data_by_type(
             sesh,
-            strike_symbol,
-            InstrumentType.FUTURE_OPTION if is_future else InstrumentType.EQUITY_OPTION,
-        )
+            future_options=[strike_symbol] if is_future else None,
+            options=[strike_symbol] if not is_future else None,
+        )[0]
         bid = data.bid or 0
         ask = data.ask or 0
     mid = fmt((bid + ask) / Decimal(2))
@@ -640,7 +641,7 @@ async def strangle(
     if (call is not None or put is not None) and delta is not None:
         print_error("Must specify either delta or strike, but not both.")
         return
-    elif delta is not None and (call is not None or put is not None):
+    elif delta is None and (call is None or put is None):
         print_error("Please specify either delta, or strikes for both options.")
         return
     elif delta is not None and abs(delta) > 99:
@@ -901,7 +902,7 @@ async def strangle(
     if data.warnings:
         for warning in data.warnings:
             print_warning(warning.message)
-    warn_percent = sesh.config.getint(
+    warn_percent = sesh.config.getfloat(
         "portfolio", "bp-max-percent-per-position", fallback=None
     )
     if warn_percent and percent > warn_percent:
@@ -986,7 +987,10 @@ async def chain(
                 await streamer.subscribe(Trade, [future.streamer_symbol])
             else:
                 await streamer.subscribe(Trade, [symbol])
-            trade = await streamer.get_event(Trade)
+            with move_on_after(3) as scope:
+                trade = await streamer.get_event(Trade)
+            if scope.cancelled_caught:
+                raise Exception("Timed out listening for quote, is symbol active?")
 
             subchain.strikes.sort(key=lambda s: s.strike_price)
             mid_index = 0
@@ -1007,8 +1011,8 @@ async def chain(
 
             # take into account the symbol we subscribed to
             streamer_symbol = symbol if symbol[0] != "/" else future.streamer_symbol  # type: ignore
-            trade_dict = defaultdict(lambda: 0)
-            trade_dict[streamer_symbol] = trade.day_volume or 0
+            trade_dict: dict[str, Trade | None] = {}
+            trade_dict[streamer_symbol] = trade
 
             greeks_task = asyncio.create_task(listen_events(dxfeeds, Greeks, streamer))
             quote_task = asyncio.create_task(listen_events(dxfeeds, Quote, streamer))
@@ -1029,38 +1033,37 @@ async def chain(
             if show_oi:
                 summary_dict = summary_task.result()  # type: ignore
             if show_volume:
-                trade_dict = trade_task.result()  # type: ignore
+                trade_dict.update(trade_task.result())  # type: ignore
 
     for i, strike in enumerate(all_strikes):
-        put_bid = quote_dict[strike.put_streamer_symbol].bid_price
-        put_ask = quote_dict[strike.put_streamer_symbol].ask_price
-        call_bid = quote_dict[strike.call_streamer_symbol].bid_price
-        call_ask = quote_dict[strike.call_streamer_symbol].ask_price
+        put = quote_dict[strike.put_streamer_symbol]
+        call = quote_dict[strike.call_streamer_symbol]
         row = [
-            f"{fmt(call_bid)}",
-            f"{fmt(call_ask)}",
+            f"{fmt(call.bid_price)}" if call else "",
+            f"{fmt(call.ask_price)}" if call else "",
             f"{fmt(strike.strike_price)}",
-            f"{fmt(put_bid)}",
-            f"{fmt(put_ask)}",
+            f"{fmt(put.bid_price)}" if put else "",
+            f"{fmt(put.ask_price)}" if put else "",
         ]
         prepend = []
+        put_greek = greeks_dict[strike.put_streamer_symbol]
+        call_greek = greeks_dict[strike.call_streamer_symbol]
         if show_delta:
-            put_delta = int(greeks_dict[strike.put_streamer_symbol].delta * 100)
-            call_delta = int(greeks_dict[strike.call_streamer_symbol].delta * 100)
-            prepend.append(f"{call_delta:g}")
-            row.append(f"{put_delta:g}")
-
+            prepend.append(f"{int(call_greek.delta * 100):g}" if call_greek else "")
+            row.append(f"{int(put_greek.delta * 100):g}" if put_greek else "")
         if show_theta:
-            prepend.append(f"{abs(greeks_dict[strike.call_streamer_symbol].theta):.2f}")
-            row.append(f"{abs(greeks_dict[strike.put_streamer_symbol].theta):.2f}")
+            prepend.append(f"{abs(call_greek.theta):.2f}" if call_greek else "")
+            row.append(f"{abs(put_greek.theta):.2f}" if put_greek else "")
         if show_oi:
-            prepend.append(
-                f"{summary_dict[strike.call_streamer_symbol].open_interest}"  # type: ignore
-            )
-            row.append(f"{summary_dict[strike.put_streamer_symbol].open_interest}")  # type: ignore
+            call_summary = summary_dict[strike.call_streamer_symbol]  # type: ignore
+            put_summary = summary_dict[strike.put_streamer_symbol]  # type: ignore
+            prepend.append(f"{call_summary.open_interest}" if call_summary else "")
+            row.append(f"{put_summary.open_interest}" if put_summary else "")
         if show_volume:
-            prepend.append(f"{trade_dict[strike.call_streamer_symbol].day_volume}")  # type: ignore
-            row.append(f"{trade_dict[strike.put_streamer_symbol].day_volume}")  # type: ignore
+            call_trade = trade_dict[strike.call_streamer_symbol]
+            put_trade = trade_dict[strike.put_streamer_symbol]
+            prepend.append(f"{call_trade.day_volume or 0}" if call_trade else "")
+            row.append(f"{put_trade.day_volume or 0}" if put_trade else "")
 
         prepend.reverse()
         table.add_row(*(prepend + row), end_section=(i == mid_index - 1))

ttcli/order.py

@@ -43,6 +43,8 @@ def live(
         for o in orders
         if o.status == OrderStatus.LIVE or o.status == OrderStatus.RECEIVED
     ]
+    if not orders:
+        return
     instrument_dict: dict[InstrumentType, set[str]] = defaultdict(set)
     for o in orders:
         for leg in o.legs:

ttcli/plot.py

@@ -63,25 +63,30 @@ def gnuplot(sesh: RenewableSession, symbol: str, candles: list[str]) -> None:
         f.write("\n".join(candles))
     first = candles[0].split(",")[0]
     last = candles[-1].split(",")[0]
-    total_time = datetime.strptime(last, fmt) - datetime.strptime(first, fmt)
+    first_dt = datetime.strptime(first, fmt)
+    last_dt = datetime.strptime(last, fmt)
+    total_time = last_dt - first_dt
     boxwidth = int(total_time.total_seconds() / len(candles) * 0.5)
+    padding = timedelta(seconds=boxwidth)
+    first_padded = (first_dt - padding).strftime(fmt)
+    last_padded = (last_dt + padding).strftime(fmt)
     font = sesh.config.get("plot", "font", fallback="Courier New")
     font_size = sesh.config.getint("plot", "font-size", fallback=11)
     gnu.set(
         terminal=f"kittycairo transparent font '{font},{font_size}'",
         xdata="time",
         timefmt=f'"{fmt}"',
-        xrange=f'["{first}":"{last}"]',
+        xrange=f'["{first_padded}":"{last_padded}"]',
         yrange="[*:*]",
         datafile='separator ","',
         palette="defined (-1 '#D32F2F', 1 '#26BE81')",
         cbrange="[-1:1]",
         style="fill solid noborder",
         boxwidth=f"{boxwidth} absolute",
         title=f'"{symbol}" textcolor rgb "white"',
-        border="31 lc rgb 'white'",
-        xtics="textcolor rgb 'white'",
-        ytics="textcolor rgb 'white'",
+        border="3 lc rgb 'white'",
+        xtics="nomirror rotate by -45 textcolor rgb 'white' scale 0",
+        ytics="nomirror textcolor rgb 'white' scale 0",
     )
     gnu.unset("colorbox")
     os.system("clear")