bugdantic 0.4.2__tar.gz → 0.4.4__tar.gz

{bugdantic-0.4.2 → bugdantic-0.4.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bugdantic
-Version: 0.4.2
+Version: 0.4.4
 Summary: Bugzilla client based on pydantic
 Author-email: James Graham <james@hoppipolla.co.uk>
 License-Expression: MPL-2.0

{bugdantic-0.4.2 → bugdantic-0.4.4}/bugdantic/bugzilla.py

@@ -2,8 +2,9 @@ import base64
 import enum
 import json
 import logging
+import time
 from collections.abc import Mapping, MutableMapping, Sequence
-from dataclasses import dataclass
+from dataclasses import dataclass, field
 from datetime import datetime
 from typing import (
     Any,
@@ -436,6 +437,7 @@ class BugzillaConfig:
     allow_writes: bool = False
     # Number of times to retry a request if there's a 503 error
     max_retries: int = 1
+    retry_status_codes: set[int] = field(default_factory=lambda: {502, 503})
 
 
 BugType = TypeVar("BugType", bound=BaseModel)
@@ -453,10 +455,19 @@ def bug_search_model(bug_type: type[BugType]) -> type[BugSearchGeneric[BugType]]
 
 
 def model_field_names(model: type[BaseModel]) -> list[str]:
-    return [
-        field.alias if field.alias else name
-        for name, field in model.model_fields.items()
-    ]
+    field_names = []
+    for name, field_obj in model.model_fields.items():
+        if field_obj.validation_alias is not None:
+            if not isinstance(field_obj.validation_alias, str):
+                raise ValueError(
+                    "Only string values for validation_alias are supported"
+                )
+            field_names.append(field_obj.validation_alias)
+        elif field_obj.alias is not None:
+            field_names.append(field_obj.alias)
+        else:
+            field_names.append(name)
+    return field_names
 
 
 class Bugzilla:
@@ -496,18 +507,30 @@ class Bugzilla:
         path = path.removeprefix("/")
 
         url = urljoin(self.config.base_url, f"/rest/{path}")
-
+        logging.debug("Fetching from bugzilla: %s", url)
         if self.config.allow_writes or method in {"GET", "OPTIONS", "HEAD"}:
             retry = 0
             if self.config.max_retries < 0:
                 raise ValueError("max_retries must be at least 0")
             response = None
             while retry <= self.config.max_retries:
+                if retry != 0:
+                    wait_time = 2**retry
+                    logging.debug(
+                        "Request failed, retrying %s/%s, sleeping %ss",
+                        retry,
+                        self.config.max_retries,
+                        wait_time,
+                    )
+                    time.sleep(wait_time)
                 retry += 1
-                response = self.client.request(
-                    method, url, params=params, headers=headers, json=json_body
-                )
-                if response.status_code != 503:
+                try:
+                    response = self.client.request(
+                        method, url, params=params, headers=headers, json=json_body
+                    )
+                except httpx.ReadTimeout:
+                    continue
+                if response.status_code not in self.config.retry_status_codes:
                     break
             assert response is not None
             try:

{bugdantic-0.4.2 → bugdantic-0.4.4}/bugdantic.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bugdantic
-Version: 0.4.2
+Version: 0.4.4
 Summary: Bugzilla client based on pydantic
 Author-email: James Graham <james@hoppipolla.co.uk>
 License-Expression: MPL-2.0

{bugdantic-0.4.2 → bugdantic-0.4.4}/pyproject.toml

@@ -5,7 +5,7 @@ authors = [
   {name = "James Graham", email = "james@hoppipolla.co.uk"}
 ]
 
-version = "0.4.2"
+version = "0.4.4"
 requires-python = ">=3.11"
 license = "MPL-2.0"
 classifiers = [

{bugdantic-0.4.2 → bugdantic-0.4.4}/test/test_bugzilla.py

@@ -80,3 +80,16 @@ def test_bug_as_alias(bugzilla):
     assert isinstance(result, BugData)
     assert result.id == 975444
     assert result.user_story is not None
+
+
+def test_bug_as_validation_alias(bugzilla):
+    class BugData(BaseModel):
+        id: int
+        user_story: str = Field(
+            validation_alias="cf_user_story", alias="raw_user_story"
+        )
+
+    result = bugzilla.bug_as(975444, BugData)
+    assert isinstance(result, BugData)
+    assert result.id == 975444
+    assert result.user_story is not None