Qubx 1.0.6.dev6__tar.gz → 1.0.6.dev7__tar.gz

{qubx-1.0.6.dev6 → qubx-1.0.6.dev7}/PKG-INFO

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

{qubx-1.0.6.dev6 → qubx-1.0.6.dev7}/src/qubx/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '1.0.6.dev6'
-__version_tuple__ = version_tuple = (1, 0, 6, 'dev6')
+__version__ = version = '1.0.6.dev7'
+__version_tuple__ = version_tuple = (1, 0, 6, 'dev7')
 
 __commit_id__ = commit_id = None

{qubx-1.0.6.dev6 → qubx-1.0.6.dev7}/src/qubx/backtester/data.py

@@ -102,19 +102,14 @@ class SimulatedDataProvider(IDataProvider):
             # - try to peek most recent market data
             h_data = self._data_source.peek_historical_data(i, subscription_type)
             if h_data:
-                # _s_type = DataType.from_str(subscription_type)[0]
+                self.channel.send((i, subscription_type, h_data, True))
+
                 last_update = h_data[-1]
                 if last_quote := self._account._exchange.emulate_quote_from_data(i, last_update.time, last_update):  # type: ignore
-                    # - send historical data to the channel
-                    self.channel.send((i, subscription_type, h_data, True))
-
-                    # - set last quote
                     self._last_quotes[i] = last_quote
-
-                    # - also need to pass this quote to OME !
                     self._account.process_market_data(last_quote.time, i, last_quote)  # type: ignore
 
-                    logger.debug(f" | subscribed {subscription_type} {i} -> {last_quote}")
+                logger.debug(f" | subscribed {subscription_type} {i} -> {len(h_data)} records")
 
     def unsubscribe(self, subscription_type: str, instruments: set[Instrument] | Instrument | None = None) -> None:
         # logger.debug(f" | unsubscribe: {subscription_type} -> {instruments}")

{qubx-1.0.6.dev6 → qubx-1.0.6.dev7}/src/qubx/backtester/management.py

@@ -49,7 +49,8 @@ import pandas as pd
 
 from qubx.core.metrics import TradingSessionResult
 from qubx.utils.misc import blue, cyan, green, magenta, red, yellow
-from qubx.utils.results import SimulationResultsSaver, is_cloud_path, resolve_s3_storage_options
+from qubx.utils.results import SimulationResultsSaver
+from qubx.utils.s3 import S3Client, is_cloud_path
 
 
 class BacktestStorage:
@@ -119,8 +120,10 @@ class BacktestStorage:
         self.base_path = base_path.rstrip("/") + "/"
         self._is_cloud = is_cloud_path(base_path)
 
-        # - for cloud paths: resolve credentials once (env vars → explicit dict)
-        self._storage_options: dict | None = resolve_s3_storage_options(storage_options) if self._is_cloud else None
+        # - for cloud paths: resolve credentials once
+        self._storage_options: dict | None = (
+            S3Client(storage_options=storage_options).storage_options if self._is_cloud else None
+        )
         self._conn = self._duckdb.connect()
 
         if self._is_cloud:
@@ -130,14 +133,12 @@ class BacktestStorage:
         """Configure DuckDB httpfs extension for cloud storage access."""
         self._conn.execute("INSTALL httpfs; LOAD httpfs;")
 
-        # - _storage_options is already resolved at __init__ for cloud paths
         opts = self._storage_options or {}
         if "key" in opts:
             self._conn.execute(f"SET s3_access_key_id='{opts['key']}';")
         if "secret" in opts:
             self._conn.execute(f"SET s3_secret_access_key='{opts['secret']}';")
         if "endpoint_url" in opts:
-            # - strip protocol prefix — DuckDB expects hostname only
             endpoint = opts["endpoint_url"].removeprefix("https://").removeprefix("http://")
             self._conn.execute(f"SET s3_endpoint='{endpoint}';")
         if "client_kwargs" in opts:

{qubx-1.0.6.dev6 → qubx-1.0.6.dev7}/src/qubx/backtester/runner.py

@@ -437,7 +437,7 @@ class SimulationRunner:
         # - TimeGuard is applied by callers that need it (aux/strategy-facing access).
         # - Main simulation data (DataPump) must NOT be time-guarded: DataPump provides
         #   its own explicit [start, end] window and needs to read the full range upfront.
-        _prefetch_period = str(max(self.stop - self.start, pd.Timedelta(prefetch_cfg.prefetch_period)))
+        _prefetch_period = str(min(self.stop - self.start, pd.Timedelta(prefetch_cfg.prefetch_period)))
         return CachedStorage(
             storage, prefetch_period=_prefetch_period, cache_factory=lambda: MemoryCache(prefetch_cfg.cache_size_mb)
         )

