Skip to content
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.

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

UrlDispatcher.add_routes to return list of resource objects #3866

Closed
ntai opened this issue Jun 25, 2019 · 15 comments
Closed

UrlDispatcher.add_routes to return list of resource objects #3866

ntai opened this issue Jun 25, 2019 · 15 comments
Labels
good first issue Good for newcomers Hacktoberfest We think it's good for https://hacktoberfest.digitalocean.com/ need pull request

Comments

@ntai
Copy link

ntai commented Jun 25, 2019

Long story short

UrlDispatcher.add_routes returns nothing. I'd like to see a list of resources returned.

right now,

    def add_routes(self, routes):
        for route_obj in routes:
            route_obj.register(self)

What I want -

    def add_routes(self, routes):
        return [ route_obj.register(self) for route_obj in routes ]

Not sure route_obj.register returns a resource.

Expected behaviour

resources = router.add_routes(routes)

Actual behaviour

router.add_routes(routes) returns nothing

Steps to reproduce

This is an enhancement request.

Your environment

aiohttp 3.0.1
Python 3.6
Ubuntu 18.04 LTS

@asvetlov
Copy link
Member

Why? What is your motivation?

@ntai
Copy link
Author

ntai commented Jun 25, 2019

I can hand it over to cors to do post-add_route. Right now, I have to get to resource by app.router._resources.
if I'm adding multiple routes to top-level but with different cors, it's a chore to separate them out after add_routes called, but if add_routes returns a list of resources from the routes, it's a piece of cake.

    for resource in app.router.add_routes(routes):
      cors.add(resource, { '*': aiohttp_cors.ResourceOptions(allow_credentials=True, expose_headers="*", allow_headers="*") })

@asvetlov
Copy link
Member

Not so easy.
First of all, add_routes() should return a list of routes if any, just by name.
Resource can have multiple routes, a route per supported HTTP method.
Secondly, now router.add_resoouce() can reuse the latest resource if possible. There is a case when add_routes() doesn't add a new resource at all.
Thirdly, there is app.router.resources() API, there is no need to access the private _resources method.

@ntai
Copy link
Author

ntai commented Jun 26, 2019

Here is what I ended up doing to get around the aiohttp, aiohttp_cors and socket.io.

    app.router.add_routes(routes)
    app.router.add_static("/", rootdir)
    for resource in app.router._resources:
      if resource.raw_match("/socket.io/"):
        continue
      cors.add(resource, { '*': aiohttp_cors.ResourceOptions(allow_credentials=True, expose_headers="*", allow_headers="*") })
      pass

If I can get the resources back from add_routes, I don't have to exclude the "socket.io" to declare cors header.

if add_routes returns the newly added resources, that is perfectly fine. I didn't know it's not one-to-one match. The interaction between socket.io and aiohttp_cors is pretty cumbersome.

@asvetlov
Copy link
Member

Please re-read my previous message:

  1. add_routes() adds routes and should return added routes, not resources. Otherwise, the behavior is confusing.
  2. add_routes() can be called multiple times. aiohttp doesn't forbid it.

Your code is perfectly fine if you manage access to the private variable:

    app.router.add_routes(routes)
    app.router.add_static("/", rootdir)
    for resource in app.router.resources():
      if resource.raw_match("/socket.io/"):
        continue
      cors.add(resource, { '*': aiohttp_cors.ResourceOptions(allow_credentials=True, expose_headers="*", allow_headers="*") })

aiohttp API should be self-consistent. Your proposal is not, sorry.

@ntai
Copy link
Author

ntai commented Jun 26, 2019

class Resource(AbstractResource): add_route returns ResourceRoute object. I think what I'm asking is to return the list of ResourceRoute objects returned from add_routes.

@ntai
Copy link
Author

ntai commented Jun 26, 2019

Let me ask this in different way - how can I turn the routes object to the list of resources? I need to hand the resources over to aiohttp_cors as cors.add() takes resource object.

My "workaround" is a result of digging into socketio to find out it is adding routes by itself to the aiohttp router. I shouldn't need to do this. I guess I don't care add_routes returns the list of resources or not. I need a way to convert the routes to the added resources without going into the router.resources(). How can I do this?

@ntai
Copy link
Author

ntai commented Jul 30, 2019

aiohttp API should be self-consistent. Your proposal is not, sorry.

