ey-commerce-lib 1.0.17__tar.gz → 1.0.18__tar.gz

{ey_commerce_lib-1.0.17 → ey_commerce_lib-1.0.18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ey-commerce-lib
-Version: 1.0.17
+Version: 1.0.18
 Summary: eeyoung电商客户端调用封装
 Author-email: 饶奇奇 <1124393197@qq.com>
 Requires-Python: >=3.10

{ey_commerce_lib-1.0.17 → ey_commerce_lib-1.0.18}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "ey-commerce-lib"
-version = "1.0.17"
+version = "1.0.18"
 description = "eeyoung电商客户端调用封装"
 readme = "README.md"
 authors = [

{ey_commerce_lib-1.0.17 → ey_commerce_lib-1.0.18}/src/ey_commerce_lib/dxm/main.py

@@ -6,17 +6,19 @@ from httpx import AsyncClient, Timeout
 from playwright.async_api import async_playwright
 
 from ey_commerce_lib.dxm.constant.order import DxmOrderRuleType
-from ey_commerce_lib.dxm.parser.common import get_page_info, get_purchase_pagination_info
+from ey_commerce_lib.dxm.parser.common import get_page_info, get_purchase_pagination_info, get_tracking_page_info
 from ey_commerce_lib.dxm.parser.count import parse_count
 from ey_commerce_lib.dxm.parser.order import list_order_base_by_html, list_order_rule, get_rule_detail, \
     get_order_detail_by_html
 from ey_commerce_lib.dxm.parser.purchase import list_purchasing_all, list_1688_purchase_order_number, \
     list_wait_pay_page_purchase_order_number
+from ey_commerce_lib.dxm.parser.tracking import parse_tracking_page
 from ey_commerce_lib.dxm.parser.warehouse import list_warehouse_product
 from ey_commerce_lib.dxm.schemas.common import Page
 from ey_commerce_lib.dxm.schemas.dxm_commodity_product import ViewDxmCommodityProductResponse
 from ey_commerce_lib.dxm.schemas.ebay_product import DxmEbayProductModel
 from ey_commerce_lib.dxm.schemas.order import DxmOrderSearchForm, DxmJsonResponse, DxmCheckProcessResponse, DxmOrderRule
+from ey_commerce_lib.dxm.schemas.tracking import TrackingPageListQuery, TrackingPageListItem
 from ey_commerce_lib.dxm.schemas.warehouse import WarehouseProduct, WarehouseProductQuery, PurchasingAllQuery
 
 
@@ -710,10 +712,12 @@ class DxmClient:
         try:
             async with async_playwright() as p:
                 browser = await p.chromium.launch(
-                    headless=False,
+                    headless=True,
                     args=[
                         '--start-maximized',
                         '--disable-blink-features=AutomationControlled',
+                        '--no-sandbox',
+                        '--disable-dev-shm-usage'
                     ]
                 )
                 context = await browser.new_context()
@@ -729,21 +733,94 @@ class DxmClient:
                 ])
                 page = await context.new_page()
                 # 访问
-                await page.goto(f'{self.__base_url}/dxmCommodityProduct/openEditModal.htm?id={proid}&editOrCopy=0')
+                await page.goto(f'{self.__base_url}/dxmCommodityProduct/openEditModal.htm?id={proid}&editOrCopy=0',
+                                timeout=60000)
                 # 关闭模态框
-                await page.locator('#theNewestModalLabel > div.modal-dialog > div > div.modal-header > button').click()
+                try:
+                    await page.locator(
+                        '#theNewestModalLabel > div.modal-dialog > div > div.modal-header > button').click()
+                except:
+                    pass
                 # 输入sku
                 await page.locator('input.variationValue.ui-autocomplete-input').fill(front_sku)
                 # 失去焦点
                 await page.locator('input.variationValue.ui-autocomplete-input').press('Tab')
