auto-coder 0.1.228__tar.gz → 0.1.229__tar.gz

{auto_coder-0.1.228 → auto_coder-0.1.229}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: auto-coder
-Version: 0.1.228
+Version: 0.1.229
 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.149
+Requires-Dist: byzerllm[saas]>=0.1.150
 Requires-Dist: patch
 Requires-Dist: diff_match_patch
 Requires-Dist: GitPython
@@ -35,6 +35,7 @@ Requires-Dist: anthropic
 Requires-Dist: google-generativeai
 Requires-Dist: protobuf
 Requires-Dist: azure-cognitiveservices-speech
+Requires-Dist: real_agent
 Requires-Dist: python-docx
 Requires-Dist: docx2txt
 Requires-Dist: pdf2image

{auto_coder-0.1.228 → auto_coder-0.1.229}/src/auto_coder.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: auto-coder
-Version: 0.1.228
+Version: 0.1.229
 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.149
+Requires-Dist: byzerllm[saas]>=0.1.150
 Requires-Dist: patch
 Requires-Dist: diff_match_patch
 Requires-Dist: GitPython
@@ -35,6 +35,7 @@ Requires-Dist: anthropic
 Requires-Dist: google-generativeai
 Requires-Dist: protobuf
 Requires-Dist: azure-cognitiveservices-speech
+Requires-Dist: real_agent
 Requires-Dist: python-docx
 Requires-Dist: docx2txt
 Requires-Dist: pdf2image

{auto_coder-0.1.228 → auto_coder-0.1.229}/src/auto_coder.egg-info/SOURCES.txt

@@ -136,6 +136,8 @@ src/autocoder/utils/request_event_queue.py
 src/autocoder/utils/request_queue.py
 src/autocoder/utils/rest.py
 src/autocoder/utils/tests.py
+src/autocoder/utils/auto_coder_utils/__init__.py
+src/autocoder/utils/auto_coder_utils/chat_stream_out.py
 tests/test_action_regex_project.py
 tests/test_chat_auto_coder.py
 tests/test_code_auto_merge_editblock.py

{auto_coder-0.1.228 → auto_coder-0.1.229}/src/auto_coder.egg-info/requires.txt

@@ -16,7 +16,7 @@ tabulate
 jupyter_client
 prompt-toolkit
 tokenizers
-byzerllm[saas]>=0.1.149
+byzerllm[saas]>=0.1.150
 patch
 diff_match_patch
 GitPython
@@ -25,6 +25,7 @@ anthropic
 google-generativeai
 protobuf
 azure-cognitiveservices-speech
+real_agent
 python-docx
 docx2txt
 pdf2image

{auto_coder-0.1.228 → auto_coder-0.1.229}/src/autocoder/auto_coder.py

@@ -42,6 +42,7 @@ from rich.live import Live
 from autocoder.auto_coder_lang import get_message
 from autocoder.common.memory_manager import save_to_memory_file
 from autocoder import models as models_module
+from autocoder.utils.auto_coder_utils.chat_stream_out import stream_out
 
 console = Console()
 
@@ -1257,64 +1258,11 @@ def main(input_args: Optional[List[str]] = None):
                 v = chat_llm.stream_chat_oai(
                     conversations=loaded_conversations, delta_mode=True
                 )                
