commandchat 0.0.13__tar.gz → 0.0.14__tar.gz

{commandchat-0.0.13 → commandchat-0.0.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: commandchat
-Version: 0.0.13
+Version: 0.0.14
 Summary: use command to chat with openai models
 Home-page: https://github.com/
 Author: xoto

{commandchat-0.0.13 → commandchat-0.0.14}/commandchat.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: commandchat
-Version: 0.0.13
+Version: 0.0.14
 Summary: use command to chat with openai models
 Home-page: https://github.com/
 Author: xoto

{commandchat-0.0.13 → commandchat-0.0.14}/commandchat.egg-info/SOURCES.txt

@@ -13,8 +13,17 @@ occ/ConvertLogToMarkDown.py
 occ/__init__.py
 occ/command/__init__.py
 occ/command/__main__.py
+occ/command/commands/__init__.py
+occ/command/commands/chat.py
+occ/command/commands/image.py
+occ/command/commands/profile.py
+occ/command/commands/prompt.py
+occ/command/interactive/__init__.py
+occ/command/interactive/profile_menu.py
+occ/command/interactive/prompt_menu.py
 occ/commons/__init__.py
 occ/commons/config.py
+occ/commons/prompts.py
 occ/configuration/__init__.py
 occ/configuration/profile_config.py
 occ/utils/CommonUtil.py

{commandchat-0.0.13 → commandchat-0.0.14}/occ/CommandChat.py

@@ -58,7 +58,7 @@ class CommandChat:
     partial_text = []
     role = None
 
-    def __init__(self, profile=None, chat_log_id=None, model=None):
+    def __init__(self, profile=None, chat_log_id=None, model=None, system_message=None):
         now = time.strftime("%Y%m%d", time.localtime())
         self.profile = profile or DEFAULT_PROFILE
         self.api_server_type = get_env(self.profile, "api_server_type")
@@ -92,6 +92,17 @@ class CommandChat:
                 except json.JSONDecodeError:
                     continue
         
+        # Add system message if provided
+        if system_message:
+            # Check if there's already a system message at the beginning
+            has_system = len(self.messages) > 0 and self.messages[0].get('role') == 'system'
+            if has_system:
+                # Replace existing system message
+                self.messages[0] = {"role": "system", "content": system_message}
+            else:
+                # Insert system message at the beginning
+                self.messages.insert(0, {"role": "system", "content": system_message})
+        
         # Initialize client based on API server type
         if self.api_server_type == "azure-openai":
             # For Azure OpenAI, we'll initialize client per model in chat method

commandchat-0.0.14/occ/command/__main__.py

@@ -0,0 +1,43 @@
+"""
+OpenAI CommandChat - Command Line Interface
+
+Main entry point for the occ CLI tool.
+"""
+
+from __future__ import absolute_import
+
+import importlib.metadata
+import click
+
+# Import command modules
+from occ.command.commands.prompt import prompt
+from occ.command.commands.profile import configure
+from occ.command.commands.chat import chat
+from occ.command.commands.image import image
+
+
+VERSION = importlib.metadata.version("commandchat")
+
+
+@click.group()
+@click.version_option(version=VERSION, prog_name='openai-commandchat')
+def cli():
+    """OpenAI CommandChat - AI-powered command-line chat tool"""
+    pass
+
+
+# Register commands
+cli.add_command(configure)
+cli.add_command(chat)
+cli.add_command(prompt)
+cli.add_command(image)
+
+
+def main():
+    """Main entry point"""
+    cli()
+
+
+if __name__ == '__main__':
+    main()
+

commandchat-0.0.14/occ/command/commands/__init__.py

@@ -0,0 +1,2 @@
+"""Command modules for occ CLI"""
+

commandchat-0.0.13/occ/command/__main__.py → commandchat-0.0.14/occ/command/commands/chat.py

@@ -1,50 +1,26 @@
-from __future__ import absolute_import
+"""Chat command"""
 
-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
 
 
-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='Specify profile name to configure')
-def configure(profile):
-    """Configure OpenAI or Azure OpenAI profiles"""
-    if profile is not None:
-        # If profile is specified, configure it directly
-        from occ.configuration.profile_config import configure_profile
-        configure_profile(profile)
-    else:
-        # No profile specified, show interactive selection
-        from occ.configuration.profile_config import select_profile_interactively
-        select_profile_interactively()
-
-
 @click.command()
 @click.argument('message', required=False)
