ey-commerce-lib 1.0.11__tar.gz → 1.0.12__tar.gz

{ey_commerce_lib-1.0.11 → ey_commerce_lib-1.0.12}/PKG-INFO

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

{ey_commerce_lib-1.0.11 → ey_commerce_lib-1.0.12}/pyproject.toml

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

{ey_commerce_lib-1.0.11 → ey_commerce_lib-1.0.12}/src/ey_commerce_lib/dxm/main.py

@@ -1,5 +1,7 @@
 import asyncio
 
+from httpx import AsyncClient, Timeout
+
 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.order import list_order_base_by_html, list_order_rule, get_rule_detail, \
@@ -10,7 +12,6 @@ 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.order import DxmOrderSearchForm, DxmJsonResponse, DxmCheckProcessResponse, DxmOrderRule
 from ey_commerce_lib.dxm.schemas.warehouse import WarehouseProduct, WarehouseProductQuery, PurchasingAllQuery
-from httpx import AsyncClient, Timeout
 
 
 class DxmClient:

{ey_commerce_lib-1.0.11 → ey_commerce_lib-1.0.12}/src/ey_commerce_lib/dxm/parser/common.py

@@ -1,9 +1,10 @@
 import re
 from typing import TypedDict
 
-from ey_commerce_lib.dxm.exception.common import PageInfoNotFoundException
 from lxml import html
 
+from ey_commerce_lib.dxm.exception.common import PageInfoNotFoundException
+
 
 class PageInfo(TypedDict):
     page_size: int

{ey_commerce_lib-1.0.11 → ey_commerce_lib-1.0.12}/src/ey_commerce_lib/dxm/parser/order.py

@@ -1,9 +1,10 @@
 import re
 
+from lxml import html
+
 from ey_commerce_lib.dxm.schemas.order import DxmOrderRule, DxmOrderRuleCond, DxmOrderReviewRule, DxmOrderLogisticsRule
 from ey_commerce_lib.utils.dxm import get_remaining_ship_time, get_data_custom_mark_to_str
 from ey_commerce_lib.utils.list_util import get_str_list_first_not_blank_or_none
-from lxml import html
 
 
 def get_single_order_item_list(order_element: html.HtmlElement):
@@ -230,11 +231,11 @@ def get_rule_detail(html_str: str) -> DxmOrderRule:
     cond_list = list()
     # 获取规则的条件
     for cond_element in cond_element_list:
-        cond_val = cond_element.xpath('./input[@name="condVal"]/@value')[0]
-        cond_id = cond_element.xpath('./input[@name="condId"]/@value')[0]
-        cond_name = cond_element.xpath('./input[@name="condName"]/@value')[0]
-        cond_unit = cond_element.xpath('./input[@name="condUnit"]/@value')[0]
-        cond_type = cond_element.xpath('./input[@name="condType"]/@value')[0]
+        cond_val = cond_element.xpath('.//input[@name="condVal"]/@value')[0]
+        cond_id = cond_element.xpath('.//input[@name="condId"]/@value')[0]
+        cond_name = cond_element.xpath('.//input[@name="condName"]/@value')[0]
+        cond_unit = cond_element.xpath('.//input[@name="condUnit"]/@value')[0]
+        cond_type = cond_element.xpath('.//input[@name="condType"]/@value')[0]
         cond_list.append(DxmOrderRuleCond(cond_val=cond_val,
                                           cond_id=cond_id,
                                           cond_name=cond_name,
@@ -245,10 +246,11 @@ def get_rule_detail(html_str: str) -> DxmOrderRule:
     rule_id = tree.xpath('//input[@name="id"]/@value')[0]
     rule_type = tree.xpath('//input[@name="type"]/@value')[0]
     rule_name = tree.xpath('//input[@id="ruleName"]/@value')[0]
+    gift_doubly = tree.xpath('//input[@id="giftDoubly"]/@value')[0]
 
-    kfbz = get_str_list_first_not_blank_or_none(tree.xpath('//textarea[@name="kfbz"]/text()'))
-    jhbz = get_str_list_first_not_blank_or_none(tree.xpath('//textarea[@name="jhbz"]/@value'))
-    jh_color = tree.xpath('//a[contains(@class, "bgCommentFocus")]/@data-val')[0]
+    kfbz = get_str_list_first_not_blank_or_none(tree.xpath('//textarea[@name="kfbz"]/text()')) or ''
+    jhbz = get_str_list_first_not_blank_or_none(tree.xpath('//textarea[@name="jhbz"]/text()')) or ''
+    jh_color = tree.xpath('//input[@id="jhColor"]/@value')[0]
     other_action_checked_list = tree.xpath('//input[@name="otherAction"]/@checked')
     other_action = 'on' if len(other_action_checked_list) > 0 else ''
     custom_mark = tree.xpath('//div[contains(@class, "customMarkRuleEl")]/@data-custom-mark')[0]
@@ -267,9 +269,9 @@ def get_rule_detail(html_str: str) -> DxmOrderRule:
         auth_ids = tree.xpath('//input[@name="authIds"]/@value')[0]
         pattern = re.compile(r"if\s*\(\s*'(\d+)'\s*===\s*item\.idStr")
         auth_id = pattern.findall(html_str)[0]
-
         # 物流规则
-        dxm_rule_order = DxmOrderLogisticsRule(dxm_cond_list=cond_list, id=rule_id, type=rule_type,
+        dxm_rule_order = DxmOrderLogisticsRule(gift_doubly=gift_doubly, dxm_cond_list=cond_list, id=rule_id,
+                                               type=rule_type,
                                                rule_name=rule_name, kfbz=kfbz, jhbz=jhbz,
                                                jh_color=jh_color, other_action=other_action,
                                                custom_mark=get_data_custom_mark_to_str(custom_mark),
@@ -278,7 +280,8 @@ def get_rule_detail(html_str: str) -> DxmOrderRule:
                                                )
     else:
         action = tree.xpath('//input[@name="action"]/@value')[0]
-        dxm_rule_order = DxmOrderReviewRule(dxm_cond_list=cond_list, id=rule_id, type=rule_type,
+        dxm_rule_order = DxmOrderReviewRule(gift_doubly=gift_doubly, dxm_cond_list=cond_list, id=rule_id,
+                                            type=rule_type,
                                             rule_name=rule_name, kfbz=kfbz, jhbz=jhbz,
                                             jh_color=jh_color, other_action=other_action,
                                             custom_mark=get_data_custom_mark_to_str(custom_mark),

{ey_commerce_lib-1.0.11 → ey_commerce_lib-1.0.12}/src/ey_commerce_lib/dxm/parser/purchase.py

@@ -1,4 +1,3 @@
-import lxml.html
 from lxml import html
 
 from ey_commerce_lib.utils.list_util import get_str_list_first_not_blank_or_none

{ey_commerce_lib-1.0.11 → ey_commerce_lib-1.0.12}/src/ey_commerce_lib/dxm/parser/warehouse.py

@@ -1,8 +1,10 @@
-from ey_commerce_lib.dxm.schemas.warehouse import WarehouseProduct
 from lxml import html
 
+from ey_commerce_lib.dxm.schemas.warehouse import WarehouseProduct
+
 
 def __get_warehouse_product_by_xpath_element(warehouse_product_element: html.HtmlElement) -> WarehouseProduct:
+    proid = warehouse_product_element.xpath('.//input[@iptid="selectSingle"]/@data-proid')[0].strip()
     sku = warehouse_product_element.xpath('.//span[contains(@class, "productSku")]/text()')[0].strip()
     name_list = warehouse_product_element.xpath('.//p[contains(@class, "name")]/text()')
     name = name_list[0].strip() if len(name_list) > 0 else ''
@@ -49,7 +51,7 @@ def __get_warehouse_product_by_xpath_element(warehouse_product_element: html.Htm
     update_time = warehouse_product_element.xpath('./td[7]/div[1]/text()')[0]
     # 创建时间
     create_time = warehouse_product_element.xpath('./td[7]/div[2]/text()')[0]
-    return WarehouseProduct(sku=sku, name=name, sku_code=sku_code, img=img, shelf_position=shelf_position,
+    return WarehouseProduct(proid=proid, sku=sku, name=name, sku_code=sku_code, img=img, shelf_position=shelf_position,
                             safe_stock=safe_stock, on_the_way_stock=on_the_way_stock,
                             not_shipped_stock=not_shipped_stock, occupy_stock=occupy_stock,
                             available_stock=available_stock, total_stock=total_stock, price=price,

{ey_commerce_lib-1.0.11 → ey_commerce_lib-1.0.12}/src/ey_commerce_lib/dxm/schemas/order.py

@@ -1,9 +1,10 @@
 from typing import TypedDict, Optional
 from urllib.parse import urlencode
 
-from ey_commerce_lib.utils.str import to_camel
 from pydantic import BaseModel, ConfigDict
 
+from ey_commerce_lib.utils.str import to_camel
+
 
 class DxmOrderSearchForm(BaseModel):
     """
@@ -176,6 +177,7 @@ class DxmOrderRule(BaseModel):
     """
     店小秘订单规则参数基类
     """
+    gift_doubly: str
     # 规则id
     id: str
     # 规则类型(1:审单规则，2:物流规则)
@@ -200,6 +202,7 @@ class DxmOrderRule(BaseModel):
         data = list()
         data.append(('id', self.id))
         data.append(('type', self.type))
+        data.append(('giftDoubly', self.gift_doubly))
         data.append(('ruleName', self.rule_name))
         # 装填规则内容
         for cond in self.dxm_cond_list:

{ey_commerce_lib-1.0.11 → ey_commerce_lib-1.0.12}/src/ey_commerce_lib/dxm/schemas/warehouse.py

@@ -1,8 +1,9 @@
 from typing import Optional
 
-from ey_commerce_lib.utils.str import to_camel
 from pydantic import BaseModel, ConfigDict
 
+from ey_commerce_lib.utils.str import to_camel
+
 
 class WarehouseProductQuery(BaseModel):
     refresh_flag: str = ''
@@ -67,6 +68,7 @@ class WarehouseProductQuery(BaseModel):
 
 
 class WarehouseProduct(BaseModel):
+    proid: str
     sku: str
     name: Optional[str] = None
     sku_code: str
@@ -160,6 +162,3 @@ class PurchasingAllQuery(BaseModel):
         alias_generator=to_camel,
         populate_by_name=True
     )
-
-
-

{ey_commerce_lib-1.0.11 → ey_commerce_lib-1.0.12}/src/ey_commerce_lib/four_seller/main.py

@@ -3,9 +3,9 @@ import base64
 import logging
 from typing import Callable
 
+import ddddocr
 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

{ey_commerce_lib-1.0.11 → ey_commerce_lib-1.0.12}/src/ey_commerce_lib/four_seller/schemas/vo/order.py

@@ -1,4 +1,5 @@
 from typing import Optional
+
 from pydantic import BaseModel, Field, ConfigDict
 
 

{ey_commerce_lib-1.0.11 → ey_commerce_lib-1.0.12}/src/ey_commerce_lib/kogan/schemas/query/product.py

@@ -1,4 +1,5 @@
 from typing import Optional
+
 from pydantic import BaseModel, Field, ConfigDict
 
 

{ey_commerce_lib-1.0.11 → ey_commerce_lib-1.0.12}/src/ey_commerce_lib/kogan/schemas/response/order.py

@@ -1,6 +1,7 @@
-from pydantic import BaseModel, Field
-from typing import Optional
 from datetime import datetime
+from typing import Optional
+
+from pydantic import BaseModel, Field
 
 
 class AddressModel(BaseModel):

{ey_commerce_lib-1.0.11 → ey_commerce_lib-1.0.12}/src/ey_commerce_lib/kogan/schemas/response/product.py

@@ -1,6 +1,7 @@
-from pydantic import BaseModel, Field, ConfigDict
 from typing import Optional
 
+from pydantic import BaseModel, Field, ConfigDict
+
 
 class OfferDetail(BaseModel):
     # 价格

{ey_commerce_lib-1.0.11 → ey_commerce_lib-1.0.12}/src/ey_commerce_lib/model.py

@@ -1,4 +1,5 @@
 from typing import Generic, TypeVar
+
 from pydantic import BaseModel
 
 T = TypeVar('T')

{ey_commerce_lib-1.0.11 → ey_commerce_lib-1.0.12}/tests/dxm/test_purchase.py

@@ -4,6 +4,7 @@ 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
 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
@@ -39,4 +40,10 @@ headers = {
 @pytest.mark.asyncio
 async def test_dxm_api():
     async with (DxmClient(headers=headers, cookies=cookies) as dxm_client):
-       pass
+        pass
+
+
+@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()))