xai-review 0.11.0__py3-none-any.whl → 0.12.0__py3-none-any.whl

ai_review/libs/config/prompt.py

@@ -8,6 +8,7 @@ from ai_review.libs.resources import load_resource
 
 class PromptConfig(BaseModel):
     context: dict[str, str] = Field(default_factory=dict)
+    normalize_prompts: bool = True
     context_placeholder: str = "<<{value}>>"
     inline_prompt_files: list[FilePath] | None = None
     context_prompt_files: list[FilePath] | None = None

ai_review/services/prompt/service.py

@@ -1,56 +1,57 @@
 from ai_review.config import settings
 from ai_review.services.diff.schema import DiffFileSchema
 from ai_review.services.prompt.schema import PromptContextSchema
+from ai_review.services.prompt.tools import normalize_prompt, format_file
 
 
-def format_file(diff: DiffFileSchema) -> str:
-    return f"# File: {diff.file}\n{diff.diff}\n"
+class PromptService:
+    @classmethod
+    def prepare_prompt(cls, prompts: list[str], context: PromptContextSchema) -> str:
+        prompt = "\n\n".join(prompts)
+        prompt = context.apply_format(prompt)
 
+        if settings.prompt.normalize_prompts:
+            prompt = normalize_prompt(prompt)
+
+        return prompt
 
-class PromptService:
     @classmethod
     def build_inline_request(cls, diff: DiffFileSchema, context: PromptContextSchema) -> str:
-        inline_prompts = "\n\n".join(settings.prompt.load_inline())
-        inline_prompts = context.apply_format(inline_prompts)
+        prompt = cls.prepare_prompt(settings.prompt.load_inline(), context)
         return (
-            f"{inline_prompts}\n\n"
+            f"{prompt}\n\n"
             f"## Diff\n\n"
             f"{format_file(diff)}"
         )
 
     @classmethod
     def build_summary_request(cls, diffs: list[DiffFileSchema], context: PromptContextSchema) -> str:
+        prompt = cls.prepare_prompt(settings.prompt.load_summary(), context)
         changes = "\n\n".join(map(format_file, diffs))
-        summary_prompts = "\n\n".join(settings.prompt.load_summary())
-        summary_prompts = context.apply_format(summary_prompts)
         return (
-            f"{summary_prompts}\n\n"
+            f"{prompt}\n\n"
             f"## Changes\n\n"
             f"{changes}\n"
         )
 
     @classmethod
     def build_context_request(cls, diffs: list[DiffFileSchema], context: PromptContextSchema) -> str:
+        prompt = cls.prepare_prompt(settings.prompt.load_context(), context)
         changes = "\n\n".join(map(format_file, diffs))
-        inline_prompts = "\n\n".join(settings.prompt.load_context())
-        inline_prompts = context.apply_format(inline_prompts)
         return (
-            f"{inline_prompts}\n\n"
+            f"{prompt}\n\n"
             f"## Diff\n\n"
             f"{changes}\n"
         )
 
     @classmethod
     def build_system_inline_request(cls, context: PromptContextSchema) -> str:
-        prompt = "\n\n".join(settings.prompt.load_system_inline())
-        return context.apply_format(prompt)
+        return cls.prepare_prompt(settings.prompt.load_system_inline(), context)
 
     @classmethod
     def build_system_context_request(cls, context: PromptContextSchema) -> str:
-        prompt = "\n\n".join(settings.prompt.load_system_context())
-        return context.apply_format(prompt)
+        return cls.prepare_prompt(settings.prompt.load_system_context(), context)
 
     @classmethod
     def build_system_summary_request(cls, context: PromptContextSchema) -> str:
-        prompt = "\n\n".join(settings.prompt.load_system_summary())
-        return context.apply_format(prompt)
+        return cls.prepare_prompt(settings.prompt.load_system_summary(), context)

ai_review/services/prompt/tools.py