-                # 休眠两秒
-                await asyncio.sleep(2)
-                # 点击保存
-                await page.locator('.button.btn-orange.m-left10').first.click()
-                # 获取保存成功文本
-                await page.wait_for_selector('.alert-successGreen')
+                try:
+                    # 休眠两秒
+                    error_text = await page.text_content(selector='div.alert-dangerRed span', timeout=2000)
+                    return {
+                        'code': 500,
+                        'msg': error_text
+                    }
+                except Exception as e:
+                    # 创建监听任务
+                    async def wait_for_api1():
+                        async with page.expect_response(
+                                f"{self.__base_url}/dxmCommodityProduct/editCommodityProduct.json") as response_info:
+                            pass
+                        return await response_info.value
+
+                    async def wait_for_api2():
+                        async with page.expect_response(
+                                f"{self.__base_url}/dxmCommodityProduct/editCommodityProductGroup.json") as response_info:
+                            pass
+                        return await response_info.value
+
+                    # 创建并发任务
+                    task1 = asyncio.create_task(wait_for_api1())
+                    task2 = asyncio.create_task(wait_for_api2())
+                    # 点击保存按钮
+                    await page.locator('.button.btn-orange.m-left10').first.click()
+                    # 等待任何一个请求完成
+                    done, pending = await asyncio.wait(
+                        [task1, task2],
+                        return_when=asyncio.FIRST_COMPLETED
+                    )
+                    # 取消其他未完成的任务
+                    for task in pending:
+                        task.cancel()
+                    # 获取完成的请求结果
+                    completed_task = list(done)[0]
+                    response = await completed_task
+                    return await response.json()
         except Exception as e:
-            raise Exception(f'更新店小秘 仓库-商品详情中的平台sku失败-失败原因:{traceback.format_exc()}')
+            return {
+                'code': 500,
+                'msg': traceback.format_exc()
+            }
+
+    async def tracking_page_list(self, query: TrackingPageListQuery) -> Page[TrackingPageListItem]:
+        """
+        分页查询物流追踪页表
+        :param query:
+        :return:
+        """
+        async with self.__sem:
+            tracking_page_list_response = await self.__async_client.post('/tracking/pageList.htm',
+                                                                         data=query.model_dump(by_alias=True))
+            tracking_page_list_html = tracking_page_list_response.text
+            page = get_tracking_page_info(tracking_page_list_html)
+            page.records = parse_tracking_page(tracking_page_list_html)
+            return page
+
+    async def tracking_list(self, query: TrackingPageListQuery) -> list[TrackingPageListItem]:
+        async with self.__sem:
+            query.page_no = '1'
+            tracking_page_list_response = await self.__async_client.post('/tracking/pageList.htm',
+                                                                         data=query.model_dump(by_alias=True))
+            tracking_page_list_html = tracking_page_list_response.text
+            # 获取分页数据
+            page = get_tracking_page_info(tracking_page_list_html)
+            # 获取总页数
+            total_page = page.total_page
+            # 最终记录
+            result = parse_tracking_page(tracking_page_list_html)
+            for page_num in range(2, total_page + 1):
+                query.page_no = str(page_num)
+                # 获取分页数据
+                page_data = await self.tracking_page_list(query)
+                result.extend(page_data.records)
+            return result
 
     async def __aenter__(self):
         return self

{ey_commerce_lib-1.0.17 → ey_commerce_lib-1.0.18}/src/ey_commerce_lib/dxm/parser/common.py

@@ -4,6 +4,7 @@ from typing import TypedDict
 from lxml import html
 
 from ey_commerce_lib.dxm.exception.common import PageInfoNotFoundException
+from ey_commerce_lib.model import Page
 
 
 class PageInfo(TypedDict):
@@ -92,3 +93,19 @@ def get_purchasing_page_info(html_str: str):
         'total_size': total_size,
         'page_number': page_number
     }
+
+
+def get_tracking_page_info(html_str: str):
+    tree = html.fromstring(html_str)
+    total = int(tree.xpath('//input[@id="totalSizeOrder"]/@value')[0])
+    page_size = int(tree.xpath('//input[@id="pageSizeOrder"]/@value')[0])
+    page_number = int(tree.xpath('//input[@id="pageNoOrder"]/@value')[0])
+    total_page = int(tree.xpath('//input[@id="totalPageOrder"]/@value')[0])
+    return Page(
+        total=total,
+        page_size=page_size,
+        page_number=page_number,
+        total_page=total_page,
+        records=[]
+    )
+

ey_commerce_lib-1.0.18/src/ey_commerce_lib/dxm/parser/tracking.py

