Stability fixes (#453)

* attempt better stability fixes

* hide input in errors

* Bump version

Author: mallport

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "dapla-toolbelt-pseudo"
-version = "4.2.2"
+version = "4.3.0"
 description = "Pseudonymization extensions for Dapla"
 authors = ["Dapla Developers <dapla-platform-developers@ssb.no>"]
 license = "MIT"

src/dapla_pseudo/v1/client.py

@@ -11,9 +11,11 @@
 import google.auth.transport.requests
 import google.oauth2.id_token
 import requests
+from aiohttp import ClientPayloadError
 from aiohttp import ClientResponse
 from aiohttp import ClientSession
 from aiohttp import ClientTimeout
+from aiohttp import ServerDisconnectedError
 from aiohttp import TCPConnector
 from aiohttp_retry import ExponentialRetry
 from aiohttp_retry import RetryClient
@@ -129,7 +131,7 @@ async def _post(
 
         split_pseudo_requests = self._split_requests(pseudo_requests)
         aio_session = ClientSession(
-            connector=TCPConnector(limit=200, force_close=True),
+            connector=TCPConnector(limit=100, enable_cleanup_closed=True),
             timeout=ClientTimeout(total=TIMEOUT_DEFAULT),
         )
         async with RetryClient(
@@ -139,11 +141,15 @@ async def _post(
                 start_timeout=0.1,
                 max_timeout=30,
                 factor=6,
-                statuses={
-                    400,
-                }.union(
+                statuses={400, 429}.union(
                     set(range(500, 600))
                 ),  # Retry all 5xx errors and 400 Bad Request
+                exceptions={
+                    ClientPayloadError,
+                    ServerDisconnectedError,
+                    asyncio.TimeoutError,
+                    OSError,
+                },
             ),
         ) as client:
             results = await asyncio.gather(
@@ -159,7 +165,7 @@ async def _post(
                     for req in reqs
                 ]
             )
-        await asyncio.sleep(0.1)  # Allow time for sockets to close
+        await asyncio.sleep(0.5)  # Allow time for sockets to close
         await aio_session.close()
 
         return PseudoClient._merge_responses(results)

src/dapla_pseudo/v1/models/api.py

@@ -5,6 +5,7 @@
 from dataclasses import dataclass
 
 import polars as pl
+from pydantic import ConfigDict
 
 from dapla_pseudo.models import APIModel
 from dapla_pseudo.v1.models.core import PseudoFunction
@@ -14,6 +15,8 @@
 class PseudoFieldRequest(APIModel):
     """Model of the pseudo field request sent to the service."""
 
+    model_config = ConfigDict(hide_input_in_errors=True)
+
     pseudo_func: PseudoFunction
     name: str
     pattern: str
@@ -24,6 +27,8 @@ class PseudoFieldRequest(APIModel):
 class DepseudoFieldRequest(APIModel):
     """Model of the depseudo field request sent to the service."""
 
+    model_config = ConfigDict(hide_input_in_errors=True)
+
     pseudo_func: PseudoFunction
     name: str
     pattern: str
@@ -34,6 +39,8 @@ class DepseudoFieldRequest(APIModel):
 class RepseudoFieldRequest(APIModel):
     """Model of the repseudo field request sent to the service."""
 
+    model_config = ConfigDict(hide_input_in_errors=True)
+
     source_pseudo_func: PseudoFunction
     target_pseudo_func: PseudoFunction | None
     name: str