Update tests

.github/workflows/fly.yml

@@ -61,7 +61,6 @@ jobs:
         if: github.ref == 'refs/heads/main' || github.event_name == 'workflow_dispatch'
         run: |
           flyctl deploy --remote-only --config fly.prod.toml
-          python update_database.py production https://offsets-db.fly.dev/files
 
       - name: Notify Slack on Failure
         if: failure() && (github.ref == 'refs/heads/main' || github.event_name == 'workflow_dispatch')
@@ -111,3 +110,8 @@ jobs:
                 }
               ]
             }
+
+      - name: Update Production DB
+        if: github.ref == 'refs/heads/main' || github.event_name == 'workflow_dispatch'
+        run: |
+          python update_database.py production https://offsets-db.fly.dev/files

.github/workflows/main.yaml

@@ -73,4 +73,13 @@ jobs:
 
       - name: Run tests
         run: |
-          python -m pytest -v
+          python -m pytest
+
+      - name: Upload code coverage to Codecov
+        uses: codecov/[email protected]
+        with:
+          file: ./coverage.xml
+          flags: unittests
+          env_vars: OS,PYTHON
+          name: codecov-umbrella
+          fail_ci_if_error: false

README.md

@@ -20,6 +20,7 @@ OffsetsDB-API, is a fastAPI application, designed to integrate and harmonize dat
 [![Fly.io Deployment](https://github.com/carbonplan/offsets-db-api/actions/workflows/fly.yml/badge.svg)](https://github.com/carbonplan/offsets-db-api/actions/workflows/fly.yml)
 [![Database Update](https://github.com/carbonplan/offsets-db-api/actions/workflows/update-db.yaml/badge.svg)](https://github.com/carbonplan/offsets-db-api/actions/workflows/updated-db.yaml)
 ![MIT License](https://badgen.net/badge/license/MIT/blue)
+[![Code Coverage Status][codecov-badge]][codecov-link]
 
 | Project         | GitHub Repo                                                                                    |
 | --------------- | ---------------------------------------------------------------------------------------------- |
@@ -61,3 +62,6 @@ All the code in this repository is [MIT](https://choosealicense.com/licenses/mit
 ## about us
 
 CarbonPlan is a non-profit organization that uses data and science for climate action. We aim to improve the transparency and scientific integrity of carbon removal and climate solutions through open data and tools. Find out more at [carbonplan.org](https://carbonplan.org/) or get in touch by [opening an issue](https://github.com/carbonplan/offsets-db/issues/new) or [sending us an email](mailto:[email protected]).
+
+[codecov-badge]: https://img.shields.io/codecov/c/github/carbonplan/offsets-db-api.svg?logo=codecov
+[codecov-link]: https://codecov.io/gh/carbonplan/offsets-db-api

codecov.yml

@@ -0,0 +1,23 @@
+codecov:
+  require_ci_to_pass: no
+  max_report_age: off
+
+comment: false
+
+ignore:
+  - 'tests/*.py'
+  - 'update_database.py'
+  - 'load-testing/*.py'
+  - 'migrations/*.py'
+  - 'migrations/versions/*.py'
+
+coverage:
+  precision: 2
+  round: down
+  status:
+    project:
+      default:
+        target: 95
+        informational: true
+    patch: off
+    changes: off

environment-dev.yml

@@ -8,11 +8,15 @@ dependencies:
   - apscheduler>=3.10.1
   - fastapi
   - fastparquet
+  - fsspec
   - gunicorn
   - httpx
+  - intake-parquet
+  - locust==2.20
   - pandas
-  - pandera
   - pip
+  - postgresql
+  - pyarrow
   - pydantic
   - pytest
   - pytest-cov
@@ -22,7 +26,6 @@ dependencies:
   - ujson
   - universal_pathlib
   - uvicorn
-  - postgresql
-  - locust==2.20
+  - watchdog
   - pip:
       - .

offsets_db_api/cache.py

@@ -5,7 +5,7 @@
 from fastapi_cache import FastAPICache
 
 from offsets_db_api.log import get_logger
-from offsets_db_api.query_helpers import _convert_query_params_to_dict
+from offsets_db_api.sql_helpers import _convert_query_params_to_dict
 
 logger = get_logger()
 

offsets_db_api/routers/charts.py

@@ -545,7 +545,7 @@ async def get_credits_by_project_id(
     for row in results:
         start_date = row.bin
         end_date = calculate_end_date(start_date, freq)
-        formatted_results.append({'start': start_date, 'end': end_date, 'value': row.value})
+        formatted_results.append({'start': start_date, 'end': end_date, 'value': int(row.value)})
 
     return PaginatedProjectCreditTotals(
         pagination=Pagination(
@@ -701,7 +701,7 @@ async def get_projects_by_credit_totals(
         bin_index = bins.index(bin_start)
         bin_end = bins[bin_index + 1] if bin_index < len(bins) - 1 else None
         formatted_results.append(
-            {'start': bin_start, 'end': bin_end, 'category': row.category, 'value': row.value}
+            {'start': bin_start, 'end': bin_end, 'category': row.category, 'value': int(row.value)}
         )
 
     logger.info(f'✅ {len(formatted_results)} bins generated')
@@ -801,7 +801,7 @@ async def get_projects_by_category(
 
     results = session.exec(projects_count_query).fetchall()
 
-    formatted_results = [{'category': row.category, 'value': row.value} for row in results]
+    formatted_results = [{'category': row.category, 'value': int(row.value)} for row in results]
 
     return PaginatedProjectCounts(
         data=formatted_results,