generated from amazon-archives/__template_Apache-2.0
-
Notifications
You must be signed in to change notification settings - Fork 16
Add Lliam UoW #177
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Add Lliam UoW #177
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
0a5488f
Add UoW and adapters to Lliam
cpyle0819 3d4d68b
Fix bad bath in services_test
cpyle0819 5fd05d3
Update Lliam repository to allow injectable FS
cpyle0819 d40e692
Remove ABC's
cpyle0819 cbaacfa
Make batch num padding dynamic, and clean up a few things.
cpyle0819 b0821f0
Add repository test.
cpyle0819 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
170 changes: 170 additions & 0 deletions
170
aws_doc_sdk_examples_tools/lliam/adapters/repository.py
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,170 @@ | ||
| import abc | ||
| from itertools import islice | ||
| from pathlib import Path | ||
| from typing import Any, Generator, Iterable, List, Tuple | ||
|
|
||
| from aws_doc_sdk_examples_tools.doc_gen import DocGen, Example | ||
| from aws_doc_sdk_examples_tools.fs import Fs, PathFs | ||
| from aws_doc_sdk_examples_tools.lliam.domain.model import Prompt | ||
| from aws_doc_sdk_examples_tools.lliam.shared_constants import BATCH_PREFIX | ||
|
|
||
| DEFAULT_METADATA_PREFIX = "DEFAULT" | ||
| DEFAULT_BATCH_SIZE = 150 | ||
| IAM_POLICY_LANGUAGE = "IAMPolicyGrammar" | ||
|
|
||
|
|
||
| def batched(iterable: Iterable, n: int) -> Generator[Tuple, Any, None]: | ||
| "Batch data into tuples of length n. The last batch may be shorter." | ||
| # batched('ABCDEFG', 3) --> ABC DEF G | ||
| if n < 1: | ||
| raise ValueError("n must be at least one") | ||
| it = iter(iterable) | ||
| while batch := tuple(islice(it, n)): | ||
| yield batch | ||
|
|
||
|
|
||
| class AbstractPromptRepository(abc.ABC): | ||
| def __init__(self): | ||
| self.to_write = {} | ||
|
|
||
| def add(self, prompt: Prompt): | ||
| self._add(prompt) | ||
|
|
||
| def all_all(self, prompts: List[Prompt]): | ||
| for prompt in prompts: | ||
| self._add(prompt) | ||
|
|
||
| def batch(self, prompts: List[Prompt]): | ||
| self._batch(prompts) | ||
|
|
||
| def commit(self): | ||
| self._commit() | ||
|
|
||
| def get(self, id: str) -> Prompt: | ||
| prompt = self._get(id) | ||
| return prompt | ||
|
|
||
| def get_all(self, ids: List[str]) -> List[Prompt]: | ||
| prompts = [] | ||
| for id in ids: | ||
| prompt = self._get(id) | ||
| prompts.append(prompt) | ||
| return prompts | ||
|
|
||
| def set_partition(self, name: str): | ||
| self.partition_name = name | ||
|
|
||
| @property | ||
| def partition(self): | ||
| return self.partition_name or "" | ||
|
|
||
| @abc.abstractmethod | ||
| def _add(self, product: Prompt): | ||
| raise NotImplementedError | ||
|
|
||
| @abc.abstractmethod | ||
| def _batch(self, prompts: List[Prompt]): | ||
| raise NotImplementedError | ||
|
|
||
| @abc.abstractmethod | ||
| def _commit(self): | ||
| raise NotImplementedError | ||
|
|
||
| @abc.abstractmethod | ||
| def _get(self, id: str) -> Prompt: | ||
| raise NotImplementedError | ||
|
|
||
|
|
||
| class FsPromptRepository(AbstractPromptRepository): | ||
| def __init__(self, fs: Fs = PathFs()): | ||
| super().__init__() | ||
| self.fs = fs | ||
|
|
||
| def rollback(self): | ||
| # TODO: This is not what rollback is for. We should be rolling back any | ||
| # file changes | ||
| self.to_write = {} | ||
|
|
||
| def _add(self, prompt: Prompt): | ||
| self.to_write[prompt.id] = prompt.content | ||
|
|
||
| def _batch(self, prompts: List[Prompt]): | ||
| for batch_num, batch in enumerate(batched(prompts, DEFAULT_BATCH_SIZE)): | ||
| batch_name = f"{BATCH_PREFIX}{(batch_num + 1):03}" | ||
| for prompt in batch: | ||
| prompt.id = f"{batch_name}/{prompt.id}" | ||
| self._add(prompt) | ||
|
|
||
| def _commit(self): | ||
| base_path = ( | ||
| Path(self.partition) if self.partition else Path(".") | ||
| ) | ||
|
|
||
| for file_path, content in self.to_write.items(): | ||
cpyle0819 marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| if content: | ||
| full_path = base_path / file_path | ||
| self.fs.mkdir(full_path.parent) | ||
| self.fs.write(full_path, content) | ||
|
|
||
| def _get(self, id: str): | ||
| return Prompt(id, self.fs.read(Path(id))) | ||
|
|
||
|
|
||
| class AbstractDocGenRepository(abc.ABC): | ||
cpyle0819 marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| def get_new_prompts(self, doc_gen_root: str) -> List[Prompt]: | ||
| return self._get_new_prompts(doc_gen_root) | ||
|
|
||
| @abc.abstractmethod | ||
| def _get_new_prompts(self, doc_gen_root: str) -> List[Prompt]: | ||
| raise NotImplementedError | ||
|
|
||
|
|
||
| class FsDocGenRepository(AbstractDocGenRepository): | ||
| def __init__(self, fs: Fs = PathFs()): | ||
| super().__init__() | ||
| self.fs = fs | ||
|
|
||
| def rollback(self): | ||
| # TODO: This is not what rollback is for. We should be rolling back any | ||
| # file changes | ||
| self._doc_gen = None | ||
|
|
||
| def _get_new_prompts(self, doc_gen_root: str) -> List[Prompt]: | ||
| # Right now this is the only instance of DocGen used in this Repository, | ||
| # but if that changes we need to move it up. | ||
| self._doc_gen = DocGen.from_root(Path(doc_gen_root), fs=self.fs) | ||
| self._doc_gen.collect_snippets() | ||
| new_examples = self._get_new_examples() | ||
| prompts = self._examples_to_prompts(new_examples) | ||
| return prompts | ||
|
|
||
| def _get_new_examples(self) -> List[Tuple[str, Example]]: | ||
| examples = self._doc_gen.examples | ||
|
|
||
| filtered_examples: List[Tuple[str, Example]] = [] | ||
| for example_id, example in examples.items(): | ||
| # TCXContentAnalyzer prefixes new metadata title/title_abbrev entries with | ||
| # the DEFAULT_METADATA_PREFIX. Checking this here to make sure we're only | ||
| # running the LLM tool on new extractions. | ||
| title = example.title or "" | ||
| title_abbrev = example.title_abbrev or "" | ||
| if title.startswith(DEFAULT_METADATA_PREFIX) and title_abbrev.startswith( | ||
| DEFAULT_METADATA_PREFIX | ||
| ): | ||
| filtered_examples.append((example_id, example)) | ||
| return filtered_examples | ||
|
|
||
| def _examples_to_prompts(self, examples: List[Tuple[str, Example]]) -> List[Prompt]: | ||
| snippets = self._doc_gen.snippets | ||
| prompts = [] | ||
| for example_id, example in examples: | ||
| key = ( | ||
| example.languages[IAM_POLICY_LANGUAGE] | ||
| .versions[0] | ||
| .excerpts[0] | ||
| .snippet_files[0] | ||
| .replace("/", ".") | ||
| ) | ||
| snippet = snippets.get(key) | ||
| prompts.append(Prompt(f"{example_id}.md", snippet.code)) | ||
| return prompts | ||
Empty file.
20 changes: 20 additions & 0 deletions
20
aws_doc_sdk_examples_tools/lliam/service_layer/create_prompts.py
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| import logging | ||
|
|
||
| from aws_doc_sdk_examples_tools.lliam.domain.operations import build_ailly_config | ||
| from aws_doc_sdk_examples_tools.lliam.domain.commands import CreatePrompts | ||
| from aws_doc_sdk_examples_tools.lliam.service_layer.unit_of_work import ( | ||
| AbstractUnitOfWork, | ||
| ) | ||
|
|
||
| logger = logging.getLogger(__name__) | ||
|
|
||
|
|
||
| def create_prompts(cmd: CreatePrompts, uow: AbstractUnitOfWork): | ||
| with uow: | ||
| system_prompts = uow.prompts.get_all(cmd.system_prompts) | ||
| ailly_config = build_ailly_config(system_prompts) | ||
| prompts = uow.doc_gen.get_new_prompts(cmd.doc_gen_root) | ||
| uow.prompts.batch(prompts) | ||
| uow.prompts.add(ailly_config) | ||
| uow.prompts.set_partition(cmd.out_dir) | ||
| uow.commit() |
52 changes: 52 additions & 0 deletions
52
aws_doc_sdk_examples_tools/lliam/service_layer/unit_of_work.py
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| import abc | ||
|
|
||
| from aws_doc_sdk_examples_tools.lliam.adapters.repository import ( | ||
| AbstractPromptRepository, | ||
| AbstractDocGenRepository, | ||
| FsPromptRepository, | ||
| FsDocGenRepository, | ||
| ) | ||
|
|
||
|
|
||
| class AbstractUnitOfWork(abc.ABC): | ||
| prompts: AbstractPromptRepository | ||
| doc_gen: AbstractDocGenRepository | ||
|
|
||
| def __enter__(self) -> "AbstractUnitOfWork": | ||
| return self | ||
|
|
||
| def __exit__(self, *args): | ||
| self.rollback() | ||
|
|
||
| def commit(self): | ||
| self._commit() | ||
|
|
||
| def collect_new_prompts(self): | ||
cpyle0819 marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| for prompt in self.prompts.seen: | ||
cpyle0819 marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| yield prompt | ||
|
|
||
| @abc.abstractmethod | ||
| def _commit(self): | ||
| raise NotImplementedError | ||
|
|
||
| @abc.abstractmethod | ||
| def rollback(self): | ||
| raise NotImplementedError | ||
|
|
||
|
|
||
| class FsUnitOfWork(AbstractUnitOfWork): | ||
|
|
||
| def __enter__(self): | ||
| self.prompts = FsPromptRepository() | ||
| self.doc_gen = FsDocGenRepository() | ||
| return super().__enter__() | ||
|
|
||
| def __exit__(self, *args): | ||
| super().__exit__(*args) | ||
|
|
||
| def _commit(self): | ||
| self.prompts.commit() | ||
|
|
||
| def rollback(self): | ||
| self.prompts.rollback() | ||
| self.doc_gen.rollback() | ||
cpyle0819 marked this conversation as resolved.
Show resolved
Hide resolved
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| from pathlib import Path | ||
|
|
||
| AILLY_DIR = ".ailly_iam_policy" | ||
| AILLY_DIR_PATH = Path(AILLY_DIR) | ||
| BATCH_PREFIX = "batch_" |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| from pathlib import Path | ||
|
|
||
| from aws_doc_sdk_examples_tools.fs import Fs, RecordFs | ||
| from aws_doc_sdk_examples_tools.lliam.domain.commands import CreatePrompts | ||
| from aws_doc_sdk_examples_tools.lliam.service_layer.create_prompts import create_prompts | ||
| from aws_doc_sdk_examples_tools.lliam.service_layer.unit_of_work import AbstractUnitOfWork | ||
| from aws_doc_sdk_examples_tools.lliam.adapters.repository import ( | ||
| FsPromptRepository, | ||
| FsDocGenRepository, | ||
| ) | ||
|
|
||
|
|
||
| class FakeUnitOfWork(AbstractUnitOfWork): | ||
| def __init__(self, fs: Fs): | ||
| self.prompts = FsPromptRepository(fs=fs) | ||
| self.doc_gen = FsDocGenRepository(fs=fs) | ||
| self.committed = False | ||
|
|
||
| def _commit(self): | ||
| self.committed = True | ||
| self.prompts.commit() | ||
|
|
||
| def rollback(self): | ||
| self.committed = False | ||
| self.prompts.rollback() | ||
| self.doc_gen.rollback() | ||
|
|
||
|
|
||
| def test_create_prompts_writes_when_commit_called(): | ||
| """Test that create_prompts successfully writes prompts when commit is called.""" | ||
| fs = RecordFs({ | ||
| Path("system1.md"): "System prompt 1 content", | ||
| Path("system2.md"): "System prompt 2 content", | ||
| Path("fake/doc_gen_root"): "" | ||
| }) | ||
| uow = FakeUnitOfWork(fs=fs) | ||
| cmd = CreatePrompts( | ||
| doc_gen_root="fake/doc_gen_root", | ||
| system_prompts=["system1.md", "system2.md"], | ||
| out_dir="/fake/output" | ||
| ) | ||
|
|
||
| create_prompts(cmd, uow) | ||
|
|
||
| # Ailly config should be in committed prompts | ||
| ailly_config_path = Path("/fake/output/.aillyrc") | ||
| assert fs.stat(ailly_config_path).exists | ||
| ailly_config_content = fs.read(ailly_config_path) | ||
| assert "System prompt 1 content" in ailly_config_content | ||
| assert "System prompt 2 content" in ailly_config_content |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.