beaker-py 2.7.0__tar.gz → 2.7.2__tar.gz

{beaker_py-2.7.0 → beaker_py-2.7.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: beaker-py
-Version: 2.7.0
+Version: 2.7.2
 Summary: A Python Beaker client
 Author-email: Allen Institute for Artificial Intelligence <contact@allenai.org>, Pete Walsh <petew@allenai.org>
 Project-URL: Homepage, https://github.com/allenai/beaker
@@ -21,7 +21,7 @@ Requires-Dist: google-crc32c
 Provides-Extra: docker
 Requires-Dist: docker<8.0,>=5.0; extra == "docker"
 Provides-Extra: dev
-Requires-Dist: ruff; extra == "dev"
+Requires-Dist: ruff<0.16,>=0.15; extra == "dev"
 Requires-Dist: mypy<1.6,>=1.0; extra == "dev"
 Requires-Dist: types-requests; extra == "dev"
 Requires-Dist: types-cachetools; extra == "dev"
@@ -186,7 +186,9 @@ See the [integration tests](https://github.com/allenai/beaker/tree/main/bindings
 
 ## Development
 
-After [installing from source](#installing-from-source), you can run checks and tests locally with:
+After [installing from source](#installing-from-source), set BEAKER_TOKEN in your environment.
+
+Then, you can run checks and tests locally with:
 
 ```bash
 make checks

{beaker_py-2.7.0 → beaker_py-2.7.2}/README.md

@@ -145,7 +145,9 @@ See the [integration tests](https://github.com/allenai/beaker/tree/main/bindings
 
 ## Development
 
-After [installing from source](#installing-from-source), you can run checks and tests locally with:
+After [installing from source](#installing-from-source), set BEAKER_TOKEN in your environment.
+
+Then, you can run checks and tests locally with:
 
 ```bash
 make checks

{beaker_py-2.7.0 → beaker_py-2.7.2}/pyproject.toml

@@ -32,7 +32,7 @@ docker = [
     "docker>=5.0,<8.0",
 ]
 dev = [
-    "ruff",
+    "ruff>=0.15,<0.16",
     "mypy>=1.0,<1.6",
     "types-requests",
     "types-cachetools",

{beaker_py-2.7.0 → beaker_py-2.7.2}/src/beaker/_service_client.py

@@ -224,6 +224,12 @@ class ServiceClient:
                 if status_code == 400 and msg is not None and "already in use" in msg:
                     status_code = 409
 
+                # A native 409 is a transient serialization/deadlock conflict
+                # (service/error.go), not a name conflict, so retry it instead of
+                # surfacing e.g. BeakerExperimentConflict.
+                if status_code == 409 and msg == "a retryable database conflict occurred":
+                    raise BeakerServerError(msg)
+
                 if exceptions_for_status is not None and status_code in exceptions_for_status:
                     raise exceptions_for_status[status_code]
 
@@ -246,6 +252,10 @@ class ServiceClient:
             # We assume HEAD and GET calls won't modify state, so they're
             # safe to retry for any recoverable error.
             make_request = self._retriable()(make_request)
+        else:
+            # Other methods only retry transient serialization conflicts; the
+            # aborted transaction rolled back, so replaying is safe.
+            make_request = self._retriable(recoverable_errors=(BeakerServerError,))(make_request)
 
         with self.beaker.http_session() as session:
             return make_request(session)