1)unify exports 2)add resources

examples/data_runner/actor_runner.py

@@ -3,13 +3,13 @@
 
 from apscheduler.schedulers.background import BackgroundScheduler
 
-from zvt.utils.recorder_utils import run_data_recorder
 from zvt import init_log
 from zvt.domain import (
     StockInstitutionalInvestorHolder,
     StockTopTenFreeHolder,
     StockActorSummary,
 )
+from zvt.utils.recorder_utils import run_data_recorder
 
 logger = logging.getLogger(__name__)
 

examples/data_runner/finance_runner.py

@@ -3,7 +3,6 @@
 
 from apscheduler.schedulers.background import BackgroundScheduler
 
-from zvt.utils.recorder_utils import run_data_recorder
 from zvt import init_log
 from zvt.domain import (
     Stock,
@@ -13,6 +12,7 @@
     IncomeStatement,
     CashFlowStatement,
 )
+from zvt.utils.recorder_utils import run_data_recorder
 
 logger = logging.getLogger(__name__)
 

examples/data_runner/index_runner.py

@@ -3,10 +3,10 @@
 
 from apscheduler.schedulers.background import BackgroundScheduler
 
-from zvt.utils.recorder_utils import run_data_recorder
 from zvt import init_log
 from zvt.consts import IMPORTANT_INDEX
 from zvt.domain import Index, Index1dKdata, IndexStock
+from zvt.utils.recorder_utils import run_data_recorder
 
 logger = logging.getLogger(__name__)
 

examples/data_runner/joinquant_fund_runner.py

@@ -3,9 +3,9 @@
 
 from apscheduler.schedulers.background import BackgroundScheduler
 
-from zvt.utils.recorder_utils import run_data_recorder
 from zvt import init_log
 from zvt.domain import Fund, FundStock, StockValuation
+from zvt.utils.recorder_utils import run_data_recorder
 
 logger = logging.getLogger(__name__)
 

examples/data_runner/kdata_runner.py

@@ -3,7 +3,6 @@
 
 from apscheduler.schedulers.background import BackgroundScheduler
 
-from zvt.utils.recorder_utils import run_data_recorder
 from examples.report_utils import inform
 from examples.utils import get_hot_topics
 from zvt import init_log, zvt_config
@@ -23,6 +22,7 @@
 )
 from zvt.informer import EmailInformer
 from zvt.utils import current_date
+from zvt.utils.recorder_utils import run_data_recorder
 
 logger = logging.getLogger(__name__)
 

examples/data_runner/sina_data_runner.py

@@ -3,9 +3,9 @@
 
 from apscheduler.schedulers.background import BackgroundScheduler
 
-from zvt.utils.recorder_utils import run_data_recorder
 from zvt import init_log
 from zvt.domain import *
+from zvt.utils.recorder_utils import run_data_recorder
 
 logger = logging.getLogger(__name__)
 

examples/data_runner/trading_runner.py

@@ -4,16 +4,17 @@
 from apscheduler.schedulers.background import BackgroundScheduler
 from sqlalchemy import or_, and_
 
-from zvt.utils.recorder_utils import run_data_recorder
 from examples.report_utils import inform
 from zvt import init_log
-from zvt.api import get_big_players, get_latest_kdata_date
+from zvt.api.kdata import get_latest_kdata_date
+from zvt.api.selector import get_big_players
 from zvt.domain import (
     DragonAndTiger,
     Stock1dHfqKdata,
 )
 from zvt.informer import EmailInformer
-from zvt.utils import date_time_by_interval, current_date, to_pd_timestamp
+from zvt.utils.recorder_utils import run_data_recorder
+from zvt.utils.time_utils import date_time_by_interval, current_date, to_pd_timestamp
 
 logger = logging.getLogger(__name__)
 

examples/factors/boll_factor.py

@@ -4,8 +4,8 @@
 import pandas as pd
 from ta.volatility import BollingerBands
 
-from zvt.contract.factor import *
-from zvt.factors import TechnicalFactor
+from zvt.contract.factor import Transformer
+from zvt.factors.technical_factor import TechnicalFactor
 
 
 class BollTransformer(Transformer):

examples/factors/fundamental_selector.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 from zvt.domain import BalanceSheet
-from zvt.factors.fundamental import GoodCompanyFactor
+from zvt.factors.fundamental.finance_factor import GoodCompanyFactor
 from zvt.factors.target_selector import TargetSelector
 
 

examples/factors/tech_factor.py

