ziya 0.1.43__py3-none-any.whl → 0.1.45__py3-none-any.whl

app/utils/code_util.py

@@ -83,9 +83,18 @@ def correct_git_diff(git_diff: str, original_file_path: str) -> str:
     """
     # Split the diff into lines
     lines = git_diff.split('\n')
+    is_new_file = False
+    # Check if this is a new file creation
+    if lines and lines[0].startswith('diff --git a/dev/null'):
+        is_new_file = True
+        # Check if 'new file mode 100644' is present in the first few lines
+        has_file_mode = any('new file mode 100' in line for line in lines[:3])
+        if not has_file_mode:
+            # Insert the missing line after the first line
+            mode_line = 'new file mode 100644'
+            lines.insert(1, mode_line)
+            logger.info(f"Added missing '{mode_line}' to new file diff")
 
-    # Check if this is a new file creation by looking for "new file mode" in the diff
-    is_new_file = any('new file mode 100644' in line for line in lines[:5])
     original_content = []
 
     if not is_new_file:
@@ -130,7 +139,7 @@ def correct_git_diff(git_diff: str, original_file_path: str) -> str:
     corrected_diff = '\n'.join(corrected_lines)
     return corrected_diff
 
-def _find_correct_start_line(original_content: list, hunk_lines: list) -> int:
+def _find_correct_old_start_line(original_content: list, hunk_lines: list) -> int:
     """
     Finds the correct starting line number in the original file by matching context and deleted lines.
 
