From 1362a8e465853f4c9ba63f0ff33283657b24f0e5 Mon Sep 17 00:00:00 2001
From: Moritz Althaus <moritz.althaus@aleph-alpha.com>
Date: Tue, 12 Nov 2024 23:00:43 +0100
Subject: [PATCH 1/2] fix: do not send user header if version is unavailable

When building the package with pip (e.g. pip install git+url), pip can not infer
the package versions. Using the default version of 0.0.0 in the user headers
would cause the api-scheduler to omit some fields, so no user header is send
for these edge cases
---
 aleph_alpha_client/aleph_alpha_client.py |  9 +++------
 aleph_alpha_client/version.py            | 21 +++++++++++++++++++--
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/aleph_alpha_client/aleph_alpha_client.py b/aleph_alpha_client/aleph_alpha_client.py
index 2a433cf..cd7900a 100644
--- a/aleph_alpha_client/aleph_alpha_client.py
+++ b/aleph_alpha_client/aleph_alpha_client.py
@@ -25,7 +25,6 @@
 from urllib3.util.retry import Retry
 from tqdm.asyncio import tqdm
 
-import aleph_alpha_client
 from aleph_alpha_client.explanation import (
     ExplanationRequest,
     ExplanationResponse,
@@ -54,7 +53,7 @@
     SemanticEmbeddingRequest,
     SemanticEmbeddingResponse,
 )
-from aleph_alpha_client.version import MIN_API_VERSION
+from aleph_alpha_client.version import MIN_API_VERSION, user_agent_headers
 
 POOLING_OPTIONS = ["mean", "max", "last_token", "abs_max"]
 RETRY_STATUS_CODES = frozenset({408, 429, 500, 502, 503, 504})
@@ -200,8 +199,7 @@ def __init__(
         self.session.headers = CaseInsensitiveDict(
             {
                 "Authorization": "Bearer " + self.token,
-                "User-Agent": "Aleph-Alpha-Python-Client-"
-                + aleph_alpha_client.__version__,
+                **user_agent_headers(),
             }
         )
         self.session.mount("https://", adapter)
@@ -720,8 +718,7 @@ def __init__(
             timeout=aiohttp.ClientTimeout(self.request_timeout_seconds),
             headers={
                 "Authorization": "Bearer " + self.token,
-                "User-Agent": "Aleph-Alpha-Python-Client-"
-                + aleph_alpha_client.__version__,
+                **user_agent_headers(),
             },
             connector=connector,
         )
diff --git a/aleph_alpha_client/version.py b/aleph_alpha_client/version.py
index 281fb46..c9d6ba0 100644
--- a/aleph_alpha_client/version.py
+++ b/aleph_alpha_client/version.py
@@ -1,5 +1,5 @@
 import importlib.metadata
-
+from typing import Dict
 import re
 from pathlib import Path
 import logging
@@ -21,7 +21,9 @@ def pyproject_version() -> str:
 
     To not break imports in cases where both, the pyproject.toml file and the package
     metadata are not available, no error is raised and a default version of 0.0.0
-    will be returned.
+    will be returned. One such case is building the package with `pip install git+url`,
+    where pip is not able to read the [tool.poetry.version] field and also does not
+    keep the pyproject.toml file when the package is installed.
     """
     NO_VERSION = "0.0.0"
     pyproject_path = Path(__file__).resolve().parent.parent / "pyproject.toml"
@@ -46,3 +48,18 @@ def pyproject_version() -> str:
 
 if __version__ == "0.0.0":
     __version__ = pyproject_version()
+
+
+def user_agent_headers() -> Dict[str, str]:
+    """User agent that should be send for specific versions of the SDK.
+
+    For some installations, the package version is not available (== 0.0.0).
+    Setting the user agent header to "Aleph-Alpha-Python-Client-0.0.0" causes the
+    API to return a response with some fields omitted (due to a bug with older
+    clients which can not handle the new fields). These omitted fields in turn cause
+    new clients to fail on deserialization. To prevent these errors, we omit the
+    user agent header in cases where the version is not available (== 0.0.0).
+    """
+    if __version__ != "0.0.0":
+        return {"User-Agent": "Aleph-Alpha-Python-Client-" + __version__}
+    return {}
\ No newline at end of file

From 1e6bd75808fbf51f58abc7f4884027d073162f3d Mon Sep 17 00:00:00 2001
From: Moritz Althaus <moritzalthaus@gmx.de>
Date: Wed, 13 Nov 2024 09:36:17 +0100
Subject: [PATCH 2/2] refactor: more concise version check

Co-authored-by: Fabian Gebhart <16943048+fgebhart@users.noreply.github.com>
---
 aleph_alpha_client/version.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/aleph_alpha_client/version.py b/aleph_alpha_client/version.py
index c9d6ba0..452d58b 100644
--- a/aleph_alpha_client/version.py
+++ b/aleph_alpha_client/version.py
@@ -60,6 +60,7 @@ def user_agent_headers() -> Dict[str, str]:
     new clients to fail on deserialization. To prevent these errors, we omit the
     user agent header in cases where the version is not available (== 0.0.0).
     """
-    if __version__ != "0.0.0":
-        return {"User-Agent": "Aleph-Alpha-Python-Client-" + __version__}
-    return {}
\ No newline at end of file
+    if __version__ == "0.0.0":
+        return {}
+    else:
+        return {"User-Agent": "Aleph-Alpha-Python-Client-" + __version__}
\ No newline at end of file