bugdantic 0.2__tar.gz → 0.2.2__tar.gz

{bugdantic-0.2 → bugdantic-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bugdantic
-Version: 0.2
+Version: 0.2.2
 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)

{bugdantic-0.2 → bugdantic-0.2.2}/bugdantic/bugzilla.py

@@ -3,7 +3,7 @@ import json
 import logging
 from dataclasses import dataclass
 from datetime import datetime
-from typing import Any, Mapping, MutableMapping, Optional
+from typing import Any, Mapping, MutableMapping, Optional, Sequence
 from urllib.parse import urljoin
 
 import httpx
@@ -11,6 +11,9 @@ from pydantic import BaseModel, ConfigDict
 
 Json = dict[str, "Json"] | list["Json"] | str | int | float | bool | None
 
+QueryValue = Optional[str | int | float | bool]
+QueryParams = Mapping[str, QueryValue | Sequence[QueryValue]]
+
 
 class BugzillaError(Exception):
     pass
@@ -133,7 +136,6 @@ class BugSearch(BaseModel):
 # Data model for bug history
 
 
-
 class BugHistory(BaseModel):
     id: int
     history: list[History]
@@ -308,12 +310,14 @@ class Bugzilla:
         path: str,
         include_fields: Optional[list[str]] = None,
         exclude_fields: Optional[list[str]] = None,
-        params: Optional[dict[str, str]] = None,
+        params: Optional[QueryParams] = None,
         headers: Optional[dict[str, str]] = None,
         json_body: Optional[MutableMapping[str, Json]] = None,
     ) -> Mapping[str, Json]:
         if params is None:
             params = {}
+        else:
+            params = {**params}
 
         if include_fields is not None:
             params["include_fields"] = ",".join(include_fields)
@@ -385,11 +389,13 @@ class Bugzilla:
 
     def search(
         self,
-        query: dict[str, str],
+        query: QueryParams,
         include_fields: Optional[list[str]] = None,
         page_size: int = 100,
     ) -> list[Bug]:
+        query = {**query}
         paginate = False
+        offset = 0
         if "limit" not in query and "offset" not in query and page_size > 0:
             query["limit"] = str(page_size)
             query["offset"] = "0"
@@ -413,7 +419,8 @@ class Bugzilla:
                 )
                 raise BugzillaError("Response contained neither bugs nor faults fields")
 
-            query["offset"] = str(int(query["offset"]) + page_size)
+            offset += page_size
+            query["offset"] = str(offset)
 
         return results
 

{bugdantic-0.2 → bugdantic-0.2.2}/bugdantic.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bugdantic
-Version: 0.2
+Version: 0.2.2
 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)

{bugdantic-0.2 → bugdantic-0.2.2}/pyproject.toml

@@ -5,7 +5,7 @@ authors = [
   {name = "James Graham", email = "james@hoppipolla.co.uk"}
 ]
 
-version = "0.2"
+version = "0.2.2"
 requires-python = ">=3.11"
 classifiers = [
     "License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0)",