arpakitlib 1.8.49__tar.gz → 1.8.51__tar.gz

{arpakitlib-1.8.49 → arpakitlib-1.8.51}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: arpakitlib
-Version: 1.8.49
+Version: 1.8.51
 Summary: arpakitlib
 License: Apache-2.0
 Keywords: arpakitlib,arpakit,arpakit-company,arpakitcompany,arpakit_company

{arpakitlib-1.8.49 → arpakitlib-1.8.51}/arpakitlib/ar_zabbix_api_client_util.py

@@ -78,7 +78,7 @@ class ZabbixApiClient:
         kwargs["sortorder"] = "DESC"
         return [host_id["hostid"] for host_id in host_ids]
 
-    def get_hosts(self, *, host_ids: Optional[list[str]] = None) -> list[dict[str, Any]]:
+    def get_hosts(self, *, host_ids: Optional[list[str | int]] = None) -> list[dict[str, Any]]:
         kwargs = {
             "output": "extend",
             "selectInterfaces": "extend",
@@ -93,6 +93,8 @@ class ZabbixApiClient:
 
         self.login_if_not_logged_in()
         hosts = self.zabbix_api.host.get(**kwargs)
+        for d in hosts:
+            d["hostid_int"] = int(d["hostid"])
 
         return hosts
 
@@ -116,7 +118,7 @@ class ZabbixApiClient:
     def get_item_ids(
             self,
             *,
-            host_ids: Optional[list[str]] = None,
+            host_ids: Optional[list[str | int]] = None,
             keys: Optional[list[str]] = None,
             names: Optional[list[str]] = None,
             limit: Optional[int] = None
@@ -148,8 +150,8 @@ class ZabbixApiClient:
     def get_items(
             self,
             *,
-            host_ids: Optional[list[str]] = None,
-            item_ids: Optional[list[str]] = None,
+            host_ids: Optional[list[str | int]] = None,
+            item_ids: Optional[list[str | int]] = None,
             keys: Optional[list[str]] = None,
             names: Optional[list[str]] = None,
             limit: Optional[int] = None
@@ -180,12 +182,14 @@ class ZabbixApiClient:
         kwargs["sortorder"] = "DESC"
         self.login_if_not_logged_in()
         res = self.zabbix_api.item.get(**kwargs)
+        for d in res:
+            d["itemid_int"] = int(d["itemid"])
         return res
 
     def iter_all_items(
             self,
             *,
-            host_ids: Optional[list[str]] = None,
+            host_ids: Optional[list[str | int]] = None,
             keys: Optional[list[str]] = None,
             names: Optional[list[str]] = None
     ) -> Iterator[list[dict[str, Any]]]:
@@ -200,7 +204,7 @@ class ZabbixApiClient:
     def iter_all_items_by_one(
             self,
             *,
-            host_ids: Optional[list[str]] = None,
+            host_ids: Optional[list[str | int]] = None,
             keys: Optional[list[str]] = None,
             names: Optional[list[str]] = None
     ) -> Iterator[dict[str, Any]]:
@@ -211,7 +215,7 @@ class ZabbixApiClient:
     def get_all_items(
             self,
             *,
-            host_ids: list[str] | None = None,
+            host_ids: list[str | int] | None = None,
             keys: list[str] | None = None,
             names: list[str] | None = None
     ) -> list[dict[str, Any]]:
@@ -223,8 +227,8 @@ class ZabbixApiClient:
     def get_histories(
             self,
             *,
-            host_ids: Optional[list[str]] = None,
-            item_ids: Optional[list[str]] = None,
+            host_ids: Optional[list[str | int]] = None,
+            item_ids: Optional[list[str | int]] = None,
             limit: Optional[int] = None,
             history: int = 0,
             time_from: Optional[datetime] = None,

{arpakitlib-1.8.49 → arpakitlib-1.8.51}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "arpakitlib"
-version = "1.8.49"
+version = "1.8.51"
 description = "arpakitlib"
 authors = [
     { name = "arpakit_support", email = "support@arpakit.com" }