bear-utils 0.8.19__tar.gz → 0.8.21__tar.gz

{bear_utils-0.8.19 → bear_utils-0.8.21}/.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.8.19
+current_version = 0.8.21
 
 [bumpversion:file:pyproject.toml]
 

{bear_utils-0.8.19 → bear_utils-0.8.21}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bear-utils
-Version: 0.8.19
+Version: 0.8.21
 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
@@ -20,9 +20,11 @@ Requires-Dist: sqlalchemy<3.0.0,>=2.0.40
 Requires-Dist: tinydb>=4.8.2
 Requires-Dist: toml>=0.10.2
 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.19
+# Bear Utils v# Bear Utils v0.8.21
 
 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.19 → bear_utils-0.8.21}/README.md

@@ -1,4 +1,4 @@
-# Bear Utils v# Bear Utils v0.8.19
+# Bear Utils v# Bear Utils v0.8.21
 
 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.19 → bear_utils-0.8.21}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "bear-utils"
-version = "0.8.19"
+version = "0.8.21"
 description = "Various utilities for Bear programmers, including a rich logging utility, a disk cache, and a SQLite database wrapper amongst other things."
 authors = [{ name = "chaz", email = "bright.lid5647@fastmail.com" }]
 readme = "README.md"
@@ -24,6 +24,11 @@ dependencies = [
     "bear-epoch-time>=1.1.1",
 ]
 
+[project.optional-dependencies]
+gui = [
+    "pyqt6>=6.9.0",
+]
+
 [build-system]
 requires = ["hatchling"]
 build-backend = "hatchling.build"
@@ -33,6 +38,7 @@ maintain = [
     "git-changelog>=2.5",
     "yore>=0.3.3",
     "griffe>=1.7.3",
+    "pytest-asyncio>=1.0.0",
 ]
 ci = [
     "ruff>=0.4",
@@ -58,6 +64,7 @@ default-groups = ["maintain", "ci"]
 testpaths = ["tests"]
 pythonpath = ["src"]
 addopts = "-v"
+asyncio_mode = "auto"
 markers = [
     "visual: marks tests as visual verification tests (deselect with '-m \"not visual\"')"
 ]

{bear_utils-0.8.19 → bear_utils-0.8.21}/src/bear_utils/events/events_module.py

@@ -50,7 +50,7 @@ def dispatch_event(name: str, *args, **kwargs) -> Any | None:
     results: list[Any] = []
     for func in _event_registry.get(name, []):
         if is_async_function(func):
-            result: Any = asyncio.run(func(*args, **kwargs))
+            result: Any = asyncio.run(func(*args, **kwargs))  # FIXME: This will crash if called from an async context
         else:
             result: Any = func(*args, **kwargs)
             results.append(result)

{bear_utils-0.8.19 → bear_utils-0.8.21}/src/bear_utils/extras/_async_helpers.py

@@ -1,6 +1,7 @@
 import asyncio
-from asyncio import AbstractEventLoop, get_event_loop
+from asyncio import AbstractEventLoop
 from collections.abc import Callable
+from contextlib import suppress
 import inspect
 
 
@@ -17,11 +18,15 @@ def is_async_function(func: Callable) -> bool:
 
 
 def in_async_loop() -> bool:
-    """Check if the current context is already in an async loop."""
-    try:
-        return get_event_loop().is_running()
-    except RuntimeError:
-        return False
+    """Check if the current context is already in an async loop.
+
+    Returns:
+        bool: True if an async loop is running, False otherwise.
+    """
+    loop: AbstractEventLoop | None = None
+    with suppress(RuntimeError):
+        loop = asyncio.get_running_loop()
+    return loop.is_running() if loop else False
 
 
 def gimmie_async_loop() -> AbstractEventLoop:

{bear_utils-0.8.19 → bear_utils-0.8.21}/src/bear_utils/extras/responses/function_response.py

@@ -2,7 +2,6 @@
 
 from __future__ import annotations
 
-import asyncio
 from collections.abc import Callable
 import json
 from subprocess import CompletedProcess
@@ -251,19 +250,19 @@ class FunctionResponse(BaseModel):
     ) -> Self:
         """Append additional content to the existing content."""
         try:
-            if isinstance(content, FunctionResponse | CompletedProcess | str | list) and isinstance(
-                error, (str | list)
-            ):
-                match content:
-                    case FunctionResponse():
-                        self._handle_function_response(func_response=content)
-                    case CompletedProcess():
-                        self._handle_completed_process(result=content)
-                    case str() | list() if content:
-                        self._add_content(content=content)
-                if isinstance(error, (str | list)):
-                    self._add_error(error=error)
-            if returncode is not None:
+            if content is not None:
+                if isinstance(content, FunctionResponse):
+                    self._handle_function_response(func_response=content)
+                    self.number_of_tasks += 1
+                elif isinstance(content, CompletedProcess):
+                    self._handle_completed_process(result=content)
+                    self.number_of_tasks += 1
+                elif isinstance(content, (str | list)) and content:
+                    self._add_content(content=content)
+                    self.number_of_tasks += 1
+            if error is not None and isinstance(error, (str | list)):
+                self._add_error(error=error)
+            if isinstance(returncode, int):
                 self.returncode = returncode
             if isinstance(extra, dict):
                 self.extra.update(extra)
@@ -283,10 +282,12 @@ class FunctionResponse(BaseModel):
 
         async def loop_logging(messages: list[str], func: Callable) -> None:
             for msg in messages:
+                if msg == "":
+                    continue
                 if is_async_function(func):
-                    await func(f"{self.name}: {msg}" if self.name else msg)
+                    await func(f"{msg}")
                 else:
-                    func(f"{self.name}: {msg}" if self.name else msg)
+                    func(f"{msg}")
 
         async def _log_messages(
             content: str | list[str], error: str | list[str], info_func: Callable, error_func: Callable
@@ -375,39 +376,3 @@ def fail(
 ) -> FunctionResponse:
     """Create a failed FunctionResponse."""
     return FunctionResponse().fail(content=content, error=error, returncode=returncode, **kwargs)
-
-
-async def testing_already_in_loop() -> None:
-    """Test function to check if already in an event loop."""
-    # from rich import inspect
-
-    response = FunctionResponse(name="example_function", logger=SimpleLogger())
-    try:
-        response.add(content=["Test content", "test 1234"], error="Test error", log_output=True)
-        response.done(to_dict=True)
-    except RuntimeError as e:
-        print(f"Already in an event loop: {e}")
-    else:
-        print("Successfully added content and error without issues.")
-    # inspect(response)
-
-
-def testing_not_in_loop() -> None:
-    """Test function to check if not in an event loop."""
-    response = FunctionResponse(name="example_function", logger=SimpleLogger())
-    try:
-        response.add(content=["Test content", "test 1234"], error="Test error", log_output=True)
-        response.done(to_dict=True)
-    except RuntimeError as e:
-        print(f"Not in an event loop: {e}")
-    else:
-        print("Successfully added content and error without issues.")
-
-
-if __name__ == "__main__":
-    # Example usage
-
-    from bear_utils.logger_manager import SimpleLogger
-
-    asyncio.run(testing_already_in_loop())
-    testing_not_in_loop()

{bear_utils-0.8.19 → bear_utils-0.8.21}/tests/test_function_response.py

@@ -13,6 +13,42 @@ from bear_utils.extras.responses.function_response import (
     fail,
     success,
 )
+from bear_utils.logger_manager import SimpleLogger as AsyncLogger
+
+
+class MockLogger:
+    def __init__(self):
+        """Initialize mock logger."""
+        self.messages = []
+
+    def log(self, level: str, msg: object, *args, **kwargs) -> None:
+        """Mock logging method."""
+        msg = f"{level.upper()}: {msg}"
+        if args:
+            msg = f"{msg} {' '.join(map(str, args))}"
+        if kwargs:
+            msg = f"{msg} {kwargs}"
+        self.messages.append(msg)
+
+    def info(self, msg: object, *args, **kwargs) -> None:
+        """Mock info logging method."""
+        self.log("info", msg, *args, **kwargs)
+
+    def error(self, msg: object, *args, **kwargs) -> None:
+        """Mock error logging method."""
+        self.log("error", msg, *args, **kwargs)
+
+    def debug(self, msg: object, *args, **kwargs) -> None:
+        """Mock debug logging method."""
+        self.log("debug", msg, *args, **kwargs)
+
+    def warning(self, msg: object, *args, **kwargs) -> None:
+        """Mock warning logging method."""
+        self.log("warning", msg, *args, **kwargs)
+
+    def get_messages(self) -> list[str]:
+        """Retrieve all logged messages."""
+        return self.messages
 
 
 class TestFunctionResponseCreation:
@@ -166,8 +202,22 @@ class TestFluentAPI:
 
     def test_successful_method(self):
         """Test successful() method."""
-        response = FunctionResponse(name="test")
-        result = response.successful("operation completed")
+        mock_logger = MockLogger()
+        response = FunctionResponse(name="test", logger=mock_logger)
+        result = response.successful("operation completed", log_output=True)
+
+        assert result is response  # Returns self for chaining
+        assert response.content == ["operation completed"]
+        assert response.returncode == 0
+        assert response.success is True
+        messages = mock_logger.get_messages()
+        assert len(messages) == 1
+        assert "INFO: operation completed" in messages
+
+    async def test_async_successful_method(self):
+        """Test successful() method."""
+        response = FunctionResponse(name="test", logger=AsyncLogger())
+        result = response.successful("operation completed", log_output=True)
 
         assert result is response  # Returns self for chaining
         assert response.content == ["operation completed"]
@@ -192,7 +242,7 @@ class TestFluentAPI:
             .add(content="second operation")
             .add(error="minor warning")
         )