@@ -0,0 +1,56 @@
+from lxml import html
+
+from ey_commerce_lib.dxm.schemas.tracking import TrackingPageListItem
+from ey_commerce_lib.utils.list_util import get_str_list_first_not_blank_or_none
+
+
+def parse_tracking_page(html_content: str):
+    tree = html.fromstring(html_content)
+    # 物流追踪节点列表
+    tracking_element_list = tree.xpath('//tbody[@id="dhSysMsg"]/tr[@class="content"]')
+    tracking_list = []
+    for tracking_element in tracking_element_list:
+        # 获取包裹号
+        package_number = tracking_element.xpath('@data-tracknum')[0].strip()
+        # 获取订单id
+        order_id = tracking_element.xpath('@data-orderid')[0].strip()
+        # 获取收件人姓名
+        receiver_name = tracking_element.xpath('./td[3]/text()')[0].strip()
+        # 获取国家
+        country = get_str_list_first_not_blank_or_none(tracking_element.xpath('./td[3]/span/text()'))
+        # 获取物流方式
+        logistics_method = tracking_element.xpath('./td[4]/text()')[0].strip()
+        # 物流状态
+        logistics_status = tracking_element.xpath('./td[4]/span/@title')[0].replace('「', '').replace('」', '')
+        # 物流单号
+        logistics_number = tracking_element.xpath('./td[4]//span[@class="limingcentUrlpic"]/text()')[0].strip()
+        # carrierCode
+        carrier_code = get_str_list_first_not_blank_or_none(tracking_element.xpath('./td[5]/a/@data-carriercode'))
+        # 最新消息
+        latest_message = get_str_list_first_not_blank_or_none(tracking_element.xpath('./td[5]/text()'))
+        # 运输信息
+        transport_info = tracking_element.xpath('./td[6]/text()')[0].strip()
+        # 平台和店铺
+        platform, shop = tracking_element.xpath('./td[7]')[0].text_content().split('：')
+        time_list = []
+        # 获取时间
+        for time in tracking_element.xpath('./td[8]')[0].text_content().strip().split('\n'):
+            time_list.append(time.strip())
+        platform = platform.strip()
+        shop = shop.strip()
+        tracking_list.append(TrackingPageListItem(
+            package_number=package_number,
+            order_id=order_id,
+            receiver_name=receiver_name,
+            country=country,
+            logistics_method=logistics_method,
+            logistics_status=logistics_status,
+            logistics_number=logistics_number,
+            latest_message=latest_message,
+            transport_info=transport_info,
+            platform=platform,
+            shop=shop,
+            time_list=time_list,
+            carrier_code=carrier_code
+        ))
+    return tracking_list

ey_commerce_lib-1.0.18/src/ey_commerce_lib/dxm/schemas/tracking.py