aiohttp_cors and aiohttp do not work well together. Even if aiohttp API may be consistent, if it's not working well with common pattern like implementing cors, the problem is in the API design of either aiohttp or aiohttp_cors, or both.

@asvetlov
Copy link
Member

Sorry for the delay.
I'm ok with returning a list of AbstractRoute objects from add_routes().
Application.add_routes() should be updated as well.
The issue is waiting for a champion.

@asvetlov asvetlov added the Hacktoberfest We think it's good for https://hacktoberfest.digitalocean.com/ label Sep 19, 2019
@ntai
Copy link
Author

ntai commented Sep 24, 2019

Thanks for taking a look at this again. Here is a similar question asked by someone else. It is not obvious to figure this out.

Apache, lighttp, etc. can do this by a single line of config. In some sense, needing aiohttp_cors module is the problem itself. socketio.AsyncServer() has an option cors_allowed_origins='*'. I probably should rather ask to support router.add_route and/or router.add_routes takes an option cors_allowed_origins='*' so that I don't have to deal with aiohttp_cors to begin with.

@asvetlov
Copy link
Member

CORS is a complex protocol.
People use the very limited subset very often (Access-Control-Allow-Origin: * HTTP header).
But a good library should provide all features supported by the standard.
aiohttp-cors does it. The complex functionality prevents it from including into aiohttp core.

P.S.
socketio and aiohttp have different views on software design. I don't want to argue what way is better, people have different colors and habits you know. Personally I've found socketio approach simpler for newbies but much more limited.

@zlatsic
Copy link
Contributor

zlatsic commented Oct 2, 2019

Hello!

I'd like to try to solve this issue, but I have some questions first. Since the register function doesn't return anything at the moment, should I modify it so it returns the created AbstractRoute? In that case, what about the StaticDef and the fact that both inherit AbstractRouteDef whose register function returns None at the moment? Should this None perhaps be modified to Any or Optional and then we could say that the register function returns the created resource?

@asvetlov
Copy link
Member

asvetlov commented Oct 3, 2019

Feel free to return routes (AbstractRoute perhaps) from methods that return nothing now.

@myusko
Copy link

myusko commented May 20, 2020

@asvetlov should we close the issue? since #4141 was merged.

@asvetlov
Copy link
Member

I think yes, thanks!

netbsd-srcmastr referenced this issue in NetBSD/pkgsrc Oct 24, 2020
This fixes py-yarl in pkgsrc being too new for py-aiohttp.


3.7.0 (2020-10-24)
==================

Features
--------

- Response headers are now prepared prior to running ``on_response_prepare`` hooks, directly before headers are sent to the client.
  `#1958 <https://github.com/aio-libs/aiohttp/issues/1958>`_
- Add a ``quote_cookie`` option to ``CookieJar``, a way to skip quotation wrapping of cookies containing special characters.
  `#2571 <https://github.com/aio-libs/aiohttp/issues/2571>`_
- Call ``AccessLogger.log`` with the current exception available from ``sys.exc_info()``.
  `#3557 <https://github.com/aio-libs/aiohttp/issues/3557>`_
- `web.UrlDispatcher.add_routes` and `web.Application.add_routes` return a list
  of registered `AbstractRoute` instances. `AbstractRouteDef.register` (and all
  subclasses) return a list of registered resources registered resource.
  `#3866 <https://github.com/aio-libs/aiohttp/issues/3866>`_
- Added properties of default ClientSession params to ClientSession class so it is available for introspection
  `#3882 <https://github.com/aio-libs/aiohttp/issues/3882>`_
- Don't cancel web handler on peer disconnection, raise `OSError` on reading/writing instead.
  `#4080 <https://github.com/aio-libs/aiohttp/issues/4080>`_
- Implement BaseRequest.get_extra_info() to access a protocol transports' extra info.
  `#4189 <https://github.com/aio-libs/aiohttp/issues/4189>`_
- Added `ClientSession.timeout` property.
  `#4191 <https://github.com/aio-libs/aiohttp/issues/4191>`_
- allow use of SameSite in cookies.
  `#4224 <https://github.com/aio-libs/aiohttp/issues/4224>`_
- Use ``loop.sendfile()`` instead of custom implementation if available.
  `#4269 <https://github.com/aio-libs/aiohttp/issues/4269>`_
- Apply SO_REUSEADDR to test server's socket.
  `#4393 <https://github.com/aio-libs/aiohttp/issues/4393>`_
- Use .raw_host instead of slower .host in client API
  `#4402 <https://github.com/aio-libs/aiohttp/issues/4402>`_
