nercone-modern 1.2.2__py3-none-any.whl → 1.4.5__py3-none-any.whl

nercone_modern/__main__.py

@@ -18,11 +18,11 @@ try:
     logger1.log("This is a info message", "INFO")
     logger1.log("This is a info message", "INFO")
     logger1.log("This is a info message", "INFO")
-    logger2.log("This is an error message", "INFO")
+    logger2.log("This is a info message", "INFO")
     logger1.log("This is a warning message", "WARNING")
-    logger1.log("This is an error message", "ERROR")
-    logger1.log("This is an critical error message", "CRITICAL")
-    prompt_result = logger1.prompt("This is an Prompt. Let's try it: ")
+    logger1.log("This is a error message", "ERROR")
+    logger1.log("This is a critical error message", "CRITICAL")
+    prompt_result = logger1.prompt("This is a Prompt. Let's try it: ")
     logger1.log(f"Answer is: {prompt_result}", "INFO")
 
     progress_bar1 = ModernProgressBar(total=100, process_name="Task 1", spinner_mode=False)

nercone_modern/color.py

@@ -0,0 +1,38 @@
+class ModernColor:
+    def ansi_color_by_code(color_code: int | str = 0):
+        return f"\033[{color_code}m"
+
+    def ansi_color(color_name: str = "reset"):
+        if color_name == "reset":
+            return ModernColor.ansi_color_by_code(0)
+        elif color_name == "black":
+            return ModernColor.ansi_color_by_code(30)
+        elif color_name == "red":
+            return ModernColor.ansi_color_by_code(31)
+        elif color_name == "green":
+            return ModernColor.ansi_color_by_code(32)
+        elif color_name == "yellow":
+            return ModernColor.ansi_color_by_code(33)
+        elif color_name == "blue":
+            return ModernColor.ansi_color_by_code(34)
+        elif color_name == "magenta":
+            return ModernColor.ansi_color_by_code(35)
+        elif color_name == "cyan":
+            return ModernColor.ansi_color_by_code(36)
+        elif color_name == "white":
+            return ModernColor.ansi_color_by_code(37)
+        elif color_name in ("gray", "grey"):
+            return ModernColor.ansi_color_by_code(90)
+        else:
+            return ""
+
+    RESET = "\033[0m"
+    BLACK = "\033[30m"
+    RED = "\033[31m"
+    GREEN = "\033[32m"
+    YELLOW = "\033[33m"
+    BLUE = "\033[34m"
+    MAGENTA = "\033[35m"
+    CYAN = "\033[36m"
+    WHITE = "\033[37m"
+    GRAY = "\033[90m"

nercone_modern/logging.py

@@ -47,7 +47,7 @@ class ModernLogging:
         global _max_proc_width
         _max_proc_width = max(_max_proc_width, len(process_name))
 
-    def log(self, message="", level="INFO"):
+    def log(self, message: str = "", level: str = "INFO"):
         if not is_higher_priority(level, self.display_level):
             return
 
@@ -74,7 +74,7 @@ class ModernLogging:
         _last_process = self.process_name
         _last_level = level_text
 
-    def prompt(self, message="", level="INFO") -> str:
+    def prompt(self, message: str = "", level: str = "INFO") -> str:
         if not is_higher_priority(level, self.display_level):
             return
 
@@ -102,7 +102,7 @@ class ModernLogging:
         _last_level = level_text
         return input()
 
-    def _make(self, message, level_text, color, show_proc, show_level):
+    def _make(self, message: str, level_text: str, color: str, show_proc: bool, show_level: bool):
         global _max_proc_width
         level_width = max(MAX_LOG_LEVEL_WIDTH, len(level_text))
 
@@ -116,7 +116,7 @@ class ModernLogging:
 
         return f"{proc_part} {level_part} {str(message)}"
 
-    def _color(self, color_name):
+    def _color(self, color_name: str = "reset"):
         if color_name == "cyan":
             return self._color_by_code(36)
         elif color_name == "magenta":
@@ -140,5 +140,5 @@ class ModernLogging:
         else:
             return ""
 
-    def _color_by_code(self, color_code):
+    def _color_by_code(self, color_code: int | str = 0):
         return f"\033[{color_code}m"

nercone_modern/progressbar.py

@@ -14,7 +14,7 @@ class ModernProgressBar:
     _last_rendered = False
     _lock = threading.RLock()
 
-    def __init__(self, total: int, process_name: str, spinner_mode=True):
+    def __init__(self, total: int, process_name: str, spinner_mode=False):
         self.total = total
         self.spinner_mode = spinner_mode
         self.current = 0