-@click.option('-id', help=' enter chat id, something like context')
+@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):
+@click.option('--file', '-f', type=click.Path(exists=True), help='The prompt or message is from a file')
+@click.option('--prompt', '-pt', help='Use a predefined prompt template (e.g., translate, improve). Use "occ prompt list" to see available prompts.')
+def chat(message, id, profile, model, file, prompt):
+    """Start a chat session with the AI"""
     try:
         import questionary
         from occ.commons import config as cfg
@@ -104,6 +80,31 @@ def chat(message, id, profile, model, file):
                     logger.log_r(f"Model '{model}' not found in profile '{active_profile}'. Available models: {', '.join(available_models)}")
                     return
         
+        # Handle prompt template - command line -pt has highest priority
+        system_message = None
+        prompt_source = None  # Track where the prompt came from
+        
+        if prompt:
+            # Command line -pt parameter has highest priority
+            from occ.commons.prompts import get_prompt_system_message, list_prompts
+            system_message = get_prompt_system_message(prompt)
+            if not system_message:
+                logger.log_r(f"Prompt '{prompt}' not found. Available prompts:")
+                for key, value in list_prompts().items():
+                    logger.log_g(f"  - {key}: {value['description']}")
+                return
+            prompt_source = "command line"
+            logger.log_g(f"Using prompt template: {prompt} (from {prompt_source})")
+        else:
+            # Check for profile default prompt
+            profile_default_prompt = cfg.get_profile_default_prompt(active_profile)
+            if profile_default_prompt:
+                from occ.commons.prompts import get_prompt_system_message
+                system_message = get_prompt_system_message(profile_default_prompt)
+                if system_message:
+                    prompt_source = f"profile '{active_profile}'"
+                    logger.log_g(f"Using default prompt: {profile_default_prompt} (from {prompt_source})")
+        
         if file:
             with open(file, 'r') as f:
                 message = f.read()
@@ -124,52 +125,19 @@ def chat(message, id, profile, model, file):
                         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 or /q to leave the chat.\n"
-                            "Use /help to show this message again.</ansigreen>\n"))
+                            "Use /help to show this message again.\n"
+                            "Use -pt <prompt_key> when starting chat to use a prompt template.\n"
+                            "Run 'occ prompt list' to see available prompt templates.</ansigreen>\n"))
                         continue
                     if message.lower() in {"/exit", "/quit", "/q"}:
                         print_formatted_text(HTML("<ansired>Bye 👋</ansired>"))
                         exit(0)
-                    CommandChat(profile=active_profile, chat_log_id=id).chat(message, model)
+                    CommandChat(profile=active_profile, chat_log_id=id, system_message=system_message).chat(message, model)
                     print()
                 except KeyboardInterrupt:
                     print_formatted_text(HTML("<ansired>\n(Interrupted)</ansired>"))
                     exit(0)
-        CommandChat(profile=active_profile, chat_log_id=id).chat(message, model)
+        CommandChat(profile=active_profile, chat_log_id=id, system_message=system_message).chat(message, model)
     except Exception as e:
         logger.log_g(str(e))
 
-
-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.14/occ/command/commands/image.py

@@ -0,0 +1,30 @@
+"""Image generation command"""
+
+import click
+from occ.CommandChat import CommandChat
+
+
+# Size mapping for convenience
+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):
+    """Generate images using AI"""
+    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-0.0.14/occ/command/commands/profile.py

