Merge branch 'main' into doc1

Author: badmonster0

.pre-commit-config.yaml

@@ -33,6 +33,13 @@ repos:
           files: ^(python/|src/|Cargo\.toml|pyproject\.toml)
           pass_filenames: false
 
+        - id: generate-cli-docs
+          name: generate CLI documentation
+          entry: python dev/generate_cli_docs.py
+          language: system
+          files: ^(python/cocoindex/cli\.py|dev/generate_cli_docs\.py)$
+          pass_filenames: false
+
         - id: cargo-fmt
           name: cargo fmt
           entry: cargo fmt

dev/README.md

@@ -0,0 +1,37 @@
+# Development Scripts
+
+This directory contains development and maintenance scripts for the CocoIndex project.
+
+## Scripts
+
+### `generate_cli_docs.py`
+
+Automatically generates CLI documentation from the CocoIndex Click commands.
+
+**Usage:**
+
+```bash
+python dev/generate_cli_docs.py
+```
+
+**What it does:**
+
+- Extracts help messages from all Click commands in `python/cocoindex/cli.py`
+- Generates comprehensive Markdown documentation with properly formatted tables
+- Saves the output to `docs/docs/core/cli-commands.md` for direct import into CLI documentation
+- Only updates the file if content has changed (avoids unnecessary git diffs)
+- Automatically escapes HTML-like tags to prevent MDX parsing issues
+- Wraps URLs with placeholders in code blocks for proper rendering
+
+**Integration:**
+
+- Runs automatically as a pre-commit hook when `python/cocoindex/cli.py` is modified
+- The generated documentation is directly imported into `docs/docs/core/cli.mdx` via MDX import
+- Provides seamless single-page CLI documentation experience without separate reference pages
+
+**Dependencies:**
+
+- `md-click` package for extracting Click help information
+- `cocoindex` package must be importable (the CLI module)
+
+This ensures that CLI documentation is always kept in sync with the actual command-line interface.

dev/generate_cli_docs.py

