amochka 0.3.3__py3-none-any.whl → 0.3.5__py3-none-any.whl

{amochka-0.3.3.dist-info → amochka-0.3.5.dist-info}/METADATA

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

@@ -3,12 +3,12 @@ amochka/client.py,sha256=6QMOem31Zs7Ks6CeEQYZ8VWrB1bM47NnxV103a8jDg8,70972
 amochka/etl.py,sha256=N8rXNFbtmlKfsYpgr7HDcP4enoj63XQPWuTDxGuMhw4,8901
 etl/__init__.py,sha256=bp9fPqbKlOc7xzs27diHEvysy1FgBrwlpX6GnR6GL9U,255
 etl/config.py,sha256=BvaGn5BSGMIfvUNNsnap04iy3BHyMOuRX81G7EiLUfE,9032
-etl/extractors.py,sha256=LLLy8iCVpZtb434gxoAslJ9ppDhnCXoFN_kQOoMxEN8,12961
+etl/extractors.py,sha256=PqjzlmUa8FLZa1z85mP6Y0-s_TH3REqW58632JzRKUc,13047
 etl/loaders.py,sha256=x8PcDQoq2kjbd52H2VzKKz5vHzyD6DXSsb9X0foPX_U,31941
-etl/run_etl.py,sha256=p_2NxJwXMiACMETvRsjrozMgz66U9ezDNSWZXUieNMs,26262
+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.3.3.dist-info/METADATA,sha256=naj7vOPaTtl-u1HMhVJqy15NnOmGq5o5TIKtlVzJIww,7530
-amochka-0.3.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-amochka-0.3.3.dist-info/top_level.txt,sha256=grRX8aLFG-yYKPsAqCD6sUBmdLSQeOMHsc9Dl6S7Lzo,12
-amochka-0.3.3.dist-info/RECORD,,
+amochka-0.3.5.dist-info/METADATA,sha256=It10dOYYGOkbKzAZmg25wZhPH2Yxgt1Wcm1Jb28wV1U,7530
+amochka-0.3.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+amochka-0.3.5.dist-info/top_level.txt,sha256=grRX8aLFG-yYKPsAqCD6sUBmdLSQeOMHsc9Dl6S7Lzo,12
+amochka-0.3.5.dist-info/RECORD,,

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:

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