Fix example to match previous changes.

Author: andrew-chang-dewitt

example_sync/example/__init__.py

@@ -0,0 +1,2 @@
+from . import models
+from .example import run

example_sync/example/example.py

@@ -9,7 +9,7 @@
 from db_wrapper import SyncClient, ConnectionParameters
 from db_wrapper.model import SyncModel as Model
 
-from models import (
+from example.models import (
     AModel,
     ExtendedModel,
     ExtendedModelData,
@@ -39,7 +39,7 @@ def default(self, obj: Any) -> Any:
     database=os.getenv('DB_NAME', 'dev'))
 client = SyncClient(conn_params)
 
-a_model = Model[AModel](client, 'a_model')
+a_model = Model[AModel](client, 'a_model', AModel)
 extended_model = ExtendedModel(client)
 
 
@@ -122,13 +122,14 @@ def run() -> None:
         new_id = create_a_model_record()
         created_a_model = read_a_model(new_id)
         create_extended_models()
-        extended_models = read_extended_models()
+        created_extended_models = read_extended_models()
     finally:
         client.disconnect()
 
     # Print results to stdout
-    print(json.dumps(created_a_model, cls=UUIDJsonEncoder))
-    print(json.dumps(extended_models, cls=UUIDJsonEncoder))
+    print(json.dumps(created_a_model.dict(), cls=UUIDJsonEncoder))
+    print(json.dumps([item.dict()
+          for item in created_extended_models], cls=UUIDJsonEncoder))
 
 
 if __name__ == '__main__':

example_sync/example/models/extended_model.py

@@ -5,10 +5,16 @@
 
 from psycopg2 import sql
 from psycopg2.extensions import register_adapter
-from psycopg2.extras import Json
+from psycopg2.extras import Json  # type: ignore
 
 from db_wrapper import SyncClient
-from db_wrapper.model import ModelData, SyncModel, SyncRead, SyncCreate
+from db_wrapper.model import (
+    ModelData,
+    RealDictRow,
+    SyncModel,
+    SyncRead,
+    SyncCreate
+)
 
 # tell psycopg2 to adapt all dictionaries to json instead of
 # the default hstore
@@ -51,10 +57,12 @@ def one(self, item: ExtendedModelData) -> ExtendedModelData:
             values=sql.SQL(',').join(values),
         )
 
-        result: List[ExtendedModelData] = \
+        query_result: List[RealDictRow] = \
             self._client.execute_and_return(query)
 
-        return result[0]
+        result = self._return_constructor(**query_result[0])
+
+        return result
 
 
 class ExtendedReader(SyncRead[ExtendedModelData]):
@@ -81,8 +89,10 @@ def all(self) -> List[ExtendedModelData]:
         query = sql.SQL('SELECT * FROM {table}').format(
             table=self._table)
 
-        result: List[ExtendedModelData] = self \
-            ._client.execute_and_return(query)
+        query_result: List[RealDictRow] = \
+            self._client.execute_and_return(query)
+
+        result = [self._return_constructor(**item) for item in query_result]
 
         return result
 
@@ -94,6 +104,14 @@ class ExtendedModel(SyncModel[ExtendedModelData]):
     create: ExtendedCreator
 
     def __init__(self, client: SyncClient) -> None:
-        super().__init__(client, 'extended_model')
-        self.read = ExtendedReader(self.client, self.table)
-        self.create = ExtendedCreator(self.client, self.table)
+        super().__init__(client, 'extended_model', ExtendedModelData)
+        self.read = ExtendedReader(
+            self.client,
+            self.table,
+            ExtendedModelData
+        )
+        self.create = ExtendedCreator(
+            self.client,
+            self.table,
+            ExtendedModelData
+        )