Recorded path is missing path prefix for mounted sub-applications

[jdemaeyer]

Hi Simon, thanks so much for this great app!

I have a Starlette app that mounts three subapps, each under its own prefix, so that I can get three separate OpenAPI specs while still sharing some resources between the three sub-apps.

While all routes were correctly (i.e. including their subapp prefixes) shown in the Apitally dashboard on the first run, when I make an actual request, it is not counted towards one of these routes, but instead a new route without the subapp prefix is created.

Here's some minimal code to reproduce:

from starlette.applications import Starlette
from starlette.responses import JSONResponse
from starlette.routing import Match, Mount, Route


# XXX: This function copied from
#      https://github.com/apitally/apitally-py/blob/main/apitally/starlette.py#L226-L231

def get_path(request):
    for route in request.app.routes:
        match, _ = route.matches(request.scope)
        if match == Match.FULL:
            return route.path
    return None


async def subapp1_route(request):
    return JSONResponse({
        'subapp': 1,
        'path': get_path(request),
        'uid': request.path_params['uid'],
    })


async def subapp2_route(request):
    return JSONResponse({
        'subapp': 2,
        'path': get_path(request),
        'uid': request.path_params['uid'],
    })


async def root(request):
    return JSONResponse({
        'subapp': None,
        'path': get_path(request),
    })


subapp1 = Starlette(routes=[Route('/route/{uid}', subapp1_route)])
subapp2 = Starlette(routes=[Route('/route/{uid}', subapp2_route)])


app = Starlette(
    routes=[
        Route('/', root),
        Mount('/subapp1', subapp1),
        Mount('/subapp2', subapp2),
    ],
)

When opening /subapp1/route/123, I would expect to get /subapp1/route/{uid} as path, but instead I'm getting /route/{uid}. (Which of course makes sense, since request.app will be the subapp, which has no clue it's being mounted under some prefix.)

I've worked around this locally by changing

            return route.path

to

            return request.scope['root_path'] + route.path

But I'm unsure if that's adequate for all use cases.

PS: While trying around I also noticed that even without subapps, path detection breaks down when using Mount like in this example from the Starlette docs

[itssimon]

Thanks so much for reporting this. I'll look into it and aim to have a fix shortly.

[itssimon]

PS: While trying around I also noticed that even without subapps, path detection breaks down when using Mount like in this example from the Starlette docs

This is also fixed in #81. Thanks for catching this!

[itssimon]

v0.14.3 has been released with these fixes. Thanks again!

[jdemaeyer]

Hi Simon - awesome, thank you so much and happy new year!

[itssimon]

Frohes Neues zurück und Grüße ins Münsterland! Ausgewanderter Bielefelder hier :-)