mns-scheduler 1.3.2.5__tar.gz → 1.3.2.7__tar.gz

{mns-scheduler-1.3.2.5 → mns-scheduler-1.3.2.7}/PKG-INFO

@@ -1,3 +1,3 @@
 Metadata-Version: 2.1
 Name: mns-scheduler
-Version: 1.3.2.5
+Version: 1.3.2.7

{mns-scheduler-1.3.2.5 → mns-scheduler-1.3.2.7}/mns_scheduler/zt/zt_pool/ths_zt_pool_sync_api.py

@@ -9,16 +9,13 @@ import mns_common.api.ths.zt.ths_stock_zt_pool_api as ths_stock_zt_pool_api
 from datetime import datetime
 import mns_common.utils.data_frame_util as data_frame_util
 import pandas as pd
-import mns_common.component.em.em_stock_info_api as em_stock_info_api
 import mns_common.component.company.company_common_service_new_api as company_common_service_new_api
 import mns_common.component.common_service_fun_api as common_service_fun_api
 from loguru import logger
-import mns_scheduler.k_line.common.k_line_common_api as k_line_common_api
-import mns_common.api.akshare.k_line_api as k_line_api
 import mns_common.utils.date_handle_util as date_handle_util
 from mns_common.db.MongodbUtil import MongodbUtil
 import mns_common.constant.db_name_constant as db_name_constant
-import time
+import mns_scheduler.k_line.common.k_line_common_api as k_line_common_api
 
 mongodb_util = MongodbUtil('27017')
 
@@ -33,56 +30,14 @@ def ths_zt_pool(str_day, real_time_quotes_all_stocks):
     now_date = datetime.now()
     now_day_str_day = now_date.strftime('%Y-%m-%d')
     ths_zt_pool_df = ths_stock_zt_pool_api.get_zt_reason(str_day)
-    if data_frame_util.is_empty(ths_zt_pool_df):
+    ths_zt_pool_df_copy = ths_zt_pool_df.copy()
+
+    if data_frame_util.is_empty(ths_zt_pool_df_copy):
         return pd.DataFrame()
     if str_day == now_day_str_day:
-        ths_zt_pool_df = merge_now_day_zt_info(ths_zt_pool_df, real_time_quotes_all_stocks)
+        ths_zt_pool_df = merge_his_day_zt_info(ths_zt_pool_df_copy, str_day)
     else:
-        ths_zt_pool_df = merge_his_day_zt_info(ths_zt_pool_df, str_day)
-
-    return ths_zt_pool_df
-
-
-def merge_now_day_zt_info(ths_zt_pool_df, real_time_quotes_all_stocks):
-    if real_time_quotes_all_stocks is None:
-        real_time_quotes_all_stocks = em_stock_info_api.get_a_stock_info()
-    real_time_quotes_all_stocks = real_time_quotes_all_stocks[['symbol', 'amount',
-                                                               'exchange', 'flow_mv', 'total_mv']]
-    real_time_quotes_all_stocks_zt = real_time_quotes_all_stocks.loc[
-        real_time_quotes_all_stocks['symbol'].isin(ths_zt_pool_df['symbol'])]
-
-    query_field = {
-        "ths_concept_name": 1,
-        "ths_concept_code": 1,
-        "ths_concept_sync_day": 1,
-        "company_type": 1,
-        "concept_create_day": 1,
-        "first_sw_industry": 1,
-        "third_sw_industry": 1,
-        "industry": 1,
-        "list_date": 1,
-    }
-    query_field_key = str(query_field)
-    query_key = str({'symbol': {"$in": list(ths_zt_pool_df['symbol'])}})
-    company_df_zt = company_common_service_new_api.get_company_info_by_field(query_key, query_field_key)
-
-    company_df_zt = company_df_zt.set_index(['_id'], drop=True)
-    real_time_quotes_all_stocks_zt = real_time_quotes_all_stocks_zt.set_index(['symbol'], drop=True)
-    ths_zt_pool_df = ths_zt_pool_df.set_index(['symbol'], drop=False)
-
-    ths_zt_pool_df = pd.merge(ths_zt_pool_df, company_df_zt, how='outer',
-                              left_index=True, right_index=True)
-
-    ths_zt_pool_df = pd.merge(ths_zt_pool_df, real_time_quotes_all_stocks_zt, how='outer',
-                              left_index=True, right_index=True)
-    ths_zt_pool_df['amount_level'] = round(ths_zt_pool_df['amount'] / common_service_fun_api.HUNDRED_MILLION, 2)
-    ths_zt_pool_df = common_service_fun_api.classify_symbol(ths_zt_pool_df)
-    ths_zt_pool_df = common_service_fun_api.total_mv_classification(ths_zt_pool_df)
-    ths_zt_pool_df.fillna('', inplace=True)
-    if 'zt_flag' in ths_zt_pool_df.columns:
-        del ths_zt_pool_df['zt_flag']
-    if 'zt_tag' in ths_zt_pool_df.columns:
-        del ths_zt_pool_df['zt_tag']
+        ths_zt_pool_df = merge_his_day_zt_info(ths_zt_pool_df_copy, str_day)
 
     return ths_zt_pool_df
 
