global-open-sdk-python 1.4.6__tar.gz → 1.4.8__tar.gz

{global-open-sdk-python-1.4.6 → global_open_sdk_python-1.4.8}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: global-open-sdk-python
-Version: 1.4.6
+Version: 1.4.8
 Summary: The global alipay gateway SDK for Python.
 Home-page: https://github.com/alipay/global-open-sdk-python
 Author: guodong.wzj
@@ -30,3 +30,13 @@ Requires-Dist: pytz
 Requires-Dist: pycryptodome
 Requires-Dist: rsa
 Requires-Dist: cryptography
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: license-file
+Dynamic: platform
+Dynamic: requires-dist
+Dynamic: summary

{global-open-sdk-python-1.4.6 → global_open_sdk_python-1.4.8}/README.md

@@ -1,7 +1,7 @@
 ```
 Language：Python  
 Python version：2.7+  
-Releass ^1.4.6
+Releass ^1.4.8
 Copyright：Ant financial services group  
 ```
 

{global-open-sdk-python-1.4.6 → global_open_sdk_python-1.4.8}/com/alipay/ams/api/default_alipay_client.py

@@ -8,12 +8,13 @@ from com.alipay.ams.api.net.default_http_rpc import *
 
 class DefaultAlipayClient(object):
 
-    def __init__(self, gateway_url, client_id, merchant_private_key, alipay_public_key):
+    def __init__(self, gateway_url, client_id, merchant_private_key, alipay_public_key,agent_token = None):
         self.__gateway_url = gateway_url
         self.__client_id = client_id
         self.__merchant_private_key = merchant_private_key
         self.__alipay_public_key = alipay_public_key
         self.__is_sandbox_mode = client_id.startswith("SANDBOX_")