- Allow configuring the buffer size of input stream by passing ``read_bufsize`` argument.
  `#4453 <https://github.com/aio-libs/aiohttp/issues/4453>`_
- Pass tests on Python 3.8 for Windows.
  `#4513 <https://github.com/aio-libs/aiohttp/issues/4513>`_
- Add `method` and `url` attributes to `TraceRequestChunkSentParams` and `TraceResponseChunkReceivedParams`.
  `#4674 <https://github.com/aio-libs/aiohttp/issues/4674>`_
- Add ClientResponse.ok property for checking status code under 400.
  `#4711 <https://github.com/aio-libs/aiohttp/issues/4711>`_
- Don't ceil timeouts that are smaller than 5 seconds.
  `#4850 <https://github.com/aio-libs/aiohttp/issues/4850>`_
- TCPSite now listens by default on all interfaces instead of just IPv4 when `None` is passed in as the host.
  `#4894 <https://github.com/aio-libs/aiohttp/issues/4894>`_
- Bump ``http_parser`` to 2.9.4
  `#5070 <https://github.com/aio-libs/aiohttp/issues/5070>`_


Bugfixes
--------

- Fix keepalive connections not being closed in time
  `#3296 <https://github.com/aio-libs/aiohttp/issues/3296>`_
- Fix failed websocket handshake leaving connection hanging.
  `#3380 <https://github.com/aio-libs/aiohttp/issues/3380>`_
- Fix tasks cancellation order on exit. The run_app task needs to be cancelled first for cleanup hooks to run with all tasks intact.
  `#3805 <https://github.com/aio-libs/aiohttp/issues/3805>`_
- Don't start heartbeat until _writer is set
  `#4062 <https://github.com/aio-libs/aiohttp/issues/4062>`_
- Fix handling of multipart file uploads without a content type.
  `#4089 <https://github.com/aio-libs/aiohttp/issues/4089>`_
- Preserve view handler function attributes across middlewares
  `#4174 <https://github.com/aio-libs/aiohttp/issues/4174>`_
- Fix the string representation of ``ServerDisconnectedError``.
  `#4175 <https://github.com/aio-libs/aiohttp/issues/4175>`_
- Raising RuntimeError when trying to get encoding from not read body
  `#4214 <https://github.com/aio-libs/aiohttp/issues/4214>`_
- Remove warning messages from noop.
  `#4282 <https://github.com/aio-libs/aiohttp/issues/4282>`_
- Raise ClientPayloadError if FormData re-processed.
  `#4345 <https://github.com/aio-libs/aiohttp/issues/4345>`_
- Fix a warning about unfinished task in ``web_protocol.py``
  `#4408 <https://github.com/aio-libs/aiohttp/issues/4408>`_
- Fixed 'deflate' compression. According to RFC 2616 now.
  `#4506 <https://github.com/aio-libs/aiohttp/issues/4506>`_
- Fixed OverflowError on platforms with 32-bit time_t
  `#4515 <https://github.com/aio-libs/aiohttp/issues/4515>`_
- Fixed request.body_exists returns wrong value for methods without body.
  `#4528 <https://github.com/aio-libs/aiohttp/issues/4528>`_
- Fix connecting to link-local IPv6 addresses.
  `#4554 <https://github.com/aio-libs/aiohttp/issues/4554>`_
- Fix a problem with connection waiters that are never awaited.
  `#4562 <https://github.com/aio-libs/aiohttp/issues/4562>`_
- Always make sure transport is not closing before reuse a connection.

  Reuse a protocol based on keepalive in headers is unreliable.
  For example, uWSGI will not support keepalive even it serves a
  HTTP 1.1 request, except explicitly configure uWSGI with a
  ``--http-keepalive`` option.

  Servers designed like uWSGI could cause aiohttp intermittently
  raise a ConnectionResetException when the protocol poll runs
  out and some protocol is reused.
  `#4587 <https://github.com/aio-libs/aiohttp/issues/4587>`_
- Handle the last CRLF correctly even if it is received via separate TCP segment.
  `#4630 <https://github.com/aio-libs/aiohttp/issues/4630>`_
- Fix the register_resource function to validate route name before splitting it so that route name can include python keywords.
  `#4691 <https://github.com/aio-libs/aiohttp/issues/4691>`_
