Merge pull request #20 from ricequant/develop

Develop

Author: Cuizi7

rqalpha_mod_incremental/mod.py

@@ -41,7 +41,7 @@ def start_up(self, env, mod_config):
         self._recorder = None
         self._mod_config = mod_config
 
-        if not self._mod_config.persist_folder:
+        if self._mod_config.recorder == "CsvRecorder" and not self._mod_config.persist_folder:
             return
 
         config = self._env.config
@@ -151,7 +151,7 @@ def on_settlement(self, event):
         return True
 
     def tear_down(self, success, exception=None):
-        if not self._mod_config.persist_folder:
+        if self._mod_config.recorder == "CsvRecorder" and not self._mod_config.persist_folder:
             return
         if exception is None:
             self._recorder.store_meta(self._meta)

rqalpha_mod_incremental/persist_providers.py

@@ -23,10 +23,17 @@ def load(self, key, large_file=False):
         import gridfs
         try:
             b = self._fs.get_last_version(strategy_id=self._strategy_id, key=key)
-            return b.read()
+            data = b.read()
+            return data
         except gridfs.errors.NoFile:
             return None
 
+    def should_resume(self):
+        return False
+
+    def should_run_init(self):
+        return False
+
 
 class DiskPersistProvider(AbstractPersistProvider):
     def __init__(self, path="./persist"):

rqalpha_mod_incremental/recorders.py

@@ -163,7 +163,7 @@ def load_meta(self):
         return self._db["meta"].find_one({"strategy_id": self._strategy_id})
 
     def store_meta(self, meta_dict):
-        self._db["meta"].update({"strategy_id": self._strategy_id}, meta_dict, upsert=True)
+        self._db["meta"].update_one({"strategy_id": self._strategy_id}, {"$set": meta_dict}, upsert=True)
 
     def _portfolio2dict(self, dt, portfolio):
         dic = {key: getattr(portfolio, key) for key in self.PORTFOLIO_CSV_HEADER if key != "datetime"}

setup.cfg

@@ -5,7 +5,7 @@
 
 [metadata]
 name = rqalpha-mod-incremental
-version = 0.0.9
+version = 0.0.10
 
 [versioneer]
 VCS = git