Qubx 0.6.9__cp312-cp312-manylinux_2_39_x86_64.whl → 0.6.10__cp312-cp312-manylinux_2_39_x86_64.whl

qubx/core/account.py

@@ -62,9 +62,8 @@ class BasicAccountProcessor(IAccountProcessor):
     def get_total_capital(self) -> float:
         # sum of cash + market value of all positions
         _cash_amount = self._balances[self.base_currency].total
-        _r_pnl = sum([p.r_pnl for p in self._positions.values()])
         _positions_value = sum([p.market_value_funds for p in self._positions.values()])
-        return _cash_amount + _positions_value + _r_pnl
+        return _cash_amount + _positions_value
 
     def get_balances(self) -> dict[str, AssetBalance]:
         return self._balances

qubx/utils/runner/configs.py

@@ -16,7 +16,7 @@ class ReaderConfig(BaseModel):
 
 
 class TypedReaderConfig(BaseModel):
-    data_type: str
+    data_type: list[str] | str
     readers: list[ReaderConfig]
 
 

qubx/utils/runner/runner.py

@@ -742,13 +742,19 @@ def _create_data_type_readers(warmup: WarmupConfig | None) -> dict[str, DataRead
     data_type_to_reader = {}  # Maps data type to reader instance
 
     for typed_reader_config in warmup.readers:
-        data_type = typed_reader_config.data_type
-        readers_for_type = []
+        data_types = typed_reader_config.data_type
+        if isinstance(data_types, str):
+            data_types = [data_types]
+        readers_for_types = []
 
         for reader_config in typed_reader_config.readers:
             # Create a hashable representation of the reader config
-            # TODO: maybe include args as well, but they are not always hashable
-            reader_key = reader_config.reader
+            # Create a hashable key from reader name and stringified args
+            if reader_config.args:
+                args_str = str(reader_config.args)
+                reader_key = f"{reader_config.reader}:{args_str}"
+            else:
+                reader_key = reader_config.reader
 
             # Check if we've already created this reader
             if reader_key not in unique_readers:
@@ -761,14 +767,18 @@ def _create_data_type_readers(warmup: WarmupConfig | None) -> dict[str, DataRead
                     logger.error(f"Reader {reader_config.reader} could not be created: {e}")
                     raise
 
-            # Add the reader to the list for this data type
-            readers_for_type.append(unique_readers[reader_key])
+            # Add the reader to the list for these data types
+            readers_for_types.append(unique_readers[reader_key])
 
         # Create a composite reader if needed, or use the single reader
-        if len(readers_for_type) > 1:
-            data_type_to_reader[data_type] = CompositeReader(readers_for_type)
-        elif len(readers_for_type) == 1:
-            data_type_to_reader[data_type] = readers_for_type[0]
+        if len(readers_for_types) > 1:
+            composite_reader = CompositeReader(readers_for_types)
+            for data_type in data_types:
+                data_type_to_reader[data_type] = composite_reader
+        elif len(readers_for_types) == 1:
+            single_reader = readers_for_types[0]
+            for data_type in data_types:
+                data_type_to_reader[data_type] = single_reader
 
     return data_type_to_reader
 

{qubx-0.6.9.dist-info → qubx-0.6.10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: Qubx
-Version: 0.6.9
+Version: 0.6.10
 Summary: Qubx - Quantitative Trading Framework
 Author: Dmitry Marienko
 Author-email: dmitry.marienko@xlydian.com

{qubx-0.6.9.dist-info → qubx-0.6.10.dist-info}/RECORD

@@ -26,7 +26,7 @@ qubx/connectors/ccxt/factory.py,sha256=KROJ9-7zfoKZuess99UZMzgsZakISbN3XDOkEB-Ev
 qubx/connectors/ccxt/reader.py,sha256=qaZIaOZkRf3Rz31ZrEqqAv4kATk5zDlSq-LK1jziBs8,8314
 qubx/connectors/ccxt/utils.py,sha256=kWeYQ1Z9TxFTbgJgBh5o77mGB1g09l2AkiFdR6guDQY,11141
 qubx/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-qubx/core/account.py,sha256=XWKAX9cqGKX3BC8F_-v2PTIyu0Nc05zLTsqpTMHz9uc,10486
+qubx/core/account.py,sha256=Ewzmr1jxyLROnWshtx_ngi7fna1cH42NJ5wVRyP4dmQ,10411
 qubx/core/basics.py,sha256=3Q5E9yQ_bnOIeMsL98kdb9idzDnqwi13SlmO2LMns_4,28683
 qubx/core/context.py,sha256=t4A1sWM6dn4t-LSKOC-66x4Y-_5aGduEedO_Gmd3Yrg,20593
 qubx/core/exceptions.py,sha256=ONFzWISjWfb2S0kEIorq-3L4MdhNR-xkHftHQALOZ0U,533
@@ -42,11 +42,11 @@ qubx/core/mixins/processing.py,sha256=Ny9EyrTuF_YBmPsAebykV54OfGMBGE1gSam9VFJJKa
 qubx/core/mixins/subscription.py,sha256=J_SX0CNw2bPy4bhxe0vswvDXY4LCkwXSaj_1PepKRLY,8540
 qubx/core/mixins/trading.py,sha256=KApWQE0zIh1jg_9HezLdR-mp3UEYIdylSyX9MajHmCc,3618
 qubx/core/mixins/universe.py,sha256=1ya2P3QZrsAVXmMXqq0t6CHGAC5iMGVD2ARUAtSfv04,10062
-qubx/core/series.cpython-312-x86_64-linux-gnu.so,sha256=zCATDz19kXVxlTzUW6If98vOOjHLPvYCJATO4R1qoOs,970056
+qubx/core/series.cpython-312-x86_64-linux-gnu.so,sha256=23fTZIr_aK_IaTkwhaSWHbMMq1jBgZCMLJvhuCm6UDk,970056
 qubx/core/series.pxd,sha256=ZA9mBrZ-ha112ZMZnBIun1kNrKjxzlaOoq4D_cDZYJw,3923
 qubx/core/series.pyi,sha256=r6o2SnYIBujmJuuoM8oEc3tbVg2Blz2CfSIdRKn9VMo,4547
 qubx/core/series.pyx,sha256=Y6GbCihO3zgUWOF9UvmyXisWLnGcVOcFl2u1ZtvM1zI,44909
-qubx/core/utils.cpython-312-x86_64-linux-gnu.so,sha256=X9kz20c-xdLeWmKONjUx8Ag-OS1LCALi9F6TO6gKrnU,86568
+qubx/core/utils.cpython-312-x86_64-linux-gnu.so,sha256=cOfj8bdUMj8VYurQajzxqhiPIdXlxo2rthWEnn5FPFM,86568
 qubx/core/utils.pyi,sha256=a-wS13V2p_dM1CnGq40JVulmiAhixTwVwt0ah5By0Hc,348
 qubx/core/utils.pyx,sha256=k5QHfEFvqhqWfCob89ANiJDKNG8gGbOh-O4CVoneZ8M,1696
 qubx/data/__init__.py,sha256=ELZykvpPGWc5rX7QoNyNQwMLgdKMG8MACOByA4pM5hA,549
@@ -104,7 +104,7 @@ qubx/restorers/signal.py,sha256=iruHe4ieTSV73zeJbFPubsmAEf4TzVXnkM4zjupCAJQ,6462
 qubx/restorers/state.py,sha256=ePmh604fp2kRYzMNXL-TWvZOxmtTGAaKYfHJcnKResY,4042
 qubx/restorers/utils.py,sha256=We2gfqwQKWziUYhuUnjb-xo-5tSlbuHWpPQn0CEMTn0,1155
 qubx/ta/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-qubx/ta/indicators.cpython-312-x86_64-linux-gnu.so,sha256=gPPX5D8xIVrONoYoOMW-YfT8zl7x1XSXkhL7LT2YFXo,654440
+qubx/ta/indicators.cpython-312-x86_64-linux-gnu.so,sha256=WWckO4c42inIW-CCEmcW-xCNY7dpmujiJ55TvCqQuwc,654440
 qubx/ta/indicators.pxd,sha256=eCJ9paOxtxbDFx4U5CUhcgB1jjCQAfVqMF2FnbJ03Lo,4222
 qubx/ta/indicators.pyi,sha256=19W0uERft49In5bf9jkJHkzJYEyE9gzudN7_DJ5Vdv8,1963
 qubx/ta/indicators.pyx,sha256=FVkv5ld04TpZMT3a_kR1MU3IUuWfijzjJnh_lG78JxM,26029
@@ -134,11 +134,11 @@ qubx/utils/plotting/renderers/plotly.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMp
 qubx/utils/runner/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 qubx/utils/runner/_jupyter_runner.pyt,sha256=0f6ZdfhM1BYoWFuZVqwZj7jvlv7_PZE1upJ3Tx9L2NI,9198
 qubx/utils/runner/accounts.py,sha256=brf_RP22-nFlpyLg-eES-4pCikqev-I7OHa2bnLDK6o,3304
-qubx/utils/runner/configs.py,sha256=VDGUoNX-Hqjwy59K49GlAa577djJ2Ej2fhyEAaXQBl4,3119
-qubx/utils/runner/runner.py,sha256=8wR0eLd4T2uf4HQBNNfUWfT9kaneNqz_g050uibe6Ew,37476
+qubx/utils/runner/configs.py,sha256=vtl04A42kT21hD68zpoZZw96rEC8HnFFX9en0Y85GLA,3131
+qubx/utils/runner/runner.py,sha256=kwigJ9MgBcOkDpYAHj2TuwQzNerwyUWaE4UmyNYxD34,37910
 qubx/utils/time.py,sha256=J0ZFGjzFL5T6GA8RPAel8hKG0sg2LZXeQ5YfDCfcMHA,10055
 qubx/utils/version.py,sha256=e52fIHyxzCiIuH7svCF6pkHuDlqL64rklqz-2XjWons,5309
-qubx-0.6.9.dist-info/METADATA,sha256=GQ_4ifNuG63a4UZDD3fbeDjAqvDzFJE1KP7gdmpkUSc,4141
-qubx-0.6.9.dist-info/WHEEL,sha256=h1DdjcD2ZFnKGsDLjEycQhNNPJ5l-R8qdFdDSXHrAGY,110
-qubx-0.6.9.dist-info/entry_points.txt,sha256=VqilDTe8mVuV9SbR-yVlZJBTjbkHIL2JBgXfQw076HY,47
-qubx-0.6.9.dist-info/RECORD,,
+qubx-0.6.10.dist-info/METADATA,sha256=LPSsRviGdvTomS-OolxJMEr5I61F9tLUTPegAsDSQAM,4142
+qubx-0.6.10.dist-info/WHEEL,sha256=h1DdjcD2ZFnKGsDLjEycQhNNPJ5l-R8qdFdDSXHrAGY,110
+qubx-0.6.10.dist-info/entry_points.txt,sha256=VqilDTe8mVuV9SbR-yVlZJBTjbkHIL2JBgXfQw076HY,47
+qubx-0.6.10.dist-info/RECORD,,