@@ -0,0 +1,112 @@
+"""Profile configuration commands"""
+
+import click
+import occ.utils.logger as logger
+
+
+@click.group(invoke_without_command=True)
+@click.pass_context
+def configure(ctx):
+    """Configure OpenAI or Azure OpenAI profiles"""
+    if ctx.invoked_subcommand is None:
+        # No subcommand provided, show interactive menu
+        from occ.command.interactive.profile_menu import interactive_profile_menu
+        interactive_profile_menu()
+
+
+@click.command(name='profile')
+@click.option('--profile', '-p', help='Specify profile name to configure')
+def profile_cmd(profile):
+    """Configure a profile"""
+    if profile is not None:
+        # If profile is specified, configure it directly
+        from occ.configuration.profile_config import configure_profile
+        configure_profile(profile)
+    else:
+        # No profile specified, show interactive selection
+        from occ.configuration.profile_config import select_profile_interactively
+        select_profile_interactively()
+
+
+@click.command(name='delete')
+@click.argument('profile', required=False)
+@click.option('--yes', '-y', is_flag=True, help='Skip confirmation')
+def delete_cmd(profile, yes):
+    """Delete a profile"""
+    import questionary
+    from occ.commons import config as cfg
+    
+    # If profile not provided, show interactive selection
+    if not profile:
+        profiles = [p for p in cfg.get_profiles() if p != 'default']
+        
+        if not profiles:
+            logger.log_r("No profiles to delete (cannot delete 'default' profile)")
+            return
+        
+        profile = questionary.select(
+            "Select a profile to delete:",
+            choices=profiles
+        ).ask()
+        
+        if not profile:
+            logger.log_g("Cancelled")
+            return
+    
+    if not cfg.profile_exists(profile):
+        logger.log_r(f"Profile '{profile}' does not exist")
+        return
+    
+    if profile == 'default':
+        logger.log_r("Cannot delete the 'default' profile")
+        return
+    
+    # Confirm deletion
+    if not yes:
+        confirm = questionary.confirm(
+            f"Are you sure you want to delete profile '{profile}'? This will also remove all associated models.",
+            default=False
+        ).ask()
+        
+        if not confirm:
+            logger.log_g("Deletion cancelled")
+            return
+    
+    cfg.remove_profile(profile)
+    logger.log_g(f"Profile '{profile}' deleted successfully")
+
+
+@click.command(name='list')
+def list_cmd():
+    """List all configured profiles"""
+    from occ.commons import config as cfg
+    from rich.table import Table
+    from rich.console import Console
+    
+    profiles = cfg.get_profiles()
+    if not profiles:
+        logger.log_r("No profiles found. Run 'occ configure profile' to create one.")
+        return
+    
+    console = Console()
+    table = Table(title="Configured Profiles", show_header=True, header_style="bold magenta")
+    table.add_column("Profile", style="cyan", width=20)
+    table.add_column("API Type", style="green", width=15)
+    table.add_column("Default Prompt", style="yellow", width=20)
+    table.add_column("Models", style="blue")
+    
+    for profile in profiles:
+        api_type = cfg.get_env(profile, 'api_server_type') or 'N/A'
+        default_prompt = cfg.get_profile_default_prompt(profile) or 'None'
+        models = cfg.get_profile_models(profile)
+        models_str = ', '.join(models) if models else 'N/A'
+        table.add_row(profile, api_type, default_prompt, models_str)
+    
+    console.print(table)
+
+
+# Add subcommands to configure group
+configure.add_command(profile_cmd)
+configure.add_command(delete_cmd)
+configure.add_command(list_cmd)
+

commandchat-0.0.14/occ/command/commands/prompt.py

