backtrader-next 2.2.1__py3-none-any.whl → 2.3.0__py3-none-any.whl

backtrader_next/order.py

@@ -245,6 +245,7 @@ class OrderBase(with_metaclass(MetaParams, object)):
         ('simulated', False),
         # To support historical order evaluation
         ('histnotify', False),
+        ('restored', False),
     )
 
     DAY = datetime.timedelta()  # constant for DAY order identification
@@ -273,7 +274,6 @@ class OrderBase(with_metaclass(MetaParams, object)):
         'Canceled', 'Expired', 'Margin', 'Rejected',
     ]
 
-    # refbasis = itertools.count(1)  # for a unique identifier per order
     refbasis = Counter(1)  # for a unique identifier per order
 
     def _getplimit(self):
@@ -283,18 +283,18 @@ class OrderBase(with_metaclass(MetaParams, object)):
         self._plimit = val
 
     plimit = property(_getplimit, _setplimit)
-    
+
     @property
     def owner(self):
         if self._owner_classname and not self.p.owner:
             class_name = self._owner_classname
-            for s in self.broker.cerebro.runningstrategies:
+            for s in self.broker.cerebro.runningstrats:
                 if s.__class__.__name__ == class_name:
                     self.p.owner = s
                     self._owner_classname = None
                     break
         return self.p.owner
-    
+
     @owner.setter
     def owner(self, value):
         self.p.owner = value
@@ -340,7 +340,6 @@ class OrderBase(with_metaclass(MetaParams, object)):
         self.triggered = False
         self.parent_ref = None
         self._owner_classname = None
-        self._restored = False
 
         self._active = self.parent is None
         self.status = Order.Created
@@ -355,10 +354,10 @@ class OrderBase(with_metaclass(MetaParams, object)):
 
         # Set a reference price if price is not set using
         # the close price
-        pclose = self.data.close[0] if not self.p.simulated and not self._restored else self.price
+        pclose = self.data.close[0] if not self.p.simulated and not self.p.restored else self.price
         price = pclose if not self.price and not self.pricelimit else self.price
 
