Support multiple jobs for same job type

Author: sinall

config/scheduler-template.ini

@@ -1,3 +1,14 @@
+; ShiPanE-Python-SDK 支持的计划任务类型如下：
+;
+; NewStocks: 新股申购
+; Repo: 逆回购
+; Batch: 批量下单
+; JoinQuant: 聚宽跟单
+; JoinQuantArena: 聚宽擂台（商城）同步
+; RiceQuant: 米筐策略跟单
+; Uquer: 优矿策略跟单
+; Guorn: 果仁策略同步
+;
 ; schedule 参数设置，类似于 cron 表达式
 ;
 ; 格式为：[秒(0-59)] [分(0-59)] [时(0-23)] [星期几(0-6 或英文缩写)] [星期(1-53)] [日(1-31)] [月(1-12)] [年(四位数字)]
@@ -34,9 +45,11 @@ client2=account:12345
 
 
 ;
-; 自动新股申购配置
+; 新股申购
 ;
 [NewStocks]
+type=NewStocks
+
 ; 是否启用？
 enabled=false
 
@@ -49,9 +62,11 @@ clients=client1
 
 
 ;
-; 自动逆回购配置
+; 逆回购
 ;
 [Repo]
+type=Repo
+
 ; 是否启用？
 enabled=false
 
@@ -66,9 +81,11 @@ security=131810
 
 
 ;
-; 批量下单配置
+; 批量下单
 ;
 [Batch]
+type=Batch
+
 ; 是否启用？
 enabled=false
 
@@ -82,7 +99,12 @@ clients=client1
 folder=C:\\batch-orders
 
 
-[JoinQuant]
+;
+; 聚宽策略跟单
+;
+[JoinQuant-1]
+type=JoinQuant
+
 username=
 password=
 
@@ -105,9 +127,11 @@ clients=client1
 
 
 ;
-; 聚宽擂台同步
+; 聚宽擂台（商城）同步
 ;
-[JoinQuantArena]
+[JoinQuantArena-1]
+type=JoinQuantArena
+
 ; 聚宽账号密码
 username=
 password=
@@ -173,7 +197,12 @@ order_interval=1
 extra_rounds=0
 
 
-[RiceQuant]
+;
+; 米筐策略跟单
+;
+[RiceQuant-1]
+type=RiceQuant
+
 username=
 password=
 
@@ -194,7 +223,12 @@ schedule=30 */1 9-15 mon-fri * * * *
 clients=client1
 
 
-[Uqer]
+;
+; 优矿策略跟单
+;
+[Uqer-1]
+type=Uqer
+
 username=
 password=
 
@@ -216,13 +250,16 @@ clients=client1
 
 
 ;
-; 果仁自动同步设置
+; 果仁策略同步
+;
 ; 自动同步采用多个轮次，典型的轮次如下：
 ; 1. 卖单及可用资金可以满足的买单
 ; 2. 前一次未成交的部分卖单及可用资金可以满足的买单
 ; 3. 额外轮次将重复步骤 2
 ;
-[Guorn]
+[Guorn-1]
+type=Guorn
+
 ; 手机号码前需加上 +86，例如：+8615012345678
 username=
 password=

shipane_sdk/scheduler.py

@@ -40,14 +40,14 @@ def __init__(self):
         self._client = Client(self._logger, **dict(self._config.items('ShiPanE')))
 
     def start(self):
-        self.__add_job(self.__create_new_stock_purchase_job())
-        self.__add_job(self.__create_repo_job())
-        self.__add_job(self.__create_batch_job())
-        self.__add_job(self.__create_join_quant_following_job())
-        self.__add_job(self.__create_rice_quant_following_job())
-        self.__add_job(self.__create_uqer_following_job())
-        self.__add_job(self.__create_guorn_sync_job())
-        self.__add_job(self.__create_join_quant_sync_job())
+        for section in self._config.sections():
+            if not self.__is_job(section):
+                continue
+            job = self.__create_job(section)
+            if job is not None:
+                self.__add_job(job)
+            else:
+                self._logger.warning("[{}] is not a valid job", section)
 
         self._scheduler.start()
         print('Press Ctrl+{0} to exit'.format('Break' if os.name == 'nt' else 'C'))
@@ -64,64 +64,80 @@ def __add_job(self, job):
         else:
             self._logger.warning('{} is not enabled'.format(job.name))
 
