pytest-clerk 4.0.2__py3-none-any.whl → 4.0.4__py3-none-any.whl

pytest_clerk/clerk.py

@@ -7,15 +7,7 @@ import httpx
 import pytest
 from decouple import UndefinedValueError, config
 from limits import RateLimitItemPerSecond, storage, strategies
-from tenacity import retry, retry_if_exception, wait_random_exponential
-
-retryable_status_codes = (
-    httpx.codes.TOO_MANY_REQUESTS,
-    httpx.codes.INTERNAL_SERVER_ERROR,
-    httpx.codes.BAD_GATEWAY,
-    httpx.codes.SERVICE_UNAVAILABLE,
-    httpx.codes.GATEWAY_TIMEOUT,
-)
+from tenacity import retry, stop_after_attempt, wait_random_exponential
 
 logger = logging.getLogger(__name__)
 
@@ -32,31 +24,31 @@ class ClerkRateLimiter:
         # limits.
         self.no_limit = object()
         self.backend_rate_limits = {
-            # 20 requests per 10 seconds.
-            "POST": {r"/v1/users": RateLimitItemPerSecond(amount=20, multiples=10)},
+            # 19 requests per 10 seconds.
+            "POST": {r"/v1/users": RateLimitItemPerSecond(amount=19, multiples=10)},
             # No rate limits.
             "GET": {r"/v1/jwks": self.no_limit},
-            # 100 requests per 10 seconds.
-            "DEFAULT": RateLimitItemPerSecond(amount=100, multiples=10),
+            # 99 requests per 10 seconds.
+            "DEFAULT": RateLimitItemPerSecond(amount=99, multiples=10),
         }
         self.frontend_rate_limits = {
             "POST": {
-                # 3 requests per 10 seconds.
+                # 2 requests per 10 seconds.
                 r"/v1/client/sign_ins/(?P<sign_in_id>.*?)/attempt_first_factor": RateLimitItemPerSecond(
-                    amount=3, multiples=10
+                    amount=2, multiples=10
                 ),
-                # 3 requests per 10 seconds.
+                # 2 requests per 10 seconds.
                 r"/v1/client/sign_ins/(?P<sign_in_id>.*?)/attempt_second_factor": RateLimitItemPerSecond(
-                    amount=3, multiples=10
+                    amount=2, multiples=10
                 ),
-                # 3 requests per 10 seconds.
+                # 2 requests per 10 seconds.
                 r"/v1/client/sign_ups/(?P<sign_up_id>.*?)/attempt_verification": RateLimitItemPerSecond(
-                    amount=3, multiples=10
+                    amount=2, multiples=10
                 ),
-                # 5 requests per 10 seconds.
-                r"/v1/client/sign_ins": RateLimitItemPerSecond(amount=5, multiples=10),
-                # 5 requests per 10 seconds.
-                r"/v1/client/sign_ups": RateLimitItemPerSecond(amount=5, multiples=10),
+                # 4 requests per 10 seconds.
+                r"/v1/client/sign_ins": RateLimitItemPerSecond(amount=4, multiples=10),
+                # 4 requests per 10 seconds.
+                r"/v1/client/sign_ups": RateLimitItemPerSecond(amount=4, multiples=10),
             }
         }
         self.storage = storage.MemoryStorage()
@@ -177,16 +169,6 @@ class ClerkRateLimiter:
             sleep(1)
 
 
-def retry_predicate(exception):
-    """Return whether to retry. This depends on getting an exception with a response
-    object, and that response object having one of the status codes that we can retry.
-    """
-    return (
-        hasattr(exception, "response")
-        and exception.response.status_code in retryable_status_codes
-    )
-
-
 @pytest.fixture(scope="session")
 def clerk_rate_limiter():
     """Return an instance of the Clerk rate limiter for use with HTTPX request hooks."""
@@ -234,6 +216,7 @@ def clerk_backend_httpx_client(clerk_secret_key, clerk_rate_limiter):
         headers={"Authorization": f"Bearer {clerk_secret_key}"},
         base_url="https://api.clerk.com/v1",
         event_hooks={"request": [clerk_rate_limiter.rate_limit_hook]},
+        timeout=10,
     )
 
     yield client
