Fix urllib3 DeprecationWarning about using 'method_whitelist' with Retry

Signed-off-by: Mattt Zmuda <mattt@replicate.com>

Author: mattt

replicate/client.py

@@ -30,7 +30,7 @@ def __init__(self, api_token: Optional[str] = None) -> None:
             total=5,
             backoff_factor=2,
             # Only retry 500s on GET so we don't unintionally mutute data
-            method_whitelist=["GET"],
+            allowed_methods=["GET"],
             # https://support.cloudflare.com/hc/en-us/articles/115003011431-Troubleshooting-Cloudflare-5XX-errors
             status_forcelist=[
                 429,
@@ -54,7 +54,7 @@ def __init__(self, api_token: Optional[str] = None) -> None:
         write_retries = Retry(
             total=5,
             backoff_factor=2,
-            method_whitelist=["POST", "PUT"],
+            allowed_methods=["POST", "PUT"],
             # Only retry POST/PUT requests on rate limits, so we don't unintionally mutute data
             status_forcelist=[429],
         )

replicate/model.py

@@ -36,5 +36,8 @@ def create(self, **kwargs) -> Model:
         raise NotImplementedError()
 
     def prepare_model(self, attrs: Union[Model, Dict]) -> Model:
-        attrs["id"] = f"{attrs['username']}/{attrs['name']}"
+        if isinstance(attrs, BaseModel):
+            attrs.id = f"{attrs.username}/{attrs.name}"
+        elif isinstance(attrs, dict):
+            attrs["id"] = f"{attrs['username']}/{attrs['name']}"
         return super().prepare_model(attrs)