Merge pull request #3 from wy-z/develop

[core] Add 'req_opts' option
wy-z · Aug 17, 2020 · fe591b0 · fe591b0
2 parents 344f413 + f8d51d2
commit fe591b0
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 22 deletions.
diff --git a/requests_openapi/core.py b/requests_openapi/core.py
@@ -56,15 +56,17 @@ class Operation(object):
     _method: str
     _spec: typing.Dict[str, typing.Any]
     _requestor: Requestor
+    _req_opts: typing.Dict[str, typing.Any]
     _server: Server
 
     _call: typing.Optional[typing.Callable] = None
 
-    def __init__(self, path, method, spec, requestor=None, server=None):
+    def __init__(self, path, method, spec, requestor=None, req_opts={}, server=None):
         self._path = path
         self._method = method
         self._spec = spec
         self._requestor = requestor
+        self._req_opts = req_opts
         self._server = server
 
     @property
@@ -121,6 +123,8 @@ def f(**kwargs):
             kwargs.setdefault("params", {}).update(params)
             kwargs.setdefault("headers", {}).update(headers)
             kwargs.setdefault("cookies", {}).update(cookies)
+            for k, v in self._req_opts.items():
+                kwargs.setdefault(k, v)
             return self._requestor.request(
                 self._method, self.url(**path_params), **kwargs
             )
@@ -155,12 +159,14 @@ def load_spec_from_file(file_path):
 
 class Client(object):
     _requestor: Requestor
+    _req_opts: typing.Dict[str, typing.Any]
     _server: Server
     _operations: typing.Dict[str, typing.Any]
     _spec: typing.Dict[str, typing.Any]
 
-    def __init__(self, requestor=None, server=None):
+    def __init__(self, requestor=None, server=None, req_opts={}):
         self._requestor = requestor or requests.Session()
+        self._req_opts = req_opts
         self._server = server
         self._operations = {}
         self._spec = {}
@@ -216,27 +222,24 @@ def _collect_operations(self):
                     )
                     continue
 
+                op = Operation(
+                    path,
+                    method,
+                    op_spec,
+                    requestor=self._requestor,
+                    req_opts=self._req_opts,
+                    server=self._server,
+                )
                 if operation_id not in self._operations:
-                    self._operations[operation_id] = Operation(
-                        path,
-                        method,
-                        op_spec,
-                        requestor=self._requestor,
-                        server=self._server,
-                    )
+                    self._operations[operation_id] = op
                 else:
+                    logging.warn(
+                        f"multiple '{operation_id}' found , operation ID should be unique"
+                    )
                     v = self._operations[operation_id]
                     if type(v) is not list:
                         self._operations[operation_id] = [v]
-                    self._operations[operation_id].append(
-                        Operation(
-                            path,
-                            method,
-                            op_spec,
-                            requestor=self._requestor,
-                            server=self._server,
-                        )
-                    )
+                    self._operations[operation_id].append(op)
 
     def load_spec_from_url(self, url):
         spec = load_spec_from_url(url)

diff --git a/requests_openapi/requestor.py b/requests_openapi/requestor.py
@@ -5,7 +5,7 @@
 
 class Requestor(abc.ABC):
     @abc.abstractmethod
-    def request(self, method, url, params={}, headers={}, cookies={}, *kwargs):
+    def request(self, method, url, params={}, headers={}, cookies={}, **kwargs):
         pass
 
 

diff --git a/setup.py b/setup.py
@@ -10,6 +10,9 @@ def read(filename):
         return fd.read()
 
 
+requirements = ["requests", "pyyaml"]
+requirements_dev = ["tox", "pytest"]
+
 setup(
     name="requests-openapi",
     url="https://github.com/wy-z/requests-openapi",
@@ -22,7 +25,8 @@ def read(filename):
     use_scm_version=True,
     setup_requires=["setuptools_scm"],
     packages=find_packages(exclude=("tests",)),
-    install_requires=["requests", "pyyaml"],
+    install_requires=requirements,
+    extras_require={"dev": requirements_dev},
     classifiers=[
         "License :: OSI Approved :: MIT License",
         "Programming Language :: Python",

diff --git a/tox.ini b/tox.ini
@@ -1,11 +1,11 @@
 [tox]
 nvlist = py3
 
-testenv]
+[testenv]
 ommands = py.test requests_openapi
 eps = pytest
 
-testenv:black]
+[testenv:black]
 deps =
     black
 commands =