-        dcreated = self.data.datetime[0] if not self.p.simulated and not self._restored else 0.0
+        dcreated = self.data.datetime[0] if not self.p.simulated and not self.p.restored else 0.0
         self.created = OrderData(dt=dcreated,
                                  size=self.size,
                                  price=price,
@@ -400,7 +399,7 @@ class OrderBase(with_metaclass(MetaParams, object)):
             else:  # assume float
                 valid = self.data.datetime[0] + self.valid
 
-        if not self.p.simulated and not self._restored:
+        if not self.p.simulated and not self.p.restored:
             # provisional end-of-session
             # get next session end
             dtime = self.data.datetime.datetime(0)
@@ -420,7 +419,7 @@ class OrderBase(with_metaclass(MetaParams, object)):
     @classmethod
     def last_ref(cls):
         return cls.refbasis.get_current()
-    
+
     @classmethod
     def reset_ref(cls, start=1):
         cls.refbasis.reset(start)
@@ -704,7 +703,9 @@ class Order(OrderBase):
     @classmethod
     def from_dict(cls, params, odict):
         '''Loads the order data from a dictionary representation'''
-        odict['_restored'] = True
+        odict['_owner_classname'] = params['_owner_classname']
+        del params['_owner_classname']
+        params['restored'] = True
         ordtype = odict.get('ordtype', None)
         ord = None
         if ordtype is None:

backtrader_next/version.py

@@ -22,6 +22,6 @@ from __future__ import (absolute_import, division, print_function,
                         unicode_literals)
 
 
-__version__ = '2.2.1'
+__version__ = '2.3.0'
 
 __btversion__ = tuple(int(x) for x in __version__.split('.'))

{backtrader_next-2.2.1.dist-info → backtrader_next-2.3.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: backtrader_next
-Version: 2.2.1
+Version: 2.3.0
 Summary: Live Trading and backtesting platform in Python
 Project-URL: Homepage, https://github.com/smalinin/backtrader_next
 Project-URL: Source, https://github.com/smalinin/backtrader_next

{backtrader_next-2.2.1.dist-info → backtrader_next-2.3.0.dist-info}/RECORD

@@ -17,7 +17,7 @@ backtrader_next/lineseries.py,sha256=-aNlK6FiOm47-cfyH3oIUDI3awsyEmbyAyAg_o-rETA
 backtrader_next/mathsupport.py,sha256=jc2fTjaf3dWzQ4ZV-ypvVPrHnKnoJbrWLHd-pIhdQ2w,1923
 backtrader_next/metabase.py,sha256=1g18zfwPOQQlL0MVEYI2pQ-W-FQvfJpG071a_Xbn-N4,11136
 backtrader_next/observer.py,sha256=xlR7JCYgEcZuwpgLbORPVccRD6cA5RhlkXAfKjVQjdY,2255
-backtrader_next/order.py,sha256=H2pfRnxDwD9eOq0HdirDBKkzaQ3D_VW8axA5YcSMazk,26866
+backtrader_next/order.py,sha256=mGQ2Yn4OpaE4Ymo6lPHOv9Lz3S70NpCmK3Mo_Hsb6ak,26880
 backtrader_next/position.py,sha256=odBPNNkWVRHZnNY03SqP0TSlhP1I8xoCMHJCuS2rH7E,7445
 backtrader_next/resamplerfilter.py,sha256=z0hqTqbj4nj7gWQPR9qtBk9Iqz8wcqgF3iqL04cMJdA,26141
 backtrader_next/signal.py,sha256=WwhQUu9L35209K3NEv343dvd57-gBGow1yN9VbmvqPM,1899
@@ -28,7 +28,7 @@ backtrader_next/talib.py,sha256=Q9t2V-jgp-7I9vvPg2BuCJi73GOa7B2LfMrAygPi2nc,9100
 backtrader_next/timer.py,sha256=WrY5dpyXpGUOEeOtr_3pjiOldQyiUcXQTBpl8Jd2QCY,7578
 backtrader_next/trade.py,sha256=3AABrbLCxsMubZfenHyONKDCY6j3e-d7bk0ejQPvD8g,11633
 backtrader_next/tradingcal.py,sha256=X4VQ0dojoKgWoOVTd8aYTyvZYiFZV1TALrQ9sWzb9Rg,9903
-backtrader_next/version.py,sha256=rDIJbKzLj-Vi62w32puV0UUISjnN3CTPF8qsGcsi-uA,1105
+backtrader_next/version.py,sha256=MaEEapK-sfrwBLSsbRuTguWyaPjf0aMozFb7euvlZEs,1105
 backtrader_next/writer.py,sha256=eDyz3xRsDp1i8WIZrXou6MZ80QHpYBzkf_DAqPGOcAw,7712
 backtrader_next/analyzers/__init__.py,sha256=krHAQhnqyHj0MKGyTIDNqXqqVUTX7dnQeAB1eRwcD9I,1568
 backtrader_next/analyzers/annualreturn.py,sha256=iIuQAE0nacVEPMyc1JUqIsfkWOG_8kwW104FlXvYd0s,2784
@@ -201,7 +201,7 @@ backtrader_next/utils/dateintern.py,sha256=VcFWhMw_NazuVMHSvSueNgMxRqiEgu5YmRnz5
 backtrader_next/utils/flushfile.py,sha256=ekrNdFCs0j4HwRRxho-Fnl0XZBCrpd0uHyq02kV2wjE,1588
 backtrader_next/utils/ordereddefaultdict.py,sha256=8y7FDnqI1mTcr1NwVfgqsaK-42XwC76Mu_iYRVvLmLM,2091
 backtrader_next/utils/py3.py,sha256=hSoodWo9-eUXzUCcLoQWPtTR51QxD-m01QzZNcuK9A8,2416
-backtrader_next-2.2.1.dist-info/METADATA,sha256=wk1gzBNxsY6wn3aalMx4YIkcOCNt8oW0qmOPXXRd5D4,11359
-backtrader_next-2.2.1.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-backtrader_next-2.2.1.dist-info/licenses/LICENSE,sha256=4cCtcomD2KVzNeUs8QZPGv_R1FQXPYzr0-2LSnK0hwQ,35121
-backtrader_next-2.2.1.dist-info/RECORD,,
+backtrader_next-2.3.0.dist-info/METADATA,sha256=mO6QvNmRdZwkZZE2YyxjAA5-hjzbTA2vI4DAUvp213Q,11359
+backtrader_next-2.3.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+backtrader_next-2.3.0.dist-info/licenses/LICENSE,sha256=4cCtcomD2KVzNeUs8QZPGv_R1FQXPYzr0-2LSnK0hwQ,35121
+backtrader_next-2.3.0.dist-info/RECORD,,