bear-utils 0.8.4__py3-none-any.whl → 0.8.6__py3-none-any.whl

bear_utils/cli/shell/_base_command.py

@@ -1,4 +1,5 @@
-from typing import TYPE_CHECKING, Any, ClassVar, LiteralString, Self, cast
+from subprocess import CompletedProcess
+from typing import TYPE_CHECKING, Any, ClassVar, Self
 
 if TYPE_CHECKING:
     from subprocess import CompletedProcess
@@ -49,9 +50,9 @@ class BaseShellCommand[T: str]:
     @property
     def cmd(self) -> str:
         """Return the full command as a string"""
-        cmd_parts = [self.command_name, self.sub_command, *self.args]
-        cmd_parts = [part for part in cmd_parts if part]
-        joined: LiteralString = " ".join(cmd_parts).strip()
+        cmd_parts: list[str] = [self.command_name, self.sub_command, *self.args]
+        cmd_parts: list[str] = [part for part in cmd_parts if part]
+        joined: str = " ".join(cmd_parts).strip()
         if self.suffix:
             return f"{joined} {self.suffix}"
         return joined
@@ -61,11 +62,19 @@ class BaseShellCommand[T: str]:
         from ._base_shell import shell_session  # noqa: PLC0415
 
         with shell_session(**kwargs) as session:
-            result = session.add(self.cmd).run()
+            result: CompletedProcess[str] = session.add(self.cmd).run()
         if result is not None:
-            self.result = cast("CompletedProcess[str]", result)
+            self.result = result
         return self
 
+    def get_result(self) -> CompletedProcess[str]:
+        """Get the result of the command execution"""
+        if self.result is None:
+            self.do()
+        if self.result is None:
+            raise RuntimeError("Command execution failed for some reason.")
+        return self.result
+
     def get(self) -> str:
         """Get the result of the command execution"""
         if self.result is None:

bear_utils/cli/shell/_base_shell.py

@@ -147,7 +147,7 @@ class SimpleShellSession:
         self.cmd_buffer.write(str(c))
         return self
 
-    def _run(self, command: str) -> CompletedProcess[str] | Process:
+    def _run(self, command: str) -> CompletedProcess[str]:
         """Internal method to run the accumulated command"""
         self.logger.verbose(f"Executing: {command}")
         self.next_cmd()
@@ -180,7 +180,7 @@ class SimpleShellSession:
         self.reset_buffer()
         return self.result
 
-    def run(self, cmd: str | BaseShellCommand | None = None, *args) -> CompletedProcess[str] | Process:
+    def run(self, cmd: str | BaseShellCommand | None = None, *args) -> CompletedProcess[str]:
         """Run the accumulated command history"""
         if self.empty_history and cmd is None:
             raise ValueError("No commands to run")
@@ -191,12 +191,12 @@ class SimpleShellSession:
             )
 
         if self.has_history and cmd is None:
-            result: CompletedProcess[str] | Process = self._run(self.cmd)
+            result: CompletedProcess[str] = self._run(self.cmd)
         elif self.empty_history and cmd is not None:
             self.cmd_buffer.write(f"{cmd} ")
             if args:
                 self.cmd_buffer.write(" ".join(map(str, args)))
-            result: CompletedProcess[str] | Process = self._run(self.cmd)
+            result: CompletedProcess[str] = self._run(self.cmd)
         else:
             raise ValueError("Unexpected state")
         self.reset_buffer()

bear_utils/extras/responses/function_response.py

@@ -269,15 +269,15 @@ class FunctionResponse(BaseModel):
         if content is not None and error is None:
             if isinstance(content, list):
                 for item in content:
-                    logger.info(message=f"{self.name}: {item}" if self.name else item)
+                    logger.info(f"{self.name}: {item}" if self.name else item)
             elif isinstance(content, str):
-                logger.info(message=f"{self.name}: {content}" if self.name else content)
+                logger.info(f"{self.name}: {content}" if self.name else content)
         elif error is not None and content is None:
             if isinstance(error, list):
                 for err in error:
-                    logger.error(message=f"{self.name}: {err}" if self.name else err)
+                    logger.error(f"{self.name}: {err}" if self.name else err)
             elif isinstance(error, str):
