yeref 0.24.79__tar.gz → 0.24.81__tar.gz

{yeref-0.24.79 → yeref-0.24.81}/PKG-INFO

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

{yeref-0.24.79 → yeref-0.24.81}/setup.py

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

{yeref-0.24.79 → yeref-0.24.81}/yeref/yeref.py

@@ -16373,16 +16373,15 @@ async def return_cohort_metrics(bot, PROJECT_USERNAME, EXTRA_D, BASE_P):
         total_lost = 0
         total_start = 0
         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
+                    lost = max(start_cnt - next_cnt, 0)
                     total_lost += lost
                     total_start += start_cnt
 
-        avg_churn = (total_lost / total_start * 100) if total_start else 0
+        avg_churn = (total_lost / total_start) 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:
@@ -16390,7 +16389,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"Churn ~ ×{avg_churn:.0f} monthly"])
+            writer.writerow([f"Churn ~ ×{avg_churn:.2f} 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)
@@ -16536,6 +16535,18 @@ async def return_retention_metrics(bot, PROJECT_USERNAME, EXTRA_D, BASE_P):
                 row.append(f"{row_sum:.1f}")
                 writer.writerow(row)
 
+            factors = []
+            for c in cohort_months:
+                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:
+                        factors.append(curr_rev / prev_rev)
+            avg_multiplier = math.prod(factors) ** (1 / len(factors)) if factors else 1.0
+
+            writer.writerow([])
+            writer.writerow([f"NRR ~ ×{avg_multiplier:.2f} 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)
     except Exception as e:

{yeref-0.24.79 → yeref-0.24.81}/yeref.egg-info/PKG-INFO

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