logbar 0.0.1.dev0__tar.gz → 0.0.3__tar.gz

{logbar-0.0.1.dev0/logbar.egg-info → logbar-0.0.3}/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.2
 Name: logbar
-Version: 0.0.1.dev0
-Summary: A unified Logger and ProgressBar util with zero dependencies. 
+Version: 0.0.3
+Summary: A unified Logger and ProgressBar util with zero dependencies.
 Home-page: https://github.com/ModelCloud/LogBar
 Author: ModelCloud
 Author-email: qubitium@modelcloud.ai

logbar-0.0.3/logbar/__init__.py

@@ -0,0 +1 @@
+from .logbar import LogBar

{logbar-0.0.1.dev0 → logbar-0.0.3}/logbar/logbar.py

@@ -18,7 +18,7 @@ import logging
 from enum import Enum
 from typing import Optional, Iterable
 
-from logbar.terminal import terminal_size
+from .terminal import terminal_size
 
 # global static/shared logger instance
 logger = None
@@ -45,6 +45,8 @@ class LEVEL(str, Enum):
     ERROR = "ERROR"
     CRITICAL = "CRIT"
 
+LEVEL_MAX_LENGTH = 5 # ERROR/DEBUG is longest at 5 chars
+
 class LogBar(logging.Logger):
     history = set()
     history_limit = 1000
@@ -174,58 +176,26 @@ class LogBar(logging.Logger):
         columns, _ = terminal_size()
         str_msg = str(msg)
 
+        if columns > 0:
+            str_msg += " " * (columns - LEVEL_MAX_LENGTH - 2 - len(str_msg))  # -2 for cursor + space between LEVEL and msg
+
         global last_pb_instance
         if isinstance(last_pb_instance, ProgressBar) and not last_pb_instance.closed:
-             buf = f'\r'
-             if columns > 0:
-                str_msg += " " * columns
-
-             print(buf,end='',flush=True)
+            print('\r',end='',flush=True)
 
         # Get the color for the log level
 
         reset = COLORS["RESET"]
         color = COLORS.get(level.value, reset)
 
-        out_len = 5 + 1 + len(str_msg)
-        paddding_end = " " * (columns - out_len)
-
-        padding = " " * (5 - len(level.value)) # 5 is max enum string length
-        print(f"{color}{level.value}{reset}{padding} {str_msg}", end='\n', flush=True)
-        # if level == LEVEL.INFO:
-        #     print(f"INFO: {str_msg}", end='',flush=True)
-        # elif level == LEVEL.WARN:
-        #     print(f"WARN: {str_msg}", end='',flush=True)
-        # elif level == LEVEL.ERROR:
-        #     print(f"ERROR: {str_msg}", end='',flush=True)
-        # elif level == LEVEL.DEBUG:
-        #     print(f"DEBUG: {str_msg}", end='',flush=True)
-        # else:
-        #     raise RuntimeError(f"Unknown logging level {level}")
-
-        # Print the message with the appropriate color
-        #print(f"{color}{level.value}{reset}{padding} {str_msg}")
-
-        # if level == LEVEL.INFO:
-        #     self._info(str_msg, *args, **kwargs)
-        #
-        # elif level == LEVEL.WARN:
-        #     self._warning(str_msg, *args, **kwargs)
-        # elif level == LEVEL.ERROR:
-        #     self._error(str_msg, *args, **kwargs)
-        # elif level == LEVEL.DEBUG:
-        #     self._debug(str_msg, *args, **kwargs)
-        # else:
-        #     raise RuntimeError(f"Unknown logging level {level}")
+        level_padding = " " * (LEVEL_MAX_LENGTH - len(level.value)) # 5 is max enum string length
+        print(f"\r{color}{level.value}{reset}{level_padding} {str_msg}", end='\n', flush=True)
 
         if isinstance(last_pb_instance, ProgressBar):
             if not last_pb_instance.closed:
                 # only do this for our instance
                 if self == logger:
+                    #print('\r', end='', flush=True)
                     last_pb_instance.draw()
             else:
                 last_pb_instance = None
-
-
-
-

{logbar-0.0.1.dev0 → logbar-0.0.3}/logbar/progress.py

@@ -20,8 +20,9 @@ from enum import Enum
 from typing import Iterable, Optional
 from warnings import warn
 
-from logbar.logbar import update_last_pb_instance, LogBar
-from logbar.terminal import terminal_size
+from . import LogBar
+from .logbar import update_last_pb_instance
+from .terminal import terminal_size
 
 logger = LogBar.shared()
 
