auto-coder 0.1.195__py3-none-any.whl → 0.1.196__py3-none-any.whl

{auto_coder-0.1.195.dist-info → auto_coder-0.1.196.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: auto-coder
-Version: 0.1.195
+Version: 0.1.196
 Summary: AutoCoder: AutoCoder
 Author: allwefantasy
 Classifier: Topic :: Scientific/Engineering :: Artificial Intelligence
@@ -26,7 +26,7 @@ Requires-Dist: tabulate
 Requires-Dist: jupyter-client
 Requires-Dist: prompt-toolkit
 Requires-Dist: tokenizers
-Requires-Dist: byzerllm[saas] >=0.1.139
+Requires-Dist: byzerllm[saas] >=0.1.140
 Requires-Dist: patch
 Requires-Dist: diff-match-patch
 Requires-Dist: GitPython

{auto_coder-0.1.195.dist-info → auto_coder-0.1.196.dist-info}/RECORD

@@ -7,7 +7,7 @@ autocoder/chat_auto_coder.py,sha256=iNqBbNxSqX_rdVA2aTH43ldIEnYsDNNHMfnu8NEJQ9E,
 autocoder/chat_auto_coder_lang.py,sha256=QYtu5gWEQmWKVovR_qUZ8plySZarNFX_Onk-1vN9IiA,8524
 autocoder/command_args.py,sha256=WEjQMbamhwfVhEsyeKhMLNzaGAsqf9bBT1kwJUciU7U,27120
 autocoder/lang.py,sha256=LIqqksjHdCWUEf4lowRbM_hHCJePrejbCB0xyCQzF-o,12971
-autocoder/version.py,sha256=h-aGZtlsN_Xjw_sMbs_yognwPDy0_xWrDueJrhZh0R0,24
+autocoder/version.py,sha256=iow7rl8juj0kKqXdM0kubmbiCzL_Bu8oIaEu1H5ocko,24
 autocoder/agent/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 autocoder/agent/auto_tool.py,sha256=DBzip-P_T6ZtT2eHexPcusmKYD0h7ufzp7TLwXAY10E,11554
 autocoder/agent/coder.py,sha256=dnITYHqkcOip8zV4lywbkYNH9w7Q3qyYaUArJ4WPrTs,866
@@ -28,7 +28,7 @@ autocoder/common/code_auto_generate_editblock.py,sha256=rwteehtdccqvaG6GwHooj2RU
 autocoder/common/code_auto_generate_strict_diff.py,sha256=PS9ghYxNrohfLbclSxg0a39DYz8XwZsDBMUdSkrety0,10638
 autocoder/common/code_auto_merge.py,sha256=3PB2fQtqgA0wPQSdwFqoOHfNT-mORgGfOXjfRGflikQ,5141
 autocoder/common/code_auto_merge_diff.py,sha256=b5INrBJJ2EI0uj5AIiMobCS5S9xevCvdescs3nzCPhY,12594
-autocoder/common/code_auto_merge_editblock.py,sha256=gpnHv9quRXEChfRgDWpR9rm-fIyq9zlByTmV5Trv0KI,10909
+autocoder/common/code_auto_merge_editblock.py,sha256=CwPYd_rxovcTxUNCAKzD4MVl_dwR_qIPH4IzToSmb3A,11772
 autocoder/common/code_auto_merge_strict_diff.py,sha256=iwVEcPSER1NY0g59SVJPQ-PcSIyO6bkO3zK4jjocIL8,7571
 autocoder/common/command_completer.py,sha256=pmPpdfGhpNV3v4u3KadL1BEG5H0QRO6eGv98uQjXXRQ,8947
 autocoder/common/command_generator.py,sha256=v4LmU7sO-P7jEZIXCWHUC6P-vT7AvBi_x_PTwCqBAE8,1323
@@ -99,14 +99,14 @@ autocoder/utils/llm_client_interceptors.py,sha256=FEHNXoFZlCjAHQcjPRyX8FOMjo6rPX
 autocoder/utils/log_capture.py,sha256=I-bsJFLWoGUiX-GKoZsH9kWJCKSV7ZlUnRt7jh-fOL0,1548
 autocoder/utils/multi_turn.py,sha256=unK9OpqVRbK6uIcTKXgggX2wNmyj7s5eyEAQ2xUwHoM,88
 autocoder/utils/print_table.py,sha256=ZMRhCA9DD0FUfKyJBWd5bDdj1RrtPtgOMWSJwtvZcLs,403
-autocoder/utils/queue_communicate.py,sha256=nycK3MZWb6Tw9zwYmyYh4OrTSK5VnO3e1OQ1pnuA2bg,6305
+autocoder/utils/queue_communicate.py,sha256=etv2Iq00nOd9XUML3E6-5eC5FOATx7KVvLKJZuoXpUA,6353
 autocoder/utils/request_event_queue.py,sha256=r3lo5qGsB1dIjzVQ05dnr0z_9Z3zOkBdP1vmRciKdi4,2095
 autocoder/utils/request_queue.py,sha256=nwp6PMtgTCiuwJI24p8OLNZjUiprC-TsefQrhMI-yPE,3889
 autocoder/utils/rest.py,sha256=3tXA8KZG6jKz_tddHNLGx77Icee88WcUeesfNsgPno4,8790
 autocoder/utils/tests.py,sha256=BqphrwyycGAvs-5mhH8pKtMZdObwhFtJ5MC_ZAOiLq8,1340
-auto_coder-0.1.195.dist-info/LICENSE,sha256=HrhfyXIkWY2tGFK11kg7vPCqhgh5DcxleloqdhrpyMY,11558
-auto_coder-0.1.195.dist-info/METADATA,sha256=bEQaQvtoV2sG8GchkDOPR1jbo2Py_GqwfxzkTcuLoB0,2352
-auto_coder-0.1.195.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-auto_coder-0.1.195.dist-info/entry_points.txt,sha256=0nzHtHH4pNcM7xq4EBA2toS28Qelrvcbrr59GqD_0Ak,350
-auto_coder-0.1.195.dist-info/top_level.txt,sha256=Jqc0_uJSw2GwoFQAa9iJxYns-2mWla-9ok_Y3Gcznjk,10
-auto_coder-0.1.195.dist-info/RECORD,,
+auto_coder-0.1.196.dist-info/LICENSE,sha256=HrhfyXIkWY2tGFK11kg7vPCqhgh5DcxleloqdhrpyMY,11558
+auto_coder-0.1.196.dist-info/METADATA,sha256=VnH9dmRjON6sYefiBNjBKte6npwLjzqq9PZi4Ojcwh4,2352
+auto_coder-0.1.196.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+auto_coder-0.1.196.dist-info/entry_points.txt,sha256=0nzHtHH4pNcM7xq4EBA2toS28Qelrvcbrr59GqD_0Ak,350
+auto_coder-0.1.196.dist-info/top_level.txt,sha256=Jqc0_uJSw2GwoFQAa9iJxYns-2mWla-9ok_Y3Gcznjk,10
+auto_coder-0.1.196.dist-info/RECORD,,

autocoder/common/code_auto_merge_editblock.py

@@ -205,6 +205,28 @@ class CodeAutoMergeEditBlock:
                         unmerged_blocks.append((file_path, head, update, similarity))
 
         if unmerged_blocks:
+            if self.args.request_id:
+                # collect unmerged blocks
+                event_data = []
+                for file_path, head, update, similarity in unmerged_blocks:
+                    event_data.append(
+                        {
+                            "file_path": file_path,
+                            "head": head,
+                            "update": update,
+                            "similarity": similarity,
+                        }
+                    )
+
+                _ = queue_communicate.send_event(
+                    request_id=self.args.request_id,
+                    event=CommunicateEvent(
+                        event_type=CommunicateEventType.CODE_UNMERGE_RESULT.value,
+                        data=json.dumps(event_data, ensure_ascii=False),
+                    ),
+                )
+                return
+
             s = f"Found {len(unmerged_blocks)} unmerged blocks, the changes will not be applied. Please review them manually then try again."
             logger.warning(s)
             self._print_unmerged_blocks(unmerged_blocks)

autocoder/utils/queue_communicate.py

@@ -11,6 +11,7 @@ class CommunicateEventType(Enum):
     CODE_MERGE = "code_merge"
     CODE_GENERATE = "code_generate"
     CODE_MERGE_RESULT = "code_merge_result"
+    CODE_UNMERGE_RESULT = "code_unmerge_result"
     CODE_START = "code_start"
     CODE_END = "code_end"
     CODE_HUMAN_AS_MODEL = "code_human_as_model"

autocoder/version.py

@@ -1 +1 @@
-__version__ = "0.1.195"
+__version__ = "0.1.196"