1)Add cbond(Convertible) 2)Improve tag

api-tests/event/get_stock_event.http

@@ -0,0 +1,5 @@
+GET http://127.0.0.1:8090/api/event/get_stock_event?entity_id=stock_sz_000034
+accept: application/json
+
+
+

src/zvt/autocode/generator.py

@@ -138,6 +138,9 @@ def gen_exports(
             end_empty_lines_count = end_empty_lines_count + 1
         lines = lines[: len(lines) - end_empty_lines_count]
 
+        if not lines:
+            lines.append("# -*- coding: utf-8 -*-#")
+
         lines.append("\n\n")
         lines.append(gen_flag)
         lines.append("\n")

src/zvt/contract/__init__.py

@@ -160,6 +160,9 @@ class TradableType(Enum):
     #: A股(中国)
     #: China stock
     stock = "stock"
+    #: 可转债(中国)
+    #: China convertible Bond
+    cbond = "cbond"
     #: A股指数(中国)
     #: China index
     index = "index"
@@ -239,6 +242,7 @@ class Exchange(Enum):
     TradableType.block: [Exchange.cn],
     TradableType.index: [Exchange.sh, Exchange.sz],
     TradableType.stock: [Exchange.sh, Exchange.sz, Exchange.bj],
+    TradableType.cbond: [Exchange.sh, Exchange.sz],
     TradableType.stockhk: [Exchange.hk],
     TradableType.stockus: [Exchange.nasdaq, Exchange.nyse],
     TradableType.indexus: [Exchange.us],

src/zvt/domain/actor/__init__.py

@@ -1,4 +1,6 @@
 # -*- coding: utf-8 -*-
+
+
 # the __all__ is generated
 __all__ = []
 

src/zvt/domain/actor/actor_meta.py

@@ -14,5 +14,7 @@ class ActorMeta(ActorMetaBase, ActorEntity):
 
 
 register_schema(providers=["em"], db_name="actor_meta", schema_base=ActorMetaBase)
+
+
 # the __all__ is generated
 __all__ = ["ActorMeta"]

src/zvt/domain/actor/stock_actor.py

@@ -78,5 +78,6 @@ class StockActorSummary(StockActorBase, TradableMeetActor):
 
 register_schema(providers=["em"], db_name="stock_actor", schema_base=StockActorBase, entity_type="stock")
 
+
 # the __all__ is generated
 __all__ = ["StockTopTenFreeHolder", "StockTopTenHolder", "StockInstitutionalInvestorHolder", "StockActorSummary"]

src/zvt/domain/emotion/__init__.py

@@ -1,4 +1,6 @@
 # -*- coding: utf-8 -*-
+
+
 # the __all__ is generated
 __all__ = []
 

src/zvt/domain/emotion/emotion.py

@@ -83,5 +83,7 @@ class Emotion(EmotionBase, Mixin):
 
 
 register_schema(providers=["jqka"], db_name="emotion", schema_base=EmotionBase)
+
+
 # the __all__ is generated
 __all__ = ["LimitUpInfo", "LimitDownInfo", "Emotion"]

src/zvt/domain/fundamental/__init__.py

@@ -1,4 +1,6 @@
 # -*- coding: utf-8 -*-
+
+
 # the __all__ is generated
 __all__ = []
 

src/zvt/domain/fundamental/dividend_financing.py

@@ -73,5 +73,6 @@ class RightsIssueDetail(DividendFinancingBase, Mixin):
     providers=["eastmoney"], db_name="dividend_financing", schema_base=DividendFinancingBase, entity_type="stock"
 )
 
+
 # the __all__ is generated
 __all__ = ["DividendFinancing", "DividendDetail", "SpoDetail", "RightsIssueDetail"]

src/zvt/domain/fundamental/finance.py

@@ -985,5 +985,6 @@ def important_cols(cls):
 
 register_schema(providers=["eastmoney"], db_name="finance", schema_base=FinanceBase, entity_type="stock")
 
+
 # the __all__ is generated
 __all__ = ["BalanceSheet", "IncomeStatement", "CashFlowStatement", "FinanceFactor"]

src/zvt/domain/fundamental/trading.py

