machineconfig 5.15__py3-none-any.whl → 7.66__py3-none-any.whl

machineconfig/scripts/python/agents.py

@@ -3,43 +3,33 @@
 """
 
 from pathlib import Path
-from typing import cast, Iterable, Optional, get_args
+from typing import cast, Optional, get_args, Annotated
 import typer
-from machineconfig.scripts.python.fire_agents_helper_types import AGENTS
-
-
-def _write_list_file(target: Path, files: Iterable[Path]) -> None:
-    target.parent.mkdir(parents=True, exist_ok=True)
-    target.write_text("\n".join(str(f) for f in files), encoding="utf-8")
+from machineconfig.scripts.python.helpers_agents.fire_agents_helper_types import AGENTS, HOST, PROVIDER
 
 
 def create(
-    context_path: Optional[Path] = typer.Option(None, help="Path to the context file"),
-    keyword_search: Optional[str] = typer.Option(None, help="Keyword to search in Python files"),
-    filename_pattern: Optional[str] = typer.Option(None, help="Filename pattern to match"),
-    separator: str = typer.Option("\n", help="Separator for context"),
-    tasks_per_prompt: int = typer.Option(13, help="Number of tasks per prompt"),
-    agent: AGENTS = typer.Option(..., help=f"Agent type. One of {', '.join(get_args(AGENTS))}"),
-    prompt: Optional[str] = typer.Option(None, help="Prompt prefix as string"),
-    prompt_path: Optional[Path] = typer.Option(None, help="Path to prompt file"),
-    job_name: str = typer.Option("AI_Agents", help="Job name"),
-    keep_separate: bool = typer.Option(True, help="Keep prompt material in separate file to the context."),
-    output_path: Optional[Path] = typer.Option(None, help="Path to write the layout.json file"),
-    agents_dir: Optional[Path] = typer.Option(None, help="Directory to store agent files. If not provided, will be constructed automatically."),
+    agent: Annotated[AGENTS, typer.Option(..., "--agents", "-a", help=f"Agent type. One of {', '.join(get_args(AGENTS)[:3])}")],
+    host: Annotated[HOST, typer.Option(..., "--host", "-h", help=f"Machine to run agents on. One of {', '.join(get_args(HOST))}")],
+    model: Annotated[str, typer.Option(..., "--model", "-m", help="Model to use (for crush agent).")],
+    provider: Annotated[PROVIDER, typer.Option(..., "--provider", "-p", help=f"Provider to use (for crush agent). One of {', '.join(get_args(PROVIDER)[:3])}")],
+    context_path: Annotated[Optional[Path], typer.Option(..., "--context-path", "-c", help="Path to the context file/folder, defaults to .ai/todo/")] = None,
+    separator: Annotated[str, typer.Option(..., "--separator", "-s", help="Separator for context")] = "\n",
+    agent_load: Annotated[int, typer.Option(..., "--agent-load", "-al", help="Number of tasks per prompt")] = 13,
+    prompt: Annotated[Optional[str], typer.Option(..., "--prompt", "-P", help="Prompt prefix as string")] = None,
+    prompt_path: Annotated[Optional[Path], typer.Option(..., "--prompt-path", "-pp", help="Path to prompt file")] = None,
+    job_name: Annotated[str, typer.Option(..., "--job-name", "-j", help="Job name")] = "AI_Agents",
+    separate: Annotated[bool, typer.Option(..., "--separate", "-S", help="Keep prompt material in separate file to the context.")] = True,
+    output_path: Annotated[Optional[Path], typer.Option(..., "--output-path", "-o", help="Path to write the layout.json file")] = None,
+    agents_dir: Annotated[Optional[Path], typer.Option(..., "--agents-dir", "-ad", help="Directory to store agent files. If not provided, will be constructed automatically.")] = None,
 ):
 
-    from machineconfig.scripts.python.fire_agents_help_launch import prep_agent_launch, get_agents_launch_layout
-    from machineconfig.scripts.python.fire_agents_help_search import search_files_by_pattern, search_python_files
-    from machineconfig.scripts.python.fire_agents_load_balancer import chunk_prompts
+    from machineconfig.scripts.python.helpers_agents.fire_agents_help_launch import prep_agent_launch, get_agents_launch_layout
+    from machineconfig.scripts.python.helpers_agents.fire_agents_load_balancer import chunk_prompts
     from machineconfig.utils.accessories import get_repo_root, randstr
     import json
 
     # validate mutual exclusive
-    context_options = [context_path, keyword_search, filename_pattern]
-    provided_context = [opt for opt in context_options if opt is not None]
-    if len(provided_context) != 1:
-        raise typer.BadParameter("Exactly one of --context-path, --keyword-search, --filename-pattern must be provided")
-    
     prompt_options = [prompt, prompt_path]
     provided_prompt = [opt for opt in prompt_options if opt is not None]
     if len(provided_prompt) != 1:
@@ -51,61 +41,51 @@ def create(
         raise typer.Exit(1)
     typer.echo(f"Operating @ {repo_root}")
     
-    search_strategy = ""
-    prompt_material_path = Path("")
+    if context_path is None:
+        context_path = repo_root / ".ai" / "todo"
+        
+    context_path_resolved = context_path.expanduser().resolve()
+    if not context_path_resolved.exists():
+        raise typer.BadParameter(f"Path does not exist: {context_path_resolved}")
     
-    if context_path is not None:
-        search_strategy = "file_path"
-        target_file_path = context_path.expanduser().resolve()
-        if not target_file_path.exists() or not target_file_path.is_file():
-            raise typer.BadParameter(f"Invalid file path: {target_file_path}")
-        prompt_material_path = target_file_path
-    elif keyword_search is not None:
-        search_strategy = "keyword_search"
-        matching_files = search_python_files(repo_root, keyword_search)
-        if not matching_files:
-            typer.echo(f"💥 No .py files found containing keyword: {keyword_search}")
-            raise typer.Exit(1)
-        target_file_path = repo_root / ".ai" / "target_file.txt"
-        _write_list_file(target_file_path, matching_files)
-        prompt_material_path = target_file_path
-    elif filename_pattern is not None:
-        search_strategy = "filename_pattern"
-        matching_files = search_files_by_pattern(repo_root, filename_pattern)
-        if not matching_files:
-            typer.echo(f"💥 No files found matching pattern: {filename_pattern}")
-            raise typer.Exit(1)
-        target_file_path = repo_root / ".ai" / "target_file.txt"
-        _write_list_file(target_file_path, matching_files)
-        prompt_material_path = target_file_path
+    if context_path_resolved.is_file():
+        prompt_material_re_splitted = chunk_prompts(context_path_resolved, tasks_per_prompt=agent_load, joiner=separator)
+    elif context_path_resolved.is_dir():
+        files = [f for f in context_path_resolved.rglob("*") if f.is_file()]
+        if not files:
+            raise typer.BadParameter(f"No files found in directory: {context_path_resolved}")
+        concatenated = separator.join(f.read_text(encoding="utf-8") for f in files)
+        prompt_material_re_splitted = [concatenated]
+    else:
+        raise typer.BadParameter(f"Path is neither file nor directory: {context_path_resolved}")
     
     if prompt_path is not None:
         prompt_prefix = prompt_path.read_text(encoding="utf-8")
     else:
         prompt_prefix = cast(str, prompt)
     agent_selected = agent
-    keep_material_in_separate_file_input = keep_separate
-    prompt_material_re_splitted = chunk_prompts(prompt_material_path, tasks_per_prompt=tasks_per_prompt, joiner=separator)
     if agents_dir is None: agents_dir = repo_root / ".ai" / f"tmp_prompts/{job_name}_{randstr()}"
     else:
         import shutil
         if agents_dir.exists():
             shutil.rmtree(agents_dir)
-    prep_agent_launch(agents_dir=agents_dir, prompts_material=prompt_material_re_splitted, keep_material_in_separate_file=keep_material_in_separate_file_input, prompt_prefix=prompt_prefix, agent=agent_selected, job_name=job_name)
+    prep_agent_launch(repo_root=repo_root, agents_dir=agents_dir, prompts_material=prompt_material_re_splitted,
+                      keep_material_in_separate_file=separate,
+                      prompt_prefix=prompt_prefix, machine=host, agent=agent_selected, model=model, provider=provider,
+                      job_name=job_name)
     layoutfile = get_agents_launch_layout(session_root=agents_dir)    
     regenerate_py_code = f"""