@@ -7,7 +7,7 @@
 from zvt.contract import AdjustType, TradableEntity, IntervalLevel
 from zvt.contract.factor import Transformer, Accumulator
 from zvt.domain import Stock
-from zvt.factors import MacdFactor
+from zvt.factors.macd.macd_factor import MacdFactor
 from zvt.factors.transformers import CrossMaTransformer
 
 

examples/intent/intent.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 from zvt.api.intent import compare
-from zvt.domain import Indexus1dKdata, Index, Indexus, Index1dKdata, Currency, Currency1dKdata
+from zvt.domain import Indexus1dKdata, Index, Indexus, Index1dKdata, Currency1dKdata
 from zvt.domain import TreasuryYield
 
 

examples/migration.py

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 from datetime import datetime
-from typing import Any, Dict
+from typing import Dict
 
-from pydantic import BaseModel, ConfigDict, Json
+from pydantic import BaseModel, ConfigDict
 from sqlalchemy import Column, String, JSON
 from sqlalchemy.orm import declarative_base
 

examples/query_snippet.py

@@ -1,10 +1,11 @@
 # -*- coding: utf-8 -*-
-from zvt.contract import Exchange
+from sqlalchemy import func
+
 from zvt.api.selector import get_entity_ids_by_filter
+from zvt.contract import Exchange
 from zvt.domain import Stock, BlockStock
 from zvt.recorders.em import em_api
 from zvt.tag import StockTags
-from sqlalchemy import func
 
 
 def query_json():

examples/report_utils.py

@@ -6,17 +6,16 @@
 from examples.tag_utils import group_stocks_by_tag, get_main_line_tags, get_main_line_hidden_tags
 from examples.utils import msg_group_stocks_by_topic
 from zvt import zvt_config
-from zvt.api import get_top_volume_entities, TopType
 from zvt.api.kdata import get_latest_kdata_date, get_kdata_schema, default_adjust_type
 from zvt.api.selector import get_limit_up_stocks
-from zvt.api.stats import get_top_performance_entities_by_periods
+from zvt.api.stats import get_top_performance_entities_by_periods, get_top_volume_entities, TopType
 from zvt.contract import IntervalLevel
 from zvt.contract.api import get_entities, get_entity_schema
 from zvt.contract.factor import Factor, TargetType
 from zvt.domain import StockNews
 from zvt.informer import EmailInformer
-from zvt.utils import date_time_by_interval
 from zvt.informer.inform_utils import add_to_eastmoney
+from zvt.utils.time_utils import date_time_by_interval
 
 logger = logging.getLogger("__name__")
 

examples/reports/__init__.py

@@ -6,7 +6,7 @@
 
 from sqlalchemy import or_
 
-from zvt.api import float_to_pct_str
+from zvt.api.utils import float_to_pct_str
 from zvt.contract import ActorType
 from zvt.domain import FinanceFactor, BalanceSheet, IncomeStatement, Stock, StockActorSummary
 from zvt.utils.pd_utils import pd_is_not_null

examples/reports/report_bull.py

@@ -6,7 +6,7 @@
 from examples.factors.tech_factor import BullAndUpFactor
 from examples.report_utils import report_targets
 from zvt import init_log
-from zvt.api import get_latest_kdata_date
+from zvt.api.kdata import get_latest_kdata_date
 from zvt.api.selector import get_middle_and_big_stock
 from zvt.contract import AdjustType
 from zvt.informer import EmailInformer

examples/reports/report_core_compay.py

@@ -10,8 +10,8 @@
 from zvt.contract.api import get_entities
 from zvt.domain import Stock
 from zvt.factors.target_selector import TargetSelector
-from zvt.informer.informer import EmailInformer
 from zvt.informer.inform_utils import add_to_eastmoney
+from zvt.informer.informer import EmailInformer
 from zvt.utils.time_utils import now_pd_timestamp, to_time_str
 
 logger = logging.getLogger(__name__)

examples/reports/report_tops.py

@@ -5,10 +5,10 @@
 
 from examples.report_utils import report_top_entities, inform
 from zvt import init_log
+from zvt.api.stats import TopType, get_latest_kdata_date
 from zvt.contract import AdjustType
-from zvt.api import TopType, get_latest_kdata_date
 from zvt.domain import Block, BlockCategory
-from zvt.factors.top_stocks import compute_top_stocks, get_top_stocks
+from zvt.factors.top_stocks import get_top_stocks
 from zvt.informer import EmailInformer
 
 logger = logging.getLogger(__name__)

examples/reports/report_vol_up.py

@@ -1,14 +1,13 @@
 # -*- coding: utf-8 -*-
 import logging
 