@@ -0,0 +1,226 @@
+"""Prompt management commands"""
+
+import click
+import occ.utils.logger as logger
+
+
+@click.group(invoke_without_command=True)
+@click.pass_context
+def prompt(ctx):
+    """Manage prompt templates"""
+    if ctx.invoked_subcommand is None:
+        # No subcommand provided, show interactive menu
+        from occ.command.interactive.prompt_menu import interactive_prompt_menu
+        interactive_prompt_menu()
+
+
+@click.command(name='list')
+def list_cmd():
+    """List all available prompt templates"""
+    from occ.commons.prompts import list_prompts
+    from rich.table import Table
+    from rich.console import Console
+    
+    console = Console()
+    table = Table(title="Available Prompt Templates", show_header=True, header_style="bold magenta")
+    table.add_column("Key", style="cyan", width=15)
+    table.add_column("Name", style="green", width=25)
+    table.add_column("Description", style="yellow", width=35)
+    table.add_column("Type", style="blue", width=10)
+    
+    for key, value in list_prompts().items():
+        prompt_type = "Built-in" if value.get("builtin", False) else "Custom"
+        table.add_row(key, value["name"], value["description"], prompt_type)
+    
+    console.print(table)
+    console.print("\n[bold green]Usage:[/bold green] occ chat -pt <key> \"your message\"")
+    console.print("[bold green]Example:[/bold green] occ chat -pt translate \"你好世界\"")
+
+
+@click.command(name='add')
+@click.argument('key')
+@click.option('--name', '-n', required=True, help='Display name for the prompt')
+@click.option('--description', '-d', required=True, help='Brief description of the prompt')
+@click.option('--system-prompt', '-s', required=True, help='The system prompt content')
+def add_cmd(key, name, description, system_prompt):
+    """Add a new custom prompt template"""
+    from occ.commons.prompts import add_prompt
+    
+    success, message = add_prompt(key, name, description, system_prompt)
+    if success:
+        logger.log_g(message)
+    else:
+        logger.log_r(message)
+
+
+@click.command(name='modify')
+@click.argument('key', required=False)
+@click.option('--name', '-n', help='New display name')
+@click.option('--description', '-d', help='New description')
+@click.option('--system-prompt', '-s', help='New system prompt content')
+def modify_cmd(key, name, description, system_prompt):
+    """Modify an existing custom prompt template"""
+    from occ.commons.prompts import modify_prompt, list_prompts, get_prompt
+    import questionary
+    
+    # If key not provided, show interactive selection
+    if not key:
+        user_prompts = {k: v for k, v in list_prompts().items() if not v.get('builtin', False)}
+        
+        if not user_prompts:
+            logger.log_r("No custom prompts to modify. Built-in prompts cannot be modified.")
+            return
+        
+        key = questionary.select(
+            "Select a prompt to modify:",
+            choices=list(user_prompts.keys())
+        ).ask()
+        
+        if not key:
+            logger.log_g("Cancelled")
+            return
+        
+        # If no options provided, ask interactively
+        if not any([name, description, system_prompt]):
+            current_prompt = get_prompt(key)
+            
+            fields = questionary.checkbox(
+                "What would you like to modify?",
+                choices=['Name', 'Description', 'System Prompt']
+            ).ask()
+            
+            if not fields:
+                logger.log_g("Cancelled")
+                return
+            
+            if 'Name' in fields:
+                name = questionary.text(
+                    "Enter new name:",
+                    default=current_prompt['name']
+                ).ask()
+            
+            if 'Description' in fields:
+                description = questionary.text(
+                    "Enter new description:",
+                    default=current_prompt['description']
+                ).ask()
+            
+            if 'System Prompt' in fields:
+                system_prompt = questionary.text(
+                    "Enter new system prompt:",
+                    default=current_prompt['system_prompt'],
+                    multiline=True
+                ).ask()
+    
+    if not any([name, description, system_prompt]):
+        logger.log_r("At least one of --name, --description, or --system-prompt must be provided")
+        return
+    
+    success, message = modify_prompt(key, name, description, system_prompt)
+    if success:
+        logger.log_g(message)
+    else:
+        logger.log_r(message)
+
+
+@click.command(name='remove')
+@click.argument('key', required=False)
+@click.option('--yes', '-y', is_flag=True, help='Skip confirmation')
+def remove_cmd(key, yes):
+    """Remove a custom prompt template"""
+    from occ.commons.prompts import remove_prompt, get_prompt, list_prompts
+    import questionary
+    
+    # If key not provided, show interactive selection
+    if not key:
+        user_prompts = {k: v for k, v in list_prompts().items() if not v.get('builtin', False)}
+        
+        if not user_prompts:
+            logger.log_r("No custom prompts to remove. Built-in prompts cannot be removed.")
+            return
+        
+        key = questionary.select(
+            "Select a prompt to remove:",
+            choices=list(user_prompts.keys())
+        ).ask()
+        
+        if not key:
+            logger.log_g("Cancelled")
+            return
+    
+    # Check if prompt exists
+    prompt = get_prompt(key)
+    if not prompt:
+        logger.log_r(f"Prompt '{key}' not found")
+        return
+    
+    if prompt.get("builtin", False):
+        logger.log_r(f"Cannot remove built-in prompt '{key}'")
+        return
+    
+    # Confirm removal
+    if not yes:
+        confirm = questionary.confirm(
+            f"Are you sure you want to remove prompt '{key}'?",
+            default=False
+        ).ask()
+        
+        if not confirm:
+            logger.log_g("Removal cancelled")
+            return
+    
+    success, message = remove_prompt(key)
+    if success:
+        logger.log_g(message)
+    else:
+        logger.log_r(message)
+
+
+@click.command(name='show')
+@click.argument('key', required=False)
+def show_cmd(key):
+    """Show detailed information about a prompt template"""
+    from occ.commons.prompts import get_prompt, list_prompts
+    from rich.console import Console
+    from rich.panel import Panel
+    import questionary
+    
+    # If key not provided, show interactive selection
+    if not key:
+        prompts_dict = list_prompts()
+        if not prompts_dict:
+            logger.log_r("No prompts available")
+            return
+        
+        key = questionary.select(
+            "Select a prompt to view:",
+            choices=list(prompts_dict.keys())
+        ).ask()
+        
+        if not key:
+            logger.log_g("Cancelled")
+            return
+    
+    prompt = get_prompt(key)
+    if not prompt:
+        logger.log_r(f"Prompt '{key}' not found")
+        return
+    
+    console = Console()
+    prompt_type = "Built-in" if prompt.get("builtin", False) else "Custom"
+    
+    console.print(f"\n[bold cyan]Key:[/bold cyan] {key}")
+    console.print(f"[bold cyan]Name:[/bold cyan] {prompt['name']}")
+    console.print(f"[bold cyan]Type:[/bold cyan] {prompt_type}")
+    console.print(f"[bold cyan]Description:[/bold cyan] {prompt['description']}")
+    console.print(f"\n[bold cyan]System Prompt:[/bold cyan]")
+    console.print(Panel(prompt['system_prompt'], border_style="green"))
+
+
+# Add subcommands to prompt group
+prompt.add_command(list_cmd)
+prompt.add_command(add_cmd)
+prompt.add_command(modify_cmd)
+prompt.add_command(remove_cmd)
+prompt.add_command(show_cmd)
+

