mns-common 1.4.40__py3-none-any.whl → 1.5.0.1__py3-none-any.whl

mns_common/api/em/gd/east_money_stock_gdfx_free_top_10_api.py

@@ -166,7 +166,8 @@ def sync_stock_gdfx_free_top_10(stock_gdfx_free_top_10_em_df, period, symbol, st
         stock_gdfx_free_top_10_em_df['str_day'] = str_day
 
         stock_gdfx_free_top_10_em_df['symbol'] = symbol
-        stock_gdfx_free_top_10_em_df['_id'] = symbol +  '_' + period+'_'+str(stock_gdfx_free_top_10_em_df.shareholder_name)
+        stock_gdfx_free_top_10_em_df[
+            '_id'] = symbol + '_' + period + '_' + stock_gdfx_free_top_10_em_df.shareholder_name
         stock_gdfx_free_top_10_em_df['period'] = period
 
         query_exist = {'symbol': symbol, 'period': period}
@@ -187,7 +188,7 @@ def sync_stock_gdfx_top_10(stock_gdfx_top_10_em_df, period, symbol, str_day):
     if stock_gdfx_top_10_em_df is not None and stock_gdfx_top_10_em_df.shape[0] > 0:
         stock_gdfx_top_10_em_df['str_day'] = str_day
         stock_gdfx_top_10_em_df['symbol'] = symbol
-        stock_gdfx_top_10_em_df['_id'] = symbol +  '_' + period+'_'+str(stock_gdfx_top_10_em_df.shareholder_name)
+        stock_gdfx_top_10_em_df['_id'] = symbol + '_' + period + '_' + stock_gdfx_top_10_em_df.shareholder_name
         stock_gdfx_top_10_em_df['period'] = period
 
         query_exist = {'symbol': symbol, 'period': period}
@@ -213,6 +214,7 @@ def sync_stock_gdfx_free_top_10_one_day(str_day):
             get_stock_gdfx_free_top_10_em(str_day, real_time_one.symbol)
         except BaseException as e:
             logger.error('同步所有股票前十大流通股本异常:{},{}', real_time_one.symbol, e)
+    logger.info('同步所有股票股东列表完成:{}', str_day)
 
 
 from datetime import datetime

mns_common/api/k_line/stock_k_line_data_api.py

@@ -16,6 +16,7 @@ def stock_k_line_hist(
         end_date: str = "20500101",
         adjust: str = "",
         timeout: float = None,
+        proxies: str = None
 ) -> pd.DataFrame:
     """
     东方财富网-行情首页-沪深京 A 股-每日行情
@@ -32,6 +33,9 @@ def stock_k_line_hist(
     :type adjust: str
     :param timeout: choice of None or a positive float number
     :type timeout: float
+        :param proxies: 代理ip
+    :type proxies: str
+
     :return: 每日行情
     :rtype: pandas.DataFrame
     """
@@ -49,7 +53,12 @@ def stock_k_line_hist(
         "end": end_date,
         "_": "1623766962675",
     }
-    r = requests.get(url, params=params, timeout=timeout)
+
+    if proxies is None:
+
+        r = requests.get(url, params=params, timeout=timeout)
+    else:
+        r = requests.get(url, params=params, proxies=proxies, timeout=timeout)
     data_json = r.json()
     if not (data_json["data"] and data_json["data"]["klines"]):
         return pd.DataFrame()
@@ -103,4 +112,5 @@ if __name__ == '__main__':
         "19700101",
         "20500101",
         "",
+        None,
         None)

mns_common/component/deal/deal_service_v2_api.py

