yeref 0.24.78__tar.gz → 0.24.80__tar.gz

{yeref-0.24.78 → yeref-0.24.80}/PKG-INFO

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

{yeref-0.24.78 → yeref-0.24.80}/setup.py

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

{yeref-0.24.78 → yeref-0.24.80}/yeref/yeref.py

@@ -16496,43 +16496,49 @@ async def return_retention_metrics(bot, PROJECT_USERNAME, EXTRA_D, BASE_P):
         if not cohort_months:
             return
 
-        # вычисляем максимальный offset (M-1)
-        max_offset = 0
-        for c in cohort_months:
-            if rev_by_cohort[c]:
-                max_offset = max(max_offset, max(rev_by_cohort[c].keys()))
+        # Функция прибавления месяцев
+        def add_months(mo_str, n):
+            y, m = map(int, mo_str.split("-"))
+            total = m + n
+            new_y = y + (total - 1) // 12
+            new_m = (total - 1) % 12 + 1
+            return f"{new_y:04d}-{new_m:02d}"
+
+        num_cohorts = len(cohort_months)
+        first_cohort = cohort_months[0]
 
         path = os.path.join(EXTRA_D, "4_retention_metrics.csv")
         with open(path, "w", newline="", encoding="utf-8") as f:
             writer = csv.writer(f)
-
-            # заголовок
             header = ["Месяц/Когорта"] + [
-                f"{c} ({len(cohort_users[c])})"
-                for c in cohort_months
+                f"{c} ({len(cohort_users[c])})" for c in cohort_months
             ] + ["∑"]
             writer.writerow(header)
 
-            # строки M1..M{max_offset+1} по offset
-            for i in range(max_offset + 1):
+            for i in range(num_cohorts):
+                calendar_mo = add_months(first_cohort, i)
                 row = [f"M{i+1}"]
                 row_sum = 0.0
                 for c in cohort_months:
-                    rev = rev_by_cohort[c].get(i, 0.0)
-                    if rev > 0:
-                        cell = f"{rev:.1f}"
-                        row.append(cell)
-                        row_sum += rev
-                    else:
+                    y0, m0 = map(int, c.split("-"))
+                    y1, m1 = map(int, calendar_mo.split("-"))
+                    offset = (y1 - y0) * 12 + (m1 - m0)
+                    if offset < 0:
                         row.append("")
+                    else:
+                        rev = rev_by_cohort[c].get(offset, 0.0)
+                        if rev > 0:
+                            cell = f"{rev:.1f}"
+                            row.append(cell)
+                            row_sum += rev
+                        else:
+                            row.append("0.0")
                 row.append(f"{row_sum:.1f}")
                 writer.writerow(row)
 
-            # вычисляем средний NRR-множитель (геометрическое среднее факторов роста)
-            import math
             factors = []
             for c in cohort_months:
-                for i in range(1, max_offset + 1):
+                for i in range(1, num_cohorts):
                     prev_rev = rev_by_cohort[c].get(i - 1, 0.0)
                     curr_rev = rev_by_cohort[c].get(i, 0.0)
                     if prev_rev > 0 and curr_rev > 0:
@@ -16548,6 +16554,7 @@ async def return_retention_metrics(bot, PROJECT_USERNAME, EXTRA_D, BASE_P):
         logger.info(log_ % str(e))
         await asyncio.sleep(round(random.uniform(0, 1), 2))
 
+
 # endregion
 
 

{yeref-0.24.78 → yeref-0.24.80}/yeref.egg-info/PKG-INFO

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