amochka 0.4.4__py3-none-any.whl → 0.4.6__py3-none-any.whl

amochka/__init__.py

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

amochka/client.py

@@ -1093,12 +1093,22 @@ 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,
+        query_mode: str = "auto",
+        min_phone_length: Optional[int] = None,
     ) -> Iterator[dict]:
         """
-        Итератор контактов с фильтрацией по диапазону обновления или списку ID.
+        Итератор контактов с фильтрацией по диапазону обновления, списку ID или query.
+
+        :param query: Строка поиска (например, телефон). Перед отправкой очищается до цифр.
+        :param min_query_length: Минимальная длина query (по числу цифр). Если не достигнута, query не отправляется.
+                                 Deprecated: используйте min_phone_length.
+        :param query_mode: Режим обработки query: auto | phone | raw.
+        :param min_phone_length: Минимальная длина номера (по числу цифр). Применяется в phone/auto режимах.
 
         :param max_pages: Максимальное количество страниц для итерации (None = без ограничений)
         :raises ValidationError: Если параметры имеют некорректный тип или значение.
@@ -1125,6 +1135,15 @@ class AmoCRMClient:
             elif not isinstance(contact_ids, str):
                 raise ValidationError(f"contact_ids must be int, str or sequence, got {type(contact_ids).__name__}")
 
+        if min_query_length is not None and (not isinstance(min_query_length, int) or min_query_length < 1):
+            raise ValidationError("min_query_length must be a positive int")
+        if min_phone_length is not None and (not isinstance(min_phone_length, int) or min_phone_length < 1):
+            raise ValidationError("min_phone_length must be a positive int")
+
+        mode = (query_mode or "auto").lower()
+        if mode not in {"auto", "phone", "raw"}:
+            raise ValidationError(f"query_mode must be one of: auto, phone, raw (got {query_mode})")
+
         params = {"limit": limit, "page": 1}
         start_ts = self._to_timestamp(updated_from)
         end_ts = self._to_timestamp(updated_to)
@@ -1135,6 +1154,18 @@ class AmoCRMClient:
         contact_param = self._format_filter_values(contact_ids)
         if contact_param:
             params["filter[id][]"] = contact_param
+        if query is not None:
+            query_str = str(query).strip()
+            if query_str:
+                effective_min_len = min_phone_length if min_phone_length is not None else min_query_length
+                is_raw = mode == "raw" or (mode == "auto" and any(ch.isalpha() or ch == "@" for ch in query_str))
+                if is_raw:
+                    params["query"] = query_str
+                else:
+                    query_digits = "".join(ch for ch in query_str if ch.isdigit())
+                    if query_digits:
+                        if effective_min_len is None or len(query_digits) >= effective_min_len:
+                            params["query"] = query_digits
         if extra_params:
             params.update(extra_params)
 

{amochka-0.4.4.dist-info → amochka-0.4.6.dist-info}/METADATA

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

{amochka-0.4.4.dist-info → amochka-0.4.6.dist-info}/RECORD

@@ -1,5 +1,5 @@
-amochka/__init__.py,sha256=L2D_slwPlqEmazAVuCBtq75YKtSwIwGQJDlcrpqfOmI,925
-amochka/client.py,sha256=tjWCkKaosmYV3D1CM8w9PiIAOC_Qqb4Eipfczv4F1QM,89481
+amochka/__init__.py,sha256=Rt8W0zW4TY7QnhVG6I4qTL12mEtKdkyqrRdWUrOQGeY,925
+amochka/client.py,sha256=zQUy6DhoQfLDnO9q7CxXd28cjLQmwE15MtTGsGYYVSs,91571
 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.4.dist-info/METADATA,sha256=St1Dle9yx49gdUNz104Af6akTBhAF_KnZ8QL2BdTN94,7530
-amochka-0.4.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-amochka-0.4.4.dist-info/top_level.txt,sha256=grRX8aLFG-yYKPsAqCD6sUBmdLSQeOMHsc9Dl6S7Lzo,12
-amochka-0.4.4.dist-info/RECORD,,
+amochka-0.4.6.dist-info/METADATA,sha256=xbYEJTNgE5RsqN8UPudtOrs4gKnXzuF27hmR3wcco1s,7530
+amochka-0.4.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+amochka-0.4.6.dist-info/top_level.txt,sha256=grRX8aLFG-yYKPsAqCD6sUBmdLSQeOMHsc9Dl6S7Lzo,12
+amochka-0.4.6.dist-info/RECORD,,