yeref 0.24.67__tar.gz → 0.24.69__tar.gz

{yeref-0.24.67 → yeref-0.24.69}/PKG-INFO

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

{yeref-0.24.67 → yeref-0.24.69}/setup.py

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

{yeref-0.24.67 → yeref-0.24.69}/yeref/yeref.py

@@ -16238,9 +16238,6 @@ async def return_cohort_metrics(bot, PROJECT_USERNAME, EXTRA_D, BASE_P):
         sql = 'SELECT USER_TID, USER_VARS, USER_LSTS FROM "USER"'
         data_users = await db_select_pg(sql, (), BASE_P)
 
-        cohorts = defaultdict(set)
-        activity_months = defaultdict(set)
-
         months = ["2025-06", "2025-07", "2025-08", "2025-09"]
         data_users = []
         for _ in range(20):
@@ -16305,15 +16302,16 @@ async def return_cohort_metrics(bot, PROJECT_USERNAME, EXTRA_D, BASE_P):
             ))
         print(f"gen {data_users=}")
 
+
+        cohorts = defaultdict(set)
+        activity_months = defaultdict(set)
+
         for USER_TID, USER_VARS, USER_LSTS in data_users:
             USER_VARS = json.loads(USER_VARS or "{}")
             USER_LSTS = json.loads(USER_LSTS or "{}")
             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)
 
@@ -16325,6 +16323,7 @@ async def return_cohort_metrics(bot, PROJECT_USERNAME, EXTRA_D, BASE_P):
                     pass
 
         cohort_months = sorted(cohorts.keys())
+        num_months = len(cohort_months)
 
         def add_months(mo_str, n):
             y, m = map(int, mo_str.split("-"))
@@ -16333,7 +16332,7 @@ async def return_cohort_metrics(bot, PROJECT_USERNAME, EXTRA_D, BASE_P):
             new_m = (total - 1) % 12 + 1
             return f"{new_y:04d}-{new_m:02d}"
 
-        num_cohorts = len(cohort_months)
+        # Собираем таблицу посменно по календарным месяцам
         table = []
         header = ["Месяц/Когорта"]
         for mo in cohort_months:
@@ -16341,40 +16340,44 @@ async def return_cohort_metrics(bot, PROJECT_USERNAME, EXTRA_D, BASE_P):
         header.append("∑")
         table.append(header)
 
-        # Собираем саму таблицу
-        for i in range(num_cohorts):
+        # Матрица для подсчёта retention (counts[i][j] = активных из когорты j в календарном месяце i)
+        counts = [[0] * num_months for _ in range(num_months)]
+        for i in range(num_months):
+            calendar_mo = cohort_months[i]
             row = [f"M{i+1}"]
             row_sum = 0
-            for cohort_mo in cohort_months:
-                target_mo = add_months(cohort_mo, i)
-                if i == 0:
+
+            for j in range(num_months):
+                if j > i:
+                    row.append("")
+                    continue
+
+                cohort_mo = cohort_months[j]
+                if i == j:
+                    # первый месяц когорты
                     val = len(cohorts[cohort_mo])
                 else:
-                    cnt = sum(1 for uid in cohorts[cohort_mo] if target_mo in activity_months.get(uid, set()))
-                    val = cnt
+                    # считаем, сколько из когорты j активны в календарном месяце i
+                    val = sum(1 for uid in cohorts[cohort_mo] if calendar_mo in activity_months.get(uid, set()))
+
+                counts[i][j] = val
                 if val:
                     row.append(str(val))
                     row_sum += val
                 else:
                     row.append("")
+
             row.append(str(row_sum))
             table.append(row)
 
-        # Считаем общий отток по всем когортам
+        # Считаем средний ежемесячный churn
         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]
+        for j in range(num_months):
+            # для каждой когорты собираем по календарным месяцам
+            for i in range(j, num_months - 1):
+                start_cnt = counts[i][j]
+                next_cnt = counts[i + 1][j]
                 if start_cnt > 0:
                     lost = start_cnt - next_cnt
                     total_lost += lost
@@ -16388,7 +16391,7 @@ async def return_cohort_metrics(bot, PROJECT_USERNAME, EXTRA_D, BASE_P):
             for r in table:
                 writer.writerow(r)
             writer.writerow([])
-            writer.writerow([f"Avg monthly cohort churn: {avg_churn:.2f}%"])
+            writer.writerow([f"Churn ~ ×{avg_churn:.1f} monthly"])
 
         thumb = types.FSInputFile(os.path.join(EXTRA_D, "parse.jpg"))
         await bot.send_document(chat_id=my_tid, document=types.FSInputFile(path), thumbnail=thumb)
@@ -16398,6 +16401,7 @@ async def return_cohort_metrics(bot, PROJECT_USERNAME, EXTRA_D, BASE_P):
         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"'

{yeref-0.24.67 → yeref-0.24.69}/yeref.egg-info/PKG-INFO

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