Make attributes for dict and list members of json-derived objects

Requested by @davetapley

Requires a major version bump

Author: hstern

spypoint/client.py

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from typing import Collection, Dict
+from typing import Collection, Dict, List
 
 import requests
 
@@ -25,29 +25,42 @@
 FILTERS_URL = f'{API_BASE}/api/v3/photo/filters'
 
 
-class Camera:
-    def __init__(self, id, **kwargs):  # noqa
-        for k, v in kwargs.items():
+class _AttrDict:
+    def __init__(self, d):  # noqa
+        for k, v in d.items():
+            if isinstance(v, Dict):
+                v = _AttrDict(v)
+            elif isinstance(v, List):
+                v_new = list()
+                for v_sub in v:
+                    if isinstance(v_sub, dict):
+                        v_new.append(_AttrDict(v_sub))
+                    else:
+                        v_new.append(v_sub)
+                v = tuple(v_new)
             if k and k[0] != '_':
                 setattr(self, k, v)
+
+
+class Camera(_AttrDict):
+    def __init__(self, id, **kwargs):  # noqa
+        super(Camera, self).__init__(kwargs)
         self.id = id
 
     def __repr__(self):
         return f'Camera({self.id})'
 
 
-class Photo:
+class Photo(_AttrDict):
     def __init__(self, **kwargs):
-        for k, v in kwargs.items():
-            if k and k[0] != '_':
-                setattr(self, k, v)
+        super(Photo, self).__init__(kwargs)
 
     def __repr__(self):
         return f'Photo({self.id})'  # noqa
 
     def url(self, size='large'):
-        section = getattr(self, size)
-        return f'https://{section.get("host")}/{section.get("path")}'
+        section = getattr(self, size, dict())
+        return f'https://{getattr(section, "host")}/{getattr(section, "path")}'
 
 
 class Client:

test/test_client.py

@@ -144,13 +144,19 @@ def test_tags(self, m: requests_mock.Mocker):
 class TestCamera(unittest.TestCase):
     tdata = json.loads('''
         {
-          "id": "elided01"
+          "id": "elided01",
+          "status": "test_status",
+          "config": {
+            "name": "test_camera"
+          }
         }
     ''')
 
     def test_camera(self):
         camera = c.Camera(**self.tdata)
         self.assertEqual(self.tdata['id'], camera.id)
+        self.assertEqual(self.tdata['status'], camera.status)
+        self.assertEqual(self.tdata['config']['name'], camera.config.name)
 
 
 class TestPhoto(unittest.TestCase):
@@ -219,4 +225,5 @@ def test_url_large(self):
 
     def _test_url(self, size):
         p = c.Photo(**self.tdata)
+        self.assertEqual(self.tdata['small']['headers'][0]['name'], p.small.headers[0].name)
         self.assertEqual(f'https://s3.amazonaws.com/{self.tdata[size]["path"]}', p.url(size))