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

nercone_modern/__main__.py

@@ -22,8 +22,11 @@ try:
     logger1.log("This is a warning message", "WARNING")
     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: ")
+    prompt_result = logger1.prompt("Continue demo?", choices=["Y", "n"])
     logger1.log(f"Answer is: {prompt_result}", "INFO")
+    if prompt_result == "n":
+        print("Exiting demo. See you!")
+        raise SystemExit(0)
 
     progress_bar1 = ModernProgressBar(total=100, process_name="Task 1", spinner_mode=False)
     progress_bar1.setMessage("WAITING")

nercone_modern/logging.py

@@ -40,69 +40,126 @@ 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, default: str | None = None, choices: list[str] | None = None, show_choices: 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())
+        if default:
+            message += f" ({default})"
+        if choices and show_choices:
+            message += f" [{'/'.join(choices)}]"
+        if not message.endswith(" "):
+            message += " "
+        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 answer.strip() == "" and default is not None:
+            if choices:
+                selected_default = self._select_choice(default, choices)
+                if selected_default is not None:
+                    answer = default
+            else:
+                answer = default
+        if self.filepath:
+            with open(self.filepath, "a") as f:
+                f.write(f"{log_line}{answer}\n")
+        if choices:
+            selected = self._select_choice(answer, choices)
+            if selected is not None:
+                return selected
+            else:
+                while True:
+                    log_line = self.make(message=f"Invalid selection. Please select from: {'/'.join(choices)}", level_text=level_text, level_color=level_color)
+                    print(log_line, end="")
+                    if self.filepath:
+                        with open(self.filepath, "a") as f:
+                            f.write(f"{log_line}{answer}\n")
+                    log_line = self.make(message=message, level_text=level_text, level_color=level_color)
+                    print(log_line, end="")
+                    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")
+                    if answer.strip() == "" and default is not None:
+                        if choices:
+                            selected_default = self._select_choice(default, choices)
+                            if selected_default is not None:
+                                return default
+                        else:
+                            return default
+                    selected = self._select_choice(answer, choices)
+                    if selected is not None:
+                        return selected
+
+    def _select_choice(self, answer: str, choices: list[str]) -> str | None:
+        if answer in choices:
+            return answer
+        stripped = answer.strip()
+        if stripped in choices:
+            return stripped
+        lower_map = {c.lower(): c for c in choices}
+        if answer.lower() in lower_map:
+            return lower_map[answer.lower()]
+        if stripped.lower() in lower_map:
+            return lower_map[stripped.lower()]
+        return None
+
+    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 +167,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.4.5.dist-info → nercone_modern-1.6.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: nercone-modern
-Version: 1.4.5
+Version: 1.6.0
 Summary: Modern CLI Library
 Author: Nercone
 Author-email: Nercone <nercone@diamondgotcat.net>

nercone_modern-1.6.0.dist-info/RECORD

@@ -0,0 +1,9 @@
+nercone_modern/__init__.py,sha256=ArF3T8FdWIhwGcL4MfYcHqMse3n5gjuyzbLNlcqRcxs,443
+nercone_modern/__main__.py,sha256=7UUBJ71GmMkwOmEbsgMr8LCD2dYo0v5OvBDFkTca39E,2056
+nercone_modern/color.py,sha256=sy7f0Fe07PZWNfM1AOt7HeuhF7uGK2_IuZHEckwgxc4,1328
+nercone_modern/logging.py,sha256=17CcLMKydwgfw7HIs1Ds7bKBbLxXQ677DJ_OO0u73W0,8182
+nercone_modern/progressbar.py,sha256=bzlGg0dSj88eli2lM0cI4xTw2FNJqlJb352jdtJbsWQ,8088
+nercone_modern/text.py,sha256=eGxGQOJ3b-783ocLibkG62cOcYD4HLG_3diA52tU8jI,1031
+nercone_modern-1.6.0.dist-info/WHEEL,sha256=DpNsHFUm_gffZe1FgzmqwuqiuPC6Y-uBCzibcJcdupM,78
+nercone_modern-1.6.0.dist-info/METADATA,sha256=76eB0XA8rWk80YAx2lDdB3aoHrmVOAobj5_DfcOmrRM,2472
+nercone_modern-1.6.0.dist-info/RECORD,,

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

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

nercone_modern-1.4.5.dist-info/RECORD

@@ -1,9 +0,0 @@
-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,,