@@ -0,0 +1,24 @@
+import re
+
+from ai_review.libs.logger import get_logger
+from ai_review.services.diff.schema import DiffFileSchema
+
+logger = get_logger("PROMPT_TOOLS")
+
+
+def format_file(diff: DiffFileSchema) -> str:
+    return f"# File: {diff.file}\n{diff.diff}\n"
+
+
+def normalize_prompt(text: str) -> str:
+    tails_stripped = [re.sub(r"[ \t]+$", "", line) for line in text.splitlines()]
+    text = "\n".join(tails_stripped)
+
+    text = re.sub(r"\n{3,}", "\n\n", text)
+
+    result = text.strip()
+    if len(text) > len(result):
+        logger.info(f"Prompt has been normalized from {len(text)} to {len(result)}")
+        return result
+
+    return text

ai_review/tests/suites/services/prompt/test_service.py

@@ -1,5 +1,6 @@
 import pytest
 
+from ai_review.config import settings
 from ai_review.libs.config.prompt import PromptConfig
 from ai_review.services.diff.schema import DiffFileSchema
 from ai_review.services.prompt.schema import PromptContextSchema
@@ -134,3 +135,35 @@ def test_diff_placeholders_are_not_replaced(dummy_context: PromptContextSchema)
 
     assert "<<merge_request_title>>" in result
     assert "Fix login bug" not in result
+
+
+def test_prepare_prompt_basic_substitution(dummy_context: PromptContextSchema) -> None:
+    prompts = ["Hello", "MR title: <<merge_request_title>>"]
+    result = PromptService.prepare_prompt(prompts, dummy_context)
+    assert "Hello" in result
+    assert "MR title: Fix login bug" in result
+
+
+def test_prepare_prompt_applies_normalization(
+        monkeypatch: pytest.MonkeyPatch,
+        dummy_context: PromptContextSchema
+) -> None:
+    monkeypatch.setattr(settings.prompt, "normalize_prompts", True)
+    prompts = ["Line with space   ", "", "", "Next line"]
+    result = PromptService.prepare_prompt(prompts, dummy_context)
+
+    assert "Line with space" in result
+    assert "Next line" in result
+    assert "\n\n\n" not in result
+
+
+def test_prepare_prompt_skips_normalization(
+        monkeypatch: pytest.MonkeyPatch,
+        dummy_context: PromptContextSchema
+) -> None:
+    monkeypatch.setattr(settings.prompt, "normalize_prompts", False)
+    prompts = ["Line with space   ", "", "", "Next line"]
+    result = PromptService.prepare_prompt(prompts, dummy_context)
+
+    assert "Line with space   " in result
+    assert "\n\n\n" in result

ai_review/tests/suites/services/prompt/test_tools.py

@@ -0,0 +1,72 @@
+from ai_review.services.diff.schema import DiffFileSchema
+from ai_review.services.prompt.tools import format_file, normalize_prompt
+
+
+def test_format_file_basic():
+    diff = DiffFileSchema(file="main.py", diff="+ print('hello')")
+    result = format_file(diff)
+    assert result == "# File: main.py\n+ print('hello')\n"
+
+
+def test_format_file_empty_diff():
+    diff = DiffFileSchema(file="empty.py", diff="")
+    result = format_file(diff)
+    assert result == "# File: empty.py\n\n"
+
+
+def test_format_file_multiline_diff():
+    diff = DiffFileSchema(
+        file="utils/helpers.py",
+        diff="- old line\n+ new line\n+ another line"
+    )
+    result = format_file(diff)
+    expected = (
+        "# File: utils/helpers.py\n"
+        "- old line\n"
+        "+ new line\n"
+        "+ another line\n"
+    )
+    assert result == expected
+
+
+def test_format_file_filename_with_path():
+    diff = DiffFileSchema(file="src/app/models/user.py", diff="+ class User:")
+    result = format_file(diff)
+    assert result.startswith("# File: src/app/models/user.py\n")
+    assert result.endswith("+ class User:\n")
+
+
+def test_trailing_spaces_are_removed():
+    text = "hello   \nworld\t\t"
+    result = normalize_prompt(text)
+    assert result == "hello\nworld"
+
+
+def test_multiple_empty_lines_collapsed():
+    text = "line1\n\n\n\nline2"
+    result = normalize_prompt(text)
+    assert result == "line1\n\nline2"
+
+
+def test_leading_and_trailing_whitespace_removed():
+    text = "\n\n   hello\nworld   \n\n"
+    result = normalize_prompt(text)
+    assert result == "hello\nworld"
+
+
+def test_internal_spaces_preserved():
+    text = "foo    bar\nbaz\t\tqux"
+    result = normalize_prompt(text)
+    assert result == "foo    bar\nbaz\t\tqux"
+
+
+def test_only_whitespace_string():
+    text = "   \n   \n"
+    result = normalize_prompt(text)
+    assert result == ""
+
+
+def test_no_changes_when_already_clean():
+    text = "line1\nline2"
+    result = normalize_prompt(text)
+    assert result == text

