yeref 0.24.94__py3-none-any.whl → 0.24.96__py3-none-any.whl

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 calc_metrics(bot, PROJECT_USERNAME, EXTRA_D, BASE_P):
+async def calc_metrics(bot, PROJECT_USERNAME, dataroom_folder_id, EXTRA_D, BASE_P, CONF_P):
     try:
         schema_name = "USER"
         if PROJECT_USERNAME == 'FereyBotBot':
@@ -16010,6 +16010,71 @@ async def calc_metrics(bot, PROJECT_USERNAME, EXTRA_D, BASE_P):
         r3 = await return_cohort_metrics(bot, data_users, EXTRA_D)
         r4 = await return_retention_metrics(bot, data_users, EXTRA_D)
         r5 = await return_profit_and_loss_metrics(bot, data_users, EXTRA_D)
+
+        # === НОВЫЙ БЛОК: читаем CSV (r1) и заливаем его в Google‐таблицу ===
+        if r1 and os.path.isfile(r1):
+            # 1) Авторизация в Google Sheets через Service Account
+            scopes = r_conf('scopes', CONF_P)
+            credential_path = os.path.join(EXTRA_D, (r_conf('credential_file', CONF_P))[0])
+            credentials = ServiceAccountCredentials.from_json_keyfile_name(credential_path, scopes)
+            http_auth = credentials.authorize(httplib2.Http())
+            sheets_service = build('sheets', 'v4', http=http_auth, cache_discovery=False)
+
+            # 2) Получаем metadata таблицы, чтобы найти sheetId для «Лист1» (или «Sheet1»)
+            spreadsheet = sheets_service.spreadsheets().get(spreadsheetId=dataroom_folder_id).execute()
+            sheet_id_to_rename = None
+            for sheet in spreadsheet.get('sheets', []):
+                props = sheet.get('properties', {})
+                title = props.get('title', '')
+                # если лист называется «Лист1» (русский по умолчанию) или «Sheet1» (английский)
+                if title in ['Лист1', 'Sheet1']:
+                    sheet_id_to_rename = props.get('sheetId')
+                    break
+
+            # 3) Переименовываем лист в PROJECT_USERNAME, если нашли нужный sheetId
+            if sheet_id_to_rename is not None:
+                rename_request = {
+                    'requests': [
+                        {
+                            'updateSheetProperties': {
+                                'properties': {
+                                    'sheetId': sheet_id_to_rename,
+                                    'title': PROJECT_USERNAME
+                                },
+                                'fields': 'title'
+                            }
+                        }
+                    ]
+                }
+                sheets_service.spreadsheets().batchUpdate(
+                    spreadsheetId=dataroom_folder_id,
+                    body=rename_request
+                ).execute()
+
+            # 4) Читаем CSV-файл (r1) целиком и собираем список строк
+            with open(r1, newline='', encoding='utf-8') as csvfile:
+                reader = csv.reader(csvfile)
+                all_rows = list(reader)
+
+            # 5) Пишем значения из all_rows в только что переименованный лист (PROJECT_USERNAME), начиная с A1
+            write_body = {
+                'valueInputOption': 'USER_ENTERED',
+                'data': [
+                    {
+                        'range': f"{PROJECT_USERNAME}!A1",
+                        'majorDimension': 'ROWS',
+                        'values': all_rows
+                    }
+                ]
+            }
+            sheets_service.spreadsheets().values().batchUpdate(
+                spreadsheetId=dataroom_folder_id,
+                body=write_body
+            ).execute()
+            logger.info("Activity‐метрики (r1) успешно загружены в Google‐таблицу.")
+        else:
+            logger.warning(f"Файл с метриками не найден или не существует: {r1}")
+
     except Exception as e:
         logger.info(log_ % str(e))
         await asyncio.sleep(round(random.uniform(0, 1), 2))

{yeref-0.24.94.dist-info → yeref-0.24.96.dist-info}/METADATA

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

yeref-0.24.96.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=Bfk-IETElHzdKl1GW3ZVK_vf1POOGS8aHSDd8tnvtXA,1053574
+yeref-0.24.96.dist-info/METADATA,sha256=hjnk-lihxaTZDzGAfZyqgYTw2adnX-iB-TZqMijo8I4,119
+yeref-0.24.96.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+yeref-0.24.96.dist-info/top_level.txt,sha256=yCQKchWHbfV-3OuQPYRdi2loypD-nmbDJbtt3OuKKkY,6
+yeref-0.24.96.dist-info/RECORD,,

yeref-0.24.94.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=lw2diaU3gGIN4Xpw6xgBHQdoHW-got_h5SaSllt3U6Y,1050157
-yeref-0.24.94.dist-info/METADATA,sha256=rQLVePjsJ97_n6GP9ZPj9HqKbHHSEBZruIsT0Y69yNI,119
-yeref-0.24.94.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-yeref-0.24.94.dist-info/top_level.txt,sha256=yCQKchWHbfV-3OuQPYRdi2loypD-nmbDJbtt3OuKKkY,6
-yeref-0.24.94.dist-info/RECORD,,