From 89b20895622d572f7b2825be666bdffa78eb52f7 Mon Sep 17 00:00:00 2001
From: Tyler Goodlet <jgbt@protonmail.com>
Date: Tue, 27 Jul 2021 08:28:44 -0400
Subject: [PATCH] Fixup missing ib section handling; drop `.api` subsection

---
 config/brokers.toml |  6 +++---
 piker/brokers/ib.py | 21 ++++++++++++++-------
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/config/brokers.toml b/config/brokers.toml
index 927bd302..e14fdf20 100644
--- a/config/brokers.toml
+++ b/config/brokers.toml
@@ -11,15 +11,15 @@ key_descr = "api_0"
 public_key = ""
 private_key = ""
 
-[ib.api]
-ipaddr = "127.0.0.1"
+[ib]
+host = "127.0.0.1"
 
 [ib.accounts]
 margin = ""
 registered = ""
 paper = ""
 
-[ib.api.ports]
+[ib.ports]
 gw = 4002
 tws = 7497
 order = [ "gw", "tws",]
diff --git a/piker/brokers/ib.py b/piker/brokers/ib.py
index c7533a96..f604fc93 100644
--- a/piker/brokers/ib.py
+++ b/piker/brokers/ib.py
@@ -656,25 +656,28 @@ def get_config() -> dict[str, Any]:
 
     section = conf.get('ib')
 
-    if not section:
+    if section is None:
         log.warning(f'No config section found for ib in {path}')
-        return
+        return {}
 
     return section
 
 
 @asynccontextmanager
 async def _aio_get_client(
+
     host: str = '127.0.0.1',
     port: int = None,
+
     client_id: Optional[int] = None,
+
 ) -> Client:
-    """Return an ``ib_insync.IB`` instance wrapped in our client API.
+    '''Return an ``ib_insync.IB`` instance wrapped in our client API.
 
     Client instances are cached for later use.
 
     TODO: consider doing this with a ctx mngr eventually?
-    """
+    '''
     conf = get_config()
 
     # first check cache for existing client
@@ -699,17 +702,21 @@ async def _aio_get_client(
 
         ib = NonShittyIB()
 
-        # attempt to get connection info from config
-        ports = conf['api'].get(
+        # attempt to get connection info from config; if no .toml entry
+        # exists, we try to load from a default localhost connection.
+        host = conf.get('host', '127.0.0.1')
+        ports = conf.get(
             'ports',
+
+            # default order is to check for gw first
             {
-                # default order is to check for gw first
                 'gw': 4002,
                 'tws': 7497,
                 'order': ['gw', 'tws']
             }
         )
         order = ports['order']
+
         try_ports = [ports[key] for key in order]
         ports = try_ports if port is None else [port]