@@ -160,5 +160,6 @@ class DragonAndTiger(TradingBase, Mixin):
     providers=["em", "eastmoney", "joinquant"], db_name="trading", schema_base=TradingBase, entity_type="stock"
 )
 
+
 # the __all__ is generated
 __all__ = ["ManagerTrading", "HolderTrading", "BigDealTrading", "MarginTrading", "DragonAndTiger"]

src/zvt/domain/fundamental/valuation.py

@@ -64,5 +64,6 @@ class EtfValuation(ValuationBase, Mixin):
 
 register_schema(providers=["joinquant"], db_name="valuation", schema_base=ValuationBase, entity_type="stock")
 
+
 # the __all__ is generated
 __all__ = ["StockValuation", "EtfValuation"]

src/zvt/domain/macro/__init__.py

@@ -1,4 +1,6 @@
 # -*- coding: utf-8 -*-
+
+
 # the __all__ is generated
 __all__ = []
 

src/zvt/domain/macro/macro.py

@@ -39,5 +39,7 @@ class Economy(MacroBase, Mixin):
 
 
 register_schema(providers=["wb"], db_name="macro", schema_base=MacroBase)
+
+
 # the __all__ is generated
 __all__ = ["Economy"]

src/zvt/domain/macro/monetary.py

@@ -24,5 +24,7 @@ class TreasuryYield(MonetaryBase, Mixin):
 
 
 register_schema(providers=["em"], db_name="monetary", schema_base=MonetaryBase)
+
+
 # the __all__ is generated
 __all__ = ["TreasuryYield"]

src/zvt/domain/meta/__init__.py

@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-#
+
 # the __all__ is generated
 __all__ = []
 
@@ -29,6 +31,12 @@
 
 __all__ += _country_meta_all
 
+# import all from submodule cbond_meta
+from .cbond_meta import *
+from .cbond_meta import __all__ as _cbond_meta_all
+
+__all__ += _cbond_meta_all
+
 # import all from submodule index_meta
 from .index_meta import *
 from .index_meta import __all__ as _index_meta_all

src/zvt/domain/meta/block_meta.py

@@ -23,5 +23,7 @@ class BlockStock(BlockMetaBase, PortfolioStock):
 
 
 register_schema(providers=["em", "eastmoney", "sina"], db_name="block_meta", schema_base=BlockMetaBase)
+
+
 # the __all__ is generated
 __all__ = ["Block", "BlockStock"]

src/zvt/domain/meta/cbond_meta.py

@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+
+from sqlalchemy.orm import declarative_base
+
+from zvt.contract import TradableEntity
+from zvt.contract.register import register_schema, register_entity
+
+CBondBase = declarative_base()
+
+
+#: 美股
+@register_entity(entity_type="cbond")
+class CBond(CBondBase, TradableEntity):
+    __tablename__ = "cbond"
+
+
+register_schema(providers=["em"], db_name="cbond_meta", schema_base=CBondBase)
+
+
+# the __all__ is generated
+__all__ = ["CBond"]

src/zvt/domain/meta/country_meta.py

@@ -34,5 +34,7 @@ class Country(CountryMetaBase, TradableEntity):
 
 
 register_schema(providers=["wb"], db_name="country_meta", schema_base=CountryMetaBase)
+
+
 # the __all__ is generated
 __all__ = ["Country"]

src/zvt/domain/meta/currency_meta.py

@@ -14,5 +14,7 @@ class Currency(CurrencyMetaBase, TradableEntity):
 
 
 register_schema(providers=["em"], db_name="currency_meta", schema_base=CurrencyMetaBase)
+
+
 # the __all__ is generated
 __all__ = ["Currency"]

src/zvt/domain/meta/etf_meta.py

@@ -28,5 +28,7 @@ class EtfStock(EtfMetaBase, PortfolioStockHistory):
 
 
 register_schema(providers=["exchange", "joinquant"], db_name="etf_meta", schema_base=EtfMetaBase)
+
+
 # the __all__ is generated
 __all__ = ["Etf", "EtfStock"]

src/zvt/domain/meta/fund_meta.py

