amochka 0.4.3__py3-none-any.whl → 0.4.5__py3-none-any.whl

amochka/__init__.py

@@ -2,7 +2,7 @@
 amochka: Библиотека для работы с API amoCRM.
 """
 
-__version__ = "0.4.3"
+__version__ = "0.4.5"
 
 from .client import AmoCRMClient, CacheConfig
 from .errors import (

amochka/client.py

@@ -1093,12 +1093,17 @@ class AmoCRMClient:
         updated_from: Optional[Union[int, float, str, datetime]] = None,
         updated_to: Optional[Union[int, float, str, datetime]] = None,
         contact_ids: Optional[Union[int, Sequence[Union[int, str]]]] = None,
+        query: Optional[str] = None,
+        min_query_length: Optional[int] = None,
         limit: int = 250,
         extra_params: Optional[dict] = None,
         max_pages: Optional[int] = None,
     ) -> Iterator[dict]:
         """
-        Итератор контактов с фильтрацией по диапазону обновления или списку ID.
+        Итератор контактов с фильтрацией по диапазону обновления, списку ID или query.
+
+        :param query: Строка поиска (например, телефон). Перед отправкой очищается до цифр.
+        :param min_query_length: Минимальная длина query (по числу цифр). Если не достигнута, query не отправляется.
 
         :param max_pages: Максимальное количество страниц для итерации (None = без ограничений)
         :raises ValidationError: Если параметры имеют некорректный тип или значение.
@@ -1135,6 +1140,11 @@ class AmoCRMClient:
         contact_param = self._format_filter_values(contact_ids)
         if contact_param:
             params["filter[id][]"] = contact_param
+        if query is not None:
+            query_digits = "".join(ch for ch in query.strip() if ch.isdigit())
+            if query_digits:
+                if min_query_length is None or len(query_digits) >= min_query_length:
+                    params["query"] = query_digits
         if extra_params:
             params.update(extra_params)
 
@@ -1228,6 +1238,8 @@ class AmoCRMClient:
         if end_ts is not None:
             params["filter[updated_at][to]"] = end_ts
         note_type_param = self._format_filter_values(note_type)
+        if isinstance(note_type_param, (list, tuple, set)):
+            note_type_param = ",".join(note_type_param)
         if note_type_param:
             params["filter[note_type]"] = note_type_param
         entity_param = self._format_filter_values(entity_ids)
@@ -1597,8 +1609,11 @@ class AmoCRMClient:
             "page": 1,
             "limit": 250
         }
-        if note_type is not None:
-            params["filter[note_type]"] = note_type
+        note_type_param = self._format_filter_values(note_type)
+        if isinstance(note_type_param, (list, tuple, set)):
+            note_type_param = ",".join(note_type_param)
+        if note_type_param:
+            params["filter[note_type]"] = note_type_param
         if extra_params:
             params.update(extra_params)
         
@@ -1606,7 +1621,7 @@ class AmoCRMClient:
         while True:
             response = self._make_request("GET", endpoint, params=params)
             if not response:
-                self.logger.warning(f"Empty response for notes {entity} {entity_id}, stopping pagination")
+                self.logger.debug(f"Empty response for notes {entity} {entity_id}, stopping pagination")
                 break
             if response and "_embedded" in response and "notes" in response["_embedded"]:
                 notes.extend(response["_embedded"]["notes"])
@@ -1690,7 +1705,7 @@ class AmoCRMClient:
         while True:
             response = self._make_request("GET", "/api/v4/events", params=params)
             if not response:
-                self.logger.warning(f"Empty response for events {entity} {entity_id}, stopping pagination")
+                self.logger.debug(f"Empty response for events {entity} {entity_id}, stopping pagination")
                 break
             if response and "_embedded" in response and "events" in response["_embedded"]:
                 events.extend(response["_embedded"]["events"])

{amochka-0.4.3.dist-info → amochka-0.4.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: amochka
-Version: 0.4.3
+Version: 0.4.5
 Summary: Python library for working with amoCRM API with ETL capabilities
 Author-email: Timur <timurdt@gmail.com>
 License: MIT

{amochka-0.4.3.dist-info → amochka-0.4.5.dist-info}/RECORD

@@ -1,5 +1,5 @@
-amochka/__init__.py,sha256=SXqHWqb3-E2ixu87d6j8Bw8MF7TJ_3_hzSFe3vFUUVk,925
-amochka/client.py,sha256=z4E25n5JkK64Si_RZkc-rD735a9sxmWDtGqgGnffpIw,89189
+amochka/__init__.py,sha256=xqqZUwHZXWpqCmIOmBirxG6KoN5wrezaG-ZMT_x6ttM,925
+amochka/client.py,sha256=oAsFGXVIVC8IPdkbRdB-d16VFUb78FhZGhOBSFcrxJI,90171
 amochka/errors.py,sha256=Rg4U9srjboQwgU3wwhAed0p3vGcc0ZhuyKHIDhYFnp8,1371
 amochka/etl.py,sha256=tzdGPRGxR49aSAjLksic-FqechvDUTfK8ZUUJGuIU7M,8960
 etl/__init__.py,sha256=bp9fPqbKlOc7xzs27diHEvysy1FgBrwlpX6GnR6GL9U,255
@@ -9,7 +9,7 @@ etl/loaders.py,sha256=x8PcDQoq2kjbd52H2VzKKz5vHzyD6DXSsb9X0foPX_U,31941
 etl/run_etl.py,sha256=LxKQLE_yUPkg7kaFmmMxrdggz27puS1VdV9NTna9e4Q,26665
 etl/transformers.py,sha256=OwYJ_9l3oqvy2Y3-umXjAGweOIqlfRI0iSiCFPrcQ8E,17867
 etl/migrations/001_create_tables.sql,sha256=YrSaZjpofC1smjYx0bM4eHQumboruIBY3fwRDlJLLSo,15749
-amochka-0.4.3.dist-info/METADATA,sha256=nRqy4mnZ-FRsmNdZNCLsooEZjQKbceZwDdzQ_cAEoyU,7530
-amochka-0.4.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-amochka-0.4.3.dist-info/top_level.txt,sha256=grRX8aLFG-yYKPsAqCD6sUBmdLSQeOMHsc9Dl6S7Lzo,12
-amochka-0.4.3.dist-info/RECORD,,
+amochka-0.4.5.dist-info/METADATA,sha256=4OROMcyke4Ffs6xli8q1FJaY4xrmvfzimubSfqegZjY,7530
+amochka-0.4.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+amochka-0.4.5.dist-info/top_level.txt,sha256=grRX8aLFG-yYKPsAqCD6sUBmdLSQeOMHsc9Dl6S7Lzo,12
+amochka-0.4.5.dist-info/RECORD,,