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

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/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/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.dist-info → amochka-0.4.4.dist-info}/METADATA

@@ -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.dist-info → amochka-0.4.4.dist-info}/RECORD

@@ -1,7 +1,7 @@
-amochka/__init__.py,sha256=DCp7P4c3QzaaNHMoLYjSKLCGtOVFc6cjPQHHJmseYhg,925
-amochka/client.py,sha256=4I31TqdMCsfyLpY9ChCLt46kcbdvt5ZvThOjVT371LQ,88074
+amochka/__init__.py,sha256=L2D_slwPlqEmazAVuCBtq75YKtSwIwGQJDlcrpqfOmI,925
+amochka/client.py,sha256=tjWCkKaosmYV3D1CM8w9PiIAOC_Qqb4Eipfczv4F1QM,89481
 amochka/errors.py,sha256=Rg4U9srjboQwgU3wwhAed0p3vGcc0ZhuyKHIDhYFnp8,1371
-amochka/etl.py,sha256=N8rXNFbtmlKfsYpgr7HDcP4enoj63XQPWuTDxGuMhw4,8901
+amochka/etl.py,sha256=tzdGPRGxR49aSAjLksic-FqechvDUTfK8ZUUJGuIU7M,8960
 etl/__init__.py,sha256=bp9fPqbKlOc7xzs27diHEvysy1FgBrwlpX6GnR6GL9U,255
 etl/config.py,sha256=BvaGn5BSGMIfvUNNsnap04iy3BHyMOuRX81G7EiLUfE,9032
 etl/extractors.py,sha256=PqjzlmUa8FLZa1z85mP6Y0-s_TH3REqW58632JzRKUc,13047
@@ -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.1.dist-info/METADATA,sha256=93mKBER-Qy5owT9K_NrxUAxflstfPaMKgq6Zw-ZZjXc,7530
-amochka-0.4.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-amochka-0.4.1.dist-info/top_level.txt,sha256=grRX8aLFG-yYKPsAqCD6sUBmdLSQeOMHsc9Dl6S7Lzo,12
-amochka-0.4.1.dist-info/RECORD,,
+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,,