@@ -55,5 +55,7 @@ class FundStock(FundMetaBase, PortfolioStockHistory):
 
 
 register_schema(providers=["joinquant"], db_name="fund_meta", schema_base=FundMetaBase)
+
+
 # the __all__ is generated
 __all__ = ["Fund", "FundStock"]

src/zvt/domain/meta/future_meta.py

@@ -14,5 +14,6 @@ class Future(FutureMetaBase, TradableEntity):
 
 register_schema(providers=["em"], db_name="future_meta", schema_base=FutureMetaBase)
 
+
 # the __all__ is generated
 __all__ = ["Future"]

src/zvt/domain/meta/index_meta.py

@@ -28,5 +28,7 @@ class IndexStock(IndexMetaBase, PortfolioStockHistory):
 
 
 register_schema(providers=["em", "exchange"], db_name="index_meta", schema_base=IndexMetaBase)
+
+
 # the __all__ is generated
 __all__ = ["Index", "IndexStock"]

src/zvt/domain/meta/indexus_meta.py

@@ -24,5 +24,7 @@ class Indexus(IndexusMetaBase, Portfolio):
 
 
 register_schema(providers=["em"], db_name="indexus_meta", schema_base=IndexusMetaBase)
+
+
 # the __all__ is generated
 __all__ = ["Indexus"]

src/zvt/domain/meta/stock_meta.py

@@ -49,5 +49,7 @@ class StockDetail(StockMetaBase, TradableEntity):
 register_schema(
     providers=["exchange", "joinquant", "eastmoney", "em", "qmt"], db_name="stock_meta", schema_base=StockMetaBase
 )
+
+
 # the __all__ is generated
 __all__ = ["Stock", "StockDetail"]

src/zvt/domain/meta/stockhk_meta.py

@@ -17,5 +17,7 @@ class Stockhk(StockhkMetaBase, TradableEntity):
 
 
 register_schema(providers=["em"], db_name="stockhk_meta", schema_base=StockhkMetaBase)
+
+
 # the __all__ is generated
 __all__ = ["Stockhk"]

src/zvt/domain/meta/stockus_meta.py

@@ -15,5 +15,7 @@ class Stockus(StockusMetaBase, TradableEntity):
 
 
 register_schema(providers=["em"], db_name="stockus_meta", schema_base=StockusMetaBase)
+
+
 # the __all__ is generated
 __all__ = ["Stockus"]

src/zvt/domain/misc/__init__.py

@@ -1,4 +1,6 @@
 # -*- coding: utf-8 -*-
+
+
 # the __all__ is generated
 __all__ = []
 

src/zvt/domain/misc/holder.py

@@ -95,5 +95,6 @@ class InstitutionalInvestorHolder(HolderBase, Mixin):
 
 register_schema(providers=["eastmoney", "joinquant"], db_name="holder", schema_base=HolderBase, entity_type="stock")
 
+
 # the __all__ is generated
 __all__ = ["HkHolder", "TopTenTradableHolder", "TopTenHolder", "InstitutionalInvestorHolder"]

src/zvt/domain/misc/money_flow.py

@@ -110,5 +110,6 @@ class IndexMoneyFlow(MoneyFlowBase, Mixin):
 
 register_schema(providers=["joinquant", "sina"], db_name="money_flow", schema_base=MoneyFlowBase, entity_type="stock")
 
+
 # the __all__ is generated
 __all__ = ["BlockMoneyFlow", "StockMoneyFlow", "IndexMoneyFlow"]

src/zvt/domain/misc/overall.py

@@ -69,5 +69,6 @@ class CrossMarketSummary(OverallBase, Mixin):
 
 register_schema(providers=["joinquant", "exchange"], db_name="overall", schema_base=OverallBase, entity_type="stock")
 
+
 # the __all__ is generated
 __all__ = ["StockSummary", "MarginTradingSummary", "CrossMarketSummary"]

src/zvt/domain/misc/stock_news.py

@@ -24,5 +24,7 @@ class StockNews(NewsBase, Mixin):
 
 
 register_schema(providers=["em"], db_name="stock_news", schema_base=NewsBase, entity_type="stock")
+
+
 # the __all__ is generated
 __all__ = ["StockNews"]

src/zvt/domain/quotes/block/__init__.py

