yeref 0.24.65__py3-none-any.whl → 0.24.67__py3-none-any.whl

yeref/yeref.py

@@ -16235,13 +16235,11 @@ async def return_unit_metrics(bot, PROJECT_USERNAME, EXTRA_D, BASE_P):
 
 async def return_cohort_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)
 
-        # Собираем для каждого пользователя: месяц входа и набор месяцев активности
-        cohorts = defaultdict(set)        # cohort_month -> set(USER_TID)
-        activity_months = defaultdict(set)  # USER_TID -> set месяцов, в которые был DAU
+        cohorts = defaultdict(set)
+        activity_months = defaultdict(set)
 
         months = ["2025-06", "2025-07", "2025-08", "2025-09"]
         data_users = []
@@ -16313,11 +16311,12 @@ async def return_cohort_metrics(bot, PROJECT_USERNAME, EXTRA_D, BASE_P):
             USER_DT = USER_VARS.get("USER_DT", "")
             USER_DAU = USER_LSTS.get("USER_DAU", [])
 
-            # вычисляем месяц входа
+            if not USER_DT:
+                continue
+
             entry_mo = datetime.strptime(USER_DT, "%d-%m-%Y_%H-%M-%S").strftime("%Y-%m")
             cohorts[entry_mo].add(USER_TID)
 
-            # сохраняем месяцы активности
             for day_str in USER_DAU:
                 try:
                     mo = datetime.strptime(day_str, "%Y-%m-%d").strftime("%Y-%m")
@@ -16325,10 +16324,8 @@ async def return_cohort_metrics(bot, PROJECT_USERNAME, EXTRA_D, BASE_P):
                 except:
                     pass
 
-        # Список уникальных месяцев cohort, отсортированный
         cohort_months = sorted(cohorts.keys())
 
-        # Функция для прибавления месяцев
         def add_months(mo_str, n):
             y, m = map(int, mo_str.split("-"))
             total = m + n
@@ -16337,32 +16334,23 @@ async def return_cohort_metrics(bot, PROJECT_USERNAME, EXTRA_D, BASE_P):
             return f"{new_y:04d}-{new_m:02d}"
 
         num_cohorts = len(cohort_months)
-
-        # Формируем таблицу: строки M1..M{num_cohorts}
         table = []
         header = ["Месяц/Когорта"]
-        # Добавляем в заголовок каждый cohort + его размер
         for mo in cohort_months:
             header.append(f"{mo} ({len(cohorts[mo])})")
         header.append("∑")
         table.append(header)
 
-        # Для каждой строки-месяца кортаций
+        # Собираем саму таблицу
         for i in range(num_cohorts):
             row = [f"M{i+1}"]
             row_sum = 0
-            for j, cohort_mo in enumerate(cohort_months):
-                # вычисляем целевой месяц = cohort_mo + i месяцев
+            for cohort_mo in cohort_months:
                 target_mo = add_months(cohort_mo, i)
                 if i == 0:
-                    # M1 = размер когорты
                     val = len(cohorts[cohort_mo])
                 else:
-                    # считаем, сколько пользователей из когорты были активны в target_mo
-                    cnt = 0
-                    for uid in cohorts[cohort_mo]:
-                        if target_mo in activity_months.get(uid, set()):
-                            cnt += 1
+                    cnt = sum(1 for uid in cohorts[cohort_mo] if target_mo in activity_months.get(uid, set()))
                     val = cnt
                 if val:
                     row.append(str(val))
@@ -16372,14 +16360,39 @@ async def return_cohort_metrics(bot, PROJECT_USERNAME, EXTRA_D, BASE_P):
             row.append(str(row_sum))
             table.append(row)
 
+        # Считаем общий отток по всем когортам
+        total_lost = 0
+        total_start = 0
+        for cohort_mo in cohort_months:
+            counts = []
+            for i in range(num_cohorts):
+                target_mo = add_months(cohort_mo, i)
+                if i == 0:
+                    count = len(cohorts[cohort_mo])
+                else:
+                    count = sum(1 for uid in cohorts[cohort_mo] if target_mo in activity_months.get(uid, set()))
+                counts.append(count)
+            for k in range(len(counts) - 1):
+                start_cnt = counts[k]
+                next_cnt = counts[k + 1]
+                if start_cnt > 0:
+                    lost = start_cnt - next_cnt
+                    total_lost += lost
+                    total_start += start_cnt
+
+        avg_churn = (total_lost / total_start * 100) if total_start else 0
+
         path = os.path.join(EXTRA_D, "3_cohort_metrics.csv")
         with open(path, "w", newline="", encoding="utf-8") as f:
             writer = csv.writer(f)
             for r in table:
                 writer.writerow(r)
+            writer.writerow([])
+            writer.writerow([f"Avg monthly cohort churn: {avg_churn:.2f}%"])
 
         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))

{yeref-0.24.65.dist-info → yeref-0.24.67.dist-info}/METADATA

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

yeref-0.24.67.dist-info/RECORD

@@ -0,0 +1,8 @@
+yeref/__init__.py,sha256=Qpv3o6Xa78VdLcsSRmctGtpnYE9btpAkCekgGhgJyXM,49
+yeref/l_.py,sha256=LMX_olmJwq-tgoALJCnhV_fGrL_i_43yBLkLIcEVqGo,1176743
+yeref/tonweb.js,sha256=Jf6aFOQ1OIY4q7fINYz-m5LsI3seMus124M5SYYZmtE,443659
+yeref/yeref.py,sha256=rVaQc_Ol1gmoBs8HxywCSu--0yxBYRZzgDiNAp6MGE8,1052940
+yeref-0.24.67.dist-info/METADATA,sha256=0Knh7gq-jz47tplBHpMdEYsEPZogwk3Wf1Bg6BXAQrA,119
+yeref-0.24.67.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+yeref-0.24.67.dist-info/top_level.txt,sha256=yCQKchWHbfV-3OuQPYRdi2loypD-nmbDJbtt3OuKKkY,6
+yeref-0.24.67.dist-info/RECORD,,

yeref-0.24.65.dist-info/RECORD

@@ -1,8 +0,0 @@
-yeref/__init__.py,sha256=Qpv3o6Xa78VdLcsSRmctGtpnYE9btpAkCekgGhgJyXM,49
-yeref/l_.py,sha256=LMX_olmJwq-tgoALJCnhV_fGrL_i_43yBLkLIcEVqGo,1176743
-yeref/tonweb.js,sha256=Jf6aFOQ1OIY4q7fINYz-m5LsI3seMus124M5SYYZmtE,443659
-yeref/yeref.py,sha256=fze5I1x5ZD0D4OgYpK1sv-bDgu2RXtMGPhDwjiwBa64,1053049
-yeref-0.24.65.dist-info/METADATA,sha256=Q5AZlJwo8T2kw62j1kSn8eFMPG3O6DBs7KoKHmLDWYo,119
-yeref-0.24.65.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-yeref-0.24.65.dist-info/top_level.txt,sha256=yCQKchWHbfV-3OuQPYRdi2loypD-nmbDJbtt3OuKKkY,6
-yeref-0.24.65.dist-info/RECORD,,