@@ -143,33 +98,36 @@ def merge_his_day_zt_info(ths_zt_pool_df, str_day):
 def get_bfq_daily_line(ths_zt_pool_df, str_day):
     query_k_line = {'symbol': {"$in": list(ths_zt_pool_df['symbol'])}, 'date': date_handle_util.no_slash_date(str_day)}
     bfq_daily_line_df = mongodb_util.find_query_data('stock_bfq_daily', query_k_line)
-    if data_frame_util.is_not_empty(bfq_daily_line_df):
+    if bfq_daily_line_df.shape[0] >= ths_zt_pool_df.shape[0]:
         bfq_daily_line_df = bfq_daily_line_df[['amount', 'chg', 'close', 'exchange',
                                                'symbol', 'amount_level',
                                                'flow_mv', 'flow_mv_sp'
                                                ]]
         bfq_daily_line_df = bfq_daily_line_df.rename(columns={"close": 'now_price'})
         return bfq_daily_line_df
-
-    bfq_k_line_df = pd.DataFrame()
-    for zt_one in ths_zt_pool_df.itertuples():
-        try:
+    else:
+        bfq_k_line_df = pd.DataFrame()
+        for zt_one in ths_zt_pool_df.itertuples():
             symbol = zt_one.symbol
+            try:
+
+                bfq_daily_line_df = k_line_common_api.get_k_line_common_adapter(symbol, 'daily', '', str_day)
+
+                if data_frame_util.is_empty(bfq_daily_line_df):
+                    continue
 
-            bfq_daily_line_df = k_line_common_api.get_k_line_common_adapter(symbol, 'daily', '', str_day)
+                bfq_daily_line_df = bfq_daily_line_df.loc[bfq_daily_line_df['date'] == date_handle_util.no_slash_date(str_day)]
 
-            if data_frame_util.is_empty(bfq_daily_line_df):
-                continue
-            bfq_daily_line_df = bfq_daily_line_df[['amount', 'chg', 'close', 'exchange',
-                                                   'symbol', 'amount_level',
-                                                   'flow_mv', 'flow_mv_sp'
-                                                   ]]
-            bfq_daily_line_df = bfq_daily_line_df.rename(columns={"close": 'now_price'})
-            bfq_k_line_df = pd.concat([bfq_k_line_df, bfq_daily_line_df])
-        except BaseException as e:
-            logger.warning("同步不复权k线异常:{},{}", symbol, e)
+                bfq_daily_line_df = bfq_daily_line_df[['amount', 'chg', 'close', 'exchange',
+                                                       'symbol', 'amount_level',
+                                                       'flow_mv', 'flow_mv_sp'
+                                                       ]]
+                bfq_daily_line_df = bfq_daily_line_df.rename(columns={"close": 'now_price'})
+                bfq_k_line_df = pd.concat([bfq_k_line_df, bfq_daily_line_df])
+            except BaseException as e:
+                logger.warning("同步不复权k线异常:{},{}", symbol, e)
 
-    return bfq_k_line_df
+        return bfq_k_line_df
 
 
 def save_ths_zt_pool(ths_zt_pool_df, str_day):
@@ -229,6 +187,6 @@ if __name__ == '__main__':
     # trade_date = '2024-08-01'
     # zt_df = ths_zt_pool(trade_date, None)
     # save_ths_zt_pool(zt_df, trade_date)
-    trade_date = '2025-04-18'
-    ths_zt_pool_df = ths_zt_pool(trade_date, None)
-    save_ths_zt_pool(ths_zt_pool_df, trade_date)
+    trade_date = '2025-06-06'
+    ths_zt_pool_df_test = ths_zt_pool(trade_date, None)
+    save_ths_zt_pool(ths_zt_pool_df_test, trade_date)

{mns-scheduler-1.3.2.5 → mns-scheduler-1.3.2.7}/mns_scheduler.egg-info/PKG-INFO

@@ -1,3 +1,3 @@
 Metadata-Version: 2.1
 Name: mns-scheduler
-Version: 1.3.2.5
+Version: 1.3.2.7

{mns-scheduler-1.3.2.5 → mns-scheduler-1.3.2.7}/mns_scheduler.egg-info/SOURCES.txt

@@ -139,10 +139,6 @@ mns_scheduler/trade/task/__init__.py
 mns_scheduler/trade/task/trader_task_service.py
 mns_scheduler/trade/tfp/__init__.py
 mns_scheduler/trade/tfp/stock_tfp_info_sync.py
