Merge pull request #41 from dapper91/dev

- openapi jsonrpc request schema fixed
dapper91 · Sep 10, 2021 · 7912204 · 7912204
2 parents b2fc556 + 852eaa2
commit 7912204
Show file tree

Hide file tree

Showing 4 changed files with 61 additions and 8 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,6 +1,13 @@
 Changelog
 =========
 
+
+1.3.3 (2021-09-10)
+------------------
+
+- openapi jsonrpc request schema fixed
+
+
 1.3.2 (2021-08-30)
 ------------------
 

diff --git a/pjrpc/__about__.py b/pjrpc/__about__.py
@@ -2,7 +2,7 @@
 __description__ = 'Extensible JSON-RPC library'
 __url__ = 'https://github.com/dapper91/pjrpc'
 
-__version__ = '1.3.2'
+__version__ = '1.3.3'
 
 __author__ = 'Dmitry Pershin'
 __email__ = '[email protected]'

diff --git a/pjrpc/server/specs/openapi.py b/pjrpc/server/specs/openapi.py
@@ -84,12 +84,15 @@
                 {'type': 'number'},
             ],
         },
+        'method': {
+            'type': 'string',
+        },
         'params': {
             'type': 'object',
             'properties': {},
         },
     },
-    'required': ['jsonrpc'],
+    'required': ['jsonrpc', 'method'],
 }
 
 JSONRPC_HTTP_CODE = '200'
@@ -646,6 +649,7 @@ def schema(self, path: str, methods: Iterable[Method] = (), methods_map: Dict[st
             method_spec.update((k, v) for k, v in annotated_spec.items() if v is not UNSET)
 
             request_schema = copy.deepcopy(REQUEST_SCHEMA)
+            request_schema['properties']['method']['enum'] = [method.name]
 
             for param_name, param_schema in method_spec['params_schema'].items():
                 request_schema['properties']['params']['properties'][param_name] = param_schema.schema

diff --git a/tests/server/resources/openapi-1.json b/tests/server/resources/openapi-1.json
@@ -158,6 +158,12 @@
                                             }
                                         ]
                                     },
+                                    "method": {
+                                        "type": "string",
+                                        "enum": [
+                                            "method1"
+                                        ]
+                                    },
                                     "params": {
                                         "type": "object",
                                         "properties": {
@@ -180,7 +186,8 @@
                                     }
                                 },
                                 "required": [
-                                    "jsonrpc"
+                                    "jsonrpc",
+                                    "method"
                                 ]
                             },
                             "examples": {
@@ -335,6 +342,12 @@
                                             }
                                         ]
                                     },
+                                    "method": {
+                                        "type": "string",
+                                        "enum": [
+                                            "method2"
+                                        ]
+                                    },
                                     "params": {
                                         "type": "object",
                                         "properties": {
@@ -353,7 +366,8 @@
                                     }
                                 },
                                 "required": [
-                                    "jsonrpc"
+                                    "jsonrpc",
+                                    "method"
                                 ]
                             }
                         }
@@ -478,6 +492,12 @@
                                             }
                                         ]
                                     },
+                                    "method": {
+                                        "type": "string",
+                                        "enum": [
+                                            "method3"
+                                        ]
+                                    },
                                     "params": {
                                         "type": "object",
                                         "properties": {
@@ -494,7 +514,8 @@
                                     }
                                 },
                                 "required": [
-                                    "jsonrpc"
+                                    "jsonrpc",
+                                    "method"
                                 ]
                             }
                         }
@@ -617,6 +638,12 @@
                                             }
                                         ]
                                     },
+                                    "method": {
+                                        "type": "string",
+                                        "enum": [
+                                            "method4"
+                                        ]
+                                    },
                                     "params": {
                                         "type": "object",
                                         "properties": {
@@ -630,7 +657,8 @@
                                     }
                                 },
                                 "required": [
-                                    "jsonrpc"
+                                    "jsonrpc",
+                                    "method"
                                 ]
                             }
                         }
@@ -754,13 +782,20 @@
                                             }
                                         ]
                                     },
+                                    "method": {
+                                        "type": "string",
+                                        "enum": [
+                                            "method5"
+                                        ]
+                                    },
                                     "params": {
                                         "type": "object",
                                         "properties": {}
                                     }
                                 },
                                 "required": [
-                                    "jsonrpc"
+                                    "jsonrpc",
+                                    "method"
                                 ]
                             }
                         }
@@ -884,13 +919,20 @@
                                             }
                                         ]
                                     },
+                                    "method": {
+                                        "type": "string",
+                                        "enum": [
+                                            "method6"
+                                        ]
+                                    },
                                     "params": {
                                         "type": "object",
                                         "properties": {}
                                     }
                                 },
                                 "required": [
-                                    "jsonrpc"
+                                    "jsonrpc",
+                                    "method"
                                 ]
                             }
                         }