Update supported Python versions, ensure httpx responses closed and use

kw_only for request dataclasses

Changes
-------
* PYCO-95: Updated supported Python versions to be 3.10 - 3.14
* PYCO-96: Use kw_only=True for request dataclasses
* PYCO-97: Close httpx response when raising WrappedError from HTTP
  status code
* Update dependencies
* Update pyproject.toml and requirement.txt files

Author: thejcfactor

.github/workflows/publish.yml

@@ -36,8 +36,8 @@ on:
 
 env:
   CBCI_PROJECT_TYPE: "ANALYTICS"
-  CBCI_DEFAULT_PYTHON: "3.9"
-  CBCI_SUPPORTED_PYTHON_VERSIONS: "3.9 3.10 3.11 3.12 3.13"
+  CBCI_DEFAULT_PYTHON: "3.10"
+  CBCI_SUPPORTED_PYTHON_VERSIONS: "3.10 3.11 3.12 3.13 3.14"
   CBCI_SUPPORTED_X86_64_PLATFORMS: "linux alpine macos windows"
   CBCI_SUPPORTED_ARM64_PLATFORMS: "linux macos"
   CBCI_DEFAULT_LINUX_X86_64_PLATFORM: "ubuntu-22.04"

.github/workflows/tests.yml

@@ -58,8 +58,8 @@ on:
 
 env:
   CBCI_PROJECT_TYPE: "ANALYTICS"
-  CBCI_DEFAULT_PYTHON: "3.9"
-  CBCI_SUPPORTED_PYTHON_VERSIONS: "3.9 3.10 3.11 3.12 3.13"
+  CBCI_DEFAULT_PYTHON: "3.10"
+  CBCI_SUPPORTED_PYTHON_VERSIONS: "3.10 3.11 3.12 3.13 3.14"
   CBCI_SUPPORTED_X86_64_PLATFORMS: "linux alpine macos windows"
   CBCI_SUPPORTED_ARM64_PLATFORMS: "linux macos"
   CBCI_DEFAULT_LINUX_X86_64_PLATFORM: "ubuntu-22.04"

.github/workflows/verify_release.yml

@@ -51,8 +51,8 @@ on:
 
 env:
   CBCI_PROJECT_TYPE: "ANALYTICS"
-  CBCI_DEFAULT_PYTHON: "3.9"
-  CBCI_SUPPORTED_PYTHON_VERSIONS: "3.9 3.10 3.11 3.12 3.13"
+  CBCI_DEFAULT_PYTHON: "3.10"
+  CBCI_SUPPORTED_PYTHON_VERSIONS: "3.10 3.11 3.12 3.13 3.14"
   CBCI_SUPPORTED_X86_64_PLATFORMS: "linux alpine macos windows"
   CBCI_SUPPORTED_ARM64_PLATFORMS: "linux macos"
   CBCI_DEFAULT_LINUX_X86_64_PLATFORM: "ubuntu-22.04"

.pre-commit-config.yaml

@@ -58,12 +58,12 @@ repos:
       # Compile requirements
       - id: pip-compile
         name: pip-compile requirements.in
-        args: [requirements.in, --python-version, '3.9', --universal, -o, requirements.txt]
+        args: [requirements.in, --python-version, '3.10', --universal, -o, requirements.txt]
       - id: pip-compile
         name: pip-compile requirements-dev.in
-        args: [requirements-dev.in, --python-version, '3.9', --universal, -o, requirements-dev.txt]
+        args: [requirements-dev.in, --python-version, '3.10', --universal, -o, requirements-dev.txt]
         files: ^requirements-dev\.(in|txt)$
       - id: pip-compile
         name: pip-compile requirements-sphinx.in
-        args: [requirements-sphinx.in, --python-version, '3.9', --universal, -o, requirements-sphinx.txt]
+        args: [requirements-sphinx.in, --python-version, '3.10', --universal, -o, requirements-sphinx.txt]
         files: ^requirements-sphinx\.(in|txt)$

