bear-utils 0.8.22__py3-none-any.whl → 0.8.24__py3-none-any.whl

bear_utils/cli/prompt_helpers.py

@@ -10,7 +10,11 @@ from bear_utils.constants._exceptions import UserCancelledError
 from bear_utils.constants._lazy_typing import OptBool, OptFloat, OptInt, OptStr
 from bear_utils.logger_manager import get_console
 
-# TODO: ehhhhhhhh, it is okay
+
+def _parse_exit(value: str) -> bool:
+    """Parse a string into a boolean indicating if the user wants to exit."""
+    lower_value: str = value.lower().strip()
+    return lower_value in ("exit", "quit", "q")
 
 
 def _parse_bool(value: str) -> bool:
@@ -70,7 +74,7 @@ def ask_question(question: str, expected_type: type, default: Any = None) -> Any
         UserCancelledError: If the user cancels input with Ctrl+C
         ValueError: If an unsupported type is specified
     """
-    console, sub = get_console("prompt_helpers.py")
+    console, _ = get_console("prompt_helpers.py")
 
     try:
         while True:
@@ -80,14 +84,14 @@ def ask_question(question: str, expected_type: type, default: Any = None) -> Any
             if not response:
                 if default is not None:
                     return default
-                sub.error("Input required. Please enter a value.")
+                console.error("Input required. Please enter a value.")
                 continue
             try:
                 result: str | int | float | bool = _convert_value(response, expected_type)
-                sub.verbose(f"{expected_type.__name__} detected")
+                console.verbose(f"{expected_type.__name__} detected")
                 return result
             except ValueError as e:
-                sub.error(f"Invalid input: {e}. Please enter a valid {expected_type.__name__}.")
+                console.error(f"Invalid input: {e}. Please enter a valid {expected_type.__name__}.")
 
     except KeyboardInterrupt:
         raise UserCancelledError("User cancelled input") from None
@@ -108,15 +112,13 @@ def ask_yes_no(question: str, default: bool | None = None) -> bool | None:
     try:
         while True:
             console.print(question)
-            response = prompt("> ").strip().lower()
-
+            response: str = prompt("> ").strip().lower()
             if not response:
                 if default is not None:
                     return default
                 sub.error("Please enter 'yes', 'no', or 'exit'.")
                 continue
-
-            if response in ("exit", "quit"):
+            if _parse_exit(response):
                 return None
             try:
                 return _parse_bool(response)
@@ -128,7 +130,10 @@ def ask_yes_no(question: str, default: bool | None = None) -> bool | None:
 
 
 def restricted_prompt(
-    question: str, valid_options: list[str], exit_command: str = "exit", case_sensitive: bool = False
+    question: str,
+    valid_options: list[str],
+    exit_command: str = "exit",
+    case_sensitive: bool = False,
 ) -> str | None:
     """Continuously prompt the user until they provide a valid response or exit.
 