commandchat-0.0.14/occ/command/interactive/__init__.py

@@ -0,0 +1,2 @@
+"""Interactive menu modules for occ CLI"""
+

commandchat-0.0.14/occ/command/interactive/profile_menu.py

@@ -0,0 +1,91 @@
+"""Interactive menu for profile configuration"""
+
+import questionary
+from questionary import Style
+import occ.utils.logger as logger
+
+
+# Custom style for questionary
+CUSTOM_STYLE = Style([
+    ('qmark', 'fg:#673ab7 bold'),
+    ('question', 'bold'),
+    ('answer', 'fg:#f44336 bold'),
+    ('pointer', 'fg:#673ab7 bold'),
+    ('highlighted', 'fg:#673ab7 bold'),
+])
+
+
+def interactive_profile_menu():
+    """Interactive menu for managing profiles"""
+    while True:
+        action = questionary.select(
+            "Profile Configuration - What would you like to do?",
+            choices=[
+                'List all profiles',
+                'Configure profile',
+                'Delete profile',
+                'Exit'
+            ],
+            style=CUSTOM_STYLE
+        ).ask()
+        
+        if action is None or action == 'Exit':
+            break
+        elif action == 'List all profiles':
+            from occ.command.commands.profile import list_cmd
+            list_cmd.callback()
+        elif action == 'Configure profile':
+            interactive_configure_profile()
+        elif action == 'Delete profile':
+            interactive_delete_profile()
+
+
+def interactive_configure_profile():
+    """Interactive profile configuration"""
+    from occ.commons import config as cfg
+    from occ.configuration.profile_config import configure_profile
+    
+    profiles = cfg.get_profiles()
+    
+    if profiles:
+        choices = profiles + ['[Create New Profile]']
+        selection = questionary.select(
+            "Select a profile to configure:",
+            choices=choices,
+            style=CUSTOM_STYLE
+        ).ask()
+        
+        if not selection:
+            return
+        
+        if selection == '[Create New Profile]':
+            profile_name = questionary.text("Enter new profile name:", style=CUSTOM_STYLE).ask()
+            if profile_name:
+                configure_profile(profile_name)
+        else:
+            configure_profile(selection)
+    else:
+        logger.log_g("No profiles found. Creating default profile...")
+        configure_profile('default')
+
+
+def interactive_delete_profile():
+    """Interactive profile deletion"""
+    from occ.commons import config as cfg
+    from occ.command.commands.profile import delete_cmd
+    
+    profiles = [p for p in cfg.get_profiles() if p != 'default']
+    
+    if not profiles:
+        logger.log_r("No profiles to delete (cannot delete 'default' profile)")
+        return
+    
+    profile = questionary.select(
+        "Select a profile to delete:",
+        choices=profiles,
+        style=CUSTOM_STYLE
+    ).ask()
+    
+    if profile:
+        delete_cmd.callback(profile, False)
+

