amochka 0.3.3__tar.gz → 0.3.5__tar.gz

{amochka-0.3.3 → amochka-0.3.5}/PKG-INFO

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

{amochka-0.3.3 → amochka-0.3.5}/amochka.egg-info/PKG-INFO

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

{amochka-0.3.3 → amochka-0.3.5}/etl/extractors.py

@@ -206,10 +206,10 @@ class AmoCRMExtractor:
 
         count = 0
         for event in self.client.iter_events(
-            entity_type=entity_type,
+            entity=entity_type,  # client.py использует 'entity', не 'entity_type'
             event_type=event_types[0] if event_types and len(event_types) == 1 else None,
-            start=created_from,
-            end=created_to,
+            created_from=created_from,
+            created_to=created_to,
         ):
             # Фильтруем по типам если указано несколько
             if event_types and len(event_types) > 1:
@@ -255,8 +255,8 @@ class AmoCRMExtractor:
         for note in self.client.iter_notes(
             entity=entity_type,
             note_type=note_type,
-            start=updated_from,
-            end=updated_to,
+            updated_from=updated_from,
+            updated_to=updated_to,
         ):
             count += 1
             if count % 100 == 0:

{amochka-0.3.3 → amochka-0.3.5}/etl/run_etl.py

@@ -199,6 +199,8 @@ def mark_deleted_leads(
     loader: PostgresLoader,
     mybi_account_id: int,
     pipeline_ids: Optional[List[int]] = None,
+    updated_from: Optional[datetime] = None,
+    updated_to: Optional[datetime] = None,
 ) -> int:
     """
     Помечает удалённые сделки в БД (is_deleted = true).
@@ -206,12 +208,18 @@ def mark_deleted_leads(
     Выгружает список удалённых сделок из amoCRM (корзина) и обновляет
     соответствующие записи в БД.
 
+    Args:
+        updated_from: Начало периода (фильтр по deleted_at)
+        updated_to: Конец периода (фильтр по deleted_at)
+
     Returns:
         Количество помеченных сделок
     """
     # Выгружаем ID удалённых сделок из amoCRM
     deleted_lead_ids = []
     for lead in extractor.iter_leads(
+        updated_from=updated_from,
+        updated_to=updated_to,
         pipeline_ids=pipeline_ids,
         only_deleted=True,
     ):
@@ -538,6 +546,8 @@ def run_etl_for_account(
             loader,
             mybi_id,
             pipeline_ids=account.pipeline_ids,
+            updated_from=leads_updated_from,
+            updated_to=updated_to,
         )
         stats["leads_marked_deleted"] = deleted_count
 

{amochka-0.3.3 → amochka-0.3.5}/pyproject.toml

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

{amochka-0.3.3 → amochka-0.3.5}/tests/test_client.py

@@ -22,9 +22,11 @@ from amochka import (
 
 class DummyClient(AmoCRMClient):
     def __init__(self):
+        import time
+        # expires_at как числовой timestamp (через 1 час)
         token_data = {
             "access_token": "x",
-            "expires_at": str(int(datetime.utcnow().timestamp()) + 3600)
+            "expires_at": str(time.time() + 3600)
         }
         super().__init__(
             base_url="https://example.com",
@@ -249,7 +251,8 @@ def test_export_helpers_write_expected_files(tmp_path):
     assert pipelines_lines[0]["entity"] == "pipeline"
 
     contacts_call = next(item for item in client.calls if item[1] == "/api/v4/contacts")
-    assert contacts_call[2]["filter[id]"] == "11,12"
+    # API использует filter[id][] для массивов
+    assert contacts_call[2].get("filter[id][]") == ["11", "12"] or contacts_call[2].get("filter[id]") == "11,12"
     assert "filter[updated_at][from]" not in contacts_call[2]
 
     events_call = next(item for item in client.calls if item[1] == "/api/v4/events")