ey-commerce-lib 1.0.20__tar.gz → 1.0.22__tar.gz

{ey_commerce_lib-1.0.20 → ey_commerce_lib-1.0.22}/PKG-INFO

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

{ey_commerce_lib-1.0.20 → ey_commerce_lib-1.0.22}/pyproject.toml

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

{ey_commerce_lib-1.0.20 → ey_commerce_lib-1.0.22}/src/ey_commerce_lib/dxm/main.py

@@ -9,7 +9,7 @@ from ey_commerce_lib.dxm.constant.order import DxmOrderRuleType
 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
+    get_order_detail_by_html, parse_comm_search_list_html_get_authid_dict
 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
@@ -28,7 +28,7 @@ class DxmClient:
         self.__cookies = cookies
         self.__headers = headers
         self.__sem = asyncio.Semaphore(sem)
-        timeout = Timeout(connect=5.0, read=20.0, write=10.0, pool=10.0)
+        timeout = Timeout(connect=60.0, read=60.0, write=60.0, pool=30.0)
         self.__base_url = 'https://www.dianxiaomi.com'
         self.__async_client = AsyncClient(base_url=self.__base_url, cookies=cookies, headers=headers,
                                           timeout=timeout)
@@ -847,6 +847,38 @@ class DxmClient:
             })
             return order_prior_or_ban_ship_response.json()
 
+    async def reply_msg(self, package_id: str, content: str):
+        """
+        回复消息
+        """
+        data = f'packageId={package_id}&content={content}'
+        async with self.__sem:
+            reply_msg_response = await self.__async_client.post('/replyMsg/reply.json', content=data)
+            return reply_msg_response.json()
+
+    async def get_authid_like_keyword(self, keyword: str) -> dict:
+        """
+        获取店小秘物流方式id,通过关键字模糊查询
+        :param keyword: 关键字
+        :return:
+        """
+        async with self.__sem:
+            data = {
+                'state': '',
+                'isVoided': '-1',
+                'isOversea': '-1',
+                'commitPlatform': '',
+                'prefixCount': '200',
+                'newVersion': '0',
+                'history': '',
+                'isBatch': '-1',
+                'isFree': '-1',
+            }
+
+            response = await self.__async_client.post('/package/commSearchList.htm', data=data)
+            comm_search_list_html = response.text
+            return parse_comm_search_list_html_get_authid_dict(comm_search_list_html, keyword)
+
     async def __aenter__(self):
         return self
 

{ey_commerce_lib-1.0.20 → ey_commerce_lib-1.0.22}/src/ey_commerce_lib/dxm/parser/order.py

@@ -182,6 +182,16 @@ def list_order_base_by_html(html_str: str) -> list[dict]:
                 logistics_info['track_number'] = get_str_list_first_not_blank_or_none(
                     order_first_element.xpath('.//td[6]//span[contains(@class, "limingcentUrlpicson")]/a/text()'))
                 logistics_info['logistics'] = logistics
+                # 称重重量
+                weight_element_list = order_first_element.xpath('.//td[6]//span[@class="gray-c"]/text()')
+                weight = None
+                for weight_element in weight_element_list:
+                    if '称重重量' in weight_element:
+                        # 如果包含了称重重量的话，获取完整的数字部分
+                        weight = float(re.search(r'\d+(?:\.\d+)?', weight_element).group())
+                # 设置重量部分
+                logistics_info['weight'] = weight
+
         # 状态
         if has_logistics:
             status = get_str_list_first_not_blank_or_none(order_first_element.xpath('.//td[7]/text()'))
@@ -334,7 +344,8 @@ def get_order_detail_by_html(html_str: str):
         # 获取可用库存
         warehouse_available_quantity_element_list = pair_info_element.xpath(
             './/div[contains(@class, "normalDiv")]/p[2]/span[2]/text()')
-        warehouse_available_quantity_str = get_str_list_first_not_blank_or_none(warehouse_available_quantity_element_list)
+        warehouse_available_quantity_str = get_str_list_first_not_blank_or_none(
+            warehouse_available_quantity_element_list)
         # 获取到可用库存节点
         if warehouse_available_quantity_str is not None:
             if warehouse_available_quantity_str.endswith('+'):