@@ -0,0 +1,167 @@
+import sys
+import os
+
+file_path = os.path.abspath(__file__)
+end = file_path.index('mns') + 16
+project_path = file_path[0:end]
+sys.path.append(project_path)
+import json
+import requests
+
+'''
+
+'''
+
+
+def trade_buy(symbol, buy_price, buy_volume, terminal):
+    '''
+    买入
+    :param symbol:
+    :param buy_price:
+    :param buy_volume:
+    :param terminal:
+    :return:
+    '''
+    param_buy = {
+        'symbol': symbol,
+        'buy_price': buy_price,
+        'buy_volume': buy_volume,
+        'terminal': terminal}
+    param_json = json.dumps(param_buy)
+    response = request_trader_post('/buy', param_json)
+    if response.status_code != 200:
+        buy_result = {"message": '买入失败'}
+    else:
+        buy_result = response.json()
+    return buy_result
+
+
+def trade_sell(symbol, sell_price, sell_volume, terminal):
+    '''
+    卖出
+    :param symbol:
+    :param sell_price:
+    :param sell_volume:
+    :param terminal:
+    :return:
+    '''
+    param_sell = {
+        'symbol': symbol,
+        'sell_price': sell_price,
+        'sell_volume': sell_volume,
+        'terminal': terminal}
+    param_json = json.dumps(param_sell)
+    response = request_trader_post('/sell', param_json)
+    if response.status_code != 200:
+        sell_result = {"message": '卖出失败'}
+    else:
+        sell_result = response.json()
+    return sell_result
+
+
+def auto_ipo_buy(terminal):
+    '''
+    自动打新
+    :param terminal:
+    :return:
+    '''
+    param_auto_ipo = {
+        'terminal': terminal}
+    param_json = json.dumps(param_auto_ipo)
+    response = request_trader_get('/auto/ipo/buy', param_json)
+    if response.status_code != 200:
+        result = {"message": '自动打新失败'}
+    else:
+        result = response.json()
+    return result
+
+
+def get_position(terminal):
+    '''
+    获取持仓
+    :param terminal:
+    :return:
+    '''
+    param_position = {
+        'terminal': terminal}
+    param_json = json.dumps(param_position)
+    response = request_trader_get('/position', param_json)
+    if response.status_code != 200:
+        result = {"message": '获取持仓失败'}
+    else:
+        result = response.json()
+    return result
+
+
+def order_cancel(entrust_no, terminal):
+    '''
+    撤单
+       :param entrust_no:
+    :param terminal:
+    :return:
+    '''
+    param_cancel = {
+        "entrust_no": entrust_no,
+        'terminal': terminal}
+    param_json = json.dumps(param_cancel)
+    response = request_trader_post('/cancel', param_json)
+    if response.status_code != 200:
+        result = {"message": '撤单失败'}
+    else:
+        result = response.json()
+    return result
+
+
+# 自动登陆接口
+def auto_login(terminal):
+    '''
+      自动登陆客户端
+      :param terminal:
+      :return:
+      '''
+    param_position = {
+        'terminal': terminal}
+    param_json = json.dumps(param_position)
+    response = request_trader_post('/auto/login', param_json)
+    if response.status_code != 200:
+        result = {"message": '获取持仓失败'}
+    else:
+        result = response.json()
+    return result
+
+
+def request_trader_post(url, param):
+    total_url = "http://127.0.0.1:5002/api/trade" + url
+    headers = {
+        "Content-Type": "application/json"
+    }
+    return requests.post(total_url, data=param, headers=headers)
+
+
+def request_trader_get(url, param):
+    total_url = "http://127.0.0.1:5002/api/trade" + url
+    headers = {
+        "Content-Type": "application/json"
+    }
+    return requests.get(total_url, data=param, headers=headers)
+
+
+if __name__ == '__main__':
+    # auto_login('qmt')
+    # get_position('qmt')
+    # terminal_test = 'easy_trader'
+    # order_cancel('251145121', terminal_test)
+    # get_position(terminal_test)
+    # auto_ipo_buy(terminal_test)
+    buy_result_test = trade_buy(
+        '688693.SH',
+        36.39,
+        1000,
+        'ths')
+    entrust_no_test = buy_result_test['entrust_no']
+    order_cancel(entrust_no_test, 'ths')
+    # trade_sell(
+    #     '301314',
+    #     35.77,
+    #     100,
+    #     'easy_trader')

{mns_common-1.4.40.dist-info → mns_common-1.5.0.1.dist-info}/METADATA

@@ -1,4 +1,4 @@
 Metadata-Version: 2.1
 Name: mns-common
-Version: 1.4.40
+Version: 1.5.0.1
 

{mns_common-1.4.40.dist-info → mns_common-1.5.0.1.dist-info}/RECORD

@@ -11,7 +11,7 @@ mns_common/api/em/__init__.py,sha256=2U9DiKslxsWwLLEcZKjS8UiQPN1QgALvnK3HiJNIZE0
 mns_common/api/em/concept/__init__.py,sha256=wEg73KlZo-dU0yKGwpA1C2y6LZm4IBb94tNda1tqLeg,163
 mns_common/api/em/concept/em_concept_index_api.py,sha256=PP87ES8a_y0o3SKLzBsPrc7DCPI3MBCD-4SmoUUirl0,8285
 mns_common/api/em/gd/__init__.py,sha256=wEg73KlZo-dU0yKGwpA1C2y6LZm4IBb94tNda1tqLeg,163
-mns_common/api/em/gd/east_money_stock_gdfx_free_top_10_api.py,sha256=frpDljkZkkonPHVTCqfw5fzbDqZ1wP8kqJzpx6EA_uc,10525
+mns_common/api/em/gd/east_money_stock_gdfx_free_top_10_api.py,sha256=m0zMMAOaeSKyJniIQxnIP2KC3Q3MNp7ZSEOEkaMwBR0,10604
 mns_common/api/em/real_time/__init__.py,sha256=wEg73KlZo-dU0yKGwpA1C2y6LZm4IBb94tNda1tqLeg,163
 mns_common/api/em/real_time/east_money_debt_api.py,sha256=jMvMZtlrDfExl_4jZ1hepHX8rUoeVLoLSOIhRBjkUGk,14753
 mns_common/api/em/real_time/east_money_etf_api.py,sha256=tCyH4fNx-KfVRFuNGkgM8d_xkvR0oAfr8T3e7_XrjTM,14414