@@ -55,7 +55,7 @@ class ModernProgressBar:
         self._start_spinner_thread_if_needed()
         self._render(advance_spinner=False)
 
-    def setMessage(self, message):
+    def setMessage(self, message: str = ""):
         self.message = message
 
     def start(self):
@@ -78,11 +78,13 @@ class ModernProgressBar:
         self._stop_spinner_thread()
         self._render(final=True, advance_spinner=False)
 
-    def makeModernLogging(self, process_name):
+    def makeModernLogging(self, process_name: str = None):
         from .logging import ModernLogging
+        if not process_name:
+            process_name = self.process_name
         return ModernLogging(process_name)
 
-    def logging(self, message, level="INFO", modernLogging=None):
+    def logging(self, message: str = "", level: str = "INFO", modernLogging=None):
         with ModernProgressBar._lock:
             self.log_lines = 0
             if modernLogging is None:
@@ -119,7 +121,7 @@ class ModernProgressBar:
                 continue
             self._render()
 
-    def _render(self, final=False, advance_spinner=True):
+    def _render(self, final: bool = False, advance_spinner: bool = True):
         with ModernProgressBar._lock:
             progress = self.current / self.total if self.total else 0
             bar = self._progress_bar(progress, advance_spinner=advance_spinner and self._should_spin())
@@ -145,7 +147,7 @@ class ModernProgressBar:
                 sys.stdout.write(f"\033[{down_lines}B")
             sys.stdout.flush()
 
-    def _progress_bar(self, progress, advance_spinner=True):
+    def _progress_bar(self, progress: int, advance_spinner: bool = True):
         bar_length = 20
         if not self._should_spin():
             empty_bar = "-"
@@ -174,7 +176,7 @@ class ModernProgressBar:
     def _should_spin(self):
         return self.spinner_mode and self._spinner_ready
 
-    def _color(self, color_name):
+    def _color(self, color_name: str = "reset"):
         if color_name == "cyan":
             return self._color_by_code(36)
         elif color_name == "magenta":
@@ -198,5 +200,5 @@ class ModernProgressBar:
         else:
             return ""
 
-    def _color_by_code(self, color_code):
+    def _color_by_code(self, color_code: int | str = 0):
         return f"\033[{color_code}m"

nercone_modern/text.py

@@ -0,0 +1,24 @@
+from typing import Union
+from .color import ModernColor
+
+class ModernText:
+    def __init__(self, content="", color: str = ModernColor.WHITE):
+        self.content = content
+        if not color.startswith("\033"):
+            color = getattr(ModernColor, color.upper(), ModernColor.WHITE)
+        self.color = color
+
+    def __add__(self, other: Union[str, "ModernText"]):
+        if isinstance(other, ModernText):
+            if self.color == other.color:
+                return ModernText(self.content + other.content, self.color)
+            else:
+                combined = f"{self.color}{self.content}{ModernColor.RESET}{other.color}{other.content}"
+                return ModernText(combined, ModernColor.RESET)
+        elif isinstance(other, str):
+            return ModernText(self.content + other, self.color)
+        else:
+            raise TypeError(f"Unsupported operand type(s) for +: 'ModernText' and '{type(other).__name__}'")
+
+    def __str__(self):
+        return f"{self.color}{self.content}{ModernColor.RESET}"

{nercone_modern-1.2.2.dist-info → nercone_modern-1.4.5.dist-info}/METADATA

@@ -1,7 +1,7 @@
 Metadata-Version: 2.3
 Name: nercone-modern
-Version: 1.2.2
-Summary: Modern Logging and Progress Bar Library
+Version: 1.4.5
+Summary: Modern CLI Library
 Author: Nercone
 Author-email: Nercone <nercone@diamondgotcat.net>
 License: MIT
@@ -16,7 +16,7 @@ Description-Content-Type: text/markdown
 <img width="1920" alt="Nercone Modern" src="https://github.com/user-attachments/assets/c92b0407-916f-46ec-9116-c3388b38c88c" />
 
 # nercone-modern
-Modern Logging and Progress Bar Library
+Modern CLI Library
 
 ## Installation
 
@@ -38,31 +38,84 @@ pip3 install nercone-modern
 
 ## Usage
 
+### Import
+
 ```python
+from nercone_modern.color import ModernColor
+from nercone_modern.text import ModernText
 from nercone_modern.logging import ModernLogging
 from nercone_modern.progressbar import ModernProgressBar
 ```
 
