amochka 0.4.1__tar.gz → 0.4.4__tar.gz

{amochka-0.4.1 → amochka-0.4.4}/PKG-INFO

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

{amochka-0.4.1 → amochka-0.4.4}/amochka/__init__.py

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

{amochka-0.4.1 → amochka-0.4.4}/amochka/client.py

@@ -477,11 +477,15 @@ class AmoCRMClient:
                 'redirect_uri': os.environ.get('AMOCRM_REDIRECT_URI'),
             }
         # 2. Загружаем из файла или строки
-        elif os.path.exists(self.token_file):
+        elif self.token_file and os.path.exists(self.token_file):
             with open(self.token_file, 'r') as f:
                 data = json.load(f)
             self.logger.debug(f"Token loaded from file: {self.token_file}")
         else:
+            if not self.token_file:
+                raise AuthenticationError(
+                    "Токен не найден: ни в environment variables, ни в файле, ни в переданной строке."
+                )
             try:
                 data = json.loads(self.token_file)
                 self.logger.debug("Token parsed from provided string.")
@@ -583,7 +587,11 @@ class AmoCRMClient:
                 if response.status_code in (200, 204):
                     if response.status_code == 204:
                         return None
-                    return response.json()
+                    try:
+                        return response.json()
+                    except ValueError:
+                        preview = response.text[:200] if response.text else ""
+                        raise APIError(response.status_code, f"Invalid JSON response: {preview}")
 
                 # Retryable ошибки (429, 5xx)
                 if response.status_code in retryable_status_codes:
@@ -675,7 +683,10 @@ class AmoCRMClient:
             self.logger.error(f"Не удалось обновить токен: {resp.status_code}")
             raise AuthenticationError(f"Не удалось обновить токен: {resp.status_code}")
 
-        data = resp.json() or {}
+        try:
+            data = resp.json() or {}
+        except ValueError as exc:
+            raise AuthenticationError("Ответ refresh_token не является валидным JSON") from exc
         access_token = data.get("access_token")
         refresh_token = data.get("refresh_token", self.refresh_token)
         expires_in = data.get("expires_in")
@@ -921,7 +932,10 @@ class AmoCRMClient:
             return int(value)
         if isinstance(value, str):
             try:
-                return int(datetime.fromisoformat(value).timestamp())
+                value_str = value.strip()
+                if value_str.endswith("Z"):
+                    value_str = value_str[:-1] + "+00:00"
+                return int(datetime.fromisoformat(value_str).timestamp())
             except ValueError as exc:
                 raise ValueError(f"Не удалось преобразовать '{value}' в timestamp") from exc
         raise TypeError(f"Неподдерживаемый тип для timestamp: {type(value)}")
@@ -1214,6 +1228,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)
@@ -1583,8 +1599,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)
         
@@ -1592,7 +1611,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"])
@@ -1628,6 +1647,8 @@ class AmoCRMClient:
         endpoint = f"/api/v4/{plural}/{entity_id}/notes/{note_id}"
         self.logger.debug(f"Fetching note {note_id} for {entity} {entity_id}")
         note_data = self._make_request("GET", endpoint)
+        if not note_data or not isinstance(note_data, dict):
+            raise APIError(0, f"Invalid response for note {note_id} {entity} {entity_id}.")
         self.logger.debug(f"Note {note_id} for {entity} {entity_id} fetched successfully.")
         return note_data
 
@@ -1674,7 +1695,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"])
@@ -1742,6 +1763,8 @@ class AmoCRMClient:
         endpoint = f"/api/v4/events/{event_id}"
         self.logger.debug(f"Fetching event with ID {event_id}")
         event_data = self._make_request("GET", endpoint)
+        if not event_data or not isinstance(event_data, dict):
+            raise APIError(0, f"Invalid response for event {event_id}.")
         self.logger.debug(f"Event {event_id} details fetched successfully.")
         return event_data
     

{amochka-0.4.1 → amochka-0.4.4}/amochka/etl.py

@@ -123,6 +123,8 @@ def export_contacts_to_ndjson(
             params["limit"] = limit
             while True:
                 response = client._make_request("GET", "/api/v4/contacts", params=params)
+                if not response:
+                    break
                 embedded = (response or {}).get("_embedded", {})
                 contacts = embedded.get("contacts") or []
                 if not contacts:

{amochka-0.4.1 → amochka-0.4.4}/amochka.egg-info/PKG-INFO

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

{amochka-0.4.1 → amochka-0.4.4}/pyproject.toml

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

{amochka-0.4.1 → amochka-0.4.4}/tests/test_etl.py

@@ -4,7 +4,7 @@ import sys
 
 sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "..")))
 
