Skip to content

Return by default only a window of 7 days of data in the aggregation … #1186

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hellais wants to merge 1 commit into
base: master
Choose a base branch
from
+20 −11
Open

Return by default only a window of 7 days of data in the aggregation … #1186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions ooniapi/services/oonimeasurements/src/oonimeasurements/routers/data/aggregate_analysis.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,9 @@
from ...utils.api import ProbeASNOrNone, ProbeCCOrNone
from .list_analysis import (
SinceUntil,
utc_30_days_ago,
utc_today,
)
from .utils import TimeGrains, get_measurement_start_day_agg, parse_probe_asn_to_int
from .utils import TimeGrains, get_measurement_start_day_agg, parse_probe_asn_to_int, utc_7_days_ago

router = APIRouter()

Expand Down Expand Up @@ -303,7 +302,7 @@ async def get_aggregation_analysis(
probe_asn: ProbeASNOrNone = None,
probe_cc: ProbeCCOrNone = None,
ooni_run_link_id: Annotated[Optional[str], Query()] = None,
since: SinceUntil = utc_30_days_ago(),
since: SinceUntil = utc_7_days_ago(),
until: SinceUntil = utc_today(),
time_grain: Annotated[TimeGrains, Query()] = "day",
anomaly_sensitivity: Annotated[float, Query()] = 0.9,
Expand Down Expand Up @@ -522,7 +521,7 @@ async def list_changepoints(
probe_asn: ProbeASNOrNone = None,
probe_cc: ProbeCCOrNone = None,
domain: str | None = Query(default=None),
since: SinceUntil = utc_30_days_ago(),
since: SinceUntil = utc_7_days_ago(),
until: SinceUntil = utc_today(),
) -> ListChangePointsResponse:
conditions = []
Expand Down
4 changes: 2 additions & 2 deletions ...api/services/oonimeasurements/src/oonimeasurements/routers/data/aggregate_observations.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
SinceUntil,
TimeGrains,
get_measurement_start_day_agg,
utc_30_days_ago,
utc_7_days_ago,
utc_today,
)

Expand Down Expand Up @@ -64,7 +64,7 @@ async def get_aggregation_observations(
probe_cc: Annotated[List[str] | None, Query()] = None,
ip: Annotated[List[str] | None, Query()] = None,
ooni_run_link_id: Annotated[Optional[str], Query()] = None,
since: SinceUntil = utc_30_days_ago(),
since: SinceUntil = utc_7_days_ago(),
until: SinceUntil = utc_today(),
time_grain: Annotated[TimeGrains, Query()] = "day",
db=Depends(get_clickhouse_session),
Expand Down
4 changes: 2 additions & 2 deletions ooniapi/services/oonimeasurements/src/oonimeasurements/routers/data/list_analysis.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
from .utils import (
SinceUntil,
parse_probe_asn_to_int,
utc_30_days_ago,
utc_7_days_ago,
utc_today,
)

Expand Down Expand Up @@ -73,7 +73,7 @@ async def list_measurements(
probe_asn: Annotated[Union[int, str, None], Query()] = None,
probe_cc: Annotated[Optional[str], Query(max_length=2, min_length=2)] = None,
test_name: Annotated[Optional[str], Query()] = None,
since: SinceUntil = utc_30_days_ago(),
since: SinceUntil = utc_7_days_ago(),
until: SinceUntil = utc_today(),
order_by: Annotated[
Literal[
Expand Down
11 changes: 8 additions & 3 deletions ooniapi/services/oonimeasurements/src/oonimeasurements/routers/data/list_observations.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,12 @@

from ...common.clickhouse_utils import async_query_click
from ...common.dependencies import get_clickhouse_session, get_settings
from .utils import parse_probe_asn_to_int
from .utils import (
SinceUntil,
parse_probe_asn_to_int,
utc_7_days_ago,
utc_today,
)

router = APIRouter()

Expand Down Expand Up @@ -171,8 +176,8 @@ async def list_observations(
probe_asn: Annotated[Union[int, str, None], Query()] = None,
probe_cc: Annotated[Optional[str], Query(max_length=2, min_length=2)] = None,
test_name: Annotated[Optional[str], Query()] = None,
since: Annotated[Optional[date], Query()] = None,
until: Annotated[Optional[date], Query()] = None,
since: SinceUntil = utc_7_days_ago(),
until: SinceUntil = utc_today(),
order_by: Annotated[
Literal[
"measurement_start_time",
Expand Down
5 changes: 5 additions & 0 deletions ooniapi/services/oonimeasurements/src/oonimeasurements/routers/data/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,11 @@ def utc_30_days_ago():
datetime.now(timezone.utc) - timedelta(days=30), datetime.min.time()
).replace(tzinfo=None)

def utc_7_days_ago():
return datetime.combine(
datetime.now(timezone.utc) - timedelta(days=7), datetime.min.time()
).replace(tzinfo=None)


def utc_today():
return datetime.combine(datetime.now(timezone.utc), datetime.min.time()).replace(
Expand Down
Loading