mns-scheduler 1.3.2.0__tar.gz → 1.3.2.4__tar.gz

{mns-scheduler-1.3.2.0 → mns-scheduler-1.3.2.4}/PKG-INFO

@@ -1,3 +1,3 @@
 Metadata-Version: 2.1
 Name: mns-scheduler
-Version: 1.3.2.0
+Version: 1.3.2.4

{mns-scheduler-1.3.2.0 → mns-scheduler-1.3.2.4}/mns_scheduler/company_info/em_stock_info/sync_em_stock_info_sync.py

@@ -13,7 +13,7 @@ import mns_common.api.em.real_time.east_money_stock_a_v2_api as east_money_stock
 import mns_common.api.em.real_time.east_money_debt_api as east_money_debt_api
 import mns_common.api.em.real_time.east_money_etf_api as east_money_etf_api
 import mns_common.api.em.real_time.east_money_stock_hk_api as east_money_stock_hk_api
-import mns_common.constant.db_name_constant as db_name_constant
+import mns_common.constant.extra_income_db_name as extra_income_db_name
 import mns_common.component.cookie.cookie_info_service as cookie_info_service
 
 import mns_common.api.em.real_time.east_money_stock_us_api as east_money_stock_us_api
@@ -30,14 +30,14 @@ def sync_all_em_stock_info():
     try:
         em_a_stock_info_df = east_money_stock_a_v2_api.get_all_real_time_quotes(proxies)
         em_a_stock_info_df['_id'] = em_a_stock_info_df['symbol']
-        mongodb_util.save_mongo(em_a_stock_info_df, db_name_constant.EM_A_STOCK_INFO)
+        mongodb_util.save_mongo(em_a_stock_info_df, extra_income_db_name.EM_A_STOCK_INFO)
     except BaseException as e:
         logger.error("同步东方财富A股信息异常:{}", e)
 
     try:
         em_etf_info = east_money_etf_api.get_etf_real_time_quotes(proxies)
         em_etf_info['_id'] = em_etf_info['symbol']
-        mongodb_util.save_mongo(em_etf_info, db_name_constant.EM_ETF_INFO)
+        mongodb_util.save_mongo(em_etf_info, extra_income_db_name.EM_ETF_INFO)
     except BaseException as e:
         logger.error("同步东方财富ETF信息异常:{}", e)
 
@@ -45,7 +45,7 @@ def sync_all_em_stock_info():
         em_kzz_info = east_money_debt_api.get_debt_real_time_quotes(proxies)
 
         em_kzz_info['_id'] = em_kzz_info['symbol']
-        mongodb_util.save_mongo(em_kzz_info, db_name_constant.EM_KZZ_INFO)
+        mongodb_util.save_mongo(em_kzz_info, extra_income_db_name.EM_KZZ_INFO)
     except BaseException as e:
         logger.error("同步东方财富可转债信息异常:{}", e)
 
@@ -53,7 +53,7 @@ def sync_all_em_stock_info():
     try:
         em_hk_stock_info = east_money_stock_hk_api.get_hk_real_time_quotes(em_cookie, proxies)
         em_hk_stock_info['_id'] = em_hk_stock_info['symbol']
-        mongodb_util.save_mongo(em_hk_stock_info, db_name_constant.EM_HK_STOCK_INFO)
+        mongodb_util.save_mongo(em_hk_stock_info, extra_income_db_name.EM_HK_STOCK_INFO)
     except BaseException as e:
         logger.error("同步东方财富港股信息异常:{}", e)
 
@@ -61,7 +61,12 @@ def sync_all_em_stock_info():
         em_cookie = cookie_info_service.get_em_cookie()
         em_us_stock_info = east_money_stock_us_api.get_us_stock_real_time_quotes(em_cookie, proxies)
         em_us_stock_info['_id'] = em_us_stock_info['symbol']
-        mongodb_util.save_mongo(em_us_stock_info, db_name_constant.EM_US_STOCK_INFO)
+        mongodb_util.save_mongo(em_us_stock_info, extra_income_db_name.EM_US_STOCK_INFO)
+        em_us_etf_info = em_us_stock_info.loc[(em_us_stock_info['amount'] != 0) & (em_us_stock_info['total_mv'] == 0)]
+        em_us_etf_info = em_us_etf_info.loc[em_us_etf_info['amount'] > 10000000]
+        em_us_etf_info = em_us_etf_info.sort_values(by=['amount'], ascending=False)
+        mongodb_util.save_mongo(em_us_etf_info, extra_income_db_name.EM_US_ETF_INFO)
+
     except BaseException as e:
         logger.error("同步东方财富美股信息异常:{}", e)
     logger.info("同步东方财富a,etf,kzz,us,hk,信息完成")

{mns-scheduler-1.3.2.0 → mns-scheduler-1.3.2.4}/mns_scheduler/trade/sync_position_api.py

@@ -21,8 +21,8 @@ def sync_position():
     now_date = datetime.datetime.now()
     str_day = now_date.strftime('%Y-%m-%d')
     query_exist = {'str_day': str_day}
-    # if mongodb_util.exist_data_query(db_name_constant.POSITION_STOCK, query_exist):
-    #     return None
+    if mongodb_util.exist_data_query(db_name_constant.POSITION_STOCK, query_exist):
+        return None
     position_list = deal_service_api.get_position('easy_trader')
     position_df = pd.DataFrame(position_list)
     position_df = position_df.rename(columns={"明细": "detail",

{mns-scheduler-1.3.2.0 → mns-scheduler-1.3.2.4}/mns_scheduler.egg-info/PKG-INFO

@@ -1,3 +1,3 @@
 Metadata-Version: 2.1
 Name: mns-scheduler
-Version: 1.3.2.0
+Version: 1.3.2.4

{mns-scheduler-1.3.2.0 → mns-scheduler-1.3.2.4}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='mns-scheduler',
-    version='1.3.2.0',
+    version='1.3.2.4',
     packages=find_packages(),
     install_requires=[],  # 如果有依赖项，可以在这里列出
 )