@@ -41,7 +42,6 @@ class RenderMode(str, Enum):
 class ProgressBar:
     def __init__(self, iterable: Iterable):
         self._iterating = False # state: in init or active iteration
-        self._skip_next_draw = False
 
         self._render_mode = RenderMode.AUTO
 
@@ -110,10 +110,6 @@ class ProgressBar:
         self._render_mode = RenderMode.MANUAL
         return self
 
-    def skip_next_draw(self):
-        if not self._skip_next_draw:
-            self._skip_next_draw = True
-
     def draw(self):
         columns, _ = terminal_size()
 
@@ -144,11 +140,11 @@ class ProgressBar:
         if self._subtitle and len(self._subtitle) < self.max_subtitle_len:
             padding += " " * (self.max_subtitle_len - len(self._subtitle))
 
-        bar_length = columns - pre_bar_size - len(log) - 2 # bar|_ == 2 chars
+        bar_length = columns - pre_bar_size - len(log) - 3 # bar|_ == 2 chars + 1 char for cursor
 
         filled_length = int(bar_length * self.step() // len(self))
         bar = self._fill * filled_length + '-' * (bar_length - filled_length)
-        self.log(bar=bar, log=log, padding=padding, end='') # '\n' if percent_num >= 1.0 else ''
+        self.log(bar=bar, log=log, pre_bar_padding=padding, end='') # '\n' if percent_num >= 1.0 else ''
 
     def calc_time(self, iteration):
         used_time = int(time.time() - self.time)
@@ -156,8 +152,7 @@ class ProgressBar:
         remaining = str(datetime.timedelta(seconds=int((used_time / max(iteration, 1)) * len(self))))
         return f"{formatted_time} / {remaining}"
 
-    def log(self, bar:str, log:str, padding:str = "", end: str = ""):
-        # print(f'\r{self.prefix} {self.info_text} |{bar}| {log}', end='', flush=True)
+    def log(self, bar:str, log:str, pre_bar_padding:str = "", end: str = ""):
         out = ""
         if self._title:
             out += self._title + " "
@@ -165,7 +160,8 @@ class ProgressBar:
         if self._subtitle:
             out += self._subtitle + " "
 
-        out += padding
+        if pre_bar_padding:
+            out += pre_bar_padding
 
         if self.ui_show_left_steps:
             out += self.ui_show_left_steps_text
@@ -241,7 +237,7 @@ class ProgressBar:
         iterable = self.iterable
 
         for obj in iterable:
-            # updat running state
+            # update running state
             if not self._iterating:
                 self.iterating = True
 
@@ -250,17 +246,10 @@ class ProgressBar:
             if self._render_mode == RenderMode.AUTO:
                 self.draw()
 
-            # if not self._skip_next_draw:
-            #     if self._render_mode == RenderMode.AUTO:
-            #         self.draw()
-            # else:
-            #     self._skip_next_draw = False
             yield obj
 
-        # self.progress()
         self.close()
         return
 
     def close(self):
         self.closed = True
-        #self.log(f"{self.fill * self.bar_length}", "100.0%", end="\n")

{logbar-0.0.1.dev0 → logbar-0.0.3/logbar.egg-info}/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.2
 Name: logbar
-Version: 0.0.1.dev0
-Summary: A unified Logger and ProgressBar util with zero dependencies. 
+Version: 0.0.3
+Summary: A unified Logger and ProgressBar util with zero dependencies.
 Home-page: https://github.com/ModelCloud/LogBar
 Author: ModelCloud
 Author-email: qubitium@modelcloud.ai

{logbar-0.0.1.dev0 → logbar-0.0.3}/setup.py

@@ -18,7 +18,7 @@ from pathlib import Path
 
 from setuptools import find_packages, setup
 
-__version__ = "0.0.1-dev"
+__version__ = "0.0.3"
 
 with open("requirements.txt") as f:
     requirements = f.read().splitlines()
@@ -28,7 +28,7 @@ setup(
     version=__version__,
     author="ModelCloud",
     author_email="qubitium@modelcloud.ai",
-    description="A unified Logger and ProgressBar util with zero dependencies. ",
+    description="A unified Logger and ProgressBar util with zero dependencies.",
     long_description=(Path(__file__).parent / "README.md").read_text(encoding="UTF-8"),
     long_description_content_type="text/markdown",
     url="https://github.com/ModelCloud/LogBar",

logbar-0.0.1.dev0/logbar/__init__.py

@@ -1,3 +0,0 @@
-from . import logbar
-
-__all__ = ["logbar"]