Refactor to use command pattern

Author: cpyle0819

aws_doc_sdk_examples_tools/agent/bin/main.py

@@ -0,0 +1,22 @@
+from dataclasses import dataclass
+from pathlib import Path
+from typing import List
+
+class Command:
+    pass
+
+@dataclass 
+class CreatePrompts(Command):
+    root: Path
+    system_prompts: List[str]
+    out_dir: Path
+    language: str
+
+@dataclass
+class RunAilly(Command):
+    batches: List[str]
+
+@dataclass
+class UpdateReservoir(Command):
+    root: Path
+    batches: List[str]

aws_doc_sdk_examples_tools/agent/domain/commands.py

@@ -0,0 +1,97 @@
+from pathlib import Path
+from typing import List
+from typing_extensions import Annotated
+from datetime import datetime
+import logging
+import typer
+
+from aws_doc_sdk_examples_tools.agent.shared_constants import BATCH_PREFIX, AILLY_DIR_PATH
+from aws_doc_sdk_examples_tools.agent.domain import commands
+from aws_doc_sdk_examples_tools.agent.service_layer import messagebus
+
+logging.basicConfig(
+    level=logging.INFO,
+    filename=f"lliam-run-{datetime.now().strftime('%Y%m%d_%H%M%S')}.log",
+    filemode="w",
+)
+
+logger = logging.getLogger(__name__)
+app = typer.Typer(name="Lliam")
+
+@app.command()
+def create_prompts(iam_tributary_root: str, system_prompts: List[str] = []):
+    doc_gen_root = Path(iam_tributary_root)
+    cmd = commands.CreatePrompts(
+        root=doc_gen_root,
+        system_prompts=system_prompts,
+        out_dir=AILLY_DIR_PATH,
+        language="IAMPolicyGrammar"
+    )
+    messagebus.handle(cmd)
+
+@app.command()
+def run_ailly(
+    batch_nums: Annotated[
+        str,
+        typer.Option(
+            help="Batch numbers to process (e.g., '33', '33..35', '33,35,37')"
+        ),
+    ] = None,
+) -> None:
+    """
+    Run ailly to generate IAM policy content and process the results.
+    If batch_nums is specified, only those batches will be processed.
+    If batch_nums is omitted, all batches will be processed.
+    """
+    requested_batches = parse_batch_names(batch_nums)
+    cmd = commands.RunAilly(batches=requested_batches)
+    messagebus.handle(cmd)
+
+@app.command()
+def update_reservoir(
+    iam_tributary_root: str,
+    batch_nums: Annotated[
+        str,
+        typer.Option(
+            help="Batch numbers to process (e.g., '33', '33..35', '33,35,37')"
+        ),
+    ] = None,
+) -> None:
+    """
+    Update the doc_gen reservoir with processed IAM policy updates.
+    If batch_nums is specified, only those batches will be processed.
+    If batch_nums is omitted, all available update files will be processed.
+    """
+    doc_gen_root = Path(iam_tributary_root)
+    batch_names = parse_batch_names(batch_nums) if batch_nums else None
+    cmd = commands.UpdateReservoir(
+        root=doc_gen_root, batches=batch_names
+    )
+    messagebus.handle(cmd)
+
+
+def parse_batch_names(batch_nums_str: str) -> List[str]:
+    """
+    Parse batch numbers from a string.
+    """
+    if not batch_nums_str:
+        return []
+
+    result = []
+    parts = batch_nums_str.split(",")
+
+    for part in parts:
+        part = part.strip()
+        if ".." in part:
+            start, end = part.split("..")
+            start_num = int(start.strip())
+            end_num = int(end.strip())
+            result.extend(range(start_num, end_num + 1))
+        else:
+            result.append(int(part))
+
+    batch_nums = sorted(list(set(result)))
+    return map(lambda b: f"{BATCH_PREFIX}{b:03}", batch_nums)
+
+if __name__ == "__main__":
+    app()

aws_doc_sdk_examples_tools/agent/entry_points/lliam_app.py

@@ -7,6 +7,7 @@
 from pathlib import Path
 from typing import Any, Generator, Iterable, List, Tuple
 
+from aws_doc_sdk_examples_tools.agent.domain.commands import CreatePrompts
 from aws_doc_sdk_examples_tools.agent.shared_constants import BATCH_PREFIX
 from aws_doc_sdk_examples_tools.doc_gen import DocGen, Example
 
@@ -116,12 +117,12 @@ def validate_root_path(doc_gen_root: Path):
 
 
 def make_prompts(
-    doc_gen_root: Path, system_prompts: List[str], out_dir: Path, language: str
+   create_prompts_cmd: CreatePrompts
 ) -> None:
     """Generate prompts and configuration files for Ailly."""
-    validate_root_path(doc_gen_root)
-    out_dir.mkdir(parents=True, exist_ok=True)
+    validate_root_path(create_prompts_cmd.root)
+    create_prompts_cmd.out_dir.mkdir(parents=True, exist_ok=True)
     system_prompts = read_files(system_prompts)
-    setup_ailly(system_prompts, out_dir)
-    doc_gen = make_doc_gen(doc_gen_root)
-    write_prompts(doc_gen=doc_gen, out_dir=out_dir, language=language)
+    setup_ailly(system_prompts, create_prompts_cmd.out_dir)
+    doc_gen = make_doc_gen(create_prompts_cmd.doc_gen_root)
+    write_prompts(doc_gen=doc_gen, out_dir=create_prompts_cmd.out_dir, language=create_prompts_cmd.language)

aws_doc_sdk_examples_tools/agent/service_layer/__init__.py

@@ -0,0 +1,28 @@
+from typing import List
+
+from aws_doc_sdk_examples_tools.agent.domain import commands
+from aws_doc_sdk_examples_tools.agent.service_layer import make_prompts, update_doc_gen, run_ailly
+
+# Only handling Commands for now.
+Message = commands.Command
+
+def handle(message: commands.Command):
+    queue = [message]
+
+    while queue:
+        message = queue.pop(0)
+        if isinstance(message, commands.Command):
+            # Pass queue and UoW here if we implement the UoW pattern.
+            handle_command(message)
+        else:
+            raise Exception(f"{message} was not a Command")
+        
+def handle_command(command: commands.Command):
+    handler = COMMAND_HANDLERS[type(command)]
+    handler(command)
+
+COMMAND_HANDLERS = {
+    commands.CreatePrompts: make_prompts.make_prompts,
+    commands.RunAilly: run_ailly.handle_run_ailly,
+    commands.UpdateReservoir: update_doc_gen.handle_update_reservoir
+}