@@ -141,12 +146,12 @@ def restricted_prompt(
     Returns:
         The user's response or None if they chose to exit
     """
-    console, sub = get_console("prompt_helpers.py")
-    completer_options = [*valid_options, exit_command]
+    console, _ = get_console("prompt_helpers.py")
+    completer_options: list[str] = [*valid_options, exit_command]
     completer = WordCompleter(completer_options)
 
-    comparison_options = valid_options if case_sensitive else [opt.lower() for opt in valid_options]
-    comparison_exit = exit_command if case_sensitive else exit_command.lower()
+    comparison_options: list[str] = valid_options if case_sensitive else [opt.lower() for opt in valid_options]
+    comparison_exit: str = exit_command if case_sensitive else exit_command.lower()
 
     class OptionValidator(Validator):
         def validate(self, document: Any) -> None:
@@ -162,11 +167,14 @@ def restricted_prompt(
         while True:
             console.print(question)
             response: str = prompt(
-                "> ", completer=completer, validator=OptionValidator(), complete_while_typing=True
+                "> ",
+                completer=completer,
+                validator=OptionValidator(),
+                complete_while_typing=True,
             ).strip()
             comparison_response: str = response if case_sensitive else response.lower()
             if not response:
-                sub.error("Please enter a valid option or 'exit'.")
+                console.error("Please enter a valid option or 'exit'.")
                 continue
             if comparison_response == comparison_exit:
                 return None
@@ -175,7 +183,6 @@ def restricted_prompt(
                     idx: int = comparison_options.index(comparison_response)
                     return valid_options[idx]
                 return response
-
     except KeyboardInterrupt:
-        sub.warning("KeyboardInterrupt: Exiting the prompt.")
+        console.warning("KeyboardInterrupt: Exiting the prompt.")
         return None

bear_utils/cli/typer_bridge.py

@@ -0,0 +1,90 @@
+"""A simple bridge for augmenting Typer with alias support and command execution for interactive use."""
+
+from collections.abc import Callable
+import shlex
+from typing import Any, TypedDict
+
+from rich.console import Console
+from singleton_base import SingletonBase
+from typer import Exit, Typer
+from typer.models import CommandInfo
+
+from bear_utils.logger_manager import AsyncLoggerProtocol, LoggerProtocol
+
+
+class CommandMeta(TypedDict):
+    """Metadata for a Typer command."""
+
+    name: str
+    help: str
+    hidden: bool
+
+
+def get_command_meta(command: CommandInfo) -> CommandMeta:
+    """Extract metadata from a Typer command."""
+    return {
+        "name": command.name or (command.callback.__name__ if command.callback else "unknown"),
+        "help": (command.callback.__doc__ if command.callback else None) or "No description available",
+        "hidden": command.hidden,
+    }
+
+
+# TODO: Add support for usage statements for a more robust help system
+
+
+class TyperBridge(SingletonBase):
+    """Simple bridge for Typer command execution."""
+
+    def __init__(self, typer_app: Typer, console: AsyncLoggerProtocol | LoggerProtocol | Console) -> None:
+        """Initialize the TyperBridge with a Typer app instance."""
+        self.app: Typer = typer_app
+        self.console: AsyncLoggerProtocol | LoggerProtocol | Console = console or Console()
+        self.command_meta: dict[str, CommandMeta] = {}
+
+    def metadata(self, *alias_names: str) -> Callable[..., Callable[..., Any]]:
+        """Register aliases as hidden Typer commands."""
+
+        def decorator(func: Callable[..., Any]) -> Callable[..., Any]:
+            for alias in alias_names:
+                self.app.command(name=alias, hidden=True)(func)
+            return func
+
+        return decorator
+
+    def execute_command(self, command_string: str) -> bool:
+        """Execute command via Typer. Return True if successful."""
+        try:
+            parts: list[str] = shlex.split(command_string.strip())
+            if not parts:
+                return False
+            self.app(parts, standalone_mode=False)
+            return True
+        except Exit:
+            return True
+        except Exception as e:
+            if isinstance(self.console, Console):
+                self.console.print(f"[red]Error executing command: {e}[/red]")
+            else:
+                self.console.error(f"Error executing command: {e}", exc_info=True)
+            return False
+
+    def bootstrap_command_meta(self) -> None:
+        """Bootstrap command metadata from the Typer app."""
+        if not self.command_meta:
+            for cmd in self.app.registered_commands:
+                cmd_meta: CommandMeta = get_command_meta(command=cmd)
+                self.command_meta[cmd_meta["name"]] = cmd_meta
+
+    def get_all_command_info(self, show_hidden: bool = False) -> dict[str, CommandMeta]:
+        """Get all command information from the Typer app."""
+        if not self.command_meta:
+            self.bootstrap_command_meta()
+        if not show_hidden:
+            return {name: meta for name, meta in self.command_meta.items() if not meta["hidden"]}
+        return self.command_meta
+
+    def get_command_info(self, command_name: str) -> CommandMeta | None:
+        """Get metadata for a specific command."""
+        if not self.command_meta:
+            self.bootstrap_command_meta()
+        return self.command_meta.get(command_name)

bear_utils/database/_db_manager.py

@@ -32,42 +32,35 @@ class DatabaseManager:
             raise ValueError("Base class is not set, failed to set base.")
         return cls._base
 
-    def __init__(self, db_url: str | Path | None = None):
+    def __init__(self, db_url: str | Path | None = None, default_schema: str = "sqlite:///"):
         if db_url is None or db_url == "":
             raise ValueError("Database URL cannot be None or empty.")
-        if isinstance(db_url, str) and not db_url.startswith("sqlite://"):
-            db_url = f"sqlite:///{db_url}"
+        if isinstance(db_url, str) and not db_url.startswith(default_schema):
+            db_url = f"{default_schema}{db_url}"
         self.db_url: str = str(db_url)
         self.engine: Engine = create_engine(self.db_url, echo=False)
         base: DeclarativeMeta = DatabaseManager.get_base()
         self.metadata: MetaData = base.metadata
-        self.SessionFactory = sessionmaker(bind=self.engine)
-        self.session = scoped_session(self.SessionFactory)
+        self.SessionFactory: sessionmaker[Session] = sessionmaker(bind=self.engine)
+        self.session: scoped_session[Session] = scoped_session(self.SessionFactory)
         atexit.register(self.close_all)
         self.create_tables()
 
     def get_all_records(self, table_obj: type[TableType]) -> list[TableType]:
         """Get all records from a table."""
-        with self.open_session() as session:
-            return session.query(table_obj).all()
+        return self.session().query(table_obj).all()
 
     def count_records(self, table_obj: type[TableType]) -> int:
         """Count the number of records in a table."""
-        with self.open_session() as session:
-            count: int = session.query(table_obj).count()
-        return count
+        return self.session().query(table_obj).count()
 
     def get_records_by_var(self, table_obj: type[TableType], variable: str, value: str) -> list[TableType]:
         """Get records from a table by a specific variable."""
-        with self.open_session() as session:
-            records: list[TableType] = session.query(table_obj).filter(getattr(table_obj, variable) == value).all()
-        return records
+        return self.session().query(table_obj).filter(getattr(table_obj, variable) == value).all()
 
     def count_records_by_var(self, table_obj: type[TableType], variable: str, value: str) -> int:
         """Count the number of records in a table by a specific variable."""
-        with self.open_session() as session:
-            count: int = session.query(table_obj).filter(getattr(table_obj, variable) == value).count()
-        return count
+        return self.session().query(table_obj).filter(getattr(table_obj, variable) == value).count()
 
     @contextmanager
     def open_session(self) -> Generator[Session, Any]:

bear_utils/extras/responses/function_response.py

@@ -14,13 +14,14 @@ from bear_utils.extras._async_helpers import AsyncResponseModel, create_async_ta
 # Pydantic will yell if we put this into a TYPE_CHECKING block.
 from bear_utils.logger_manager import AsyncLoggerProtocol, LoggerProtocol  # noqa: TC001
 
-SUCCESS: list[str] = ["name", "success"]
-FAILURE: list[str] = ["name"]
-
 if TYPE_CHECKING:
     from collections.abc import Callable
 
 
+SUCCESS: list[str] = ["name", "success", "number_of_tasks"]
+FAILURE: list[str] = ["name", "number_of_tasks"]
+
+
 class FunctionResponse(BaseModel):
     """A class to represent the response of a function call, including success status, content, and error messages."""
 
@@ -337,10 +338,8 @@ class FunctionResponse(BaseModel):
             content = []
         if not isinstance(error, (list | str)):
             error = []
-
         if not content and not error:
             return
-
         res: AsyncResponseModel = create_async_task(
             _log_messages,
             content=content,

{bear_utils-0.8.22.dist-info → bear_utils-0.8.24.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bear-utils
-Version: 0.8.22
+Version: 0.8.24
 Summary: Various utilities for Bear programmers, including a rich logging utility, a disk cache, and a SQLite database wrapper amongst other things.
 Author-email: chaz <bright.lid5647@fastmail.com>
 Requires-Python: >=3.12
@@ -19,12 +19,13 @@ Requires-Dist: singleton-base>=1.0.5
 Requires-Dist: sqlalchemy<3.0.0,>=2.0.40
 Requires-Dist: tinydb>=4.8.2
 Requires-Dist: toml>=0.10.2
+Requires-Dist: typer>=0.16.0
 Requires-Dist: uvicorn>=0.35.0
 Provides-Extra: gui
 Requires-Dist: pyqt6>=6.9.0; extra == 'gui'
 Description-Content-Type: text/markdown
 
-# Bear Utils v# Bear Utils v0.8.22
+# Bear Utils v# Bear Utils v0.8.24
 
 Personal set of tools and utilities for Python projects, focusing on modularity and ease of use. This library includes components for caching, database management, logging, time handling, file operations, CLI prompts, image processing, clipboard interaction, gradient utilities, event systems, and async helpers.
 

{bear_utils-0.8.22.dist-info → bear_utils-0.8.24.dist-info}/RECORD

@@ -12,7 +12,8 @@ bear_utils/ai/ai_helpers/_types.py,sha256=rmnl8mTlUj0LyL9USzTb-EN_31TtXY6qzhkOEu
 bear_utils/cache/__init__.py,sha256=c9z1mLhWpZJHZdXRlviYQXl8tc9KTJCM8vin3moDO3I,4578
 bear_utils/cli/__init__.py,sha256=H2QpLyHpQS_Yn3sF2px7n4KqT97LEe7Oyzafg2iHcpc,503
 bear_utils/cli/commands.py,sha256=5ppEjvVV_g28WLaIFtKgz-ctzwoo-g-KpHTXNx9xBzo,3161
-bear_utils/cli/prompt_helpers.py,sha256=wxOz8IkL_fP7q1Fbiy1cv1r74qVOG2nl2QKUueZ2MjE,6535
+bear_utils/cli/prompt_helpers.py,sha256=0Cwa5bk_7xgLBeLuJje9LwNtrRYlTCAW__mpFpFD1gw,6814
+bear_utils/cli/typer_bridge.py,sha256=ah2dCJ_LJFRy3hDF5Dd8rYqq70H6ko4KTuCuVcUmRAw,3408
 bear_utils/cli/shell/__init__.py,sha256=2s3oR6CqLKj1iyERy7YafWT3t3KzTr70Z1yaLKa6IiQ,42
 bear_utils/cli/shell/_base_command.py,sha256=T1bwY9UX355Mv2u7JjSgI4U7VoWCTibszG8WvC3IEo4,2789
 bear_utils/cli/shell/_base_shell.py,sha256=cjpgwf8R6iP9T8HZDy_MKIirW5qM0btXLmmCce1Ll58,16702
@@ -28,7 +29,7 @@ bear_utils/constants/date_related.py,sha256=vwgPPGamVJ8p12iRFu3IzTksmGfhqYULwrk-
 bear_utils/constants/server.py,sha256=1gWA3h1HH12uk5nqX3r5EFkffPKVDTo3he51teHSDbk,271
 bear_utils/constants/time_related.py,sha256=Mykb27THqC-K0HFrbbrdkTNJUKhzBEOfmPJ0rx2-L6E,705
 bear_utils/database/__init__.py,sha256=dS_HHJKESpsI6BFDLVx055o0GCJV9CMYOQVuHs7EfgY,192
-bear_utils/database/_db_manager.py,sha256=rW4yq6arMF7UbgKrA7C2Wi37O-byqzae39tIZixfRZk,3977
+bear_utils/database/_db_manager.py,sha256=bbg5zG06DcOvd37oafLIqc480BwF9ZW9qWF3ldZHR8o,3805
 bear_utils/events/__init__.py,sha256=EFqmuzhaEYK9kjkGlrM7bjdjPwFEDbKn6RjJKfIBEJY,414
 bear_utils/events/events_class.py,sha256=vPDjWrbut8L3TFn7byyYFZpWYM5ADIqtW2Aeh-qtKfQ,1632
 bear_utils/events/events_module.py,sha256=DkQsDZ5WzM1MH1Msg7mRny40a17Jl31CXbpw4-pICxc,2349
@@ -37,7 +38,7 @@ bear_utils/extras/_async_helpers.py,sha256=4buULZZkR0n2z13Q8_FK59dMchj0Mup03YBaq
 bear_utils/extras/_tools.py,sha256=-rOH_-0pRd7_-o_l2QqByYBB2yhbXcTC8fuQf4Sx-eg,7671
 bear_utils/extras/platform_utils.py,sha256=Ai7ow7S-_cKb5zFwFh8dkC8xmbMJFy-0_-w3NCERdEw,1362
 bear_utils/extras/responses/__init__.py,sha256=XbE4VKemrKRwx9E5jqy__OiM_AAjA58ebnqQ2hytnT0,225
-bear_utils/extras/responses/function_response.py,sha256=VFhYGoSXbqdkgeBWYdmHcHcJ2Z0BFg_Y8EmdkaF442Y,16220
+bear_utils/extras/responses/function_response.py,sha256=aGUhxfliaqE2tXKGtVPDeOy5JJRjHN5M9gRgI1IsopY,16257
 bear_utils/extras/wrappers/__init__.py,sha256=crh4sKOLvuhNMVX5bJYjCFWtXtH7G47UgNPOHq3HXTk,43
 bear_utils/extras/wrappers/add_methods.py,sha256=z2XZG2ZoYOB1MaGiLli4NRyyTeRgBy7tuYsiy8mTa9s,4422
 bear_utils/files/__init__.py,sha256=mIdnFSXoDE64ElM43bN2m6KuafURnN82ki0pdqN8q2o,201
@@ -86,6 +87,6 @@ bear_utils/monitoring/__init__.py,sha256=9DKNIWTp_voLnaWgiP-wJ-o_N0hYixo-MzjUmg8
 bear_utils/monitoring/_common.py,sha256=LYQFxgTP9fk0cH71IQTuGwBYYPWCqHP_mMRNecoD76M,657
 bear_utils/monitoring/host_monitor.py,sha256=e0TYRJw9iDj5Ga6y3ck1TBFEeH42Cax5mQYaNU8yams,13241
 bear_utils/time/__init__.py,sha256=VctjJG17SyEHAFXytI1sZrOrq7zm3hVenIDOJFdaMN0,1424
-bear_utils-0.8.22.dist-info/METADATA,sha256=bI6HOJaPlDs8ml0B_n-if7qmczI67TKOllT-6JkXXhY,8763
-bear_utils-0.8.22.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-bear_utils-0.8.22.dist-info/RECORD,,
+bear_utils-0.8.24.dist-info/METADATA,sha256=6nRLOfttz27oKf-N_I-gCBeLmjX7tpSnlOvUc228JyA,8792
+bear_utils-0.8.24.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+bear_utils-0.8.24.dist-info/RECORD,,