@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
 # this file is generated by gen_kdata_schema function, dont't change it
+
+
 # the __all__ is generated
 __all__ = []
 

src/zvt/domain/quotes/block/block_1d_kdata.py

@@ -14,5 +14,6 @@ class Block1dKdata(KdataBase, BlockKdataCommon):
 
 register_schema(providers=["em"], db_name="block_1d_kdata", schema_base=KdataBase, entity_type="block")
 
+
 # the __all__ is generated
 __all__ = ["Block1dKdata"]

src/zvt/domain/quotes/block/block_1mon_kdata.py

@@ -14,5 +14,6 @@ class Block1monKdata(KdataBase, BlockKdataCommon):
 
 register_schema(providers=["em"], db_name="block_1mon_kdata", schema_base=KdataBase, entity_type="block")
 
+
 # the __all__ is generated
 __all__ = ["Block1monKdata"]

src/zvt/domain/quotes/block/block_1wk_kdata.py

@@ -14,5 +14,6 @@ class Block1wkKdata(KdataBase, BlockKdataCommon):
 
 register_schema(providers=["em"], db_name="block_1wk_kdata", schema_base=KdataBase, entity_type="block")
 
+
 # the __all__ is generated
 __all__ = ["Block1wkKdata"]

src/zvt/domain/quotes/currency/__init__.py

@@ -1,4 +1,6 @@
 # -*- coding: utf-8 -*-
+
+
 # the __all__ is generated
 __all__ = []
 

src/zvt/domain/quotes/currency/currency_1d_kdata.py

@@ -14,5 +14,6 @@ class Currency1dKdata(KdataBase, CurrencyKdataCommon):
 
 register_schema(providers=["em"], db_name="currency_1d_kdata", schema_base=KdataBase, entity_type="currency")
 
+
 # the __all__ is generated
 __all__ = ["Currency1dKdata"]

src/zvt/domain/quotes/etf/__init__.py

@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
 # this file is generated by gen_kdata_schema function, dont't change it
+
+
 # the __all__ is generated
 __all__ = []
 

src/zvt/domain/quotes/etf/etf_1d_kdata.py

@@ -14,5 +14,6 @@ class Etf1dKdata(KdataBase, EtfKdataCommon):
 
 register_schema(providers=["sina"], db_name="etf_1d_kdata", schema_base=KdataBase, entity_type="etf")
 
+
 # the __all__ is generated
 __all__ = ["Etf1dKdata"]

src/zvt/domain/quotes/future/__init__.py

@@ -1,4 +1,6 @@
 # -*- coding: utf-8 -*-
+
+
 # the __all__ is generated
 __all__ = []
 

src/zvt/domain/quotes/future/future_1d_kdata.py

@@ -14,5 +14,6 @@ class Future1dKdata(KdataBase, FutureKdataCommon):
 
 register_schema(providers=["em"], db_name="future_1d_kdata", schema_base=KdataBase, entity_type="future")
 
+
 # the __all__ is generated
 __all__ = ["Future1dKdata"]

src/zvt/domain/quotes/index/__init__.py

@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
 # this file is generated by gen_kdata_schema function, dont't change it
+
+
 # the __all__ is generated
 __all__ = []
 

src/zvt/domain/quotes/index/index_1d_kdata.py

@@ -14,5 +14,6 @@ class Index1dKdata(KdataBase, IndexKdataCommon):
 
 register_schema(providers=["em", "sina"], db_name="index_1d_kdata", schema_base=KdataBase, entity_type="index")
 
+
 # the __all__ is generated
 __all__ = ["Index1dKdata"]

src/zvt/domain/quotes/index/index_1wk_kdata.py

@@ -14,5 +14,6 @@ class Index1wkKdata(KdataBase, IndexKdataCommon):
 
 register_schema(providers=["em", "sina"], db_name="index_1wk_kdata", schema_base=KdataBase, entity_type="index")
 
+
 # the __all__ is generated
 __all__ = ["Index1wkKdata"]

src/zvt/domain/quotes/indexus/__init__.py

@@ -1,4 +1,6 @@
 # -*- coding: utf-8 -*-
+
+
 # the __all__ is generated
 __all__ = []