@@ -268,7 +251,7 @@ def clerk_frontend_httpx_client(clerk_frontend_api_url, clerk_rate_limiter):
     set via environment variables or in a .env file. This URL can be found under
     Developers -> API Keys -> Show API URLs.
     """
-    with httpx.Client(base_url=f"{clerk_frontend_api_url}/v1") as client:
+    with httpx.Client(base_url=f"{clerk_frontend_api_url}/v1", timeout=10) as client:
         result = client.post(url="/dev_browser")
 
     result.raise_for_status()
@@ -277,6 +260,7 @@ def clerk_frontend_httpx_client(clerk_frontend_api_url, clerk_rate_limiter):
         params={"__dev_session": result.json()["token"]},
         base_url=f"{clerk_frontend_api_url}/v1",
         event_hooks={"request": [clerk_rate_limiter.rate_limit_hook]},
+        timeout=10,
     )
 
     yield client
@@ -294,8 +278,9 @@ def clerk_delete_org(clerk_backend_httpx_client):
     """
 
     @retry(
-        retry=retry_if_exception(predicate=retry_predicate),
+        stop=stop_after_attempt(10),
         wait=wait_random_exponential(multiplier=0.5, max=60),
+        reraise=True,
     )
     def _inner(org_id, **kwargs):
         """Delete the org with the given org ID. Any additional kwargs are passed
@@ -324,8 +309,9 @@ def clerk_create_org(clerk_backend_httpx_client, clerk_delete_org):
     orgs_to_delete = []
 
     @retry(
-        retry=retry_if_exception(predicate=retry_predicate),
+        stop=stop_after_attempt(10),
         wait=wait_random_exponential(multiplier=0.5, max=60),
+        reraise=True,
     )
     def _inner(organization_data, **kwargs):
         """This function creates an Organization with the provided organization_data,
@@ -337,8 +323,6 @@ def clerk_create_org(clerk_backend_httpx_client, clerk_delete_org):
         The API documentation for this call can be found below:
         https://clerk.com/docs/reference/backend-api/tag/Organizations#operation/CreateOrganization
         """
-        nonlocal orgs_to_delete
-
         result = clerk_backend_httpx_client.post(
             url="/organizations", json=organization_data, **kwargs
         )
@@ -365,8 +349,9 @@ def clerk_update_org(clerk_backend_httpx_client):
     """
 
     @retry(
-        retry=retry_if_exception(predicate=retry_predicate),
+        stop=stop_after_attempt(10),
         wait=wait_random_exponential(multiplier=0.5, max=60),
+        reraise=True,
     )
     def _inner(org_id_or_slug, organization_data, **kwargs):
         """This function attempts to update an organization with the provided
@@ -397,8 +382,9 @@ def clerk_get_org(clerk_backend_httpx_client):
     """
 
     @retry(
-        retry=retry_if_exception(predicate=retry_predicate),
+        stop=stop_after_attempt(10),
         wait=wait_random_exponential(multiplier=0.5, max=60),
+        reraise=True,
     )
     def _inner(org_id_or_slug, **kwargs):
         """This function attempts to find and return the org with the given ID or slug.
@@ -428,8 +414,9 @@ def clerk_delete_user(clerk_backend_httpx_client):
     """
 
     @retry(
-        retry=retry_if_exception(predicate=retry_predicate),
+        stop=stop_after_attempt(10),
         wait=wait_random_exponential(multiplier=0.5, max=60),
+        reraise=True,
     )
     def _inner(user_id, **kwargs):
         """Delete the user with the given user ID. All additional kwargs are passed
@@ -456,8 +443,9 @@ def clerk_create_user(clerk_backend_httpx_client, clerk_delete_user):
     users_to_delete = []
 
     @retry(
-        retry=retry_if_exception(predicate=retry_predicate),
+        stop=stop_after_attempt(10),
         wait=wait_random_exponential(multiplier=0.5, max=60),
+        reraise=True,
     )
     def _inner(user_data, **kwargs):
         """This function uses user_data to create a User with the backend API, and