-mns_scheduler/us/__init__.py
-mns_scheduler/us/baidu_yun_pan_handle_service.py
-mns_scheduler/us/k_line.py
-mns_scheduler/us/us_company_info_sync_service_api.py
 mns_scheduler/zb/__init__.py
 mns_scheduler/zb/stock_zb_pool_sync.py
 mns_scheduler/zt/__init__.py

{mns-scheduler-1.3.2.5 → mns-scheduler-1.3.2.7}/setup.py

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

mns-scheduler-1.3.2.5/mns_scheduler/us/baidu_yun_pan_handle_service.py

@@ -1,91 +0,0 @@
-import sys
-import os
-
-file_path = os.path.abspath(__file__)
-end = file_path.index('mns') + 17
-project_path = file_path[0:end]
-sys.path.append(project_path)
-from bypy import ByPy
-from mns_common.db.MongodbUtil import MongodbUtil
-import tempfile
-from loguru import logger
-import akshare as ak
-
-mongodb_util = MongodbUtil('27017')
-
-import subprocess
-
-
-def get_file_list(path):
-    """
-    获取百度网盘指定路径下的文件列表
-    :param path: 百度网盘中的路径，例如 '/我的资源'
-    :return: 文件列表
-    """
-    try:
-        # 调用 bypy list 命令
-        result = subprocess.run(['bypy', 'list', path], capture_output=True, text=True, check=True, encoding='utf-8')
-
-        # 输出结果
-        if result.returncode == 0:
-            file_list = result.stdout.splitlines()  # 按行分割结果
-            return file_list
-        else:
-            logger.error("获取文件路径异常:{}", result.stderr)
-            return []
-    except subprocess.CalledProcessError as e:
-        logger.error("获取文件路径异常:{}", e)
-        return []
-
-
-def upload_to_baidu(file_name, folder_name, data_df):
-    bp = ByPy()
-    file_name = file_name + '.csv'
-    with tempfile.NamedTemporaryFile(mode='w', suffix='.csv', delete=False) as temp_file:
-        data_df.to_csv(temp_file, index=False)
-        temp_file_path = temp_file.name  # 获取临时文件的路径
-
-    # 上传临时文件到百度云
-    remote_path = f'/{folder_name}/{file_name}'
-    result = bp.upload(temp_file_path, remote_path)
-    if result == 0:
-        logger.info("上传成功:{}", file_name)
-    else:
-        logger.error("上传失败:{}", file_name)
-    return result
-
-
-def mkdir_baidu_new_folder(remote_path):
-    bp = ByPy()
-    try:
-        # 调用 mkdir 方法创建文件夹
-        result = bp.mkdir(remote_path)
-
-        if result == 0:
-            logger.info("成功创建文件夹:{}", remote_path)
-        else:
-            logger.error("创建文件夹失败:{}", result)
-
-    except Exception as e:
-        logger.error("创建文件夹失败:{}", e)
-
-
-def del_baidu_old_folder(remote_path):
-    bp = ByPy()
-    try:
-        # 调用 mkdir 方法创建文件夹
-        result = bp.delete(remote_path)
-
-        if result == 0:
-            logger.info("成功删除文件夹:{}", remote_path)
-        else:
-            logger.error("删除文件夹失败:{}", result)
-
-    except Exception as e:
-        logger.error("删除文件夹失败:{}", e)
-
-
-if __name__ == '__main__':
-    folder_name1 = '/美股/不复权日线'
-    mkdir_baidu_new_folder(folder_name1)
-    list_df = get_file_list('/bypy/美股')

mns-scheduler-1.3.2.5/mns_scheduler/us/k_line.py

