arpakitlib 1.8.48__py3-none-any.whl → 1.8.50__py3-none-any.whl

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",
@@ -116,7 +116,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 +148,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
@@ -182,11 +182,49 @@ class ZabbixApiClient:
         res = self.zabbix_api.item.get(**kwargs)
         return res
 
+    def iter_all_items(
+            self,
+            *,
+            host_ids: Optional[list[str | int]] = None,
+            keys: Optional[list[str]] = None,
+            names: Optional[list[str]] = None
+    ) -> Iterator[list[dict[str, Any]]]:
+        item_ids = self.get_item_ids(
+            host_ids=host_ids,
+            keys=keys,
+            names=names
+        )
+        for item_ids_ in iter_group_list(item_ids, n=100):
+            yield self.get_items(item_ids=item_ids_)
+
+    def iter_all_items_by_one(
+            self,
+            *,
+            host_ids: Optional[list[str | int]] = None,
+            keys: Optional[list[str]] = None,
+            names: Optional[list[str]] = None
+    ) -> Iterator[dict[str, Any]]:
+        for items in self.iter_all_items(host_ids=host_ids, keys=keys, names=names):
+            for item in items:
+                yield item
+
+    def get_all_items(
+            self,
+            *,
+            host_ids: list[str | int] | None = None,
+            keys: list[str] | None = None,
+            names: list[str] | None = None
+    ) -> list[dict[str, Any]]:
+        return [
+            item
+            for item in self.iter_all_items_by_one(host_ids=host_ids, keys=keys, names=names)
+        ]
+
     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,
@@ -235,13 +273,6 @@ ZabbixAPIClient = ZabbixApiClient
 
 def __example():
     setup_normal_logging()
-    zabbix = ZabbixAPIClient(
-        api_url=...,
-        api_user=...,
-        api_password=...
-    )
-
-    print(zabbix.is_login_good())
 
 
 async def __async_example():

{arpakitlib-1.8.48.dist-info → arpakitlib-1.8.50.dist-info}/METADATA

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

{arpakitlib-1.8.48.dist-info → arpakitlib-1.8.50.dist-info}/RECORD

@@ -368,9 +368,9 @@ arpakitlib/ar_str_util.py,sha256=QWlXMYgGOh_m0uXwUywF9R6g_zJ0Rh9YSfU_eVzPh7g,420
 arpakitlib/ar_type_util.py,sha256=Cs_tef-Fc5xeyAF54KgISCsP11NHyzIsglm4S3Xx7iM,4049
 arpakitlib/ar_wata_api_client.py,sha256=gdHOqDbuqxhTjVDtRW1DvkRJLdDofCrOq51GTctzLns,242
 arpakitlib/ar_yookassa_api_client_util.py,sha256=VozuZeCJjmLd1zj2BdC9WfiAQ3XYOrIMsdpNK-AUlm0,5347
-arpakitlib/ar_zabbix_api_client_util.py,sha256=0JG-gIJ86-JI-vYRcgxXKFZp18B2_sK-pt4p7W9mvLU,8102
-arpakitlib-1.8.48.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
-arpakitlib-1.8.48.dist-info/METADATA,sha256=E0FQzGTF_K4-Kaz5pnof4M0lKpp-0H0ujrfaDjSBe5E,3475
-arpakitlib-1.8.48.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
-arpakitlib-1.8.48.dist-info/entry_points.txt,sha256=36xqR3PJFT2kuwjkM_EqoIy0qFUDPKSm_mJaI7emewE,87
-arpakitlib-1.8.48.dist-info/RECORD,,
+arpakitlib/ar_zabbix_api_client_util.py,sha256=eb4Tach4y0mgEPVgTig6XR5xVOk6e0IFZI7Gwdtmlxw,9240
+arpakitlib-1.8.50.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
+arpakitlib-1.8.50.dist-info/METADATA,sha256=4a2FYET8lHiY-JXqbpkCMmSiPIdRCL81R9Jog2vKc-8,3475
+arpakitlib-1.8.50.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
+arpakitlib-1.8.50.dist-info/entry_points.txt,sha256=36xqR3PJFT2kuwjkM_EqoIy0qFUDPKSm_mJaI7emewE,87
+arpakitlib-1.8.50.dist-info/RECORD,,