commandchat-0.0.14/occ/command/interactive/prompt_menu.py

@@ -0,0 +1,176 @@
+"""Interactive menu for prompt management"""
+
+import questionary
+from questionary import Style
+import occ.utils.logger as logger
+
+
+# Custom style for questionary
+CUSTOM_STYLE = Style([
+    ('qmark', 'fg:#673ab7 bold'),
+    ('question', 'bold'),
+    ('answer', 'fg:#f44336 bold'),
+    ('pointer', 'fg:#673ab7 bold'),
+    ('highlighted', 'fg:#673ab7 bold'),
+])
+
+
+def interactive_prompt_menu():
+    """Interactive menu for managing prompts"""
+    while True:
+        action = questionary.select(
+            "Prompt Management - What would you like to do?",
+            choices=[
+                'List all prompts',
+                'Show prompt details',
+                'Add new prompt',
+                'Modify prompt',
+                'Remove prompt',
+                'Exit'
+            ],
+            style=CUSTOM_STYLE
+        ).ask()
+        
+        if action is None or action == 'Exit':
+            break
+        elif action == 'List all prompts':
+            from occ.command.commands.prompt import list_cmd
+            list_cmd.callback()
+        elif action == 'Show prompt details':
+            interactive_show_prompt()
+        elif action == 'Add new prompt':
+            interactive_add_prompt()
+        elif action == 'Modify prompt':
+            interactive_modify_prompt()
+        elif action == 'Remove prompt':
+            interactive_remove_prompt()
+
+
+def interactive_show_prompt():
+    """Interactive prompt selection for showing details"""
+    from occ.commons.prompts import list_prompts
+    from occ.command.commands.prompt import show_cmd
+    
+    prompts_dict = list_prompts()
+    if not prompts_dict:
+        logger.log_r("No prompts available")
+        return
+    
+    prompt_key = questionary.select(
+        "Select a prompt to view:",
+        choices=list(prompts_dict.keys()),
+        style=CUSTOM_STYLE
+    ).ask()
+    
+    if prompt_key:
+        show_cmd.callback(prompt_key)
+
+
+def interactive_add_prompt():
+    """Interactive prompt addition"""
+    from occ.command.commands.prompt import add_cmd
+    
+    key = questionary.text("Enter prompt key (e.g., my-prompt):", style=CUSTOM_STYLE).ask()
+    if not key:
+        return
+    
+    name = questionary.text("Enter prompt name:", style=CUSTOM_STYLE).ask()
+    if not name:
+        return
+    
+    description = questionary.text("Enter prompt description:", style=CUSTOM_STYLE).ask()
+    if not description:
+        return
+    
+    system_prompt = questionary.text(
+        "Enter system prompt content:",
+        multiline=True,
+        style=CUSTOM_STYLE
+    ).ask()
+    if not system_prompt:
+        return
+    
+    add_cmd.callback(key, name, description, system_prompt)
+
+
+def interactive_modify_prompt():
+    """Interactive prompt modification"""
+    from occ.commons.prompts import list_prompts, get_prompt
+    from occ.command.commands.prompt import modify_cmd
+    
+    user_prompts = {k: v for k, v in list_prompts().items() if not v.get('builtin', False)}
+    
+    if not user_prompts:
+        logger.log_r("No custom prompts to modify. Built-in prompts cannot be modified.")
+        return
+    
+    prompt_key = questionary.select(
+        "Select a prompt to modify:",
+        choices=list(user_prompts.keys()),
+        style=CUSTOM_STYLE
+    ).ask()
+    
+    if not prompt_key:
+        return
+    
+    current_prompt = get_prompt(prompt_key)
+    
+    # Ask what to modify
+    fields = questionary.checkbox(
+        "What would you like to modify?",
+        choices=['Name', 'Description', 'System Prompt'],
+        style=CUSTOM_STYLE
+    ).ask()
+    
+    if not fields:
+        return
+    
+    name = None
+    description = None
+    system_prompt = None
+    
+    if 'Name' in fields:
+        name = questionary.text(
+            "Enter new name:",
+            default=current_prompt['name'],
+            style=CUSTOM_STYLE
+        ).ask()
+    
+    if 'Description' in fields:
+        description = questionary.text(
+            "Enter new description:",
+            default=current_prompt['description'],
+            style=CUSTOM_STYLE
+        ).ask()
+    
+    if 'System Prompt' in fields:
+        system_prompt = questionary.text(
+            "Enter new system prompt:",
+            default=current_prompt['system_prompt'],
+            multiline=True,
+            style=CUSTOM_STYLE
+        ).ask()
+    
+    modify_cmd.callback(prompt_key, name, description, system_prompt)
+
+
+def interactive_remove_prompt():
+    """Interactive prompt removal"""
+    from occ.commons.prompts import list_prompts
+    from occ.command.commands.prompt import remove_cmd
+    
+    user_prompts = {k: v for k, v in list_prompts().items() if not v.get('builtin', False)}
+    
+    if not user_prompts:
+        logger.log_r("No custom prompts to remove. Built-in prompts cannot be removed.")
+        return
+    
+    prompt_key = questionary.select(
+        "Select a prompt to remove:",
+        choices=list(user_prompts.keys()),
+        style=CUSTOM_STYLE
+    ).ask()
+    
+    if prompt_key:
+        remove_cmd.callback(prompt_key, False)
+