-from amochka.etl import write_ndjson
+from amochka.etl import export_contacts_to_ndjson, write_ndjson
 
 
 def test_write_ndjson_transform_and_on_record(tmp_path):
@@ -32,3 +32,26 @@ def test_write_ndjson_transform_and_on_record(tmp_path):
     assert payload["account_id"] == 42
     assert payload["payload"]["flag"] is True
     assert seen == [1]
+
+
+def test_export_contacts_handles_empty_response(tmp_path):
+    class DummyClient:
+        def _make_request(self, *args, **kwargs):
+            return None
+
+        def get_contact_by_id(self, *_args, **_kwargs):
+            raise Exception("not found")
+
+        def iter_contacts(self, *args, **kwargs):
+            return iter(())
+
+    client = DummyClient()
+    output_path = tmp_path / "contacts.ndjson"
+    count = export_contacts_to_ndjson(
+        client,
+        output_path,
+        account_id=1,
+        contact_ids=[123],
+    )
+    assert count == 0
+    assert output_path.read_text() == ""

{amochka-0.4.1 → amochka-0.4.4}/tests/test_http.py

@@ -12,13 +12,16 @@ from amochka import AmoCRMClient, CacheConfig, APIError, NotFoundError, RateLimi
 
 
 class FakeResponse:
-    def __init__(self, status_code, json_data=None, text="", headers=None):
+    def __init__(self, status_code, json_data=None, text="", headers=None, raise_on_json=False):
         self.status_code = status_code
         self._json_data = json_data
         self.text = text
         self.headers = headers or {}
+        self._raise_on_json = raise_on_json
 
     def json(self):
+        if self._raise_on_json:
+            raise ValueError("invalid json")
         return self._json_data
 
 
@@ -43,6 +46,18 @@ def test_make_request_success_json(monkeypatch):
     assert client._make_request("GET", "/api/v4/leads") == {"ok": True}
 
 
+def test_make_request_invalid_json_raises(monkeypatch):
+    client = make_client()
+
+    def fake_request(*args, **kwargs):
+        return FakeResponse(200, text="not json", raise_on_json=True)
+
+    monkeypatch.setattr(client_module.requests, "request", fake_request)
+    with pytest.raises(APIError) as excinfo:
+        client._make_request("GET", "/api/v4/leads")
+    assert "Invalid JSON response" in str(excinfo.value)
+
+
 def test_make_request_204_returns_none(monkeypatch):
     client = make_client()
 

amochka-0.4.4/tests/test_notes_events.py

@@ -0,0 +1,86 @@
+import json
+import os
+import sys
+import time
+
+sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "..")))
+
+import pytest
+
+from amochka import AmoCRMClient, CacheConfig, APIError
+
+
+def make_client():
+    token_data = {"access_token": "token", "expires_at": str(time.time() + 3600)}
+    return AmoCRMClient(
+        base_url="https://example.amocrm.ru",
+        token_file=json.dumps(token_data),
+        cache_config=CacheConfig.disabled(),
+        disable_logging=True,
+    )
+
+
+def test_get_entity_notes_handles_none_response(monkeypatch):
+    client = make_client()
+    monkeypatch.setattr(client, "_make_request", lambda *args, **kwargs: None)
+    assert client.get_entity_notes("lead", 1, get_all=True) == []
+
+
+def test_get_entity_events_handles_none_response(monkeypatch):
+    client = make_client()
+    monkeypatch.setattr(client, "_make_request", lambda *args, **kwargs: None)
+    assert client.get_entity_events("lead", 1, get_all=True) == []
+
+
+def test_get_entity_notes_note_type_list_serialized(monkeypatch):
+    client = make_client()
+    captured = {}
+
+    def fake_request(method, endpoint, params=None, **kwargs):
+        captured["params"] = params
+        return {"_embedded": {"notes": []}, "_page_count": 1}
+
+    monkeypatch.setattr(client, "_make_request", fake_request)
+    notes = client.get_entity_notes("lead", 1, note_type=["common", "call_in"])
+    assert notes == []
+    assert captured["params"]["filter[note_type]"] == "common,call_in"
+
+
+def test_get_entity_notes_note_type_string_kept(monkeypatch):
+    client = make_client()
+    captured = {}
+
+    def fake_request(method, endpoint, params=None, **kwargs):
+        captured["params"] = params
+        return {"_embedded": {"notes": []}, "_page_count": 1}
+
+    monkeypatch.setattr(client, "_make_request", fake_request)
+    client.get_entity_notes("lead", 1, note_type="common")
+    assert captured["params"]["filter[note_type]"] == "common"
+
+
+def test_iter_notes_note_type_list_serialized(monkeypatch):
+    client = make_client()
+    captured = {}
+
+    def fake_request(method, endpoint, params=None, **kwargs):
+        captured["params"] = params
+        return {"_embedded": {"notes": []}, "_page_count": 1}
+
+    monkeypatch.setattr(client, "_make_request", fake_request)
+    list(client.iter_notes(note_type=["common", "call_in"], max_pages=1))
+    assert captured["params"]["filter[note_type]"] == "common,call_in"
+
+
+def test_get_entity_note_invalid_response_raises(monkeypatch):
+    client = make_client()
+    monkeypatch.setattr(client, "_make_request", lambda *args, **kwargs: None)
+    with pytest.raises(APIError):
+        client.get_entity_note("lead", 1, 2)
+
+
+def test_get_event_invalid_response_raises(monkeypatch):
+    client = make_client()
+    monkeypatch.setattr(client, "_make_request", lambda *args, **kwargs: None)
+    with pytest.raises(APIError):
+        client.get_event(123)

