Merge remote-tracking branch 'origin/2104'

# Conflicts: # futu/VERSION.txt
ouou1000 · Apr 26, 2021 · 75d0e39 · 75d0e39
2 parents ec32e5a + 2b6ded1
commit 75d0e39
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 16 deletions.
diff --git a/futu/VERSION.txt b/futu/VERSION.txt
@@ -1 +1 @@
-5.2.1408
+5.3.1507
diff --git a/futu/common/constant.py b/futu/common/constant.py
@@ -2447,12 +2447,14 @@ class SecurityFirm(FtEnum):
     NONE = 'N/A'
     FUTUSECURITIES = 'FUTUSECURITIES'
     FUTUINC = 'FUTUINC'
+    FUTUSG = 'FUTUSG'
 
     def load_dic(self):
         return {
             self.NONE: Trd_Common_pb2.SecurityFirm_Unknown,
             self.FUTUSECURITIES: Trd_Common_pb2.SecurityFirm_FutuSecurities,
-            self.FUTUINC: Trd_Common_pb2.SecurityFirm_FutuInc
+            self.FUTUINC: Trd_Common_pb2.SecurityFirm_FutuInc,
+            self.FUTUSG: Trd_Common_pb2.SecurityFirm_FutuSG
         }
 
 # 模拟交易账号类型

diff --git a/futu/common/pb/Common_pb2.py b/futu/common/pb/Common_pb2.py
diff --git a/futu/common/pb/Trd_Common.proto b/futu/common/pb/Trd_Common.proto
@@ -150,8 +150,9 @@ enum TimeInForce
 enum SecurityFirm
 {
     SecurityFirm_Unknown = 0;        //未知
-    SecurityFirm_FutuSecurities = 1; //富途证券
-	SecurityFirm_FutuInc = 2;        //富途Inc
+    SecurityFirm_FutuSecurities = 1; //富途证券（香港）
+	SecurityFirm_FutuInc = 2;        //富途证券（美国）
+	SecurityFirm_FutuSG = 3;         //富途证券（新加坡）
 }
 
 //模拟交易账户类型

diff --git a/futu/common/pb/Trd_Common_pb2.py b/futu/common/pb/Trd_Common_pb2.py
diff --git a/futu/trade/open_trade_context.py b/futu/trade/open_trade_context.py
@@ -289,7 +289,7 @@ def accinfo_query(self, trd_env=TrdEnv.REAL, acc_id=0, acc_index=0, refresh_cach
             'pending_asset', 'interest_charged_amount', 'frozen_cash', 'avl_withdrawal_cash', 'max_withdrawal', 'currency',
             'available_funds', 'unrealized_pl', 'realized_pl', 'risk_level', 'risk_status', 'initial_margin',
             'margin_call_margin', 'maintenance_margin', 'hk_cash', 'hk_avl_withdrawal_cash', 'us_cash',
-            'us_avl_withdrawal_cash'
+            'us_avl_withdrawal_cash', 'jp_cash', 'jp_avl_withdrawal_cash'
         ]
         accinfo_frame_table = pd.DataFrame(accinfo_list, columns=col_list)
 

diff --git a/futu/trade/trade_query.py b/futu/trade/trade_query.py
@@ -157,7 +157,9 @@ def unpack_rsp(cls, rsp_pb):
             'hk_cash': NoneDataValue,
             'hk_avl_withdrawal_cash': NoneDataValue,
             'us_cash': NoneDataValue,
-            'us_avl_withdrawal_cash': NoneDataValue
+            'us_avl_withdrawal_cash': NoneDataValue,
+            'jp_cash': NoneDataValue,
+            'jp_avl_withdrawal_cash': NoneDataValue
         }]
         for cashInfo in raw_funds.cashInfoList:
             if cashInfo.currency == Trd_Common_pb2.Currency_HKD:
@@ -166,6 +168,9 @@ def unpack_rsp(cls, rsp_pb):
             elif cashInfo.currency == Trd_Common_pb2.Currency_USD:
                 accinfo_list[0]['us_cash'] = cashInfo.cash
                 accinfo_list[0]['us_avl_withdrawal_cash'] = cashInfo.availableBalance
+            elif cashInfo.currency == Trd_Common_pb2.Currency_JPY:
+                accinfo_list[0]['jp_cash'] = cashInfo.cash
+                accinfo_list[0]['jp_avl_withdrawal_cash'] = cashInfo.availableBalance
         return RET_OK, "", accinfo_list
 
 

diff --git a/setup.py b/setup.py
@@ -29,6 +29,9 @@
 with open(join(dirname(__file__), 'futu/VERSION.txt'), 'rb') as f:
     version = f.read().decode('ascii').strip()
 
+with open("README.md", "r") as fh:
+    long_desc = fh.read()
+
 install_requires = ["pandas",
                     "simplejson",
                     "protobuf==3.5.1",
@@ -42,6 +45,8 @@
     name='futu-api',
     version=version,
     description='Futu Quantitative Trading API',
+	long_description=long_desc,
+	long_description_content_type="text/markdown",
     classifiers=[],
     keywords='Futu HK/US Stock Quant Trading API',
     author='Futu, Inc.',