amochka 0.4.5__tar.gz → 0.4.6__tar.gz

{amochka-0.4.5 → amochka-0.4.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: amochka
-Version: 0.4.5
+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.5 → amochka-0.4.6}/amochka/__init__.py

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

{amochka-0.4.5 → amochka-0.4.6}/amochka/client.py

@@ -1098,12 +1098,17 @@ class AmoCRMClient:
         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 или 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: Если параметры имеют некорректный тип или значение.
@@ -1130,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)
@@ -1141,10 +1155,17 @@ class AmoCRMClient:
         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
+            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.5 → amochka-0.4.6}/amochka.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: amochka
-Version: 0.4.5
+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.5 → amochka-0.4.6}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "amochka"
-version = "0.4.5"
+version = "0.4.6"
 description = "Python library for working with amoCRM API with ETL capabilities"
 readme = "README.md"
 authors = [

{amochka-0.4.5 → amochka-0.4.6}/tests/test_client.py

@@ -297,3 +297,42 @@ def test_iter_contacts_query_min_length(monkeypatch):
     monkeypatch.setattr(client, "_make_request", fake_request)
     list(client.iter_contacts(query="7925", min_query_length=8, max_pages=1))
     assert "query" not in captured["params"]
+
+
+def test_iter_contacts_query_auto_raw_for_name(monkeypatch):
+    client = make_client()
+    captured = {}
+
+    def fake_request(method, endpoint, params=None, **kwargs):
+        captured["params"] = params
+        return {"_embedded": {"contacts": []}, "_page_count": 1}
+
+    monkeypatch.setattr(client, "_make_request", fake_request)
+    list(client.iter_contacts(query="ivan", max_pages=1))
+    assert captured["params"]["query"] == "ivan"
+
+
+def test_iter_contacts_query_phone_mode_forces_digits(monkeypatch):
+    client = make_client()
+    captured = {}
+
+    def fake_request(method, endpoint, params=None, **kwargs):
+        captured["params"] = params
+        return {"_embedded": {"contacts": []}, "_page_count": 1}
+
+    monkeypatch.setattr(client, "_make_request", fake_request)
+    list(client.iter_contacts(query="ivan 7925", query_mode="phone", max_pages=1))
+    assert captured["params"]["query"] == "7925"
+
+
+def test_iter_contacts_query_min_phone_length(monkeypatch):
+    client = make_client()
+    captured = {}
+
+    def fake_request(method, endpoint, params=None, **kwargs):
+        captured["params"] = params
+        return {"_embedded": {"contacts": []}, "_page_count": 1}
+
+    monkeypatch.setattr(client, "_make_request", fake_request)
+    list(client.iter_contacts(query="7925", min_phone_length=8, max_pages=1))
+    assert "query" not in captured["params"]