fix: ruff format + use pytest for validate-macros CI step

Made-with: Cursor

Author: claude

.github/workflows/ci.yml

@@ -138,4 +138,4 @@ jobs:
         run: uv sync --dev
 
       - name: Validate SQL macros
-        run: uv run python tests/test_macros.py
+        run: uv run pytest tests/test_macros.py -v

src/agent_farm/__main__.py

@@ -1,4 +1,5 @@
 """Entry point for python -m agent_farm."""
+
 from agent_farm.cli import cli
 
 if __name__ == "__main__":

tests/test_macros.py

@@ -76,6 +76,7 @@ def test_macros():
     # Register UDFs (getenv etc. – needed by macros); requires numpy for DuckDB create_function
     try:
         from agent_farm.udfs import register_udfs
+
         register_udfs(con)
     except Exception as e:
         pytest.skip(f"UDFs not available: {e}")
@@ -103,13 +104,10 @@ def test_macros():
     print("\nLoading macros...")
     sql_dir = os.path.join("src", "agent_farm", "sql")
     all_files = [os.path.basename(p) for p in glob.glob(os.path.join(sql_dir, "*.sql"))]
-    sql_files = [
-        os.path.join(sql_dir, f)
-        for f in SQL_LOAD_ORDER
-        if f in all_files
-    ]
+    sql_files = [os.path.join(sql_dir, f) for f in SQL_LOAD_ORDER if f in all_files]
     sql_files += sorted(
-        p for p in glob.glob(os.path.join(sql_dir, "*.sql"))
+        p
+        for p in glob.glob(os.path.join(sql_dir, "*.sql"))
         if os.path.basename(p) not in SQL_LOAD_ORDER
     )
     if not sql_files:

tests/test_spec_engine.py

@@ -162,17 +162,13 @@ def test_pia_agent_seeded(self, con):
 
     def test_skills_seeded(self, con):
         """Test that skills are seeded."""
-        result = con.sql(
-            "SELECT COUNT(*) FROM spec_objects WHERE kind = 'skill'"
-        ).fetchone()
+        result = con.sql("SELECT COUNT(*) FROM spec_objects WHERE kind = 'skill'").fetchone()
         assert result is not None
         assert result[0] >= 3  # At least 3 skills
 
     def test_schemas_seeded(self, con):
         """Test that schemas are seeded."""
-        result = con.sql(
-            "SELECT COUNT(*) FROM spec_objects WHERE kind = 'schema'"
-        ).fetchone()
+        result = con.sql("SELECT COUNT(*) FROM spec_objects WHERE kind = 'schema'").fetchone()
         assert result is not None
         assert result[0] >= 3  # At least 3 schemas
 
@@ -186,9 +182,7 @@ def test_templates_seeded(self, con):
 
     def test_orgs_seeded(self, con):
         """Test that organizations are seeded."""
-        result = con.sql(
-            "SELECT COUNT(*) FROM spec_objects WHERE kind = 'org'"
-        ).fetchone()
+        result = con.sql("SELECT COUNT(*) FROM spec_objects WHERE kind = 'org'").fetchone()
         assert result is not None
         assert result[0] >= 5  # All 5 orgs
 
@@ -309,9 +303,7 @@ def test_spec_search(self, spec_engine):
     def test_validate_payload_success(self, spec_engine):
         """Test validate_payload_against_spec with valid payload."""
         result = spec_engine.validate_payload_against_spec(
-            kind="schema",
-            name="agent_config_schema",
-            payload={"name": "test", "role": "planner"}
+            kind="schema", name="agent_config_schema", payload={"name": "test", "role": "planner"}
         )
         # Should succeed or have no schema (ok=True or note about no schema)
         assert "ok" in result or "note" in result
@@ -371,14 +363,12 @@ def test_view_consistency(self, full_setup):
         con = full_setup
 
         # Count from table
-        table_count = con.sql(
-            "SELECT COUNT(*) FROM spec_objects WHERE kind = 'agent'"
-        ).fetchone()[0]
+        table_count = con.sql("SELECT COUNT(*) FROM spec_objects WHERE kind = 'agent'").fetchone()[
+            0
+        ]
 
         # Count from view
-        view_count = con.sql(
-            "SELECT COUNT(*) FROM spec_agents_view"
-        ).fetchone()[0]
+        view_count = con.sql("SELECT COUNT(*) FROM spec_agents_view").fetchone()[0]
 
         assert table_count == view_count