auto-coder 0.1.400__py3-none-any.whl → 2.0.0__py3-none-any.whl

autocoder/common/__init__.py

@@ -235,183 +235,197 @@ def chat_with_llm_step_by_step(
 
 class AutoCoderArgs(pydantic.BaseModel):
     request_id: Optional[str] = None
-    source_dir: Optional[str] = None
+    source_dir: Optional[str] = "."
     git_url: Optional[str] = None
     target_file: Optional[str] = None
     query: Optional[str] = None
     template: Optional[str] = None
     project_type: Optional[str] = None
     execute: Optional[bool] = None
-    package_name: Optional[str] = ""
-    script_path: Optional[str] = ""
+    package_name: str = ""
+    script_path: str = ""
         
-    model: Optional[str] = ""
-    chat_model: Optional[str] = ""
-    model_max_length: Optional[int] = 2000
-    model_max_input_length: Optional[int] = 6000
-    vl_model: Optional[str] = ""
-    sd_model: Optional[str] = ""
-    emb_model: Optional[str] = ""
-    code_model: Optional[str] = ""
-    generate_rerank_model: Optional[str] = ""
-    context_prune_model: Optional[str] = ""
-    conversation_prune_model: Optional[str] = ""
-    inference_model: Optional[str] = ""
-    system_prompt: Optional[str] = ""
-    planner_model: Optional[str] = ""
-    voice2text_model: Optional[str] = ""
-    text2voice_model: Optional[str] = ""
-    commit_model: Optional[str] = ""
+    model: str = ""
+    chat_model: str = ""
+    model_max_length: int = 2000
+    model_max_input_length: int = 6000
+    vl_model: str = ""
+    sd_model: str = ""
+    emb_model: str = ""
+    code_model: str = ""
+    generate_rerank_model: str = ""
+    context_prune_model: str = ""
+    conversation_prune_model: str = ""
+    inference_model: str = ""
+    system_prompt: str = ""
+    planner_model: str = ""
+    voice2text_model: str = ""
+    text2voice_model: str = ""
+    commit_model: str = ""
     
-    skip_build_index: Optional[bool] = False
-    skip_filter_index: Optional[bool] = False
-
-    index_model: Optional[str] = ""
-    index_filter_model: Optional[str] = ""
-    index_filter_model_max_input_length: Optional[int] = 50*1024
-    index_model_max_length: Optional[int] = 0
-    index_model_max_input_length: Optional[int] = 0
-    index_model_anti_quota_limit: Optional[int] = 0
-
-    enable_agentic_filter: Optional[bool] = False
-    enable_agentic_edit: Optional[bool] = True
-    enable_agentic_auto_approve: Optional[bool] = False
-    enable_agentic_dangerous_command_check: Optional[bool] = False
+    skip_build_index: bool = False
+    skip_filter_index: bool = False
+
+    index_model: str = ""
+    index_filter_model: str = ""
+    index_filter_model_max_input_length: int = 50*1024
+    index_model_max_length: int = 0
+    index_model_max_input_length: int = 0
+    index_model_anti_quota_limit: int = 0
+
+    enable_agentic_filter: bool = True
+    enable_agentic_edit: bool = True
+    enable_agentic_auto_approve: bool = False
+    enable_agentic_dangerous_command_check: bool = False
+    agentic_max_rounds: int = 10000
+    agentic_mode:str = "act" #plan|act
+    agentic_connection_retries: int = 10
+    agentic_filter_retries: int = 3
     
 
-    index_filter_level: Optional[int] = 0
-    index_filter_enable_relevance_verification: Optional[bool] = True
-    index_filter_workers: Optional[int] = 1
-    index_filter_file_num: Optional[int] = 10
-    index_build_workers: Optional[int] = 1
+    index_filter_level: int = 0
+    index_filter_enable_relevance_verification: bool = True
+    index_filter_workers: int = 1
+    index_filter_file_num: int = 10
+    index_build_workers: int = 1
     
-    planner_model: Optional[str] = ""
-    designer_model: Optional[str] = ""
-    file: Optional[str] = ""
-    ray_address: Optional[str] = ""
-    anti_quota_limit: Optional[int] = 1    
-    print_request: Optional[bool] = False
-    py_packages: Optional[str] = ""
+    designer_model: str = ""
+    file: Optional[str] = None
+    ray_address: str = ""
+    anti_quota_limit: int = 1    
+    print_request: bool = False
+    py_packages: str = ""
     
-    search: Optional[Union[str, List[str]]] = ""
-    search_engine: Optional[str] = ""
-    search_engine_token: Optional[str] = ""
+    search: Union[str, List[str]] = ""
+    search_engine: str = ""
+    search_engine_token: str = ""
         
-    rag_url: Optional[str] = ""
-    rag_token: Optional[str] = ""
-    rag_type: Optional[str] = "storage"
-    rag_storage_type: Optional[str] = "duckdb"  # 向量化存储类型 byzer-storage | duckdb
-    rag_params_max_tokens: Optional[int] = 500000 
-    rag_doc_filter_relevance: Optional[int] = 2
-    rag_context_window_limit: Optional[int] = 120000
-    rag_duckdb_vector_dim: Optional[int] = 1024  # DuckDB 向量化存储的维度
-    rag_duckdb_query_similarity: Optional[float] = 0.1  # DuckDB 向量化检索 相似度 阈值
-    rag_duckdb_query_top_k: Optional[int] = 10000  # DuckDB 向量化检索 返回 TopK个结果(且大于相似度)
-    rag_index_build_workers: Optional[int] = 10
-    rag_emb_dim: Optional[int] = 1024
-    rag_emb_text_size: Optional[int] = 1024
+    rag_url: str = ""
+    rag_token: str = ""
+    rag_type: str = "storage"
+    rag_storage_type: str = "duckdb"  # 向量化存储类型 byzer-storage | duckdb
+    rag_params_max_tokens: int = 500000 
+    rag_doc_filter_relevance: int = 2
+    rag_context_window_limit: int = 120000
+    rag_duckdb_vector_dim: int = 1024  # DuckDB 向量化存储的维度
+    rag_duckdb_query_similarity: float = 0.1  # DuckDB 向量化检索 相似度 阈值
+    rag_duckdb_query_top_k: int = 10000  # DuckDB 向量化检索 返回 TopK个结果(且大于相似度)
+    rag_index_build_workers: int = 10
+    rag_emb_dim: int = 1024
+    rag_emb_text_size: int = 1024
     # rag 本地图床地址
-    local_image_host: Optional[str] = ""
-    rag_recall_max_queries: Optional[int] = 5
+    local_image_host: str = ""
+    rag_recall_max_queries: int = 5
+
+    include_rules: bool = True
 
     
     # 回答用户问题时，使用哪种对话历史策略
     # single_round: 单轮对话
     # multi_round: 多轮对话
-    rag_qa_conversation_strategy: Optional[str] = "multi_round"
+    rag_qa_conversation_strategy: str = "multi_round"
 
     verify_file_relevance_score: int = 6
-    enable_rag_search: Optional[Union[bool, str]] = False
-    enable_rag_context: Optional[Union[bool, str]] = False
+    enable_rag_search: Union[bool, str] = False
+    enable_rag_context: Union[bool, str] = False
     collection: Optional[str] = None
     collections: Optional[str] = None
 
-    auto_merge: Optional[Union[bool, str]] = False
-    human_as_model: Optional[bool] = False
-    human_model_num: Optional[int] = 1
+    auto_merge: Union[bool, str] = False
+    human_as_model: bool = False
+    human_model_num: int = 1
 
-    image_file: Optional[str] = ""
-    image_mode: Optional[str] = "direct"
-    image_max_iter: Optional[int] = 1
+    image_file: str = ""
+    image_mode: str = "direct"
+    image_max_iter: int = 1
     
-    urls: Optional[Union[str, List[str]]] = ""
-    urls_use_model: Optional[bool] = False    
+    urls: Union[str, List[str]] = ""
+    urls_use_model: bool = False    
     command: Optional[str] = None
     doc_command: Optional[str] = None
     required_exts: Optional[str] = None
-    hybrid_index_max_output_tokens: Optional[int] = 1000000
+    hybrid_index_max_output_tokens: int = 1000000
 
-    enable_multi_round_generate: Optional[bool] = False
+    enable_multi_round_generate: bool = False
 
     monitor_mode: bool = False
     enable_hybrid_index: bool = False
     rag_build_name: Optional[str] = None
     disable_auto_window: bool = False
-    filter_batch_size: Optional[int] = 5
+    filter_batch_size: int = 5
     disable_segment_reorder: bool = False    
     tokenizer_path: Optional[str] = None
-    skip_confirm: Optional[bool] = False
-    silence: Optional[bool] = False
-    exclude_files: Optional[Union[str, List[str]]] = ""
-    output: Optional[str] = ""
-    single_file: Optional[bool] = False
+    skip_confirm: bool = False
+    silence: bool = False
+    exclude_files: Union[str, List[str]] = ""
+    output: str = ""
+    single_file: bool = False
     query_prefix: Optional[str] = None
     query_suffix: Optional[str] = None
     from_yaml: Optional[str] = None
     base_dir: Optional[str] = None
     context: Optional[str] = None
-    editblock_similarity: Optional[float] = 0.9
-    include_project_structure: Optional[bool] = False
-    new_session: Optional[bool] = False    
-
-    tokenizer_path: Optional[str] = None
+    editblock_similarity: float = 0.9
+    include_project_structure: bool = False
+    new_session: bool = False    
 
     prompt_review: Optional[str] = None
 
-    agent_designer_mode: Optional[str] = "svg"
+    agent_designer_mode: str = "svg"
 
-    full_text_ratio: Optional[float] = 0.7
-    segment_ratio: Optional[float] = 0.2
-    buff_ratio: Optional[float] = 0.1
+    full_text_ratio: float = 0.7
+    segment_ratio: float = 0.2
+    buff_ratio: float = 0.1
 
-    disable_inference_enhance: Optional[bool] = True
-    inference_deep_thought: Optional[bool] = False
-    inference_slow_without_deep_thought: Optional[bool] = False
+    disable_inference_enhance: bool = True
+    inference_deep_thought: bool = False
+    inference_slow_without_deep_thought: bool = False
     inference_compute_precision: int = 64
-    without_contexts: Optional[bool] = False
-    skip_events: Optional[bool] = False
-    data_cells_max_num: Optional[int] = 2000
-    generate_times_same_model: Optional[int] = 1
-    rank_times_same_model: Optional[int] = 1
+    without_contexts: bool = False
+    skip_events: bool = False
+    data_cells_max_num: int = 2000
+    generate_times_same_model: int = 1
+    rank_times_same_model: int = 1
     
     # block:给定每个文件修改的代码块 file: 给定每个文件修改前后内容
-    rank_strategy: Optional[str] = "file"
+    rank_strategy: str = "file"
 
     action: Union[List[str], Dict[str, Any]] = []
-    enable_global_memory: Optional[bool] = False  
-    product_mode: Optional[str] = "lite"
+    cancel_token: Optional[str] = None
+    enable_global_memory: bool = False  
+    product_mode: str = "lite"
 
-    keep_reasoning_content: Optional[bool] = False
-    keep_only_reasoning_content: Optional[bool] = False
+    keep_reasoning_content: bool = False
+    keep_only_reasoning_content: bool = False
 
     in_code_apply: bool = False
     model_filter_path: Optional[str] = None
 
-    conversation_prune_safe_zone_tokens: Optional[int] = 50*1024
-    conversation_prune_group_size: Optional[int] = 4
-    conversation_prune_strategy: Optional[str] = "summarize"
+    conversation_prune_safe_zone_tokens: Union[str, int, float] = 0.7
+    conversation_prune_group_size: int = 4
+    conversation_prune_strategy: str = "summarize"
+
+    context_prune_strategy: str = "extract"
+    context_prune: bool = True
+    context_prune_safe_zone_tokens: Union[str, int, float] = 40*1024
+    context_prune_sliding_window_size: int = 1000
+    context_prune_sliding_window_overlap: int = 100
 
-    context_prune_strategy: Optional[str] = "extract"
-    context_prune: Optional[bool] = True
-    context_prune_safe_zone_tokens: Optional[int] = 32*1024
-    context_prune_sliding_window_size: Optional[int] = 1000
-    context_prune_sliding_window_overlap: Optional[int] = 100
+    # Range-based conversation pruning settings
+    enable_range_pruning: bool = False           # 是否启用区间裁剪
+    range_preserve_pairs: bool = True            # 是否保证user/assistant成对裁剪
+    range_storage_dir: Optional[str] = None      # 存储目录，None使用默认目录
+    range_backup_enabled: bool = True            # 是否启用备份
+    range_max_backup_files: int = 10             # 最大备份文件数
 
-    auto_command_max_iterations: Optional[int] = 10
+    auto_command_max_iterations: int = 10
+
+    
+    use_shell_commands: bool = True
     
-    skip_commit: Optional[bool] = False 
+    skip_commit: bool = True
 
-    enable_beta: Optional[bool] = False
+    enable_beta: bool = False
 
     how_to_reproduce: Optional[str] = None
 
@@ -419,28 +433,36 @@ class AutoCoderArgs(pydantic.BaseModel):
 
     add_updated_urls: List[str] = []
 
-    enable_task_history: Optional[bool] = False
+    enable_task_history: bool = False
 
     event_file: Optional[str] = None
 
-    enable_active_context: Optional[bool] = False
-    enable_active_context_in_generate: Optional[bool] = False
+    enable_active_context: bool = False
+    enable_active_context_in_generate: bool = False
 
-    generate_max_rounds: Optional[int] = 5
+    generate_max_rounds: int = 5
 
     revert_commit_id: Optional[str] = None
 
-    enable_auto_fix_lint: Optional[bool] = False
-    enable_auto_fix_compile: Optional[bool] = False
-    enable_auto_fix_merge: Optional[bool] = False
+    enable_auto_fix_lint: bool = False
+    enable_auto_fix_compile: bool = False
+    enable_auto_fix_merge: bool = False
 
-    auto_fix_lint_max_attempts: Optional[int] = 5
-    auto_fix_compile_max_attempts: Optional[int] = 5
-    auto_fix_merge_max_attempts: Optional[int] = 5
+    auto_fix_lint_max_attempts: int = 5
+    auto_fix_compile_max_attempts: int = 5
+    auto_fix_merge_max_attempts: int = 5
 
-    enable_auto_select_rules: Optional[bool] = True
+    enable_auto_select_rules: bool = True
     
-    ignore_clean_shadows: Optional[bool] = False
+    ignore_clean_shadows: bool = False
+
+    firecrawl_api_key: Optional[str] = None
+    metaso_api_key: Optional[str] = None
+    bochaai_api_key: Optional[str] = None
+
+    # Timeout (in seconds) for calling subagents via RunNamedSubagentsToolResolver
+    # Default to 30 minutes
+    call_subagent_timeout: float = 30 * 60
 
     class Config:
         protected_namespaces = ()

autocoder/common/ac_style_command_parser/__init__.py

@@ -1,15 +1,52 @@
 from .parser import (
     CommandParser,
+    QueryCommand,
     parse_query,
     has_command,
     get_command_args,
-    get_command_kwargs
+    get_command_kwargs,
+    get_query_command
+)
+
+from .config import (
+    ArgType,
+    ParamConstraint,
+    ArgumentConfig,
+    CommandConfig,
+    ParserConfig,
+    ConfigBuilder,
+    create_config
+)
+
+from .typed_parser import (
+    ParsedCommand,
+    TypedCommandParser,
+    TypedQueryCommand,
+    parse_typed_query
 )
 
 __all__ = [
+    # 原有的解析器
     "CommandParser",
+    "QueryCommand",
     "parse_query", 
     "has_command",
     "get_command_args",
-    "get_command_kwargs"
+    "get_command_kwargs",
+    "get_query_command",
+    
+    # 配置相关
+    "ArgType",
+    "ParamConstraint",
+    "ArgumentConfig",
+    "CommandConfig",
+    "ParserConfig",
+    "ConfigBuilder",
+    "create_config",
+    
+    # 类型化解析器
+    "ParsedCommand",
+    "TypedCommandParser",
+    "TypedQueryCommand",
+    "parse_typed_query"
 ]