bugdantic 0.4.0__tar.gz → 0.4.2__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bugdantic
-Version: 0.4.0
+Version: 0.4.2
 Summary: Bugzilla client based on pydantic
 Author-email: James Graham <james@hoppipolla.co.uk>
 License-Expression: MPL-2.0
@@ -11,8 +11,9 @@ License-File: LICENSE
 Requires-Dist: httpx[http2]>=0.28.1
 Requires-Dist: pydantic>=2.11.3
 Provides-Extra: test
-Requires-Dist: mypy==1.18.2; extra == "test"
-Requires-Dist: ruff==0.14.1; extra == "test"
-Requires-Dist: pytest==8.4.2; extra == "test"
+Requires-Dist: mypy==2.3.0; extra == "test"
+Requires-Dist: ruff==0.16.2; extra == "test"
+Requires-Dist: pytest==9.1.1; extra == "test"
 Requires-Dist: pytest-ruff==0.5; extra == "test"
+Requires-Dist: ty==0.0.71; extra == "test"
 Dynamic: license-file

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

@@ -2,15 +2,13 @@ import base64
 import enum
 import json
 import logging
+from collections.abc import Mapping, MutableMapping, Sequence
 from dataclasses import dataclass
 from datetime import datetime
 from typing import (
     Any,
     Generic,
-    Mapping,
-    MutableMapping,
     Optional,
-    Sequence,
     Self,
     TypeVar,
     cast,
@@ -454,6 +452,13 @@ 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()
+    ]
+
+
 class Bugzilla:
     def __init__(self, config: BugzillaConfig):
         self.config = config
@@ -488,8 +493,7 @@ class Bugzilla:
         if exclude_fields is not None:
             params["exclude_fields"] = ",".join(exclude_fields)
 
-        if path.startswith("/"):
-            path = path[1:]
+        path = path.removeprefix("/")
 
         url = urljoin(self.config.base_url, f"/rest/{path}")
 
@@ -508,13 +512,13 @@ class Bugzilla:
             assert response is not None
             try:
                 response.raise_for_status()
-            except Exception as e:
+            except Exception:
                 msg = "Request failed"
                 json_resp = response.json()
                 if json_resp:
                     msg += f"\n{json_resp.get('message')}"
                 logging.error(msg)
-                raise e
+                raise
             return response.json()
         else:
             logging.info(f"""Not updating, would send {method} request to {path} with body:
@@ -558,7 +562,7 @@ class Bugzilla:
         return self._bug(bug_id, Bug, include_fields)
 
     def bug_as(self, bug_id: int, bug_type: type[BugType]) -> Optional[BugType]:
-        include_fields = list(bug_type.model_fields.keys())
+        include_fields = model_field_names(bug_type)
         return self._bug(bug_id, bug_type, include_fields)
 
     def bugs(
@@ -585,9 +589,9 @@ class Bugzilla:
         bug_ids: Sequence[int],
         bug_type: type[BugType],
         page_size: int = 100,
-    ) -> list[Bug]:
+    ) -> list[BugType]:
         """Get multiple bugs specified by id"""
-        results: list[Bug] = []
+        results: list[BugType] = []
         for bug_ids_chunk in [
             bug_ids[n : n + page_size] for n in range(0, len(bug_ids), page_size)
         ]:
@@ -668,8 +672,8 @@ class Bugzilla:
 
     def search_as(
         self, query: QueryParams, bug_type: type[BugType], page_size: int = 100
-    ):
-        include_fields = list(bug_type.model_fields.keys())
+    ) -> list[BugType]:
+        include_fields = model_field_names(bug_type)
         return self._search(bug_type, query, include_fields, page_size)
 
     def update_bugs(

{bugdantic-0.4.0 → bugdantic-0.4.2}/bugdantic/userstory.py

@@ -1,12 +1,12 @@
 """Utility functions for working with cf_user_story fields that
 are used to store key: value pair data"""
 
+import re
 from collections import defaultdict
-from enum import IntEnum
+from collections.abc import Iterator, Mapping
 from dataclasses import dataclass
-
-import re
-from typing import Iterator, Optional, Mapping, Self
+from enum import IntEnum
+from typing import Optional, Self
 
 
 def parse(

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bugdantic
-Version: 0.4.0
+Version: 0.4.2
 Summary: Bugzilla client based on pydantic
 Author-email: James Graham <james@hoppipolla.co.uk>
 License-Expression: MPL-2.0
@@ -11,8 +11,9 @@ License-File: LICENSE
 Requires-Dist: httpx[http2]>=0.28.1
 Requires-Dist: pydantic>=2.11.3
 Provides-Extra: test
-Requires-Dist: mypy==1.18.2; extra == "test"
-Requires-Dist: ruff==0.14.1; extra == "test"
-Requires-Dist: pytest==8.4.2; extra == "test"
+Requires-Dist: mypy==2.3.0; extra == "test"
+Requires-Dist: ruff==0.16.2; extra == "test"
+Requires-Dist: pytest==9.1.1; extra == "test"
 Requires-Dist: pytest-ruff==0.5; extra == "test"
+Requires-Dist: ty==0.0.71; extra == "test"
 Dynamic: license-file

{bugdantic-0.4.0 → bugdantic-0.4.2}/bugdantic.egg-info/requires.txt

@@ -2,7 +2,8 @@ httpx[http2]>=0.28.1
 pydantic>=2.11.3
 
 [test]
-mypy==1.18.2
-ruff==0.14.1
-pytest==8.4.2
+mypy==2.3.0
+ruff==0.16.2
+pytest==9.1.1
 pytest-ruff==0.5
+ty==0.0.71

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

@@ -5,7 +5,7 @@ authors = [
   {name = "James Graham", email = "james@hoppipolla.co.uk"}
 ]
 
-version = "0.4.0"
+version = "0.4.2"
 requires-python = ">=3.11"
 license = "MPL-2.0"
 classifiers = [
@@ -20,8 +20,15 @@ dependencies = [
 
 [project.optional-dependencies]
 test = [
-  "mypy==1.18.2",
-  "ruff==0.14.1",
-  "pytest==8.4.2",
+  "mypy==2.3.0",
+  "ruff==0.16.2",
+  "pytest==9.1.1",
   "pytest-ruff==0.5",
+  "ty==0.0.71",
 ]
+
+[tool.mypy]
+disallow_untyped_defs = true
+
+[tool.ruff.lint]
+ignore = ["UP045", "LOG015"]

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

@@ -1,5 +1,5 @@
 import pytest
-from pydantic import BaseModel
+from pydantic import BaseModel, Field
 
 from bugdantic import Bugzilla, BugzillaConfig
 from bugdantic.bugzilla import BugComment
@@ -69,3 +69,14 @@ def test_search_as(bugzilla):
         assert isinstance(bug, BugData)
         assert bug.id == expected_id
         assert isinstance(bug.comments, list)
+
+
+def test_bug_as_alias(bugzilla):
+    class BugData(BaseModel):
+        id: int
+        user_story: str = Field(alias="cf_user_story")
+
+    result = bugzilla.bug_as(975444, BugData)
+    assert isinstance(result, BugData)
+    assert result.id == 975444
+    assert result.user_story is not None