@@ -149,15 +158,15 @@ def _find_correct_start_line(original_content: list, hunk_lines: list) -> int:
     """
     # Extract context and deleted lines from the hunk
     if not original_content:
-        # Creating a new file.
-        return 1
+        # Creating a new file, should start with @@ -0,0 +1,N @@
+        return 0
 
     if len(hunk_lines) < 3:
         error_msg = (
             f"Invalid git diff format: Expected at least 2 lines in the hunk, but got {len(hunk_lines)} lines.\n"
-            "Hunk content:\n{}".format('\n'.join(hunk_lines)))
+            + "Hunk content:\n{}".format('\n'.join(hunk_lines)))
         logger.error(error_msg)
-        raise RuntimeError("git diff file is not valid.")
+        raise RuntimeError("Invalid git diff format.")
 
     context_and_deleted = []
     for line in hunk_lines:
@@ -240,9 +249,9 @@ def _process_hunk_with_original_content(lines: list, start_index: int, cumulativ
             line_index += 1
 
     # Find the correct start_line_old by matching context and deleted lines
-    start_line_old = _find_correct_start_line(original_content, hunk_lines)
+    start_line_old = _find_correct_old_start_line(original_content, hunk_lines)
 
-    # Now process hunk_lines to calculate counts
+    # Calculate counts for the hunk lines
     for hunk_line in hunk_lines:
         if hunk_line.startswith('+') and not hunk_line.startswith('+++'):
             actual_count_new += 1
@@ -253,8 +262,15 @@ def _process_hunk_with_original_content(lines: list, start_index: int, cumulativ
             actual_count_old += 1
             actual_count_new += 1
 
-    # Adjust start_line_new considering previous line offsets
-    corrected_start_line_new = start_line_old + cumulative_line_offset
+    # Special handling for new file creation
+    if start_line_old == 0:
+        # For new files:
+        # count_old should be 0
+        actual_count_old = 0
+        corrected_start_line_new = 1
+    else:
+        # For existing files, adjust start_line_new considering previous line offsets
+        corrected_start_line_new = start_line_old + cumulative_line_offset
 
     # Calculate line offset for subsequent hunks
     line_offset = actual_count_new - actual_count_old
@@ -292,24 +308,3 @@ def _format_hunk_header(start_old: int, count_old: int, start_new: int, count_ne
     if count_new != 1:
         new_part += f',{count_new}'
     return f'@@ {old_part} {new_part} @@'
-
-
-
-if __name__ == '__main__':
-    # TODO: Create unit test and move these code to unit test
-    diff = """\
-diff --git a/file.txt b/file.txt
-index e69de29..4b825dc 100644
---- a/file.txt
-+++ b/file.txt
-@@ -1,5 +1,5 @@
- Line one
-+Line two
- Line three
- Line four
- Line five
-@@ -10,2 +10,2 @@
- Line ten
--Line eleven
-+Line eleven modified"""
-    print(correct_git_diff(diff,""))

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "ziya"
-version = "0.1.43"
+version = "0.1.45"
 description = ""
 authors = ["Vishnu Krishnaprasad <vishnukool@gmail.com>"]
 readme = "README.md"
@@ -25,6 +25,9 @@ langchain-cli = ">=0.0.15"
 pydevd-pycharm = "^243.18137.19"
 langchain-community = "^0.3.1"
 
+[tool.poetry.group.dev.dependencies]
+pytest = "^8.3.3"
+
 [build-system]
 requires = ["poetry-core"]
 build-backend = "poetry.core.masonry.api"

{ziya-0.1.43.dist-info → ziya-0.1.45.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ziya
-Version: 0.1.43
+Version: 0.1.45
 Summary: 
 Author: Vishnu Krishnaprasad
 Author-email: vishnukool@gmail.com

{ziya-0.1.43.dist-info → ziya-0.1.45.dist-info}/RECORD

@@ -5,14 +5,14 @@ app/agents/prompts.py,sha256=Hm0TJcABRgnpV2bbBobigPznxeLVhyRLEHm7maQ9CEE,3873
 app/main.py,sha256=5bZk9PUm00bdk_w2gJTWJVQFcJ13WU3eN16vFU1AMk0,4303
 app/server.py,sha256=Ii_JFygHdMmxYsEtVm2L0vRRMINWgim3_cWLmVha8mg,4704
 app/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-app/utils/code_util.py,sha256=EpRmWs36A4eGoZhTRwFymfRcwvu4hQj6S-lAkVi7uto,12148
+app/utils/code_util.py,sha256=aqyDneAOJPXc1fujEaNXvfPCqoOrYOcq0cyWFFhXvaI,12440
 app/utils/directory_util.py,sha256=2zxsSxSOZKesjhgjF3KguY__fC9XkjxHHnDbcxtnhXk,2762
 app/utils/gitignore_parser.py,sha256=Li3hQd60eclIuN2qxn8-NQ5sxRyMcnS88DFUxVHdx-A,7487
 app/utils/langchain_validation_util.py,sha256=RgmKayKMApvUA7SPF_DrBAcYdIzzLUVJfnOwTSc1Eug,527
 app/utils/logging_utils.py,sha256=8JEcc1t7L-a0G4HLmM8zFydNNSOd5l2-gkTxviLQUns,280
 app/utils/print_tree_util.py,sha256=O4Rb-GS8UODxfH7Z6bZGsr-opG6QLmvdaU1im5kh4IA,1419
 app/utils/version_util.py,sha256=NcvMWIImJDcO9K5OMX6jJD4q6Zb8Y117Mu8sWIkhxEc,631
-pyproject.toml,sha256=ZAbpqTqEaeD5pSQ6CoGYy_67IxYTpORqEfNa78HWvVI,878
+pyproject.toml,sha256=Dk7YaPVfwZD3KfhcP9Ky_-eAP9f0buKeVqFCffwzRS4,934
 scripts.py,sha256=70BOvYoboMhl3Bxjy73m1ozmI8UV8JZVyi2RwUptkK8,809
 templates/asset-manifest.json,sha256=CWTbaK4qJuG_uzscwg8HZ9leGVx06vlQKAVEDcLvtqo,1157
 templates/favicon.ico,sha256=HgB8xAZdDHFK2lODUsp2H_Dds_i14pnpydx7NEJrNrU,15086
@@ -30,8 +30,8 @@ templates/static/media/fa-solid-900.4d986b00ff9ca3828fbd.woff2,sha256=rhfBavvqIW
 templates/static/media/fa-solid-900.bacd5de623fb563b961a.ttf,sha256=tJkNDQxfXTjWLpNu6hIGdOWEx-6o3O44qXXAz5o3U5s,420332
 templates/static/media/fa-v4compatibility.c8e090db312b0bea2aa2.ttf,sha256=_49SX7BQxdJFGczI9XI9hbLlHt0_m8ZUivVa663U8mk,10832
 templates/static/media/fa-v4compatibility.cf7f5903d06b79ad60f1.woff2,sha256=x6hp-sopnRW-EKAfGdB2WnxNRtiSLZuTFyNcHkpvCYI,4792
-ziya-0.1.43.dist-info/LICENSE,sha256=8CfErGEG13yY1Z-CDlIhAQawX2KOv-QI_2Ge2z6x8SU,1064
-ziya-0.1.43.dist-info/METADATA,sha256=CeyrpIVxVI2L3s48rtCx8gxKyUfEiN17Y5AHvMHz1Mo,2867
-ziya-0.1.43.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-ziya-0.1.43.dist-info/entry_points.txt,sha256=6-KUolj5XXeOPVCJGTJgUL_3lDVGxG-YtK5BTvFPyBg,147
-ziya-0.1.43.dist-info/RECORD,,
+ziya-0.1.45.dist-info/LICENSE,sha256=8CfErGEG13yY1Z-CDlIhAQawX2KOv-QI_2Ge2z6x8SU,1064
+ziya-0.1.45.dist-info/METADATA,sha256=UOwRhVy88bS15LJgUgUQe-IdtUCIxPJCfmWVvkWiNgc,2867
+ziya-0.1.45.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+ziya-0.1.45.dist-info/entry_points.txt,sha256=6-KUolj5XXeOPVCJGTJgUL_3lDVGxG-YtK5BTvFPyBg,147
+ziya-0.1.45.dist-info/RECORD,,