-
+        print(response)
         assert response.content == ["first operation", "second operation"]
         assert response.error == ["minor warning"]
         assert response.returncode == 0
@@ -296,6 +346,24 @@ class TestSubTaskMethod:
         # Should still add content, just without name prefix
         assert "content without name" in main_response.content
 
+    def test_async_sub_task(self):
+        """Test sub_task with async logger."""
+        main_response = FunctionResponse(name="main_task", logger=AsyncLogger())
+        main_response.sub_task(name="async_subtask", content="async content")
+
+        assert main_response.number_of_tasks == 1
+        assert main_response.content == ["async_subtask: async content"]
+        assert isinstance(main_response.logger, AsyncLogger)
+
+    async def test_async_sub_task_with_async_logger(self):
+        """Test sub_task with async logger with an async context."""
+        main_response = FunctionResponse(name="main_task", logger=AsyncLogger())
+        main_response.sub_task(name="async_subtask", content="async content")
+
+        assert main_response.number_of_tasks == 1
+        assert main_response.content == ["async_subtask: async content"]
+        assert isinstance(main_response.logger, AsyncLogger)
+
 
 class TestAddMethod:
     """Test the complex add() method."""

{bear_utils-0.8.19 → bear_utils-0.8.21}/uv.lock

@@ -73,7 +73,7 @@ wheels = [
 
 [[package]]
 name = "bear-utils"
-version = "0.8.7"
+version = "0.8.19"
 source = { editable = "." }
 dependencies = [
     { name = "bear-epoch-time" },
@@ -114,6 +114,7 @@ gui = [
 maintain = [
     { name = "git-changelog" },
     { name = "griffe" },
+    { name = "pytest-asyncio" },
     { name = "yore" },
 ]
 
@@ -155,6 +156,7 @@ gui = [{ name = "pyqt6", specifier = ">=6.9.0" }]
 maintain = [
     { name = "git-changelog", specifier = ">=2.5" },
     { name = "griffe", specifier = ">=1.7.3" },
+    { name = "pytest-asyncio", specifier = ">=1.0.0" },
     { name = "yore", specifier = ">=0.3.3" },
 ]
 
@@ -1033,6 +1035,18 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/2f/de/afa024cbe022b1b318a3d224125aa24939e99b4ff6f22e0ba639a2eaee47/pytest-8.4.0-py3-none-any.whl", hash = "sha256:f40f825768ad76c0977cbacdf1fd37c6f7a468e460ea6a0636078f8972d4517e", size = 363797, upload_time = "2025-06-02T17:36:27.859Z" },
 ]
 
+[[package]]
+name = "pytest-asyncio"
+version = "1.0.0"
+source = { registry = "https://pypi.org/simple/" }
+dependencies = [
+    { name = "pytest" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/d0/d4/14f53324cb1a6381bef29d698987625d80052bb33932d8e7cbf9b337b17c/pytest_asyncio-1.0.0.tar.gz", hash = "sha256:d15463d13f4456e1ead2594520216b225a16f781e144f8fdf6c5bb4667c48b3f", size = 46960, upload_time = "2025-05-26T04:54:40.484Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/30/05/ce271016e351fddc8399e546f6e23761967ee09c8c568bbfbecb0c150171/pytest_asyncio-1.0.0-py3-none-any.whl", hash = "sha256:4f024da9f1ef945e680dc68610b52550e36590a67fd31bb3b4943979a1f90ef3", size = 15976, upload_time = "2025-05-26T04:54:39.035Z" },
+]
+
 [[package]]
 name = "pytest-cov"
 version = "6.2.1"