{commandchat-0.0.13 → commandchat-0.0.14}/occ/commons/config.py

@@ -142,6 +142,19 @@ def profile_exists(profile):
     return config.has_section(profile)
 
 
+def get_profile_default_prompt(profile):
+    """Get the default prompt for a profile"""
+    return get_env(profile, 'default_prompt')
+
+
+def set_profile_default_prompt(profile, prompt_key):
+    """Set the default prompt for a profile"""
+    if not profile_exists(profile):
+        return False, f"Profile '{profile}' does not exist"
+    set_env(profile, 'default_prompt', prompt_key)
+    return True, f"Default prompt for profile '{profile}' set to '{prompt_key}'"
+
+
 def log_config():
     level_input = 'DEBUG'
     if level_input == 'DEBUG':

commandchat-0.0.14/occ/commons/prompts.py

@@ -0,0 +1,146 @@
+"""
+Built-in and custom prompt template management
+"""
+
+import os
+import json
+import logging
+
+# Built-in default prompts (read-only)
+DEFAULT_PROMPTS = {
+    "translate": {
+        "name": "Translation Assistant",
+        "description": "Translate Chinese to English",
+        "system_prompt": "You are a professional translation assistant. Please translate the Chinese text provided by the user into idiomatic English. Only output the translation result without additional explanations.",
+        "builtin": True
+    },
+    "improve": {
+        "name": "English Writing Assistant",
+        "description": "Improve English sentences and identify issues",
+        "system_prompt": "You are a professional English writing assistant. Please help users improve their English sentences to make them more natural for native speakers. Format your output as follows:\n\n**Improved Sentence:**\n[The improved English sentence]\n\n**Issues in Original:**\n[List grammar, word choice, and expression issues]",
+        "builtin": True
+    }
+}
+
+
+def get_home_path():
+    homedir = os.environ.get('HOME', None)
+    if os.name == 'nt':
+        homedir = os.path.expanduser('~')
+    return homedir
+
+
+def get_prompts_file():
+    """Get the path to user prompts configuration file"""
+    homedir = get_home_path()
+    prompts_dir = os.path.join(homedir, ".occ")
+    os.makedirs(prompts_dir, exist_ok=True)
+    return os.path.join(prompts_dir, "prompts.json")
+
+
+def load_user_prompts():
+    """Load user-defined prompts from file"""
+    prompts_file = get_prompts_file()
+    if not os.path.exists(prompts_file):
+        return {}
+    
+    try:
+        with open(prompts_file, 'r', encoding='utf-8') as f:
+            return json.load(f)
+    except Exception as e:
+        logging.error(f"Error loading user prompts: {e}")
+        return {}
+
+
+def save_user_prompts(prompts):
+    """Save user-defined prompts to file"""
+    prompts_file = get_prompts_file()
+    try:
+        with open(prompts_file, 'w', encoding='utf-8') as f:
+            json.dump(prompts, f, indent=2, ensure_ascii=False)
+        return True
+    except Exception as e:
+        logging.error(f"Error saving user prompts: {e}")
+        return False
+
+
+def get_prompt(prompt_key):
+    """Get a specific prompt template (checks user prompts first, then built-in)"""
+    user_prompts = load_user_prompts()
+    if prompt_key in user_prompts:
+        return user_prompts[prompt_key]
+    return DEFAULT_PROMPTS.get(prompt_key)
+
+
+def list_prompts():
+    """List all available prompts (built-in + user-defined)"""
+    all_prompts = DEFAULT_PROMPTS.copy()
+    user_prompts = load_user_prompts()
+    all_prompts.update(user_prompts)
+    return all_prompts
+
+
+def get_prompt_system_message(prompt_key):
+    """Get the system message for a prompt"""
+    prompt = get_prompt(prompt_key)
+    if prompt:
+        return prompt["system_prompt"]
+    return None
+
+
+def add_prompt(key, name, description, system_prompt):
+    """Add a new user-defined prompt"""
+    if key in DEFAULT_PROMPTS:
+        return False, f"Cannot override built-in prompt '{key}'"
+    
+    user_prompts = load_user_prompts()
+    user_prompts[key] = {
+        "name": name,
+        "description": description,
+        "system_prompt": system_prompt,
+        "builtin": False
+    }
+    
+    if save_user_prompts(user_prompts):
+        return True, f"Prompt '{key}' added successfully"
+    return False, "Failed to save prompt"
+
+
+def modify_prompt(key, name=None, description=None, system_prompt=None):
+    """Modify an existing user-defined prompt"""
+    if key in DEFAULT_PROMPTS:
+        return False, f"Cannot modify built-in prompt '{key}'"
+    
+    user_prompts = load_user_prompts()
+    if key not in user_prompts:
+        return False, f"Prompt '{key}' not found"
+    
+    # Update only provided fields
+    if name is not None:
+        user_prompts[key]["name"] = name
+    if description is not None:
+        user_prompts[key]["description"] = description
+    if system_prompt is not None:
+        user_prompts[key]["system_prompt"] = system_prompt
+    
+    if save_user_prompts(user_prompts):
+        return True, f"Prompt '{key}' modified successfully"
+    return False, "Failed to save prompt"
+
+
+def remove_prompt(key):
+    """Remove a user-defined prompt"""
+    if key in DEFAULT_PROMPTS:
+        return False, f"Cannot remove built-in prompt '{key}'"
+    
+    user_prompts = load_user_prompts()
+    if key not in user_prompts:
+        return False, f"Prompt '{key}' not found"
+    
+    del user_prompts[key]
+    
+    if save_user_prompts(user_prompts):
+        return True, f"Prompt '{key}' removed successfully"
+    return False, "Failed to save prompts"
+
+