+        self.__agent_token = agent_token
 
     """
     内部方法，生成请求签名
@@ -88,8 +89,11 @@ class DefaultAlipayClient(object):
             "User-Agent": "global-alipay-sdk-python",
             "Request-Time": req_time,
             "client-id": client_id,
-            "Signature": signature
+            "Signature": signature,
         }
+        if self.__agent_token:
+            headers["Agent-Token"] = self.__agent_token
+
 
         url = self.__gateway_url + path
         headers, response = do_post(url, headers, req_body)

{global-open-sdk-python-1.4.6 → global_open_sdk_python-1.4.8}/com/alipay/ams/api/model/acquirer_info.py

@@ -10,6 +10,7 @@ class AcquirerInfo:
         self.__acquirer_merchant_id = None
         self.__acquirer_result_code = None
         self.__acquirer_result_message = None
+        self.__acquirer_merchant_name = None
 
     @property
     def acquirer_name(self):
@@ -59,6 +60,15 @@ class AcquirerInfo:
     def acquirer_result_message(self, acquirer_result_message):
         self.__acquirer_result_message = acquirer_result_message
 
+    @property
+    def acquirer_merchant_name(self):
+        return self.__acquirer_merchant_name
+
+
+    @acquirer_merchant_name.setter
+    def acquirer_merchant_name(self, acquirer_merchant_name):
+        self.__acquirer_merchant_name = acquirer_merchant_name
+
     def parse_rsp_body(self, result_body):
         if type(result_body) == str:
             payment_result_info_body = json.loads(result_body)
@@ -81,6 +91,9 @@ class AcquirerInfo:
         if 'acquirerResultMessage' in result_body:
             self.__acquirer_result_message = result_body['acquirerResultMessage']
 
+        if 'acquirerMerchantName' in result_body:
+            self.__acquirer_merchant_name = result_body['acquirerMerchantName']
+
 
 
 

{global-open-sdk-python-1.4.6 → global_open_sdk_python-1.4.8}/com/alipay/ams/api/model/agreement_info.py

@@ -23,10 +23,10 @@ class AgreementInfo(object):
         self.__user_login_id = value
 
     def to_ams_json(self):
-        json_str = json.dumps(obj=self.__to_ams_dict(), default=lambda o: o.to_ams_dict(), indent=3)
+        json_str = json.dumps(obj=self.to_ams_dict(), default=lambda o: o.to_ams_dict(), indent=3)
         return json_str
 
-    def __to_ams_dict(self):
+    def to_ams_dict(self):
         params = dict()
         if self.__auth_state is not None:
             params['authState'] = self.__auth_state

global_open_sdk_python-1.4.8/com/alipay/ams/api/model/credential_type.py

@@ -0,0 +1,10 @@
+from enum import Enum, unique
+
+
+@unique
+class CredentialType(Enum):
+    NETWORK_TOKEN = "NETWORK_TOKEN"
+    PAN = "PAN"
+
+    def to_ams_dict(self):
+        return self.name

global_open_sdk_python-1.4.8/com/alipay/ams/api/model/mpi_data.py

@@ -0,0 +1,85 @@
+import json
+
+
+class MpiData(object):
+
+    def __init__(self):
+        self.__three_ds_version = None
+        self.eci = None
+        self.cavv = None
+        self.ds_transaction_id = None
+        self.credential_type = None
+
+    @property
+    def three_ds_version(self):
+        return self.__three_ds_version
+
+    @three_ds_version.setter
+    def three_ds_version(self, value):
+        self.__three_ds_version = value
+
+
+    @property
+    def eci(self):
+        return self.__eci
+
+    @eci.setter
+    def eci(self, value):
+        self.__eci = value
+
+
+    @property
+    def cavv(self):
+        return self.__cavv
+
+    @cavv.setter
+    def cavv(self, value):
+        self.__cavv = value
+
+
+    @property
+    def ds_transaction_id(self):
+        return self.__ds_transaction_id
+
+    @ds_transaction_id.setter
+    def ds_transaction_id(self, value):
+        self.__ds_transaction_id = value
+
+    @property
+    def credential_type(self):
+        return self.__credential_type
+
+    @credential_type.setter
+    def credential_type(self, value):
+        self.__credential_type = value
+
+
+    def to_ams_dict(self):
+        ams_dict = {}
+        if self.three_ds_version:
+            ams_dict['threeDSVersion'] = self.three_ds_version
+        if self.eci:
+            ams_dict['eci'] = self.eci
+        if self.cavv:
+            ams_dict['cavv'] = self.cavv
+        if self.ds_transaction_id:
+            ams_dict['dsTransactionId'] = self.ds_transaction_id
+        if self.credential_type:
+            ams_dict['credentialType'] = self.credential_type
+        return ams_dict
+
+
+    def parse_rsp_body(self, response_body):
+        if type(response_body) == str:
+            response_body = json.loads(response_body)
+            if 'threeDSVersion' in response_body:
+                self.three_ds_version = response_body['threeDSVersion']
+            if 'eci' in response_body:
+                self.eci = response_body['eci']
+            if 'cavv' in response_body:
+                self.cavv = response_body['cavv']
+            if 'dsTransactionId' in response_body:
+                self.ds_transaction_id = response_body['dsTransactionId']
+            if 'credentialType' in response_body:
+                self.credential_type = response_body['credentialType']
+

{global-open-sdk-python-1.4.6 → global_open_sdk_python-1.4.8}/com/alipay/ams/api/model/payment_method.py

@@ -2,6 +2,8 @@
 # -*- coding: utf-8 -*-
 import json
 
+from com.alipay.ams.api.model.funding_type import FundingType
+
 
 class PaymentMethod(object):
     def __init__(self):
@@ -10,6 +12,8 @@ class PaymentMethod(object):
         self.__payment_method_meta_data = None #type: map
         self.__customer_id = None
         self.__extend_info = None
+        self.__require_issuer_authentication = None #type: bool
+        self.funding = None #type: FundingType
 
     @property
     def payment_method_type(self):
@@ -51,6 +55,21 @@ class PaymentMethod(object):
     def extend_info(self, value):
         self.__extend_info = value
 
+    @property
+    def require_issuer_authentication(self):
+        return self.__require_issuer_authentication
+    @require_issuer_authentication.setter
+    def require_issuer_authentication(self, value):
+        self.__require_issuer_authentication = value
+
+    @property
+    def funding(self):
+        return self.__funding
+
+    @funding.setter
+    def funding(self, value):
+        self.__funding = value
+
     def to_ams_dict(self):
         params = dict()
         if hasattr(self, "payment_method_type") and self.payment_method_type:
@@ -68,6 +87,12 @@ class PaymentMethod(object):
         if hasattr(self, "extend_info") and self.extend_info:
             params['extendInfo'] = self.extend_info
 
+        if hasattr(self, "require_issuer_authentication") and self.require_issuer_authentication:
+            params['requireIssuerAuthentication'] = self.require_issuer_authentication
+
+        if hasattr(self, "funding") and self.funding:
+            params['funding'] = self.funding
+
         return params
 
     def parse_rsp_body(self, response_body):
@@ -83,4 +108,8 @@ class PaymentMethod(object):
         if 'paymentMethodId' in response_body:
             self.payment_method_id = response_body['paymentMethodId']
         if 'extendInfo' in response_body:
-            self.extend_info = response_body['extendInfo']
+            self.extend_info = response_body['extendInfo']
+        if 'requireIssuerAuthentication' in response_body:
+            self.require_issuer_authentication = response_body['requireIssuerAuthentication']
+        if 'funding' in response_body:
+            self.funding = response_body['funding']

{global-open-sdk-python-1.4.6 → global_open_sdk_python-1.4.8}/com/alipay/ams/api/model/payment_result_info.py

@@ -1,5 +1,8 @@
 import json
 
+from com.alipay.ams.api.model.acquirer_info import AcquirerInfo
+from com.alipay.ams.api.model.three_ds_result import ThreeDSResult
+
 
 class PaymentResultInfo(object):
 
@@ -20,6 +23,11 @@ class PaymentResultInfo(object):
         self.__last_four = None
         self.__expiry_month = None
         self.__expiry_year = None
+        self.__account_no = None
+        self.__refusal_code_raw = None
+        self.__refusal_reason_raw = None
+        self.__merchant_advice_code = None
+        self.__acquirer_info = None #type: AcquirerInfo
 
 
     @property
@@ -150,6 +158,50 @@ class PaymentResultInfo(object):
     def expiry_year(self, value):
         self.__expiry_year = value
 
+
+    @property
+    def account_no(self):
+        return self.__account_no
+
+    @account_no.setter
+    def account_no(self, value):
+        self.__account_no = value
+
+    @property
+    def refusal_code_raw(self):
+        return self.__refusal_code_raw
+
+    @refusal_code_raw.setter
+    def refusal_code_raw(self, value):
+        self.__refusal_code_raw = value
+
+
+    @property
+    def refusal_reason_raw(self):
+        return self.__refusal_reason_raw
+
+    @refusal_reason_raw.setter
+    def refusal_reason_raw(self, value):
+        self.__refusal_reason_raw = value
+
+    @property
+    def merchant_advice_code(self):
+        return self.__merchant_advice_code
+
+    @merchant_advice_code.setter
+    def merchant_advice_code(self, value):
+        self.__merchant_advice_code = value
+
+    @property
+    def acquirer_info(self):
+        return self.__acquirer_info
+
+    @acquirer_info.setter
+    def acquirer_info(self, value):
+        self.__acquirer_info = value
+
+
+
     def to_ams_dict(self):
         param = dict()
         if hasattr(self, 'avs_result_raw') and self.avs_result_raw:
@@ -184,6 +236,16 @@ class PaymentResultInfo(object):
             param['expiryMonth'] = self.expiry_month
         if hasattr(self, 'expiry_year') and self.expiry_year:
             param['expiryYear'] = self.expiry_year
+        if hasattr(self, 'account_no') and self.account_no:
+            param['accountNo'] = self.account_no
+        if hasattr(self, 'refusal_code_raw') and self.refusal_code_raw:
+            param['refusalCodeRaw'] = self.refusal_code_raw
+        if hasattr(self, 'refusal_reason_raw') and self.refusal_reason_raw:
+            param['refusalReasonRaw'] = self.refusal_reason_raw
+        if hasattr(self, 'merchant_advice_code') and self.merchant_advice_code:
+            param['merchantAdviceCode'] = self.merchant_advice_code
+        if hasattr(self, 'acquirer_info') and self.acquirer_info:
+            param['acquirerInfo'] = self.acquirer_info
 
         return param
 
@@ -223,3 +285,13 @@ class PaymentResultInfo(object):
             self.expiry_month = payment_result_info_body['expiryMonth']
         if 'expiryYear' in payment_result_info_body:
             self.expiry_year = payment_result_info_body['expiryYear']
+        if 'accountNo' in payment_result_info_body:
+            self.account_no = payment_result_info_body['accountNo']
+        if 'refusalCodeRaw' in payment_result_info_body:
+            self.refusal_code_raw = payment_result_info_body['refusalCodeRaw']
+        if 'refusalReasonRaw' in payment_result_info_body:
+            self.refusal_reason_raw = payment_result_info_body['refusalReasonRaw']
+        if 'merchantAdviceCode' in payment_result_info_body:
+            self.merchant_advice_code = payment_result_info_body['merchantAdviceCode']
+        if 'acquirerInfo' in payment_result_info_body:
+            self.acquirer_info = payment_result_info_body['acquirerInfo']

{global-open-sdk-python-1.4.6 → global_open_sdk_python-1.4.8}/com/alipay/ams/api/model/three_ds_result.py

@@ -8,6 +8,8 @@ class ThreeDSResult(object):
         self.__cavv = None
         self.__ds_transaction_id = None
         self.__xid = None
+        self.__three_ds_transaction_status_reason = None
+        self.__challenge_cancel = None
 
     @property
     def three_ds_version(self):
@@ -49,6 +51,23 @@ class ThreeDSResult(object):
     def xid(self, value):
         self.__xid = value
 
+    @property
+    def three_ds_transaction_status_reason(self):
+        return self.__three_ds_transaction_status_reason
+
+    @three_ds_transaction_status_reason.setter
+    def three_ds_transaction_status_reason(self, value):
+        self.__three_ds_transaction_status_reason = value
+
+    @property
+    def challenge_cancel(self):
+        return self.__challenge_cancel
+
+
+    @challenge_cancel.setter
+    def challenge_cancel(self, value):
+        self.__challenge_cancel = value
+
     def to_ams_dict(self):
         param = dict()
         if hasattr(self, 'three_ds_version') and self.three_ds_version:
@@ -61,6 +80,10 @@ class ThreeDSResult(object):
             param['dsTransactionId'] = self.ds_transaction_id
         if hasattr(self, 'xid') and self.xid:
             param['xid'] = self.xid
+        if hasattr(self, 'three_ds_transaction_status_reason') and self.three_ds_transaction_status_reason:
+            param['threeDSTransactionStatusReason'] = self.three_ds_transaction_status_reason
+        if hasattr(self, 'challenge_cancel') and self.challenge_cancel:
+            param['challengeCancel'] = self.challenge_cancel
         return param
 
     def parse_rsp_body(self, three_dS_result_body):
@@ -76,3 +99,7 @@ class ThreeDSResult(object):
             self.ds_transaction_id = three_dS_result_body['dsTransactionId']
         if 'xid' in three_dS_result_body:
             self.xid = three_dS_result_body['xid']
+        if 'threeDSTransactionStatusReason' in three_dS_result_body:
+            self.three_ds_transaction_status_reason = three_dS_result_body['threeDSTransactionStatusReason']
+        if 'challengeCancel' in three_dS_result_body:
+            self.challenge_cancel = three_dS_result_body['challengeCancel']

{global-open-sdk-python-1.4.6 → global_open_sdk_python-1.4.8}/com/alipay/ams/api/request/pay/alipay_capture_request.py

@@ -5,6 +5,7 @@ import json
 
 from com.alipay.ams.api.model.amount import Amount
 from com.alipay.ams.api.model.antom_path_constants import AntomPathConstants
+from com.alipay.ams.api.model.transit import Transit
 from com.alipay.ams.api.request.alipay_request import AlipayRequest
 
 
@@ -16,6 +17,8 @@ class AlipayCaptureRequest(AlipayRequest):
         self.__payment_id = None
         self.__capture_amount = None  # type: Amount
         self.__is_last_capture = None
+        self.__capture_type = None
+        self.__transit = None # type: Transit
 
     @property
     def capture_request_id(self):
@@ -49,6 +52,22 @@ class AlipayCaptureRequest(AlipayRequest):
     def is_last_capture(self, value):
         self.__is_last_capture = value
 
+    @property
+    def capture_type(self):
+        return self.__capture_type
+
+    @capture_type.setter
+    def capture_type(self, value):
+        self.__capture_type = value
+
+    @property
+    def transit(self):
+        return self.__transit
+
+    @transit.setter
+    def transit(self, value):
+        self.__transit = value
+
     def to_ams_json(self):
         json_str = json.dumps(obj=self.__to_ams_dict(), default=lambda o: o.to_ams_dict(), indent=3)
         return json_str
@@ -67,4 +86,10 @@ class AlipayCaptureRequest(AlipayRequest):
         if hasattr(self, "is_last_capture") and self.is_last_capture:
             params['isLastCapture'] = self.is_last_capture
 
+        if hasattr(self, "capture_type") and self.capture_type:
+            params['captureType'] = self.capture_type
+
+        if hasattr(self, "transit") and self.transit:
+            params['transit'] = self.transit
+
         return params

{global-open-sdk-python-1.4.6 → global_open_sdk_python-1.4.8}/com/alipay/ams/api/request/pay/alipay_create_session_request.py

@@ -38,6 +38,7 @@ class AlipayCreateSessionRequest(AlipayRequest):
         self.__available_payment_method = None # type: list[AvailablePaymentMethod]
         self.__allowed_payment_method_regions = None # type: list[str]
         self.__subscription_info = None  # type: SubscriptionInfo
+        self.__user_region= None
 
     @property
     def product_code(self):
@@ -207,6 +208,15 @@ class AlipayCreateSessionRequest(AlipayRequest):
     def subscription_info(self, value):
         self.__subscription_info = value
 
+
+    @property
+    def user_region(self):
+        return self.__user_region
+
+    @user_region.setter
+    def user_region(self, value):
+        self.__user_region = value
+
     def to_ams_json(self):
         json_str = json.dumps(obj=self.__to_ams_dict(), default=lambda o: o.to_ams_dict(), indent=3)
         return json_str
@@ -255,4 +265,6 @@ class AlipayCreateSessionRequest(AlipayRequest):
             params['allowedPaymentMethodRegions'] = self.allowed_payment_method_regions
         if hasattr(self, "subscription_info") and self.subscription_info:
             params['subscriptionInfo'] = self.subscription_info
+        if hasattr(self, "user_region") and self.user_region:
+            params['userRegion'] = self.user_region
         return params

{global-open-sdk-python-1.4.6 → global_open_sdk_python-1.4.8}/global_open_sdk_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: global-open-sdk-python
-Version: 1.4.6
+Version: 1.4.8
 Summary: The global alipay gateway SDK for Python.
 Home-page: https://github.com/alipay/global-open-sdk-python
 Author: guodong.wzj
@@ -30,3 +30,13 @@ Requires-Dist: pytz
 Requires-Dist: pycryptodome
 Requires-Dist: rsa
 Requires-Dist: cryptography
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: license-file
+Dynamic: platform
+Dynamic: requires-dist
+Dynamic: summary

{global-open-sdk-python-1.4.6 → global_open_sdk_python-1.4.8}/global_open_sdk_python.egg-info/SOURCES.txt

@@ -59,6 +59,7 @@ com/alipay/ams/api/model/company_unit_type.py
 com/alipay/ams/api/model/contact.py
 com/alipay/ams/api/model/contact_info.py
 com/alipay/ams/api/model/coupon_payment_method_detail.py
+com/alipay/ams/api/model/credential_type.py
 com/alipay/ams/api/model/credit_pay_fee_type.py
 com/alipay/ams/api/model/credit_pay_plan.py
 com/alipay/ams/api/model/customer_belongs_to.py
@@ -101,6 +102,7 @@ com/alipay/ams/api/model/merchant_info.py
 com/alipay/ams/api/model/merchant_registration_info.py
 com/alipay/ams/api/model/merchant_type.py
 com/alipay/ams/api/model/method_type.py
+com/alipay/ams/api/model/mpi_data.py
 com/alipay/ams/api/model/order.py
 com/alipay/ams/api/model/order_code_form.py
 com/alipay/ams/api/model/order_info.py

{global-open-sdk-python-1.4.6 → global_open_sdk_python-1.4.8}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = global-alipay-sdk-python
-version = 1.4.6
+version = 1.4.8
 
 [options]
 packages = find:

{global-open-sdk-python-1.4.6 → global_open_sdk_python-1.4.8}/setup.py

@@ -12,7 +12,7 @@ DESCRIPTION = "The global alipay gateway SDK for Python."
 AUTHOR = "guodong.wzj"
 AUTHOR_EMAIL = "wangzunjiao.wzj@digital-engine.com"
 URL = "https://github.com/alipay/global-open-sdk-python"
-VERSION = "1.4.6"
+VERSION = "1.4.8"
 '''
 only python2 need enum34、pytz
 '''