Skip to content

Conversation

@aagbsn
Copy link
Contributor

@aagbsn aagbsn commented Dec 17, 2025

resolve merge conflicts

aagbsn and others added 9 commits November 12, 2025 11:06
* in test_settings, add clickhouse_server fixture

* delay and decrease probe frequency of is_clickhouse_running to reduce logspam

* remove docker_ip and docker_services included by clickhouse_server
* add collectors to ooniapi

* Make method "GET" on route for list_collectors

* Use SettingsDep from ooniprobe.dependencies
* add geolookup to ooniapi probe services

this includes a small refactor to make the probe_geoip method re-usable

* Replace class docstring with pydantic.Field annotation

* use pydantic field validation for geolookup endpoint

* probe_services: validate probe_geoip; add type GeoLookupResult

* monkeypatch lookup_probe_cc and lookup_probe_network to provide static responses
* add bouncer/net-tests to ooniapi under new router bouncer

* fix pylint import complaints

* let fastapi validate input

* exclude unset parameters in bouncer/net-tests

* add bouncer tests from api/tests/integ/test_probe_services.py

I modified the tests to expect any error (other than http response 200)
because FastAPI returns HTTP error 422 Unprocessable Entity instead of 400,
as the tests do not supply a request that the model can validate

* raise HTTPException with status 400 for backwards-compatibility

* check status code on error is 400 for backwards compatibility with old probes
* Add logging to failing comparision function

* Trigger CI

* Trigger CI

* Fix bad db_asn logging

* Improve logging of geoip mismatches

* Fix extract_probe_ipaddr
* Add initial endpoint shape for event detector changepoints

* Add cusum changepoint list endpoint

* Remove unused request model

* Add event detector changepoint

* Fix event detector table migration for tests

* Add basic test for changepoint endpoint

* Add basic filtering test to changepoint endpoint

* Remove unused log

* Add tests to check filtering by date

* Add utils module with useful types

* Remove unused types

* Remove unused import

* Add enum for change direction

* Black reformat

* Add testing data from the DB

* Remove out dated comment

* Trigger ci

* fix typo in changepoint api endpoint

* trigger ci

* Modify changepoints table to add block_type column

* replace bad quotes

* Add block_type field to changepoints API
* Add prioritization CRUD methods

/api/_/show_countries_prioritization
/api/_/debug_prioritization

* rename routers/prio to routers/prio_crud

* use raw string in regex
* Add config bucket setting and function to read file from bucket

* trigger ci
@LDiazN
Copy link
Contributor

LDiazN commented Dec 18, 2025

LGTM

@LDiazN LDiazN merged commit 46b3555 into ooni:port-test-lists Dec 18, 2025
1 check failed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants