commandchat 0.0.7__tar.gz → 0.0.9__tar.gz

{commandchat-0.0.7 → commandchat-0.0.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: commandchat
-Version: 0.0.7
+Version: 0.0.9
 Summary: use command to chat with openai models
 Home-page: https://github.com/
 Author: xoto
@@ -16,6 +16,8 @@ License-File: LICENSE
 Requires-Dist: click
 Requires-Dist: Image
 Requires-Dist: openai
+Requires-Dist: prompt_toolkit
+Requires-Dist: rich
 Dynamic: author
 Dynamic: home-page
 Dynamic: license-file

{commandchat-0.0.7 → commandchat-0.0.9}/commandchat.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: commandchat
-Version: 0.0.7
+Version: 0.0.9
 Summary: use command to chat with openai models
 Home-page: https://github.com/
 Author: xoto
@@ -16,6 +16,8 @@ License-File: LICENSE
 Requires-Dist: click
 Requires-Dist: Image
 Requires-Dist: openai
+Requires-Dist: prompt_toolkit
+Requires-Dist: rich
 Dynamic: author
 Dynamic: home-page
 Dynamic: license-file

commandchat-0.0.9/commandchat.egg-info/requires.txt

@@ -0,0 +1,5 @@
+click
+Image
+openai
+prompt_toolkit
+rich

{commandchat-0.0.7 → commandchat-0.0.9}/occ/CommandChat.py

@@ -1,14 +1,26 @@
 import json
+import sys
+import time
+
 import openai
 from openai import OpenAI
 from openai import AzureOpenAI
 import os
 
+from prompt_toolkit import print_formatted_text, HTML
+from rich.console import Console
+from rich.markdown import Markdown
+from rich.live import Live
+
 from occ.commons.config import get_env
 from occ.utils.CommonUtil import save_and_copy_image, waiting_start, waiting_stop
 
 DEFAULT_CHAT_LOG_ID = "chat-1"
 DEFAULT_PROFILE = "default"
+USER_COLOR = "ansiyellow"
+ASSISTANT_COLOR = "ansicyan"
+TYPING_DELAY = 0.01  # 打字速度（秒/字符）
+SEPARATOR = "─" * 30
 
 
 def get_home_path():
@@ -17,6 +29,13 @@ def get_home_path():
         homedir = os.path.expanduser('~')
     return homedir
 
+console = Console()
+
+def print_formatted(content: str, live: Live):
+    md = Markdown(content)
+    live.update(md)
+    sys.stdout.flush()
+
 
 class CommandChat:
 
@@ -70,8 +89,14 @@ class CommandChat:
             print(e.http_status)
             print(e.error)
 
+    def chat(self, message, model):
+        print_formatted_text(HTML(f"<{ASSISTANT_COLOR}>🤖 Assistant: </{ASSISTANT_COLOR}>"))
+        if model == "gpt-35-turbo-instruct":
+            self.completions(message, model)
+        else:
+            self.chat_completions(message, model)
+
     def completions(self, message, model):
-        waiting_start()
         stream = self.client.completions.create(
             model=model,
             prompt=message,
@@ -79,25 +104,19 @@ class CommandChat:
             temperature=0.1,
             stream=True
         )
-        waiting_stop()
-        for completion in stream:
-            for choice in completion.choices:
-                print(choice.text, end="")
-
+        completion_text = ''
+        with Live(console=console, refresh_per_second=8) as live:
+            for completion in stream:
+                for choice in completion.choices:
+                    completion_text += choice.text
+                    print_formatted(completion_text, live)
         print("\n")
 
-    def chat(self, message, model):
-        if model == "gpt-35-turbo-instruct":
-            self.completions(message, model)
-        else:
-            self.chat_completions(message, model)
-
     def chat_completions(self, message, model):
         openai.api_key = self.api_key
         openai.api_base = self.api_base
         message = {"role": "user", "content": message}
         self.messages.append(message)
-        waiting_start()
         response = self.client.chat.completions.create(
             model=model,
             messages=self.messages,
@@ -106,24 +125,24 @@ class CommandChat:
             frequency_penalty=0.0,
             stream=True
         )
-        waiting_stop()
         completion_text = ''
         role = None
-        for chunk in response:
-            if chunk.choices is None or len(chunk.choices) == 0:
-                continue
-            choice = chunk.choices[0]
-            delta = choice.delta
-
-            if choice.finish_reason == "stop":
-                break
-
-            if role is None and delta.role:
-                role = delta.role
-
-            if delta.content:
-                completion_text += delta.content
-                print(delta.content, end="")
+        with Live(console=console, refresh_per_second=8) as live:
+            for chunk in response:
+                if chunk.choices is None or len(chunk.choices) == 0:
+                    continue
+                choice = chunk.choices[0]
+                delta = choice.delta
+
+                if choice.finish_reason == "stop":
+                    break
+
+                if role is None and delta.role:
+                    role = delta.role
+
+                if delta.content:
+                    completion_text += delta.content
+                    print_formatted(completion_text, live)
         print("\n")
         self.record_chat_logs(message, {"role": role, "content": completion_text.replace("\n\n", "")})
 

commandchat-0.0.9/occ/command/__main__.py

@@ -0,0 +1,115 @@
+from __future__ import absolute_import
+
+import importlib.metadata
+import sys
+
+import click
+from prompt_toolkit import PromptSession, print_formatted_text, HTML
+from prompt_toolkit.cursor_shapes import ModalCursorShapeConfig
+from prompt_toolkit.styles import style_from_pygments_cls
+from pygments.lexers.markup import MarkdownLexer
+from pygments.styles.tango import TangoStyle
+
+import occ.utils.logger as logger
+from occ.CommandChat import CommandChat
+from occ.configuration.profile_config import add_profile, add_default_profile
+from occ.utils.CommonUtil import waiting_stop
+
+VERSION = importlib.metadata.version("commandchat")
+
+
+@click.group()
+@click.version_option(version=VERSION, prog_name='openai-commandchat')
+def commandchat_operator():
+    pass
+
+
+@click.command()
+@click.option('--profile', '-p', help='Enable profile name')
+def configure(profile):
+    if profile is not None:
+        add_profile(profile)
+    else:
+        add_default_profile()
+
+
+@click.command()
+@click.argument('message', required=False)
+@click.option('-id', help=' enter chat id, something like context')
+@click.option('--profile', '-p', envvar="OCC_PROFILE", help='Enable profile name')
+@click.option("--model", "-m", envvar="OCC_MODEL", default="o1-mini",
+              help="Specify the model to use for this chat session")
+@click.option('--file', '-f', type=click.Path(exists=True), help='the prompt or message is from a file')
+def chat(message, id, profile, model, file):
+    try:
+        if file:
+            with open(file, 'r') as f:
+                message = f.read()
+        elif not message and not sys.stdin.isatty():
+            message = sys.stdin.read()
+        elif not message:
+            session = PromptSession(
+                show_frame=True,
+                style=style_from_pygments_cls(TangoStyle), multiline=True, wrap_lines=True,
+                cursor=ModalCursorShapeConfig(),
+            )
+            print_formatted_text(HTML("<ansibrightwhite>AI model Terminal</ansibrightwhite>\n"))
+            while True:
+                try:
+                    message = session.prompt("👤 You: \n")
+                    if not message:
+                        continue
+                    if message.lower() in {"/help", "/Help"}:
+                        print_formatted_text(HTML(
+                            "<b>Help Info: \n</b><ansigreen>Type your message and press ESC+Enter or OPT+Enter to send.\n"
+                            "Use /exit or /quit to leave the chat.\n"
+                            "Use /help to show this message again.</ansigreen>\n"))
+                        continue
+                    if message.lower() in {"/exit", "/quit"}:
+                        print_formatted_text(HTML("<ansired>Bye 👋</ansired>"))
+                        exit(0)
+                    CommandChat(profile=profile, chat_log_id=id).chat(message, model)
+                    print()
+                except KeyboardInterrupt:
+                    print_formatted_text(HTML("<ansired>\n(Interrupted)</ansired>"))
+                    exit(0)
+        CommandChat(profile=profile, chat_log_id=id).chat(message, model)
+    except Exception as e:
+        logger.log_g(str(e))
+        waiting_stop()
+
+
+size_map = {
+    "s": "256x256",
+    "S": "256x256",
+    "m": "512x512",
+    "M": "512x512",
+    "l": "1024x1024",
+    "L": "1024x1024"
+}
+
+
+@click.command()
+@click.option('-desc', help=' Enter the description of the images you want')
+@click.option('-size',
+              help=' Enter the size(S/s,M/m,L/l): \n   small - 256x256 \n   middle  - 512x512 \n   large - 1024x1024')
+@click.option('-num', count=True, help=' Enter the number to generate the specified number of images')
+@click.option('-profile', help='Enable profile name')
+def image(desc, size, num, profile):
+    number = num if num > 0 else 1
+    size = size_map.get(size)
+    size_value = size if size is not None else "512x512"
+    CommandChat(profile=profile).image_create(desc, size_value, number if number < 5 else 4)
+
+
+commandchat_operator.add_command(configure)
+commandchat_operator.add_command(chat)
+commandchat_operator.add_command(image)
+
+
+def main():
+    commandchat_operator()
+
+
+if __name__ == '__main__':
+    main()

{commandchat-0.0.7 → commandchat-0.0.9}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "commandchat"
-version = "0.0.7"
+version = "0.0.9"
 description = "use command to chat with openai models"
 readme = "README.md"
 requires-python = ">=3.8"
@@ -15,7 +15,9 @@ authors = [
 dependencies = [
     "click",
     "Image",
-    "openai"
+    "openai",
+    "prompt_toolkit",
+    "rich",
 ]
 
 classifiers = [

commandchat-0.0.7/commandchat.egg-info/requires.txt

@@ -1,3 +0,0 @@
-click
-Image
-openai

commandchat-0.0.7/occ/command/__main__.py

@@ -1,75 +0,0 @@
-from __future__ import absolute_import
-
-import click
-import importlib.metadata
-
-import occ.utils.logger as logger
-from occ.configuration.profile_config import add_profile, add_default_profile
-from occ.CommandChat import CommandChat
-from occ.utils.CommonUtil import waiting_stop
-
-VERSION = importlib.metadata.version("commandchat")
-
-
-@click.group()
-@click.version_option(version=VERSION, prog_name='openai-commandchat')
-def commandchat_operator():
-    pass
-
-
-@click.command()
-@click.option('--profile', '-p', help='Enable profile name')
-def configure(profile):
-    if profile is not None:
-        add_profile(profile)
-    else:
-        add_default_profile()
-
-
-@click.command()
-@click.argument('message')
-@click.option('-id', help=' enter chat id, something like context')
-@click.option('--profile', '-p', help='Enable profile name')
-@click.option("--model", "-m", envvar="OCC_MODEL", default="o1-mini", help="Specify the model to use for this chat session")
-def chat(message, id, profile, model):
-    try:
-        CommandChat(profile=profile, chat_log_id=id).chat(message, model)
-    except Exception as e:
-        logger.log_g(str(e))
-        waiting_stop()
-
-
-size_map = {
-    "s": "256x256",
-    "S": "256x256",
-    "m": "512x512",
-    "M": "512x512",
-    "l": "1024x1024",
-    "L": "1024x1024"
-}
-
-
-@click.command()
-@click.option('-desc', help=' Enter the description of the images you want')
-@click.option('-size',
-              help=' Enter the size(S/s,M/m,L/l): \n   small - 256x256 \n   middle  - 512x512 \n   large - 1024x1024')
-@click.option('-num', count=True, help=' Enter the number to generate the specified number of images')
-@click.option('-profile', help='Enable profile name')
-def image(desc, size, num, profile):
-    number = num if num > 0 else 1
-    size = size_map.get(size)
-    size_value = size if size is not None else "512x512"
-    CommandChat(profile=profile).image_create(desc, size_value, number if number < 5 else 4)
-
-
-commandchat_operator.add_command(configure)
-commandchat_operator.add_command(chat)
-commandchat_operator.add_command(image)
-
-
-def main():
-    commandchat_operator()
-
-
-if __name__ == '__main__':
-    main()