Merge branch 'feature/concrete-datacollector' of https://github.com/Ben-geo/mesa-frames into feature/concrete-datacollector

Author: Ben-geo

mesa_frames/concrete/datacollector.py

@@ -430,7 +430,9 @@ def _validate_reporter_table_columns(
         for col_name, required_column in reporter.items():
             if isinstance(required_column, str):
                 for k, v in self._model.agents[required_column].items():
-                    expected_columns.add((col_name + "_" + str(k.__class__.__name__)).lower())
+                    expected_columns.add(
+                        (col_name + "_" + str(k.__class__.__name__)).lower()
+                    )
             else:
                 expected_columns.add(col_name.lower())
 

tests/test_datacollector.py

@@ -433,7 +433,7 @@ def test_postgress(self, fix1_model, postgres_uri):
             )
         """)
         conn.commit()
-        
+
         model.dc = DataCollector(
             model=model,
             trigger=custom_trigger,
@@ -461,14 +461,16 @@ def test_postgress(self, fix1_model, postgres_uri):
         model_rows = cur.fetchall()
         assert model_rows == [(2, 12), (4, 12)]
 
-        cur.execute("SELECT step, wealth,age_ExampleAgentSet1, age_ExampleAgentSet2, age_ExampleAgentSet3 FROM agent_data WHERE step=2 ORDER BY wealth")
+        cur.execute(
+            "SELECT step, wealth,age_ExampleAgentSet1, age_ExampleAgentSet2, age_ExampleAgentSet3 FROM agent_data WHERE step=2 ORDER BY wealth"
+        )
         agent_rows = cur.fetchall()
         assert agent_rows == [
-            (2, 3, 10, 11, 3), 
+            (2, 3, 10, 11, 3),
             (2, 4, 20, 22, 4),
             (2, 5, 30, 33, 5),
             (2, 6, 40, 44, 6),
-            ]
+        ]
 
         cur.close()
         conn.close()