+from zvt.factors.ma import VolumeUpMaFactor
 from apscheduler.schedulers.background import BackgroundScheduler
 
 from examples.report_utils import report_targets, inform
 from zvt import init_log
 from zvt.api.kdata import get_latest_kdata_date
-from zvt.api.selector import get_mini_and_small_stock, get_middle_and_big_stock
 from zvt.contract import AdjustType
-from zvt.factors import VolumeUpMaFactor
 from zvt.factors.top_stocks import get_top_stocks
 from zvt.informer import EmailInformer
 

examples/research/top_dragon_tiger.py

@@ -3,13 +3,14 @@
 
 import pandas as pd
 
-from zvt.api import get_top_performance_by_month
 from zvt.api.selector import get_players
+from zvt.api.stats import get_top_performance_by_month
 from zvt.contract import TradableEntity, IntervalLevel, AdjustType
 from zvt.contract.factor import Transformer, Accumulator
 from zvt.domain import Stock
-from zvt.factors import TechnicalFactor
-from zvt.utils import pd_is_not_null, pre_month_start_date, date_time_by_interval
+from zvt.factors.technical_factor import TechnicalFactor
+from zvt.utils.pd_utils import pd_is_not_null
+from zvt.utils.time_utils import pre_month_start_date, date_time_by_interval
 
 
 def top_dragon_and_tiger(data_provider="em", start_timestamp="2021-01-01", end_timestamp="2022-01-01"):

examples/research/top_tags.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
-from zvt.api import get_top_performance_by_month
+from zvt.api.stats import get_top_performance_by_month
 from zvt.domain import Stock1dHfqKdata
-from zvt.utils import date_time_by_interval, month_end_date, is_same_date
+from zvt.utils.time_utils import date_time_by_interval, month_end_date, is_same_date
 
 
 # 每月涨幅前30，市值90%分布在100亿以下

examples/tag_utils.py

@@ -3,8 +3,7 @@
 import os
 from collections import Counter
 
-from zvt.api import china_stock_code_to_id, get_china_exchange
-
+from zvt.api.utils import china_stock_code_to_id, get_china_exchange
 from zvt.domain import BlockStock, Block, Stock, LimitUpInfo
 
 

examples/trader/follow_ii_trader.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 import pandas as pd
 
-from zvt.api import get_recent_report_date
+from zvt.api.utils import get_recent_report_date
 from zvt.contract import ActorType, AdjustType
 from zvt.domain import StockActorSummary, Stock1dKdata, Stock
 from zvt.trader import StockTrader

examples/trader/keep_run_trader.py

@@ -1,12 +1,12 @@
 # -*- coding: utf-8 -*-
 import logging
 
-from zvt.api import get_top_volume_entities
 from zvt.api.stats import get_top_fund_holding_stocks
-from zvt.trader.trader_info_api import clear_trader
+from zvt.api.stats import get_top_volume_entities
 from zvt.contract import IntervalLevel
-from zvt.factors import GoldCrossFactor, BullFactor
+from zvt.factors.macd.macd_factor import BullFactor
 from zvt.trader import StockTrader
+from zvt.trader.trader_info_api import clear_trader
 from zvt.utils.time_utils import split_time_interval, date_time_by_interval
 
 logger = logging.getLogger(__name__)

examples/trader/ma_trader.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from zvt.contract import IntervalLevel
-from zvt.factors import CrossMaFactor
-from zvt.factors.macd import BullFactor
+from zvt.factors.ma.ma_factor import CrossMaFactor
+from zvt.factors.macd.macd_factor import BullFactor
 
 from zvt.trader.trader import StockTrader
 

examples/trader/macd_day_trader.py

@@ -5,14 +5,14 @@
 
 from zvt.contract import IntervalLevel
 from zvt.contract.factor import Factor
-from zvt.factors import GoldCrossFactor
+from zvt.factors.macd.macd_factor import GoldCrossFactor
 from zvt.trader import TradingSignal
 from zvt.trader.trader import StockTrader
 
 # 依赖数据
 # data_schema: Stock1dHfqKdata
 # provider: joinquant
-from zvt.utils import date_time_by_interval
+from zvt.utils.time_utils import date_time_by_interval
 
 
 class MacdDayTrader(StockTrader):

examples/trader/macd_week_and_day_trader.py

@@ -2,7 +2,7 @@
 from typing import List, Tuple
 
 from zvt.contract import IntervalLevel
-from zvt.factors import GoldCrossFactor
+from zvt.factors.macd.macd_factor import GoldCrossFactor
 from zvt.trader.trader import StockTrader