{amochka-0.4.1 → amochka-0.4.4}/tests/test_security.py

@@ -93,6 +93,16 @@ def test_invalid_token_string_raises():
         )
 
 
+def test_missing_token_file_and_env_raises():
+    with pytest.raises(AuthenticationError):
+        AmoCRMClient(
+            base_url="https://example.amocrm.ru",
+            token_file=None,
+            cache_config=CacheConfig.disabled(),
+            disable_logging=True,
+        )
+
+
 def test_refresh_access_token_success(monkeypatch, tmp_path):
     token_path = tmp_path / "token.json"
     token_path.write_text(json.dumps(_token_payload(time.time() - 10)))
@@ -139,6 +149,28 @@ def test_refresh_access_token_failure(monkeypatch, tmp_path):
         )
 
 
+def test_refresh_access_token_invalid_json(monkeypatch, tmp_path):
+    token_path = tmp_path / "token.json"
+    token_path.write_text(json.dumps(_token_payload(time.time() - 10)))
+
+    class BadJsonResponse:
+        status_code = 200
+        text = "not json"
+
+        def json(self):
+            raise ValueError("invalid json")
+
+    monkeypatch.setattr(client_module.requests, "post", lambda *args, **kwargs: BadJsonResponse())
+
+    with pytest.raises(AuthenticationError):
+        AmoCRMClient(
+            base_url="https://example.amocrm.ru",
+            token_file=str(token_path),
+            cache_config=CacheConfig.disabled(),
+            disable_logging=True,
+        )
+
+
 def test_cache_path_validation():
     with pytest.raises(ValueError):
         CacheConfig._validate_path("../secret", "base_dir")

{amochka-0.4.1 → amochka-0.4.4}/tests/test_utils.py

@@ -46,6 +46,8 @@ def test_to_timestamp():
     assert client._to_timestamp(1700000000.5) == 1700000000
     iso = "2020-01-01T00:00:00"
     assert client._to_timestamp(iso) == int(datetime.fromisoformat(iso).timestamp())
+    iso_z = "2020-01-01T00:00:00Z"
+    assert client._to_timestamp(iso_z) == int(datetime.fromisoformat("2020-01-01T00:00:00+00:00").timestamp())
     with pytest.raises(ValueError):
         client._to_timestamp("bad-date")
     with pytest.raises(TypeError):

amochka-0.4.1/tests/test_notes_events.py

@@ -1,30 +0,0 @@
-import json
-import os
-import sys
-import time
-
-sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "..")))
-
-from amochka import AmoCRMClient, CacheConfig
-
-
-def make_client():
-    token_data = {"access_token": "token", "expires_at": str(time.time() + 3600)}
-    return AmoCRMClient(
-        base_url="https://example.amocrm.ru",
-        token_file=json.dumps(token_data),
-        cache_config=CacheConfig.disabled(),
-        disable_logging=True,
-    )
-
-
-def test_get_entity_notes_handles_none_response(monkeypatch):
-    client = make_client()
-    monkeypatch.setattr(client, "_make_request", lambda *args, **kwargs: None)
-    assert client.get_entity_notes("lead", 1, get_all=True) == []
-
-
-def test_get_entity_events_handles_none_response(monkeypatch):
-    client = make_client()
-    monkeypatch.setattr(client, "_make_request", lambda *args, **kwargs: None)
-    assert client.get_entity_events("lead", 1, get_all=True) == []