nercone-modern 1.3.0__tar.gz → 1.5.0__tar.gz

{nercone_modern-1.3.0 → nercone_modern-1.5.0}/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.3
 Name: nercone-modern
-Version: 1.3.0
-Summary: Modern Logging and Progress Bar Library
+Version: 1.5.0
+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,28 +38,63 @@ pip3 install nercone-modern
 
 ## Usage
 
-**Import**
+### 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)

{nercone_modern-1.3.0 → nercone_modern-1.5.0}/README.md

@@ -2,7 +2,7 @@
 <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
 
@@ -24,28 +24,63 @@ pip3 install nercone-modern
 
 ## Usage
 
-**Import**
+### 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)

{nercone_modern-1.3.0 → nercone_modern-1.5.0}/pyproject.toml

@@ -4,8 +4,8 @@ build-backend = "uv_build"
 
 [project]
 name = "nercone-modern"
-version = "1.3.0"
-description = "Modern Logging and Progress Bar Library"
+version = "1.5.0"
+description = "Modern CLI Library"
 readme = { file = "README.md", content-type = "text/markdown" }
 authors = [
     { name = "Nercone", email = "nercone@diamondgotcat.net" }

nercone_modern-1.5.0/src/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-1.3.0 → nercone_modern-1.5.0}/src/nercone_modern/logging.py

@@ -40,69 +40,68 @@ def is_higher_priority(level_a: str, level_b: str) -> bool:
         raise ValueError(f"Unknown log level: {level_a} or {level_b}")
 
 class ModernLogging:
-    def __init__(self, process_name: str, display_level: str = "INFO"):
+    def __init__(self, process_name: str = "App", display_level: str = "INFO", filepath: str | None = None):
         self.process_name = process_name
         self.display_level = display_level
-
+        self.filepath = filepath
         global _max_proc_width
         _max_proc_width = max(_max_proc_width, len(process_name))
 
-    def log(self, message: str = "", level: str = "INFO"):
-        if not is_higher_priority(level, self.display_level):
+    def log(self, message: str = "", level_text: str = "INFO", level_color: str | None = None):
+        if not is_higher_priority(level_text, self.display_level):
             return
-
         global _last_process, _last_level
-        level_text = normalize_level(level.strip().upper())
-        show_proc = (self.process_name != _last_process)
-        show_level = show_proc or (level_text != _last_level)
-
-        if level_text == "DEBUG":
-            color = 'gray'
-        elif level_text == "INFO":
-            color = 'blue'
-        elif level_text == "WARN":
-            color = 'yellow'
-        elif level_text == "ERROR":
-            color = 'red'
-        elif level_text == "CRITICAL":
-            color = 'red'
-        else:
-            color = 'blue'
-
-        print(self._make(message, level_text, color, show_proc, show_level))
-
+        log_line = self.make(message=message, level_text=level_text, level_color=level_color)
+        print(log_line)
         _last_process = self.process_name
-        _last_level = level_text
+        _last_level = normalize_level(level_text.strip().upper())
+        if self.filepath:
+            with open(self.filepath, "a") as f:
+                f.write(f"{log_line}\n")
 
-    def prompt(self, message: str = "", level: str = "INFO") -> str:
-        if not is_higher_priority(level, self.display_level):
+    def prompt(self, message: str = "", level_text: str = "INFO", level_color: str | None = None, ignore_kbdinterrupt: bool = True) -> str:
+        if not is_higher_priority(level_text, self.display_level):
             return
-
         global _last_process, _last_level
-        level_text = normalize_level(level.strip().upper())
+        log_line = self.make(message=message, level_text=level_text, level_color=level_color)
+        print(log_line, end="")
+        _last_process = self.process_name
+        _last_level = normalize_level(level_text.strip().upper())
+        answer = ""
+        try:
+            answer = input()
+        except KeyboardInterrupt:
+            if ignore_kbdinterrupt:
+                print()
+            else:
+                raise
+        if self.filepath:
+            with open(self.filepath, "a") as f:
+                f.write(f"{log_line}{answer}\n")
+        return answer
+
+    def make(self, message: str = "", level_text: str = "INFO", level_color: str | None = None):
+        level_text = normalize_level(level_text.strip().upper())
         show_proc = (self.process_name != _last_process)
         show_level = show_proc or (level_text != _last_level)
 
-        if level_text == "DEBUG":
-            color = 'gray'
-        elif level_text == "INFO":
-            color = 'blue'
-        elif level_text == "WARN":
-            color = 'yellow'
-        elif level_text == "ERROR":
-            color = 'red'
-        elif level_text == "CRITICAL":
-            color = 'red'
-        else:
-            color = 'blue'
-
-        print(self._make(message, level_text, color, show_proc, show_level), end="")
-
-        _last_process = self.process_name
-        _last_level = level_text
-        return input()
-
-    def _make(self, message: str, level_text: str, color: str, show_proc: bool, show_level: bool):
+        if not level_color:
+            if level_text == "DEBUG":
+                level_color = 'gray'
+            elif level_text == "INFO":
+                level_color = 'blue'
+            elif level_text == "WARN":
+                level_color = 'yellow'
+            elif level_text == "ERROR":
+                level_color = 'red'
+            elif level_text == "CRITICAL":
+                level_color = 'red'
+            else:
+                level_color = 'blue'
+
+        return self._make(message, level_text, level_color, show_proc, show_level)
+
+    def _make(self, message: str, level_text: str, level_color: str, show_proc: bool, show_level: bool):
         global _max_proc_width
         level_width = max(MAX_LOG_LEVEL_WIDTH, len(level_text))
 
@@ -110,9 +109,9 @@ class ModernLogging:
         proc_part = proc_part.ljust(_max_proc_width) if proc_part else " " * _max_proc_width
 
         if show_level:
-            level_part = f"{self._color(color)}{level_text.ljust(level_width)} |{self._color('reset')}"
+            level_part = f"{self._color(level_color)}{level_text.ljust(level_width)} |{self._color('reset')}"
         else:
-            level_part = (" " * level_width) + f"{self._color(color)} |{self._color('reset')}"
+            level_part = (" " * level_width) + f"{self._color(level_color)} |{self._color('reset')}"
 
         return f"{proc_part} {level_part} {str(message)}"
 

nercone_modern-1.5.0/src/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}"