{commandchat-0.0.13 → commandchat-0.0.14}/occ/configuration/profile_config.py

@@ -102,6 +102,40 @@ def configure_common_settings(profile_name, is_existing):
     
     if limit_history:
         config.set_env(profile_name, 'limit_history', limit_history)
+    
+    # Configure default prompt
+    existing_prompt = config.get_profile_default_prompt(profile_name) if is_existing else None
+    
+    set_prompt = questionary.confirm(
+        "Set a default prompt template for this profile?",
+        default=False,
+        style=custom_style
+    ).ask()
+    
+    if set_prompt:
+        from occ.commons.prompts import list_prompts
+        available_prompts = list(list_prompts().keys())
+        if available_prompts:
+            default_prompt = questionary.select(
+                "Select default prompt:",
+                choices=available_prompts + ['[None]'],
+                default=existing_prompt if existing_prompt in available_prompts else '[None]',
+                style=custom_style
+            ).ask()
+            
+            if default_prompt and default_prompt != '[None]':
+                config.set_env(profile_name, 'default_prompt', default_prompt)
+                logger.log_g(f"✓ Default prompt set to '{default_prompt}'")
+            elif default_prompt == '[None]' and existing_prompt:
+                # Remove default prompt
+                config.config.remove_option(profile_name, 'default_prompt')
+                config.write_config()
+                logger.log_g("✓ Default prompt removed")
+        else:
+            logger.log_r("No prompts available. Use 'occ prompts add' to create custom prompts.")
+    elif existing_prompt:
+        # Show existing default prompt
+        logger.log_g(f"Current default prompt: {existing_prompt}")
 
 
 def configure_openai(profile_name, is_existing):

{commandchat-0.0.13 → commandchat-0.0.14}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "commandchat"
-version = "0.0.13"
+version = "0.0.14"
 description = "use command to chat with openai models"
 readme = "README.md"
 requires-python = ">=3.8"