Merge pull request #41 from dapper91/dev

dapper91 · web-flow · commit 791220496dae · 2021-09-10T19:05:37.000+05:00
- openapi jsonrpc request schema fixed
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__ = 'dapper91@mail.ru'
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"
                                 ]
                             }
                         }

Original file line number	Diff line number	Diff line change
`@@ -158,6 +158,12 @@`
`158`	`158`	`}`
`159`	`159`	`]`
`160`	`160`	`},`
	`161`	`+ "method": {`
	`162`	`+ "type": "string",`
	`163`	`+ "enum": [`
	`164`	`+ "method1"`
	`165`	`+ ]`
	`166`	`+ },`
`161`	`167`	`"params": {`
`162`	`168`	`"type": "object",`
`163`	`169`	`"properties": {`
`@@ -180,7 +186,8 @@`
`180`	`186`	`}`
`181`	`187`	`},`
`182`	`188`	`"required": [`
`183`		`- "jsonrpc"`
	`189`	`+ "jsonrpc",`
	`190`	`+ "method"`
`184`	`191`	`]`
`185`	`192`	`},`
`186`	`193`	`"examples": {`
`@@ -335,6 +342,12 @@`
`335`	`342`	`}`
`336`	`343`	`]`
`337`	`344`	`},`
	`345`	`+ "method": {`
	`346`	`+ "type": "string",`
	`347`	`+ "enum": [`
	`348`	`+ "method2"`
	`349`	`+ ]`
	`350`	`+ },`
`338`	`351`	`"params": {`
`339`	`352`	`"type": "object",`
`340`	`353`	`"properties": {`
`@@ -353,7 +366,8 @@`
`353`	`366`	`}`
`354`	`367`	`},`
`355`	`368`	`"required": [`
`356`		`- "jsonrpc"`
	`369`	`+ "jsonrpc",`
	`370`	`+ "method"`
`357`	`371`	`]`
`358`	`372`	`}`
`359`	`373`	`}`
`@@ -478,6 +492,12 @@`
`478`	`492`	`}`
`479`	`493`	`]`
`480`	`494`	`},`
	`495`	`+ "method": {`
	`496`	`+ "type": "string",`
	`497`	`+ "enum": [`
	`498`	`+ "method3"`
	`499`	`+ ]`
	`500`	`+ },`
`481`	`501`	`"params": {`
`482`	`502`	`"type": "object",`
`483`	`503`	`"properties": {`
`@@ -494,7 +514,8 @@`
`494`	`514`	`}`
`495`	`515`	`},`
`496`	`516`	`"required": [`
`497`		`- "jsonrpc"`
	`517`	`+ "jsonrpc",`
	`518`	`+ "method"`
`498`	`519`	`]`
`499`	`520`	`}`
`500`	`521`	`}`
`@@ -617,6 +638,12 @@`
`617`	`638`	`}`
`618`	`639`	`]`
`619`	`640`	`},`
	`641`	`+ "method": {`
	`642`	`+ "type": "string",`
	`643`	`+ "enum": [`
	`644`	`+ "method4"`
	`645`	`+ ]`
	`646`	`+ },`
`620`	`647`	`"params": {`
`621`	`648`	`"type": "object",`
`622`	`649`	`"properties": {`
`@@ -630,7 +657,8 @@`
`630`	`657`	`}`
`631`	`658`	`},`
`632`	`659`	`"required": [`
`633`		`- "jsonrpc"`
	`660`	`+ "jsonrpc",`
	`661`	`+ "method"`
`634`	`662`	`]`
`635`	`663`	`}`
`636`	`664`	`}`
`@@ -754,13 +782,20 @@`
`754`	`782`	`}`
`755`	`783`	`]`
`756`	`784`	`},`
	`785`	`+ "method": {`
	`786`	`+ "type": "string",`
	`787`	`+ "enum": [`
	`788`	`+ "method5"`
	`789`	`+ ]`
	`790`	`+ },`
`757`	`791`	`"params": {`
`758`	`792`	`"type": "object",`
`759`	`793`	`"properties": {}`
`760`	`794`	`}`
`761`	`795`	`},`
`762`	`796`	`"required": [`
`763`		`- "jsonrpc"`
	`797`	`+ "jsonrpc",`
	`798`	`+ "method"`
`764`	`799`	`]`
`765`	`800`	`}`
`766`	`801`	`}`
`@@ -884,13 +919,20 @@`
`884`	`919`	`}`
`885`	`920`	`]`
`886`	`921`	`},`
	`922`	`+ "method": {`
	`923`	`+ "type": "string",`
	`924`	`+ "enum": [`
	`925`	`+ "method6"`
	`926`	`+ ]`
	`927`	`+ },`
`887`	`928`	`"params": {`
`888`	`929`	`"type": "object",`
`889`	`930`	`"properties": {}`
`890`	`931`	`}`
`891`	`932`	`},`
`892`	`933`	`"required": [`
`893`		`- "jsonrpc"`
	`934`	`+ "jsonrpc",`
	`935`	`+ "method"`
`894`	`936`	`]`
`895`	`937`	`}`
`896`	`938`	`}`