README.md

@@ -1,7 +1,7 @@
 # Couchbase Python Analytics Client
 Python client for [Couchbase](https://couchbase.com) Analytics.
 
-Currently Python 3.9 - Python 3.13 is supported.
+Currently Python 3.10 - Python 3.14 is supported.
 
 The Analytics SDK supports static typing.  Currently only [mypy](https://github.com/python/mypy) is supported.  You mileage may vary (YMMV) with the use of other static type checkers (e.g. [pyright](https://github.com/microsoft/pyright)).
 

acouchbase_analytics/protocol/_core/client_adapter.py

@@ -25,7 +25,7 @@
 from couchbase_analytics.common.credential import Credential
 from couchbase_analytics.common.deserializer import Deserializer
 from couchbase_analytics.common.logging import LogLevel, log_message
-from couchbase_analytics.protocol._core.request import CancelRequest, HttpRequest, QueryRequest, StartQueryRequest
+from couchbase_analytics.protocol._core.request import HttpRequest
 from couchbase_analytics.protocol.connection import _ConnectionDetails
 from couchbase_analytics.protocol.options import OptionsBuilder
 
@@ -169,19 +169,15 @@ async def send_request(self, request: HttpRequest, stream: Optional[bool] = True
         if not hasattr(self, '_client'):
             raise RuntimeError('Client not created yet')
 
-        url = URL(
-            scheme=request.url.scheme,
-            host=request.url.ip,
-            port=request.url.port,
-            path=request.url.path,
+        url = URL(scheme=request.url.scheme, host=request.url.ip, port=request.url.port, path=request.url.path)
+        req = self._client.build_request(
+            request.method,
+            url,
+            data=request.data,
+            json=request.body,
+            headers=request.headers,
+            extensions=request.extensions,
         )
-        if isinstance(request, (QueryRequest, StartQueryRequest)):
-            req = self._client.build_request(request.method, url, json=request.body, extensions=request.extensions)
-        else:
-            data = request.data if isinstance(request, CancelRequest) else None
-            req = self._client.build_request(
-                request.method, url, data=data, headers=request.headers, extensions=request.extensions
-            )
 
         if stream is None:
             stream = True

acouchbase_analytics/protocol/_core/request_context.py

@@ -104,6 +104,22 @@ def timed_out(self) -> bool:
     def calculate_backoff(self) -> float:
         return self._backoff_calc.calculate_backoff(self._error_context.num_attempts) / 1000
 
+    async def check_for_http_status_error(
+        self,
+        status_code: int,
+        ignore_not_found_status: Optional[bool] = False,
+        close_handler: Optional[Callable[[], Awaitable[None]]] = None,
+    ) -> None:
+        ctx = str(self._error_context)
+        err = ErrorMapper.maybe_get_error_from_status_code(
+            status_code, ctx, ignore_not_found_status=ignore_not_found_status
+        )
+        if err is None:
+            return
+        if close_handler is not None:
+            await close_handler()
+        raise err
+
     def create_response_task(self, fn: Callable[..., Coroutine[Any, Any, Any]], *args: object) -> Task[Any]:
         if self._backend is None or self._backend.backend_lib != 'asyncio':
             raise RuntimeError('Must use the asyncio backend to create a response task.')
@@ -188,10 +204,13 @@ async def process_response(
         core_response: HttpCoreResponse,
         close_handler: Callable[[], Awaitable[None]],
         handle_context_shutdown: Optional[bool] = False,
+        ignore_not_found_status: Optional[bool] = False,
     ) -> Any:
         # we have all the data, close the core response/stream
         await close_handler()
-
+        await self.check_for_http_status_error(
+            core_response.status_code, ignore_not_found_status=ignore_not_found_status
+        )
         try:
             json_response = core_response.json()
         except json.JSONDecodeError:
@@ -243,7 +262,6 @@ async def send_request(
             'request_deadline': f'{self._request_deadline}',
         }
         self.log_message('HTTP response', LogLevel.DEBUG, message_data=message_data)
-        self._check_for_http_status_error(response.status_code, ignore_not_found_status=ignore_not_found_status)
         return response
 
     async def shutdown(
@@ -265,12 +283,6 @@ async def shutdown(
         self._shutdown = True
         self.log_message('Request context shutdown complete', LogLevel.INFO)
 
-    def _check_for_http_status_error(self, status_code: int, ignore_not_found_status: Optional[bool] = False) -> None:
-        ctx = str(self._error_context)
-        ErrorMapper.maybe_raise_error_from_status_code(
-            status_code, ctx, ignore_not_found_status=ignore_not_found_status
-        )
-
     def _check_timed_out(self) -> None:
         if self._request_state in (RequestState.Timeout, RequestState.Error):
             return

acouchbase_analytics/protocol/_core/response.py

@@ -123,6 +123,7 @@ async def _process_no_body_response(self) -> None:
         if 200 <= status_code < 300 or status_code == 404:
             await self._request_context.shutdown()
             return
+        await self._request_context.check_for_http_status_error(status_code, ignore_not_found_status=True)
         ctx = str(self._request_context.error_context)
         raise WrappedError(AnalyticsError(context=ctx, message=f'Request failed with status {status_code}.'))
 
@@ -131,6 +132,9 @@ async def _process_response(self) -> None:
         **INTERNAL**
         """
         self._json_response = await self._request_context.process_response(
-            self._core_response, self.close, handle_context_shutdown=True
+            self._core_response,
+            self.close,
+            handle_context_shutdown=True,
+            ignore_not_found_status=self._has_no_body_response,
         )
         await self.set_metadata(json_data=self._json_response)

acouchbase_analytics/protocol/streaming.py

@@ -172,6 +172,12 @@ async def send_request(self) -> None:
         self._request_context.start_stream(self._core_response)
         # block until we either know we have rows or we have an error
         await self._request_context.wait_for_results_or_errors()
+
+        # it is possible we have "rows" but the HTTP status code is indicative of an error (e.g. 404, 503, etc.),
+        # so we need to check for HTTP status errors before allowing iteration to continue
+        await self._request_context.check_for_http_status_error(
+            self._core_response.status_code, close_handler=self.close
+        )
         if not self._request_context.okay_to_iterate:
             await self._request_context.finish_processing_stream()
             await self._process_response()

couchbase_analytics/protocol/_core/client_adapter.py

@@ -25,7 +25,7 @@
 from couchbase_analytics.common.credential import Credential
 from couchbase_analytics.common.deserializer import Deserializer
 from couchbase_analytics.common.logging import LogLevel, log_message
-from couchbase_analytics.protocol._core.request import CancelRequest, HttpRequest, QueryRequest, StartQueryRequest
+from couchbase_analytics.protocol._core.request import HttpRequest
 from couchbase_analytics.protocol.connection import _ConnectionDetails
 from couchbase_analytics.protocol.options import OptionsBuilder
 
@@ -168,13 +168,14 @@ def send_request(self, request: HttpRequest, stream: Optional[bool] = True) -> R
             raise RuntimeError('Client not created yet')
 
         url = URL(scheme=request.url.scheme, host=request.url.ip, port=request.url.port, path=request.url.path)
-        if isinstance(request, (QueryRequest, StartQueryRequest)):
-            req = self._client.build_request(request.method, url, json=request.body, extensions=request.extensions)
-        else:
-            data = request.data if isinstance(request, CancelRequest) else None
-            req = self._client.build_request(
-                request.method, url, data=data, headers=request.headers, extensions=request.extensions
-            )
+        req = self._client.build_request(
+            request.method,
+            url,
+            data=request.data,
+            json=request.body,
+            headers=request.headers,
+            extensions=request.extensions,
+        )
 
         if stream is None:
             stream = True