yeref 0.24.72__tar.gz → 0.24.74__tar.gz

{yeref-0.24.72 → yeref-0.24.74}/PKG-INFO

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

{yeref-0.24.72 → yeref-0.24.74}/setup.py

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

{yeref-0.24.72 → yeref-0.24.74}/yeref/yeref.py

@@ -16496,39 +16496,39 @@ async def return_retention_metrics(bot, PROJECT_USERNAME, EXTRA_D, BASE_P):
         if not cohort_months:
             return
 
-        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}"
 
-        base_rev = {c: rev_by_cohort[c].get(0, 0.0) for c in cohort_months}
+        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 = ["Месяц / Когорта"] + [
+            header = ["Месяц/Когорта"] + [
                 f"{c} ({len(cohort_users[c])})" for c in cohort_months
             ] + ["∑"]
             writer.writerow(header)
 
-            for i in range(max_offset + 1):
-                row = [f"M{i+1} ({i} мес)"]
+            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 i == 0:
-                        pct = 100
-                        cell = f"{rev:.1f} ({pct}%)"
-                        row.append(cell)
-                        row_sum += rev
+                    y0, m0 = map(int, c.split("-"))
+                    y1, m1 = map(int, calendar_mo.split("-"))
+                    offset = (y1 - y0) * 12 + (m1 - m0)
+                    if offset < 0:
+                        cell = "0.0"
                     else:
-                        if base_rev[c] > 0 and rev > 0:
-                            pct = rev / base_rev[c] * 100
-                            cell = f"{rev:.1f} ({pct:.0f}%)"
-                            row.append(cell)
-                            row_sum += rev
-                        else:
-                            row.append("")
+                        rev = rev_by_cohort[c].get(offset, 0.0)
+                        cell = f"{rev:.1f}"
+                        row_sum += rev
+                    row.append(cell)
                 row.append(f"{row_sum:.1f}")
                 writer.writerow(row)
 

{yeref-0.24.72 → yeref-0.24.74}/yeref.egg-info/PKG-INFO

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