update

Author: somewheve

README.MD

@@ -5,7 +5,7 @@
 # 安装
 
 ```bash
-pip install hive-c
+pip install hived-c
 # or 
 pip install git+https://github.com/ctpbee/hive
 ```
@@ -32,7 +32,7 @@ pip install git+https://github.com/ctpbee/hive
 3. 执行下面的命令(可以根据参数解析自己做更改)
 
 ```bash
-hive --name hive --path ./data --ff csv --cf config.json --rd 127.0.0.1:6379 --tick_save true --dispatch true
+hived --name hived --path ./data --ff csv --cf config.json --rd 127.0.0.1:6379 --tick_save true --dispatch true
 ```
 
 ### 如果自己定义订阅指定行情

examples/atk.py

@@ -6,8 +6,8 @@
 from types import FunctionType
 from datetime import time
 
-from hive import Hive
-from hive.task import LoopTask, OnceTask
+from hived import Hive
+from hived.task import LoopTask, OnceTask
 
 import atexit
 

hive/__pycache__/__init__.cpython-37.pyc

@@ -6,9 +6,9 @@
 
 import click
 
-from hive.log import logger
-from hive.main import Hive
-from hive.src.task import DataUpdateTask, CleanDataTask
+from hived.log import logger
+from hived.main import Hive
+from hived.src.task import DataUpdateTask, CleanDataTask
 
 bool_map = {"false": False, "true": True}
 
@@ -21,7 +21,7 @@ def fix_bool(name):
 
 
 @click.command()
-@click.option("--name", default="hive", prompt="hive")
+@click.option("--name", default="hived", prompt="hived")
 @click.option("--path", help="the dirname of file_save_path", default="./")
 @click.option("--ff", help="format of file", default="csv")
 @click.option("--cf", help="config of file", default="config.json")
@@ -31,11 +31,16 @@ def fix_bool(name):
 @click.option("--config_path", default="", help="config file path ")
 def run_command(name, path, ff, cf, rd, dispatch, tick_save, config_path):
     if os.path.exists(config_path):
+        logger.info("当前检测到配置文件 读取参数")
         if not config_path.endswith(".json"):
             raise FileNotFoundError("当前配置文件不是json格式")
         with open(config_path, "r") as f:
-            config = json.load(f)
+            try:
+                config = json.load(f)
+            except json.decoder.JSONDecodeError:
+                raise json.decoder.JSONDecodeError("json格式不合法")
     else:
+        logger.info("当前未检测到配置文件 读取参数")
         if ff not in ["csv", "parquet", "h5"]:
             raise TypeError("错误的文件导出格式 请检查你的ff参数")
         dispatch = fix_bool(dispatch)

hive/__pycache__/__init__.cpython-39.pyc

@@ -1,6 +1,6 @@
 import logging
 
-logger = logging.Logger(name="hive")
+logger = logging.Logger(name="hived")
 formatter = logging.Formatter("%(asctime)s - %(name)s - %(levelname)s - %(message)s")
 ch = logging.StreamHandler()
 ch.setLevel(logging.INFO)

hive/__pycache__/log.cpython-37.pyc

@@ -1,9 +1,9 @@
 from datetime import datetime
 from time import sleep
 
-from hive.config import Config
-from hive.log import logger
-from hive.task import Task
+from hived.config import Config
+from hived.log import logger
+from hived.task import Task
 
 
 class Hive(object):

hive/__pycache__/log.cpython-39.pyc

@@ -1,5 +1,5 @@
-from hive.src.task import DataUpdateTask, CleanDataTask
-from hive import Hive
+from hived.src.task import DataUpdateTask, CleanDataTask
+from hived import Hive
 
 
 class Terminal:

hive/__pycache__/main.cpython-37.pyc

@@ -6,9 +6,9 @@
 from ctpbee.constant import *
 
 from redis import Redis
-from hive.src.obj import Message
-from hive import logger
-from hive.src.env import RD_CONTRACT_NAME
+from hived.src.obj import Message
+from hived import logger
+from hived.src.env import RD_CONTRACT_NAME
 
 
 class WorkBench(CtpbeeApi):

hive/__pycache__/main.cpython-39.pyc

@@ -5,7 +5,7 @@
 
 from ctpbee.constant import OrderData, Entity, ContractData, TradeData, CancelRequest, OrderRequest, TickData
 
-from hive.src.env import DATA_TYPE_KEY, DATA_FIELD
+from hived.src.env import DATA_TYPE_KEY, DATA_FIELD
 from ctpbee import dumps, loads
 
 

hive/__pycache__/task.cpython-37.pyc

@@ -3,16 +3,16 @@
 from ctpbee import hickey
 from ctpbee.date import trade_dates
 
-from hive import LoopTask, OnceTask
-from hive.src.env import FILE_CLEAN_TIME
-from hive.src.func import record_data, clean_data_from_redis
+from hived import LoopTask, OnceTask
+from hived.src.env import FILE_CLEAN_TIME
+from hived.src.func import record_data, clean_data_from_redis
 
 
 class DataUpdateTask(LoopTask):
     def __init__(self, **kwargs):
         super().__init__("数据录制")
         interface = kwargs.get("interface", "ctp")
-        front = kwargs.get("front", 300)
+        front = kwargs.get("front", 600)
         for i, v in hickey.open_trading[interface].items():
             setattr(hickey, i, hickey.add_seconds(getattr(hickey, i), front))
 

hive/__pycache__/task.cpython-39.pyc

@@ -1,6 +1,6 @@
 from setuptools import setup
 
-pkgs = ["hive", "hive.src"]
+pkgs = ["hived", "hived.src"]
 
 install_requires = ["ctpbee", "redis", "click", "pandas"]
 setup(
@@ -13,8 +13,8 @@
     license="Apache2",
     packages=pkgs,
     install_requires=install_requires,
-    platforms=["Linux", "Windows"],
-    package_dir={"hive": "hive"},
+    platforms=["Linux", "Windows", "MacOS"],
+    package_dir={"hived": "hived"},
     zip_safe=False,
     include_package_data=True,
     ext_modules=[],
@@ -27,7 +27,6 @@
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
-        "Programming Language :: Python :: 3.11",
     ],
-    entry_points={"console_scripts": ["hive = hive:run_command"]},
+    entry_points={"console_scripts": ["hived = hived:run_command"]},
 )