yeref 0.24.88__tar.gz → 0.24.90__tar.gz

{yeref-0.24.88 → yeref-0.24.90}/PKG-INFO

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

{yeref-0.24.88 → yeref-0.24.90}/setup.py

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

{yeref-0.24.88 → yeref-0.24.90}/yeref/yeref.py

@@ -16584,12 +16584,11 @@ async def return_profit_and_loss_metrics(bot, PROJECT_USERNAME, EXTRA_D, BASE_P)
                 pay_day = random.randint(1, 28)
                 pay_date = f"{pay_month}-{pay_day:02}"
                 dt_pay = datetime.strptime(pay_date, "%Y-%m-%d")
-                # if dt_pay >= entry_dt_obj:
                 payments = [{
                     "TYPE": random.choice(["don", "sub", "pst"]),
                     "DT_START": f"{dt_pay.strftime('%d-%m-%Y')}_14-00-00",
                     "DT_END": "0",
-                    "AMOUNT": str(random.randint(1, 10))
+                    "AMOUNT": str(random.randint(10, 1000))
                 }]
                 user_dau_dates.add(pay_date)
 
@@ -16642,18 +16641,18 @@ async def return_profit_and_loss_metrics(bot, PROJECT_USERNAME, EXTRA_D, BASE_P)
         results = []
 
         for mo in months_sorted:
-            # Преобразуем "2025-06" → "JUN"
-            dt_mo = datetime.strptime(mo, "%Y-%m")
-            mon_str = dt_mo.strftime("%b").upper()
-
             MRR = metrics[mo]["sum_amount"]
             COGS = 0.0
             GP = MRR - COGS
             OPEX = 4.5
             OP = GP - OPEX
-            COMM = MRR * 0.3
-            EXCH = MRR * 0.01
-            NP = OP - COMM - EXCH
+
+            # из 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             # чистая прибыль
 
             results.append([
                 mo,

{yeref-0.24.88 → yeref-0.24.90}/yeref.egg-info/PKG-INFO

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