sqlsaber 0.30.1__py3-none-any.whl → 0.31.0__py3-none-any.whl

sqlsaber/config/oauth_tokens.py

@@ -1,16 +1,16 @@
 """OAuth token management for SQLSaber."""
 
 import json
-import logging
 from datetime import datetime, timedelta, timezone
 from typing import Any
 
 import keyring
 
+from sqlsaber.config.logging import get_logger
 from sqlsaber.theme.manager import create_console
 
 console = create_console()
-logger = logging.getLogger(__name__)
+logger = get_logger(__name__)
 
 
 class OAuthToken:
@@ -99,6 +99,7 @@ class OAuthTokenManager:
                     f"OAuth token for {provider} has expired and needs refresh",
                     style="muted",
                 )
+                logger.info("oauth.token.expired", provider=provider)
                 return token  # Return anyway for refresh attempt
 
             if token.expires_soon():
@@ -106,11 +107,14 @@ class OAuthTokenManager:
                     f"OAuth token for {provider} expires soon, consider refreshing",
                     style="muted",
                 )
+                logger.info("oauth.token.expires_soon", provider=provider)
 
             return token
 
         except Exception as e:
-            logger.warning(f"Failed to retrieve OAuth token for {provider}: {e}")
+            logger.warning(
+                "oauth.token.retrieve_failed", provider=provider, error=str(e)
+            )
             return None
 
     def store_oauth_token(self, provider: str, token: OAuthToken) -> bool:
@@ -121,9 +125,10 @@ class OAuthTokenManager:
             token_data = json.dumps(token.to_dict())
             keyring.set_password(service_name, provider, token_data)
             console.print(f"OAuth token for {provider} stored securely", style="green")
+            logger.info("oauth.token.stored", provider=provider)
             return True
         except Exception as e:
-            logger.error(f"Failed to store OAuth token for {provider}: {e}")
+            logger.error("oauth.token.store_failed", provider=provider, error=str(e))
             console.print(
                 f"Warning: Could not store OAuth token in keyring: {e}",
                 style="warning",
@@ -149,7 +154,10 @@ class OAuthTokenManager:
             token_type=existing_token.token_type,
         )
 
-        return self.store_oauth_token(provider, updated_token)
+        success = self.store_oauth_token(provider, updated_token)
+        if success:
+            logger.info("oauth.token.updated", provider=provider)
+        return success
 
     def remove_oauth_token(self, provider: str) -> bool:
         """Remove OAuth token from storage."""
@@ -158,9 +166,10 @@ class OAuthTokenManager:
         try:
             keyring.delete_password(service_name, provider)
             console.print(f"OAuth token for {provider} removed", style="green")
+            logger.info("oauth.token.removed", provider=provider)
             return True
         except Exception as e:
-            logger.error(f"Failed to remove OAuth token for {provider}: {e}")
+            logger.error("oauth.token.remove_failed", provider=provider, error=str(e))
             console.print(
                 f"Warning: Could not remove OAuth token: {e}", style="warning"
             )

sqlsaber/threads/storage.py

@@ -9,7 +9,6 @@ recommended approach of serializing ModelMessage[] with ModelMessagesTypeAdapter
 """
 
 import asyncio
-import logging
 import time
 import uuid
 from pathlib import Path
@@ -19,7 +18,9 @@ import aiosqlite
 import platformdirs
 from pydantic_ai.messages import ModelMessage, ModelMessagesTypeAdapter
 
-logger = logging.getLogger(__name__)
+from sqlsaber.config.logging import get_logger
+
+logger = get_logger(__name__)
 
 
 SCHEMA_SQL = """
@@ -79,9 +80,9 @@ class ThreadStorage:
                 await db.executescript(SCHEMA_SQL)
                 await db.commit()
             self._initialized = True
-            logger.debug("Initialized threads database at %s", self.db_path)
+            logger.info("threads.db.init", path=str(self.db_path))
         except Exception as e:  # pragma: no cover - best-effort persistence
-            logger.warning("Failed to initialize threads DB: %s", e)
+            logger.warning("threads.db.init_failed", error=str(e))
 
     async def save_snapshot(
         self,
@@ -116,10 +117,10 @@ class ThreadStorage:
                         ),
                     )
                     await db.commit()
-                logger.debug("Created thread %s", thread_id)
+                logger.info("threads.create", thread_id=thread_id)
                 return thread_id
             except Exception as e:  # pragma: no cover
-                logger.warning("Failed to create thread: %s", e)
+                logger.warning("threads.create_failed", error=str(e))
                 return thread_id
         else:
             try:
@@ -140,10 +141,12 @@ class ThreadStorage:
                         ),
                     )
                     await db.commit()
-                logger.debug("Updated thread %s snapshot", thread_id)
+                logger.info("threads.update_snapshot", thread_id=thread_id)
                 return thread_id
             except Exception as e:  # pragma: no cover
-                logger.warning("Failed to update thread %s: %s", thread_id, e)
+                logger.warning(
+                    "threads.update_snapshot_failed", thread_id=thread_id, error=str(e)
+                )
                 return thread_id
 
     async def save_metadata(
@@ -167,9 +170,12 @@ class ThreadStorage:
                     (title, model_name, thread_id),
                 )
                 await db.commit()
+            logger.info("threads.update_metadata", thread_id=thread_id)
             return True
         except Exception as e:  # pragma: no cover
-            logger.warning("Failed to update metadata for thread %s: %s", thread_id, e)
+            logger.warning(
+                "threads.update_metadata_failed", thread_id=thread_id, error=str(e)
+            )
             return False
 
     async def end_thread(self, thread_id: str) -> bool:
@@ -181,9 +187,10 @@ class ThreadStorage:
                     (time.time(), time.time(), thread_id),
                 )
                 await db.commit()
+            logger.info("threads.end", thread_id=thread_id)
             return True
         except Exception as e:  # pragma: no cover
-            logger.warning("Failed to end thread %s: %s", thread_id, e)
+            logger.warning("threads.end_failed", thread_id=thread_id, error=str(e))
             return False
 
     async def get_thread(self, thread_id: str) -> Thread | None:
@@ -211,7 +218,7 @@ class ThreadStorage:
                         model_name=row[6],
                     )
         except Exception as e:  # pragma: no cover
-            logger.warning("Failed to get thread %s: %s", thread_id, e)
+            logger.warning("threads.get_failed", thread_id=thread_id, error=str(e))
             return None
 
     async def get_thread_messages(self, thread_id: str) -> list[ModelMessage]:
@@ -229,7 +236,9 @@ class ThreadStorage:
                     messages_blob: bytes = row[0]
                     return ModelMessagesTypeAdapter.validate_json(messages_blob)
         except Exception as e:  # pragma: no cover
-            logger.warning("Failed to load thread %s messages: %s", thread_id, e)
+            logger.warning(
+                "threads.get_messages_failed", thread_id=thread_id, error=str(e)
+            )
             return []
 
     async def list_threads(
@@ -265,7 +274,7 @@ class ThreadStorage:
                         )
                     return threads
         except Exception as e:  # pragma: no cover
-            logger.warning("Failed to list threads: %s", e)
+            logger.warning("threads.list_failed", error=str(e))
             return []
 
     async def delete_thread(self, thread_id: str) -> bool:
@@ -274,9 +283,12 @@ class ThreadStorage:
             async with self._lock, aiosqlite.connect(self.db_path) as db:
                 cur = await db.execute("DELETE FROM threads WHERE id = ?", (thread_id,))
                 await db.commit()
-                return cur.rowcount > 0
+                deleted = cur.rowcount > 0
+                if deleted:
+                    logger.info("threads.delete", thread_id=thread_id)
+                return deleted
         except Exception as e:  # pragma: no cover
-            logger.warning("Failed to delete thread %s: %s", thread_id, e)
+            logger.warning("threads.delete_failed", thread_id=thread_id, error=str(e))
             return False
 
     async def prune_threads(self, older_than_days: int = 30) -> int:
@@ -297,7 +309,9 @@ class ThreadStorage:
                     (cutoff,),
                 )
                 await db.commit()
-                return cur.rowcount or 0
+                deleted = cur.rowcount or 0
+                logger.info("threads.prune", days=older_than_days, deleted=deleted)
+                return deleted
         except Exception as e:  # pragma: no cover
-            logger.warning("Failed to prune threads: %s", e)
+            logger.warning("threads.prune_failed", days=older_than_days, error=str(e))
             return 0