@@ -0,0 +1,286 @@
+#!/usr/bin/env python3
+"""
+Script to generate CLI documentation from CocoIndex Click commands.
+
+This script uses md-click as the foundation but generates enhanced markdown
+documentation that's suitable for inclusion in the CocoIndex documentation site.
+"""
+
+import sys
+from pathlib import Path
+import re
+import click
+from cocoindex.cli import cli
+
+# Add the cocoindex python directory to the path
+project_root = Path(__file__).parent.parent
+python_path = project_root / "python"
+sys.path.insert(0, str(python_path))
+
+
+def clean_usage_line(usage: str) -> str:
+    """Clean up the usage line to remove 'cli' and make it generic, and remove the 'Usage:' prefix."""
+    # Replace 'cli' with 'cocoindex' in usage lines and remove 'Usage:' prefix
+    cleaned = usage.replace("Usage: cli ", "cocoindex ")
+    # Handle case where it might be "Usage: cocoindex" already
+    if cleaned.startswith("Usage: cocoindex "):
+        cleaned = cleaned.replace("Usage: cocoindex ", "cocoindex ")
+    return cleaned
+
+
+def escape_html_tags(text: str) -> str:
+    """Escape HTML-like tags in text to prevent MDX parsing issues, but preserve them in code blocks."""
+    import re
+
+    # Handle special cases where URLs with placeholders should be wrapped in code blocks
+    text = re.sub(r"http://localhost:<([^>]+)>", r"`http://localhost:<\1>`", text)
+    text = re.sub(r"https://([^<\s]+)<([^>]+)>", r"`https://\1<\2>`", text)
+
+    # Handle comma-separated URL examples specifically (e.g., "https://site1.com,http://localhost:3000")
+    text = re.sub(r"(?<!`)(\bhttps?://[^\s,`]+,https?://[^\s`]+)(?!`)", r"`\1`", text)
+
+    # Handle standalone URLs that aren't already wrapped in backticks
+    text = re.sub(r"(?<!`)(?<!,)(\bhttps?://[^\s,`]+)(?!`)(?!,)", r"`\1`", text)
+
+    # Split text into code blocks and regular text
+    # Pattern matches: `code content` (inline code blocks)
+    parts = re.split(r"(`[^`]*`)", text)
+
+    result = []
+    for i, part in enumerate(parts):
+        if i % 2 == 0:
+            # Even indices are regular text, escape HTML tags
+            result.append(part.replace("<", "&lt;").replace(">", "&gt;"))
+        else:
+            # Odd indices are code blocks, preserve as-is
+            result.append(part)
+
+    return "".join(result)
+
+
+def format_options_section(help_text: str) -> str:
+    """Extract and format the options section."""
+    lines = help_text.split("\n")
+    options_start = None
+    commands_start = None
+
+    for i, line in enumerate(lines):
+        if line.strip() == "Options:":
+            options_start = i
+        elif line.strip() == "Commands:":
+            commands_start = i
+            break
+
+    if options_start is None:
+        return ""
+
+    # Extract options section
+    end_idx = commands_start if commands_start else len(lines)
+    options_lines = lines[options_start + 1 : end_idx]  # Skip "Options:" header
+
+    # Parse options - each option starts with exactly 2 spaces and a dash
+    formatted_options = []
+    current_option = None
+    current_description = []
+
+    for line in options_lines:
+        if not line.strip():  # Empty line
+            continue
+
+        # Check if this is a new option line (starts with exactly 2 spaces then -)
+        if line.startswith("  -") and not line.startswith("   "):
+            # Save previous option if exists
+            if current_option is not None:
+                desc = " ".join(current_description).strip()
+                desc = escape_html_tags(desc)  # Escape HTML tags for MDX compatibility
+                formatted_options.append(f"| `{current_option}` | {desc} |")
+
+            # Remove the leading 2 spaces
+            content = line[2:]
+
+            # Find the position where we have multiple consecutive spaces (start of description)
+            match = re.search(r"\s{2,}", content)
+            if match:
+                # Split at the first occurrence of multiple spaces
+                option_part = content[: match.start()]
+                desc_part = content[match.end() :]
+                current_option = option_part.strip()
+                current_description = [desc_part.strip()] if desc_part.strip() else []
+            else:
+                # No description on this line, just the option
+                current_option = content.strip()
+                current_description = []
+        else:
+            # Continuation line (starts with more than 2 spaces)
+            if current_option is not None and line.strip():
+                current_description.append(line.strip())
+
+    # Add last option
+    if current_option is not None:
+        desc = " ".join(current_description).strip()
+        desc = escape_html_tags(desc)  # Escape HTML tags for MDX compatibility
+        formatted_options.append(f"| `{current_option}` | {desc} |")
+
+    if formatted_options:
+        header = "| Option | Description |\n|--------|-------------|"
+        return f"{header}\n" + "\n".join(formatted_options) + "\n"
+
+    return ""
+
+
+def format_commands_section(help_text: str) -> str:
+    """Extract and format the commands section."""
+    lines = help_text.split("\n")
+    commands_start = None
+
+    for i, line in enumerate(lines):
+        if line.strip() == "Commands:":
+            commands_start = i
+            break
+
+    if commands_start is None:
+        return ""
+
+    # Extract commands section
+    commands_lines = lines[commands_start + 1 :]
+
+    # Parse commands - each command starts with 2 spaces then the command name
+    formatted_commands = []
+
+    for line in commands_lines:
+        if not line.strip():  # Empty line
+            continue
+
+        # Check if this is a command line (starts with 2 spaces + command name)
+        match = re.match(r"^  (\w+)\s{2,}(.+)$", line)
+        if match:
+            command = match.group(1)
+            description = match.group(2).strip()
+            # Truncate long descriptions
+            if len(description) > 80:
+                description = description[:77] + "..."
+            formatted_commands.append(f"| `{command}` | {description} |")
+
+    if formatted_commands:
+        header = "| Command | Description |\n|---------|-------------|"
+        return f"{header}\n" + "\n".join(formatted_commands) + "\n"
+
+    return ""
+
+
+def extract_description(help_text: str) -> str:
+    """Extract the main description from help text."""
+    lines = help_text.split("\n")
+
+    # Find the description between usage and options/commands
+    description_lines = []
+    in_description = False
+
+    for line in lines:
+        if line.startswith("Usage:"):
+            in_description = True
+            continue
+        elif line.strip() in ["Options:", "Commands:"]:
+            break
+        elif in_description and line.strip():
+            description_lines.append(line.strip())
+
+    description = "\n\n".join(description_lines) if description_lines else ""
+    return escape_html_tags(description)  # Escape HTML tags for MDX compatibility
+
+
+def generate_command_docs(cmd: click.Group) -> str:
+    """Generate markdown documentation for all commands."""
+
+    markdown_content = []
+
+    # Disable lint warnings for about "first line in file should be a top level heading"
+    # We intentionally start with a level 2 heading below, as this file is imported into another file.
+    markdown_content.append("<!-- markdownlint-disable MD041 -->")
+    markdown_content.append("")
+
+    # Add top-level heading to satisfy MD041 linting rule
+    markdown_content.append("## Subcommands Reference")
+    markdown_content.append("")
+
+    ctx = click.core.Context(cmd, info_name=cmd.name)
+    subcommands = list(cmd.commands.values())
+    # Generate only the command details section (remove redundant headers)
+    for sub_cmd in sorted(subcommands, key=lambda x: x.name or ""):
+        sub_ctx = click.core.Context(sub_cmd, info_name=sub_cmd.name, parent=ctx)
+        command_name = sub_cmd.name
+        help_text = sub_cmd.get_help(sub_ctx)
+        usage = clean_usage_line(sub_cmd.get_usage(sub_ctx))
+        description = extract_description(help_text)
+
+        markdown_content.append(f"### `{command_name}`")
+        markdown_content.append("")
+
+        if description:
+            markdown_content.append(description)
+            markdown_content.append("")
+
+        # Add usage
+        markdown_content.append("**Usage:**")
+        markdown_content.append("")
+        markdown_content.append(f"```bash")
+        markdown_content.append(usage)
+        markdown_content.append("```")
+        markdown_content.append("")
+
+        # Add options if any
+        options_section = format_options_section(help_text)
+        if options_section:
+            markdown_content.append("**Options:**")
+            markdown_content.append("")
+            markdown_content.append(options_section)
+
+        markdown_content.append("---")
+        markdown_content.append("")
+
+    return "\n".join(markdown_content)
+
+
+def main() -> None:
+    """Generate CLI documentation and save to file."""
+    print("Generating CocoIndex CLI documentation...")
+
+    try:
+        # Generate markdown content
+        markdown_content = generate_command_docs(cli)
+
+        # Determine output path
+        docs_dir = project_root / "docs" / "docs" / "core"
+        output_file = docs_dir / "cli-commands.md"
+
+        # Ensure directory exists
+        docs_dir.mkdir(parents=True, exist_ok=True)
+
+        # Write the generated documentation
+        content_changed = True
+        if output_file.exists():
+            with open(output_file, "r", encoding="utf-8") as f:
+                existing_content = f.read()
+            content_changed = existing_content != markdown_content
+
+        if content_changed:
+            with open(output_file, "w", encoding="utf-8") as f:
+                f.write(markdown_content)
+
+            print(f"CLI documentation generated successfully at: {output_file}")
+            print(
+                f"Generated {len(markdown_content.splitlines())} lines of documentation"
+            )
+        else:
+            print(f"CLI documentation is up to date at: {output_file}")
+
+    except Exception as e:
+        print(f"Error generating documentation: {e}")
+        import traceback
+
+        traceback.print_exc()
+        sys.exit(1)
+
+
+if __name__ == "__main__":
+    main()