@@ -22,7 +22,7 @@ mns_common/api/em/real_time/east_money_stock_us_api.py,sha256=RiTrdZDuDgTOtiMSD1
 mns_common/api/hk/__init__.py,sha256=wEg73KlZo-dU0yKGwpA1C2y6LZm4IBb94tNda1tqLeg,163
 mns_common/api/hk/ths_hk_company_info_api.py,sha256=Cxlbuccopa0G1s8o0uTnnyLn2QaxOvbDpJQJOj7J8a8,5360
 mns_common/api/k_line/__init__.py,sha256=itoGlqKhsx7EVXQoD1vchDKQ5GPB16vDjofTSuQtrXg,161
-mns_common/api/k_line/stock_k_line_data_api.py,sha256=v27p4qU0bhBGp2t8bZDnyMz20a71GduhmK7uylt6GH4,3496
+mns_common/api/k_line/stock_k_line_data_api.py,sha256=oOtgSRik-F36FWdcWVIRlyYC2rCePvmZEjONFh1yjkk,3724
 mns_common/api/k_line/stock_minute_data_api.py,sha256=FNe9I_lvgdyEsKQVzdA0vZ5CWeB-KGtJiCpj0YPRuwY,5322
 mns_common/api/kpl/__init__.py,sha256=2U9DiKslxsWwLLEcZKjS8UiQPN1QgALvnK3HiJNIZE0,163
 mns_common/api/kpl/common/__init__.py,sha256=8b2PuXJM5fLoq71cWPXp695czQuaRtyR6OVHajGjDPc,161
@@ -92,6 +92,7 @@ mns_common/component/data/__init__.py,sha256=2U9DiKslxsWwLLEcZKjS8UiQPN1QgALvnK3
 mns_common/component/data/data_init_api.py,sha256=VFPmjk_Js16q42l3h1o__6DU1Dpnbf0BJlCBksU12q8,5355
 mns_common/component/deal/__init__.py,sha256=wEg73KlZo-dU0yKGwpA1C2y6LZm4IBb94tNda1tqLeg,163
 mns_common/component/deal/deal_service_api.py,sha256=XV_L8qfeTPbojmNXFjnUe-5ZTp3ADT3ett0j-gPuPVI,3806
+mns_common/component/deal/deal_service_v2_api.py,sha256=QmiMQeaCGV8Izuilihp_1_h3s2rCQUg8Lf6Qay5qX3A,4184
 mns_common/component/deal/terminal_enum.py,sha256=JUkSTXLQW1fob05PCCzIBg_VKlGmqaJEa0GOvrQH6e0,275
 mns_common/component/em/__init__.py,sha256=wEg73KlZo-dU0yKGwpA1C2y6LZm4IBb94tNda1tqLeg,163
 mns_common/component/em/em_real_time_quotes_api.py,sha256=9VAwzj_am-Jd4zG57bhrVjXrrsytzymSu8CIs7T7Lc0,2144
@@ -156,7 +157,7 @@ mns_common/utils/date_handle_util.py,sha256=XS-MyA8_7k35LOCFAYOHgVcVkMft_Kc4Wa9U
 mns_common/utils/db_util.py,sha256=hSmfNAN4vEeEaUva6_cicZEhb2jSnib-Gvk2reke1vc,2590
 mns_common/utils/file_util.py,sha256=egWu6PenGPRp_ixrNTHKarT4dAnOT6FETR82EHUZJnQ,1042
 mns_common/utils/ip_util.py,sha256=UTcYfz_uytB__6nlBf7T-izuI7hi4XdB6ET0sJgEel4,969
-mns_common-1.4.40.dist-info/METADATA,sha256=gaayvHC6VAn1TARZguxjemkK04N4pS48OyZkSixbh6I,60
-mns_common-1.4.40.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-mns_common-1.4.40.dist-info/top_level.txt,sha256=ZC58kAR-8Hvc6U2xhYNBNLAh3mb6sZazbdj5nZpvEkQ,11
-mns_common-1.4.40.dist-info/RECORD,,
+mns_common-1.5.0.1.dist-info/METADATA,sha256=s39Ru9_jwa3fZ315Ua1TJAyY-RoWdtrZwilleSyjI40,61
+mns_common-1.5.0.1.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+mns_common-1.5.0.1.dist-info/top_level.txt,sha256=ZC58kAR-8Hvc6U2xhYNBNLAh3mb6sZazbdj5nZpvEkQ,11
+mns_common-1.5.0.1.dist-info/RECORD,,