yeref 0.24.62__tar.gz → 0.24.64__tar.gz

{yeref-0.24.62 → yeref-0.24.64}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: yeref
-Version: 0.24.62
+Version: 0.24.64
 Summary: desc-f
 Author: john smith
 Dynamic: author

{yeref-0.24.62 → yeref-0.24.64}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup
 
 setup(
     name='yeref',
-    version='0.24.62',
+    version='0.24.64',
     description='desc-f',
     author='john smith',
     packages=['yeref'],

{yeref-0.24.62 → yeref-0.24.64}/yeref/yeref.py

@@ -16384,6 +16384,64 @@ async def return_cohort_metrics(bot, PROJECT_USERNAME, EXTRA_D, BASE_P):
     except Exception as e:
         logger.info(log_ % str(e))
         await asyncio.sleep(round(random.uniform(0, 1), 2))
+
+
+async def return_retention_metrics(bot, PROJECT_USERNAME, EXTRA_D, BASE_P):
+    try:
+        sql = 'SELECT USER_TID, USER_VARS, USER_LSTS FROM "USER"'
+        data_users = await db_select_pg(sql, (), BASE_P)
+
+        # собираем выручку по пользователю и месяцу
+        user_month_rev = defaultdict(lambda: defaultdict(float))
+        for USER_TID, USER_VARS, USER_LSTS in data_users:
+            USER_LSTS = json.loads(USER_LSTS or "{}")
+            for pay in USER_LSTS.get("USER_PAYMENTS", []):
+                dt_p = datetime.strptime(pay.get("DT_START", ""), "%d-%m-%Y_%H-%M-%S")
+                mo = dt_p.strftime("%Y-%m")
+                amt = float(pay.get("AMOUNT", 0)) * 0.013
+                user_month_rev[USER_TID][mo] += amt
+
+        # список всех месяцев с выручкой, отсортированный
+        all_months = sorted({mo for revs in user_month_rev.values() for mo in revs.keys()})
+
+        results = []
+        for idx, mo in enumerate(all_months):
+            if idx == 0:
+                results.append({"MO": mo, "NRR": ""})
+                continue
+            prev_mo = all_months[idx - 1]
+            # общая выручка в prev_mo
+            prev_total = sum(user_month_rev[u][prev_mo] for u in user_month_rev if prev_mo in user_month_rev[u])
+            if prev_total == 0:
+                results.append({"MO": mo, "NRR": ""})
+                continue
+            # выручка текущего месяца от тех же пользователей
+            curr_existing = sum(
+                user_month_rev[u][mo]
+                for u in user_month_rev
+                if prev_mo in user_month_rev[u] and mo in user_month_rev[u]
+            )
+            nrr = curr_existing / prev_total
+            results.append({"MO": mo, "NRR": f"{nrr * 100:.2f}"})
+
+        # средний NRR (арифметическое по ненулевым)
+        vals = [float(r["NRR"]) for r in results if r["NRR"]]
+        avg_nrr = f"{(sum(vals) / len(vals)):.2f}" if vals else ""
+
+        path = os.path.join(EXTRA_D, "4_retention_metrics.csv")
+        with open(path, "w", newline="", encoding="utf-8") as f:
+            writer = csv.writer(f)
+            writer.writerow(["MO", "NRR (%)"])
+            for r in results:
+                writer.writerow([r["MO"], r["NRR"]])
+            writer.writerow([])
+            writer.writerow([f"Avg NRR (%)", avg_nrr])
+
+        thumb = types.FSInputFile(os.path.join(EXTRA_D, "parse.jpg"))
+        await bot.send_document(chat_id=my_tid, document=types.FSInputFile(path), thumbnail=thumb)
+    except Exception as e:
+        logger.info(log_ % str(e))
+        await asyncio.sleep(round(random.uniform(0, 1), 2))
 # endregion
 
 

{yeref-0.24.62 → yeref-0.24.64}/yeref.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: yeref
-Version: 0.24.62
+Version: 0.24.64
 Summary: desc-f
 Author: john smith
 Dynamic: author