@@ -469,7 +457,6 @@ def clerk_create_user(clerk_backend_httpx_client, clerk_delete_user):
         The API documentation for this call can be found below:
         https://clerk.com/docs/reference/backend-api/tag/Users#operation/CreateUser
         """
-        nonlocal users_to_delete
         result = clerk_backend_httpx_client.post(url="/users", json=user_data, **kwargs)
         result.raise_for_status()
         result = result.json()
@@ -493,8 +480,9 @@ def clerk_add_org_member(clerk_backend_httpx_client):
     """
 
     @retry(
-        retry=retry_if_exception(predicate=retry_predicate),
+        stop=stop_after_attempt(10),
         wait=wait_random_exponential(multiplier=0.5, max=60),
+        reraise=True,
     )
     def _inner(org_id, user_id, role, **kwargs):
         """Add's the provided user ID to the provided org ID with the provided role. All
@@ -527,8 +515,9 @@ def clerk_sign_user_in(clerk_frontend_httpx_client):
     """
 
     @retry(
-        retry=retry_if_exception(predicate=retry_predicate),
+        stop=stop_after_attempt(10),
         wait=wait_random_exponential(multiplier=0.5, max=60),
+        reraise=True,
     )
     def _inner(email, password, **kwargs):
         """Attempts to sign in the user using the provided email and password, and then
@@ -565,8 +554,9 @@ def clerk_touch_user_session(clerk_frontend_httpx_client):
     """
 
     @retry(
-        retry=retry_if_exception(predicate=retry_predicate),
+        stop=stop_after_attempt(10),
         wait=wait_random_exponential(multiplier=0.5, max=60),
+        reraise=True,
     )
     def _inner(session_id, session_data=None, **kwargs):
         """Given a Clerk user session ID and any optional session_data, touch the
@@ -626,8 +616,9 @@ def clerk_get_user_session_token(clerk_frontend_httpx_client):
     """
 
     @retry(
-        retry=retry_if_exception(predicate=retry_predicate),
+        stop=stop_after_attempt(10),
         wait=wait_random_exponential(multiplier=0.5, max=60),
+        reraise=True,
     )
     def _inner(session_id, **kwargs):
         """Retrieves a currently valid session token for the user tied to the provided
@@ -659,8 +650,9 @@ def clerk_end_user_session(clerk_frontend_httpx_client):
     """
 
     @retry(
-        retry=retry_if_exception(predicate=retry_predicate),
+        stop=stop_after_attempt(10),
         wait=wait_random_exponential(multiplier=0.5, max=60),
+        reraise=True,
     )
     def _inner(session_id, **kwargs):
         """Given a Clerk user session ID, ends that session. This passes through any

{pytest_clerk-4.0.2.dist-info → pytest_clerk-4.0.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pytest-clerk
-Version: 4.0.2
+Version: 4.0.4
 Summary: A set of pytest fixtures to help with integration testing with Clerk.
 License: MIT
 Author: Ryan Causey

pytest_clerk-4.0.4.dist-info/RECORD

@@ -0,0 +1,7 @@
+pytest_clerk/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+pytest_clerk/clerk.py,sha256=hrLyb3IApqvx49U-7FsjuLMj_Cbtd17y71MpG89gu68,24621
+pytest_clerk-4.0.4.dist-info/LICENSE,sha256=QLSYHsNt-ZLbbVtDs7h8o8v-V0SlK2BuGe7LmoPOasU,1064
+pytest_clerk-4.0.4.dist-info/METADATA,sha256=OHo84IIKNcBJVHrsnbRZPL_D5VdZp9z1bThAwkVRFyw,1291
+pytest_clerk-4.0.4.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+pytest_clerk-4.0.4.dist-info/entry_points.txt,sha256=ps5MgIGlDiWP4lufTAzoQhfwL-GA7rJquc1bqnVR-oA,44
+pytest_clerk-4.0.4.dist-info/RECORD,,

{pytest_clerk-4.0.2.dist-info → pytest_clerk-4.0.4.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 2.0.1
+Generator: poetry-core 2.1.3
 Root-Is-Purelib: true
 Tag: py3-none-any

pytest_clerk-4.0.2.dist-info/RECORD

@@ -1,7 +0,0 @@
-pytest_clerk/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pytest_clerk/clerk.py,sha256=fjf4Io81i2grKuFE8AwzHd7X9vhjpet7rXTGVsCKhxQ,25203
-pytest_clerk-4.0.2.dist-info/LICENSE,sha256=QLSYHsNt-ZLbbVtDs7h8o8v-V0SlK2BuGe7LmoPOasU,1064
-pytest_clerk-4.0.2.dist-info/METADATA,sha256=I3IhRKapB-S3fpW44d60PewoMAidviBn9GNfIIT9yHs,1291
-pytest_clerk-4.0.2.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
-pytest_clerk-4.0.2.dist-info/entry_points.txt,sha256=ps5MgIGlDiWP4lufTAzoQhfwL-GA7rJquc1bqnVR-oA,44
-pytest_clerk-4.0.2.dist-info/RECORD,,