- Improve typing annotations for ``web.Request``, ``aiohttp.ClientResponse`` and
  ``multipart`` module.
  `#4736 <https://github.com/aio-libs/aiohttp/issues/4736>`_
- Fix resolver task is not awaited when connector is cancelled
  `#4795 <https://github.com/aio-libs/aiohttp/issues/4795>`_
- Fix a bug "Aiohttp doesn't return any error on invalid request methods"
  `#4798 <https://github.com/aio-libs/aiohttp/issues/4798>`_
- Fix HEAD requests for static content.
  `#4809 <https://github.com/aio-libs/aiohttp/issues/4809>`_
- Fix incorrect size calculation for memoryview
  `#4890 <https://github.com/aio-libs/aiohttp/issues/4890>`_
- Add HTTPMove to _all__.
  `#4897 <https://github.com/aio-libs/aiohttp/issues/4897>`_
- Fixed the type annotations in the ``tracing`` module.
  `#4912 <https://github.com/aio-libs/aiohttp/issues/4912>`_
- Fix typing for multipart ``__aiter__``.
  `#4931 <https://github.com/aio-libs/aiohttp/issues/4931>`_
- Fix for race condition on connections in BaseConnector that leads to exceeding the connection limit.
  `#4936 <https://github.com/aio-libs/aiohttp/issues/4936>`_
- Add forced UTF-8 encoding for ``application/rdap+json`` responses.
  `#4938 <https://github.com/aio-libs/aiohttp/issues/4938>`_
- Fix inconsistency between Python and C http request parsers in parsing pct-encoded URL.
  `#4972 <https://github.com/aio-libs/aiohttp/issues/4972>`_
- Fix connection closing issue in HEAD request.
  `#5012 <https://github.com/aio-libs/aiohttp/issues/5012>`_
- Fix type hint on BaseRunner.addresses (from ``List[str]`` to ``List[Any]``)
  `#5086 <https://github.com/aio-libs/aiohttp/issues/5086>`_
- Make `web.run_app()` more responsive to Ctrl+C on Windows for Python < 3.8. It slightly
  increases CPU load as a side effect.
  `#5098 <https://github.com/aio-libs/aiohttp/issues/5098>`_


Improved Documentation
----------------------

- Fix example code in client quick-start
  `#3376 <https://github.com/aio-libs/aiohttp/issues/3376>`_
- Updated the docs so there is no contradiction in ``ttl_dns_cache`` default value
  `#3512 <https://github.com/aio-libs/aiohttp/issues/3512>`_
- Add 'Deploy with SSL' to docs.
  `#4201 <https://github.com/aio-libs/aiohttp/issues/4201>`_
- Change typing of the secure argument on StreamResponse.set_cookie from ``Optional[str]`` to ``Optional[bool]``
  `#4204 <https://github.com/aio-libs/aiohttp/issues/4204>`_
- Changes ``ttl_dns_cache`` type from int to Optional[int].
  `#4270 <https://github.com/aio-libs/aiohttp/issues/4270>`_
- Simplify README hello word example and add a documentation page for people coming from requests.
  `#4272 <https://github.com/aio-libs/aiohttp/issues/4272>`_
- Improve some code examples in the documentation involving websockets and starting a simple HTTP site with an AppRunner.
  `#4285 <https://github.com/aio-libs/aiohttp/issues/4285>`_
- Fix typo in code example in Multipart docs
  `#4312 <https://github.com/aio-libs/aiohttp/issues/4312>`_
- Fix code example in Multipart section.
  `#4314 <https://github.com/aio-libs/aiohttp/issues/4314>`_
- Update contributing guide so new contributors read the most recent version of that guide. Update command used to create test coverage reporting.
  `#4810 <https://github.com/aio-libs/aiohttp/issues/4810>`_
- Spelling: Change "canonize" to "canonicalize".
  `#4986 <https://github.com/aio-libs/aiohttp/issues/4986>`_
- Add ``aiohttp-sse-client`` library to third party usage list.
  `#5084 <https://github.com/aio-libs/aiohttp/issues/5084>`_


Misc
----

- `#2856 <https://github.com/aio-libs/aiohttp/issues/2856>`_, `#4218 <https://github.com/aio-libs/aiohttp/issues/4218>`_, `#4250 <https://github.com/aio-libs/aiohttp/issues/4250>`_
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
good first issue Good for newcomers Hacktoberfest We think it's good for https://hacktoberfest.digitalocean.com/ need pull request
Projects
None yet
Development

No branches or pull requests

4 participants