-    def __create_new_stock_purchase_job(self):
-        section = 'NewStocks'
+    def __create_job(self, section):
+        job_type = self._config.get(section, 'type')
+        job = None
+        if job_type == 'NewStocks':
+            job = self.__create_new_stock_purchase_job(section)
+        elif job_type == 'Repo':
+            job = self.__create_repo_job(section)
+        elif job_type == 'Batch':
+            job = self.__create_batch_job(section)
+        elif job_type == 'JoinQuant':
+            job = self.__create_join_quant_following_job(section)
+        elif job_type == 'RiceQuant':
+            job = self.__create_rice_quant_following_job(section)
+        elif job_type == 'Uqer':
+            job = self.__create_uqer_following_job(section)
+        elif job_type == 'Guorn':
+            job = self.__create_guorn_sync_job(section)
+        elif job_type == 'JoinQuantArena':
+            job = self.__create_join_quant_sync_job(section)
+        return job
+
+    def __create_new_stock_purchase_job(self, section):
         options = self.__build_options(section)
         client_aliases = self.__filter_client_aliases(section)
-        return NewStockPurchaseJob(self._client, client_aliases, '{}Job'.format(section), **options)
+        return NewStockPurchaseJob(self._client, client_aliases, '{}-Job'.format(section), **options)
 
-    def __create_repo_job(self):
-        section = 'Repo'
+    def __create_repo_job(self, section):
         options = self.__build_options(section)
         client_aliases = self.__filter_client_aliases(section)
-        return RepoJob(self._client, client_aliases, '{}Job'.format(section), **options)
+        return RepoJob(self._client, client_aliases, '{}-Job'.format(section), **options)
 
-    def __create_batch_job(self):
-        section = 'Batch'
+    def __create_batch_job(self, section):
         options = self.__build_options(section)
         client_aliases = self.__filter_client_aliases(section)
-        return BatchJob(self._client, client_aliases, '{}Job'.format(section), **options)
+        return BatchJob(self._client, client_aliases, '{}-Job'.format(section), **options)
 
-    def __create_join_quant_following_job(self):
-        section = 'JoinQuant'
+    def __create_join_quant_following_job(self, section):
         options = self.__build_options(section)
         client_aliases = self.__filter_client_aliases(section)
         quant_client = JoinQuantClient(**options)
-        return OnlineQuantFollowingJob(self._client, quant_client, client_aliases, '{}FollowingJob'.format(section),
+        return OnlineQuantFollowingJob(self._client, quant_client, client_aliases, '{}-FollowingJob'.format(section),
                                        **options)
 
-    def __create_rice_quant_following_job(self):
-        section = 'RiceQuant'
+    def __create_rice_quant_following_job(self, section):
         options = self.__build_options(section)
         client_aliases = self.__filter_client_aliases(section)
         quant_client = RiceQuantClient(**options)
-        return OnlineQuantFollowingJob(self._client, quant_client, client_aliases, '{}FollowingJob'.format(section),
+        return OnlineQuantFollowingJob(self._client, quant_client, client_aliases, '{}-FollowingJob'.format(section),
                                        **options)
 
-    def __create_uqer_following_job(self):
-        section = 'Uqer'
+    def __create_uqer_following_job(self, section):
         options = self.__build_options(section)
         client_aliases = self.__filter_client_aliases(section)
         quant_client = UqerClient(**options)
-        return OnlineQuantFollowingJob(self._client, quant_client, client_aliases, '{}FollowingJob'.format(section),
+        return OnlineQuantFollowingJob(self._client, quant_client, client_aliases, '{}-FollowingJob'.format(section),
                                        **options)
 
-    def __create_guorn_sync_job(self):
-        section = 'Guorn'
+    def __create_guorn_sync_job(self, section):
         options = self.__build_options(section)
         client_aliases = self.__filter_client_aliases(section)
         quant_client = GuornClient(**options)
-        return OnlineQuantSyncJob(self._client, quant_client, client_aliases, '{}SyncJob'.format(section),
+        return OnlineQuantSyncJob(self._client, quant_client, client_aliases, '{}-SyncJob'.format(section),
                                   **options)
 
-    def __create_join_quant_sync_job(self):
-        section = 'JoinQuantArena'
+    def __create_join_quant_sync_job(self, section):
         options = self.__build_options(section)
         client_aliases = self.__filter_client_aliases(section)
         quant_client = JoinQuantClient(**options)
-        return OnlineQuantSyncJob(self._client, quant_client, client_aliases, '{}SyncJob'.format(section),
+        return OnlineQuantSyncJob(self._client, quant_client, client_aliases, '{}-SyncJob'.format(section),
                                   **options)
 
+    def __is_job(self, section):
+        return self._config.has_option(section, 'type')
+
     def __build_options(self, section):
         if not self._config.has_section(section):
             return dict()