Merge pull request #2291 from compdemocracy/te-delphi-tests-2

add more tests

Author: tevko

.github/workflows/python-ci.yml

@@ -66,8 +66,12 @@ jobs:
         echo "Copying test files into container..."
         docker compose -f docker-compose.test.yml cp delphi/tests delphi:/app/tests
         docker compose -f docker-compose.test.yml cp delphi/real_data delphi:/app/real_data
+        echo "Copying coverage script into container..."
+        docker compose -f docker-compose.test.yml cp delphi/generate_coverage_md.py delphi:/app/generate_coverage_md.py
+        echo "Copying script to be tested into container..."
+        docker compose -f docker-compose.test.yml cp delphi/polismath/run_math_pipeline.py delphi:/app/run_math_pipeline.py
 
-        echo "Running tests..."
+        echo "Running tests and generating coverage report..."
         docker compose \
           -f docker-compose.test.yml \
           --env-file .env \
@@ -76,15 +80,44 @@ jobs:
           -e AWS_REGION=us-east-1 \
           -e AWS_ACCESS_KEY_ID=dummy \
           -e AWS_SECRET_ACCESS_KEY=dummy \
+          -e POSTGRES_HOST=postgres \
+          -e POSTGRES_PASSWORD=PdwPNS2mDN73Vfbc \
+          -e POSTGRES_DB=polis-test \
           delphi \
           bash -c " \
+            set -e; \
             echo '--- Setting up DynamoDB Tables ---'; \
             python create_dynamodb_tables.py --region us-east-1; \
             echo '--- Running Pytest ---'; \
-            pytest /app/tests \
+            export PYTHONPATH=\$PYTHONPATH:/app; \
+            pytest --cov=polismath --cov=run_math_pipeline --cov-report=xml:/app/coverage.xml /app/tests --ignore=/app/tests/test_pakistan_conversation.py
+            echo '--- Generating Coverage Comment Text ---'; \
+            python /app/generate_coverage_md.py > /app/coverage-comment.md \
           "
 
-    - name: 7. Show service logs on failure
+    - name: 7. Copy coverage report from container
+      if: success()
+      run: |
+        echo "Copying coverage-comment.md from delphi container..."
+        docker compose -f docker-compose.test.yml cp delphi:/app/coverage-comment.md .
+
+    - name: 8. Post Coverage Comment
+      if: success() && github.event_name == 'pull_request'
+      uses: actions/github-script@v6
+      with:
+        github-token: ${{ secrets.GITHUB_TOKEN }}
+        script: |
+          const fs = require('fs');
+          const commentBody = fs.readFileSync('coverage-comment.md', 'utf8');
+          
+          await github.rest.issues.createComment({
+            issue_number: context.issue.number,
+            owner: context.repo.owner,
+            repo: context.repo.repo,
+            body: "## Coverage Report\n\n" + commentBody
+          });
+
+    - name: 9. Show service logs on failure
       if: failure()
       run: |
         echo "=== Delphi service logs ==="
@@ -94,7 +127,7 @@ jobs:
         echo "=== DynamoDB service logs ==="
         docker compose -f docker-compose.test.yml logs dynamodb || true
 
-    - name: 8. Clean up services
+    - name: 10. Clean up services
       if: always()
       run: |
         echo "Cleaning up services..."

delphi/Makefile

@@ -60,8 +60,6 @@ clean: ## Clean build artifacts
 	rm -rf build/
 	rm -rf dist/
 	rm -rf htmlcov/
-	rm -f coverage.xml
-	rm -f .coverage
 	rm -f bandit-report.json
 
 # Build

delphi/generate_coverage_md.py

@@ -0,0 +1,80 @@
+#!/usr/bin/env python
+
+import xml.etree.ElementTree as ET
+import sys
+
+def main():
+    """
+    Parses a coverage.xml file and prints a Markdown table to stdout.
+    """
+    try:
+        tree = ET.parse('/app/coverage.xml')
+        root = tree.getroot()
+
+        lines = [
+            "| File | Stmts | Miss | Cover |",
+            "|------|-------|------|-------|"
+        ]
+        
+        total_statements = 0
+        total_missed = 0
+        
+        packages = root.find('packages')
+        if packages is None:
+            print("Could not find 'packages' tag in coverage.xml", file=sys.stderr)
+            sys.exit(1)
+
+        all_files = []
+        for package in packages.findall('package'):
+            classes = package.find('classes')
+            if classes is None:
+                continue
+            
+            for cls in classes.findall('class'):
+                filename = cls.get('filename') # This is the path
+                line_rate = float(cls.get('line-rate', '0'))
+                
+                lines_node = cls.find('lines')
+                if lines_node is None:
+                    continue
+                    
+                lines_valid = 0
+                lines_covered = 0
+                
+                for line in lines_node.findall('line'):
+                    lines_valid += 1
+                    if int(line.get('hits', '0')) > 0:
+                        lines_covered += 1
+                
+                if lines_valid == 0:
+                    continue # Skip files with no executable statements
+
+                lines_missed = lines_valid - lines_covered
+                total_statements += lines_valid
+                total_missed += lines_missed
+                
+                coverage_percent = line_rate * 100
+                all_files.append((filename, lines_valid, lines_missed, coverage_percent))
+
+        # Sort files alphabetically
+        all_files.sort(key=lambda x: x[0])
+        
+        for f in all_files:
+            lines.append(f"| {f[0]} | {f[1]} | {f[2]} | {f[3]:.0f}% |")
+
+        if total_statements > 0:
+            total_coverage = ((total_statements - total_missed) / total_statements) * 100
+            lines.append(f"| **Total** | **{total_statements}** | **{total_missed}** | **{total_coverage:.0f}%** |")
+        else:
+            lines.append("| **Total** | **0** | **0** | **N/A** |")
+
+        # Print to stdout
+        print('\n'.join(lines))
+            
+    except Exception as e:
+        print(f"Error parsing coverage.xml: {e}", file=sys.stderr)
+        print(f"Error generating coverage report: {e}")
+        sys.exit(1)
+
+if __name__ == "__main__":
+    main()

delphi/pyproject.toml

@@ -121,3 +121,6 @@ filterwarnings = [
     # Ignore python_multipart deprecation warning from ddtrace (third-party)
     "ignore:Please use `import python_multipart`:PendingDeprecationWarning:ddtrace.internal.module",
 ]
+
+[tool.coverage.run]
+relative_files = true

delphi/real_data/r4tykwac8thvzv35jrn53/python_output/conversation_result.json

@@ -1,5 +1,5 @@
 {
-  "last_updated": 1762912986405,
+  "last_updated": 1763157841353,
   "participant_count": 536,
   "comment_count": 314,
   "vote_stats": {
@@ -19562,8 +19562,8 @@
     }
   },
   "zid": "biodiversity",
-  "lastVoteTimestamp": 1762912986405,
-  "lastModTimestamp": 1762912986405,
+  "lastVoteTimestamp": 1763157841353,
+  "lastModTimestamp": 1763157841353,
   "tids": [
     0,
     1,
@@ -26469,5 +26469,5 @@
     "disagree": [],
     "comment-stats": {}
   },
-  "math_tick": 27987
+  "math_tick": 32844
 }