python-qlv-helper 0.6.0__py3-none-any.whl → 0.9.3__py3-none-any.whl

qlv_helper/controller/order_table.py

@@ -10,10 +10,17 @@
 # ---------------------------------------------------------------------------------------------------------
 """
 import asyncio
+from copy import deepcopy
+from logging import Logger
 from aiohttp import CookieJar
-from typing import Optional, Dict, Any, Callable, List
+from datetime import datetime, timedelta
+from playwright.async_api import Page, Locator
+import qlv_helper.config.url_const as url_const
 from http_helper.client.async_proxy import HttpClientFactory
 from qlv_helper.utils.html_utils import parse_pagination_info
+from qlv_helper.utils.type_utils import safe_convert_advanced
+from typing import Optional, Dict, Any, Callable, List, cast, Tuple
+from qlv_helper.po.domestic_activity_order_page import DomesticActivityOrderPage
 from qlv_helper.http.order_table_page import get_domestic_activity_order_page_html, get_domestic_ticket_outed_page_html, \
     parse_order_table, get_domestic_unticketed_order_page_html
 
@@ -28,7 +35,7 @@ async def _get_paginated_order_table(
         cookie_jar: Optional[CookieJar],
         playwright_state: Dict[str, Any],
         table_state: str,
-        fetch_page_fn: Callable[..., Any],   # 拿到第一页/分页 HTML 的函数
+        fetch_page_fn: Callable[..., Any],  # 拿到第一页/分页 HTML 的函数
 ) -> Dict[str, Any]:
     """通用分页表格抓取（支持并发）"""
 
@@ -46,9 +53,10 @@ async def _get_paginated_order_table(
     response = await fetch_page_fn(
         domain=domain, protocol=protocol, retry=retry, timeout=timeout,
         enable_log=enable_log, cookie_jar=cookie_jar, playwright_state=playwright_state,
-        order_http_client=order_http_client, is_end=True
+        order_http_client=order_http_client, is_end=False
     )
     if response.get("code") != 200:
+        await order_http_client.close()
         return response
 
     html = response["data"]
@@ -66,6 +74,7 @@ async def _get_paginated_order_table(
             "pages": 1
         })
         response["data"] = pagination_info
+        await order_http_client.close()
         return response
 
     # --- 3. 多页：并发抓取第 2~pages 页 ---
@@ -75,24 +84,14 @@ async def _get_paginated_order_table(
             resp = await fetch_page_fn(
                 domain=domain, protocol=protocol, retry=retry, timeout=timeout,
                 enable_log=enable_log, cookie_jar=cookie_jar, playwright_state=playwright_state,
-                order_http_client=client, current_page=page, pages=pages, is_end=(page == pages)
+                order_http_client=client, current_page=page, pages=pages, is_end=False
             )
             if resp.get("code") == 200:
                 return parse_order_table(html=resp["data"], table_state=table_state)
-        except (Exception, ):
+        except (Exception,):
             return list()  # 抓取失败则返回空，不影响整体
         return list()
 
-    # 🔥 并发：一口气抓全部分页
-    order_http_client = HttpClientFactory(
-        protocol=protocol if protocol == "http" else "https",
-        domain=domain,
-        timeout=timeout,
-        retry=retry,
-        enable_log=enable_log,
-        cookie_jar=cookie_jar,
-        playwright_state=playwright_state
-    )
     tasks = [fetch_page(client=order_http_client, page=page) for page in range(2, pages + 1)]
     results = await asyncio.gather(*tasks)
 
@@ -109,8 +108,10 @@ async def _get_paginated_order_table(
         "pages": 1
     })
     response["data"] = pagination_info
+    await order_http_client.close()
     return response
 
+
 async def get_domestic_activity_order_table(
         domain: str, protocol: str = "http", retry: int = 1, timeout: int = 5, enable_log: bool = True,
         cookie_jar: Optional[CookieJar] = None, playwright_state: Dict[str, Any] = None
@@ -144,6 +145,7 @@ async def get_domestic_ticket_outed_table(
         fetch_page_fn=get_domestic_ticket_outed_page_html
     )
 
+
 async def get_domestic_unticketed_order_table(
         domain: str, protocol: str = "http", retry: int = 1, timeout: int = 5, enable_log: bool = True,
         cookie_jar: Optional[CookieJar] = None, playwright_state: Dict[str, Any] = None
@@ -158,4 +160,164 @@ async def get_domestic_unticketed_order_table(
         playwright_state=playwright_state,
         table_state="proccessing",
         fetch_page_fn=get_domestic_unticketed_order_page_html
-    )
+    )
+
+
+async def open_domestic_activity_order_page(
+        *, page: Page, logger: Logger, qlv_protocol: str, qlv_domain: str, timeout: float = 20.0
+) -> DomesticActivityOrderPage:
+    url_prefix = f"{qlv_protocol}://{qlv_domain}"
+    domestic_activity_order_url = url_prefix + url_const.domestic_activity_order_url
+    await page.goto(domestic_activity_order_url)
+
+    domestic_activity_order_po = DomesticActivityOrderPage(page=page, url=domestic_activity_order_url)
+    await domestic_activity_order_po.url_wait_for(url=domestic_activity_order_url, timeout=timeout)
+    logger.info(f"即将进入国内活动订单页面，页面URL<{domestic_activity_order_url}>")
+    return domestic_activity_order_po
+
+
+async def pop_will_expire_domestic_activity_order(
+        *, page: Page, logger: Logger, qlv_protocol: str, qlv_domain: str, last_minute_threshold: int,
+        timeout: float = 20.0, **kwargs: Any
+) -> Tuple[List[Dict[str, Any]], bool]:
+    # 1. 打开国内活动订单页面
+    domestic_activity_order_po = await open_domestic_activity_order_page(
+        page=page, logger=logger, qlv_protocol=qlv_protocol, qlv_domain=qlv_domain, timeout=timeout
+    )
+
+    # TODO 暂时不考虑分页的情况
+    # 2. 获取table所有tr的Locator对象
+    trs_locator = await domestic_activity_order_po.get_flight_table_trs_locator(timeout=timeout)
+    trs_locator = await trs_locator.all()
+    table_data = list()
+    feilds = {
+        "to_from": "", "urgant_state": "", "order_id": 0, "pre_order_id": "", "aduit_pnr": "", "child_pnr": "",
+        "payment_time": "", "last_time_ticket": "", "dat_dep": "", "code_dep": "", "code_arr": "", "flight_no": "",
+        "cabin": "", "policy": "", "total_people": 0, "total_adult": 0, "total_child": 0, "receipted": 0.00,
+        "stat_opration": "", "more_seats": "", "operation_info": "", "substitute_btn_locator": ""
+    }
+    pre_pop_orders = list()
+    is_pop = False
+    for tr_locator in trs_locator[1:]:
+        row_locator = await domestic_activity_order_po.get_flight_table_trs_td(locator=tr_locator, timeout=timeout)
+        tds_locators = await row_locator.all()
+        sub_feilds = list()
+        copy_feilds = deepcopy(feilds)
+        for index, td_locator in enumerate(tds_locators):
+            try:
+                text = (await td_locator.inner_text()).strip()
+                if index == 0:
+                    copy_feilds["to_from"] = text
+                    sub_feilds.append("to_from")
+                elif index == 1:
+                    order_id = await domestic_activity_order_po.get_flight_table_td_order_id(
+                        locator=td_locator, timeout=timeout
+                    )
+                    urgant_state = await domestic_activity_order_po.get_flight_table_td_urgant(
+                        locator=td_locator, timeout=timeout
+                    )
+                    copy_feilds["order_id"] = safe_convert_advanced(value=order_id)
+                    copy_feilds["urgant_state"] = urgant_state
+                    sub_feilds.extend(["order_id", "urgant_state"])
+                elif index == 2:
+                    copy_feilds["pre_order_id"] = text
+                    sub_feilds.append("pre_order_id")
+                elif index == 3:
+                    text = text.replace("\xa0", "")
+                    text_slice = text.split("|")
+                    copy_feilds["aduit_pnr"] = text_slice[0].strip()
+                    copy_feilds["child_pnr"] = text_slice[1].strip()
+                    sub_feilds.extend(["aduit_pnr", "child_pnr"])
+                elif index == 4:
+                    copy_feilds["payment_time"] = text
+                    sub_feilds.append("payment_time")
+                elif index == 5:
+                    continue
+                elif index == 6:
+                    copy_feilds["last_time_ticket"] = text
+                    sub_feilds.append("last_time_ticket")
+                elif index == 7:
+                    continue
+                elif index == 8:
+                    text = text.replace("\xa0", "|")
+                    text_slice = [i for i in text.split("|") if i.strip()]
+                    ctrip = text_slice[1].split("-")
+                    copy_feilds["dat_dep"] = text_slice[0].strip()
+                    copy_feilds["code_dep"] = ctrip[0].strip()
+                    copy_feilds["code_arr"] = ctrip[1].strip()
+                    copy_feilds["flight_no"] = text_slice[2].strip()
+                    copy_feilds["cabin"] = text_slice[3].strip()
+                    sub_feilds.extend(["dat_dep", "code_dep", "code_arr", "flight_no", "cabin"])
+                elif index == 9:
+                    text = text.replace("\xa0", "")
+                    text = text.replace(">", "")
+                    text = text.replace("<", "")
+                    text = text.replace("&", "")
+                    text = text.replace("<br>", "\n")
+                    copy_feilds["policy"] = text
+                    sub_feilds.append("policy")
+                elif index == 10:
+                    text = text.replace("【 ", "|")
+                    text = text.replace("/", "|")
+                    text = text.replace("】", "")
+                    text_slice = text.split("|")
+                    copy_feilds["total_people"] = safe_convert_advanced(value=text_slice[0].strip())
+                    copy_feilds["total_adult"] = safe_convert_advanced(value=text_slice[1].strip())
+                    copy_feilds["total_child"] = safe_convert_advanced(value=text_slice[2].strip())
+                    sub_feilds.extend(["total_people", "total_adult", "total_child"])
+                elif index == 11:
+                    copy_feilds["receipted"] = safe_convert_advanced(value=text)
+                    sub_feilds.append("receipted")
+                elif index == 12:
+                    copy_feilds["stat_opration"] = text
+                    sub_feilds.append("stat_opration")
+                elif index == 13:
+                    copy_feilds["more_seats"] = safe_convert_advanced(value=text)
+                    sub_feilds.append("more_seats")
+                elif index == 14:
+                    text_slice = text.split(" ")
+                    operation_info = dict(
+                        lock_btn_locator=cast(Locator, None), pop_btn_locator=cast(Locator, None), locked=""
+                    )
+                    if "锁定" in text_slice[0]:
+                        lock_btn_locator = await domestic_activity_order_po.get_flight_table_td_operation_lock_btn(
+                            locator=td_locator, timeout=timeout
+                        )
+                        operation_info["lock_btn_locator"] = lock_btn_locator
+                    else:
+                        operation_info["locked"] = text_slice[0].strip()
+                    if "踢出" in text:
+                        pop_btn_locator = await domestic_activity_order_po.get_flight_table_td_operation_pop_btn(
+                            locator=td_locator, timeout=timeout
+                        )
+                        operation_info["pop_btn_locator"] = pop_btn_locator
+                    copy_feilds["operation_info"] = operation_info
+                    sub_feilds.append("operation_info")
+                elif index == 15:
+                    copy_feilds[
+                        "substitute_btn_locator"
+                    ] = await domestic_activity_order_po.get_flight_table_td_operation_substitute_btn(
+                        locator=td_locator, timeout=timeout)
+                    sub_feilds.append("substitute_btn_locator")
+            except (Exception,) as e:
+                logger.error(f"第<{index + 1}>列数据处理异常，原因：{e}")
+        if len(sub_feilds) == 22:
+            table_data.append(copy_feilds)
+            if datetime.strptime(
+                    copy_feilds.get("last_time_ticket"), "%Y-%m-%d %H:%M:%S"
+            ) < datetime.now() + timedelta(minutes=last_minute_threshold):
+                pre_pop_orders.append(copy_feilds)
+    for pre_pop_order in pre_pop_orders:
+        order_id = pre_pop_order.get("order_id")
+        operation_info = pre_pop_order.get("operation_info")
+        pop_btn_locator = operation_info.get("pop_btn_locator")
+        last_time_ticket = pre_pop_order.get("last_time_ticket")
+        if pop_btn_locator and isinstance(pop_btn_locator, Locator):
+            minute = (datetime.strptime(last_time_ticket, "%Y-%m-%d %H:%M:%S") - datetime.now()).total_seconds() / 60
+            await pop_btn_locator.click()
+            if is_pop is False:
+                is_pop = True
+            logger.info(
+                f"订单<{order_id}>，距离最晚出票时限: {last_time_ticket}，仅剩<{minute}>分钟，已将工单剔出活动订单"
+            )
+    return table_data, is_pop

qlv_helper/controller/user_login.py

@@ -9,111 +9,115 @@
 # Copyright ©2011-2025. Hunan xxxxxxx Company limited. All rights reserved.
 # ---------------------------------------------------------------------------------------------------------
 """
