bugdantic 0.2.6__tar.gz → 0.2.8__tar.gz

{bugdantic-0.2.6 → bugdantic-0.2.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bugdantic
-Version: 0.2.6
+Version: 0.2.8
 Summary: Bugzilla client based on pydantic
 Author-email: James Graham <james@hoppipolla.co.uk>
 Classifier: License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0)
@@ -11,8 +11,8 @@ License-File: LICENSE
 Requires-Dist: httpx[http2]>=0.28.1
 Requires-Dist: pydantic>=2.11.3
 Provides-Extra: test
-Requires-Dist: mypy==1.16.0; extra == "test"
-Requires-Dist: ruff==0.12.0; extra == "test"
-Requires-Dist: pytest==8.4.0; extra == "test"
-Requires-Dist: pytest-ruff==0.4.1; 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: pytest-ruff==0.5; extra == "test"
 Dynamic: license-file

{bugdantic-0.2.6 → bugdantic-0.2.8}/bugdantic/bugzilla.py

@@ -1,9 +1,10 @@
+import base64
 import enum
 import json
 import logging
 from dataclasses import dataclass
 from datetime import datetime
-from typing import Any, Mapping, MutableMapping, Optional, Sequence
+from typing import Any, Mapping, MutableMapping, Optional, Sequence, Self
 from urllib.parse import urljoin
 
 import httpx
@@ -55,7 +56,7 @@ class Flag(BaseModel):
     modification_date: datetime
     status: str
     setter: str
-    requestee: str
+    requestee: Optional[str] = None
 
 
 class Change(BaseModel):
@@ -71,6 +72,50 @@ class History(BaseModel):
     changes: list[Change]
 
 
+class BugComment(BaseModel):
+    """A comment retrieved from a bug (cf. :class:`Comment`, used in updates)."""
+
+    id: Optional[int] = None
+    bug_id: Optional[int] = None
+    attachment_id: Optional[int] = None
+    count: Optional[int] = None
+    text: Optional[str] = None
+    raw_text: Optional[str] = None
+    creator: Optional[str] = None
+    time: Optional[datetime] = None
+    creation_time: Optional[datetime] = None
+    is_private: Optional[bool] = None
+    is_markdown: Optional[bool] = None
+    tags: Optional[list[str]] = None
+
+    model_config = ConfigDict(extra="allow")
+
+    def to_dict(self) -> dict[str, Any]:
+        return self.model_dump(exclude_unset=True)
+
+
+class Attachment(BaseModel):
+    id: Optional[int] = None
+    bug_id: Optional[int] = None
+    file_name: Optional[str] = None
+    summary: Optional[str] = None
+    content_type: Optional[str] = None
+    creator: Optional[str] = None
+    creation_time: Optional[datetime] = None
+    last_change_time: Optional[datetime] = None
+    size: Optional[int] = None
+    data: Optional[str] = None
+    is_private: Optional[bool] = None
+    is_obsolete: Optional[bool] = None
+    is_patch: Optional[bool] = None
+    flags: Optional[list[Flag]] = None
+
+    model_config = ConfigDict(extra="allow")
+
+    def to_dict(self) -> dict[str, Any]:
+        return self.model_dump(exclude_unset=True)
+
+
 class Bug(BaseModel):
     actual_time: Optional[float] = None
     alias: Optional[str] = None
@@ -123,6 +168,9 @@ class Bug(BaseModel):
     cf_webcompat_priority: Optional[str] = None
     cf_webcompat_score: Optional[str] = None
 
+    comments: Optional[list[BugComment]] = None
+    attachments: Optional[list[Attachment]] = None
+
     model_config = ConfigDict(extra="allow")
 
     def to_dict(self) -> dict[str, Any]:
@@ -292,6 +340,78 @@ class BugsUpdateResponse(BaseModel):
     faults: Optional[list[Any]] = None
 
 
+# Data models for creating attachments
+
+
+class AttachmentCreate(BaseModel):
+    ids: Optional[list[int | str]] = None
+    data: str
+    file_name: str
+    summary: str
+    content_type: str
+    comment: Optional[str] = None
+    is_markdown: Optional[bool] = None
+    is_patch: Optional[bool] = None
+    is_private: Optional[bool] = None
+    flags: Optional[list[FlagChange]] = None
+    bug_flags: Optional[list[FlagChange]] = None
+
+    @classmethod
+    def from_raw_data(
+        cls,
+        data: str | bytes,
+        file_name: str,
+        summary: str,
+        content_type: str,
+        ids: Optional[list[int | str]] = None,
+        comment: Optional[str] = None,
+        is_markdown: Optional[bool] = None,
+        is_patch: Optional[bool] = None,
+        is_private: Optional[bool] = None,
+        flags: Optional[list[FlagChange]] = None,
+        bug_flags: Optional[list[FlagChange]] = None,
+    ) -> Self:
+        if isinstance(data, str):
+            data = data.encode("utf8")
+        return cls(
+            ids=ids,
+            data=base64.b64encode(data).decode("ascii"),
+            file_name=file_name,
+            summary=summary,
+            content_type=content_type,
+            comment=comment,
+            is_markdown=is_markdown,
+            is_patch=is_patch,
+            is_private=is_private,
+            flags=flags,
+            bug_flags=bug_flags,
+        )
+
+
+class AttachmentCreateResponse(BaseModel):
+    attacher: str
+    bug_id: int
+    content_type: str
+    creation_time: datetime
+    creator: str
+    creator_detail: User
+    data: str
+    description: str
+    file_name: str
+    flags: Optional[list[FlagChange]]
+    id: int
+    is_obsolete: bool
+    is_patch: bool
+    is_private: bool
+    last_change_time: datetime
+    size: int
+    summary: str
+
+
+class AttachmentsCreateResponse(BaseModel):
+    attachments: Mapping[str, AttachmentCreateResponse]
+
+
 @dataclass
 class BugzillaConfig:
     base_url: str
