init measurements refactor

ooni · Oct 3, 2024 · 5f3fddd · 5f3fddd
1 parent ffe750e
commit 5f3fddd
Show file tree

Hide file tree

Showing 5 changed files with 119 additions and 150 deletions.
diff --git a/ooniapi/common/src/common/routers.py b/ooniapi/common/src/common/routers.py
@@ -18,3 +18,6 @@ class BaseModel(PydandicBaseModel):
             date: lambda v: v.strftime(ISO_FORMAT_DATE),
         }
     )
+
+class NotSupportedResponse(BaseModel):
+    mssg: str
diff --git a/ooniapi/services/oonimeasurements/src/oonimeasurements/errors.py b/ooniapi/services/oonimeasurements/src/oonimeasurements/errors.py
diff --git a/ooniapi/services/oonimeasurements/src/oonimeasurements/main.py b/ooniapi/services/oonimeasurements/src/oonimeasurements/main.py
@@ -8,7 +8,8 @@
 
 from prometheus_fastapi_instrumentator import Instrumentator
 
-from .routers import aggregation, measurements
+from .routers.v1 import aggregation
+from .routers.v1 import measurements
 
 from .dependencies import get_clickhouse_session
 from .common.dependencies import get_settings

diff --git a/...c/oonimeasurements/routers/aggregation.py → ...onimeasurements/routers/v1/aggregation.py b/...c/oonimeasurements/routers/aggregation.py → ...onimeasurements/routers/v1/aggregation.py
@@ -1,6 +1,5 @@
 """
 Aggregation API
-The routes are mounted under /api
 """
 
 from datetime import datetime, timedelta, date
@@ -20,7 +19,7 @@
 
 from oonimeasurements.common.clickhouse_utils import query_click, query_click_one_row
 from oonimeasurements.common.utils import jerror, commasplit, convert_to_csv
-from ..dependencies import get_clickhouse_session
+from ...dependencies import get_clickhouse_session
 
 
 router = APIRouter()