auto-coder 0.1.304__py3-none-any.whl → 0.1.306__py3-none-any.whl

autocoder/dispacher/actions/action.py

@@ -112,10 +112,7 @@ class ActionTSProject(BaseAction):
                     f"Content(send to model) is {content_length} tokens, which is larger than the maximum input length {self.args.model_max_input_length}"
                 )
 
-        if global_cancel.requested:
-            printer = Printer()
-            raise Exception(printer.get_message_from_key(
-                "generation_cancelled"))
+        global_cancel.check_and_raise()
 
         if args.execute:
             self.printer.print_in_terminal("code_generation_start")
@@ -181,10 +178,7 @@ class ActionTSProject(BaseAction):
                     action_file=self.args.file
                 ).to_dict())
 
-            if global_cancel.requested:
-                printer = Printer()
-                raise Exception(printer.get_message_from_key(
-                    "generation_cancelled"))
+            global_cancel.check_and_raise()
 
             merge_result = None
             if args.execute and args.auto_merge:
@@ -227,144 +221,6 @@ class ActionTSProject(BaseAction):
                     )
 
 
-class ActionPyScriptProject(BaseAction):
-    def __init__(
-        self, args: AutoCoderArgs, llm: Optional[byzerllm.ByzerLLM] = None
-    ) -> None:
-        self.args = args
-        self.llm = llm
-        self.printer = Printer()
-
-    def run(self) -> bool:
-        args = self.args
-        if args.project_type != "py-script":
-            return False
-        pp = Level1PyProject(
-            script_path=args.script_path, package_name=args.package_name
-        )
-        pp.run()
-        source_code_list = SourceCodeList(pp.sources)
-        self.process_content(source_code_list)
-        return True
-
-    def process_content(self, source_code_list: SourceCodeList):
-        args = self.args
-        if global_cancel.requested:
-            printer = Printer()
-            raise Exception(printer.get_message_from_key(
-                "generation_cancelled"))
-
-        if args.execute:
-            self.printer.print_in_terminal("code_generation_start")
-            start_time = time.time()
-            if args.auto_merge == "diff":
-                generate = CodeAutoGenerateDiff(
-                    llm=self.llm, args=self.args, action=self
-                )
-            elif args.auto_merge == "strict_diff":
-                generate = CodeAutoGenerateStrictDiff(
-                    llm=self.llm, args=self.args, action=self
-                )
-            elif args.auto_merge == "editblock":
-                generate = CodeAutoGenerateEditBlock(
-                    llm=self.llm, args=self.args, action=self
-                )
-            else:
-                generate = CodeAutoGenerate(
-                    llm=self.llm, args=self.args, action=self)
-            if self.args.enable_multi_round_generate:
-                generate_result = generate.multi_round_run(
-                    query=args.query, source_code_list=source_code_list
-                )
-            else:
-                generate_result = generate.single_round_run(
-                    query=args.query, source_code_list=source_code_list
-                )
-
-            elapsed_time = time.time() - start_time
-            speed = generate_result.metadata.get(
-                'generated_tokens_count', 0) / elapsed_time if elapsed_time > 0 else 0
-            model_names = ",".join(get_llm_names(generate.llms))
-            input_tokens_cost = generate_result.metadata.get(
-                'input_tokens_cost', 0)
-            generated_tokens_cost = generate_result.metadata.get(
-                'generated_tokens_cost', 0)
-            self.printer.print_in_terminal(
-                "code_generation_complete",
-                duration=elapsed_time,
-                input_tokens=generate_result.metadata.get(
-                    'input_tokens_count', 0),
-                output_tokens=generate_result.metadata.get(
-                    'generated_tokens_count', 0),
-                input_cost=input_tokens_cost,
-                output_cost=generated_tokens_cost,
-                speed=round(speed, 2),
-                model_names=model_names,
-                sampling_count=len(generate_result.contents)
-            )
-
-            get_event_manager(self.args.event_file).write_result(
-                EventContentCreator.create_result(content=EventContentCreator.ResultTokenStatContent(
-                    model_name=model_names,
-                    elapsed_time=elapsed_time,
-                    input_tokens=generate_result.metadata.get(
-                        'input_tokens_count', 0),
-                    output_tokens=generate_result.metadata.get(
-                        'generated_tokens_count', 0),
-                    input_cost=input_tokens_cost,
-                    output_cost=generated_tokens_cost,
-                    speed=round(speed, 2)
-                )).to_dict(),metadata=EventMetadata(
-                    action_file=self.args.file
-                ).to_dict())
-
-            if global_cancel.requested:
-                printer = Printer()
-                raise Exception(printer.get_message_from_key(
-                    "generation_cancelled"))
-
-            merge_result = None
-            if args.execute and args.auto_merge:
-                self.printer.print_in_terminal("code_merge_start")
-                if args.auto_merge == "diff":
-                    code_merge = CodeAutoMergeDiff(
-                        llm=self.llm, args=self.args)
-                    merge_result = code_merge.merge_code(
-                        generate_result=generate_result)
-                elif args.auto_merge == "strict_diff":
-                    code_merge = CodeAutoMergeStrictDiff(
-                        llm=self.llm, args=self.args)
-                    merge_result = code_merge.merge_code(
-                        generate_result=generate_result)
-                elif args.auto_merge == "editblock":
-                    code_merge = CodeAutoMergeEditBlock(
-                        llm=self.llm, args=self.args)
-                    merge_result = code_merge.merge_code(
-                        generate_result=generate_result)
-                else:
-                    code_merge = CodeAutoMerge(llm=self.llm, args=self.args)
-                    merge_result = code_merge.merge_code(
-                        generate_result=generate_result)
-
-                content = merge_result.contents[0]
-
-                store_code_model_conversation(
-                    args=self.args,
-                    instruction=self.args.query,
-                    conversations=merge_result.conversations[0],
-                    model=self.llm.default_model_name,
-                )
-            else:
-                content = generate_result.contents[0]
-
-                store_code_model_conversation(
-                    args=self.args,
-                    instruction=self.args.query,
-                    conversations=generate_result.conversations[0],
-                    model=self.llm.default_model_name,
-                )
-
-
 class ActionPyProject(BaseAction):
     def __init__(
         self, args: AutoCoderArgs, llm: Optional[byzerllm.ByzerLLM] = None
@@ -410,10 +266,7 @@ class ActionPyProject(BaseAction):
                     max_length=self.args.model_max_input_length
                 )
 
