fabricatio 0.2.6.dev0__tar.gz → 0.2.6.dev1__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {fabricatio-0.2.6.dev0 → fabricatio-0.2.6.dev1}/PKG-INFO +3 -3
- {fabricatio-0.2.6.dev0 → fabricatio-0.2.6.dev1}/README.md +2 -2
- {fabricatio-0.2.6.dev0 → fabricatio-0.2.6.dev1}/examples/minor/hello_fabricatio.py +1 -1
- fabricatio-0.2.6.dev1/examples/minor/write_a_poem.py +36 -0
- {fabricatio-0.2.6.dev0 → fabricatio-0.2.6.dev1}/examples/reviewer/review.py +1 -1
- {fabricatio-0.2.6.dev0 → fabricatio-0.2.6.dev1}/pyproject.toml +1 -1
- {fabricatio-0.2.6.dev0 → fabricatio-0.2.6.dev1}/python/fabricatio/__init__.py +6 -6
- {fabricatio-0.2.6.dev0 → fabricatio-0.2.6.dev1}/python/fabricatio/_rust_instances.py +1 -1
- fabricatio-0.2.6.dev1/python/fabricatio/capabilities/correct.py +103 -0
- {fabricatio-0.2.6.dev0 → fabricatio-0.2.6.dev1}/python/fabricatio/capabilities/rag.py +3 -3
- {fabricatio-0.2.6.dev0 → fabricatio-0.2.6.dev1}/python/fabricatio/capabilities/rating.py +8 -8
- {fabricatio-0.2.6.dev0 → fabricatio-0.2.6.dev1}/python/fabricatio/capabilities/review.py +53 -16
- {fabricatio-0.2.6.dev0 → fabricatio-0.2.6.dev1}/python/fabricatio/capabilities/task.py +2 -2
- {fabricatio-0.2.6.dev0 → fabricatio-0.2.6.dev1}/python/fabricatio/config.py +14 -5
- {fabricatio-0.2.6.dev0 → fabricatio-0.2.6.dev1}/python/fabricatio/fs/__init__.py +2 -2
- {fabricatio-0.2.6.dev0 → fabricatio-0.2.6.dev1}/python/fabricatio/fs/readers.py +1 -1
- {fabricatio-0.2.6.dev0 → fabricatio-0.2.6.dev1}/python/fabricatio/journal.py +0 -7
- {fabricatio-0.2.6.dev0 → fabricatio-0.2.6.dev1}/python/fabricatio/models/action.py +2 -2
- {fabricatio-0.2.6.dev0 → fabricatio-0.2.6.dev1}/python/fabricatio/models/generic.py +14 -6
- {fabricatio-0.2.6.dev0 → fabricatio-0.2.6.dev1}/python/fabricatio/models/kwargs_types.py +2 -2
- {fabricatio-0.2.6.dev0 → fabricatio-0.2.6.dev1}/python/fabricatio/models/role.py +2 -2
- {fabricatio-0.2.6.dev0 → fabricatio-0.2.6.dev1}/python/fabricatio/models/task.py +2 -2
- {fabricatio-0.2.6.dev0 → fabricatio-0.2.6.dev1}/python/fabricatio/models/usages.py +26 -6
- {fabricatio-0.2.6.dev0 → fabricatio-0.2.6.dev1}/python/fabricatio/models/utils.py +21 -0
- {fabricatio-0.2.6.dev0 → fabricatio-0.2.6.dev1}/python/fabricatio/parser.py +13 -5
- fabricatio-0.2.6.dev1/templates/built-in/correct.hbs +15 -0
- fabricatio-0.2.6.dev1/templates/built-in/generic_string.hbs +30 -0
- fabricatio-0.2.6.dev1/templates.tar.gz +0 -0
- {fabricatio-0.2.6.dev0 → fabricatio-0.2.6.dev1}/uv.lock +1 -1
- fabricatio-0.2.6.dev0/templates.tar.gz +0 -0
- {fabricatio-0.2.6.dev0 → fabricatio-0.2.6.dev1}/.github/workflows/build-package.yaml +0 -0
- {fabricatio-0.2.6.dev0 → fabricatio-0.2.6.dev1}/.github/workflows/ruff.yaml +0 -0
- {fabricatio-0.2.6.dev0 → fabricatio-0.2.6.dev1}/.github/workflows/tests.yaml +0 -0
- {fabricatio-0.2.6.dev0 → fabricatio-0.2.6.dev1}/.gitignore +0 -0
- {fabricatio-0.2.6.dev0 → fabricatio-0.2.6.dev1}/.python-version +0 -0
- {fabricatio-0.2.6.dev0 → fabricatio-0.2.6.dev1}/Cargo.lock +0 -0
- {fabricatio-0.2.6.dev0 → fabricatio-0.2.6.dev1}/Cargo.toml +0 -0
- {fabricatio-0.2.6.dev0 → fabricatio-0.2.6.dev1}/LICENSE +0 -0
- {fabricatio-0.2.6.dev0 → fabricatio-0.2.6.dev1}/Makefile +0 -0
- {fabricatio-0.2.6.dev0 → fabricatio-0.2.6.dev1}/examples/extract_and_review/.gitignore +0 -0
- {fabricatio-0.2.6.dev0 → fabricatio-0.2.6.dev1}/examples/extract_and_review/extract_and_review.py +0 -0
- {fabricatio-0.2.6.dev0 → fabricatio-0.2.6.dev1}/examples/extract_article/extract.py +0 -0
- {fabricatio-0.2.6.dev0 → fabricatio-0.2.6.dev1}/examples/llm_usages/llm_usage.py +0 -0
- {fabricatio-0.2.6.dev0 → fabricatio-0.2.6.dev1}/examples/make_a_rating/rating.py +0 -0
- {fabricatio-0.2.6.dev0 → fabricatio-0.2.6.dev1}/examples/make_diary/commits.json +0 -0
- {fabricatio-0.2.6.dev0 → fabricatio-0.2.6.dev1}/examples/make_diary/diary.py +0 -0
- {fabricatio-0.2.6.dev0 → fabricatio-0.2.6.dev1}/examples/propose_task/propose.py +0 -0
- {fabricatio-0.2.6.dev0 → fabricatio-0.2.6.dev1}/examples/simple_chat/chat.py +0 -0
- {fabricatio-0.2.6.dev0 → fabricatio-0.2.6.dev1}/examples/simple_rag/simple_rag.py +0 -0
- {fabricatio-0.2.6.dev0 → fabricatio-0.2.6.dev1}/examples/task_handle/handle_task.py +0 -0
- {fabricatio-0.2.6.dev0 → fabricatio-0.2.6.dev1}/examples/write_outline/.gitignore +0 -0
- {fabricatio-0.2.6.dev0 → fabricatio-0.2.6.dev1}/examples/write_outline/write_outline.py +0 -0
- {fabricatio-0.2.6.dev0 → fabricatio-0.2.6.dev1}/python/fabricatio/_rust.pyi +0 -0
- {fabricatio-0.2.6.dev0 → fabricatio-0.2.6.dev1}/python/fabricatio/actions/article.py +0 -0
- {fabricatio-0.2.6.dev0 → fabricatio-0.2.6.dev1}/python/fabricatio/actions/output.py +0 -0
- {fabricatio-0.2.6.dev0 → fabricatio-0.2.6.dev1}/python/fabricatio/actions/rag.py +0 -0
- {fabricatio-0.2.6.dev0 → fabricatio-0.2.6.dev1}/python/fabricatio/capabilities/propose.py +0 -0
- {fabricatio-0.2.6.dev0 → fabricatio-0.2.6.dev1}/python/fabricatio/core.py +0 -0
- {fabricatio-0.2.6.dev0 → fabricatio-0.2.6.dev1}/python/fabricatio/decorators.py +0 -0
- {fabricatio-0.2.6.dev0 → fabricatio-0.2.6.dev1}/python/fabricatio/fs/curd.py +0 -0
- {fabricatio-0.2.6.dev0 → fabricatio-0.2.6.dev1}/python/fabricatio/models/events.py +0 -0
- {fabricatio-0.2.6.dev0 → fabricatio-0.2.6.dev1}/python/fabricatio/models/extra.py +0 -0
- {fabricatio-0.2.6.dev0 → fabricatio-0.2.6.dev1}/python/fabricatio/models/tool.py +0 -0
- {fabricatio-0.2.6.dev0 → fabricatio-0.2.6.dev1}/python/fabricatio/py.typed +0 -0
- {fabricatio-0.2.6.dev0 → fabricatio-0.2.6.dev1}/python/fabricatio/toolboxes/__init__.py +0 -0
- {fabricatio-0.2.6.dev0 → fabricatio-0.2.6.dev1}/python/fabricatio/toolboxes/arithmetic.py +0 -0
- {fabricatio-0.2.6.dev0 → fabricatio-0.2.6.dev1}/python/fabricatio/toolboxes/fs.py +0 -0
- {fabricatio-0.2.6.dev0 → fabricatio-0.2.6.dev1}/python/fabricatio/workflows/articles.py +0 -0
- {fabricatio-0.2.6.dev0 → fabricatio-0.2.6.dev1}/python/fabricatio/workflows/rag.py +0 -0
- {fabricatio-0.2.6.dev0 → fabricatio-0.2.6.dev1}/src/bib_tools.rs +0 -0
- {fabricatio-0.2.6.dev0 → fabricatio-0.2.6.dev1}/src/hash.rs +0 -0
- {fabricatio-0.2.6.dev0 → fabricatio-0.2.6.dev1}/src/hbs_helpers.rs +0 -0
- {fabricatio-0.2.6.dev0 → fabricatio-0.2.6.dev1}/src/lib.rs +0 -0
- {fabricatio-0.2.6.dev0 → fabricatio-0.2.6.dev1}/src/templates.rs +0 -0
- {fabricatio-0.2.6.dev0 → fabricatio-0.2.6.dev1}/templates/built-in/binary-exploitation-ctf-solver.hbs +0 -0
- {fabricatio-0.2.6.dev0 → fabricatio-0.2.6.dev1}/templates/built-in/claude-xml.hbs +0 -0
- {fabricatio-0.2.6.dev0 → fabricatio-0.2.6.dev1}/templates/built-in/clean-up-code.hbs +0 -0
- {fabricatio-0.2.6.dev0 → fabricatio-0.2.6.dev1}/templates/built-in/create_json_obj.hbs +0 -0
- {fabricatio-0.2.6.dev0 → fabricatio-0.2.6.dev1}/templates/built-in/cryptography-ctf-solver.hbs +0 -0
- {fabricatio-0.2.6.dev0 → fabricatio-0.2.6.dev1}/templates/built-in/dependencies.hbs +0 -0
- {fabricatio-0.2.6.dev0 → fabricatio-0.2.6.dev1}/templates/built-in/document-the-code.hbs +0 -0
- {fabricatio-0.2.6.dev0 → fabricatio-0.2.6.dev1}/templates/built-in/draft_rating_criteria.hbs +0 -0
- {fabricatio-0.2.6.dev0 → fabricatio-0.2.6.dev1}/templates/built-in/draft_rating_manual.hbs +0 -0
- {fabricatio-0.2.6.dev0 → fabricatio-0.2.6.dev1}/templates/built-in/draft_rating_weights_klee.hbs +0 -0
- {fabricatio-0.2.6.dev0 → fabricatio-0.2.6.dev1}/templates/built-in/draft_tool_usage_code.hbs +0 -0
- {fabricatio-0.2.6.dev0 → fabricatio-0.2.6.dev1}/templates/built-in/extract_criteria_from_reasons.hbs +0 -0
- {fabricatio-0.2.6.dev0 → fabricatio-0.2.6.dev1}/templates/built-in/extract_reasons_from_examples.hbs +0 -0
- {fabricatio-0.2.6.dev0 → fabricatio-0.2.6.dev1}/templates/built-in/find-security-vulnerabilities.hbs +0 -0
- {fabricatio-0.2.6.dev0 → fabricatio-0.2.6.dev1}/templates/built-in/fix-bugs.hbs +0 -0
- {fabricatio-0.2.6.dev0 → fabricatio-0.2.6.dev1}/templates/built-in/improve-performance.hbs +0 -0
- {fabricatio-0.2.6.dev0 → fabricatio-0.2.6.dev1}/templates/built-in/liststr.hbs +0 -0
- {fabricatio-0.2.6.dev0 → fabricatio-0.2.6.dev1}/templates/built-in/make_choice.hbs +0 -0
- {fabricatio-0.2.6.dev0 → fabricatio-0.2.6.dev1}/templates/built-in/make_judgment.hbs +0 -0
- {fabricatio-0.2.6.dev0 → fabricatio-0.2.6.dev1}/templates/built-in/pathstr.hbs +0 -0
- {fabricatio-0.2.6.dev0 → fabricatio-0.2.6.dev1}/templates/built-in/rate_fine_grind.hbs +0 -0
- {fabricatio-0.2.6.dev0 → fabricatio-0.2.6.dev1}/templates/built-in/refactor.hbs +0 -0
- {fabricatio-0.2.6.dev0 → fabricatio-0.2.6.dev1}/templates/built-in/refined_query.hbs +0 -0
- {fabricatio-0.2.6.dev0 → fabricatio-0.2.6.dev1}/templates/built-in/retrieved_display.hbs +0 -0
- {fabricatio-0.2.6.dev0 → fabricatio-0.2.6.dev1}/templates/built-in/reverse-engineering-ctf-solver.hbs +0 -0
- {fabricatio-0.2.6.dev0 → fabricatio-0.2.6.dev1}/templates/built-in/review_string.hbs +0 -0
- {fabricatio-0.2.6.dev0 → fabricatio-0.2.6.dev1}/templates/built-in/task_briefing.hbs +0 -0
- {fabricatio-0.2.6.dev0 → fabricatio-0.2.6.dev1}/templates/built-in/web-ctf-solver.hbs +0 -0
- {fabricatio-0.2.6.dev0 → fabricatio-0.2.6.dev1}/templates/built-in/write-git-commit.hbs +0 -0
- {fabricatio-0.2.6.dev0 → fabricatio-0.2.6.dev1}/templates/built-in/write-github-pull-request.hbs +0 -0
- {fabricatio-0.2.6.dev0 → fabricatio-0.2.6.dev1}/templates/built-in/write-github-readme.hbs +0 -0
- {fabricatio-0.2.6.dev0 → fabricatio-0.2.6.dev1}/tests/test_config.py +0 -0
- {fabricatio-0.2.6.dev0 → fabricatio-0.2.6.dev1}/tests/test_models/test_action.py +0 -0
- {fabricatio-0.2.6.dev0 → fabricatio-0.2.6.dev1}/tests/test_models/test_advanced.py +0 -0
- {fabricatio-0.2.6.dev0 → fabricatio-0.2.6.dev1}/tests/test_models/test_generic.py +0 -0
- {fabricatio-0.2.6.dev0 → fabricatio-0.2.6.dev1}/tests/test_models/test_role.py +0 -0
- {fabricatio-0.2.6.dev0 → fabricatio-0.2.6.dev1}/tests/test_models/test_task.py +0 -0
- {fabricatio-0.2.6.dev0 → fabricatio-0.2.6.dev1}/tests/test_models/test_tool.py +0 -0
- {fabricatio-0.2.6.dev0 → fabricatio-0.2.6.dev1}/tests/test_models/test_usages.py +0 -0
@@ -1,6 +1,6 @@
|
|
1
1
|
Metadata-Version: 2.4
|
2
2
|
Name: fabricatio
|
3
|
-
Version: 0.2.6.
|
3
|
+
Version: 0.2.6.dev1
|
4
4
|
Classifier: License :: OSI Approved :: MIT License
|
5
5
|
Classifier: Programming Language :: Rust
|
6
6
|
Classifier: Programming Language :: Python :: 3.12
|
@@ -176,7 +176,7 @@ if __name__ == "__main__":
|
|
176
176
|
### Template Management and Rendering
|
177
177
|
|
178
178
|
```python
|
179
|
-
from fabricatio._rust_instances import
|
179
|
+
from fabricatio._rust_instances import TEMPLATE_MANAGER
|
180
180
|
|
181
181
|
template_name = "claude-xml.hbs"
|
182
182
|
data = {
|
@@ -185,7 +185,7 @@ data = {
|
|
185
185
|
"files": [{"path": "file1.py", "code": "print('Hello')"}],
|
186
186
|
}
|
187
187
|
|
188
|
-
rendered_template =
|
188
|
+
rendered_template = TEMPLATE_MANAGER.render_template(template_name, data)
|
189
189
|
print(rendered_template)
|
190
190
|
```
|
191
191
|
|
@@ -137,7 +137,7 @@ if __name__ == "__main__":
|
|
137
137
|
### Template Management and Rendering
|
138
138
|
|
139
139
|
```python
|
140
|
-
from fabricatio._rust_instances import
|
140
|
+
from fabricatio._rust_instances import TEMPLATE_MANAGER
|
141
141
|
|
142
142
|
template_name = "claude-xml.hbs"
|
143
143
|
data = {
|
@@ -146,7 +146,7 @@ data = {
|
|
146
146
|
"files": [{"path": "file1.py", "code": "print('Hello')"}],
|
147
147
|
}
|
148
148
|
|
149
|
-
rendered_template =
|
149
|
+
rendered_template = TEMPLATE_MANAGER.render_template(template_name, data)
|
150
150
|
print(rendered_template)
|
151
151
|
```
|
152
152
|
|
@@ -0,0 +1,36 @@
|
|
1
|
+
"""Example of a poem writing program using fabricatio."""
|
2
|
+
|
3
|
+
import asyncio
|
4
|
+
from typing import Any
|
5
|
+
|
6
|
+
from fabricatio import Action, Role, Task, WorkFlow, logger
|
7
|
+
|
8
|
+
task = Task(name="write poem")
|
9
|
+
|
10
|
+
|
11
|
+
class WritePoem(Action):
|
12
|
+
"""Action that generates a poem."""
|
13
|
+
|
14
|
+
output_key: str = "task_output"
|
15
|
+
|
16
|
+
async def _execute(self, **_) -> Any:
|
17
|
+
logger.info("Generating poem about the sea")
|
18
|
+
return await self.ageneric_string(
|
19
|
+
"Write a poetic and evocative poem about the sea, its vastness, and mysteries.",
|
20
|
+
)
|
21
|
+
|
22
|
+
|
23
|
+
async def main() -> None:
|
24
|
+
"""Main function."""
|
25
|
+
Role(
|
26
|
+
name="poet",
|
27
|
+
description="A role that creates poetic content",
|
28
|
+
registry={task.pending_label: WorkFlow(name="poetry_creation", steps=(WritePoem,))},
|
29
|
+
)
|
30
|
+
|
31
|
+
poem = await task.delegate()
|
32
|
+
logger.success(f"Poem:\n\n{poem}")
|
33
|
+
|
34
|
+
|
35
|
+
if __name__ == "__main__":
|
36
|
+
asyncio.run(main())
|
@@ -19,7 +19,7 @@ async def main() -> None:
|
|
19
19
|
logger.success(f"Code: \n{code}")
|
20
20
|
res = await role.review_string(code, "If the cli app is of good design")
|
21
21
|
logger.success(f"Review: \n{res.display()}")
|
22
|
-
await res.supervisor_check(
|
22
|
+
await res.supervisor_check()
|
23
23
|
logger.success(f"Review: \n{res.display()}")
|
24
24
|
|
25
25
|
|
@@ -3,11 +3,11 @@
|
|
3
3
|
from importlib.util import find_spec
|
4
4
|
|
5
5
|
from fabricatio._rust import BibManager
|
6
|
-
from fabricatio._rust_instances import
|
6
|
+
from fabricatio._rust_instances import TEMPLATE_MANAGER
|
7
7
|
from fabricatio.actions.article import ExtractArticleEssence, GenerateArticleProposal, GenerateOutline
|
8
8
|
from fabricatio.actions.output import DumpFinalizedOutput
|
9
9
|
from fabricatio.core import env
|
10
|
-
from fabricatio.fs import
|
10
|
+
from fabricatio.fs import MAGIKA, safe_json_read, safe_text_read
|
11
11
|
from fabricatio.journal import logger
|
12
12
|
from fabricatio.models.action import Action, WorkFlow
|
13
13
|
from fabricatio.models.events import Event
|
@@ -16,21 +16,23 @@ from fabricatio.models.role import Role
|
|
16
16
|
from fabricatio.models.task import Task
|
17
17
|
from fabricatio.models.tool import ToolBox
|
18
18
|
from fabricatio.models.utils import Message, Messages
|
19
|
-
from fabricatio.parser import Capture,
|
19
|
+
from fabricatio.parser import Capture, GenericCapture, JsonCapture, PythonCapture
|
20
20
|
from fabricatio.toolboxes import arithmetic_toolbox, basic_toolboxes, fs_toolbox
|
21
21
|
from fabricatio.workflows.articles import WriteOutlineWorkFlow
|
22
22
|
|
23
23
|
__all__ = [
|
24
|
+
"MAGIKA",
|
25
|
+
"TEMPLATE_MANAGER",
|
24
26
|
"Action",
|
25
27
|
"ArticleEssence",
|
26
28
|
"BibManager",
|
27
29
|
"Capture",
|
28
|
-
"CodeBlockCapture",
|
29
30
|
"DumpFinalizedOutput",
|
30
31
|
"Event",
|
31
32
|
"ExtractArticleEssence",
|
32
33
|
"GenerateArticleProposal",
|
33
34
|
"GenerateOutline",
|
35
|
+
"GenericCapture",
|
34
36
|
"JsonCapture",
|
35
37
|
"Message",
|
36
38
|
"Messages",
|
@@ -45,10 +47,8 @@ __all__ = [
|
|
45
47
|
"env",
|
46
48
|
"fs_toolbox",
|
47
49
|
"logger",
|
48
|
-
"magika",
|
49
50
|
"safe_json_read",
|
50
51
|
"safe_text_read",
|
51
|
-
"template_manager",
|
52
52
|
]
|
53
53
|
|
54
54
|
|
@@ -3,7 +3,7 @@
|
|
3
3
|
from fabricatio._rust import TemplateManager
|
4
4
|
from fabricatio.config import configs
|
5
5
|
|
6
|
-
|
6
|
+
TEMPLATE_MANAGER = TemplateManager(
|
7
7
|
template_dirs=configs.templates.template_dir,
|
8
8
|
suffix=configs.templates.template_suffix,
|
9
9
|
active_loading=configs.templates.active_loading,
|
@@ -0,0 +1,103 @@
|
|
1
|
+
"""Correct capability module providing advanced review and validation functionality.
|
2
|
+
|
3
|
+
This module implements the Correct capability, which extends the Review functionality
|
4
|
+
to provide mechanisms for reviewing, validating, and correcting various objects and tasks
|
5
|
+
based on predefined criteria and templates.
|
6
|
+
"""
|
7
|
+
|
8
|
+
from typing import Optional, Unpack
|
9
|
+
|
10
|
+
from fabricatio._rust_instances import TEMPLATE_MANAGER
|
11
|
+
from fabricatio.capabilities.review import Review, ReviewResult
|
12
|
+
from fabricatio.config import configs
|
13
|
+
from fabricatio.models.generic import Display, ProposedAble, WithBriefing
|
14
|
+
from fabricatio.models.kwargs_types import ReviewKwargs
|
15
|
+
from fabricatio.models.task import Task
|
16
|
+
|
17
|
+
|
18
|
+
class Correct(Review):
|
19
|
+
"""Correct capability for reviewing, validating, and improving objects.
|
20
|
+
|
21
|
+
This class enhances the Review capability with specialized functionality for
|
22
|
+
correcting and improving objects based on review feedback. It can process
|
23
|
+
various inputs including tasks, strings, and generic objects that implement
|
24
|
+
the required interfaces, applying corrections based on templated review processes.
|
25
|
+
"""
|
26
|
+
|
27
|
+
async def correct_obj[M: ProposedAble](
|
28
|
+
self, obj: M, **kwargs: Unpack[ReviewKwargs[ReviewResult[str]]]
|
29
|
+
) -> Optional[M]:
|
30
|
+
"""Review and correct an object based on defined criteria and templates.
|
31
|
+
|
32
|
+
This method first conducts a review of the given object, then uses the review results
|
33
|
+
to generate a corrected version of the object using appropriate templates.
|
34
|
+
|
35
|
+
Args:
|
36
|
+
obj (M): The object to be reviewed and corrected. Must implement ProposedAble.
|
37
|
+
**kwargs: Review configuration parameters including criteria and review options.
|
38
|
+
|
39
|
+
Returns:
|
40
|
+
Optional[M]: A corrected version of the input object, or None if correction fails.
|
41
|
+
|
42
|
+
Raises:
|
43
|
+
TypeError: If the provided object doesn't implement Display or WithBriefing interfaces.
|
44
|
+
"""
|
45
|
+
if not isinstance(obj, (Display, WithBriefing)):
|
46
|
+
raise TypeError(f"Expected Display or WithBriefing, got {type(obj)}")
|
47
|
+
review_res = await self.review_obj(obj, **kwargs)
|
48
|
+
await review_res.supervisor_check()
|
49
|
+
if "default" in kwargs:
|
50
|
+
kwargs["default"] = None
|
51
|
+
return await self.propose(
|
52
|
+
obj.__class__,
|
53
|
+
TEMPLATE_MANAGER.render_template(
|
54
|
+
configs.templates.correct_template,
|
55
|
+
{
|
56
|
+
"content": obj.display() if isinstance(obj, Display) else obj.briefing,
|
57
|
+
"review": review_res.display(),
|
58
|
+
},
|
59
|
+
),
|
60
|
+
**kwargs,
|
61
|
+
)
|
62
|
+
|
63
|
+
async def correct_string(self, input_text: str, **kwargs: Unpack[ReviewKwargs[ReviewResult[str]]]) -> Optional[str]:
|
64
|
+
"""Review and correct a string based on defined criteria and templates.
|
65
|
+
|
66
|
+
This method applies the review process to the input text and generates
|
67
|
+
a corrected version based on the review results.
|
68
|
+
|
69
|
+
Args:
|
70
|
+
input_text (str): The text content to be reviewed and corrected.
|
71
|
+
**kwargs: Review configuration parameters including criteria and review options.
|
72
|
+
|
73
|
+
Returns:
|
74
|
+
Optional[str]: The corrected text content, or None if correction fails.
|
75
|
+
"""
|
76
|
+
review_res = await self.review_string(input_text, **kwargs)
|
77
|
+
await review_res.supervisor_check()
|
78
|
+
|
79
|
+
if "default" in kwargs:
|
80
|
+
kwargs["default"] = None
|
81
|
+
return await self.ageneric_string(
|
82
|
+
TEMPLATE_MANAGER.render_template(
|
83
|
+
configs.templates.correct_template, {"content": input_text, "review": review_res.display()}
|
84
|
+
),
|
85
|
+
**kwargs,
|
86
|
+
)
|
87
|
+
|
88
|
+
async def correct_task[T](
|
89
|
+
self, task: Task[T], **kwargs: Unpack[ReviewKwargs[ReviewResult[str]]]
|
90
|
+
) -> Optional[Task[T]]:
|
91
|
+
"""Review and correct a task object based on defined criteria.
|
92
|
+
|
93
|
+
This is a specialized version of correct_obj specifically for Task objects,
|
94
|
+
applying the same review and correction process to task definitions.
|
95
|
+
|
96
|
+
Args:
|
97
|
+
task (Task[T]): The task to be reviewed and corrected.
|
98
|
+
**kwargs: Review configuration parameters including criteria and review options.
|
99
|
+
|
100
|
+
Returns:
|
101
|
+
Optional[Task[T]]: The corrected task, or None if correction fails.
|
102
|
+
"""
|
103
|
+
return await self.correct_obj(task, **kwargs)
|
@@ -10,7 +10,7 @@ from os import PathLike
|
|
10
10
|
from pathlib import Path
|
11
11
|
from typing import Any, Callable, Dict, List, Optional, Self, Union, Unpack, cast, overload
|
12
12
|
|
13
|
-
from fabricatio._rust_instances import
|
13
|
+
from fabricatio._rust_instances import TEMPLATE_MANAGER
|
14
14
|
from fabricatio.config import configs
|
15
15
|
from fabricatio.journal import logger
|
16
16
|
from fabricatio.models.kwargs_types import (
|
@@ -306,7 +306,7 @@ class RAG(EmbeddingUsage):
|
|
306
306
|
similarity_threshold=similarity_threshold,
|
307
307
|
)
|
308
308
|
|
309
|
-
rendered =
|
309
|
+
rendered = TEMPLATE_MANAGER.render_template(configs.templates.retrieved_display_template, {"docs": docs[::-1]})
|
310
310
|
|
311
311
|
logger.debug(f"Retrieved Documents: \n{rendered}")
|
312
312
|
return await self.aask(
|
@@ -326,7 +326,7 @@ class RAG(EmbeddingUsage):
|
|
326
326
|
List[str]: A list of refined questions.
|
327
327
|
"""
|
328
328
|
return await self.aliststr(
|
329
|
-
|
329
|
+
TEMPLATE_MANAGER.render_template(
|
330
330
|
configs.templates.refined_query_template,
|
331
331
|
{"question": [question] if isinstance(question, str) else question},
|
332
332
|
),
|
@@ -4,7 +4,7 @@ from itertools import permutations
|
|
4
4
|
from random import sample
|
5
5
|
from typing import Dict, List, Optional, Set, Tuple, Union, Unpack, overload
|
6
6
|
|
7
|
-
from fabricatio._rust_instances import
|
7
|
+
from fabricatio._rust_instances import TEMPLATE_MANAGER
|
8
8
|
from fabricatio.config import configs
|
9
9
|
from fabricatio.journal import logger
|
10
10
|
from fabricatio.models.generic import WithBriefing
|
@@ -53,7 +53,7 @@ class GiveRating(WithBriefing, LLMUsage):
|
|
53
53
|
logger.info(f"Rating for {to_rate}")
|
54
54
|
return await self.aask_validate(
|
55
55
|
question=(
|
56
|
-
|
56
|
+
TEMPLATE_MANAGER.render_template(
|
57
57
|
configs.templates.rate_fine_grind_template,
|
58
58
|
{
|
59
59
|
"to_rate": to_rate,
|
@@ -65,7 +65,7 @@ class GiveRating(WithBriefing, LLMUsage):
|
|
65
65
|
)
|
66
66
|
if isinstance(to_rate, str)
|
67
67
|
else [
|
68
|
-
|
68
|
+
TEMPLATE_MANAGER.render_template(
|
69
69
|
configs.templates.rate_fine_grind_template,
|
70
70
|
{
|
71
71
|
"to_rate": item,
|
@@ -150,7 +150,7 @@ class GiveRating(WithBriefing, LLMUsage):
|
|
150
150
|
|
151
151
|
return await self.aask_validate(
|
152
152
|
question=(
|
153
|
-
|
153
|
+
TEMPLATE_MANAGER.render_template(
|
154
154
|
configs.templates.draft_rating_manual_template,
|
155
155
|
{
|
156
156
|
"topic": topic,
|
@@ -180,7 +180,7 @@ class GiveRating(WithBriefing, LLMUsage):
|
|
180
180
|
"""
|
181
181
|
return await self.aask_validate(
|
182
182
|
question=(
|
183
|
-
|
183
|
+
TEMPLATE_MANAGER.render_template(
|
184
184
|
configs.templates.draft_rating_criteria_template,
|
185
185
|
{
|
186
186
|
"topic": topic,
|
@@ -230,7 +230,7 @@ class GiveRating(WithBriefing, LLMUsage):
|
|
230
230
|
reasons = flatten(
|
231
231
|
await self.aask_validate(
|
232
232
|
question=[
|
233
|
-
|
233
|
+
TEMPLATE_MANAGER.render_template(
|
234
234
|
configs.templates.extract_reasons_from_examples_template,
|
235
235
|
{
|
236
236
|
"topic": topic,
|
@@ -250,7 +250,7 @@ class GiveRating(WithBriefing, LLMUsage):
|
|
250
250
|
# extract certain mount of criteria from reasons according to their importance and frequency
|
251
251
|
return await self.aask_validate(
|
252
252
|
question=(
|
253
|
-
|
253
|
+
TEMPLATE_MANAGER.render_template(
|
254
254
|
configs.templates.extract_criteria_from_reasons_template,
|
255
255
|
{
|
256
256
|
"topic": topic,
|
@@ -290,7 +290,7 @@ class GiveRating(WithBriefing, LLMUsage):
|
|
290
290
|
# get the importance multiplier indicating how important is second criterion compared to the first one
|
291
291
|
relative_weights = await self.aask_validate(
|
292
292
|
question=[
|
293
|
-
|
293
|
+
TEMPLATE_MANAGER.render_template(
|
294
294
|
configs.templates.draft_rating_weights_klee_template,
|
295
295
|
{
|
296
296
|
"topic": topic,
|
@@ -2,15 +2,17 @@
|
|
2
2
|
|
3
3
|
from typing import List, Optional, Self, Set, Unpack, cast
|
4
4
|
|
5
|
-
from fabricatio import
|
5
|
+
from fabricatio._rust_instances import TEMPLATE_MANAGER
|
6
6
|
from fabricatio.capabilities.propose import Propose
|
7
7
|
from fabricatio.capabilities.rating import GiveRating
|
8
8
|
from fabricatio.config import configs
|
9
9
|
from fabricatio.models.generic import Base, Display, ProposedAble, WithBriefing
|
10
10
|
from fabricatio.models.kwargs_types import ReviewKwargs, ValidateKwargs
|
11
11
|
from fabricatio.models.task import Task
|
12
|
-
from
|
13
|
-
from
|
12
|
+
from fabricatio.models.utils import ask_edit
|
13
|
+
from questionary import Choice, checkbox, text
|
14
|
+
from questionary import print as q_print
|
15
|
+
from rich import print as r_print
|
14
16
|
|
15
17
|
|
16
18
|
class ProblemSolutions(Base):
|
@@ -53,6 +55,25 @@ class ProblemSolutions(Base):
|
|
53
55
|
self.solutions = solutions
|
54
56
|
return self
|
55
57
|
|
58
|
+
async def edit_problem(self) -> Self:
|
59
|
+
"""Interactively edit the problem description using a prompt.
|
60
|
+
|
61
|
+
Returns:
|
62
|
+
Self: The current instance with updated problem description.
|
63
|
+
"""
|
64
|
+
self.problem = await text("Please edit the problem below:", default=self.problem).ask_async()
|
65
|
+
return self
|
66
|
+
|
67
|
+
async def edit_solutions(self) -> Self:
|
68
|
+
"""Interactively edit the list of potential solutions using a prompt.
|
69
|
+
|
70
|
+
Returns:
|
71
|
+
Self: The current instance with updated solutions.
|
72
|
+
"""
|
73
|
+
q_print(self.problem, style="bold cyan")
|
74
|
+
self.solutions = await ask_edit(self.solutions)
|
75
|
+
return self
|
76
|
+
|
56
77
|
|
57
78
|
class ReviewResult[T](ProposedAble, Display):
|
58
79
|
"""Represents the outcome of a review process with identified problems and solutions.
|
@@ -110,7 +131,7 @@ class ReviewResult[T](ProposedAble, Display):
|
|
110
131
|
"""
|
111
132
|
return self._ref
|
112
133
|
|
113
|
-
async def supervisor_check(self, check_solutions: bool =
|
134
|
+
async def supervisor_check(self, check_solutions: bool = True) -> Self:
|
114
135
|
"""Perform an interactive review session to filter problems and solutions.
|
115
136
|
|
116
137
|
Presents an interactive prompt allowing a supervisor to select which
|
@@ -132,23 +153,25 @@ class ReviewResult[T](ProposedAble, Display):
|
|
132
153
|
else:
|
133
154
|
raise TypeError(f"Unsupported type for review: {type(self._ref)}")
|
134
155
|
# Choose the problems to retain
|
135
|
-
|
156
|
+
r_print(display)
|
136
157
|
chosen_ones: List[ProblemSolutions] = await checkbox(
|
137
158
|
f"Please choose the problems you want to retain.(Default: retain all)\n\t`{self.review_topic}`",
|
138
159
|
choices=[Choice(p.problem, p, checked=True) for p in self.problem_solutions],
|
139
160
|
).ask_async()
|
161
|
+
self.problem_solutions = [await p.edit_problem() for p in chosen_ones]
|
140
162
|
if not check_solutions:
|
141
|
-
self.problem_solutions = chosen_ones
|
142
163
|
return self
|
143
164
|
|
144
165
|
# Choose the solutions to retain
|
145
|
-
for to_exam in
|
166
|
+
for to_exam in self.problem_solutions:
|
146
167
|
to_exam.update_solutions(
|
147
168
|
await checkbox(
|
148
169
|
f"Please choose the solutions you want to retain.(Default: retain all)\n\t`{to_exam.problem}`",
|
149
170
|
choices=[Choice(s, s, checked=True) for s in to_exam.solutions],
|
150
171
|
).ask_async()
|
151
172
|
)
|
173
|
+
await to_exam.edit_solutions()
|
174
|
+
|
152
175
|
return self
|
153
176
|
|
154
177
|
|
@@ -181,7 +204,7 @@ class Review(GiveRating, Propose):
|
|
181
204
|
|
182
205
|
async def review_string(
|
183
206
|
self,
|
184
|
-
|
207
|
+
input_text: str,
|
185
208
|
topic: str,
|
186
209
|
criteria: Optional[Set[str]] = None,
|
187
210
|
**kwargs: Unpack[ValidateKwargs[ReviewResult[str]]],
|
@@ -192,7 +215,7 @@ class Review(GiveRating, Propose):
|
|
192
215
|
based on the given topic and criteria.
|
193
216
|
|
194
217
|
Args:
|
195
|
-
|
218
|
+
input_text (str): The text content to be reviewed.
|
196
219
|
topic (str): The subject topic for the review criteria.
|
197
220
|
criteria (Optional[Set[str]], optional): A set of criteria for the review.
|
198
221
|
If not provided, criteria will be drafted automatically. Defaults to None.
|
@@ -202,18 +225,32 @@ class Review(GiveRating, Propose):
|
|
202
225
|
ReviewResult[str]: A review result containing identified problems and proposed solutions,
|
203
226
|
with a reference to the original text.
|
204
227
|
"""
|
205
|
-
|
206
|
-
|
207
|
-
|
228
|
+
default = None
|
229
|
+
if "default" in kwargs:
|
230
|
+
default = kwargs.pop("default")
|
231
|
+
|
232
|
+
criteria = criteria or (await self.draft_rating_criteria(topic, **kwargs))
|
233
|
+
if not criteria:
|
234
|
+
raise ValueError("No criteria provided for review.")
|
235
|
+
manual = await self.draft_rating_manual(topic, criteria, **kwargs)
|
236
|
+
|
237
|
+
if default is not None:
|
238
|
+
kwargs["default"] = default
|
239
|
+
res = await self.propose(
|
208
240
|
ReviewResult,
|
209
|
-
|
210
|
-
configs.templates.review_string_template,
|
241
|
+
TEMPLATE_MANAGER.render_template(
|
242
|
+
configs.templates.review_string_template,
|
243
|
+
{"text": input_text, "topic": topic, "criteria_manual": manual},
|
211
244
|
),
|
212
245
|
**kwargs,
|
213
246
|
)
|
214
|
-
|
247
|
+
if not res:
|
248
|
+
raise ValueError("Failed to generate review result.")
|
249
|
+
return res.update_ref(input_text).update_topic(topic)
|
215
250
|
|
216
|
-
async def review_obj[M: (Display, WithBriefing)](
|
251
|
+
async def review_obj[M: (Display, WithBriefing)](
|
252
|
+
self, obj: M, **kwargs: Unpack[ReviewKwargs[ReviewResult[str]]]
|
253
|
+
) -> ReviewResult[M]:
|
217
254
|
"""Review an object that implements Display or WithBriefing interface.
|
218
255
|
|
219
256
|
This method extracts displayable text from the object and performs a review
|
@@ -4,7 +4,7 @@ from types import CodeType
|
|
4
4
|
from typing import Any, Dict, List, Optional, Tuple, Unpack, cast
|
5
5
|
|
6
6
|
import orjson
|
7
|
-
from fabricatio._rust_instances import
|
7
|
+
from fabricatio._rust_instances import TEMPLATE_MANAGER
|
8
8
|
from fabricatio.capabilities.propose import Propose
|
9
9
|
from fabricatio.config import configs
|
10
10
|
from fabricatio.journal import logger
|
@@ -66,7 +66,7 @@ class HandleTask(WithBriefing, ToolBoxUsage):
|
|
66
66
|
|
67
67
|
return None
|
68
68
|
|
69
|
-
q =
|
69
|
+
q = TEMPLATE_MANAGER.render_template(
|
70
70
|
configs.templates.draft_tool_usage_code_template,
|
71
71
|
{
|
72
72
|
"data_module_name": configs.toolbox.data_module_name,
|
@@ -19,8 +19,6 @@ from pydantic import (
|
|
19
19
|
)
|
20
20
|
from pydantic_settings import (
|
21
21
|
BaseSettings,
|
22
|
-
DotEnvSettingsSource,
|
23
|
-
EnvSettingsSource,
|
24
22
|
PydanticBaseSettingsSource,
|
25
23
|
PyprojectTomlConfigSettingsSource,
|
26
24
|
SettingsConfigDict,
|
@@ -228,6 +226,12 @@ class TemplateConfig(BaseModel):
|
|
228
226
|
review_string_template: str = Field(default="review_string")
|
229
227
|
"""The name of the review string template which will be used to review a string."""
|
230
228
|
|
229
|
+
generic_string_template: str = Field(default="generic_string")
|
230
|
+
"""The name of the generic string template which will be used to review a string."""
|
231
|
+
|
232
|
+
correct_template: str = Field(default="correct")
|
233
|
+
"""The name of the correct template which will be used to correct a string."""
|
234
|
+
|
231
235
|
|
232
236
|
class MagikaConfig(BaseModel):
|
233
237
|
"""Magika configuration class."""
|
@@ -370,6 +374,9 @@ class Settings(BaseSettings):
|
|
370
374
|
) -> tuple[PydanticBaseSettingsSource, ...]:
|
371
375
|
"""Customize settings sources.
|
372
376
|
|
377
|
+
This method customizes the settings sources used by the application. It returns a tuple of settings sources, including
|
378
|
+
the dotenv settings source, environment settings source, a custom TomlConfigSettingsSource, and a custom
|
379
|
+
|
373
380
|
Args:
|
374
381
|
settings_cls (type[BaseSettings]): The settings class.
|
375
382
|
init_settings (PydanticBaseSettingsSource): Initial settings source.
|
@@ -381,10 +388,12 @@ class Settings(BaseSettings):
|
|
381
388
|
tuple[PydanticBaseSettingsSource, ...]: A tuple of settings sources.
|
382
389
|
"""
|
383
390
|
return (
|
384
|
-
|
385
|
-
|
386
|
-
|
391
|
+
init_settings,
|
392
|
+
dotenv_settings,
|
393
|
+
env_settings,
|
394
|
+
file_secret_settings,
|
387
395
|
PyprojectTomlConfigSettingsSource(settings_cls),
|
396
|
+
TomlConfigSettingsSource(settings_cls),
|
388
397
|
)
|
389
398
|
|
390
399
|
|
@@ -11,9 +11,10 @@ from fabricatio.fs.curd import (
|
|
11
11
|
move_file,
|
12
12
|
tree,
|
13
13
|
)
|
14
|
-
from fabricatio.fs.readers import
|
14
|
+
from fabricatio.fs.readers import MAGIKA, safe_json_read, safe_text_read
|
15
15
|
|
16
16
|
__all__ = [
|
17
|
+
"MAGIKA",
|
17
18
|
"absolute_path",
|
18
19
|
"copy_file",
|
19
20
|
"create_directory",
|
@@ -21,7 +22,6 @@ __all__ = [
|
|
21
22
|
"delete_file",
|
22
23
|
"dump_text",
|
23
24
|
"gather_files",
|
24
|
-
"magika",
|
25
25
|
"move_file",
|
26
26
|
"safe_json_read",
|
27
27
|
"safe_text_read",
|
@@ -9,7 +9,7 @@ from magika import Magika
|
|
9
9
|
from fabricatio.config import configs
|
10
10
|
from fabricatio.journal import logger
|
11
11
|
|
12
|
-
|
12
|
+
MAGIKA = Magika(model_dir=configs.magika.model_dir)
|
13
13
|
|
14
14
|
|
15
15
|
def safe_text_read(path: Path | str) -> str:
|
@@ -19,10 +19,3 @@ logger.add(
|
|
19
19
|
logger.add(sys.stderr, level=configs.debug.log_level)
|
20
20
|
|
21
21
|
__all__ = ["logger"]
|
22
|
-
if __name__ == "__main__":
|
23
|
-
logger.debug("This is a trace message.")
|
24
|
-
logger.info("This is an information message.")
|
25
|
-
logger.success("This is a success message.")
|
26
|
-
logger.warning("This is a warning message.")
|
27
|
-
logger.error("This is an error message.")
|
28
|
-
logger.critical("This is a critical message.")
|
@@ -5,7 +5,7 @@ from abc import abstractmethod
|
|
5
5
|
from asyncio import Queue, create_task
|
6
6
|
from typing import Any, Dict, Self, Tuple, Type, Union, final
|
7
7
|
|
8
|
-
from fabricatio.capabilities.
|
8
|
+
from fabricatio.capabilities.correct import Correct
|
9
9
|
from fabricatio.capabilities.task import HandleTask, ProposeTask
|
10
10
|
from fabricatio.journal import logger
|
11
11
|
from fabricatio.models.generic import WithBriefing
|
@@ -14,7 +14,7 @@ from fabricatio.models.usages import ToolBoxUsage
|
|
14
14
|
from pydantic import Field, PrivateAttr
|
15
15
|
|
16
16
|
|
17
|
-
class Action(HandleTask, ProposeTask,
|
17
|
+
class Action(HandleTask, ProposeTask, Correct):
|
18
18
|
"""Class that represents an action to be executed in a workflow."""
|
19
19
|
|
20
20
|
name: str = Field(default="")
|