{xai_review-0.11.0.dist-info → xai_review-0.12.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xai-review
-Version: 0.11.0
+Version: 0.12.0
 Summary: AI-powered code review tool
 Author-email: Nikita Filonov <nikita.filonov@example.com>
 Maintainer-email: Nikita Filonov <nikita.filonov@example.com>

{xai_review-0.11.0.dist-info → xai_review-0.12.0.dist-info}/RECORD

@@ -41,7 +41,7 @@ ai_review/libs/config/http.py,sha256=QsIj0yH1IYELOFBQ5AoqPZT0kGIIrQ19cxk1ozPRhLE
 ai_review/libs/config/llm.py,sha256=cK-e4NCQxnnixLATCsO8-r5k3zUWz1N0BdPCoqerORM,1824
 ai_review/libs/config/logger.py,sha256=oPmjpjf6EZwW7CgOjT8mOQdGnT98CLwXepiGB_ajZvU,384
 ai_review/libs/config/openai.py,sha256=vOYqhUq0ceEuNdQrQaHq44lVS5M648mB61Zc4YlfJVw,271
-ai_review/libs/config/prompt.py,sha256=e5jmHsfC6WpnkYZpTLT9TyKQfGtsbqJbxMkJBmLAWf0,4434
+ai_review/libs/config/prompt.py,sha256=8aO5WNnhVhQcpWzWxqzb9lq6PzormaJazVwPHuf_ia8,4469
 ai_review/libs/config/review.py,sha256=LEZni68iH_0m4URPfN0d3F6yrrK7KSn-BwXf-7w2al8,1058
 ai_review/libs/config/vcs.py,sha256=FduvJJkGObh2LgTSapaMB6FABIvjX7E63yTwZF4p8CU,517
 ai_review/libs/constants/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -98,7 +98,8 @@ ai_review/services/llm/openai/client.py,sha256=WhMXNfH_G1NTlFkdRK5sgYvrCIE5ZQNfP
 ai_review/services/prompt/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ai_review/services/prompt/adapter.py,sha256=humGHLRVBu0JspeULgYHCs782BAy4YYKSf5yaG8aF24,1003
 ai_review/services/prompt/schema.py,sha256=erAecUYzOWyZfixt-pjmPSnvcMDh5DajMd1b7_SPm_o,2052
-ai_review/services/prompt/service.py,sha256=VsY8mj6UvY1a4Zsb8JlDJIg_8l7LBW6PXrObiHCwCzo,2128
+ai_review/services/prompt/service.py,sha256=D1PR2HC4cgrEND6mAhU5EPRAtp4mgEkOLEyD51WBc0g,2129
+ai_review/services/prompt/tools.py,sha256=-gS74mVM3OZPKWQkY9_QfStkfxaUfssDbJ3Bdi4AQ74,636
 ai_review/services/review/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ai_review/services/review/service.py,sha256=8YhRFqhZAk2pAnkDaytKSCENlOeOti1brAJq3R9tVMY,8394
 ai_review/services/review/inline/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -147,7 +148,8 @@ ai_review/tests/suites/services/diff/test_service.py,sha256=iFkGX9Vj2X44JU3eFsoH
 ai_review/tests/suites/services/diff/test_tools.py,sha256=HBQ3eCn-kLeb_k5iTgyr09x0VwLYSegSbxm0Qk9ZrCc,3543
 ai_review/tests/suites/services/prompt/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ai_review/tests/suites/services/prompt/test_schema.py,sha256=XkJk4N9ovgod7G3i6oZwRBjpd71sv0vtVDJhSOfIwGA,2660
-ai_review/tests/suites/services/prompt/test_service.py,sha256=M8vvBhEbyHnXCSiIRu7231odn89sPDyCiRMOc2XufC4,5570
+ai_review/tests/suites/services/prompt/test_service.py,sha256=plJ8xDnBifCrLtHJO00cdl11U1EsqSw7lBrEGxu0AIw,6752
+ai_review/tests/suites/services/prompt/test_tools.py,sha256=_yNZoBATvPU5enWNIopbjY8lVVjfaB_46kNIKODhCW4,1981
 ai_review/tests/suites/services/review/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ai_review/tests/suites/services/review/inline/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ai_review/tests/suites/services/review/inline/test_schema.py,sha256=tIz-1UA_GgwcdsyUqgrodiiVVmd_jhoOVmtEwzRVWiY,2474
@@ -157,9 +159,9 @@ ai_review/tests/suites/services/review/policy/test_service.py,sha256=kRWT550OjWY
 ai_review/tests/suites/services/review/summary/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ai_review/tests/suites/services/review/summary/test_schema.py,sha256=xSoydvABZldHaVDa0OBFvYrj8wMuZqUDN3MO-XdvxOI,819
 ai_review/tests/suites/services/review/summary/test_service.py,sha256=8UMvi_NL9frm280vD6Q1NCDrdI7K8YbXzoViIus-I2g,541
-xai_review-0.11.0.dist-info/licenses/LICENSE,sha256=p-v8m7Kmz4KKc7PcvsGiGEmCw9AiSXY4_ylOPy_u--Y,11343
-xai_review-0.11.0.dist-info/METADATA,sha256=HSYx4FRillzjL5CfB97QZZTxnCOlLRoRfDMg_Kufa4w,9618
-xai_review-0.11.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-xai_review-0.11.0.dist-info/entry_points.txt,sha256=JyC5URanMi5io5P_PXQf7H_I1OGIpk5cZQhaPQ0g4Zs,53
-xai_review-0.11.0.dist-info/top_level.txt,sha256=sTsZbfzLoqvRZKdKa-BcxWvjlHdrpbeJ6DrGY0EuR0E,10
-xai_review-0.11.0.dist-info/RECORD,,
+xai_review-0.12.0.dist-info/licenses/LICENSE,sha256=p-v8m7Kmz4KKc7PcvsGiGEmCw9AiSXY4_ylOPy_u--Y,11343
+xai_review-0.12.0.dist-info/METADATA,sha256=LCwEqar1dH6shbzNbIh4hZkuLcz0pOrhWz27Rta769I,9618
+xai_review-0.12.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+xai_review-0.12.0.dist-info/entry_points.txt,sha256=JyC5URanMi5io5P_PXQf7H_I1OGIpk5cZQhaPQ0g4Zs,53
+xai_review-0.12.0.dist-info/top_level.txt,sha256=sTsZbfzLoqvRZKdKa-BcxWvjlHdrpbeJ6DrGY0EuR0E,10
+xai_review-0.12.0.dist-info/RECORD,,