ey-commerce-lib 1.0.5__tar.gz → 1.0.7__tar.gz

{ey_commerce_lib-1.0.5 → ey_commerce_lib-1.0.7}/PKG-INFO

@@ -1,11 +1,13 @@
 Metadata-Version: 2.4
 Name: ey-commerce-lib
-Version: 1.0.5
+Version: 1.0.7
 Summary: eeyoung电商客户端调用封装
 Author-email: 饶奇奇 <1124393197@qq.com>
 Requires-Python: >=3.10
+Requires-Dist: ddddocr>=1.5.6
 Requires-Dist: httpx>=0.28.1
 Requires-Dist: lxml>=5.3.2
+Requires-Dist: playwright>=1.52.0
 Requires-Dist: pydantic>=2.11.3
 Requires-Dist: pytest-asyncio>=0.26.0
 Requires-Dist: pytest>=8.3.5

{ey_commerce_lib-1.0.5 → ey_commerce_lib-1.0.7}/pyproject.toml

@@ -1,24 +1,26 @@
-[project]
-name = "ey-commerce-lib"
-version = "1.0.5"
-description = "eeyoung电商客户端调用封装"
-readme = "README.md"
-authors = [
-    { name = "饶奇奇", email = "1124393197@qq.com" }
-]
-requires-python = ">=3.10"
-dependencies = [
-    "pytest-asyncio>=0.26.0",
-    "pytest>=8.3.5",
-    "httpx>=0.28.1",
-    "pydantic>=2.11.3",
-    "lxml>=5.3.2",
-]
-
-[build-system]
-requires = ["hatchling"]
-build-backend = "hatchling.build"
-
-[pypi]
-username = '__token__'
-password = 'pypi-AgEIcHlwaS5vcmcCJGM0ODMxYjA3LWUwZGEtNDI5MC04ZjFhLWY0NWQ2YjMwMTE3YgACKlszLCIxZmExMDhjZC02MjBjLTQ0ZjQtYmRiYy01ZDc4ZDM0MmY4YzIiXQAABiAX4H1ZB3reItO25PIffe7vOLqyqktJpnevZy_ibdUt6Q'
+[project]
+name = "ey-commerce-lib"
+version = "1.0.7"
+description = "eeyoung电商客户端调用封装"
+readme = "README.md"
+authors = [
+    { name = "饶奇奇", email = "1124393197@qq.com" }
+]
+requires-python = ">=3.10"
+dependencies = [
+    "pytest-asyncio>=0.26.0",
+    "pytest>=8.3.5",
+    "httpx>=0.28.1",
+    "pydantic>=2.11.3",
+    "lxml>=5.3.2",
+    "playwright>=1.52.0",
+    "ddddocr>=1.5.6",
+]
+
+[build-system]
+requires = ["hatchling"]
+build-backend = "hatchling.build"
+
+[pypi]
+username = '__token__'
+password = 'pypi-AgEIcHlwaS5vcmcCJGM0ODMxYjA3LWUwZGEtNDI5MC04ZjFhLWY0NWQ2YjMwMTE3YgACKlszLCIxZmExMDhjZC02MjBjLTQ0ZjQtYmRiYy01ZDc4ZDM0MmY4YzIiXQAABiAX4H1ZB3reItO25PIffe7vOLqyqktJpnevZy_ibdUt6Q'

{ey_commerce_lib-1.0.5 → ey_commerce_lib-1.0.7}/src/ey_commerce_lib/dxm/main.py

@@ -522,7 +522,7 @@ class DxmClient:
         validate_price_res = await self.__async_client.post("/dxmPurchasingNote/validatePrice.json", data={
             'ids': ids
         })