-
-            assistant_response = ""
-            markdown_content = ""
-
-            try:
-                with Live(
-                    Panel("", title="Response", border_style="green", expand=False),
-                    refresh_per_second=4,
-                    auto_refresh=True,
-                    vertical_overflow="visible",
-                    console=Console(force_terminal=True, color_system="auto", height=None)
-                ) as live:
-                    for res in v:
-                        markdown_content += res[0]
-                        assistant_response += res[0]
-                        if args.request_id:
-                            request_queue.add_request(
-                                args.request_id,
-                                RequestValue(
-                                    value=StreamValue(value=[res[0]]),
-                                    status=RequestOption.RUNNING,
-                                ),
-                            )
-                        live.update(
-                            Panel(
-                                Markdown(markdown_content),
-                                title="Response",
-                                border_style="green",
-                                expand=False,
-                            )
-                        )
-                    live.update(
-                            Panel(
-                                Markdown(markdown_content),
-                                title="Response",
-                                border_style="green",
-                                expand=False,
-                            )
-                        )        
-            except Exception as e:
-                ##MARK
-                console.print(Panel(
-                    f"Error: {str(e)}",  
-                    title="Error",
-                    border_style="red"
-                ))
-                request_queue.add_request(
-                    args.request_id,
-                    RequestValue(
-                        value=StreamValue(value=[str(e)]), status=RequestOption.FAILED
-                    ),
-                )
-            finally:
-                request_queue.add_request(
-                    args.request_id,
-                    RequestValue(
-                        value=StreamValue(value=[""]), status=RequestOption.COMPLETED
-                    ),
+            
+            assistant_response, last_meta = stream_out(
+                    v, 
+                    request_id=args.request_id,                    
+                    console=console
                 )
             
             chat_history["ask_conversation"].append(

{auto_coder-0.1.228 → auto_coder-0.1.229}/src/autocoder/chat_auto_coder.py

@@ -2173,7 +2173,8 @@ def manage_models(params, query: str):
             "model_name": data_dict.get("model_name", data_dict["name"]),
             "base_url": data_dict.get("base_url", "https://api.openai.com/v1"),
             "api_key_path": data_dict.get("api_key_path", "api.openai.com"),
-            "description": data_dict.get("description", "")
+            "description": data_dict.get("description", ""),
+            "is_reasoning": data_dict.get("is_reasoning", "false") in ["true", "True", "TRUE", "1"]
         }
 
         models_data.append(final_model)
@@ -2476,6 +2477,9 @@ def lib_command(args: List[str]):
     else:
         console.print(f"Unknown subcommand: {subcommand}")
 
+def agent(query: str):
+    console.print(f"Agent query: {query}")
+
 
 def main():
     ARGS = parse_arguments()
@@ -2650,14 +2654,20 @@ def main():
                 if not query:
                     print("Please enter your query.")
                 else:
-                    manage_models(ARGS,query)    
+                    manage_models(ARGS,query) 
+            elif user_input.startswith("/agent"):
+                query = user_input[len("/agent"):].strip()
+                if not query:
+                    print("Please enter your query.")
+                else:
+                    agent(query)
 
             elif user_input.startswith("/mode"):
                 conf = user_input[len("/mode"):].strip()
                 if not conf:
                     print(memory["mode"])
                 else:
-                    memory["mode"] = conf
+                    memory["mode"] = conf                    
 
             elif user_input.startswith("/conf"):
                 conf = user_input[len("/conf"):].strip()

{auto_coder-0.1.228 → auto_coder-0.1.229}/src/autocoder/models.py

@@ -13,7 +13,8 @@ default_models_list = [
         "model_name": "deepseek-reasoner",
         "model_type": "saas/openai",
         "base_url": "https://api.deepseek.com/v1",
-        "api_key_path": "api.deepseek.com"
+        "api_key_path": "api.deepseek.com",
+        "is_reasoning": True
     },    
     {
         "name": "deepseek_chat",
@@ -21,7 +22,8 @@ default_models_list = [
         "model_name": "deepseek-chat",
         "model_type": "saas/openai",
         "base_url": "https://api.deepseek.com/v1",
-        "api_key_path": "api.deepseek.com"
+        "api_key_path": "api.deepseek.com",
+        "is_reasoning": False
     },
     {
         "name":"o1",
@@ -29,7 +31,8 @@ default_models_list = [
         "model_name": "o1-2024-12-17",
         "model_type": "saas/openai",
         "base_url": "https://api.openai.com/v1",
-        "api_key_path": ""
+        "api_key_path": "",
+        "is_reasoning": False
     }
 ]
 
@@ -123,7 +126,7 @@ def update_model_with_api_key(name: str, api_key: str) -> Dict:
     # 在现有模型中查找
     found_model = None
     for model in models:
-        if model["name"] == name:
+        if model["name"] == name.strip():
             found_model = model
             break
                     
@@ -140,7 +143,7 @@ def update_model_with_api_key(name: str, api_key: str) -> Dict:
         os.makedirs(api_key_dir, exist_ok=True)
         api_key_file = os.path.join(api_key_dir, api_key_path)
         with open(api_key_file, "w") as f:
-            f.write(api_key)
+            f.write(api_key.strip())
         
         # 如果是新模型，添加到模型列表中
         if all(model["name"] != name for model in models):

auto_coder-0.1.229/src/autocoder/utils/auto_coder_utils/chat_stream_out.py

@@ -0,0 +1,120 @@
+from rich.console import Console
+from rich.live import Live
+from rich.panel import Panel
+from rich.markdown import Markdown
+from typing import Generator, List, Dict, Any, Optional, Tuple
+from autocoder.utils.request_queue import RequestValue, RequestOption, StreamValue
+from autocoder.utils.request_queue import request_queue
+
+MAX_HISTORY_LINES = 40  # 最大保留历史行数
+
+def stream_out(
+    stream_generator: Generator[Tuple[str, Dict[str, Any]], None, None],
+    request_id: Optional[str] = None,    
+    console: Optional[Console] = None
+) -> Tuple[str, Optional[Dict[str, Any]]]:
+    """
+    处理流式输出事件并在终端中展示
+    
+    Args:
+        stream_generator: 生成流式输出的生成器
+        request_id: 请求ID,用于更新请求队列        
+        console: Rich Console对象
+        
+    Returns:
+        Tuple[str, Dict[str, Any]]: 返回完整的响应内容和最后的元数据
+    """
+    if console is None:
+        console = Console(force_terminal=True, color_system="auto", height=None)
+        
+    lines_buffer = []  # 存储历史行
+    current_line = ""  # 当前行
+    assistant_response = ""
+    last_meta = None
+    
+    try:
+        with Live(
+            Panel("", title="Response", border_style="green"),
+            refresh_per_second=4,
+            console=console
+        ) as live:
+            for res in stream_generator:
+                last_meta = res[1]
+                content = res[0]
+                assistant_response += content
+                
+                # 处理所有行
+                parts = (current_line + content).split("\n")
+                
+                # 最后一部分是未完成的新行
+                if len(parts) > 1:
+                    # 将完整行加入缓冲区
+                    lines_buffer.extend(parts[:-1])
+                    # 保留最大行数限制
+                    if len(lines_buffer) > MAX_HISTORY_LINES:
+                        del lines_buffer[0:len(lines_buffer) - MAX_HISTORY_LINES]
+                
+                # 更新当前行
+                current_line = parts[-1]
+                
+                # 构建显示内容 = 历史行 + 当前行
+                display_content = "\n".join(lines_buffer[-MAX_HISTORY_LINES:] + [current_line])
+                
+                if request_id and request_queue:
+                    request_queue.add_request(
+                        request_id,
+                        RequestValue(
+                            value=StreamValue(value=[content]),
+                            status=RequestOption.RUNNING,
+                        ),
+                    )
+                    
+                live.update(
+                    Panel(
+                        Markdown(display_content),
+                        title="Response",
+                        border_style="green",
+                        height=min(50, live.console.height - 4)
+                    )
+                )
+            
+            # 处理最后一行的内容
+            if current_line:
+                lines_buffer.append(current_line)
+            
+            # 最终显示结果
+            live.update(
+                Panel(
+                    Markdown(assistant_response),
+                    title="Final Response",
+                    border_style="blue"
+                )
+            )
+            
+    except Exception as e:
+        console.print(Panel(
+            f"Error: {str(e)}",  
+            title="Error",
+            border_style="red"
+        ))
+        
+        if request_id and request_queue:
+            request_queue.add_request(
+                request_id,
+                RequestValue(
+                    value=StreamValue(value=[str(e)]), 
+                    status=RequestOption.FAILED
+                ),
+            )
+            
+    finally:
+        if request_id and request_queue:
+            request_queue.add_request(
+                request_id,
+                RequestValue(
+                    value=StreamValue(value=[""]), 
+                    status=RequestOption.COMPLETED
+                ),
+            )
+            
+    return assistant_response, last_meta

auto_coder-0.1.229/src/autocoder/version.py

@@ -0,0 +1 @@
+__version__ = "0.1.229"

auto_coder-0.1.228/src/autocoder/version.py

@@ -1 +0,0 @@
-__version__ = "0.1.228"