@@ -0,0 +1,45 @@
+from typing import Optional
+
+from pydantic import BaseModel, Field, ConfigDict
+
+
+class TrackingPageListQuery(BaseModel):
+    page_no: str = Field('1', alias='pageNo', description='页码')
+    state_type: str = Field('all', alias='stateType', description='状态类型，默认 all(全部)')
+    platform: str = Field('', alias='platform', description='平台渠道')
+    shop_id: str = Field('-1', alias="shopId", description='店铺 ID')
+    country: str = Field('', alias="country", description="国家")
+    auth_id: str = Field('-1', alias="authId", description="物流方式")
+    ship_start_time: str = Field('', alias="shipStartTime", description="发货开始时间")
+    ship_end_time: str = Field('', alias="shipEndTime", description="发货结束时间")
+    track_start_time: str = Field('-1', alias='trackStartTime', description='运输天数')
+    track_end_time: str = Field('-1', alias='trackEndTime', description='运输天数')
+    is_comm: str = Field('', alias='isComm', description='备注')
+    order_field: str = Field('shipped_time', alias='orderField', description='排序方式')
+    is_desc: str = Field('1', alias='isDesc', description='排序方式')
+    search_type: str = Field('orderId', alias='searchType', description='搜索类型 orderId(订单id)')
+    search_value: str = Field('', alias="searchValue", description="搜索关键字")
+    is_del: str = Field('0', alias="isDel", description="是否删除，0 否 1 是")
+    history: str = Field('', alias="history", description="历史记录标志")
+    is_stop: str = Field('0', alias='isStop', description='是否暂停，0 正常追踪 1 暂停追踪')
+    no_update_days: str = Field('0', alias="noUpdateDays", description="异常类型 无更新天数")
+
+    model_config = ConfigDict(populate_by_name=True)
+
+
+class TrackingPageListItem(BaseModel):
+    package_number: str = Field(..., alias='packageNumber', description='包裹号')
+    order_id: str = Field(..., alias='orderId', description='订单号')
+    receiver_name: str = Field(..., alias='receiverName', description='收件人姓名')
+    country: Optional[str] = Field(..., alias='country', description='国家')
+    logistics_method: str = Field(..., alias='logisticsMethod', description='物流方式')
+    logistics_status: str = Field(..., alias='logisticsStatus', description='物流状态')
+    logistics_number: str = Field(..., alias='logisticsNumber', description='物流单号')
+    carrier_code: Optional[str] = Field(..., alias='carrierCode', description='物流公司编码')
+    latest_message: Optional[str] = Field(..., alias='latestMessage', description='最新物流信息')
+    transport_info: str = Field(..., alias='transportInfo', description='运输信息')
+    platform: str = Field(..., alias='platform', description='平台渠道')
+    shop: str = Field(..., alias='shop', description='店铺')
+    time_list: list[str] = Field([], alias='timeList', description='时间列表')
+
+    model_config = ConfigDict(populate_by_name=True)

ey_commerce_lib-1.0.18/tests/dxm/test_purchase.py

@@ -0,0 +1,66 @@
+import json
+
+import pytest
+
+from ey_commerce_lib.dxm.constant.order import ORDER_SEARCH_APPROVAL_BASE_FORM, \
+    ORDER_SEARCH_PENDING_PROCESSING_BASE_FORM, ORDER_SEARCH_SELF_WAREHOUSE_BASE_FORM, \
+    ORDER_SEARCH_OUT_OF_STOCK_BASE_FORM, ORDER_SEARCH_HAVE_GOODS_BASE_FORM
+from ey_commerce_lib.dxm.main import DxmClient
+from ey_commerce_lib.dxm.schemas.tracking import TrackingPageListQuery
+from ey_commerce_lib.dxm.schemas.warehouse import WarehouseProductQuery
+from ey_commerce_lib.dxm.utils.mark import get_custom_mark_content_list_by_data_custom_mark, \
+    generate_add_or_update_user_comment_data_by_content_list
+from ey_commerce_lib.four_seller.main import FourSellerClient
+from ey_commerce_lib.four_seller.schemas.query.order import FourSellerOrderQueryModel
+from ey_commerce_lib.takesend.main import TakeSendClient
+import ey_commerce_lib.dxm.utils.dxm_commodity_product as dxm_commodity_product_util
+
+
+async def login_success(user_token: str):
+    print(f'user_token: {user_token}')
+    pass
+
+
+@pytest.mark.asyncio
+async def test_auto_login_4seller():
+    # user_token = await auto_login_4seller(user_name="sky@eeyoung.com", password="ey010203@@")
+    # print(user_token)
+    async with FourSellerClient(
+            user_name="xxxxx",
+            password="xxxxxx",
+            login_success_call_back=login_success,
+            user_token="xxxxxx") as four_seller_client:
+        await four_seller_client.list_history_order(FourSellerOrderQueryModel())
+
+
+cookies = {
+
+}
+
+headers = {
+
+}
+
+
+@pytest.mark.asyncio
+async def test_dxm_api():
+    async with (DxmClient(headers=headers, cookies=cookies) as dxm_client):
+        # data = await dxm_client.list_order_detail_async(query=ORDER_SEARCH_HAVE_GOODS_BASE_FORM)
+        # for order in data:
+        #     for pair_info in order.get('detail').get('pair_info_list'):
+        #         print(pair_info.get('proid'))
+        # data = await dxm_client.update_dxm_commodity_front_sku('17773195771232287', 'fuck112')
+        data = await dxm_client.tracking_list(TrackingPageListQuery())
+        print(len(data))
+
+
+@pytest.mark.asyncio
+async def test_warehouse():
+    async with (DxmClient(headers=headers, cookies=cookies) as dxm_client):
+        print(await dxm_client.page_warehouse_product(WarehouseProductQuery()))
+
+
+@pytest.mark.asyncio
+async def test_tasksend_api():
+    async with (TakeSendClient(username="", password="") as tasksend_client):
+        await tasksend_client.login()

