yeref 0.24.89__tar.gz → 0.24.91__tar.gz

{yeref-0.24.89 → yeref-0.24.91}/PKG-INFO

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

{yeref-0.24.89 → yeref-0.24.91}/setup.py

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

{yeref-0.24.89 → yeref-0.24.91}/yeref/yeref.py

@@ -15926,7 +15926,7 @@ async def upd_user_data(ENT_TID, data, web_app_init_data, PROJECT_USERNAME, BASE
 
 
 # region unit ecomonics
-async def return_activity_metrics(bot, PROJECT_USERNAME, EXTRA_D, BASE_P):
+async def calc_metrics(bot, PROJECT_USERNAME, EXTRA_D, BASE_P):
     try:
         schema_name = "USER"
         if PROJECT_USERNAME == 'FereyBotBot':
@@ -15939,6 +15939,84 @@ async def return_activity_metrics(bot, PROJECT_USERNAME, EXTRA_D, BASE_P):
         sql = f"SELECT {schema_name}_TID FROM \"{schema_name}\""
         data_ents = await db_select_pg(sql, (), BASE_P)
 
+        sql = 'SELECT USER_TID, USER_VARS, USER_LSTS FROM "USER"'
+        data_users = await db_select_pg(sql, (), BASE_P)
+
+        months = ["2025-06", "2025-07", "2025-08", "2025-09"]
+        data_users = []
+        for _ in range(30):
+            # дата входа
+            entry_month = random.choice(months)
+            entry_day = random.randint(1, 28)
+            entry_date = f"{entry_month}-{entry_day:02}"
+            entry_dt_obj = datetime.strptime(entry_date, '%Y-%m-%d')
+            entry_dt = f"{entry_dt_obj.strftime('%d-%m-%Y')}_{datetime.now().strftime('%H-%M-%S')}"
+            utm = random.choice(["/start", "/startapp"])
+
+            # месяцы от входа и дальше
+            valid_months = [m for m in months if datetime.strptime(m + "-01", "%Y-%m-%d") >= entry_dt_obj.replace(day=1)]
+            if not valid_months:
+                valid_months = [entry_month]
+
+            user_mau = sorted(random.sample(valid_months, k=random.randint(1, len(valid_months))))
+            user_dau_dates = set()
+            txs, payments = [], []
+
+            # платеж
+            if user_mau:
+                pay_month = random.choice(user_mau)
+                pay_day = random.randint(1, 28)
+                pay_date = f"{pay_month}-{pay_day:02}"
+                dt_pay = datetime.strptime(pay_date, "%Y-%m-%d")
+                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(10, 1000))
+                }]
+                user_dau_dates.add(pay_date)
+
+            # вход в приложение
+            user_dau_dates.add(entry_date)
+            for m in user_mau:
+                day = random.randint(1, 28)
+                visit = f"{m}-{day:02}"
+                dt_visit = datetime.strptime(visit, "%Y-%m-%d")
+                if dt_visit >= entry_dt_obj and random.random() < 0.7:
+                    user_dau_dates.add(visit)
+
+            # статусы (отток) с низкой вероятностью
+            USER_STATUSES = []
+            if random.random() < 0.2:  # 10% шанс оттока
+                churn_month = random.choice(valid_months)
+                churn_day = random.randint(1, 28)
+                churn_date = f"{churn_month}-{churn_day:02}"
+                churn_ts = datetime.strptime(churn_date, "%Y-%m-%d").strftime("%d-%m-%Y") + "_23-59-59"
+                USER_STATUSES = [{random.choice(["left", "kicked"]): churn_ts}]
+
+            user_dau = sorted(user_dau_dates)
+            wallet = f"wallet{random.randint(1, 100)}" if txs else random.choice([f"wallet{random.randint(1, 100)}", ""])
+
+            data_users.append((
+                random.randint(100000, 999999),
+                json.dumps({"USER_WALLET": wallet, "USER_UTM": utm, "USER_DT": entry_dt}),
+                json.dumps({"USER_DAU": user_dau, "USER_MAU": user_mau, "USER_TXS": txs,
+                            "USER_PAYMENTS": payments, "USER_STATUSES": USER_STATUSES})
+            ))
+        print(f"gen {data_users=}")
+
+        await return_activity_metrics(bot, data_users, EXTRA_D, BASE_P, data_ents, schema_name)
+        await return_unit_metrics(bot, data_users, EXTRA_D, BASE_P)
+        await return_cohort_metrics(bot, data_users, EXTRA_D, BASE_P)
+        await return_retention_metrics(bot, data_users, EXTRA_D, BASE_P)
+        await return_profit_and_loss_metrics(bot, data_users, EXTRA_D, BASE_P)
+    except Exception as e:
+        logger.info(log_ % str(e))
+        await asyncio.sleep(round(random.uniform(0, 1), 2))
+
+
+async def return_activity_metrics(bot, data_users, EXTRA_D, BASE_P, data_ents, schema_name):
+    try:
         metrics_by_month = defaultdict(lambda: {
             "dau": 0,
             "mau": 0,
@@ -15953,79 +16031,8 @@ async def return_activity_metrics(bot, PROJECT_USERNAME, EXTRA_D, BASE_P):
         seen_dau = set()
         wallets_set = set()
         users_set = set()
-        pay_set = set()
 
         def process_user_rows(rows):
-            # months = ["2025-06", "2025-07", "2025-08", "2025-09"]
-            # data_users = []
-            # for _ in range(3):
-            #     # дата входа
-            #     entry_month = random.choice(months)
-            #     entry_day = random.randint(1, 28)
-            #     entry_date = f"{entry_month}-{entry_day:02}"
-            #     entry_dt_obj = datetime.strptime(entry_date, '%Y-%m-%d')
-            #     entry_dt = f"{entry_dt_obj.strftime('%d-%m-%Y')}_{datetime.now().strftime('%H-%M-%S')}"
-            #     utm = random.choice(["/start", "/startapp"])
-            #
-            #     # месяцы от входа и дальше
-            #     valid_months = [m for m in months if datetime.strptime(m + "-01", "%Y-%m-%d") >= entry_dt_obj.replace(day=1)]
-            #     if not valid_months:
-            #         valid_months = [entry_month]
-            #
-            #     user_mau = sorted(random.sample(valid_months, k=random.randint(1, len(valid_months))))
-            #     user_dau_dates = set()
-            #     txs, payments = [], []
-            #
-            #     # транзакция
-            #     if user_mau and random.random() < 0.5:
-            #         tx_month = random.choice(user_mau)
-            #         tx_day = random.randint(1, 28)
-            #         tx_date = f"{tx_month}-{tx_day:02}"
-            #         dt_tx = datetime.strptime(tx_date, "%Y-%m-%d")
-            #         if dt_tx >= entry_dt_obj:
-            #             txs = [{
-            #                 "TYPE": random.choice(["don", "sub", "pst"]),
-            #                 "AMOUNT": str(random.randint(1, 10)),
-            #                 "ADDRESS": f"address{random.randint(1, 999)}",
-            #                 "DT_START": f"{dt_tx.strftime('%d-%m-%Y')}_12-00-00",
-            #             }]
-            #             user_dau_dates.add(tx_date)
-            #
-            #     # платеж
-            #     if user_mau and random.random() < 0.5:
-            #         pay_month = random.choice(user_mau)
-            #         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))
-            #             }]
-            #             user_dau_dates.add(pay_date)
-            #
-            #     # вход в приложение
-            #     user_dau_dates.add(entry_date)
-            #
-            #     # остальные посещения
-            #     for m in user_mau:
-            #         day = random.randint(1, 28)
-            #         visit = f"{m}-{day:02}"
-            #         dt_visit = datetime.strptime(visit, "%Y-%m-%d")
-            #         if dt_visit >= entry_dt_obj and random.random() < 0.7:
-            #             user_dau_dates.add(visit)
-            #
-            #     user_dau = sorted(user_dau_dates)
-            #     wallet = f"wallet{random.randint(1, 100)}" if txs else random.choice([f"wallet{random.randint(1, 100)}", ""])
-            #
-            #     data_users.append((
-            #         random.randint(100000, 999999),
-            #         json.dumps({"USER_WALLET": wallet, "USER_UTM": utm, "USER_DT": entry_dt}),
-            #         json.dumps({"USER_DAU": user_dau, "USER_MAU": user_mau, "USER_TXS": txs, "USER_PAYMENTS": payments})
-            #     ))
-
             for USER_TID, USER_VARS, USER_LSTS in rows:
                 USER_VARS = json.loads(USER_VARS or "{}")
                 USER_LSTS = json.loads(USER_LSTS or "{}")
@@ -16081,6 +16088,8 @@ async def return_activity_metrics(bot, PROJECT_USERNAME, EXTRA_D, BASE_P):
                     key = "/startapp" if USER_UTM == "/startapp" else "/start"
                     metrics_by_month[month_key][key] += 1
 
+        process_user_rows(data_users)
+
         for item in data_ents:
             ENT_TID = item[0]
             sql = f'SELECT USER_TID, USER_VARS, USER_LSTS FROM {schema_name}_{ENT_TID}.USER'
@@ -16088,11 +16097,6 @@ async def return_activity_metrics(bot, PROJECT_USERNAME, EXTRA_D, BASE_P):
             print(f"schema_name {data_users=}")
             process_user_rows(data_users)
 
-        sql = f"SELECT USER_TID, USER_VARS, USER_LSTS FROM \"USER\""
-        data_users = await db_select_pg(sql, (), BASE_P)
-        print(f"{data_users=}")
-        process_user_rows(data_users)
-
         all_months = sorted(metrics_by_month.keys())
         f_name = os.path.join(EXTRA_D, "1_activity_metrics.csv")
         with open(f_name, mode="w", encoding="utf-8", newline="") as csvfile:
@@ -16122,11 +16126,8 @@ async def return_activity_metrics(bot, PROJECT_USERNAME, EXTRA_D, BASE_P):
         await asyncio.sleep(round(random.uniform(0, 1), 2))
 
 
-async def return_unit_metrics(bot, PROJECT_USERNAME, EXTRA_D, BASE_P):
+async def return_unit_metrics(bot, data_users, EXTRA_D):
     try:
-        sql = 'SELECT USER_TID, USER_VARS, USER_LSTS FROM "USER"'
-        data_users = await db_select_pg(sql, (), BASE_P)
-
         metrics = defaultdict(lambda: {
             "new_users": 0,
             "sum_amount": 0.0,
@@ -16165,13 +16166,14 @@ async def return_unit_metrics(bot, PROJECT_USERNAME, EXTRA_D, BASE_P):
         all_months = sorted(metrics.keys())
         cumulative_users = 0
         results = []
-
+        first_mrr = None
+        
         for idx, mo in enumerate(all_months):
             data = metrics[mo]
             new_u = data["new_users"]
             cumulative_users += new_u
-
             MRR = data["sum_amount"]
+
             def fmt(x):
                 return f"{x:.2f}".rstrip("0").rstrip(".") if x is not None else ""
 
@@ -16233,75 +16235,8 @@ async def return_unit_metrics(bot, PROJECT_USERNAME, EXTRA_D, BASE_P):
         await asyncio.sleep(round(random.uniform(0, 1), 2))
 
 
-async def return_cohort_metrics(bot, PROJECT_USERNAME, EXTRA_D, BASE_P):
+async def return_cohort_metrics(bot, data_users, EXTRA_D):
     try:
-        sql = 'SELECT USER_TID, USER_VARS, USER_LSTS FROM "USER"'
-        data_users = await db_select_pg(sql, (), BASE_P)
-
-        months = ["2025-06", "2025-07", "2025-08", "2025-09"]
-        data_users = []
-        for _ in range(30):
-            # дата входа
-            entry_month = random.choice(months)
-            entry_day = random.randint(1, 28)
-            entry_date = f"{entry_month}-{entry_day:02}"
-            entry_dt_obj = datetime.strptime(entry_date, '%Y-%m-%d')
-            entry_dt = f"{entry_dt_obj.strftime('%d-%m-%Y')}_{datetime.now().strftime('%H-%M-%S')}"
-            utm = random.choice(["/start", "/startapp"])
-
-            # месяцы от входа и дальше
-            valid_months = [m for m in months if datetime.strptime(m + "-01", "%Y-%m-%d") >= entry_dt_obj.replace(day=1)]
-            if not valid_months:
-                valid_months = [entry_month]
-
-            user_mau = sorted(random.sample(valid_months, k=random.randint(1, len(valid_months))))
-            user_dau_dates = set()
-            txs, payments = [], []
-
-            # платеж
-            if user_mau:
-                pay_month = random.choice(user_mau)
-                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))
-                }]
-                user_dau_dates.add(pay_date)
-
-            # вход в приложение
-            user_dau_dates.add(entry_date)
-            for m in user_mau:
-                day = random.randint(1, 28)
-                visit = f"{m}-{day:02}"
-                dt_visit = datetime.strptime(visit, "%Y-%m-%d")
-                if dt_visit >= entry_dt_obj and random.random() < 0.7:
-                    user_dau_dates.add(visit)
-
-            # статусы (отток) с низкой вероятностью
-            USER_STATUSES = []
-            if random.random() < 0.2:  # 10% шанс оттока
-                churn_month = random.choice(valid_months)
-                churn_day = random.randint(1, 28)
-                churn_date = f"{churn_month}-{churn_day:02}"
-                churn_ts = datetime.strptime(churn_date, "%Y-%m-%d").strftime("%d-%m-%Y") + "_23-59-59"
-                USER_STATUSES = [{random.choice(["left", "kicked"]): churn_ts}]
-
-            user_dau = sorted(user_dau_dates)
-            wallet = f"wallet{random.randint(1, 100)}" if txs else random.choice([f"wallet{random.randint(1, 100)}", ""])
-
-            data_users.append((
-                random.randint(100000, 999999),
-                json.dumps({"USER_WALLET": wallet, "USER_UTM": utm, "USER_DT": entry_dt}),
-                json.dumps({"USER_DAU": user_dau, "USER_MAU": user_mau, "USER_TXS": txs,
-                            "USER_PAYMENTS": payments, "USER_STATUSES": USER_STATUSES})
-            ))
-        print(f"gen {data_users=}")
-
         cohorts = defaultdict(set)
         activity_months = defaultdict(set)
 