-        if global_cancel.requested:
-            printer = Printer()
-            raise Exception(printer.get_message_from_key(
-                "generation_cancelled"))
+        global_cancel.check_and_raise()
 
         if args.execute:
             self.printer.print_in_terminal("code_generation_start")
@@ -479,10 +332,7 @@ class ActionPyProject(BaseAction):
                     action_file=self.args.file
                 ).to_dict())
 
-            if global_cancel.requested:
-                printer = Printer()
-                raise Exception(printer.get_message_from_key(
-                    "generation_cancelled"))
+            global_cancel.check_and_raise()
 
             merge_result = None
             if args.execute and args.auto_merge:
@@ -563,10 +413,7 @@ class ActionSuffixProject(BaseAction):
                     f"Content(send to model) is {content_length} tokens, which is larger than the maximum input length {self.args.model_max_input_length}"
                 )
 
-        if global_cancel.requested:
-            printer = Printer()
-            raise Exception(printer.get_message_from_key(
-                "generation_cancelled"))
+        global_cancel.check_and_raise()
 
         if args.execute:
             self.printer.print_in_terminal("code_generation_start")
@@ -631,10 +478,7 @@ class ActionSuffixProject(BaseAction):
                     action_file=self.args.file
                 ).to_dict())
 
-        if global_cancel.requested:
-            printer = Printer()
-            raise Exception(printer.get_message_from_key(
-                "generation_cancelled"))
+        global_cancel.check_and_raise()
 
         merge_result = None
         if args.execute and args.auto_merge:

autocoder/dispacher/actions/plugins/action_regex_project.py

@@ -66,9 +66,7 @@ class ActionRegexProject:
 
         start_time = time.time()
         
-        if global_cancel.requested:
-            printer = Printer()            
-            raise Exception(printer.get_message_from_key("generation_cancelled")) 
+        global_cancel.check_and_raise()
         
         if args.execute:
             self.printer.print_in_terminal("code_generation_start")
@@ -128,9 +126,7 @@ class ActionRegexProject:
                     action_file=self.args.file
                 ).to_dict())
 
-            if global_cancel.requested:
-                printer = Printer()            
-                raise Exception(printer.get_message_from_key("generation_cancelled")) 
+            global_cancel.check_and_raise()
             
             merge_result = None
             if args.execute and args.auto_merge:

autocoder/index/filter/quick_filter.py

@@ -120,7 +120,8 @@ class QuickFilter():
                         self.index_manager.index_filter_llm,
                         [{"role": "user", "content": self.quick_filter_files.prompt(
                             chunk, self.args.query)}],
-                        {}
+                        {},
+                        self.args
                     )
                     full_response, last_meta = stream_out(
                         stream_generator,
@@ -485,7 +486,8 @@ class QuickFilter():
             stream_generator = stream_chat_with_continue(
                 self.index_manager.index_filter_llm,
                 [{"role": "user", "content": query}],
-                {}
+                {},
+                self.args
             )
 
             def extract_file_number_list(content: str) -> str:
@@ -760,7 +762,8 @@ class QuickFilter():
                 stream_generator = stream_chat_with_continue(
                     self.index_manager.index_filter_llm,
                     [{"role": "user", "content": prompt}],
-                    {}
+                    {},
+                    self.args
                 )
                 
                 def extract_file_number_list(content: str) -> str:

autocoder/index/index.py

@@ -296,8 +296,7 @@ class IndexManager:
         return False
 
     def build_index_for_single_source(self, source: SourceCode):
-        if global_cancel.requested:
-            return None
+        global_cancel.check_and_raise()
 
         file_path = source.module_name
         if not os.path.exists(file_path):
@@ -552,8 +551,7 @@ class IndexManager:
                 for source in wait_to_build_files
             ]
             for future in as_completed(futures):
-                if global_cancel.requested:
-                    break
+                global_cancel.check_and_raise()
                 result = future.result()
                 if result is not None:
                     counter += 1

autocoder/memory/__init__.py

@@ -0,0 +1,7 @@
+"""
+记忆子系统 - 用于跟踪和记录代码变更上下文
+"""
+
+from autocoder.memory.active_context_manager import ActiveContextManager
+
+__all__ = ["ActiveContextManager"]