+import os
 import asyncio
-from typing import Tuple
+import traceback
+from logging import Logger
+from datetime import datetime
+from typing import Dict, Any, Optional
 from qlv_helper.po.login_page import LoginPage
-from playwright.async_api import BrowserContext
-from qlv_helper.po.wechat_auth_page import WechatAuthPage
-from qlv_helper.utils.browser_utils import switch_for_table_window
-from qlv_helper.utils.po_utils import on_click_locator, locator_input_element
-
-
-async def _username_login(login_po: LoginPage, username: str, password: str, timeout: float = 5.0) -> Tuple[bool, str]:
-    # 1. 输入用户名
-    is_success, username_input = await login_po.get_login_username_input(timeout=timeout)
-    if is_success is False:
-        return is_success, username_input
-    await locator_input_element(locator=username_input, text=username.strip())
-
-    # 2. 输入密码
-    is_success, password_input = await login_po.get_login_password_input(timeout=timeout)
-    if is_success is False:
-        return is_success, username_input
-    await locator_input_element(locator=password_input, text=password.strip())
-
-    # 3. 获取一层验证码
-    is_success, code_str = await login_po.get_number_code(timeout=timeout)
-    if is_success is False:
-        return is_success, code_str
-
-    # 4. 输入一层验证码
-    is_success, code_input = await login_po.get_login_number_code_input(timeout=timeout)
-    if is_success is False:
-        return is_success, code_input
-    await locator_input_element(locator=code_input, text=code_str.lower())
-
-    # 5. 点击登录
-    is_success, login_btn = await login_po.get_login_btn(timeout=timeout)
-    if is_success is False:
-        return is_success, login_btn
-    await on_click_locator(locator=login_btn)
-
-
-async def _wechat_login(browser: BrowserContext, login_po: LoginPage, timeout: float = 5.0) -> Tuple[bool, str]:
-    # 1. 点击微信登录快捷入口
-    is_success, wechat_entrance = await login_po.get_wechat_entrance(timeout=timeout)
-    if is_success is False:
-        return is_success, wechat_entrance
-    await on_click_locator(locator=wechat_entrance)
-
-    page_new = await switch_for_table_window(browser=browser, url_keyword="open.weixin.qq.com", wait_time=int(timeout))
-    wachat_po = WechatAuthPage(page=page_new)
-
-    # 2. 点击【微信快捷登录】按钮
-    is_success, wechat_quick_login_btn = await wachat_po.get_wechat_quick_login_btn(timeout=timeout)
-    if is_success is False:
-        return is_success, wechat_quick_login_btn
-    await on_click_locator(locator=wechat_quick_login_btn)
-
-    # 3. 点击微信弹框的中【允许】按钮
-    return await wachat_po.on_click_allow_btn(timeout=int(timeout) * 3)
-
-
-async def username_login(
-        login_po: LoginPage, username: str, password: str, timeout: float = 5.0, retry: int = 3
-) -> Tuple[bool, str]:
-    # 1. 第一次全流程的登录
-    await _username_login(login_po=login_po, username=username, password=password, timeout=timeout)
-    for _ in range(retry):
-        # 2. 判断是否为当前页
-        if login_po.is_current_page() is False:
-            return True, f"账号:{username} 登录成功"
-
-        # 3. 判断是否存在登录警告，存在的话，继续输入验证码，再次登录
-        is_warn: bool = await login_po.is_exist_login_warn(timeout=timeout)
-        if is_warn is True:
-            # 4. 获取一层验证码
-            is_success, code_str = await login_po.get_number_code(timeout=timeout)
-            if is_success is False:
-                return is_success, code_str
-
-            # 5. 输入一层验证码
-            is_success, code_input = await login_po.get_login_number_code_input(timeout=timeout)
-            if is_success is False:
-                return is_success, code_input
-            await locator_input_element(locator=code_input, text=code_str.lower())
+import qlv_helper.config.url_const as url_const
+from playwright.async_api import Page, ElementHandle
+from qlv_helper.utils.ocr_helper import get_image_text
+
+async def _username_login(
+        *, login_po: LoginPage, logger: Logger, username: str, password: str, screenshot_dir: str, api_key: str,
+        secret_key: str, timeout: float = 5.0, attempt: int = 10
+) -> Optional[Dict[str, Any]]:
+    for index in range(1, attempt + 1):
+        try:
+            # 1. 输入用户名
+            username_input = await login_po.get_login_username_input(timeout=timeout)
+            await username_input.fill(value=username)
+            logger.info(f"登录页面，用户名<{username}>输入完成")
+        except (Exception,):
+            pass
+        try:
+            # 2. 输入密码
+            password_input = await login_po.get_login_password_input(timeout=timeout)
+            await password_input.fill(value=password)
+            logger.info(f"登录页面，用户密码<{password}>输入完成")
+        except (Exception,):
+            pass
+        try:
+            # 3. 首次获取验证码，并点击
+            # captcha_1 = await login_po.get_captcha(timeout=timeout)
+            # await captcha_1.click(button="left")
+            # await asyncio.sleep(delay=3)
+
+            # 4. 再次获取验证码
+            captcha_2 = await login_po.get_captcha(timeout=timeout)
+            # 4.1 获取验证码类型
+            captcha_type: int = await login_po.get_captcha_type(locator=captcha_2, timeout=timeout)
+            logger.info(f"登录页面，验证码类型<{captcha_type}>获取成功")
+            # 4.2 获取验证码图片，直接截图获取原始图片字节，不刷新图片
+            image: ElementHandle = await login_po.get_captcha_image(timeout=timeout)
+            dt_str: str = datetime.now().strftime("%Y%m%d%H%M%S")
+            fn: str = os.path.join(screenshot_dir, f"captcha_{username}_{captcha_type}_{dt_str}.png")
+            await image.screenshot(path=fn, timeout=timeout * 1000)
+            logger.info(f"登录页面，验证码图片已经生成，图片路径：{fn}")
+            # 4.3 获取验证码内容
+            capthcha_text = await get_image_text(
+                image_path=fn, captcha_type=captcha_type, api_key=api_key, secret_key=secret_key
+            )
+            logger.info(f"登录页面，验证码内容：<{capthcha_text}>识别成功")
+
+            # 5. 获取验证码输入框
+            captcha_input = await login_po.get_login_captcha_input(timeout=timeout)
+            await captcha_input.fill(value=capthcha_text)
+            logger.info(f"登录页面，验证码<{capthcha_text}>输入完成")
 
             # 6. 点击登录
