Qubx 1.0.4.dev1__tar.gz → 1.0.4.dev3__tar.gz

{qubx-1.0.4.dev1 → qubx-1.0.4.dev3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Qubx
-Version: 1.0.4.dev1
+Version: 1.0.4.dev3
 Summary: Qubx - Quantitative Trading Framework
 Project-URL: homepage, https://xlydian.com
 Project-URL: repository, https://github.com/xLydianSoftware/Qubx
@@ -9,12 +9,17 @@ Author-email: Dmitry Marienko <dmitry.marienko@xlydian.com>, Yuriy Arabskyy <yur
 License-File: LICENSE
 Requires-Python: <4.0,>=3.12
 Requires-Dist: aiohttp<3.11,>=3.10.11
+Requires-Dist: boto3<2,>=1.34.0
 Requires-Dist: click<9,>=8.1.7
 Requires-Dist: croniter<3,>=2.0.5
+Requires-Dist: duckdb>=1.0.0
 Requires-Dist: gitpython<4,>=3.1.44
 Requires-Dist: importlib-metadata
+Requires-Dist: ipykernel<7,>=6.29.0
+Requires-Dist: ipywidgets<9,>=8.1.5
 Requires-Dist: jinja2<4,>=3.1.0
 Requires-Dist: joblib<2,>=1.3.0
+Requires-Dist: jupyter-client<9,>=8.0.0
 Requires-Dist: loguru<1,>=0.7.2
 Requires-Dist: msgspec<1,>=0.18.6
 Requires-Dist: ntplib<1,>=0.4.0
@@ -22,17 +27,27 @@ Requires-Dist: numba<1,>=0.59.1
 Requires-Dist: numpy>=1.26.3
 Requires-Dist: orjson<4,>=3.10.15
 Requires-Dist: pandas<3,>=2.2.2
+Requires-Dist: prometheus-client<1,>=0.21.1
+Requires-Dist: psycopg-binary<4,>=3.1.19
+Requires-Dist: psycopg-pool<4,>=3.2.2
+Requires-Dist: psycopg<4,>=3.1.18
 Requires-Dist: pyarrow>=15.0.0
 Requires-Dist: pydantic-settings<3,>=2.4.0
 Requires-Dist: pydantic<3,>=2.9.2
+Requires-Dist: pymongo<5,>=4.6.1
 Requires-Dist: python-dotenv<2,>=1.0.0
 Requires-Dist: pyyaml<7,>=6.0.2
+Requires-Dist: questdb<3,>=2.0.3
+Requires-Dist: redis<6,>=5.2.1
 Requires-Dist: rich<14,>=13.9.4
 Requires-Dist: scipy<2,>=1.12.0
 Requires-Dist: sortedcontainers<3,>=2.4.0
 Requires-Dist: stackprinter<1,>=0.2.10
 Requires-Dist: statsmodels<1,>=0.14.6
 Requires-Dist: tabulate<1,>=0.9.0
+Requires-Dist: textual-autocomplete<5,>=4.0.0
+Requires-Dist: textual-serve<2,>=1.0.0
+Requires-Dist: textual[syntax]<7,>=6.0.0
 Requires-Dist: toml<1,>=0.10.2
 Requires-Dist: tqdm<5,>=4.66.0
 Requires-Dist: uvloop<1,>=0.22.1; sys_platform != 'win32'
@@ -43,25 +58,9 @@ Provides-Extra: bitfinex
 Requires-Dist: qubx-bitfinex-api<4,>=3.0.7; extra == 'bitfinex'
 Provides-Extra: connectors
 Requires-Dist: ccxt<5,>=4.2.68; extra == 'connectors'
-Provides-Extra: db
-Requires-Dist: duckdb>=1.0.0; extra == 'db'
-Requires-Dist: psycopg-binary<4,>=3.1.19; extra == 'db'
-Requires-Dist: psycopg-pool<4,>=3.2.2; extra == 'db'
-Requires-Dist: psycopg<4,>=3.1.18; extra == 'db'
-Requires-Dist: pymongo<5,>=4.6.1; extra == 'db'
-Requires-Dist: questdb<3,>=2.0.3; extra == 'db'
-Requires-Dist: redis<6,>=5.2.1; extra == 'db'
 Provides-Extra: jupyter
-Requires-Dist: ipywidgets<9,>=8.1.5; extra == 'jupyter'
 Requires-Dist: jupyter-console<7,>=6.6.3; extra == 'jupyter'
 Requires-Dist: jupyter<2,>=1.1.1; extra == 'jupyter'
-Provides-Extra: k8
-Requires-Dist: boto3<2,>=1.34.0; extra == 'k8'
-Requires-Dist: prometheus-client<1,>=0.21.1; extra == 'k8'
-Provides-Extra: tui
-Requires-Dist: textual-autocomplete<5,>=4.0.0; extra == 'tui'
-Requires-Dist: textual-serve<2,>=1.0.0; extra == 'tui'
-Requires-Dist: textual[syntax]<7,>=6.0.0; extra == 'tui'
 Provides-Extra: viz
 Requires-Dist: dash-bootstrap-components<2,>=1.6.0; extra == 'viz'
 Requires-Dist: dash<3,>=2.18.2; extra == 'viz'

{qubx-1.0.4.dev1 → qubx-1.0.4.dev3}/pyproject.toml

@@ -46,6 +46,24 @@ dependencies = [
     "rich>=13.9.4,<14",
     "click>=8.1.7,<9",
     "statsmodels>=0.14.6,<1",
+    # Database backends
+    "pymongo>=4.6.1,<5",
+    "redis>=5.2.1,<6",
+    "psycopg>=3.1.18,<4",
+    "psycopg-binary>=3.1.19,<4",
+    "psycopg-pool>=3.2.2,<4",
+    "questdb>=2.0.3,<3",
+    "duckdb>=1.0.0",
+    # Terminal UI
+    "textual[syntax]>=6.0.0,<7",
+    "textual-autocomplete>=4.0.0,<5",
+    "textual-serve>=1.0.0,<2",
+    "jupyter-client>=8.0.0,<9",
+    "ipykernel>=6.29.0,<7",
+    "ipywidgets>=8.1.5,<9",
+    # Production monitoring & cloud
+    "prometheus-client>=0.21.1,<1",
+    "boto3>=1.34.0,<2",
 ]
 
 [project.urls]
@@ -57,7 +75,7 @@ docs = "https://xlydiansoftware.github.io/Qubx"
 qubx = "qubx.cli.commands:main"
 
 # ============================================================
-# OPTIONAL DEPENDENCIES (`pip install qubx[connectors,db,...]`)
+# OPTIONAL DEPENDENCIES (`pip install qubx[connectors,...]`)
 # ============================================================
 [project.optional-dependencies]
 # Exchange connectors (ccxt-based)
@@ -66,16 +84,6 @@ connectors = ["ccxt>=4.2.68,<5"]
 binance = ["python-binance>=1.0.19,<2"]
 # Bitfinex-specific (custom API client)
 bitfinex = ["qubx-bitfinex-api>=3.0.7,<4"]
-# Database backends (MongoDB, Redis, PostgreSQL/QuestDB, DuckDB)
-db = [
-    "pymongo>=4.6.1,<5",
-    "redis>=5.2.1,<6",
-    "psycopg>=3.1.18,<4",
-    "psycopg-binary>=3.1.19,<4",
-    "psycopg-pool>=3.2.2,<4",
-    "questdb>=2.0.3,<3",
-    "duckdb>=1.0.0",
-]
 # Visualization & charting
 viz = [
     "matplotlib>=3.8.4,<4",
@@ -83,22 +91,10 @@ viz = [
     "dash>=2.18.2,<3",
     "dash-bootstrap-components>=1.6.0,<2",
 ]
-# Terminal UI (textual TUI, browse command)
-tui = [
-    "textual[syntax]>=6.0.0,<7",
-    "textual-autocomplete>=4.0.0,<5",
-    "textual-serve>=1.0.0,<2",
-]
 # Jupyter integration
 jupyter = [
     "jupyter>=1.1.1,<2",
     "jupyter-console>=6.6.3,<7",
-    "ipywidgets>=8.1.5,<9",
-]
-# Kubernetes / production monitoring
-k8 = [
-    "prometheus-client>=0.21.1,<1",
-    "boto3>=1.34.0,<2",
 ]
 
 # ============================================================
@@ -164,7 +160,6 @@ dev = [
     "py-spy>=0.4.1,<1",
     # Jupyter / notebooks
     "ipykernel>=6.29.4,<7",
-    "iprogress>=0.4,<1",
     "nbformat>=5.10.4,<6",
     # Documentation
     "markdown==3.7",

{qubx-1.0.4.dev1 → qubx-1.0.4.dev3}/src/qubx/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '1.0.4.dev1'
-__version_tuple__ = version_tuple = (1, 0, 4, 'dev1')
+__version__ = version = '1.0.4.dev3'
+__version_tuple__ = version_tuple = (1, 0, 4, 'dev3')
 
 __commit_id__ = commit_id = None

{qubx-1.0.4.dev1 → qubx-1.0.4.dev3}/src/qubx/cli/release.py

@@ -633,10 +633,15 @@ def _scan_strategy_deps(
         all_deps.extend(group_deps)
 
     # Step 4: for each declared dep, check if the strategy uses it
+    import re
+
     scanned_deps: list[str] = []
     for dep_spec in all_deps:
-        # Extract package name from spec like "cachetools>=6.2.1,<7"
-        pkg_name = dep_spec.split(">=")[0].split("==")[0].split("<")[0].split("[")[0].strip()
+        # Parse dep spec like "qubx[connectors,db,k8,tui]==1.0.3" or "cachetools>=6.2.1,<7"
+        # Extract: package name, extras (if any), version specifiers
+        match = re.match(r'^([A-Za-z0-9_.-]+)(\[[^\]]*\])?', dep_spec)
+        pkg_name = match.group(1).strip() if match else dep_spec.split("[")[0].split(">")[0].split("=")[0].split("<")[0].strip()
+        extras = match.group(2) or "" if match else ""
         pkg_name_normalized = pkg_name.lower().replace("-", "_")
 
         # Determine import names for this package
@@ -652,7 +657,7 @@ def _scan_strategy_deps(
                 if dist.files:
                     for f in dist.files:
                         parts = str(f).split("/")
-                        if len(parts) > 1 and not parts[0].endswith(".dist-info"):
+                        if len(parts) > 1 and parts[0] and not parts[0].endswith(".dist-info"):
                             import_names.add(parts[0].replace("-", "_"))
                 if not import_names:
                     import_names.add(pkg_name_normalized)
@@ -662,10 +667,10 @@ def _scan_strategy_deps(
 
         # Check if any import name is used by strategy
         if import_names & strategy_imports:
-            # Pin version from lock file
+            # Pin version from lock file, preserving extras
             version = lock_versions.get(pkg_name_normalized)
             if version:
-                pinned = f"{pkg_name}=={version}"
+                pinned = f"{pkg_name}{extras}=={version}"
             else:
                 # Fallback to declared spec
                 pinned = dep_spec
@@ -893,12 +898,6 @@ def _generate_release_pyproject(
         },
     }
 
-    # Preserve [[tool.uv.index]] from original pyproject (needed for private registry)
-    if pyproject_data:
-        indexes = pyproject_data.get("tool", {}).get("uv", {}).get("index", [])
-        if indexes:
-            release_pyproject["tool"]["uv"]["index"] = indexes
-
     pyproject_path = os.path.join(release_dir, "pyproject.toml")
     with open(pyproject_path, "w") as f:
         toml.dump(release_pyproject, f)

{qubx-1.0.4.dev1 → qubx-1.0.4.dev3}/src/qubx/connectors/ccxt/exchanges/__init__.py

@@ -9,8 +9,6 @@ import ccxt.pro as cxp
 from ..broker import CcxtBroker
 from .binance.broker import BinanceCcxtBroker
 from .binance.exchange import BINANCE_UM_MM, BinancePortfolioMargin, BinanceQV, BinanceQVUSDM
-from .bitfinex.bitfinex import BitfinexF
-from .bitfinex.bitfinex_account import BitfinexAccountProcessor
 from .gateio.gateio import GateioFutures
 from .hyperliquid.account import HyperliquidAccountProcessor
 from .hyperliquid.broker import HyperliquidCcxtBroker
@@ -20,6 +18,15 @@ from .okx.account import OkxAccountProcessor
 from .okx.broker import OkxCcxtBroker
 from .okx.okx import OkxFutures
 
+# Bitfinex requires optional qubx-bitfinex-api package
+try:
+    from .bitfinex.bitfinex import BitfinexF
+    from .bitfinex.bitfinex_account import BitfinexAccountProcessor
+
+    _HAS_BITFINEX = True
+except ImportError:
+    _HAS_BITFINEX = False
+
 
 @dataclass
 class ReaderCapabilities:
@@ -59,7 +66,7 @@ CUSTOM_BROKERS: dict[str, BrokerConfig] = {
     "binance.um": BrokerConfig(BinanceCcxtBroker, {"enable_create_order_ws": True, "enable_cancel_order_ws": True}),
     "binance.cm": BrokerConfig(BinanceCcxtBroker, {"enable_create_order_ws": True, "enable_cancel_order_ws": False}),
     "binance.pm": BrokerConfig(BinanceCcxtBroker, {"enable_create_order_ws": False, "enable_cancel_order_ws": False}),
-    "bitfinex.f": BrokerConfig(CcxtBroker, {"enable_create_order_ws": True, "enable_cancel_order_ws": True}),
+    **({"bitfinex.f": BrokerConfig(CcxtBroker, {"enable_create_order_ws": True, "enable_cancel_order_ws": True})} if _HAS_BITFINEX else {}),
     "hyperliquid": BrokerConfig(
         HyperliquidCcxtBroker,
         {"enable_create_order_ws": True, "enable_cancel_order_ws": False, "enable_edit_order_ws": True},
@@ -72,7 +79,7 @@ CUSTOM_BROKERS: dict[str, BrokerConfig] = {
 }
 
 CUSTOM_ACCOUNTS = {
-    "bitfinex.f": BitfinexAccountProcessor,
+    **({"bitfinex.f": BitfinexAccountProcessor} if _HAS_BITFINEX else {}),
     "hyperliquid": HyperliquidAccountProcessor,
     "hyperliquid.f": HyperliquidAccountProcessor,
     "okx.f": OkxAccountProcessor,
@@ -98,7 +105,8 @@ cxp.binanceqv_usdm = BinanceQVUSDM  # type: ignore
 cxp.binancepm = BinancePortfolioMargin  # type: ignore
 cxp.binance_um_mm = BINANCE_UM_MM  # type: ignore
 cxp.custom_krakenfutures = CustomKrakenFutures  # type: ignore
-cxp.bitfinex_f = BitfinexF  # type: ignore
+if _HAS_BITFINEX:
+    cxp.bitfinex_f = BitfinexF  # type: ignore
 cxp.hyperliquid = Hyperliquid  # type: ignore
 cxp.hyperliquid_f = HyperliquidF  # type: ignore
 cxp.gateio_futures = GateioFutures  # type: ignore
@@ -110,7 +118,8 @@ cxp.exchanges.append("binancepm")
 cxp.exchanges.append("binancepm_usdm")
 cxp.exchanges.append("binance_um_mm")
 cxp.exchanges.append("custom_krakenfutures")
-cxp.exchanges.append("bitfinex_f")
+if _HAS_BITFINEX:
+    cxp.exchanges.append("bitfinex_f")
 cxp.exchanges.append("hyperliquid")
 cxp.exchanges.append("hyperliquid_f")
 cxp.exchanges.append("gateio_futures")