-#!/usr/bin/env uv run --python 3.13 --with machineconfig
-#!/usr/bin/env uv run --no-dev --project $HOME/code/machineconfig
-fire_agents create --context-path "{prompt_material_path}" \\
-    --{search_strategy} "{context_path or keyword_search or filename_pattern}" \\
+#!/usr/bin/env uv run --python 3.14 --with machineconfig
+agents create "{context_path_resolved}" \\
     --prompt-path "{prompt_path or ''}" \\
     --agent "{agent_selected}" \\
+    --host "{host}" \\
     --job-name "{job_name}" \\
-    --tasks-per-prompt {tasks_per_prompt} \\
+    --agent_load {agent_load} \\
     --separator "{separator}" \\
-    {"--keep-separate" if keep_material_in_separate_file_input else ""}
+    {"--separate" if separate else ""}
 """
-    (agents_dir / "aa_agents_relaunch.py").write_text(data=regenerate_py_code, encoding="utf-8")
+    (agents_dir / "aa_agents_relaunch.sh").write_text(data=regenerate_py_code, encoding="utf-8")
     layout_output_path = output_path if output_path is not None else agents_dir / "layout.json"
     layout_output_path.parent.mkdir(parents=True, exist_ok=True)
     layout_output_path.write_text(data=json.dumps(layoutfile, indent=4), encoding="utf-8")
@@ -114,15 +94,15 @@ fire_agents create --context-path "{prompt_material_path}" \\
 
 
 def collect(
-    agent_dir: Path = typer.Argument(..., help="Path to the agent directory containing the prompts folder"),
-    output_path: Path = typer.Argument(..., help="Path to write the concatenated material files"),
-    separator: str = typer.Option("\n", help="Separator to use when concatenating material files"),
+    agent_dir: Annotated[str, typer.Argument(..., help="Path to the agent directory containing the prompts folder")],
+    output_path: Annotated[str, typer.Argument(..., help="Path to write the concatenated material files")],
+    separator: Annotated[str, typer.Option(..., help="Separator to use when concatenating material files")] = "\n",
 ) -> None:
     """Collect all material files from an agent directory and concatenate them."""
-    if not agent_dir.exists() or not agent_dir.is_dir():
+    if not Path(agent_dir).exists() or not Path(agent_dir).is_dir():
         raise typer.BadParameter(f"Agent directory does not exist or is not a directory: {agent_dir}")
     
-    prompts_dir = agent_dir / "prompts"
+    prompts_dir = Path(agent_dir) / "prompts"
     if not prompts_dir.exists():
         raise typer.BadParameter(f"Prompts directory not found: {prompts_dir}")
     
@@ -149,36 +129,18 @@ def collect(
     result = separator.join(concatenated_content)
     
     # Write to output file
-    output_path.parent.mkdir(parents=True, exist_ok=True)
-    output_path.write_text(result, encoding="utf-8")
+    Path(output_path).parent.mkdir(parents=True, exist_ok=True)
+    Path(output_path).write_text(result, encoding="utf-8")
     typer.echo(f"Concatenated material written to {output_path}")
 
 
 def template():
-    template_bash = """#!/bin/bash
-JOB_NAME="outpatient_mapping"
-REPO_ROOT="$HOME/code/work/winter_planning/"
-CONTEXT_PATH="$REPO_ROOT/data/outpatient_mapping/op_services_collected.csv"
-PROMPT_PATH="$REPO_ROOT/data/outpatient_mapping/prompt"
-
-AGENTS_DIR="$REPO_ROOT/.ai/agents/$JOB_NAME"
-LAYOUT_PATH="$REPO_ROOT/.ai/agents/$JOB_NAME/layout_unbalanced.json"
-LAYOUT_BALANCED_PATH="$REPO_ROOT/.ai/agents/$JOB_NAME/layout_balanced.json"
-
-agents create --context-path $CONTEXT_PATH --tasks-per-prompt 10 --agent crush --prompt-path $PROMPT_PATH --keep-separate --output-path $LAYOUT_PATH --agents-dir $AGENTS_DIR
-sessions balance-load $LAYOUT_PATH --max-thresh 6 --breaking-method moreLayouts --thresh-type number  --output-path $LAYOUT_BALANCED_PATH
-
-sessions run $LAYOUT_BALANCED_PATH --kill-upon-completion
-agents collect $AGENTS_DIR "$REPO_ROOT/.ai/agents/$JOB_NAME/collected.txt"
-"""
-    template_powershell = """
-
-"""
     from platform import system
-    if system() == "Linux":
-        template = template_bash
+    import machineconfig.scripts.python.helpers_agents as module
+    if system() == "Linux" or system() == "Darwin":
+        template_path = Path(module.__file__).parent / "templates/template.sh"
     elif system() == "Windows":
-        template = template_powershell
+        template_path = Path(module.__file__).parent / "templates/template.ps1"
     else:
         raise typer.BadParameter(f"Unsupported OS: {system()}")
 
@@ -189,20 +151,47 @@ agents collect $AGENTS_DIR "$REPO_ROOT/.ai/agents/$JOB_NAME/collected.txt"
         raise typer.Exit(1)
     save_path = repo_root / ".ai" / "agents" / "template_fire_agents.sh"
     save_path.parent.mkdir(parents=True, exist_ok=True)
-    save_path.write_text(template, encoding="utf-8")
+    save_path.write_text(template_path.read_text(encoding="utf-8"), encoding="utf-8")
     typer.echo(f"Template bash script written to {save_path}")
 
 
-def main_from_parser():
-    import sys
-    agents_app = typer.Typer(help="🤖 AI Agents management subcommands")
-    agents_app.command("create")(create)
-    agents_app.command("collect")(collect)
-    agents_app.command("template")(template)
-    if len(sys.argv) == 1:
-        agents_app(["--help"])
-    else:
-        agents_app()
+def init_config():
+    from machineconfig.scripts.python.ai.initai import add_ai_configs
+    add_ai_configs(repo_root=Path.cwd())
+
+def get_app():
+    agents_app = typer.Typer(help="🤖 AI Agents management subcommands", no_args_is_help=True, add_help_option=False, add_completion=False)
+    sep = "\n"
+    agents_full_help = f"""
+[c] Create agents layout file, ready to run.
+{sep}
+PROVIDER options: {', '.join(get_args(PROVIDER))}
+{sep}
+AGENT options: {', '.join(get_args(AGENTS))}
+"""
+    agents_app.command("create", no_args_is_help=True, help=agents_full_help)(create)
+    agents_app.command("c", no_args_is_help=True, help="Create agents layout file, ready to run.", hidden=True)(create)
+    agents_app.command("collect", no_args_is_help=True, help="[T] Collect all agent materials into a single file.")(collect)
+    agents_app.command("T", no_args_is_help=True, help="Collect all agent materials into a single file.", hidden=True)(collect)
+    agents_app.command("make-template", no_args_is_help=False, help="[t] Create a template for fire agents")(template)
+    agents_app.command("t", no_args_is_help=False, help="Create a template for fire agents", hidden=True)(template)
+    agents_app.command("make-config", no_args_is_help=False, help="[g] Initialize AI configurations in the current repository")(init_config)
+    agents_app.command("g", no_args_is_help=False, help="Initialize AI configurations in the current repository", hidden=True)(init_config)
+    from machineconfig.scripts.python.ai.generate_files import main
+    agents_app.command("make-todo", no_args_is_help=True, help="[d] Generate a markdown file listing all Python files in the repo")(main)
+    agents_app.command("d", no_args_is_help=True, help="Generate a markdown file listing all Python files in the repo", hidden=True)(main)
+    from machineconfig.scripts.python.ai.generate_files import create_symlink_command
+    agents_app.command(name="make-symlinks", no_args_is_help=True, help="[s] Create symlinks to the current repo in ~/code_copies/")(create_symlink_command)
+    agents_app.command(name="s", no_args_is_help=True, help="Create symlinks to the current repo in ~/code_copies/", hidden=True)(create_symlink_command)
+    return agents_app
+
+
+def main():
+    agents_app = get_app()
+    # from trogon.typer import init_tui
+    # agents_app_tui = init_tui(agents_app)
+    agents_app()
+    # agents_app_tui()
 
 
 if __name__ == "__main__":  # pragma: no cover

machineconfig/scripts/python/ai/command_runner/command_runner.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+TERMINAL_OUTPUT_PATH_RAW="/.ai/terminal/debug/terminal_output_raw.txt"
+TERMINAL_OUTPUT_PATH="/.ai/terminal/debug/terminal_output.txt"
+> $TERMINAL_OUTPUT_PATH
+echo "New run is underway. If you are reading this message, it means the execution has not finished yet, and you will need to wait. Once done you won't see this message and you will see terminal output instead." >> $TERMINAL_OUTPUT_PATH
+echo "Starting new uv run..."
+COLUMNS=200 unbuffer uv run /home/alex/code/bytesense/exchanges/src/exchanges/cli/cli_binance.py b > $TERMINAL_OUTPUT_PATH_RAW 2>&1
+cat $TERMINAL_OUTPUT_PATH_RAW | sed -r "s/\x1B\[[0-9;]*[mK]//g" > $TERMINAL_OUTPUT_PATH
+# watchexec --watch ./.ai/terminal/make_output.sh --watch . -e py -- bash ./.ai/terminal/make_output.sh

machineconfig/scripts/python/ai/command_runner/prompt.txt

@@ -0,0 +1,9 @@
+
+I have started a watch-exec server in my terminal and its working now.
+I have set it up to re-run thi script `.ai/terminal/debug/command_runner.sh` automatically.
+A re-run is triggered upon any change of any python file in the repo, or, any change in the make_output.sh script itself.
+The script redirects the output from terminal to the file ./.ai/debug/terminal_output.txt
+Run takes 50 ms only. So by the time you finish editing any python file or the command runner script, the new output is ready for you to read in that text file,
+this makes it much faster for you to iterate because pulling the terminal and closing it every time is a bit slow.
+Please use the terminal_output.txt as your main iteration driver.
+please fix the mistakes that you can see in terminal output.