@@ -343,6 +463,9 @@ class Bugzilla:
 
         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:
                 retry += 1
                 response = self.client.request(
@@ -350,6 +473,7 @@ class Bugzilla:
                 )
                 if response.status_code != 503:
                     break
+            assert response is not None
             try:
                 response.raise_for_status()
             except Exception as e:
@@ -490,3 +614,28 @@ class Bugzilla:
             return update_result.bugs
 
         return []
+
+    def create_attachment(
+        self, attachment: AttachmentCreate, bug_id: Optional[int] = None
+    ) -> list[AttachmentCreateResponse]:
+        """Add an attachment to one or more bugs"""
+        if bug_id is not None:
+            id_str = str(bug_id)
+        elif attachment.ids:
+            id_str = str(attachment.ids[0])
+        else:
+            raise ValueError("Missing bug ids for attachment")
+
+        path = f"bug/{id_str}/attachment"
+
+        json_body = attachment.model_dump(exclude_none=True)
+        if not json_body.get("ids"):
+            json_body["ids"] = [bug_id]
+
+        response = self.request("POST", path, json_body=json_body)
+
+        if self.config.allow_writes:
+            create_result = AttachmentsCreateResponse.model_validate(response)
+            return list(create_result.attachments.values())
+
+        return []

{bugdantic-0.2.6 → bugdantic-0.2.8}/bugdantic.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bugdantic
-Version: 0.2.6
+Version: 0.2.8
 Summary: Bugzilla client based on pydantic
 Author-email: James Graham <james@hoppipolla.co.uk>
 Classifier: License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0)
@@ -11,8 +11,8 @@ License-File: LICENSE
 Requires-Dist: httpx[http2]>=0.28.1
 Requires-Dist: pydantic>=2.11.3
 Provides-Extra: test
-Requires-Dist: mypy==1.16.0; extra == "test"
-Requires-Dist: ruff==0.12.0; extra == "test"
-Requires-Dist: pytest==8.4.0; extra == "test"
-Requires-Dist: pytest-ruff==0.4.1; 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: pytest-ruff==0.5; extra == "test"
 Dynamic: license-file

bugdantic-0.2.8/bugdantic.egg-info/requires.txt

@@ -0,0 +1,8 @@
+httpx[http2]>=0.28.1
+pydantic>=2.11.3
+
+[test]
+mypy==1.18.2
+ruff==0.14.1
+pytest==8.4.2
+pytest-ruff==0.5

{bugdantic-0.2.6 → bugdantic-0.2.8}/pyproject.toml

@@ -5,7 +5,7 @@ authors = [
   {name = "James Graham", email = "james@hoppipolla.co.uk"}
 ]
 
-version = "0.2.6"
+version = "0.2.8"
 requires-python = ">=3.11"
 classifiers = [
     "License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0)",
@@ -20,8 +20,8 @@ dependencies = [
 
 [project.optional-dependencies]
 test = [
-  "mypy==1.16.0",
-  "ruff==0.12.0",
-  "pytest==8.4.0",
-  "pytest-ruff==0.4.1",
+  "mypy==1.18.2",
+  "ruff==0.14.1",
+  "pytest==8.4.2",
+  "pytest-ruff==0.5",
 ]

{bugdantic-0.2.6 → bugdantic-0.2.8}/test/test_bugzilla.py

@@ -32,3 +32,14 @@ def test_serach_include_history(bugzilla):
     for expected_id, bug in zip(bugs, sorted(result, key=lambda x: x.id)):
         assert bug.id == expected_id
         assert isinstance(bug.history, list)
+
+
+def test_search_include_comments_and_attachments(bugzilla):
+    bugs = [423488, 1749533]
+    result = bugzilla.search(
+        {"id": bugs}, include_fields=["id", "comments", "attachments"]
+    )
+    for expected_id, bug in zip(bugs, sorted(result, key=lambda x: x.id)):
+        assert bug.id == expected_id
+        assert isinstance(bug.comments, list)
+        assert isinstance(bug.attachments, list)

bugdantic-0.2.6/bugdantic.egg-info/requires.txt

@@ -1,8 +0,0 @@
-httpx[http2]>=0.28.1
-pydantic>=2.11.3
-
-[test]
-mypy==1.16.0
-ruff==0.12.0
-pytest==8.4.0
-pytest-ruff==0.4.1