Merge pull request #147 from Aleph-Alpha/add-ssl-bool

Add ssl bool

Author: rutgercap

.github/workflows/integration.yml

@@ -7,9 +7,10 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        # We support latest 3.x version and 3.7 because
-        # Google Colab uses 3.7 by default.
-        python-version: [3.7, 3.x]
+        # We currently only support up to python 3.11 
+        # because aiohttp does not support 3.12 as of yet.
+        # 3.7 because Google Colab uses 3.7 by default.
+        python-version: [3.7, 3.11]
 
     steps:
       - uses: actions/checkout@v3

Changelog.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 4.1.0
+
+- Added `verify_ssl` flag so you can disable SSL checking for your sessions.
+
 ## 4.0.0
 
 - Turned all NamedTuples into Dataclasses. Even if this is technically a breaking change

aleph_alpha_client/aleph_alpha_client.py

@@ -130,6 +130,9 @@ class Client:
             Setting this to True, will signal to the API that you intend to be nice to other users
             by de-prioritizing your request below concurrent ones.
 
+        verify_ssl(bool, optional, default True)
+            Setting this to False will disable checking for SSL when doing requests.
+
     Example usage:
         >>> request = CompletionRequest(
                 prompt=Prompt.from_text(f"Request"), maximum_tokens=64
@@ -146,6 +149,7 @@ def __init__(
         request_timeout_seconds: int = DEFAULT_REQUEST_TIMEOUT,
         total_retries: int = 8,
         nice: bool = False,
+        verify_ssl = True,
     ) -> None:
         if host[-1] != "/":
             host += "/"
@@ -164,6 +168,7 @@ def __init__(
         )
         adapter = HTTPAdapter(max_retries=retry_strategy)
         self.session = requests.Session()
+        self.session.verify = verify_ssl
         self.session.headers = CaseInsensitiveDict(
             {
                 "Authorization": "Bearer " + self.token,
@@ -603,6 +608,9 @@ class AsyncClient:
             Setting this to True, will signal to the API that you intend to be nice to other users
             by de-prioritizing your request below concurrent ones.
 
+        verify_ssl(bool, optional, default True)
+            Setting this to False will disable checking for SSL when doing requests.
+
     Example usage:
         >>> request = CompletionRequest(prompt=Prompt.from_text(f"Request"), maximum_tokens=64)
         >>> async with AsyncClient(token=os.environ["AA_TOKEN"]) as client:
@@ -617,6 +625,7 @@ def __init__(
         request_timeout_seconds: int = DEFAULT_REQUEST_TIMEOUT,
         total_retries: int = 8,
         nice: bool = False,
+        verify_ssl = True,
     ) -> None:
         if host[-1] != "/":
             host += "/"
@@ -632,6 +641,7 @@ def __init__(
             start_timeout=0.25,
             statuses=set(RETRY_STATUS_CODES),
         )
+        connector = aiohttp.TCPConnector(verify_ssl=verify_ssl)
         self.session = RetryClient(
             trust_env=True,  # same behaviour as requests/(Sync)Client wrt. http_proxy
             raise_for_status=False,
@@ -642,6 +652,7 @@ def __init__(
                 "User-Agent": "Aleph-Alpha-Python-Client-"
                 + aleph_alpha_client.__version__,
             },
+            connector=connector
         )
 
     async def close(self):

aleph_alpha_client/version.py

@@ -1 +1 @@
-__version__ = "4.0.0"
+__version__ = "4.1.0"

setup.py

@@ -44,7 +44,7 @@ def version():
     install_requires=[
         "requests >= 2.28",
         "urllib3 >= 1.26",
-        "aiohttp >= 3.8.3",
+        "aiohttp >= 3.8.6",
         "aiodns >= 3.0.0",
         "aiohttp-retry >= 2.8.3",
         "tokenizers >= 0.13.2",