ey-commerce-lib 1.0.10__py3-none-any.whl → 1.0.12__py3-none-any.whl

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/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/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/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/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/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/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/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/four_seller/schemas/vo/order.py

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

ey_commerce_lib/kogan/main.py

@@ -11,7 +11,7 @@ class KoganClient:
     def __init__(self, seller_id: str, seller_token: str):
         self.seller_id = seller_id
         self.seller_token = seller_token
-        timeout = Timeout(connect=5.0, read=20.0, write=10.0, pool=10.0)
+        timeout = Timeout(connect=5.0, read=60.0, write=10.0, pool=10.0)
 
         # 异步客户端
         self.__async_client = AsyncClient(base_url="https://nimda.kogan.com",

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/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/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/model.py

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

{ey_commerce_lib-1.0.10.dist-info → ey_commerce_lib-1.0.12.dist-info}/METADATA

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

{ey_commerce_lib-1.0.10.dist-info → ey_commerce_lib-1.0.12.dist-info}/RECORD

@@ -1,26 +1,26 @@
 ey_commerce_lib/__init__.py,sha256=QTYqXqSTHFRkM9TEgpDFcHvwLbvqHDqvqfQ9EiXkcAM,23
-ey_commerce_lib/model.py,sha256=uL_xo6Zi2B4t44UB0HALv8On3NIV9cgHay00F_Gkecs,230
+ey_commerce_lib/model.py,sha256=0ZCE68502blzRDsQ38AIswc8kPk7H34Am5x8IiDi2DU,232
 ey_commerce_lib/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ey_commerce_lib/dxm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ey_commerce_lib/dxm/main.py,sha256=aNYkE3HA3OrhnfN-RLq24Sha7fm-9d2uytRM_6wSLqI,24726
+ey_commerce_lib/dxm/main.py,sha256=WNqAelT64nYX1Tka6_3zN1IgAL7VuBFPSJU4OARADk4,24728
 ey_commerce_lib/dxm/order.py,sha256=hMdNm9X5h9tbvMWFnyE5hcSF4butzn7m-akGqLQUD0k,35
 ey_commerce_lib/dxm/constant/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ey_commerce_lib/dxm/constant/order.py,sha256=U-2NYnkIcqukzMtOFpfqvzIktu_t7jYEms_n9LgKMlY,2213
 ey_commerce_lib/dxm/exception/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ey_commerce_lib/dxm/exception/common.py,sha256=DM5vItHdZCGK2Piqp2S5TFxPm3pioMzzlV-1RTxty00,159
 ey_commerce_lib/dxm/parser/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ey_commerce_lib/dxm/parser/common.py,sha256=-3OwoGsuHpugFS96OAzimZTXLkH7qZqmNvP-kvVSndM,3035
-ey_commerce_lib/dxm/parser/order.py,sha256=_MIkdXkgi8clZuGoc8BJe3qMh2kmfCKLLG20zyoC1vU,17248
-ey_commerce_lib/dxm/parser/purchase.py,sha256=7ULQHAIqUuUcpvWM1ut7uqCQhwE-DcQ7K3qftsfNlK8,5768
-ey_commerce_lib/dxm/parser/warehouse.py,sha256=LfmqVixV5IcnPvr6Ma4XYoWUdXixQ16xzPP07bJrWb0,3192
+ey_commerce_lib/dxm/parser/common.py,sha256=-xfnaYhMStuvR-XEJTWAgTN2H88xflGtWXIrxDqbq0Q,3037
+ey_commerce_lib/dxm/parser/order.py,sha256=pivRDYgN-pBdFziOw4aiz6G4zR9uegikH9SLxMhe_qg,17457
+ey_commerce_lib/dxm/parser/purchase.py,sha256=lmcC41HtdUqCgGamFASPnzHatUziLFaenTJmazsiMm0,5750
+ey_commerce_lib/dxm/parser/warehouse.py,sha256=oQVojPX8VKHUphdV1KY5ZK1PCFtOY2zwkyLNUeJ3JT0,3310
 ey_commerce_lib/dxm/schemas/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ey_commerce_lib/dxm/schemas/common.py,sha256=ihCeYrh4K_-m9_4rVzHm-o8rFNqzcD5XkO0JQd2023g,234
-ey_commerce_lib/dxm/schemas/order.py,sha256=uzhSgW0d7Z3L1yYb0meZ2AEF1OosnVM408W2-wZVriE,7802
-ey_commerce_lib/dxm/schemas/warehouse.py,sha256=kHxNMgkVHCILfAWuDhLN0Q5pDtb3Nd5qexnJowCSnrI,5082
+ey_commerce_lib/dxm/schemas/order.py,sha256=6ps9aXFcEiRASLv1CH5uW7wnplaWzD_vTfyzvi5eLE0,7881
+ey_commerce_lib/dxm/schemas/warehouse.py,sha256=BT9r92DgkGKRI-HPqHPt5FKPdPJr2h-rxjfh25STR2E,5094
 ey_commerce_lib/dxm/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ey_commerce_lib/dxm/utils/mark.py,sha256=rAmofi3JmdI8gdl3s-U0ZEKcA-cn6vtS3lsXDrVXRLc,4716
 ey_commerce_lib/four_seller/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ey_commerce_lib/four_seller/main.py,sha256=Mz_Z0Vs-v0UmegOU_lo8eIpXmrWcL7_paRgBrm1s9_o,13131
+ey_commerce_lib/four_seller/main.py,sha256=cqO29DRRVzJHwo_005RFOO3vyGboQcuJUli783nyQjA,13131
 ey_commerce_lib/four_seller/constant/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ey_commerce_lib/four_seller/constant/response.py,sha256=UqGeRCaAV6B_IyNfJR5oJvbKW4BUF5jQGhU5JYpYP1k,163
 ey_commerce_lib/four_seller/parser/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -29,21 +29,21 @@ ey_commerce_lib/four_seller/schemas/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQ
 ey_commerce_lib/four_seller/schemas/query/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ey_commerce_lib/four_seller/schemas/query/order.py,sha256=XV7by4RT9NWvei4C__cQsLTjMMZKLbK73N1GAU7RL7o,3714
 ey_commerce_lib/four_seller/schemas/vo/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ey_commerce_lib/four_seller/schemas/vo/order.py,sha256=aNpnXSaXeUVbBz_7JtP8p6mWIWgUwejUhtYoa3gf4Po,12133
+ey_commerce_lib/four_seller/schemas/vo/order.py,sha256=c-Z6KQRugsJmxQJEztsH1nzqrg3KvK4Q5xm6xEyjbJM,12135
 ey_commerce_lib/kogan/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ey_commerce_lib/kogan/main.py,sha256=fROFOUd80qtsnggz5XR3vyoSAcb6PqFD1_rqSbAtYhE,2216
+ey_commerce_lib/kogan/main.py,sha256=wkjaTv1d0lxYDUT9R0rnFpg1g4KW4ZLYW227xrs4ooM,2216
 ey_commerce_lib/kogan/schemas/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ey_commerce_lib/kogan/schemas/query/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ey_commerce_lib/kogan/schemas/query/order.py,sha256=ajqO992fiorUDg3-YPPpK2Dgmdy2LoHfz4IatBz1Mro,574
-ey_commerce_lib/kogan/schemas/query/product.py,sha256=EDKnwTqBTVR7YkXbpHiu90f_3E2nFX6BnhIMkthgucs,2287
+ey_commerce_lib/kogan/schemas/query/product.py,sha256=nqFQh9IuFYwbM_cJxl-Ed_JYBlipyPqpQFeo_vD2pCA,2289
 ey_commerce_lib/kogan/schemas/response/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ey_commerce_lib/kogan/schemas/response/order.py,sha256=3AWXAOTd60y-V-1-VWObf4LmqU4q3tQ8cTREr3_83Is,4716
-ey_commerce_lib/kogan/schemas/response/product.py,sha256=0qnoM4UG-Iugyn1o2M1mgz3wy4_QkP-KA5vMhRuvA7Q,2771
+ey_commerce_lib/kogan/schemas/response/order.py,sha256=ATWks8Erv9HmW9t_UklYRMn4sNbzYptmE8jTU_uCeyc,4718
+ey_commerce_lib/kogan/schemas/response/product.py,sha256=IVC1QSHSYZyHa4lCYz20rTdtmPvpPoqJsQP88hu48S4,2773
 ey_commerce_lib/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ey_commerce_lib/utils/close.py,sha256=-De_H1I-gryytKYhLMsC3HfW67W852XkP1ckK2gLsFs,141
 ey_commerce_lib/utils/dxm.py,sha256=jVNltK_Pm_yMzXReD0Aw5VW6kzIZ5Bn23RucS0DKBI0,1196
 ey_commerce_lib/utils/list_util.py,sha256=R1w7B1m3sEXr38zSHWp-15C3xAs5ykYCCpvwmnRW4xs,545
 ey_commerce_lib/utils/str.py,sha256=939xE0y8U7KEWjwbEezMlaWJNBsfb2BSb-dBpYbOD8Q,138
-ey_commerce_lib-1.0.10.dist-info/METADATA,sha256=fLcVW4n7xGfi1eKRTmNZQH29q8J0KCc0gTo-mYOSfHc,391
-ey_commerce_lib-1.0.10.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-ey_commerce_lib-1.0.10.dist-info/RECORD,,
+ey_commerce_lib-1.0.12.dist-info/METADATA,sha256=4FjehL0P_6j7xreBQoErb7WK7eyboLXw3qZKqth3BOI,391
+ey_commerce_lib-1.0.12.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+ey_commerce_lib-1.0.12.dist-info/RECORD,,