yeref 0.25.5__py3-none-any.whl → 0.25.6__py3-none-any.whl

yeref/yeref.py

@@ -16097,7 +16097,7 @@ async def calc_metrics(bot, PROJECT_USERNAME, dataroom_folder_id, EXTRA_D, BASE_
                 offset += len(tbl['rows'])
 
                 # 5.3) Оставляем минимум 2 пустые строки перед следующей таблицей
-                offset += 2
+                offset += 3
 
             # 6) Выполняем единый batchUpdate для всех data_requests
             write_body = {
@@ -16342,7 +16342,7 @@ async def return_unit_metrics(bot, data_users, EXTRA_D):
                 factors = [1 + v for v in cmgr_vals]
                 avg = math.prod(factors) ** (1 / len(factors))
                 writer.writerow([])
-                writer.writerow([f"Rev ~ ×{round(avg, 2)} monthly"])
+                writer.writerow([f"Rev ~ ×{round(avg, 2)} monthly".replace('.', ',')])
 
         result = f_name
         thumb = types.FSInputFile(os.path.join(EXTRA_D, "parse.jpg"))
@@ -16437,7 +16437,7 @@ async def return_cohort_metrics(bot, data_users, EXTRA_D):
             for r in table:
                 writer.writerow(r)
             writer.writerow([])
-            writer.writerow([f"Churn ~ ×{avg_churn:.2f} monthly"])
+            writer.writerow([f"Churn ~ ×{avg_churn:.2f} monthly".replace('.', ',')])
 
         result = f_name
         thumb = types.FSInputFile(os.path.join(EXTRA_D, "parse.jpg"))
@@ -16511,12 +16511,12 @@ async def return_retention_metrics(bot, data_users, EXTRA_D):
                     else:
                         rev = rev_by_cohort[c].get(offset, 0.0)
                         if rev > 0:
-                            cell = f"{rev:.1f}"
+                            cell = f"{rev:.1f}".replace('.', ',')
                             row.append(cell)
                             row_sum += rev
                         else:
-                            row.append("0.0")
-                row.append(f"{row_sum:.1f}")
+                            row.append("0,0")
+                row.append(f"{row_sum:.1f}".replace('.', ','))
                 writer.writerow(row)
 
             factors = []
@@ -16529,7 +16529,7 @@ async def return_retention_metrics(bot, data_users, EXTRA_D):
             avg_multiplier = math.prod(factors) ** (1 / len(factors)) if factors else 1.0
 
             writer.writerow([])
-            writer.writerow([f"NRR ~ ×{avg_multiplier:.2f} monthly"])
+            writer.writerow([f"NRR ~ ×{avg_multiplier:.2f} monthly".replace('.', ',')])
 
         result = f_name
         thumb = types.FSInputFile(os.path.join(EXTRA_D, "parse.jpg"))
@@ -16546,6 +16546,7 @@ async def return_profit_and_loss_metrics(bot, data_users, EXTRA_D):
     try:
         metrics = defaultdict(lambda: {"sum_amount": 0.0})
 
+        # Собираем данные по месяцам
         for USER_TID, USER_VARS, USER_LSTS in data_users:
             USER_LSTS = json.loads(USER_LSTS or "{}")
             USER_PAYMENTS = USER_LSTS.get("USER_PAYMENTS", [])
@@ -16556,12 +16557,14 @@ async def return_profit_and_loss_metrics(bot, data_users, EXTRA_D):
                 amt = float(pay.get("AMOUNT", 0)) * 0.013
                 metrics[mo_p]["sum_amount"] += amt
 
+        # Функция форматирования с запятой
         def fmt(x):
-            return f"{x:.2f}".rstrip("0").rstrip(".") if x is not None else ""
+            return f"{x:.2f}".rstrip("0").rstrip(".").replace(".", ",") if x is not None else ""
 
         # Сортируем месяцы
         months_sorted = sorted(metrics.keys())
         results = []
+        np_values = []
 
         for mo in months_sorted:
             MRR = metrics[mo]["sum_amount"]
@@ -16570,12 +16573,12 @@ async def return_profit_and_loss_metrics(bot, data_users, EXTRA_D):
             OPEX = 4.5
             OP = GP - OPEX
 
-            # из OP сначала вычитаем 30%, затем из результата вычитаем 1%
-            after_comm = OP * 0.70      # остаётся после 30% комиссии
-            after_fiat = after_comm * 0.99  # остаётся после ещё 1% на обмен
-            COMM = OP - after_comm      # сама комиссия (30% от OP)
-            EXCH = after_comm - after_fiat # сама часть обмена (1% от остатка после комиссии)
-            NP = after_fiat             # чистая прибыль
+            # комиссия 30% и обмен 1%
+            after_comm = OP * 0.70
+            after_fiat = after_comm * 0.99
+            COMM = OP - after_comm
+            EXCH = after_comm - after_fiat
+            NP = after_fiat
 
             results.append([
                 mo,
@@ -16588,16 +16591,27 @@ async def return_profit_and_loss_metrics(bot, data_users, EXTRA_D):
                 fmt(EXCH),
                 fmt(NP)
             ])
+            np_values.append(NP)
+
+        # Вычисляем средний NP (если есть хотя бы одно значение)
+        avg_np = sum(np_values) / len(np_values) if np_values else 0.0
+        avg_np_str = fmt(avg_np)
 
         f_name = os.path.join(EXTRA_D, "5_profit_and_loss_metrics.csv")
         with open(f_name, "w", newline="", encoding="utf-8") as f:
             writer = csv.writer(f)
+            # Заголовок
             writer.writerow([
                 "Mo", "MRR", "COGS", "Gross Profit",
                 "OPEX", "Operating Profit", "Comission (30%)", "Fiat (1%)", "Net Profit"
             ])
+            # Строки по месяцам
             for row in results:
                 writer.writerow(row)
+            # Пустая строка перед средним
+            writer.writerow([])
+            # Строка со средним Net Profit
+            writer.writerow([f"Average Net Profit: {avg_np_str}"])
 
         result = f_name
         thumb = types.FSInputFile(os.path.join(EXTRA_D, "parse.jpg"))
@@ -16607,6 +16621,7 @@ async def return_profit_and_loss_metrics(bot, data_users, EXTRA_D):
         await asyncio.sleep(round(random.uniform(0, 1), 2))
     finally:
         return result
+
 # endregion
 
 

{yeref-0.25.5.dist-info → yeref-0.25.6.dist-info}/METADATA

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

yeref-0.25.6.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=8Ow6asK12jj3noAAUVtCKwq-txpj_ks_w-L-IQKqaZA,1056443
+yeref-0.25.6.dist-info/METADATA,sha256=bsrMXHVBgRzsBy8TBIwOSrV1PA13MYOgpYrFdb4BfPY,118
+yeref-0.25.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+yeref-0.25.6.dist-info/top_level.txt,sha256=yCQKchWHbfV-3OuQPYRdi2loypD-nmbDJbtt3OuKKkY,6
+yeref-0.25.6.dist-info/RECORD,,

yeref-0.25.5.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=ljsCvG1omKMY2PpVKfFunM1eTcMNd7w_aW_GFX3b8Ps,1055985
-yeref-0.25.5.dist-info/METADATA,sha256=L3eS_VIOpEfv271siW57nYb5571PNCcE-XqbHoAID-k,118
-yeref-0.25.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-yeref-0.25.5.dist-info/top_level.txt,sha256=yCQKchWHbfV-3OuQPYRdi2loypD-nmbDJbtt3OuKKkY,6
-yeref-0.25.5.dist-info/RECORD,,