-        return validate_price_res
+        return validate_price_res.json()
 
     async def wait_pay_pay_money(self, purchase_id: str):
         """

{ey_commerce_lib-1.0.5 → ey_commerce_lib-1.0.7}/src/ey_commerce_lib/dxm/parser/order.py

@@ -16,10 +16,10 @@ def get_single_order_item_list(order_element: html.HtmlElement):
     for sku_element in sku_element_list:
         sku = sku_element.xpath('.//a[contains(@class, "pairProInfoSku")]/text()')[0]
         img = get_str_list_first_not_blank_or_none(sku_element.xpath('.//img/@data-original'))
-        quantity = sku_element.xpath('.//p[@class="limingcentUrlpicson"]/span/text()')[0]
+        quantity = sku_element.xpath('.//span[@class="limingcentUrlpicson"]/following-sibling::span[1]/text()')[0]
         # 价格
         currency, price = \
-            sku_element.xpath('.//p[@class="limingcentUrlpicson"]/following-sibling::p[1]/text()')[
+            sku_element.xpath('.//span[@class="limingcentUrlpicson"]/parent::*/following-sibling::p[1]/text()')[
                 0].split(' ')
         # 变种
         variants = sku_element.xpath(

ey_commerce_lib-1.0.7/src/ey_commerce_lib/four_seller/constant/response.py

@@ -0,0 +1,8 @@
+from enum import IntEnum
+
+
+class ResponseCodeEnum(IntEnum):
+    # 登录验证失败
+    LOGIN_VALIDATION_FAILED = 4001
+    # 操作成功
+    SUCCESS = 0

ey_commerce_lib-1.0.7/src/ey_commerce_lib/four_seller/main.py

@@ -0,0 +1,280 @@
+import asyncio
+import base64
+import logging
+from typing import Callable
+
+from httpx import AsyncClient, ReadTimeout
+from playwright.async_api import async_playwright, TimeoutError
+import ddddocr
+
+from ey_commerce_lib.four_seller.constant.response import ResponseCodeEnum
+from ey_commerce_lib.four_seller.parser.order import parse_order
+from ey_commerce_lib.four_seller.schemas.query.order import FourSellerOrderQueryModel
+from ey_commerce_lib.four_seller.schemas.vo.order import FourSellerOrderVO
+from ey_commerce_lib.model import Page
+from ey_commerce_lib.utils.close import safe_close
+
+logger = logging.getLogger(__name__)
+
+
+class FourSellerClient:
+
+    def __init__(self, user_name: str,
+                 password: str,
+                 user_token: str,
+                 login_success_call_back: Callable,
+                 sem: int = 10):
+        self.user_name = user_name
+        self.password = password
+        self.user_token = user_token
+        # 登录成功回调函数
+        self.login_success_call_back = login_success_call_back
+        # 信号量
+        self.__sem = asyncio.Semaphore(sem)
+        # 自动登录锁
+        self.__login_lock = asyncio.Lock()
+        # 当前登录任务的 future
+        self.__login_in_progress = None
+        # ddddocr实例
+        self.__ocr = ddddocr.DdddOcr()
+        # 异步客户端
+        self.__async_client = AsyncClient(base_url="https://www.4seller.com", cookies={"userToken": user_token},
+                                          headers={
+                                              "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) "
+                                                            "AppleWebKit/537.36 (KHTML, like Gecko) Chrome/137.0.0.0 "
+                                                            "Safari/537.36"
+                                          })
+
+    async def __auto_login_4seller(self) -> str:
+        """
+        自动登录4seller
+        :return: 登录
+        """
+        browser = None
+        context = None
+        page = None
+        try:
+            async with async_playwright() as p:
+                browser = await p.chromium.launch(
+                    headless=True,
+                    args=[
+                        '--start-maximized',
+                        '--disable-blink-features=AutomationControlled',
+                    ]
+                )
+
+                context = await browser.new_context(
+                    user_agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 "
+                               "(KHTML, like Gecko) Chrome/114.0.0.0 Safari/537.36",
+                    viewport={"width": 1920, "height": 1080},
+                    locale='zh-CN',  # 中文环境
+                    timezone_id='Asia/Shanghai',  # 中国时区
+                    geolocation={"longitude": 116.4074, "latitude": 39.9042},  # 北京位置
+                    permissions=["geolocation"]
+                )
+                page = await context.new_page()
+                await page.goto('https://www.4seller.com/login.html')
+                # 等待元素出现
+                await page.locator('.el-input__inner').first.wait_for()
+                input_locators = await page.locator('.el-input__inner').all()
+                username_input_element = input_locators[0]
+                password_input_element = input_locators[1]
+                await username_input_element.fill(self.user_name)
+                await password_input_element.fill(self.password)
+                login_button_element = page.locator('.el-button.sign_up')
+                await login_button_element.click()
+                # 获取验证码图片
+                capcha_code_img_element = page.locator('.el-input__wrapper img')
+                await capcha_code_img_element.wait_for()
+                captcha_code_input_element = page.locator('[autocomplete="new-password"]')
+                login_count = 1
+                # 只能允许一百次登录
+                while login_count <= 100:
+                    # 等图片 src 被赋值
+                    max_attempts = 10
+                    for attempt in range(max_attempts):
+                        src = await capcha_code_img_element.get_attribute("src")
+                        if src and src.strip() != "":
+                            break
+                        await page.wait_for_timeout(500)
+                    else:
+                        raise Exception("获取不到图片验证码")
+                    # 识别验证码
+                    # 如果有前缀 "data:image/xxx;base64,", 需要去掉
+                    if ',' in src:
+                        base64_str = src.split(',')[1]
+
+                    # 解码 base64 为字节流
+                    img_bytes = base64.b64decode(base64_str)
+                    captcha_code = self.__ocr.classification(img_bytes)
+                    # 回填验证码
+                    await captcha_code_input_element.fill(captcha_code)
+                    # 再次点击登录按钮
+                    await login_button_element.click()
+                    try:
+                        await page.wait_for_selector(".el-message.el-message--error", timeout=10000)
+                    except TimeoutError:
+                        # 获取userToken的cookie
+                        cookies = await context.cookies()
+                        for cookie in cookies:
+                            if cookie["name"] == "userToken":
+                                userToken = cookie["value"]
+                                # 返回token
+                                return userToken
+                    # 防止验证码切换过快
+                    await page.wait_for_timeout(2000)
+                    login_count += 1
+        except Exception as e:
+            raise e
+        finally:
+            # 不管成功与否函数都要关闭
+            for close_obj in (page, context, browser):
+                await safe_close(close_obj)
+
+    async def __refresh_user_token(self):
+        """
+        刷新token
+        :return:
+        """
+        # 如果有登录任务正在运行
+        if self.__login_in_progress is not None:
+            # 已有协程在处理登录，我们等待它完成
+            await self.__login_in_progress
+            return
+
+        # 没有登录任务，当前协程负责登录
+        self.__login_in_progress = asyncio.get_event_loop().create_future()
+        # 检测锁，确保只有一个线程在登录
+        async with self.__login_lock:
+            try:
+                user_token = await self.__auto_login_4seller()
+            except Exception as e:
+                # 如果future没有被终结掉手动设置终结future
+                if not self.__login_in_progress.done():
+                    self.__login_in_progress.set_exception(e)
+                logger.error(f'FourSeller自动登录失败 {e}')
+                raise Exception(f'FourSeller登录身份失效, 尝试自动登录失败 {e}')
+            else:
+                # 登录成功后重置token
+                self.user_token = user_token
+                # 清空原cookies
+                self.__async_client.cookies.clear()
+                # 重新设置客户端的cookie
+                self.__async_client.cookies.set('userToken', self.user_token, domain='www.4seller.com', path='/')
+                # 如果future没有被终结掉手动设置终结future,否则会抛出异常影响回调执行
+                if not self.__login_in_progress.done():
+                    self.__login_in_progress.set_result(True)
+                # 回调函数可能会失败，但是不能影响其它协程操作
+                try:
+                    await self.login_success_call_back(user_token)
+                except Exception as e:
+                    logger.error(f'FourSeller登录成功回调函数执行失败 {e}')
+                    pass
+            finally:
+                # 提示登录任务完成
+                self.__login_in_progress = None
+
+    async def __request(self, url, method, retry_count=0, **kwargs):
+        """
+        4seller基本请求
+        :param url: url路径
+        :param method: 请求方法
+        :param kwargs: 请求参数
+        :return:
+        """
+        try:
+            async with self.__sem:
+                response = await self.__async_client.request(method, url, **kwargs)
+        except ReadTimeout:
+            raise Exception(f'FourSeller请求接口超时')
+        except Exception as e:
+            logger.error(f'FourSeller请求接口失败{e}')
+            raise Exception(f'FourSeller请求接口失败{e}')
+        else:
+            try:
+                data = response.json()
+            except Exception as e:
+                logger.error(f'FourSeller请求,json序列化失败{e},原始数据{response.text}')
+                raise Exception(f'FourSeller请求,json序列化失败{e},原始数据{response.text}')
+            else:
+                if data.get('code') == ResponseCodeEnum.LOGIN_VALIDATION_FAILED:
+                    # 刷新token
+                    await self.__refresh_user_token()
+                    if retry_count < 1:
+                        # 最多重试一次
+                        return await self.__request(url, method, 1, **kwargs)
+                    else:
+                        raise Exception(f'FourSeller登录成功后,再次请求登录验证失败, 请求接口{url}，返回信息{data}')
+                return data
+
+    async def __get(self, url, **kwargs):
+        return await self.__request(url, 'GET', **kwargs)
+
+    async def __post(self, url, **kwargs):
+        return await self.__request(url, 'POST', **kwargs)
+
+    async def __put(self, url, **kwargs):
+        return await self.__request(url, 'PUT', **kwargs)
+
+    async def __delete(self, url, **kwargs):
+        return await self.__request(url, 'DELETE', **kwargs)
+
+    async def __order_page_api(self, query_params: FourSellerOrderQueryModel):
+        return await self.__post('/api/v2/order/page', json=query_params.model_dump(by_alias=True))
+
+    async def __order_page_history_api(self, query_params: FourSellerOrderQueryModel):
+        return await self.__post('/api/v2/order/history/page', json=query_params.model_dump(by_alias=True))
+
+    async def order_page(self, query_params: FourSellerOrderQueryModel) -> Page[FourSellerOrderVO]:
+        page_data = await self.__order_page_api(query_params)
+        # 能到这里说明登录验证什么的都没有问题，接口返回代码也是代表成功
+        if page_data.get('code') != ResponseCodeEnum.SUCCESS:
+            raise Exception(f'FourSeller请求接口失败, 请求接口{page_data}')
+        return parse_order(page_data.get('data'))
+
+    async def order_page_history(self, query_params: FourSellerOrderQueryModel) -> Page[FourSellerOrderVO]:
+        page_data = await self.__order_page_history_api(query_params)
+        # 能到这里说明登录验证什么的都没有问题，接口返回代码也是代表成功
+        if page_data.get('code') != ResponseCodeEnum.SUCCESS:
+            raise Exception(f'FourSeller拉取历史分页订单失败, 请求接口{page_data}')
+        return parse_order(page_data.get('data'))
+
+    async def list_order(self, query_params: FourSellerOrderQueryModel) -> list[FourSellerOrderVO]:
+        # 获取分页信息
+        order_list = list()
+        page = await self.order_page(query_params)
+        # 采用并发提高速度
+        page_order_task_list = list()
+        for page_number in range(1, page.total_page + 1):
+            page_order_task_list.append(
+                self.order_page(query_params.copy(update={"page_current": page_number}))
+            )
+        page_list = await asyncio.gather(*page_order_task_list)
+        # 所有的数据
+        for every_page in page_list:
+            # 插入数据
+            order_list.extend(every_page.records)
+        return order_list
+
+    async def list_history_order(self, query_params: FourSellerOrderQueryModel):
+        # 获取分页信息
+        order_history_list = list()
+        page = await self.order_page_history(query_params)
+        # 采用并发提高速度
+        page_order_task_list = list()
+        for page_number in range(1, page.total_page + 1):
+            page_order_task_list.append(self.order_page_history(
+                query_params.copy(update={"page_current": page_number})
+            ))
+        page_list = await asyncio.gather(*page_order_task_list)
+        # 所有的数据
+        for every_page in page_list:
+            # 插入数据
+            order_history_list.extend(every_page.records)
+        return order_history_list
+
+    async def __aenter__(self):
+        return self
+
+    async def __aexit__(self, exc_type, exc_val, exc_tb):
+        await self.__async_client.aclose()

ey_commerce_lib-1.0.7/src/ey_commerce_lib/four_seller/parser/order.py

@@ -0,0 +1,19 @@
+import math
+
+from ey_commerce_lib.four_seller.schemas.vo.order import FourSellerOrderVO
+from ey_commerce_lib.model import Page
+
+
+def parse_order(data: dict) -> Page[FourSellerOrderVO]:
+    # 计算total_page
+    page_size = data.get('pageSize')
+    total = data.get('total')
+    page_number = data.get('pageCurrent')
+    total_page = math.ceil(total / page_size) if total > 0 else 0
+    return Page(
+        records=[FourSellerOrderVO(**record) for record in data.get('records')],
+        total=total,
+        page_size=page_size,
+        page_number=page_number,
+        total_page=total_page
+    )

ey_commerce_lib-1.0.7/src/ey_commerce_lib/four_seller/schemas/query/order.py

@@ -0,0 +1,101 @@
+from pydantic import BaseModel, ConfigDict
+
+from ey_commerce_lib.utils.str import to_camel
+
+
+class FourSellerOrderQueryModel(BaseModel):
+    # 页码
+    page_current: int = 1
+    # 每页条数
+    page_size: int = 100
+    # 平台
+    platform: str = ""
+    # 店铺id列表
+    shop_id_list: list[str] = []
+    # 仓库id 页面未知来源
+    warehouse_id: str = ""
+    # 物流id 例如: 13554
+    logistics_service_id: str = ""
+    # 物流服务id映射关系父子id,id连接起来 例如: ["470", "13554"]
+    logistics_service_map: list[str] = []
+    # 单品单数: onlyOne 全部包裹类型: "" 单品多数: gtOne 多品: multiple
+    item_type: str = ""
+    """
+    打印状态  全部: "" 面单已打印: labelPrinted   面单未打印: labelUnPrinted  装箱已打印: packingPrinted   装箱未打印: packingUnPrinted 
+    拣货单已打印: pickPrinted  拣货单未打印: pickUnPrinted    
+    """
+    print_status: str = ""
+    # 买家指定
+    shipping_method: list[str] = []
+    # 搜索类型  订单号: orderNo   物流跟踪号: trackNo  其余请参考页面
+    search_type: str = "orderNo"
+    # 搜索方式  模糊: like  精确: exact
+    search_method: str = "exact"
+    # 搜索内容
+    search_value: str = ""
+    # 商品总数最小
+    item_min: str = ""
+    # 商品总数最大
+    item_max: str = ""
+    # 重量最小
+    weight_min: str = ""
+    # 重量最大
+    weight_max: str = ""
+    # 重量单位 lb oz kg g
+    weight_unit: str = "lb"
+    # 到期时间 如果是数字就是小时  如果为空字符串是全部
+    expires_hour: str | int = ""
+    hours: str = ""
+    # 平台状态 待发货: Awaiting_Shipment  待揽收: Awaiting_Collection 其它参考页面
+    platform_status: str = ""
+    # 发货地址id   如果为空字符串就是没有选择
+    ship_from_address_id: str | int = ""
+    # 国家编码 具体参考筛选页面
+    country_code: str = ""
+    # 国家名称 具体参考筛选页面
+    country_name: str = ""
+    # 省份或者洲
+    state: str = ""
+    # 买家备注 空字符串未选 有:1 无: 0
+    buyer_note: str | int = ""
+    # 卖家备注 空字符串未选 有:1 无: 0
+    seller_note: str = ""
+    # 系统备注: 空字符串未选 有:1 无: 0
+    internal_note: str = ""
+    # 平台标记 PRE_SALE: Temu预售
+    platform_marker: str = ""
+    # 下单时间 这个时间比上海时间要晚7个小时
+    date_query_create_start_time: str = ""
+    date_query_create_end_time: str = ""
+    # 付款时间
+    date_query_paid_start_time: str = ""
+    date_query_paid_end_time: str = ""
+    # 发货时间
+    date_query_ship_start_time: str = ""
+    date_query_ship_end_time: str = ""
+    # 打印面单时间
+    date_query_print_label_start_time: str = ""
+    date_query_print_label_end_time: str = ""
+    # 取消订单时间
+    date_query_cancel_start_time: str = ""
+    date_query_cancel_end_time: str = ""
+    # 标签页 具体参考筛选页面
+    tag_id_list: list[str] = []
+    # 订单状态 全部: 空字符串  未付款: un_paid 已发货: shipped  待处理: to_ship  风控中: on_hold  处理中: in_process 已签收: delivered 参考页面
+    all_order_status: str = ""
+    # 订单状态: 全部: all 已发货: shipped
+    order_status: str = "all"
+    # 排序字段
+    order_by: str = "orderPaidTime"
+    # 排序方式 asc: 升序 desc: 降序
+    desc: str = "asc"
+
+    country: str = ""
+    note_query: str = ""
+    tag_query: str = ""
+    exception_type: str = ""
+
+    model_config = ConfigDict(
+        alias_generator=to_camel,
+        populate_by_name=True
+    )