-### Logging
+### Color
+```python
+from nercone_modern.color import ModernColor as Color
+print(f"Build {Color.GREEN}Success{Color.RESET}")
+```
+
+**Supported colors:**
+- `CYAN`
+- `MAGENTA`
+- `YELLOW`
+- `GREEN`
+- `RED`
+- `BLUE`
+- `WHITE`
+- `BLACK`
+- `GRAY`
+- `RESET`
+
+### Text
+```python
+from nercone_modern.text import ModernText as Text
+from nercone_modern.color import ModernColor as Color
+print("Build" + Text("Success", color="green"))
+print("Build" + Text("Failed", color=Color.RED))
+```
 
+### Logging
 ```python
+from nercone_modern.logging import ModernLogging
 logger = ModernLogging("Main", display_level="DEBUG")
 logger.log("This is a test message", level="INFO")
+answer = logger.prompt("What's your name?", level="INFO")
+logger.log(f"Answer: {answer}", level="DEBUG")
 ```
 
-### Progress Bar
+**Supported levels:**
+- `DEBUG`
+- `INFO`
+- `WARN`
+- `ERROR`
+- `CRITICAL`
 
+### Progress Bar
 ```python
+from nercone_modern.progressbar import ModernProgressBar
 progress_bar = ModernProgressBar(total=100, process_name="Task 1", spinner_mode=True)
-progress_bar.start()
 
+progress_bar.start()
 time.sleep(5)
 
 progress_bar.spinner(False)
 
-for i in range(100):
+progress_bar.setMessage("Step 1")
+
+for i in range(50):
   time.sleep(0.05)
-  progress_bar.update()
+  progress_bar.update(amount=1)
+
+progress_bar.setMessage("Step 2")
+
+for i in range(25):
+  time.sleep(0.03)
+  progress_bar.update(amount=1)
+
+progress_bar.setMessage("Step 3")
+
+for i in range(5):
+  time.sleep(1)
+  progress_bar.update(amount=5)
 
 progress_bar.finish()
 ```

nercone_modern-1.4.5.dist-info/RECORD

@@ -0,0 +1,9 @@
+nercone_modern/__init__.py,sha256=ArF3T8FdWIhwGcL4MfYcHqMse3n5gjuyzbLNlcqRcxs,443
+nercone_modern/__main__.py,sha256=wKQnrGpTKemaaMv1oow_KKQFfPqxzhkz4KAhWBjVcYg,1957
+nercone_modern/color.py,sha256=sy7f0Fe07PZWNfM1AOt7HeuhF7uGK2_IuZHEckwgxc4,1328
+nercone_modern/logging.py,sha256=p9biozctXNQmesChmn8ozCUKwBSC_5mdelCgbuZ3q0M,4945
+nercone_modern/progressbar.py,sha256=bzlGg0dSj88eli2lM0cI4xTw2FNJqlJb352jdtJbsWQ,8088
+nercone_modern/text.py,sha256=eGxGQOJ3b-783ocLibkG62cOcYD4HLG_3diA52tU8jI,1031
+nercone_modern-1.4.5.dist-info/WHEEL,sha256=5w2T7AS2mz1-rW9CNagNYWRCaB0iQqBMYLwKdlgiR4Q,78
+nercone_modern-1.4.5.dist-info/METADATA,sha256=jZPhPnjGBngxi4j_NgDVtFeiZKaedAmJcaPhXTn7CWY,2472
+nercone_modern-1.4.5.dist-info/RECORD,,

{nercone_modern-1.2.2.dist-info → nercone_modern-1.4.5.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: uv 0.9.6
+Generator: uv 0.9.7
 Root-Is-Purelib: true
 Tag: py3-none-any

nercone_modern-1.2.2.dist-info/RECORD

@@ -1,7 +0,0 @@
-nercone_modern/__init__.py,sha256=ArF3T8FdWIhwGcL4MfYcHqMse3n5gjuyzbLNlcqRcxs,443
-nercone_modern/__main__.py,sha256=7ZhJgTJOF73XO3HwSed9LAyf9K9A-Bnqd8N3pTuV2b0,1962
-nercone_modern/logging.py,sha256=CVMyOGoHAP87A578hvFFc0mNNtNjXCn49rTQDWLo-fE,4860
-nercone_modern/progressbar.py,sha256=xPUDQG77pXyKT3YuEVQl8ERjWrZ1YXOnujEUwkFc0YA,7915
-nercone_modern-1.2.2.dist-info/WHEEL,sha256=UH59_qNuDUAa1VxQvC6fxmbl24EMw6DOIlT1yp8oeuU,78
-nercone_modern-1.2.2.dist-info/METADATA,sha256=e5rADnucSyZHDsNRyVJqG_aoocdU9igp85kt3s0u3Io,1403
-nercone_modern-1.2.2.dist-info/RECORD,,