ey_commerce_lib-1.0.17/tests/dxm/test_purchase.py

@@ -1,91 +0,0 @@
-import json
-
-import pytest
-
-from ey_commerce_lib.dxm.constant.order import ORDER_SEARCH_APPROVAL_BASE_FORM, \
-    ORDER_SEARCH_PENDING_PROCESSING_BASE_FORM, ORDER_SEARCH_SELF_WAREHOUSE_BASE_FORM, \
-    ORDER_SEARCH_OUT_OF_STOCK_BASE_FORM, ORDER_SEARCH_HAVE_GOODS_BASE_FORM
-from ey_commerce_lib.dxm.main import DxmClient
-from ey_commerce_lib.dxm.schemas.warehouse import WarehouseProductQuery
-from ey_commerce_lib.dxm.utils.mark import get_custom_mark_content_list_by_data_custom_mark, \
-    generate_add_or_update_user_comment_data_by_content_list
-from ey_commerce_lib.four_seller.main import FourSellerClient
-from ey_commerce_lib.four_seller.schemas.query.order import FourSellerOrderQueryModel
-from ey_commerce_lib.takesend.main import TakeSendClient
-import ey_commerce_lib.dxm.utils.dxm_commodity_product as dxm_commodity_product_util
-
-
-async def login_success(user_token: str):
-    print(f'user_token: {user_token}')
-    pass
-
-
-@pytest.mark.asyncio
-async def test_auto_login_4seller():
-    # user_token = await auto_login_4seller(user_name="sky@eeyoung.com", password="ey010203@@")
-    # print(user_token)
-    async with FourSellerClient(
-            user_name="xxxxx",
-            password="xxxxxx",
-            login_success_call_back=login_success,
-            user_token="xxxxxx") as four_seller_client:
-        await four_seller_client.list_history_order(FourSellerOrderQueryModel())
-
-
-cookies = {
-    'dxm_i': 'MTAyNzg5NiFhVDB4TURJM09EazIhZjc5ZTMxMjZmN2Q3NTk5OGZlMDg4YjQzNzNlNzlmOWY',
-    'dxm_t': 'MTcxNDk2NDU4MiFkRDB4TnpFME9UWTBOVGd5IWIzZWRjYTc3YTdjYWE0MmIxMWYwNjFhOTlmMDgxZjY5',
-    'dxm_c': 'TWVOMVpiclYhWXoxTlpVNHhXbUp5VmchNmM5MmM5ODc1MDBkODVjOWJmOTFlMzdhNGJiNWI3Njk',
-    'dxm_w': 'ZDc3NWVhOTdkOTEyNGE4ZmRkODBmYzc2YmFlOGVjZjEhZHoxa056YzFaV0U1TjJRNU1USTBZVGhtWkdRNE1HWmpOelppWVdVNFpXTm1NUSFmZWZiZGZiMTEwMzhlN2M4M2MzYjZmYjAxYTcxMjViMw',
-    'dxm_s': 'aMHO7LWKAQe6NzFrV3O4cceXkBriLGNmwondOR7INWs',
-    'MYJ_MKTG_fapsc5t4tc': 'JTdCJTdE',
-    'MYJ_fapsc5t4tc': 'JTdCJTIyZGV2aWNlSWQlMjIlM0ElMjJkMGRlYzNkYi00MTNlLTQyZjktOWIxNC0xYzBhZTY4MTk4ZmIlMjIlMkMlMjJ1c2VySWQlMjIlM0ElMjIxMDI3ODk2JTIyJTJDJTIycGFyZW50SWQlMjIlM0ElMjIyNTg2MzQlMjIlMkMlMjJzZXNzaW9uSWQlMjIlM0ExNzMxMDU5MDc1MjU0JTJDJTIyb3B0T3V0JTIyJTNBZmFsc2UlMkMlMjJsYXN0RXZlbnRUaW1lJTIyJTNBMTczMTA1OTA3NTQyNCUyQyUyMmxhc3RFdmVudElkJTIyJTNBMTE2JTdE',
-    'MYJ_fapsc5t4tc': 'JTdCJTIyZGV2aWNlSWQlMjIlM0ElMjJkMGRlYzNkYi00MTNlLTQyZjktOWIxNC0xYzBhZTY4MTk4ZmIlMjIlMkMlMjJ1c2VySWQlMjIlM0ElMjIxMDI3ODk2JTIyJTJDJTIycGFyZW50SWQlMjIlM0ElMjIyNTg2MzQlMjIlMkMlMjJzZXNzaW9uSWQlMjIlM0ExNzMxMDU5MDc1MTEwJTJDJTIyb3B0T3V0JTIyJTNBZmFsc2UlMkMlMjJsYXN0RXZlbnRUaW1lJTIyJTNBMTczMTA1OTA3NTk5NiUyQyUyMmxhc3RFdmVudElkJTIyJTNBMTE2JTdE',
-    '_dxm_ad_client_id': '7AEFA0B78CE1B35075D391C5226612CED',
-    'Hm_lvt_f8001a3f3d9bf5923f780580eb550c0b': '1731459796,1731547149,1731590878,1731893161',
-    'HMACCOUNT': 'F266E8F609D8D8B1',
-    'MYJ_fapsc5t4tc': 'JTdCJTIyZGV2aWNlSWQlMjIlM0ElMjJkMGRlYzNkYi00MTNlLTQyZjktOWIxNC0xYzBhZTY4MTk4ZmIlMjIlMkMlMjJ1c2VySWQlMjIlM0ElMjIxMDI3ODk2JTIyJTJDJTIycGFyZW50SWQlMjIlM0ElMjIyNTg2MzQlMjIlMkMlMjJzZXNzaW9uSWQlMjIlM0ExNzMxOTAxNDMzMTk3JTJDJTIyb3B0T3V0JTIyJTNBZmFsc2UlMkMlMjJsYXN0RXZlbnRJZCUyMiUzQTExNiU3RA==',
-    'Hm_lpvt_f8001a3f3d9bf5923f780580eb550c0b': '1731901433',
-    'JSESSIONID': 'CD9C8372185D453012E5EEFBA64E2C9C',
-}
-
-headers = {
-    'accept': 'text/html, */*; q=0.01',
-    'accept-language': 'zh-CN,zh;q=0.9',
-    'cache-control': 'no-cache',
-    'content-type': 'application/x-www-form-urlencoded; charset=UTF-8',
-    'origin': 'https://www.dianxiaomi.com',
-    'pragma': 'no-cache',
-    'priority': 'u=1, i',
-    'referer': 'https://www.dianxiaomi.com/sys/index.htm?go=m420',
-    'sec-ch-ua': '"Google Chrome";v="131", "Chromium";v="131", "Not_A Brand";v="24"',
-    'sec-ch-ua-mobile': '?0',
-    'sec-ch-ua-platform': '"Windows"',
-    'sec-fetch-dest': 'empty',
-    'sec-fetch-mode': 'cors',
-    'sec-fetch-site': 'same-origin',
-    'user-agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36',
-    'x-requested-with': 'XMLHttpRequest',
-}
-
-
-@pytest.mark.asyncio
-async def test_dxm_api():
-    async with (DxmClient(headers=headers, cookies=cookies) as dxm_client):
-        # data = await dxm_client.list_order_detail_async(query=ORDER_SEARCH_HAVE_GOODS_BASE_FORM)
-        # for order in data:
-        #     for pair_info in order.get('detail').get('pair_info_list'):
-        #         print(pair_info.get('proid'))
-        data = await dxm_client.update_dxm_commodity_front_sku('17773195771232287', 'fuck112')
-
-
-@pytest.mark.asyncio
-async def test_warehouse():
-    async with (DxmClient(headers=headers, cookies=cookies) as dxm_client):
-        print(await dxm_client.page_warehouse_product(WarehouseProductQuery()))
-
-
-@pytest.mark.asyncio
-async def test_tasksend_api():
-    async with (TakeSendClient(username="", password="") as tasksend_client):
-        await tasksend_client.login()