@@ -366,3 +377,21 @@ def get_order_detail_by_html(html_str: str):
         'pair_info_list': pair_info_list,
         'storage_id': storage_id
     }
+
+
+def parse_comm_search_list_html_get_authid_dict(html_str: str, keyword: str):
+    """
+    解析网页获取物流方式id字典
+    :param html_str:
+    :param keyword:
+    :return:
+    """
+    tree = html.fromstring(html_str)
+    logistics_authid_dict = {}
+    logistics_method_element_list = tree.xpath('//select[@id="advancedAuthSelect"]/option')
+    for logistics_method in logistics_method_element_list:
+        logistics_authid_text = str(logistics_method.xpath('text()')[0])
+        logistics_authid_value = logistics_method.xpath('@value')[0]
+        if keyword in logistics_authid_text:
+            logistics_authid_dict[logistics_authid_text] = logistics_authid_value
+    return logistics_authid_dict

{ey_commerce_lib-1.0.20 → ey_commerce_lib-1.0.22}/src/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=60.0, write=10.0, pool=10.0)
+        timeout = Timeout(connect=60.0, read=60.0, write=60.0, pool=30.0)
 
         # 异步客户端
         self.__async_client = AsyncClient(base_url="https://nimda.kogan.com",

{ey_commerce_lib-1.0.20 → ey_commerce_lib-1.0.22}/src/ey_commerce_lib/takesend/main.py

@@ -6,10 +6,12 @@ from ey_commerce_lib.takesend.config import LOGIN_HEADERS, EDIT_HEADERS
 class TakeSendClient(object):
 
     def __init__(self, username: str, password: str):
-        timeout = Timeout(connect=5.0, read=20.0, write=10.0, pool=10.0)
+        timeout = Timeout(connect=60.0, read=60.0, write=60.0, pool=30.0)
         self.__async_client = AsyncClient(
             base_url="http://k5.takesend.com:8180",
-            timeout=timeout)
+            timeout=timeout,
+            verify=False
+        )
         self.__username = username
         self.__password = password
 
@@ -18,9 +20,9 @@ class TakeSendClient(object):
         自动登录
         :return:
         """
-        # 1. 先访问首页更新JESSIONID
+        # 访问首页
         await self.__async_client.get("/c_index.jsp")
-        # 2.在登录
+        # 登录
         params = {
             'action': 'logon'
         }
@@ -28,9 +30,10 @@ class TakeSendClient(object):
             'userid': self.__username,
             'password': self.__password
         }
-        await self.__async_client.post("//client/Logon", params=params, data=data, headers=LOGIN_HEADERS)
+        # 请求登录接口
+        await self.__async_client.post(".//client/Logon", params=params, data=data, headers=LOGIN_HEADERS)
 
-    async def __client_cc_order(self, excel_data: list):
+    async def client_cc_order(self, excel_data: list | str):
         """
         修改泰嘉产品上传重量数据
         :param excel_data:
@@ -43,7 +46,9 @@ class TakeSendClient(object):
         data = {
             'excel[]': excel_data,
         }
-        return await self.__async_client.post("/Client/CCOrder", params=params, data=data, headers=EDIT_HEADERS)
+
+        response = await self.__async_client.post('/Client/CCOrder', params=params, data=data, headers=EDIT_HEADERS)
+        return response.json()
 
     async def __aenter__(self):
         return self

{ey_commerce_lib-1.0.20 → ey_commerce_lib-1.0.22}/tests/dxm/test_purchase.py

@@ -6,6 +6,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, ORDER_SEARCH_HAVE_GOODS_BASE_FORM
 from ey_commerce_lib.dxm.main import DxmClient
+from ey_commerce_lib.dxm.schemas.order import DxmOrderSearchForm
 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, \
@@ -50,8 +51,12 @@ async def test_dxm_api():
         #     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))
+        # data = await dxm_client.get_authid_like_keyword('泰嘉')
+        data = await dxm_client.list_order_base_async(query=DxmOrderSearchForm(
+            search_types='trackNum',
+            contents='36QT4109377801000931506'
+        ))
+        print(data)
 
 
 @pytest.mark.asyncio