@@ -16324,13 +16259,6 @@ async def return_cohort_metrics(bot, PROJECT_USERNAME, EXTRA_D, BASE_P):
         cohort_months = sorted(cohorts.keys())
         num_months = len(cohort_months)
 
-        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}"
-
         # Собираем таблицу посменно по календарным месяцам
         table = []
         header = ["Месяц/Когорта"]
@@ -16398,75 +16326,8 @@ async def return_cohort_metrics(bot, PROJECT_USERNAME, EXTRA_D, BASE_P):
         await asyncio.sleep(round(random.uniform(0, 1), 2))
 
 
-async def return_retention_metrics(bot, PROJECT_USERNAME, EXTRA_D, BASE_P):
+async def return_retention_metrics(bot, data_users, EXTRA_D):
     try:
-        sql = 'SELECT USER_TID, USER_VARS, USER_LSTS FROM "USER"'
-        data_users = await db_select_pg(sql, (), BASE_P)
-
-        months = ["2025-06", "2025-07", "2025-08", "2025-09"]
-        data_users = []
-        for _ in range(30):
-            # дата входа
-            entry_month = random.choice(months)
-            entry_day = random.randint(1, 28)
-            entry_date = f"{entry_month}-{entry_day:02}"
-            entry_dt_obj = datetime.strptime(entry_date, '%Y-%m-%d')
-            entry_dt = f"{entry_dt_obj.strftime('%d-%m-%Y')}_{datetime.now().strftime('%H-%M-%S')}"
-            utm = random.choice(["/start", "/startapp"])
-
-            # месяцы от входа и дальше
-            valid_months = [m for m in months if datetime.strptime(m + "-01", "%Y-%m-%d") >= entry_dt_obj.replace(day=1)]
-            if not valid_months:
-                valid_months = [entry_month]
-
-            user_mau = sorted(random.sample(valid_months, k=random.randint(1, len(valid_months))))
-            user_dau_dates = set()
-            txs, payments = [], []
-
-            # платеж
-            if user_mau:
-                pay_month = random.choice(user_mau)
-                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))
-                }]
-                user_dau_dates.add(pay_date)
-
-            # вход в приложение
-            user_dau_dates.add(entry_date)
-            for m in user_mau:
-                day = random.randint(1, 28)
-                visit = f"{m}-{day:02}"
-                dt_visit = datetime.strptime(visit, "%Y-%m-%d")
-                if dt_visit >= entry_dt_obj and random.random() < 0.7:
-                    user_dau_dates.add(visit)
-
-            # статусы (отток) с низкой вероятностью
-            USER_STATUSES = []
-            if random.random() < 0.2:  # 10% шанс оттока
-                churn_month = random.choice(valid_months)
-                churn_day = random.randint(1, 28)
-                churn_date = f"{churn_month}-{churn_day:02}"
-                churn_ts = datetime.strptime(churn_date, "%Y-%m-%d").strftime("%d-%m-%Y") + "_23-59-59"
-                USER_STATUSES = [{random.choice(["left", "kicked"]): churn_ts}]
-
-            user_dau = sorted(user_dau_dates)
-            wallet = f"wallet{random.randint(1, 100)}" if txs else random.choice([f"wallet{random.randint(1, 100)}", ""])
-
-            data_users.append((
-                random.randint(100000, 999999),
-                json.dumps({"USER_WALLET": wallet, "USER_UTM": utm, "USER_DT": entry_dt}),
-                json.dumps({"USER_DAU": user_dau, "USER_MAU": user_mau, "USER_TXS": txs,
-                            "USER_PAYMENTS": payments, "USER_STATUSES": USER_STATUSES})
-            ))
-        print(f"gen {data_users=}")
-
         rev_by_cohort = defaultdict(lambda: defaultdict(float))
         cohort_users = defaultdict(set)
 
