Merge pull request #2381 from hlohaus/info

Add aliases to gui arguments, fix logs variable
xtekky · Nov 19, 2024 · a0f3ea1 · a0f3ea1
2 parents 1563946 + 6e674ca
commit a0f3ea1
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 9 deletions.
diff --git a/g4f/debug.py b/g4f/debug.py
@@ -6,6 +6,7 @@
 last_model: str = None
 version: str = None
 log_handler: callable = print
+logs: list = []
 
 def log(text):
     if logging:

diff --git a/g4f/gui/client/static/css/style.css b/g4f/gui/client/static/css/style.css
@@ -1060,7 +1060,6 @@ a:-webkit-any-link {
 
 .log {
     white-space: pre-wrap;
-    font-family: Consolas, "Andale Mono WT", "Andale Mono", "Lucida Console", "Lucida Sans Typewriter", "DejaVu Sans Mono", "Bitstream Vera Sans Mono", "Liberation Mono", "Nimbus Mono L", Monaco, "Courier New", Courier, monospace;
 }
 
 .log.hidden {

diff --git a/g4f/gui/gui_parser.py b/g4f/gui/gui_parser.py
@@ -2,8 +2,12 @@
 
 def gui_parser():
     parser = ArgumentParser(description="Run the GUI")
-    parser.add_argument("-host", type=str, default="0.0.0.0", help="hostname")
-    parser.add_argument("-port", type=int, default=8080, help="port")
-    parser.add_argument("-debug", action="store_true", help="debug mode")
+    parser.add_argument("--host", type=str, default="0.0.0.0", help="hostname")
+    parser.add_argument_alias('-h', '--host')
+    parser.add_argument("--port", type=int, default=8080, help="port")
+    parser.add_argument_alias('-p', '--port')
+    parser.add_argument("--debug", action="store_true", help="debug mode")
+    parser.add_argument_alias('-d', '--debug')
+    parser.add_argument_alias('-debug', '--debug')
     parser.add_argument("--ignore-cookie-files", action="store_true", help="Don't read .har and cookie files.")
     return parser
diff --git a/g4f/gui/server/api.py b/g4f/gui/server/api.py
@@ -142,10 +142,10 @@ def _prepare_conversation_kwargs(self, json_data: dict, kwargs: dict):
 
     def _create_response_stream(self, kwargs: dict, conversation_id: str, provider: str) -> Iterator:
         if debug.logging:
-            logs = []
+            debug.logs = []
             print_callback = debug.log_handler
             def log_handler(text: str):
-                logs.append(text)
+                debug.logs.append(text)
                 print_callback(text)
             debug.log_handler = log_handler
         try:
@@ -176,10 +176,10 @@ def log_handler(text: str):
                         yield self._format_json("content", str(ImageResponse(images, chunk.alt)))
                     elif not isinstance(chunk, FinishReason):
                         yield self._format_json("content", str(chunk))
-                    if logs:
-                        for log in logs:
+                    if debug.logs:
+                        for log in debug.logs:
                             yield self._format_json("log", str(log))
-                        logs = []
+                        debug.logs = []
         except Exception as e:
             logger.exception(e)
             yield self._format_json('error', get_error_message(e))