{qubx-1.0.6.dev6 → qubx-1.0.6.dev7}/src/qubx/cli/commands.py

@@ -248,6 +248,13 @@ def run(
     "Overrides the 'name:' field from the config file.",
     show_default=True,
 )
+@click.option(
+    "--log-file",
+    default=None,
+    type=click.Path(dir_okay=False),
+    help="Write simulation logs to a specific file path.",
+    show_default=True,
+)
 def simulate(
     config_file: Path,
     start: str | None,
@@ -256,6 +263,7 @@ def simulate(
     report: str | None,
     log_to_file: bool,
     name: str | None,
+    log_file: str | None,
 ):
     """
     Simulates the strategy with the given configuration file.
@@ -267,7 +275,9 @@ def simulate(
     add_project_to_system_path(str(config_file.parent))
     logo()
     logger.info(f"Process PID: <g>{os.getpid()}</g>")
-    simulate_strategy(config_file, output, start, end, report, log_to_file, name=name)
+    simulate_strategy(
+        config_file, output, start, end, report, log_to_file, name=name, log_file=log_file,
+    )
 
 
 @main.command()
@@ -467,9 +477,10 @@ def deploy(zip_file: str, output_dir: str | None, force: bool, system: bool):
 @click.argument(
     "results-path",
     type=str,
-    default="results",
+    default=None,
+    required=False,
 )
-def browse(results_path: str):
+def browse(results_path: str | None):
     """
     Browse backtest results using an interactive TUI.
 
@@ -487,10 +498,14 @@ def browse(results_path: str):
 
         qubx browse s3://my-bucket/backtests/
     """
-    from qubx.utils.results import is_cloud_path
+    from qubx.config import get_settings
+    from qubx.utils.s3 import is_cloud_path
 
     from .tui import run_backtest_browser
 
+    if results_path is None:
+        results_path = get_settings().default_browse_path or "results"
+
     # - only resolve local paths; cloud URIs (s3://, gs://, az://) are passed as-is
     if not is_cloud_path(results_path):
         results_path = os.path.abspath(os.path.expanduser(results_path))
@@ -755,5 +770,87 @@ def backtests(storage_path: str, where: str | None, order_by: str, limit: int |
     bs.print(where=where, order_by=order_by, limit=limit, params=params)
 
 
+@main.group()
+def s3():
+    """
+    Operate on S3-compatible storage using named accounts.
+
+    Paths use the format: account:bucket/path
+
+    Examples:\n
+      qubx s3 ls hetzner:frab/spreads/\n
+      qubx s3 rm hetzner:frab/spreads/ --recursive\n
+      qubx s3 cp hetzner:frab/spreads/data.parquet ./local_copy.parquet
+    """
+    pass
+
+
+@s3.command("accounts")
+def s3_accounts_cmd():
+    """List configured S3 accounts."""
+    from .s3 import s3_accounts
+
+    s3_accounts()
+
+
+@s3.command("ls")
+@click.argument("path", type=str)
+@click.option("--recursive", "-r", is_flag=True, help="List files recursively.")
+@click.option("--long", "-l", is_flag=True, help="Show detailed info (size, type).")
+def s3_ls_cmd(path: str, recursive: bool, long: bool):
+    """
+    List files in an S3 path.
+
+    Examples:\n
+      qubx s3 ls hetzner:frab/\n
+      qubx s3 ls hetzner:frab/spreads/ -r -l
+    """
+    from .s3 import s3_ls
+
+    s3_ls(path, recursive=recursive, long=long)
+
+
+@s3.command("rm")
+@click.argument("path", type=str)
+@click.option("--recursive", "-r", is_flag=True, help="Delete recursively.")
+@click.option("--yes", "-y", is_flag=True, help="Skip confirmation prompt.")
+def s3_rm_cmd(path: str, recursive: bool, yes: bool):
+    """
+    Delete files from S3.
+
+    Examples:\n
+      qubx s3 rm hetzner:frab/spreads/long_exchange=BINANCE.UM/asset=BTC/data.parquet\n
+      qubx s3 rm hetzner:frab/spreads/ -r
+    """
+    if not yes:
+        label = f"{path} (recursive)" if recursive else path
+        click.confirm(f"Delete {label}?", abort=True)
+
+    from .s3 import s3_rm
+
+    s3_rm(path, recursive=recursive)
+
+
+@s3.command("cp")
+@click.argument("src", type=str)
+@click.argument("dst", type=str)
+@click.option("--recursive", "-r", is_flag=True, help="Copy recursively.")
+def s3_cp_cmd(src: str, dst: str, recursive: bool):
+    """
+    Copy files to/from S3.
+
+    At least one of SRC or DST must be an S3 path (account:bucket/path).
+    The other can be a local path for upload/download.
+
+    Examples:\n
+      qubx s3 cp hetzner:frab/data.parquet ./local.parquet\n
+      qubx s3 cp ./local.parquet hetzner:frab/data.parquet\n
+      qubx s3 cp hetzner:frab/spreads/ ./spreads/ -r
+    """
+    from .s3 import s3_cp
+
+    s3_cp(src, dst, recursive=recursive)
+
+
 if __name__ == "__main__":
     main()

qubx-1.0.6.dev7/src/qubx/cli/s3.py

@@ -0,0 +1,124 @@
+"""S3 storage operations using named accounts from Qubx settings.
+
+Uses :class:`qubx.utils.s3.S3Client` for all operations.
+"""
+
+import click
+from pyarrow.fs import FileType, LocalFileSystem, copy_files
+
+from qubx.config import get_settings
+from qubx.utils.s3 import S3Client, parse_uri
+
+
+def _human_size(nbytes: int) -> str:
+    for unit in ("B", "KB", "MB", "GB", "TB"):
+        if abs(nbytes) < 1024:
+            return f"{nbytes:6.1f} {unit}"
+        nbytes /= 1024  # type: ignore[assignment]
+    return f"{nbytes:.1f} PB"
+
+
+def s3_ls(path: str, recursive: bool = False, long: bool = False) -> None:
+    try:
+        client, s3_path = S3Client.from_uri(path)
+    except ValueError as e:
+        raise click.BadParameter(str(e))
+
+    try:
+        entries = client.ls(s3_path, recursive=recursive)
+    except Exception as e:
+        click.echo(click.style(f"Error listing {s3_path}: {e}", fg="red"), err=True)
+        raise click.Abort()
+
+    if not entries:
+        click.echo(click.style(f"No files found under: {s3_path}", fg="yellow"))
+        return
+
+    for info in sorted(entries, key=lambda e: e.path):
+        if long:
+            size = _human_size(info.size) if info.type == FileType.File else "     -"
+            kind = "DIR " if info.type == FileType.Directory else "FILE"
+            click.echo(f"  {kind}  {size}  {info.path}")
+        else:
+            click.echo(f"  {info.path}")
+
+
+def s3_rm(path: str, recursive: bool = False) -> None:
+    try:
+        client, s3_path = S3Client.from_uri(path)
+    except ValueError as e:
+        raise click.BadParameter(str(e))
+
+    try:
+        if recursive:
+            entries = client.ls(s3_path, recursive=True)
+            files = [e for e in entries if e.type == FileType.File]
+            if not files:
+                click.echo(click.style(f"No files found under: {s3_path}", fg="yellow"))
+                return
+            click.echo(f"Deleting {len(files)} file(s) under {s3_path} ...")
+        client.rm(s3_path, recursive=recursive)
+        click.echo(click.style(f"✓ Deleted {s3_path}", fg="green"))
+    except Exception as e:
+        click.echo(click.style(f"Error deleting {s3_path}: {e}", fg="red"), err=True)
+        raise click.Abort()
+
+
+def s3_cp(src: str, dst: str, recursive: bool = False) -> None:
+    src_is_s3 = ":" in src
+    dst_is_s3 = ":" in dst
+
+    if src_is_s3 and dst_is_s3:
+        try:
+            src_account, src_path = parse_uri(src)
+            dst_account, dst_path = parse_uri(dst)
+        except ValueError as e:
+            raise click.BadParameter(str(e))
+
+        if src_account != dst_account:
+            click.echo(
+                click.style("Cross-account copy is not supported yet.", fg="red"),
+                err=True,
+            )
+            raise click.Abort()
+        client = S3Client(account=src_account)
+        client.copy_s3(src_path, dst_path, recursive=recursive)
+        click.echo(click.style(f"✓ Copied {src_path} → {dst_path}", fg="green"))
+
+    elif src_is_s3 and not dst_is_s3:
+        try:
+            client, src_path = S3Client.from_uri(src)
+        except ValueError as e:
+            raise click.BadParameter(str(e))
+        copy_files(src_path, dst, source_filesystem=client.fs, destination_filesystem=LocalFileSystem())
+        click.echo(click.style(f"✓ Downloaded {src_path} → {dst}", fg="green"))
+
+    elif not src_is_s3 and dst_is_s3:
+        try:
+            client, dst_path = S3Client.from_uri(dst)
+        except ValueError as e:
+            raise click.BadParameter(str(e))
+        copy_files(src, dst_path, source_filesystem=LocalFileSystem(), destination_filesystem=client.fs)
+        click.echo(click.style(f"✓ Uploaded {src} → {dst_path}", fg="green"))
+
+    else:
+        click.echo(
+            click.style("At least one path must be an S3 path (account:bucket/path).", fg="red"),
+            err=True,
+        )
+        raise click.Abort()
+
+
+def s3_accounts() -> None:
+    s = get_settings()
+    if not s.s3:
+        click.echo("No S3 accounts configured.")
+        return
+
+    click.echo(click.style("Configured S3 accounts:", fg="cyan", bold=True))
+    for name, acct in s.s3.items():
+        default_marker = " (default)" if name == s.default_s3_account else ""
+        click.echo(f"  {click.style(name, fg='yellow')}{default_marker}")
+        click.echo(f"    endpoint: {acct.endpoint_url}")
+        if acct.region:
+            click.echo(f"    region:   {acct.region}")

{qubx-1.0.6.dev6 → qubx-1.0.6.dev7}/src/qubx/cli/tui.py

@@ -10,6 +10,8 @@ from textual import on, work
 from textual.app import App, ComposeResult
 from textual.binding import Binding
 from textual.containers import Horizontal, Vertical
+from textual.coordinate import Coordinate
+from textual.timer import Timer
 from textual.widgets import (
     Button,
     DataTable,
@@ -699,6 +701,7 @@ class BacktestBrowserApp(App):
     DARK = True
 
     BINDINGS = [
+        Binding("q", "quit", "Quit", show=True),
         Binding("j", "vim_down", "Down", show=False),
         Binding("k", "vim_up", "Up", show=False),
         Binding("g", "vim_home", "Top", show=False),
@@ -707,6 +710,7 @@ class BacktestBrowserApp(App):
         Binding("S", "sort_by_key_sharpe", "Sort Sharpe", show=True),
         Binding("C", "sort_by_key_cagr", "Sort CAGR", show=True),
         Binding("G", "vim_end", "Sort Gain", show=True),  # - Tree: scroll end; Table: sort gain
+        Binding("T", "sort_by_key_created", "Sort Created", show=True),
     ]
 
     CSS = """
@@ -865,6 +869,9 @@ class BacktestBrowserApp(App):
         self._selected_result: dict[str, Any] | None = None
         # - tracks which node is currently being loaded to discard stale callbacks
         self._loading_node: BacktestTreeNode | None = None
+        # - cc (copy path) state machine
+        self._pending_copy: bool = False
+        self._pending_copy_timer: Timer | None = None
 
     def compose(self) -> ComposeResult:
         """Compose the TUI layout"""
@@ -880,6 +887,7 @@ class BacktestBrowserApp(App):
                     yield Button("Sort by Sharpe", id="sort-sharpe")
                     yield Button("Sort by CAGR", id="sort-cagr")
                     yield Button("Sort by Gain", id="sort-gain")
+                    yield Button("Sort by Created", id="sort-created")
                     yield Button("Open HTML", id="open-html")
                     yield Button("Refresh", id="refresh")
 
@@ -910,7 +918,7 @@ class BacktestBrowserApp(App):
         if node_data.backtest_results:
             # - already loaded: show immediately (cached after first click)
             self.current_results = node_data.backtest_results
-            self._update_table()
+            self._sort_table("creation_time")
             self.query_one("#metrics-table", MetricsTable).focus()
 
         elif node_data.pending_ids:
@@ -1011,7 +1019,7 @@ class BacktestBrowserApp(App):
 
         self.current_results = node_data.backtest_results
         if self.current_results:
-            self._update_table()
+            self._sort_table("creation_time")
             table.focus()
         else:
             self.call_later(
@@ -1034,6 +1042,11 @@ class BacktestBrowserApp(App):
         """Sort results by total gain"""
         self._sort_table("gain")
 
+    @on(Button.Pressed, "#sort-created")
+    def sort_by_created(self) -> None:
+        """Sort results by creation time"""
+        self._sort_table("creation_time")
+
     @on(Button.Pressed, "#open-html")
     def open_html_tearsheet(self) -> None:
         """Open full HTML tearsheet in browser for the selected result"""
@@ -1071,7 +1084,14 @@ class BacktestBrowserApp(App):
         ``_fv`` substitutes 0.0 for NaN / None so those rows sink to the bottom.
         """
         if self.current_results:
-            self.current_results.sort(key=lambda x: _fv(x.get(metric)), reverse=True)
+            if metric == "creation_time":
+                # - timestamps cannot go through _fv (float coercion); use pd.Timestamp
+                self.current_results.sort(
+                    key=lambda x: pd.Timestamp(x.get("creation_time") or "1970-01-01"),
+                    reverse=True,
+                )
+            else:
+                self.current_results.sort(key=lambda x: _fv(x.get(metric)), reverse=True)
             self._update_table()
 
     def _update_table(self) -> None:
@@ -1163,6 +1183,68 @@ class BacktestBrowserApp(App):
         if not isinstance(self.focused, Tree):
             self._sort_table("cagr")
 
+    def action_sort_by_key_created(self) -> None:
+        """Sort table by creation time (T — right pane only)."""
+        if not isinstance(self.focused, Tree):
+            self._sort_table("creation_time")
+
+    # ── cc copy path ─────────────────────────────────────────────────────────
+
+    def on_key(self, event) -> None:
+        """Handle key events for multi-key bindings (cc = copy path to clipboard)."""
+        if event.key == "c":
+            if not isinstance(self.focused, DataTable):
+                # - only intercept c when DataTable is focused
+                return
+            if self._pending_copy:
+                # - second 'c' within timeout: complete the copy
+                self._pending_copy = False
+                if self._pending_copy_timer:
+                    self._pending_copy_timer.stop()
+                    self._pending_copy_timer = None
+                self._copy_current_path()
+                event.prevent_default()
+                event.stop()
+            else:
+                # - first 'c': enter pending state, start timeout
+                self._pending_copy = True
+                self._pending_copy_timer = self.set_timer(
+                    0.5, self._cancel_pending_copy, name="cc_timeout"
+                )
+                event.prevent_default()
+                event.stop()
+        elif self._pending_copy:
+            # - any other key cancels the pending copy
+            self._cancel_pending_copy()
+
+    def _cancel_pending_copy(self) -> None:
+        """Cancel the pending cc copy operation (timeout or different key)."""
+        self._pending_copy = False
+        if self._pending_copy_timer:
+            self._pending_copy_timer.stop()
+            self._pending_copy_timer = None
+
+    def _copy_current_path(self) -> None:
+        """Copy the path of the currently highlighted table row to clipboard via OSC 52."""
+        table = self.query_one("#metrics-table", MetricsTable)
+        if table.row_count == 0:
+            return
+
+        try:
+            cursor_row = table.cursor_row
+            cell_key = table.coordinate_to_cell_key(Coordinate(cursor_row, 0))
+            load_id = cell_key.row_key.value
+        except Exception:
+            self.notify("No row selected", severity="warning", timeout=2)
+            return
+
+        if not load_id:
+            return
+
+        # - load_id is the backtest_id = relative path from storage root
+        self.copy_to_clipboard(str(load_id))
+        self.notify(f"Copied: {load_id}", timeout=3)
+
     # ── tearsheet ────────────────────────────────────────────────────────────
 
     def _generate_html_tearsheet(self, result_info: dict[str, Any]) -> None:

{qubx-1.0.6.dev6 → qubx-1.0.6.dev7}/src/qubx/config.py

@@ -93,6 +93,7 @@ class QubxSettings(BaseSettings):
     metrics_port: int | None = None
     health_port: int | None = None
     log_format: str = "text"  # "text" or "json"
+    default_browse_path: str | None = None
 
     model_config = {"env_prefix": "QUBX_", "env_nested_delimiter": "__"}
 

{qubx-1.0.6.dev6 → qubx-1.0.6.dev7}/src/qubx/core/interfaces.py

@@ -148,7 +148,11 @@ class ITradeDataExport:
         pass
 
     def export_position_changes(
-        self, time: dt_64, instrument: Instrument, price: float, account: "IAccountViewer",
+        self,
+        time: dt_64,
+        instrument: Instrument,
+        price: float,
+        account: "IAccountViewer",
         metadata: dict[str, Any] | None = None,
     ) -> None:
         """

{qubx-1.0.6.dev6 → qubx-1.0.6.dev7}/src/qubx/core/loggers.py

@@ -137,7 +137,7 @@ class PortfolioLogger(PositionsDumper):
                 "exchange": i.exchange,
                 "market_type": i.market_type,
                 "pnl_quoted": p.pnl,
-                "quantity": p.quantity,
+                "quantity": p.quantity * i.quantity_multiplier,
                 "realized_pnl_quoted": p.r_pnl,
                 "avg_position_price": p.position_avg_price if p.quantity != 0.0 else 0.0,
                 "current_price": p.last_update_price,