-            is_success, login_btn = await login_po.get_login_btn(timeout=timeout)
-            if is_success is False:
-                return is_success, login_btn
-            await on_click_locator(locator=login_btn)
-        else:
-            # 7. 重复一次全流程的登录
-            await _username_login(login_po=login_po, username=username, password=password, timeout=timeout)
-
-        await asyncio.sleep(delay=timeout)
-
-    return True, f"账号:{username} 一次登录流程结束"
+            login_btn = await login_po.get_login_btn(timeout=timeout)
+            await login_btn.click(button="left")
+            logger.info(f"登录页面，【登录】按钮点击完成")
+            await asyncio.sleep(delay=3)
+
+            # 7. 验证登录是否成功
+            result = login_po.is_current_page()
+            if result is False:
+                logger.info(f"用户<{username}>登录成功，登录流程结束")
+
+                # 9. 获取当前cookie，不指定 path，Playwright 会返回 JSON 字符串
+                return await login_po.get_page().context.storage_state()
+            else:
+                raise RuntimeError("登录失败")
+        except (RuntimeError,):
+            if index == attempt:
+                logger.error(f"尝试登录<{attempt}>次，均失败，登录结束")
+            else:
+                logger.error(f"第<{index}>次登录失败，等待下一次登录")
+        except (Exception,):
+            logger.error(traceback.format_exc())
+            if index == attempt:
+                logger.error(f"尝试登录<{attempt}>次，均失败，登录结束")
+            else:
+                logger.error(f"第<{index}>次登录失败，等待下一次登录")
+
+
+async def open_login_page(
+        *, page: Page, logger: Logger, qlv_protocol: str, qlv_domain: str, timeout: float = 60.0
+) -> LoginPage:
+    url_prefix = f"{qlv_protocol}://{qlv_domain}"
+    login_url = url_prefix + url_const.login_url
+    await page.goto(login_url)
+
+    login_po = LoginPage(page=page, url=login_url)
+    await login_po.url_wait_for(url=login_url, timeout=timeout)
+    logger.info(f"即将进入登录页，页面URL<{login_url}>")
+    return login_po
 
 
-async def wechat_login(
-        browser: BrowserContext, login_po: LoginPage, timeout: float = 5.0, retry: int = 3
-) -> Tuple[bool, str]:
-    for index in range(retry):
-        # 全流程的登录
-        is_success, message = await _wechat_login(browser=browser, login_po=login_po, timeout=timeout)
-
-        # 判断是否为当前页
-        if is_success is True or index == retry - 1:
-            return is_success, message
+async def username_login(
+        *, page: Page, logger: Logger, qlv_protocol: str, qlv_domain: str, username: str, screenshot_dir: str,
+        password: str, api_key: str, secret_key: str, timeout: float = 60.0, attempt: int = 10, **kwargs: Any
+) -> Dict[str, Any]:
+    # 1. 打开登录页面
+    login_po = await open_login_page(
+        page=page, logger=logger, qlv_domain=qlv_domain, qlv_protocol=qlv_protocol, timeout=timeout
+    )
+    # 2. 一次全流程的登录
+    return await _username_login(
+        login_po=login_po, logger=logger, username=username, password=password, screenshot_dir=screenshot_dir,
+        timeout=timeout, api_key=api_key, secret_key=secret_key, attempt=attempt
+    )

