piker/brokers/ib/broker.py

@@ -555,56 +555,36 @@ def load_flex_trades(
         report = flexreport.FlexReport(path=path)
 
     trade_entries = report.extract('Trade')
-
-    # get reverse map to user account names
-    accounts = conf['accounts'].inverse
-    trades_by_account = {}
-
-    for t in trade_entries:
-
+    trades = {
         # XXX: LOL apparently ``toml`` has a bug
         # where a section key error will show up in the write
         # if you leave this as an ``int``?
-        trade = t.__dict__
+        str(t.__dict__['tradeID']): t.__dict__
+        for t in trade_entries
+    }
+
+    ln = len(trades)
+    log.info(f'Loaded {ln} trades from flex query')
+
+    trades_by_account = {}
+    for tid, trade in trades.items():
+        trades_by_account.setdefault(
             # oddly for some so-called "BookTrade" entries
             # this field seems to be blank, no cuckin clue.
             # trade['ibExecID']
-        tid = str(trade['tradeID'])
-        date = str(trade['tradeDate'])
-        acctid = accounts[str(trade['accountId'])]
-        trades_by_account.setdefault(
-            acctid, {}
-        ).setdefault(date, {})[tid] = trade
+            str(trade['accountId']), {}
+        )[tid] = trade
 
-    ln = len(trades_by_account.values())
-    log.info(f'Loaded {ln} trades from flex query')
-
-    # section = {'ib': trades_by_account}
-    for acctid, trades_by_id in trades_by_account.items():
-        with config.open_trade_ledger('ib', acctid) as ledger:
-            ledger.update({'ib': trades_by_id})
-
-    # pprint(section)
+    section = {'ib': trades_by_account}
+    pprint(section)
 
     # TODO: load the config first and append in
     # the new trades loaded here..
-    # try:
-    #     config.write(section, 'trades')
-    # except KeyError:
-    #     import pdbpp; pdbpp.set_trace()  # noqa
+    try:
+        config.write(section, 'trades')
+    except KeyError:
+        import pdbpp; pdbpp.set_trace()  # noqa
 
 
 if __name__ == '__main__':
-    import sys
-    import os
-
-    args = sys.argv
-    if len(args) > 1:
-        args = args[1:]
-        for arg in args:
-            path = os.path.abspath(arg)
-            load_flex_trades(path=path)
-    else:
-        # expect brokers.toml to have an entry and
-        # pull from the web service.
     load_flex_trades()

piker/config.py

@@ -18,11 +18,9 @@
 Broker configuration mgmt.
 
 """
-from contextlib import contextmanager as cm
 import platform
 import sys
 import os
-from os import path
 from os.path import dirname
 import shutil
 from typing import Optional
@@ -113,7 +111,6 @@ if _parent_user:
 
 _conf_names: set[str] = {
     'brokers',
-    'pp',
     'trades',
     'watchlists',
 }
@@ -150,21 +147,19 @@ def get_conf_path(
     conf_name: str = 'brokers',
 
 ) -> str:
-    '''
-    Return the top-level default config path normally under
-    ``~/.config/piker`` on linux for a given ``conf_name``, the config
-    name.
+    """Return the default config path normally under
+    ``~/.config/piker`` on linux.
 
     Contains files such as:
     - brokers.toml
-    - pp.toml
     - watchlists.toml
+    - trades.toml
 
     # maybe coming soon ;)
     - signals.toml
     - strats.toml
 
-    '''
+    """
     assert conf_name in _conf_names
     fn = _conf_fn_w_ext(conf_name)
     return os.path.join(
@@ -173,57 +168,12 @@ def get_conf_path(
     )
 
 
-@cm
-def open_trade_ledger(
-    broker: str,
-    account: str,
-
-) -> str:
-    '''
-    Indempotently create and read in a trade log file from the
-    ``<configuration_dir>/ledgers/`` directory.
-
-    Files are named per broker account of the form
-    ``<brokername>_<accountname>.toml``. The ``accountname`` here is the
-    name as defined in the user's ``brokers.toml`` config.
-
-    '''
-    ldir = path.join(_config_dir, 'ledgers')
-    if not path.isdir(ldir):
-        os.makedirs(ldir)
-
-    fname = f'trades_{broker}_{account}.toml'
-    tradesfile = path.join(ldir, fname)
-
-    if not path.isfile(tradesfile):
-        log.info(
-            f'Creating new local trades ledger: {tradesfile}'
-        )
-        with open(tradesfile, 'w') as cf:
-            pass  # touch
-    try:
-        with open(tradesfile, 'r') as cf:
-            ledger = toml.load(tradesfile)
-            cpy = ledger.copy()
-            yield cpy
-    finally:
-        if cpy != ledger:
-            # TODO: show diff output?
-            # https://stackoverflow.com/questions/12956957/print-diff-of-python-dictionaries
-            print(f'Updating ledger for {tradesfile}:\n')
-            ledger.update(cpy)
-
-            # we write on close the mutated ledger data
-            with open(tradesfile, 'w') as cf:
-                return toml.dump(ledger, cf)
-
-
 def repodir():
     '''
     Return the abspath to the repo directory.
 
     '''
-    dirpath = path.abspath(
+    dirpath = os.path.abspath(
         # we're 3 levels down in **this** module file
         dirname(dirname(os.path.realpath(__file__)))
     )