@@ -1,91 +0,0 @@
-import akshare as ak
-import pandas as pd
-from mns_common.db.MongodbUtil import MongodbUtil
-
-mongodb_util = MongodbUtil('27017')
-
-
-def us_stock():
-    # 输入参数
-    symbol = input("请输入股票代码（all:全量(时间很长),特定代码:106.TTE）：")
-    start_date = input("请输入开始日期（格式：YYYYMMDD）：")
-    end_date = input("请输入结束日期（格式：YYYYMMDD）：")
-    fq = input("请输入复权信息（前复权:qfq,不复权:bfq,后复权:hfq）：")
-    k_line_period = input("请输入k线周期（日线:daily,周线:weekly,月线:monthly）：")
-    db_name = "us_stock_" + fq + "_" + k_line_period
-    if fq == 'bfq':
-        fq = ''
-    if symbol != 'all':
-        # 获取股票历史数据
-        stock_us_hist_df = ak.stock_us_hist(symbol=symbol,
-                                            period=k_line_period,
-                                            start_date=start_date,
-                                            end_date=end_date,
-                                            adjust=fq)
-        # 保存数据到 CSV 文件
-        stock_us_hist_df.to_csv(f"{symbol}_historical_data.csv", index=False)
-        print(f"数据已保存到 {symbol}_historical_data.csv")
-    else:
-        stock_us_spot_em_df = ak.stock_us_spot_em()
-        stock_us_spot_em_df = stock_us_spot_em_df.rename(columns={
-            "序号": "index",
-            "代码": "symbol",
-            "名称": "name",
-            "涨跌额": "change_price",
-            "涨跌幅": "chg",
-            "开盘价": "open",
-            "最高价": "high",
-            "最低价": "low",
-            "最新价": "now_price",
-            "昨收价": "last_price",
-            "总市值": "total_mv",
-            "市盈率": "pe",
-            "成交量": "volume",
-            "成交额": "amount",
-            "振幅": "pct_chg",
-            "换手率": "exchange"
-        })
-        stock_us_spot_em_df = stock_us_spot_em_df.sort_values(by=['amount'], ascending=False)
-        stock_us_spot_em_df = stock_us_spot_em_df.fillna(0)
-        stock_us_spot_em_df = stock_us_spot_em_df.loc[stock_us_spot_em_df['total_mv'] != 0]
-
-        k_line_result = pd.DataFrame()
-
-        for stock_us_one in stock_us_spot_em_df.itertuples():
-            try:
-                # 获取股票历史数据
-                stock_us_hist_df = ak.stock_us_hist(symbol=stock_us_one.symbol,
-                                                    period=k_line_period,
-                                                    start_date=start_date,
-                                                    end_date=end_date,
-                                                    adjust=fq)
-                stock_us_hist_df = stock_us_hist_df.rename(columns={
-                    "日期": "date",
-                    "涨跌额": "change_price",
-                    "涨跌幅": "chg",
-                    "开盘": "open",
-                    "最高": "high",
-                    "最低": "low",
-                    "收盘": "close",
-                    "成交量": "volume",
-                    "成交额": "amount",
-                    "振幅": "pct_chg",
-                    "换手率": "exchange"
-                })
-
-                k_line_result = pd.concat([stock_us_hist_df, k_line_result])
-                stock_us_hist_df['_id'] = stock_us_one.symbol + '_' + stock_us_hist_df['date']
-                stock_us_hist_df['symbol'] = stock_us_one.symbol
-                stock_us_hist_df['name'] = stock_us_one.name
-                mongodb_util.insert_mongo(stock_us_hist_df, db_name)
-                print(f"同步k线数据到: {stock_us_one.name}")
-            except BaseException as e:
-                print(f"同步数据发生异常: {stock_us_one.name}, {e}")
-
-        # 保存数据到 CSV 文件
-        k_line_result.to_csv(f"{symbol}_historical_data.csv", index=False)
-        print(f"数据已保存到 {symbol}_historical_data.csv")
-
-
-if __name__ == "__main__":
-    us_stock()

mns-scheduler-1.3.2.5/mns_scheduler/us/us_company_info_sync_service_api.py

@@ -1,39 +0,0 @@
-import sys
-import os
-
-file_path = os.path.abspath(__file__)
-end = file_path.index('mns') + 17
-project_path = file_path[0:end]
-sys.path.append(project_path)
-import akshare as ak
-
-
-def sync_us_company_info():
-    stock_us_spot_em_df = ak.stock_us_spot_em()
-    stock_us_spot_em_df = stock_us_spot_em_df.rename(columns={
-        "序号": "index",
-        "代码": "symbol",
-        "名称": "name",
-        "涨跌额": "change_price",
-        "涨跌幅": "chg",
-        "开盘价": "open",
-        "最高价": "high",
-        "最低价": "low",
-        "最新价": "now_price",
-        "昨收价": "last_price",
-        "总市值": "total_mv",
-        "市盈率": "pe",
-        "成交量": "volume",
-        "成交额": "amount",
-        "振幅": "pct_chg",
-        "换手率": "exchange"
-    })
-    stock_us_spot_em_df = stock_us_spot_em_df.sort_values(by=['amount'], ascending=False)
-    stock_us_spot_em_df = stock_us_spot_em_df.fillna(0)
-    stock_us_spot_em_df = stock_us_spot_em_df.loc[stock_us_spot_em_df['total_mv']!=0]
-    stock_us_spot_em_df.to_csv('us_stock.csv', index=False)
-    return stock_us_spot_em_df
-
-
-if __name__ == '__main__':
-    sync_us_company_info()

mns-scheduler-1.3.2.5/mns_scheduler/zz_task/__init__.py

@@ -1,7 +0,0 @@
-import sys
-import os
-
-file_path = os.path.abspath(__file__)
-end = file_path.index('mns') + 17
-project_path = file_path[0:end]
-sys.path.append(project_path)