qlv_helper/controller/wechat_login.py

@@ -0,0 +1,50 @@
+# -*- coding: utf-8 -*-
+"""
+# ---------------------------------------------------------------------------------------------------------
+# ProjectName:  qlv-helper
+# FileName:     wechat_login.py
+# Description:  微信登录模块
+# Author:       ASUS
+# CreateDate:   2025/12/31
+# Copyright ©2011-2025. Hunan xxxxxxx Company limited. All rights reserved.
+# ---------------------------------------------------------------------------------------------------------
+"""
+from typing import Tuple
+from qlv_helper.po.login_page import LoginPage
+from playwright.async_api import BrowserContext
+
+from qlv_helper.utils.po_utils import on_click_locator
+from qlv_helper.po.wechat_auth_page import WechatAuthPage
+from qlv_helper.utils.browser_utils import switch_for_table_window
+
+
+async def _wechat_login(browser: BrowserContext, login_po: LoginPage, timeout: float = 5.0) -> Tuple[bool, str]:
+    # 1. 点击微信登录快捷入口
+    is_success, wechat_entrance = await login_po.get_wechat_entrance(timeout=timeout)
+    if is_success is False:
+        return is_success, wechat_entrance
+    await on_click_locator(locator=wechat_entrance)
+
+    page_new = await switch_for_table_window(browser=browser, url_keyword="open.weixin.qq.com", wait_time=int(timeout))
+    wachat_po = WechatAuthPage(page=page_new)
+
+    # 2. 点击【微信快捷登录】按钮
+    is_success, wechat_quick_login_btn = await wachat_po.get_wechat_quick_login_btn(timeout=timeout)
+    if is_success is False:
+        return is_success, wechat_quick_login_btn
+    await on_click_locator(locator=wechat_quick_login_btn)
+
+    # 3. 点击微信弹框的中【允许】按钮
+    return await wachat_po.on_click_allow_btn(timeout=int(timeout) * 3)
+
+
+async def wechat_login(
+        *, browser: BrowserContext, login_po: LoginPage, timeout: float = 5.0, retry: int = 3
+) -> Tuple[bool, str]:
+    for index in range(1, retry + 1):
+        # 全流程的登录
+        is_success, message = await _wechat_login(browser=browser, login_po=login_po, timeout=timeout)
+
+        # 判断是否为当前页
+        if is_success is True or index == retry:
+            return is_success, message