sqlsaber 0.28.0__py3-none-any.whl → 0.29.1__py3-none-any.whl

sqlsaber/theme/manager.py

@@ -1,7 +1,7 @@
 """Theme management for unified theming across Rich and prompt_toolkit."""
 
+import json
 import os
-import tomllib
 from dataclasses import dataclass
 from functools import lru_cache
 from typing import Dict
@@ -10,20 +10,14 @@ from platformdirs import user_config_dir
 from prompt_toolkit.styles import Style as PTStyle
 from prompt_toolkit.styles.pygments import style_from_pygments_cls
 from pygments.styles import get_style_by_name
+from pygments.token import Token
+from pygments.util import ClassNotFound
 from rich.console import Console
 from rich.theme import Theme
 
 DEFAULT_THEME_NAME = "nord"
 
 DEFAULT_ROLE_PALETTE = {
-    # base roles
-    "primary": "cyan",
-    "accent": "magenta",
-    "success": "green",
-    "warning": "yellow",
-    "error": "red",
-    "info": "cyan",
-    "muted": "dim",
     # components
     "table.header": "bold $primary",
     "panel.border.user": "$info",
@@ -43,89 +37,97 @@ DEFAULT_ROLE_PALETTE = {
     "title": "bold $success",
 }
 
-# Theme presets using exact Pygments colors
-THEME_PRESETS = {
-    # Nord - exact colors from pygments nord theme
-    "nord": {
-        "primary": "#81a1c1",  # Keyword (frost)
-        "accent": "#b48ead",  # Number (aurora purple)
-        "success": "#a3be8c",  # String (aurora green)
-        "warning": "#ebcb8b",  # String.Escape (aurora yellow)
-        "error": "#bf616a",  # Error/Generic.Error (aurora red)
-        "info": "#88c0d0",  # Name.Function (frost cyan)
-        "muted": "dim",
-    },
-    # Dracula - exact colors from pygments dracula theme
-    "dracula": {
-        "primary": "#bd93f9",  # purple
-        "accent": "#ff79c6",  # pink
-        "success": "#50fa7b",  # green
-        "warning": "#f1fa8c",  # yellow
-        "error": "#ff5555",  # red
-        "info": "#8be9fd",  # cyan
-        "muted": "dim",
-    },
-    # Solarized Light - exact colors from pygments solarized-light theme
-    "solarized-light": {
-        "primary": "#268bd2",  # blue
-        "accent": "#d33682",  # magenta
-        "success": "#859900",  # green
-        "warning": "#b58900",  # yellow
-        "error": "#dc322f",  # red
-        "info": "#2aa198",  # cyan
-        "muted": "dim",
-    },
-    # VS (Visual Studio Light) - exact colors from pygments vs theme
-    "vs": {
-        "primary": "#0000ff",  # Keyword (blue)
-        "accent": "#2b91af",  # Keyword.Type/Name.Class
-        "success": "#008000",  # Comment (green)
-        "warning": "#b58900",  # (using solarized yellow as fallback)
-        "error": "#dc322f",  # (using solarized red as fallback)
-        "info": "#2aa198",  # (using solarized cyan as fallback)
-        "muted": "dim",
-    },
-    # Material (approximation based on material design colors)
-    "material": {
-        "primary": "#89ddff",  # cyan
-        "accent": "#f07178",  # pink/red
-        "success": "#c3e88d",  # green
-        "warning": "#ffcb6b",  # yellow
-        "error": "#ff5370",  # red
-        "info": "#82aaff",  # blue
-        "muted": "dim",
-    },
-    # One Dark - exact colors from pygments one-dark theme
-    "one-dark": {
-        "primary": "#c678dd",  # Keyword (purple)
-        "accent": "#e06c75",  # Name (red)
-        "success": "#98c379",  # String (green)
-        "warning": "#e5c07b",  # Keyword.Type (yellow)
-        "error": "#e06c75",  # Name (red, used for errors)
-        "info": "#61afef",  # Name.Function (blue)
-        "muted": "dim",
-    },
-    # Lightbulb - exact colors from pygments lightbulb theme (minimal dark)
-    "lightbulb": {
-        "primary": "#73d0ff",  # Keyword.Type/Name.Class (blue_1)
-        "accent": "#dfbfff",  # Number (magenta_1)
-        "success": "#d5ff80",  # String (green_1)
-        "warning": "#ffd173",  # Name.Function (yellow_1)
-        "error": "#f88f7f",  # Error (red_1)
-        "info": "#95e6cb",  # Name.Entity (cyan_1)
-        "muted": "dim",
-    },
+ROLE_TOKEN_PREFERENCES: dict[str, tuple] = {
+    "primary": (
+        Token.Keyword,
+        Token.Keyword.Namespace,
+        Token.Name.Tag,
+    ),
+    "accent": (
+        Token.Name.Tag,
+        Token.Keyword.Type,
+        Token.Literal.Number,
+        Token.Operator.Word,
+    ),
+    "success": (
+        Token.Literal.String,
+        Token.Generic.Inserted,
+        Token.Name.Attribute,
+    ),
+    "warning": (
+        Token.Literal.String.Escape,
+        Token.Name.Constant,
+        Token.Generic.Emph,
+    ),
+    "error": (
+        Token.Error,
+        Token.Generic.Error,
+        Token.Generic.Deleted,
+        Token.Name.Exception,
+    ),
+    "info": (
+        Token.Name.Function,
+        Token.Name.Builtin,
+        Token.Keyword.Type,
+    ),
+    "muted": (
+        Token.Comment,
+        Token.Generic.Subheading,
+        Token.Text,
+    ),
 }
 
 
+def _normalize_hex(color: str | None) -> str | None:
+    if not color:
+        return None
+    color = color.strip()
+    if not color:
+        return None
+    if color.startswith("#"):
+        color = color[1:]
+    if len(color) == 3:
+        color = "".join(ch * 2 for ch in color)
+    if len(color) != 6:
+        return None
+    return f"#{color.lower()}"
+
+
+def _build_role_palette_from_style(style_name: str) -> dict[str, str]:
+    try:
+        style_cls = get_style_by_name(style_name)
+    except ClassNotFound:
+        return {}
+
+    palette: dict[str, str] = {}
+    try:
+        base_color = _normalize_hex(style_cls.style_for_token(Token.Text).get("color"))
+    except KeyError:
+        base_color = None
+    for role, tokens in ROLE_TOKEN_PREFERENCES.items():
+        for token in tokens:
+            try:
+                style_def = style_cls.style_for_token(token)
+            except KeyError:
+                continue
+            color = _normalize_hex(style_def.get("color"))
+            if not color or color == base_color:
+                continue
+            if role == "accent" and color == palette.get("primary"):
+                continue
+            palette[role] = color
+            break
+    return palette
+
+
 def _load_user_theme_config() -> dict:
     """Load theme configuration from user config directory."""
     cfg_dir = user_config_dir("sqlsaber")
-    path = os.path.join(cfg_dir, "theme.toml")
+    path = os.path.join(cfg_dir, "theme.json")
     if not os.path.exists(path):
         return {}
-    with open(path, "rb") as f:
-        return tomllib.load(f)
+    with open(path, "r") as f:
+        return json.load(f)
 
 
 def _resolve_refs(palette: dict[str, str]) -> dict[str, str]:
@@ -204,7 +206,7 @@ def get_theme_manager() -> ThemeManager:
     pygments_style = user_cfg.get("theme", {}).get("pygments_style") or name
 
     roles = dict(DEFAULT_ROLE_PALETTE)
-    roles.update(THEME_PRESETS.get(name, {}))
+    roles.update(_build_role_palette_from_style(pygments_style))
     roles.update(user_cfg.get("roles", {}))
 
     cfg = ThemeConfig(name=name, pygments_style=pygments_style, roles=roles)

{sqlsaber-0.28.0.dist-info → sqlsaber-0.29.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sqlsaber
-Version: 0.28.0
+Version: 0.29.1
 Summary: SQLsaber - Open-source agentic SQL assistant
 License-File: LICENSE
 Requires-Python: >=3.12

{sqlsaber-0.28.0.dist-info → sqlsaber-0.29.1.dist-info}/RECORD

@@ -5,28 +5,29 @@ sqlsaber/agents/base.py,sha256=40-MKEoz5rGrqVIylV1U2DaAUSPFcC75ohRin4E3-kk,2668
 sqlsaber/agents/mcp.py,sha256=Pn8tdDRUEVLYQyEi5nHRp9MKNePwHVVoeNI-uqWcr0Y,757
 sqlsaber/agents/pydantic_ai_agent.py,sha256=wBxKz0pjOkL-HI-TXV6B67bczZNgu7k26Rr3w5usR3o,10064
 sqlsaber/application/__init__.py,sha256=KY_-d5nEdQyAwNOsK5r-f7Tb69c63XbuEkHPeLpJal8,84
-sqlsaber/application/auth_setup.py,sha256=cbS2VTwL7mwm24UFRz84PhC13XMzC1F7JkN-ze7tApY,5104
-sqlsaber/application/db_setup.py,sha256=qtMxCd_KO7GsD4W_iRBpDRvLriiyvOXPvZdcvm6KVDM,6849
-sqlsaber/application/model_selection.py,sha256=xZI-nvUgYZikaTK38SCmEWvWSfRsDpFu2VthbVdI95g,3187
+sqlsaber/application/auth_setup.py,sha256=D94dyU9bOVfnNHLnnFJb5PaeWsKPTL21CiS_DLcY93A,5114
+sqlsaber/application/db_setup.py,sha256=ZSgR9rJJVHttIjsbYQS9GEIyzkM09k5RLrVGdegrfYc,6859
+sqlsaber/application/model_selection.py,sha256=fSC06MZNKinHDR-csMFVYYJFyK8MydKf6pStof74Jp0,3191
 sqlsaber/application/prompts.py,sha256=4rMGcWpYJbNWPMzqVWseUMx0nwvXOkWS6GaTAJ5mhfc,3473
 sqlsaber/cli/__init__.py,sha256=qVSLVJLLJYzoC6aj6y9MFrzZvAwc4_OgxU9DlkQnZ4M,86
-sqlsaber/cli/auth.py,sha256=ysDBXEFR8Jz7wYbIP6X7yWA2ivd8SDnUp_jUg_qYNWk,6088
-sqlsaber/cli/commands.py,sha256=-rTxr-kW7j2rR8wAg0tATKoh284pMDPKVMpQKaJwtqk,8540
+sqlsaber/cli/auth.py,sha256=elUpw8gypHGlxbHx4a4_z4wFznx2vr6V1h8lqpeC6OQ,6121
+sqlsaber/cli/commands.py,sha256=Pii_SlVKpNEtt57_QPQzwC1u-x6tA8kuG8yd43undWE,8628
 sqlsaber/cli/completers.py,sha256=g-hLDq5fiBx7gg8Bte1Lq8GU-ZxCYVs4dcPsmHPIcK4,6574
-sqlsaber/cli/database.py,sha256=hh8PdWnhaD0fO2jwvSSQyxsjwk-JyvmcY7f5tuHfnAQ,10663
+sqlsaber/cli/database.py,sha256=Tqy8H5MnjsrmOSPcbA5Qy-u-IOYJCIXRJVhk0veLNDk,10726
 sqlsaber/cli/display.py,sha256=WB5JCumhXadziDEX1EZHG3vN1Chol5FNAaTXHieqFK0,17892
-sqlsaber/cli/interactive.py,sha256=u1gvdMZJkFWelZQ2urOS6-EH1uShKF4u_edfr_BzDNk,13479
-sqlsaber/cli/memory.py,sha256=gKP-JJ0w1ya1YTM_Lk7Gw-7wL9ptyj6cZtg-uoW8K7A,7818
-sqlsaber/cli/models.py,sha256=NozZbnisSjbPKo7PW7CltJMIkGcPqTDpDQEY-C_eLhk,8504
-sqlsaber/cli/onboarding.py,sha256=l6FFWn8J1OVQUxr-xIAzKaFhAz8rFh6IEWwIyPWqR6U,11438
+sqlsaber/cli/interactive.py,sha256=PcY6mszImo_3PsqjjWmx_cOfj44OmKvD9ENOvGA-wjU,13715
+sqlsaber/cli/memory.py,sha256=IKq09DUbqpvvtATsyDlpm7rDlGqWEhdUX9wgnR-oiq4,7850
+sqlsaber/cli/models.py,sha256=iMTw3DCKIQbWfSfikwy-nQ5tiHWjoN4cbKA-G6RFlj4,8535
+sqlsaber/cli/onboarding.py,sha256=iBGT-W-OJFRvQoEpuHYyO1c9Mym5c97eIefRvxGHtTg,11265
 sqlsaber/cli/streaming.py,sha256=1XoZGPPMoTmBQVgp_Bqk483MR93j9oXxSV6Tx_-TpOg,6923
-sqlsaber/cli/threads.py,sha256=5EV4ckRzKqhWeTKpTfQSNCBuqs3onsJURKT09g4E4XM,13634
+sqlsaber/cli/theme.py,sha256=hP0kmsMLCtqaT7b5wB1dk1hW1hV94oP4BHdz8S6887A,4243
+sqlsaber/cli/threads.py,sha256=o9q9Hst1Wt7cxSyrpAtwG6pkUct6csgiAmN_0P_WO3k,13637
 sqlsaber/config/__init__.py,sha256=olwC45k8Nc61yK0WmPUk7XHdbsZH9HuUAbwnmKe3IgA,100
-sqlsaber/config/api_keys.py,sha256=bjogRmIuxNNGusyKXKi0ZpJWeS5Fyn53zrAD8hsoYx4,3671
+sqlsaber/config/api_keys.py,sha256=9RyhD5Bntq8NMFRPiZZo8YEHACK9MPyFGp8dsmQZ1iI,3678
 sqlsaber/config/auth.py,sha256=b5qB2h1doXyO9Bn8z0CcL8LAR2jF431gGXBGKLgTmtQ,2756
 sqlsaber/config/database.py,sha256=Yec6_0wdzq-ADblMNnbgvouYCimYOY_DWHT9oweaISc,11449
-sqlsaber/config/oauth_flow.py,sha256=VNbq4TZPk0hVJIcOh7JUO5qSxJnNzqDj0vwjCn-59Ok,10316
-sqlsaber/config/oauth_tokens.py,sha256=SC-lXVcKCV7uiWtBiU2mxvx1z7ryW8tOSKHBApPsXtE,5931
+sqlsaber/config/oauth_flow.py,sha256=P81lHhtICdhiQu8lNwyqn2m45FGEqCEzLgUQTLG5UW0,10343
+sqlsaber/config/oauth_tokens.py,sha256=V4U8GAQHjTfgUcTzwjRVaIE7DeN0tF9OsSjiasHw7Uc,5970
 sqlsaber/config/providers.py,sha256=JFjeJv1K5Q93zWSlWq3hAvgch1TlgoF0qFa0KJROkKY,2957
 sqlsaber/config/settings.py,sha256=iB4CnGQ4hw8gxkaa9CVLB_JEy6Y9h9FQTAams5OCVyI,6421
 sqlsaber/database/__init__.py,sha256=Gi9N_NOkD459WRWXDg3hSuGoBs3xWbMDRBvsTVmnGAg,2025
@@ -36,7 +37,7 @@ sqlsaber/database/duckdb.py,sha256=8HNKdx208aFK_YtwGjLz6LTne0xEmNevD-f9dRWlrFg,1
 sqlsaber/database/mysql.py,sha256=wMzDQqq4GFbfEdqXtv_sCb4Qbr9GSWqYAvOLeo5UryY,14472
 sqlsaber/database/postgresql.py,sha256=fuf2Wl29NKXvD3mqsR08PDleNQ1PG-fNvWSxT6HDh2M,13223
 sqlsaber/database/resolver.py,sha256=wSCcn__aCqwIfpt_LCjtW2Zgb8RpG5PlmwwZHli1q_U,3628
-sqlsaber/database/schema.py,sha256=68PrNcA-5eR9PZB3i-TUQw5_E7QatwiDU2wv9GgXgM4,6928
+sqlsaber/database/schema.py,sha256=CuV0ewoVaERe1gj_fJFJFWAP8aEPgepmn6X6B7bgkfQ,6962
 sqlsaber/database/sqlite.py,sha256=iReEIiSpkhhS1VzITd79ZWqSL3fHMyfe3DRCDpM0DvE,9421
 sqlsaber/mcp/__init__.py,sha256=COdWq7wauPBp5Ew8tfZItFzbcLDSEkHBJSMhxzy8C9c,112
 sqlsaber/mcp/mcp.py,sha256=tpNPHpkaCre1Xjp7c4DHXbTKeuYpDQ8qhmJZvAyr7Vk,3939
@@ -44,7 +45,7 @@ sqlsaber/memory/__init__.py,sha256=GiWkU6f6YYVV0EvvXDmFWe_CxarmDCql05t70MkTEWs,6
 sqlsaber/memory/manager.py,sha256=p3fybMVfH-E4ApT1ZRZUnQIWSk9dkfUPCyfkmA0HALs,2739
 sqlsaber/memory/storage.py,sha256=ne8szLlGj5NELheqLnI7zu21V8YS4rtpYGGC7tOmi-s,5745
 sqlsaber/theme/__init__.py,sha256=qCICX1Cg4B6yCbZ1UrerxglWxcqldRFVSRrSs73na_8,188
-sqlsaber/theme/manager.py,sha256=0DWuVXn7JoC8NvAl5FSqc61eagKFTx5YnoY8SoCTxGM,7236
+sqlsaber/theme/manager.py,sha256=xOi1ZLNr31ZtE8-WzxdtvywCB1rbJ7z2DTzcqHsCavY,6377
 sqlsaber/threads/__init__.py,sha256=Hh3dIG1tuC8fXprREUpslCIgPYz8_6o7aRLx4yNeO48,139
 sqlsaber/threads/storage.py,sha256=rsUdxT4CR52D7xtGir9UlsFnBMk11jZeflzDrk2q4ME,11183
 sqlsaber/tools/__init__.py,sha256=x3YdmX_7P0Qq_HtZHAgfIVKTLxYqKk6oc4tGsujQWsc,586
@@ -54,8 +55,8 @@ sqlsaber/tools/instructions.py,sha256=X-x8maVkkyi16b6Tl0hcAFgjiYceZaSwyWTfmrvx8U
 sqlsaber/tools/registry.py,sha256=HWOQMsNIdL4XZS6TeNUyrL-5KoSDH6PHsWd3X66o-18,3211
 sqlsaber/tools/sql_guard.py,sha256=dTDwcZP-N4xPGzcr7MQtKUxKrlDzlc1irr9aH5a4wvk,6182
 sqlsaber/tools/sql_tools.py,sha256=ujmAcfLkNaBrb5LWEgWcINQEQSX0LRPX3VK5Dag1Sj4,9178
-sqlsaber-0.28.0.dist-info/METADATA,sha256=oY9Awl9jLkdeJLa1oeTPHPGH94KktJ_HmBVUVLQs-do,7174
-sqlsaber-0.28.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-sqlsaber-0.28.0.dist-info/entry_points.txt,sha256=qEbOB7OffXPFgyJc7qEIJlMEX5RN9xdzLmWZa91zCQQ,162
-sqlsaber-0.28.0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-sqlsaber-0.28.0.dist-info/RECORD,,
+sqlsaber-0.29.1.dist-info/METADATA,sha256=kx_nQDGhcDUJp4DadT7Pi89QsUuf8S5W6IVqwaJfuXM,7174
+sqlsaber-0.29.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+sqlsaber-0.29.1.dist-info/entry_points.txt,sha256=qEbOB7OffXPFgyJc7qEIJlMEX5RN9xdzLmWZa91zCQQ,162
+sqlsaber-0.29.1.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+sqlsaber-0.29.1.dist-info/RECORD,,