pixelarraythirdparty 1.0.1__py3-none-any.whl → 1.0.3__py3-none-any.whl

pixelarraythirdparty/__init__.py

@@ -10,7 +10,7 @@ PixelArray 第三方微服务客户端
 - user: 用户管理模块
 """
 
-__version__ = "1.0.1"
+__version__ = "1.0.3"
 __author__ = "Lu qi"
 __email__ = "qi.lu@pixelarrayai.com"
 

pixelarraythirdparty/celery/celery.py

@@ -3,20 +3,35 @@ from pixelarraythirdparty.client import Client
 
 class CeleryManager(Client):
     def get_celery_status(self):
-        return self._request("GET", "/api/celery/status")
+        data, success = self._request("GET", "/api/celery/status")
+        if not success:
+            return {}, False
+        return data, True
 
     def get_celery_tasks(self):
-        return self._request("GET", "/api/celery/tasks")
+        data, success = self._request("GET", "/api/celery/tasks")
+        if not success:
+            return {}, False
+        return data, True
 
     def get_celery_tasks_scheduled(self):
-        return self._request("GET", "/api/celery/tasks/scheduled")
+        data, success = self._request("GET", "/api/celery/tasks/scheduled")
+        if not success:
+            return {}, False
+        return data, True
 
     def get_celery_tasks_detail(self, task_name: str):
-        return self._request("GET", f"/api/celery/tasks/{task_name}")
+        data, success = self._request("GET", f"/api/celery/tasks/{task_name}")
+        if not success:
+            return {}, False
+        return data, True
 
     def trigger_celery_task(self, task_name: str, args: list, kwargs: dict):
-        return self._request(
+        data, success = self._request(
             "POST",
             f"/api/celery/tasks/{task_name}/trigger",
             json={"args": args, "kwargs": kwargs},
         )
+        if not success:
+            return {}, False
+        return data, True

pixelarraythirdparty/client.py

@@ -1,5 +1,5 @@
 import requests
-from typing import Dict, Any, Optional
+from typing import Dict, Any, Optional, Tuple
 
 
 class Client:
@@ -12,11 +12,11 @@ class Client:
             "X-API-Key": self.api_key,
         }
 
-    def _request(self, method: str, url: str, **kwargs) -> Dict[str, Any]:
+    def _request(self, method: str, url: str, **kwargs) -> Tuple[Dict[str, Any], bool]:
         """统一的请求方法"""
         resp = requests.request(
             method, f"{self.base_url}{url}", headers=self.headers, **kwargs
         )
-        if resp.status_code == 200:
-            return resp.json().get("data", {})
-        return {}
+        if resp.status_code == 200 and resp.json().get("success") is True:
+            return resp.json().get("data", {}), True
+        return {}, False

pixelarraythirdparty/order/order.py

@@ -1,90 +1,110 @@
-import requests
+from pixelarraythirdparty.client import Client
 
 
-class OrderManager:
-    def __init__(self, api_key: str):
-        self.base_url = "https://thirdparty.pixelarrayai.com"
-        self.api_key = api_key
-        self.headers = {
-            "Content-Type": "application/json",
-            "X-API-Key": self.api_key,
-        }
-
-    def _request(self, method, url, **kwargs):
-        resp = requests.request(
-            method, f"{self.base_url}{url}", headers=self.headers, **kwargs
-        )
-        if resp.status_code == 200:
-            return resp.json().get("data", {})
-        return {}
-
+class OrderManager(Client):
     def create_order(
         self,
-        product_name: str,
         product_id: str,
-        amount: float,
-        body: str,
-        remark: str,
-        payment_channel: str,
+        body: str = None,
+        remark: str = None,
+        payment_channel: str = "WECHAT",
     ):
         data = {
-            "product_name": product_name,
             "product_id": product_id,
-            "amount": amount,
             "body": body,
             "remark": remark,
             "payment_channel": payment_channel,
         }
-        return self._request("POST", "/api/orders/create", json=data)
+        data, success = self._request("POST", "/api/orders/create", json=data)
+        if not success:
+            return {}, False
+        return data, True
 
     def list_order(
         self,
         page: int = 1,
         page_size: int = 10,
         payment_status: str = None,
-        order_no: str = None,
+        out_trade_no: str = None,
     ):
         params = {
             "page": page,
             "page_size": page_size,
             "payment_status": payment_status,
-            "order_no": order_no,
+            "out_trade_no": out_trade_no,
         }
-        return self._request("GET", "/api/orders/list", params=params)
+        data, success = self._request("GET", "/api/orders/list", params=params)
+        if not success:
+            return {}, False
+        return data, True
 
-    def get_order_detail(self, order_no: str):
-        return self._request("GET", f"/api/orders/{order_no}")
+    def get_order_detail(self, out_trade_no: str):
+        data, success = self._request("GET", f"/api/orders/{out_trade_no}")
+        if not success:
+            return {}, False
+        return data, True
 
-    def update_order(
+    def update_order_status(
         self,
-        order_no: str,
+        out_trade_no: str,
         payment_status: str,
-        wx_order_no: str,
-        transaction_id: str,
-        openid: str,
-        trade_type: str,
-        bank_type: str,
-        fee_type: str,
-        is_subscribe: str,
-        time_end: str,
-        remark: str,
     ):
         data = {
             "payment_status": payment_status,
-            "wx_order_no": wx_order_no,
-            "transaction_id": transaction_id,
-            "openid": openid,
-            "trade_type": trade_type,
-            "bank_type": bank_type,
-            "fee_type": fee_type,
-            "is_subscribe": is_subscribe,
-            "time_end": time_end,
-            "remark": remark,
         }
-        return self._request("PUT", f"/api/orders/{order_no}", json=data)
+        data, success = self._request(
+            "PUT", f"/api/orders/{out_trade_no}/status", json=data
+        )
+        if not success:
+            return {}, False
+        return data, True
 
-    def delete_order(self, order_no: str):
-        return self._request("DELETE", f"/api/orders/{order_no}")
+    def delete_order(self, out_trade_no: str):
+        data, success = self._request("DELETE", f"/api/orders/{out_trade_no}")
+        if not success:
+            return {}, False
+        return data, True
 
     def get_order_stats(self):
-        return self._request("GET", "/api/orders/stats/summary")
+        data, success = self._request("GET", "/api/orders/stats/summary")
+        if not success:
+            return {}, False
+        return data, True
+
+    def generate_qr_code(
+        self,
+        out_trade_no: str,
+        payment_channel: str = "WECHAT",
+    ):
+        if payment_channel == "WECHAT":
+            url = "/api/orders/wx_pay/generate_qr_code"
+        elif payment_channel == "ALIPAY":
+            url = "/api/orders/ali_pay/generate_qr_code"
+        else:
+            raise ValueError("Invalid payment channel")
+        data, success = self._request(
+            "POST",
+            url,
+            json={
+                "out_trade_no": out_trade_no,
+            },
+        )
+        if not success:
+            return {}, False
+        return data, True
+
+    def refund_order(self, out_trade_no: str, payment_channel: str = "WECHAT"):
+        if payment_channel == "WECHAT":
+            url = "/api/orders/wx_pay/refund"
+        elif payment_channel == "ALIPAY":
+            url = "/api/orders/ali_pay/refund"
+        else:
+            raise ValueError("Invalid payment channel")
+        data, success = self._request(
+            "POST",
+            url,
+            json={"out_trade_no": out_trade_no},
+        )
+        if not success:
+            return {}, False
+        return data, True

pixelarraythirdparty/product/product.py

@@ -25,7 +25,10 @@ class ProductManager(Client):
             "features": features,
             "sort_order": sort_order,
         }
-        return self._request("POST", "/api/products/create", json=data)
+        data, success = self._request("POST", "/api/products/create", json=data)
+        if not success:
+            return {}, False
+        return data, True
 
     def list_product(
         self,
@@ -48,10 +51,16 @@ class ProductManager(Client):
             params["category"] = category
         if name is not None:
             params["name"] = name
-        return self._request("GET", "/api/products/list", params=params)
+        data, success = self._request("GET", "/api/products/list", params=params)
+        if not success:
+            return {}, False
+        return data, True
 
     def get_product_detail(self, product_id: str):
-        return self._request("GET", f"/api/products/{product_id}")
+        data, success = self._request("GET", f"/api/products/{product_id}")
+        if not success:
+            return {}, False
+        return data, True
 
     def update_product(
         self,
@@ -77,10 +86,19 @@ class ProductManager(Client):
             "features": features,
             "sort_order": sort_order,
         }
-        return self._request("PUT", f"/api/products/{product_id}", json=data)
+        data, success = self._request("PUT", f"/api/products/{product_id}", json=data)
+        if not success:
+            return {}, False
+        return data, True
 
     def delete_product(self, product_id: str):
-        return self._request("DELETE", f"/api/products/{product_id}")
+        data, success = self._request("DELETE", f"/api/products/{product_id}")
+        if not success:
+            return {}, False
+        return data, True
 
     def get_product_categories(self):
-        return self._request("GET", "/api/products/categories/list")
+        data, success = self._request("GET", "/api/products/categories/list")
+        if not success:
+            return {}, False
+        return data, True

pixelarraythirdparty/user/user.py

@@ -16,7 +16,10 @@ class UserManager(Client):
             params["role"] = role
         if is_active is not None:
             params["is_active"] = is_active
-        return self._request("GET", "/api/users/list", params=params)
+        data, success = self._request("GET", "/api/users/list", params=params)
+        if not success:
+            return {}, False
+        return data, True
 
     def create_user(self, username: str, password: str, email: str, role: str):
         data = {
@@ -25,7 +28,10 @@ class UserManager(Client):
             "email": email,
             "role": role,
         }
-        return self._request("POST", "/api/users/create", json=data)
+        data, success = self._request("POST", "/api/users/create", json=data)
+        if not success:
+            return {}, False
+        return data, True
 
     def update_user(
         self, user_id: int, username: str, email: str, role: str, is_active: bool
@@ -36,14 +42,28 @@ class UserManager(Client):
             "role": role,
             "is_active": is_active,
         }
-        return self._request("PUT", f"/api/users/{user_id}", json=data)
+        data, success = self._request("PUT", f"/api/users/{user_id}", json=data)
+        if not success:
+            return {}, False
+        return data, True
 
     def delete_user(self, user_id: int):
-        return self._request("DELETE", f"/api/users/{user_id}")
+        data, success = self._request("DELETE", f"/api/users/{user_id}")
+        if not success:
+            return {}, False
+        return data, True
 
     def get_user_detail(self, user_id: int):
-        return self._request("GET", f"/api/users/{user_id}")
+        data, success = self._request("GET", f"/api/users/{user_id}")
+        if not success:
+            return {}, False
+        return data, True
 
     def reset_user_password(self, user_id: int, new_password: str):
         data = {"new_password": new_password}
-        return self._request("POST", f"/api/users/{user_id}/reset-password", json=data)
+        data, success = self._request(
+            "POST", f"/api/users/{user_id}/reset-password", json=data
+        )
+        if not success:
+            return {}, False
+        return data, True

{pixelarraythirdparty-1.0.1.dist-info → pixelarraythirdparty-1.0.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pixelarraythirdparty
-Version: 1.0.1
+Version: 1.0.3
 Summary: PixelArray 第三方微服务客户端
 Author-email: Lu qi <qi.lu@pixelarrayai.com>
 License-Expression: MIT

pixelarraythirdparty-1.0.3.dist-info/RECORD

@@ -0,0 +1,15 @@
+pixelarraythirdparty/__init__.py,sha256=TYuj96ZwZ4VXhB9Xn4KoEWpoJVsChUjzoWSRZONmC-U,458
+pixelarraythirdparty/client.py,sha256=dJlIrMlr1M4AGHvaLw191uaPnQbQ12_BGx8DTDTPkZQ,802
+pixelarraythirdparty/celery/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+pixelarraythirdparty/celery/celery.py,sha256=Oaa7pBztL-FM0X5NSCjjfZP80AUsnnme5Z3RxXIJsZg,1178
+pixelarraythirdparty/order/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+pixelarraythirdparty/order/order.py,sha256=kmJNAvfiXxhjOhRbD3JTl1saE8aetMZ0TFR9NjPsaIM,3208
+pixelarraythirdparty/product/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+pixelarraythirdparty/product/product.py,sha256=eHU0VKal1QpJs6F4_VxLoBYeeqQ19elEogH2Qpw7IDo,3029
+pixelarraythirdparty/user/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+pixelarraythirdparty/user/user.py,sha256=tbcFsrNEdWz4op7V_zJ5o8neBuI4ogl4dgHS-uSIAX0,2155
+pixelarraythirdparty-1.0.3.dist-info/licenses/LICENSE,sha256=O-g1dUr0U50rSIvmWE9toiVkSgFpVt72_MHITbWvAqA,1067
+pixelarraythirdparty-1.0.3.dist-info/METADATA,sha256=_BcKEA0W8joCfUZcvDqyKBkBXKGyWUwIDVI16boT7s4,993
+pixelarraythirdparty-1.0.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pixelarraythirdparty-1.0.3.dist-info/top_level.txt,sha256=dzG2Ut8j7noUqj_0ZQjcIDAeHYCh_9WtlxjAxtoyufo,21
+pixelarraythirdparty-1.0.3.dist-info/RECORD,,

pixelarraythirdparty/order/pay.py

@@ -1,35 +0,0 @@
-from pixelarraythirdparty.client import Client
-
-
-class WeChatPayManager(Client):
-    def generate_qr_code(
-        self,
-        out_trade_no: str,
-        total_fee: int,
-        body: str,
-        product_name: str,
-        product_id: str,
-    ):
-        return self._request(
-            "POST",
-            "/api/wx_pay/generate_qr_code",
-            json={
-                "out_trade_no": out_trade_no,
-                "total_fee": total_fee,
-                "body": body,
-                "product_name": product_name,
-                "product_id": product_id,
-            },
-        )
-
-    def query_order(self, out_trade_no: str):
-        return self._request(
-            "POST", "/api/wx_pay/query_order", json={"out_trade_no": out_trade_no}
-        )
-
-    def refund(self, out_trade_no: str, total_fee: int):
-        return self._request(
-            "POST",
-            "/api/wx_pay/refund",
-            json={"out_trade_no": out_trade_no, "total_fee": total_fee},
-        )

pixelarraythirdparty-1.0.1.dist-info/RECORD

@@ -1,16 +0,0 @@
-pixelarraythirdparty/__init__.py,sha256=fk9_1IcETIUlA8F5IoMrexyHfxQ0ygyplTk8Ur2o1mM,458
-pixelarraythirdparty/client.py,sha256=oob1iFWsLPPDiXic-H_5twxazQ-pEOHK98H-RaZvnSY,730
-pixelarraythirdparty/celery/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pixelarraythirdparty/celery/celery.py,sha256=NaLf5gJo8BTTJrC6a9f3TPfwaR9YArpcV-EM8HiJWhU,738
-pixelarraythirdparty/order/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pixelarraythirdparty/order/order.py,sha256=K_uhC9CFvzdW33mFoz5aRypi21V5rd58Q5WyCfe6Wes,2571
-pixelarraythirdparty/order/pay.py,sha256=JpzWEQfq5v9gu9uFLjn5FNAnDNjYGQuZA5aeuEjfDcw,987
-pixelarraythirdparty/product/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pixelarraythirdparty/product/product.py,sha256=taX_UNsBJRB_KWCrszagh9TkiY_rybok57PBU-cLbEI,2501
-pixelarraythirdparty/user/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pixelarraythirdparty/user/user.py,sha256=nRtTahL1w-gic6vaS7Gh2CVWBvveL_yIuVf3U0eJCPA,1605
-pixelarraythirdparty-1.0.1.dist-info/licenses/LICENSE,sha256=O-g1dUr0U50rSIvmWE9toiVkSgFpVt72_MHITbWvAqA,1067
-pixelarraythirdparty-1.0.1.dist-info/METADATA,sha256=MZkNXMe8G6cMRAweo_JIoWM4ywZQcxlsZTFqSGXb_jw,993
-pixelarraythirdparty-1.0.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pixelarraythirdparty-1.0.1.dist-info/top_level.txt,sha256=dzG2Ut8j7noUqj_0ZQjcIDAeHYCh_9WtlxjAxtoyufo,21
-pixelarraythirdparty-1.0.1.dist-info/RECORD,,