Qubx 1.1.2.dev2__tar.gz → 1.1.2.dev4__tar.gz

{qubx-1.1.2.dev2 → qubx-1.1.2.dev4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Qubx
-Version: 1.1.2.dev2
+Version: 1.1.2.dev4
 Summary: Qubx - Quantitative Trading Framework
 Project-URL: homepage, https://xlydian.com
 Project-URL: repository, https://github.com/xLydianSoftware/Qubx

{qubx-1.1.2.dev2 → qubx-1.1.2.dev4}/src/qubx/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '1.1.2.dev2'
-__version_tuple__ = version_tuple = (1, 1, 2, 'dev2')
+__version__ = version = '1.1.2.dev4'
+__version_tuple__ = version_tuple = (1, 1, 2, 'dev4')
 
 __commit_id__ = commit_id = None

{qubx-1.1.2.dev2 → qubx-1.1.2.dev4}/src/qubx/core/mixins/trading.py

@@ -563,16 +563,25 @@ class TradingManager(ITradingManager):
         )
 
     def _adjust_size(self, instrument: Instrument, amount: float) -> float:
-        size_adj = instrument.round_size_down(abs(amount))
+        abs_amount = abs(amount)
+        size_adj = instrument.round_size_down(abs_amount)
         min_size = self._get_min_size(instrument, amount)
-        if abs(size_adj) < min_size:
-            # Try just in case to round up to avoid too small orders
-            size_adj = instrument.round_size_up(abs(amount))
-            if abs(size_adj) < min_size:
-                raise InvalidOrderSize(
-                    f"[{instrument.symbol}] Attempt to trade size {abs(amount)} less than minimal allowed {min_size} !"
-                )
-        return size_adj
+
+        if size_adj >= min_size:
+            return size_adj
+
+        size_adj = instrument.round_size_up(abs_amount)
+        if size_adj >= min_size:
+            return size_adj
+
+        # When amount is already at precision, round_size_up returns the same value.
+        # Round up min_size instead, but only if the gap is within one lot step.
+        if abs_amount + instrument.lot_size >= min_size:
+            return instrument.round_size_up(min_size)
+
+        raise InvalidOrderSize(
+            f"[{instrument.symbol}] Attempt to trade size {abs_amount} less than minimal allowed {min_size} !"
+        )
 
     def _adjust_price(self, instrument: Instrument, price: float | None, amount: float) -> float | None:
         if price is None:

{qubx-1.1.2.dev2 → qubx-1.1.2.dev4}/src/qubx/data/cache.py

@@ -270,16 +270,18 @@ def _merge_batches(existing: pa.RecordBatch, incoming: pa.RecordBatch, time_col_
         [
             pa.Table.from_batches([existing]),
             pa.Table.from_batches([incoming]),
-        ]
+        ],
+        promote_options="permissive",
     )
     time_col_name = tbl.schema.field(time_col_idx).name
     tbl = tbl.sort_by(time_col_name)
 
+    merged_schema = tbl.schema
     pdf = tbl.to_pandas()
     dedup_cols = [time_col_name] + [f.name for f in existing.schema if pa.types.is_string(f.type) or pa.types.is_large_string(f.type)]
     pdf = pdf.drop_duplicates(subset=dedup_cols, keep="last")
 
-    batch = pa.RecordBatch.from_pandas(pdf, schema=existing.schema, preserve_index=False)
+    batch = pa.RecordBatch.from_pandas(pdf, schema=merged_schema, preserve_index=False)
     return batch
 
 

{qubx-1.1.2.dev2 → qubx-1.1.2.dev4}/src/qubx/data/storages/questdb.py

@@ -318,6 +318,10 @@ class xLTableMetaInfo:
         ("binance", "cmfutures"): ("binance.cm", "future"),
         ("binance", "margin"): ("binance.pm", "swap"),
         ("gateio", "swap"): ("gateio.f", "swap"),
+        ("kraken", "swap"): ("kraken.f", "swap"),
+        ("hyperliquid", "swap"): ("hyperliquid.f", "swap"),
+        ("bybit", "swap"): ("bybit.f", "swap"),
+        ("okx", "swap"): ("okx.f", "swap"),
     }
 
     _DTYPE_FIX = {

{qubx-1.1.2.dev2 → qubx-1.1.2.dev4}/src/qubx/data/transformers.py

@@ -119,7 +119,7 @@ class PandasFrame(IDataTransformer):
                 tbl = tbl.append_column(pa.field("symbol", pa.large_string()), sym_col)
             tables.append(tbl)
 
-        tbl = pa.concat_tables(tables)
+        tbl = pa.concat_tables(tables, promote_options="permissive")
         df = tbl.to_pandas()
         df[t_name] = pd.to_datetime(df[t_name])
         return df.set_index([t_name, "symbol"]).sort_index()