🐞 fix: 锁定akshare版本，增加价格获取入口

omega/akshareprice/app.py

@@ -7,7 +7,7 @@
 import cfg4py
 
 from omega.akshareprice.datasync import init_redis_connection
-from omega.akshareprice.job import start_cron_task, start_cron_task_idx
+from omega.akshareprice.job import start_cron_task
 from omega.config import get_config_dir
 
 cfg = cfg4py.get_instance()
@@ -37,9 +37,6 @@ def run(action: str):
     if action == "stock":
         loop.run_until_complete(start_cron_task())
         loop.run_forever()
-    elif action == "index":
-        loop.run_until_complete(start_cron_task_idx())
-        loop.run_forever()
     else:
         logger.info("action: %s not supported", action)
 

omega/akshareprice/job.py

@@ -86,71 +86,6 @@ async def start_cron_task():
     scheduler.start()
 
 
-def load_cron_task_idx(scheduler):
-    scheduler.add_job(
-        fetch_idx_price_from_akshare,
-        "cron",
-        hour=9,
-        minute=25,
-        second=10,
-        name="fetch_index_price_task",
-    )
-
-    scheduler.add_job(
-        fetch_idx_price_from_akshare,
-        "cron",
-        hour=9,
-        minute="30-59",
-        second="*/5",
-        name="fetch_index_price_task",
-    )
-    scheduler.add_job(
-        fetch_idx_price_from_akshare,
-        "cron",
-        hour=10,
-        second="*/5",
-        name="fetch_index_price_task",
-    )
-    scheduler.add_job(
-        fetch_idx_price_from_akshare,
-        "cron",
-        hour=11,
-        minute="0-29",
-        second="*/5",
-        name="fetch_index_price_task",
-    )
-    scheduler.add_job(
-        fetch_idx_price_from_akshare,
-        "cron",
-        hour=11,
-        minute=30,
-        second=10,
-        name="fetch_index_price_task",
-    )
-
-    scheduler.add_job(
-        fetch_idx_price_from_akshare,
-        "cron",
-        hour="13-14",
-        second="*/5",
-        name="fetch_index_price_task",
-    )
-    scheduler.add_job(
-        fetch_idx_price_from_akshare,
-        "cron",
-        hour=15,
-        minute=0,
-        second=10,
-        name="fetch_index_price_task",
-    )
-
-
-async def start_cron_task_idx():
-    scheduler = AsyncIOScheduler(timezone="Asia/Shanghai")
-    load_cron_task_idx(scheduler)
-    scheduler.start()
-
-
 def get_akshare_data_em():
     try:
         all_secs = ak.stock_zh_a_spot_em()
@@ -229,20 +164,6 @@ async def fetch_price_from_akshare():
         logger.info("%s side: %s", running_mode, now)
         await process_stock_price()
 
-    return True
-
-
-async def fetch_idx_price_from_akshare():
-    # cfg = cfg4py.get_instance()
-    running_mode = "server"
-
-    now = datetime.datetime.now()
-    if now.weekday() >= 5:  # 周末不运行
-        return True
-
-    seconds = now.second
-    _seq_num = seconds / 5
-
     if _seq_num % 4 == 0:  # running at 0, 20, 40
         logger.info("%s side for index: %s", running_mode, now)
         await process_index_price()

omega/cli.py

@@ -115,6 +115,22 @@ async def start_logger():
     print("Omega logger process started ...")
 
 
+async def start_realprice_stock():
+    print("prepare to start Omega real price process for stock ...")
+
+    subprocess.Popen(
+        [
+            sys.executable,
+            "-m",
+            "omega.akshareprice.app",
+            "stock",
+        ],
+        stdout=subprocess.DEVNULL,
+    )
+
+    print("Omega stock price process started ...")
+
+
 async def import_local_data():
     print("正在初始化系统数据...")
 
@@ -145,6 +161,7 @@ def main():
             "webservice": run(start_webservice),
             "logger": run(start_logger),
             "importdata": run(import_local_data),
+            "stock_price": run(start_realprice_stock),
         }
     )
 

pyproject.toml

@@ -35,7 +35,7 @@ include = [
     "tests/*"
 ]
 
-version = "2.0.0a8"
+version = "2.0.0a9"
 
 [tool.poetry.dependencies]
 python=">=3.8,<3.9"
@@ -83,8 +83,9 @@ mike = { version="^1.1.2", optional=true}
 freezegun = {version = "^1.2.1", optional = true}
 zarr = "^2.13.3"
 sanic = "^22.9.1"
-akshare = "^1.8.27"
+akshare = ">=1.8,<1.9"
 retry = "^0.9.2"
+urllib3 = ">=1.26.14,<2.0"
 
 [tool.poetry.extras]
 test = [