-                logger.error(message=f"{self.name}: {error}" if self.name else error)
+                logger.error(f"{self.name}: {error}" if self.name else error)
 
     @overload
     def done(self, to_dict: Literal[True], suppress: list[str] | None = None) -> dict[str, Any]: ...

{bear_utils-0.8.4.dist-info → bear_utils-0.8.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bear-utils
-Version: 0.8.4
+Version: 0.8.6
 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,7 +20,7 @@ Requires-Dist: tinydb>=4.8.2
 Requires-Dist: toml>=0.10.2
 Description-Content-Type: text/markdown
 
-# Bear Utils v# Bear Utils v0.8.4
+# Bear Utils v# Bear Utils v0.8.6
 
 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.4.dist-info → bear_utils-0.8.6.dist-info}/RECORD

@@ -14,8 +14,8 @@ bear_utils/cli/__init__.py,sha256=H2QpLyHpQS_Yn3sF2px7n4KqT97LEe7Oyzafg2iHcpc,50
 bear_utils/cli/commands.py,sha256=5ppEjvVV_g28WLaIFtKgz-ctzwoo-g-KpHTXNx9xBzo,3161
 bear_utils/cli/prompt_helpers.py,sha256=DVdg1f5yZElVyFNao6RTPfrc6mKy4PoXLgY6az-ejo8,6580
 bear_utils/cli/shell/__init__.py,sha256=2s3oR6CqLKj1iyERy7YafWT3t3KzTr70Z1yaLKa6IiQ,42
-bear_utils/cli/shell/_base_command.py,sha256=eqvYSXR_NqWqJm5meGTONYJGSG32q0AQDfTGums2hI0,2471
-bear_utils/cli/shell/_base_shell.py,sha256=FGlXshVVEGXXB0CYcoLZd_tLn4-AVXP0qLt01yRaoQw,16737
+bear_utils/cli/shell/_base_command.py,sha256=T1bwY9UX355Mv2u7JjSgI4U7VoWCTibszG8WvC3IEo4,2789
+bear_utils/cli/shell/_base_shell.py,sha256=GW2kgj_KR33FtJLvV-ljSs_wzo5WQ8--H-K2hDPOblQ,16697
 bear_utils/cli/shell/_common.py,sha256=_KQyL5lvqOfjonFIwlEOyp3K9G3TSOj19RhgVzfNNpg,669
 bear_utils/config/__init__.py,sha256=HC_lWpmLF0kbPr5i1Wa2FLER2b446E_GecgU9EPmc04,353
 bear_utils/config/config_manager.py,sha256=Xj0xOmY-wo_rwfcWiXyxNZWX9NknX_Jm9W56Gx8yyHQ,8244
@@ -37,7 +37,7 @@ bear_utils/extras/_async_helpers.py,sha256=cxq5d24NHkECmZqTVXEazv6K-XUa7skFnX6KQ
 bear_utils/extras/_tools.py,sha256=kxJ1jaqx3PvLpc0CZUIV8XQUwjQGrNCRLoka11aNtoc,7672
 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=Zis2uIpGp3Mqbpc0RszyNt2JSsLAiGmWKhgezLjzUTM,14153
+bear_utils/extras/responses/function_response.py,sha256=D6123VaOaJeeSQ9Gp1gtrvCSv7HF5Iw7dZlGbxHVQDk,14121
 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
@@ -80,6 +80,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=d9Ovv-Dlx5NWgnOl1hY-evznVm9hboS6ypNp1wDFxQQ,934
-bear_utils-0.8.4.dist-info/METADATA,sha256=MWGyDV2Wod3G9WdKUunCbx0_XDBaULZ_R2_fkTKgB24,8634
-bear_utils-0.8.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-bear_utils-0.8.4.dist-info/RECORD,,
+bear_utils-0.8.6.dist-info/METADATA,sha256=QG8sOkLV4XiFr490DziS-jSq9tIaICPgMvz--TgyaZI,8634
+bear_utils-0.8.6.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+bear_utils-0.8.6.dist-info/RECORD,,