@@ -16553,75 +16414,8 @@ async def return_retention_metrics(bot, PROJECT_USERNAME, EXTRA_D, BASE_P):
         await asyncio.sleep(round(random.uniform(0, 1), 2))
 
 
-async def return_profit_and_loss_metrics(bot, PROJECT_USERNAME, EXTRA_D, BASE_P):
+async def return_profit_and_loss_metrics(bot, data_users, EXTRA_D):
     try:
-        sql = 'SELECT USER_TID, USER_VARS, USER_LSTS FROM "USER"'
-        data_users = await db_select_pg(sql, (), BASE_P)
-
-        months = ["2025-06", "2025-07", "2025-08", "2025-09"]
-        data_users = []
-        for _ in range(30):
-            # дата входа
-            entry_month = random.choice(months)
-            entry_day = random.randint(1, 28)
-            entry_date = f"{entry_month}-{entry_day:02}"
-            entry_dt_obj = datetime.strptime(entry_date, '%Y-%m-%d')
-            entry_dt = f"{entry_dt_obj.strftime('%d-%m-%Y')}_{datetime.now().strftime('%H-%M-%S')}"
-            utm = random.choice(["/start", "/startapp"])
-
-            # месяцы от входа и дальше
-            valid_months = [m for m in months if datetime.strptime(m + "-01", "%Y-%m-%d") >= entry_dt_obj.replace(day=1)]
-            if not valid_months:
-                valid_months = [entry_month]
-
-            user_mau = sorted(random.sample(valid_months, k=random.randint(1, len(valid_months))))
-            user_dau_dates = set()
-            txs, payments = [], []
-
-            # платеж
-            if user_mau:
-                pay_month = random.choice(user_mau)
-                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(10, 1000))
-                }]
-                user_dau_dates.add(pay_date)
-
-            # вход в приложение
-            user_dau_dates.add(entry_date)
-            for m in user_mau:
-                day = random.randint(1, 28)
-                visit = f"{m}-{day:02}"
-                dt_visit = datetime.strptime(visit, "%Y-%m-%d")
-                if dt_visit >= entry_dt_obj and random.random() < 0.7:
-                    user_dau_dates.add(visit)
-
-            # статусы (отток) с низкой вероятностью
-            USER_STATUSES = []
-            if random.random() < 0.2:  # 10% шанс оттока
-                churn_month = random.choice(valid_months)
-                churn_day = random.randint(1, 28)
-                churn_date = f"{churn_month}-{churn_day:02}"
-                churn_ts = datetime.strptime(churn_date, "%Y-%m-%d").strftime("%d-%m-%Y") + "_23-59-59"
-                USER_STATUSES = [{random.choice(["left", "kicked"]): churn_ts}]
-
-            user_dau = sorted(user_dau_dates)
-            wallet = f"wallet{random.randint(1, 100)}" if txs else random.choice([f"wallet{random.randint(1, 100)}", ""])
-
-            data_users.append((
-                random.randint(100000, 999999),
-                json.dumps({"USER_WALLET": wallet, "USER_UTM": utm, "USER_DT": entry_dt}),
-                json.dumps({"USER_DAU": user_dau, "USER_MAU": user_mau, "USER_TXS": txs,
-                            "USER_PAYMENTS": payments, "USER_STATUSES": USER_STATUSES})
-            ))
-        print(f"gen {data_users=}")
-
         metrics = defaultdict(lambda: {"sum_amount": 0.0})
 
         for USER_TID, USER_VARS, USER_LSTS in data_users:
@@ -16642,18 +16436,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,
@@ -16682,7 +16476,6 @@ async def return_profit_and_loss_metrics(bot, PROJECT_USERNAME, EXTRA_D, BASE_P)
     except Exception as e:
         logger.info(log_ % str(e))
         await asyncio.sleep(round(random.uniform(0, 1), 2))
-
 # endregion
 
 

{yeref-0.24.89 → yeref-0.24.91}/yeref.egg-info/PKG-INFO

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