v2 passing tests with close to new proposed structure. Edited __init_…

…_ files so v1 and v2 have their own versions of 'router'.

app/main.py

@@ -18,7 +18,7 @@
 from .models.latest import LatestResponse as Latest
 from .models.location import LocationResponse as Location
 from .models.location import LocationsResponse as Locations
-from .router import router
+from .router.v2 import router
 
 # ############
 # FastAPI App
@@ -83,12 +83,14 @@ async def handle_validation_error(request: Request, exc: pydantic.error_wrappers
 
 
 # Include routers.
+# APP.include_router(router, prefix="/", tags=["v1"])
 APP.include_router(router, prefix="/v2", tags=["v2"])
 
 # mount the existing Flask app
 # v1 @ /
 APP.mount("/", WSGIMiddleware(create_app()))
 
+
 # Running of app.
 if __name__ == "__main__":
     uvicorn.run(

app/router/__init__.py

@@ -1,7 +1,8 @@
 from fastapi import APIRouter
 
 # Create the router.
-router = APIRouter()
+# router = APIRouter()
 
 # The routes.
 from .v2 import latest, sources, locations  # isort:skip
+# from .v1 import confirmed, deaths, recovered, all

app/router/v2/__init__.py

@@ -0,0 +1,3 @@
+from fastapi import APIRouter
+
+router = APIRouter()

app/router/v2/latest.py

@@ -2,7 +2,7 @@
 
 from ...enums.sources import Sources
 from ...models.latest import LatestResponse as Latest
-from .. import router
+from . import router
 
 
 @router.get("/latest", response_model=Latest)

app/router/v2/locations.py

@@ -3,7 +3,7 @@
 from ...enums.sources import Sources
 from ...models.location import LocationResponse as Location
 from ...models.location import LocationsResponse as Locations
-from .. import router
+from . import router
 
 
 @router.get("/locations", response_model=Locations, response_model_exclude_unset=True)

app/router/v2/sources.py

@@ -1,5 +1,5 @@
 from ...data import data_sources
-from .. import router
+from . import router
 
 
 @router.get("/sources")