1)add del_stock_pool/del_hidden_tag api

2)add setting hidden tag in batch_set_stock_tags
3)add QiyeWechatBot

Author: foolcage

api-tests/del_stock_pool.http

@@ -0,0 +1,3 @@
+DELETE http://127.0.0.1:8090/api/work/del_stock_pool?stock_pool_name=今日弱势
+accept: application/json
+Content-Type: application/json

api-tests/tag/del_hidden_tag_info.http

@@ -0,0 +1,4 @@
+DELETE http://127.0.0.1:8090/api/work/del_hidden_tag?tag=123123
+accept: application/json
+
+

src/zvt/config.json

@@ -9,6 +9,7 @@
   "email_password": "",
   "wechat_app_id": "",
   "wechat_app_secrect": "",
+  "qiye_wechat_bot_token": "",
   "qmt_mini_data_path": "D:\\qmt\\userdata_mini",
   "qmt_account_id": "",
   "moonshot_api_key": "",

src/zvt/informer/informer.py

@@ -156,12 +156,29 @@ def _format_price_notification(self, to_user, security_name, current_price, chan
         return the_json
 
 
-if __name__ == "__main__":
-    email_action = EmailInformer()
-    email_action.send_message(["5533061@qq.com", "2315983623@qq.com"], "helo", "just a test", sub_size=20)
+class QiyeWechatBot(Informer):
+    def __init__(self, token=None) -> None:
+        self.token = token
+
+    def send_message(self, content):
+        if not self.token:
+            if not zvt_config["qiye_wechat_bot_token"]:
+                logger.warning(f"Please set qiye_wechat_bot_token in ~/zvt-home/config.json")
+                return
+            self.token = zvt_config["qiye_wechat_bot_token"]
+
+        msg = {
+            "msgtype": "text",
+            "text": {"content": content},
+        }
+        requests.post(f"https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key={self.token}", json=msg)
 
+
+if __name__ == "__main__":
     # weixin_action = WechatInformer()
     # weixin_action.send_price_notification(to_user='oRvNP0XIb9G3g6a-2fAX9RHX5--Q', security_name='BTC/USDT',
     #                                       current_price=1000, change_pct='0.5%')
+    bot = QiyeWechatBot()
+    bot.send_message(content="test")
 # the __all__ is generated
 __all__ = ["Informer", "EmailInformer", "WechatInformer"]

src/zvt/resources/concept_main_tag_mapping.json

@@ -392,6 +392,7 @@
   "一带一路": "其他",
   "碳交易": "其他",
   "宠物经济": "其他",
+  "商业航天": "商业航天",
   "航天概念": "商业航天",
   "天基互联": "商业航天",
   "北斗导航": "商业航天",

src/zvt/rest/work.py

@@ -65,6 +65,11 @@ def create_stock_pools(create_stock_pools_model: CreateStockPoolsModel):
     return tag_service.build_stock_pool(create_stock_pools_model, current_date())
 
 
+@work_router.delete("/del_stock_pool", response_model=str)
+def del_stock_pool(stock_pool_name: str):
+    return tag_service.del_stock_pool(stock_pool_name=stock_pool_name)
+
+
 @work_router.get("/get_stock_pools", response_model=Optional[StockPoolsModel])
 def get_stock_pools(stock_pool_name: str):
     with contract_api.DBSession(provider="zvt", data_schema=StockPools)() as session:
@@ -261,3 +266,8 @@ def build_main_tag_sub_tag_relation(relation: MainTagSubTagRelation):
 @work_router.post("/change_main_tag", response_model=List[StockTagsModel])
 def change_main_tag(change_main_tag_model: ChangeMainTagModel):
     return tag_service.change_main_tag(change_main_tag_model=change_main_tag_model)
+
+
+@work_router.delete("/del_hidden_tag", response_model=List[StockTagsModel])
+def del_hidden_tag(tag: str):
+    return tag_service.del_hidden_tag(tag=tag)

src/zvt/tag/tag_models.py

@@ -90,6 +90,8 @@ class TagParameter(CustomModel):
     main_tag_reason: Optional[str] = Field(default=None)
     sub_tag: Optional[str] = Field(default=None)
     sub_tag_reason: Optional[str] = Field(default=None)
+    hidden_tag: Optional[str] = Field(default=None)
+    hidden_tag_reason: Optional[str] = Field(default=None)
 
 
 class StockTagOptions(CustomModel):

src/zvt/tag/tag_service.py

@@ -47,7 +47,7 @@
 logger = logging.getLogger(__name__)
 
 
-def stock_tags_need_update(stock_tags: StockTags, set_stock_tags_model: SetStockTagsModel):
+def _stock_tags_need_update(stock_tags: StockTags, set_stock_tags_model: SetStockTagsModel):
     if (
         stock_tags.main_tag != set_stock_tags_model.main_tag
         or stock_tags.main_tag_reason != set_stock_tags_model.main_tag_reason
@@ -59,7 +59,7 @@ def stock_tags_need_update(stock_tags: StockTags, set_stock_tags_model: SetStock
     return False
 
 
-def get_stock_tag_options(entity_id):
+def get_stock_tag_options(entity_id: str) -> StockTagOptions:
     with contract_api.DBSession(provider="zvt", data_schema=StockTags)() as session:
         datas: List[StockTags] = StockTags.query_data(
             entity_id=entity_id, order=StockTags.timestamp.desc(), limit=1, return_type="domain", session=session
@@ -175,7 +175,7 @@ def build_stock_tags(
             current_stock_tags: StockTags = datas[0]
 
             # nothing change
-            if not stock_tags_need_update(current_stock_tags, set_stock_tags_model):
+            if not _stock_tags_need_update(current_stock_tags, set_stock_tags_model):
                 logger.info(f"Not change stock_tags for {set_stock_tags_model.entity_id}")
                 return current_stock_tags
 
@@ -224,6 +224,9 @@ def build_stock_tags(
 
 
 def build_tag_parameter(tag_type: TagType, tag, tag_reason, stock_tag: StockTags):
+    hidden_tag = None
+    hidden_tag_reason = None
+
     if tag_type == TagType.main_tag:
         main_tag = tag
         if main_tag in stock_tag.main_tags:
@@ -240,11 +243,29 @@ def build_tag_parameter(tag_type: TagType, tag, tag_reason, stock_tag: StockTags
             sub_tag_reason = tag_reason
         main_tag = stock_tag.main_tag
         main_tag_reason = stock_tag.main_tag_reason
+    elif tag_type == TagType.hidden_tag:
+        hidden_tag = tag
+        if stock_tag.hidden_tags and (hidden_tag in stock_tag.hidden_tags):
+            hidden_tag_reason = stock_tag.hidden_tags.get(hidden_tag, tag_reason)
+        else:
+            hidden_tag_reason = tag_reason
+
+        sub_tag = stock_tag.sub_tag
+        sub_tag_reason = stock_tag.sub_tag_reason
+
+        main_tag = stock_tag.main_tag
+        main_tag_reason = stock_tag.main_tag_reason
+
     else:
         assert False
 
     return TagParameter(
-        main_tag=main_tag, main_tag_reason=main_tag_reason, sub_tag=sub_tag, sub_tag_reason=sub_tag_reason
+        main_tag=main_tag,
+        main_tag_reason=main_tag_reason,
+        sub_tag=sub_tag,
+        sub_tag_reason=sub_tag_reason,
+        hidden_tag=hidden_tag,
+        hidden_tag_reason=hidden_tag_reason,
     )
 
 
@@ -274,6 +295,15 @@ def batch_set_stock_tags(batch_set_stock_tags_model: BatchSetStockTagsModel):
                 session=session,
                 return_type="domain",
             )
+        elif tag_type == TagType.hidden_tag:
+            hidden_tag = batch_set_stock_tags_model.tag
+            stock_tags: List[StockTags] = StockTags.query_data(
+                entity_ids=batch_set_stock_tags_model.entity_ids,
+                # 需要sqlite3版本>=3.37.0
+                filters=[func.json_extract(StockTags.active_hidden_tags, f'$."{hidden_tag}"') == None],
+                session=session,
+                return_type="domain",
+            )
 
         for stock_tag in stock_tags:
             tag_parameter: TagParameter = build_tag_parameter(
@@ -282,13 +312,18 @@ def batch_set_stock_tags(batch_set_stock_tags_model: BatchSetStockTagsModel):
                 tag_reason=batch_set_stock_tags_model.tag_reason,
                 stock_tag=stock_tag,
             )
+            if tag_type == TagType.hidden_tag:
+                active_hidden_tags = {batch_set_stock_tags_model.tag: batch_set_stock_tags_model.tag_reason}
+            else:
+                active_hidden_tags = stock_tag.active_hidden_tags
+
             set_stock_tags_model = SetStockTagsModel(
                 entity_id=stock_tag.entity_id,
                 main_tag=tag_parameter.main_tag,
                 main_tag_reason=tag_parameter.main_tag_reason,
                 sub_tag=tag_parameter.sub_tag,
                 sub_tag_reason=tag_parameter.sub_tag_reason,
-                active_hidden_tags=stock_tag.active_hidden_tags,
+                active_hidden_tags=active_hidden_tags,
             )
 
             build_stock_tags(
@@ -521,6 +556,23 @@ def build_stock_pool(create_stock_pools_model: CreateStockPoolsModel, target_dat
         return stock_pool
 
 
+def del_stock_pool(stock_pool_name: str):
+    with contract_api.DBSession(provider="zvt", data_schema=StockPoolInfo)() as session:
+        stock_pool_info = StockPoolInfo.query_data(
+            session=session,
+            filters=[StockPoolInfo.stock_pool_name == stock_pool_name],
+            return_type="domain",
+        )
+
+        contract_api.del_data(data_schema=StockPools, filters=[StockPools.stock_pool_name == stock_pool_name])
+
+        if stock_pool_info:
+            session.delete(stock_pool_info[0])
+            session.commit()
+            return "success"
+        return "not found"
+
+
 def query_stock_tag_stats(query_stock_tag_stats_model: QueryStockTagStatsModel):
     with contract_api.DBSession(provider="zvt", data_schema=TagStats)() as session:
         datas = TagStats.query_data(
@@ -701,6 +753,43 @@ def activate_sub_tags(activate_sub_tags_model: ActivateSubTagsModel):
         return result
 
 
+def remove_hidden_tag(hidden_tag: str):
+    with contract_api.DBSession(provider="zvt", data_schema=StockTags)() as session:
+        stock_tags = StockTags.query_data(
+            session=session,
+            # 需要sqlite3版本>=3.37.0
+            filters=[func.json_extract(StockTags.hidden_tags, f'$."{hidden_tag}"') != None],
+            return_type="domain",
+        )
+        if not stock_tags:
+            logger.info(f"all stocks with hidden_tag: {hidden_tag} has been removed")
+            return []
+        for stock_tag in stock_tags:
+            hidden_tags = dict(stock_tag.hidden_tags)
+            hidden_tags.pop(hidden_tag)
+            stock_tag.hidden_tags = hidden_tags
+            session.commit()
+            session.refresh(stock_tag)
+        return stock_tags
+
+
+def del_hidden_tag(tag: str):
+    with contract_api.DBSession(provider="zvt", data_schema=HiddenTagInfo)() as session:
+        hidden_tag_info = HiddenTagInfo.query_data(
+            session=session,
+            filters=[HiddenTagInfo.tag == tag],
+            return_type="domain",
+        )
+        if not hidden_tag_info:
+            logger.info(f"hidden_tag: {tag} has been removed")
+            return []
+
+        result = remove_hidden_tag(hidden_tag=tag)
+        session.delete(hidden_tag_info[0])
+        session.commit()
+        return result
+
+
 def _create_main_tag_if_not_existed(main_tag, main_tag_reason):
     main_tag_info = CreateTagInfoModel(tag=main_tag, tag_reason=main_tag_reason)
     if not is_tag_info_existed(tag_info=main_tag_info, tag_type=TagType.main_tag):
@@ -818,13 +907,13 @@ def change_main_tag(change_main_tag_model: ChangeMainTagModel):
 
 
 if __name__ == "__main__":
-    activate_industry_list(industry_list=["半导体"])
+    print(del_hidden_tag(tag="妖"))
+    # activate_industry_list(industry_list=["半导体"])
     # activate_sub_tags(ActivateSubTagsModel(sub_tags=["航天概念", "天基互联", "北斗导航", "通用航空"]))
 
 
 # the __all__ is generated
 __all__ = [
-    "stock_tags_need_update",
     "get_stock_tag_options",
     "build_stock_tags",
     "build_tag_parameter",

src/zvt/trading/trading_schemas.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from sqlalchemy import Column, Float, DateTime
+from sqlalchemy import Column, Float, DateTime, Integer
 from sqlalchemy import String, JSON
 from sqlalchemy.orm import declarative_base
 
@@ -9,6 +9,18 @@
 TradingBase = declarative_base()
 
 
+class TagQuoteStats(Mixin, TradingBase):
+    __tablename__ = "tag_quote_stats"
+    stock_pool_name = Column(String)
+    main_tag = Column(String)
+    limit_up_count = Column(Integer)
+    limit_down_count = Column(Integer)
+    up_count = Column(Integer)
+    down_count = Column(Integer)
+    change_pct = Column(Float)
+    turnover = Column(Float)
+
+
 class TradingPlan(TradingBase, Mixin):
     __tablename__ = "trading_plan"
     stock_id = Column(String)

src/zvt/trading/trading_service.py

@@ -20,7 +20,7 @@
     KdataRequestModel,
     TSRequestModel,
 )
-from zvt.trading.trading_schemas import TradingPlan, QueryStockQuoteSetting
+from zvt.trading.trading_schemas import TradingPlan, QueryStockQuoteSetting, TagQuoteStats
 from zvt.utils.pd_utils import pd_is_not_null
 from zvt.utils.time_utils import (
     to_time_str,
@@ -229,6 +229,62 @@ def cal_quote_stats(quote_df):
     return df.to_dict(orient="records")[0]
 
 
+def cal_tag_quote_stats(stock_pool_name):
+    stock_pools: List[StockPools] = StockPools.query_data(
+        filters=[StockPools.stock_pool_name == stock_pool_name],
+        order=StockPools.timestamp.desc(),
+        limit=1,
+        return_type="domain",
+    )
+    if stock_pools:
+        entity_ids = stock_pools[0].entity_ids
+    else:
+        entity_ids = None
+
+    tag_df = StockTags.query_data(
+        entity_ids=entity_ids,
+        filters=[StockTags.main_tag.isnot(None)],
+        columns=[StockTags.entity_id, StockTags.main_tag],
+        return_type="df",
+        index="entity_id",
+    )
+
+    entity_ids = tag_df["entity_id"].tolist()
+
+    quote_df = StockQuote.query_data(entity_ids=entity_ids, return_type="df", index="entity_id")
+    timestamp = quote_df["timestamp"].tolist()[0]
+
+    df = pd.concat([tag_df, quote_df], axis=1)
+    grouped_df = (
+        df.groupby("main_tag")
+        .agg(
+            up_count=("change_pct", lambda x: (x > 0).sum()),
+            down_count=("change_pct", lambda x: (x <= 0).sum()),
+            turnover=("turnover", "sum"),
+            change_pct=("change_pct", "mean"),
+            limit_up_count=("is_limit_up", "sum"),
+            limit_down_count=("is_limit_down", lambda x: (x == True).sum()),
+            total_count=("main_tag", "size"),  # 添加计数，计算每个分组的总行数
+        )
+        .reset_index(drop=False)
+    )
+    grouped_df["stock_pool_name"] = stock_pool_name
+
+    grouped_df["entity_id"] = grouped_df[["stock_pool_name", "main_tag"]].apply(
+        lambda se: "{}_{}".format(se["stock_pool_name"], se["main_tag"]), axis=1
+    )
+    grouped_df["timestamp"] = timestamp
+    grouped_df["id"] = grouped_df[["entity_id", "timestamp"]].apply(
+        lambda se: "{}_{}".format(se["entity_id"], to_time_str(se["timestamp"])), axis=1
+    )
+
+    print(grouped_df)
+
+    contract_api.df_to_db(
+        df=grouped_df, data_schema=TagQuoteStats, provider="zvt", force_update=True, drop_duplicates=False
+    )
+
+
 def query_tag_quotes(query_tag_quote_model: QueryTagQuoteModel):
     stock_pools: List[StockPools] = StockPools.query_data(
         filters=[StockPools.stock_pool_name == query_tag_quote_model.stock_pool_name],