Merge pull request #27 from dapper91/dev

- pydantic schema generation bug fixed
- method registry merge implementation changed

CHANGELOG.rst

@@ -1,6 +1,13 @@
 Changelog
 =========
 
+1.2.3 (2021-08-10)
+------------------
+
+- pydantic schema generation bug fixed
+- method registry merge implementation changed
+
+
 1.2.2 (2021-07-28)
 ------------------
 

docs/source/_static/css/custom.css

@@ -0,0 +1,7 @@
+.py.class {
+    padding: 1.5em 0em 1.5em;
+}
+
+.py.method, .py.property, .py.exception, .py.function {
+    padding: 0.5em 0em 0.5em;
+}

docs/source/conf.py

@@ -10,8 +10,10 @@
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
 
+import enum
 import os
 import sys
+
 sys.path.insert(0, os.path.abspath('..'))
 
 import pjrpc  # noqa
@@ -66,6 +68,8 @@
 # so a file named "default.css" will overwrite the builtin "default.css".
 html_static_path = ['_static']
 
+html_css_files = ['css/custom.css']
+
 # The master toctree document.
 master_doc = 'index'
 
@@ -76,5 +80,16 @@
 }
 
 autodoc_mock_imports = ['attrs']
-autodoc_typehints = 'none'
+autodoc_typehints = 'description'
 autodoc_member_order = 'bysource'
+
+
+def maybe_skip_member(app, what, name, obj, skip, options):
+    if isinstance(obj, enum.Enum):
+        return False
+
+    return None
+
+
+def setup(app):
+    app.connect('autodoc-skip-member', maybe_skip_member)

examples/aiohttp_versioning.py

@@ -32,12 +32,12 @@ async def add_user_v2(request: web.Request, user: dict):
 
 app_v1 = aiohttp.Application()
 app_v1.dispatcher.add_methods(methods_v1)
-app.add_subapp('/api/v1', app_v1)
+app.add_subapp('/api/v1', app_v1.app)
 
 
 app_v2 = aiohttp.Application()
 app_v2.dispatcher.add_methods(methods_v2)
-app.add_subapp('/api/v2', app_v2)
+app.add_subapp('/api/v2', app_v2.app)
 
 if __name__ == "__main__":
     web.run_app(app, host='localhost', port=8080)

pjrpc/__about__.py

@@ -2,7 +2,7 @@
 __description__ = 'Extensible JSON-RPC library'
 __url__ = 'https://github.com/dapper91/pjrpc'
 
-__version__ = '1.2.2'
+__version__ = '1.2.3'
 
 __author__ = 'Dmitry Pershin'
 __email__ = '[email protected]'

pjrpc/server/dispatcher.py

@@ -216,8 +216,6 @@ def merge(self, other: 'MethodRegistry') -> None:
         """
 
         for name, method in other.items():
-            if other._prefix:
-                name = utils.remove_prefix(name, f'{other._prefix}.')
             if self._prefix:
                 name = f'{self._prefix}.{name}'
 
@@ -254,6 +252,8 @@ class Dispatcher:
     :param json_dumper: response json dumper
     :param json_encoder: response json encoder
     :param json_decoder: request json decoder
+    :param middlewares: request middlewares
+    :param error_handlers: request error handlers
     """
 
     def __init__(

pjrpc/server/validators/pydantic.py

@@ -65,17 +65,17 @@ def build_validation_schema(self, signature: inspect.Signature) -> Dict[str, Any
         for param in signature.parameters.values():
             if param.kind is inspect.Parameter.VAR_KEYWORD:
                 field_definitions[param.name] = (
-                    Optional[Dict[str, param.annotation]] if param.annotation is not inspect.Parameter.empty else ...,
+                    Optional[Dict[str, param.annotation]] if param.annotation is not inspect.Parameter.empty else Any,
                     param.default if param.default is not inspect.Parameter.empty else None,
                 )
             elif param.kind is inspect.Parameter.VAR_POSITIONAL:
                 field_definitions[param.name] = (
-                    Optional[List[param.annotation]] if param.annotation is not inspect.Parameter.empty else ...,
+                    Optional[List[param.annotation]] if param.annotation is not inspect.Parameter.empty else Any,
                     param.default if param.default is not inspect.Parameter.empty else None,
                 )
             else:
                 field_definitions[param.name] = (
-                    param.annotation if param.annotation is not inspect.Parameter.empty else ...,
+                    param.annotation if param.annotation is not inspect.Parameter.empty else Any,
                     param.default if param.default is not inspect.Parameter.empty else ...,
                 )
 

tests/server/test_dispatcher.py

@@ -91,7 +91,7 @@ def test_method():
 
     assert list(registry2.items()) == [
         ('prefix2.method2', Method(test_method, 'prefix2.method2', 'ctx2')),
-        ('prefix2.method1', Method(test_method, 'prefix2.method1', 'ctx1')),
+        ('prefix2.prefix1.method1', Method(test_method, 'prefix2.prefix1.method1', 'ctx1')),
     ]
 
 

tests/server/test_pydantic_validator.py

@@ -16,6 +16,8 @@
         ('param1: int = 1', {}),
         ('param1: int, param2: int = 2', {'param1': 1}),
         ('param1: int, *, param2: int = 2', {'param1': 1}),
+        ('param1, param2: int', [1, 2]),
+        ('param1, param2: int', ['param1', 2]),
     ], indirect=['dyn_method'],
 )
 def test_validation_success(dyn_method, params):