Merge pull request #56 from cloudblue/use_sessions

Use sessions to save SSL handshake time

Author: ffaraone

.github/workflows/build.yml

@@ -14,14 +14,14 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10']
+        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
     steps:
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         fetch-depth: 0
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies
@@ -41,11 +41,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
       - name: Set up Python '3.10.0'
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: '3.10'
       - name: Install dependencies

.github/workflows/deploy.yml

@@ -8,9 +8,9 @@ jobs:
   deploy:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up Python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
         python-version: '3.10'
     - name: Install dependencies
@@ -25,7 +25,7 @@ jobs:
       run: |
         poetry run pytest
     - name: Extract tag name
-      uses: actions/github-script@v3
+      uses: actions/github-script@v6
       id: tag
       with:
         github-token: ${{ secrets.GITHUB_TOKEN }}

connect/client/fluent.py

@@ -7,6 +7,10 @@
 import threading
 from json.decoder import JSONDecodeError
 
+import httpx
+
+import requests
+
 from connect.client.constants import CONNECT_ENDPOINT_URL, CONNECT_SPECS_URL
 from connect.client.mixins import AsyncClientMixin, SyncClientMixin
 from connect.client.models import AsyncCollection, AsyncNS, Collection, NS
@@ -205,6 +209,10 @@ class ConnectClient(_ConnectClientBase, threading.local, SyncClientMixin):
     * **timeout**  *(optional)* - Timeout parameter to pass to the underlying HTTP client.
     * **resourceset_append**  *(optional)* - Append all the pages to the current resourceset.
     """
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self._session = requests.Session()
+
     def _get_collection_class(self):
         return Collection
 
@@ -243,6 +251,7 @@ class AsyncConnectClient(_ConnectClientBase, AsyncClientMixin):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self._response = contextvars.ContextVar('response', default=None)
+        self._session = httpx.AsyncClient()
 
     @property
     def response(self):

connect/client/mixins.py

@@ -5,10 +5,6 @@
 #
 import time
 
-import httpx
-
-import requests
-
 from httpx import HTTPError
 
 from requests.exceptions import RequestException, Timeout
@@ -81,7 +77,7 @@ def _execute_http_call(self, method, url, kwargs):  # noqa: CCR001
             if self.logger:
                 self.logger.log_request(method, url, kwargs)
             try:
-                self.response = requests.request(method, url, **kwargs)
+                self.response = self._session.request(method, url, **kwargs)
                 if self.logger:
                     self.logger.log_response(self.response)
             except Timeout:
@@ -169,8 +165,7 @@ async def _execute_http_call(self, method, url, kwargs):
             if self.logger:
                 self.logger.log_request(method, url, kwargs)
 
-            async with httpx.AsyncClient() as client:
-                self.response = await client.request(method, url, **kwargs)
+            self.response = await self._session.request(method, url, **kwargs)
 
             if self.logger:
                 self.logger.log_response(self.response)

poetry.lock

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "connect-openapi-client"
-version = "26.0"
+version = "25.16"
 description = "Connect Python OpenAPI Client"
 authors = ["CloudBlue"]
 license = "Apache-2.0"
@@ -48,7 +48,7 @@ importlib-metadata = { version = "^4.12.0", python = ">=3.7,<3.8" }
 
 [tool.poetry.dev-dependencies]
 pytest = ">=6.1.2,<8"
-pytest-cov = ">=2.10.1,<4"
+pytest-cov = ">=2.10.1,<5"
 pytest-mock = "^3.3.1"
 coverage = {extras = ["toml"], version = ">=5.3,<7"}
 flake8 = ">=3.8,<6"

pyproject.toml

@@ -531,9 +531,8 @@ def test_help(mocker):
 
 
 def test_non_server_error(mocker):
-    mocker.patch('connect.client.mixins.requests.request', side_effect=RequestException('generic'))
-
     c = ConnectClient('API_KEY', endpoint='https://localhost')
+    c._session.request = mocker.MagicMock(side_effect=RequestException('generic'))
 
     with pytest.raises(ClientError) as cv:
         c.execute('get', 'path')