{sqlsaber-0.30.1.dist-info → sqlsaber-0.31.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sqlsaber
-Version: 0.30.1
+Version: 0.31.0
 Summary: SQLsaber - Open-source agentic SQL assistant
 License-File: LICENSE
 Requires-Python: >=3.12
@@ -11,12 +11,14 @@ Requires-Dist: cyclopts>=3.22.1
 Requires-Dist: duckdb>=0.9.2
 Requires-Dist: httpx>=0.28.1
 Requires-Dist: keyring>=25.6.0
+Requires-Dist: keyrings-cryptfile; sys_platform == 'linux'
 Requires-Dist: platformdirs>=4.0.0
 Requires-Dist: prompt-toolkit>3.0.51
 Requires-Dist: pydantic-ai
 Requires-Dist: questionary>=2.1.0
 Requires-Dist: rich>=13.7.0
 Requires-Dist: sqlglot[rs]>=27.20.0
+Requires-Dist: structlog>=25.4.0
 Description-Content-Type: text/markdown
 
 # SQLsaber

{sqlsaber-0.30.1.dist-info → sqlsaber-0.31.0.dist-info}/RECORD

@@ -9,24 +9,25 @@ sqlsaber/application/db_setup.py,sha256=ZSgR9rJJVHttIjsbYQS9GEIyzkM09k5RLrVGdegr
 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=elUpw8gypHGlxbHx4a4_z4wFznx2vr6V1h8lqpeC6OQ,6121
-sqlsaber/cli/commands.py,sha256=Pii_SlVKpNEtt57_QPQzwC1u-x6tA8kuG8yd43undWE,8628
+sqlsaber/cli/auth.py,sha256=8BsAkOYarLSpGipYi2CCUqyAv7EbOCqVXKLmdrX_g2c,6966
+sqlsaber/cli/commands.py,sha256=eH6jC2coaH6QhJAlOySBxEHfETWW283fBr6BQG60Bl8,9732
 sqlsaber/cli/completers.py,sha256=g-hLDq5fiBx7gg8Bte1Lq8GU-ZxCYVs4dcPsmHPIcK4,6574
-sqlsaber/cli/database.py,sha256=Tqy8H5MnjsrmOSPcbA5Qy-u-IOYJCIXRJVhk0veLNDk,10726
+sqlsaber/cli/database.py,sha256=BBGj0eyduh5DDXNLZLDtWfY9kWpeT_ZX0J9R9INZyyU,12421
 sqlsaber/cli/display.py,sha256=WB5JCumhXadziDEX1EZHG3vN1Chol5FNAaTXHieqFK0,17892
-sqlsaber/cli/interactive.py,sha256=PcY6mszImo_3PsqjjWmx_cOfj44OmKvD9ENOvGA-wjU,13715
-sqlsaber/cli/memory.py,sha256=IKq09DUbqpvvtATsyDlpm7rDlGqWEhdUX9wgnR-oiq4,7850
-sqlsaber/cli/models.py,sha256=nbn75gCnkRciGt4Q47yxa8wImiZcCkDdQZNVeehDim8,8530
+sqlsaber/cli/interactive.py,sha256=XSl_W1NOozFfxf3On5r6w53qMNULyttHnH4vR4iQGus,14140
+sqlsaber/cli/memory.py,sha256=kAY5LLFueIF30gJ8ibfrFw42rOyy5wajeJGS4h5XQw4,9475
+sqlsaber/cli/models.py,sha256=aVHazP_fiT-Mj9AtCdjliDtq3E3fJrhgP4oF5p4CuwI,9593
 sqlsaber/cli/onboarding.py,sha256=iBGT-W-OJFRvQoEpuHYyO1c9Mym5c97eIefRvxGHtTg,11265
-sqlsaber/cli/streaming.py,sha256=eggj25ZlA-xKrAF726S29vfS2MHTFC5wTmgXLbS-RvM,6515
-sqlsaber/cli/theme.py,sha256=hP0kmsMLCtqaT7b5wB1dk1hW1hV94oP4BHdz8S6887A,4243
-sqlsaber/cli/threads.py,sha256=o9q9Hst1Wt7cxSyrpAtwG6pkUct6csgiAmN_0P_WO3k,13637
+sqlsaber/cli/streaming.py,sha256=jicSDLWQ3efitpdc2y4QsasHcEW8ogZ4lHcWmftq9Ao,6763
+sqlsaber/cli/theme.py,sha256=D6HIt7rmF00B5ZOCV5lXKzPICE4uppHdraOdVs7k5Nw,4672
+sqlsaber/cli/threads.py,sha256=zYvs1epmRRuQxOofF85eXk1_YHS6co7oq_F33DdNdf0,14643
 sqlsaber/config/__init__.py,sha256=olwC45k8Nc61yK0WmPUk7XHdbsZH9HuUAbwnmKe3IgA,100
 sqlsaber/config/api_keys.py,sha256=dJ7cCSFOM6CRLHxEVgKJXGIOd_wQkRuQO4W88-8ng_w,3672
 sqlsaber/config/auth.py,sha256=b5qB2h1doXyO9Bn8z0CcL8LAR2jF431gGXBGKLgTmtQ,2756
 sqlsaber/config/database.py,sha256=Yec6_0wdzq-ADblMNnbgvouYCimYOY_DWHT9oweaISc,11449
-sqlsaber/config/oauth_flow.py,sha256=P81lHhtICdhiQu8lNwyqn2m45FGEqCEzLgUQTLG5UW0,10343
-sqlsaber/config/oauth_tokens.py,sha256=nkCPFV1Yxs6W5wDRze2PAu8g5HqCN3n-Ihvv-6lmXPI,5954
+sqlsaber/config/logging.py,sha256=V-DGhKm7XYPtcA6bXL-aQQyTTlyHi2WHTqTTzu2xipw,6174
+sqlsaber/config/oauth_flow.py,sha256=cDfaJjqr4spNuzxbAlzuJfk6SEe1ojSRAkoOWlvQYy0,11037
+sqlsaber/config/oauth_tokens.py,sha256=KCC2u3lOjdh0M-rd0K1rW0PWk58w7mqpodAhlPVp9NE,6424
 sqlsaber/config/providers.py,sha256=JFjeJv1K5Q93zWSlWq3hAvgch1TlgoF0qFa0KJROkKY,2957
 sqlsaber/config/settings.py,sha256=-nIBNt9E0tCRGd14bk4x-bNAwO12sbsjRsN8fFannK4,6449
 sqlsaber/database/__init__.py,sha256=Gi9N_NOkD459WRWXDg3hSuGoBs3xWbMDRBvsTVmnGAg,2025
@@ -44,14 +45,14 @@ sqlsaber/memory/storage.py,sha256=ne8szLlGj5NELheqLnI7zu21V8YS4rtpYGGC7tOmi-s,57
 sqlsaber/theme/__init__.py,sha256=qCICX1Cg4B6yCbZ1UrerxglWxcqldRFVSRrSs73na_8,188
 sqlsaber/theme/manager.py,sha256=TPourIKGU-UzHtImgexgtazpuDaFhqUYtVauMblgGAQ,6480
 sqlsaber/threads/__init__.py,sha256=Hh3dIG1tuC8fXprREUpslCIgPYz8_6o7aRLx4yNeO48,139
-sqlsaber/threads/storage.py,sha256=rsUdxT4CR52D7xtGir9UlsFnBMk11jZeflzDrk2q4ME,11183
+sqlsaber/threads/storage.py,sha256=gs-BMjGbow7KOF3dOfbNS64B8TNfxdbktV9K2PyiszI,11801
 sqlsaber/tools/__init__.py,sha256=O6eqkMk8mkhYDniQD1eYgAElOjiHz03I2bGARdgkDkk,421
 sqlsaber/tools/base.py,sha256=NKEEooliPKTJj_Pomwte_wW0Xd9Z5kXNfVdCRfTppuw,883
 sqlsaber/tools/registry.py,sha256=XmBzERq0LJXtg3BZ-r8cEyt8J54NUekgUlTJ_EdSYMk,2204
 sqlsaber/tools/sql_guard.py,sha256=dTDwcZP-N4xPGzcr7MQtKUxKrlDzlc1irr9aH5a4wvk,6182
 sqlsaber/tools/sql_tools.py,sha256=eo-NTxiXGHMopAjujvDDjmv9hf5bQNbiy3nTpxoJ_E8,7369
-sqlsaber-0.30.1.dist-info/METADATA,sha256=9Pfi9tzGwiqGMtci8l2DuhQpvTTzqHhIzZyyfljzEuQ,5823
-sqlsaber-0.30.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-sqlsaber-0.30.1.dist-info/entry_points.txt,sha256=tw1mB0fjlkXQiOsC0434X6nE-o1cFCuQwt2ZYHv_WAE,91
-sqlsaber-0.30.1.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-sqlsaber-0.30.1.dist-info/RECORD,,
+sqlsaber-0.31.0.dist-info/METADATA,sha256=B5_gtNMDPZ9pEIMaAHvuvx9XvyaTS3ENl3A37d1-A_o,5915
+sqlsaber-0.31.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+sqlsaber-0.31.0.dist-info/entry_points.txt,sha256=tw1mB0fjlkXQiOsC0434X6nE-o1cFCuQwt2ZYHv_WAE,91
+sqlsaber-0.31.0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+sqlsaber-0.31.0.dist-info/RECORD,,