Qubx 0.2.79__tar.gz → 0.2.81__tar.gz

{qubx-0.2.79 → qubx-0.2.81}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: Qubx
-Version: 0.2.79
+Version: 0.2.81
 Summary: Qubx - quantitative trading framework
 Home-page: https://github.com/dmarienko/Qubx
 Author: Dmitry Marienko

{qubx-0.2.79 → qubx-0.2.81}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "Qubx"
-version = "0.2.79"
+version = "0.2.81"
 description = "Qubx - quantitative trading framework"
 authors = ["Dmitry Marienko <dmitry@gmail.com>", "Yuriy Arabskyy <yuriy.arabskyy@gmail.com>"]
 readme = "README.md"

{qubx-0.2.79 → qubx-0.2.81}/src/qubx/data/helpers.py

@@ -9,6 +9,7 @@ from collections import defaultdict
 
 from qubx import logger
 from qubx.core.basics import ITimeProvider
+from qubx.core.series import TimeSeries
 from qubx.data.readers import (
     AsPandasFrame,
     CsvStorageDataReader,
@@ -314,6 +315,7 @@ class TimeGuardedWrapper(DataReader):
         _cut_dict = lambda xs, t: OhlcDict({s: v.loc[:t] for s, v in xs.items()})
         _cut_list_of_timestamped = lambda xs, t: list(filter(lambda x: x.time <= t, xs))
         _cut_list_raw = lambda xs, t: list(filter(lambda x: x[0] <= t, xs))
+        _cut_time_series = lambda ts, t: ts.loc[: str(t)]
 
         if prev_bar:
             _c_time = _c_time - pd.Timedelta(self._reader._data_timeframe)
@@ -329,6 +331,10 @@ class TimeGuardedWrapper(DataReader):
             else:
                 return _cut_list_of_timestamped(data, _c_time.asm8.item())
 
+        # - input is TimeSeries
+        if isinstance(data, TimeSeries):
+            return _cut_time_series(data, _c_time)
+
         return data.loc[:_c_time]
 
     def __str__(self) -> str:

{qubx-0.2.79 → qubx-0.2.81}/src/qubx/pandaz/utils.py

@@ -575,8 +575,8 @@ class OhlcDict(dict):
         if isinstance(orig, dict):
             _lst = []
             for k, o in orig.items():
-                if not k[0].isalpha():
-                    raise ValueError("Keys in the dictionary must start with an alphabet")
+                # if not k[0].isalpha():
+                # raise ValueError("Keys in the dictionary must start with an alphabet")
                 if not isinstance(o, (pd.DataFrame | pd.Series)):
                     raise ValueError("All values in the dictionary must be pandas Series or DataFrames")
                 _lst.extend(o.columns.values)