auto-coder 0.1.345__py3-none-any.whl → 0.1.347__py3-none-any.whl

autocoder/rag/qa_conversation_strategy.py

@@ -1,6 +1,7 @@
 from abc import ABC, abstractmethod
-from typing import List, Dict, Any,Generator
+from typing import List, Dict, Any, Generator
 import byzerllm
+from autocoder.common import AutoCoderArgs
 
 class QAConversationStrategy(ABC):
     """
@@ -26,6 +27,9 @@ class MultiRoundStrategy(QAConversationStrategy):
     Multi-round strategy: First let the model read documents, then do Q&A.
     Creates multiple conversation turns.
     """
+    def __init__(self, args: AutoCoderArgs):
+        self.args = args
+
     def create_conversation(self, documents: List[Any], conversations: List[Dict[str,str]], local_image_host: str) -> List[Dict]:
         messages = []    
         messages.extend([
@@ -36,7 +40,7 @@ class MultiRoundStrategy(QAConversationStrategy):
         return messages
     
     @byzerllm.prompt()
-    def _read_docs_prompt(
+    def _read_docs_prompt_old(
         self, relevant_docs: List[str], local_image_host: str
     ) -> Generator[str, None, None]:
         """        
@@ -68,6 +72,76 @@ class MultiRoundStrategy(QAConversationStrategy):
         例如：/path/to/images/image.png， 返回 http://{{ local_image_host }}/static/path/to/images/image.png
         {% endif %}
         """
+    
+    @byzerllm.prompt()
+    def _read_docs_prompt(
+        self, relevant_docs: List[str], local_image_host: str
+    ) -> Generator[str, None, None]:
+        """
+        You are a knowledgeable assistant capable of answering any user question strictly based on the retrieved documents.
+
+        ====
+
+        FILES CONTEXT
+
+        The following files are provided to you as context for the user's task. Use these files to understand the project and answer questions strictly based on their content.
+
+        <documents>
+        {% for doc in relevant_docs %}
+        {{ doc }}
+        {% endfor %}
+        </documents>
+
+        ====
+        {% endif %}
+
+        INSTRUCTIONS
+
+        - Use ONLY the information from the provided documents and extension docs.
+        - If the documents do not contain enough information to answer, reply: "抱歉,文档中没有足够的信息来回答这个问题。"
+        - Do NOT invent, guess, or add information beyond what is provided.
+
+        - For Markdown images like ![image](/path/to/image.png):
+          - Analyze surrounding text to determine relevance.
+          - Include relevant images naturally in your answer, preserving image paths.
+          - Convert Windows paths to Linux style (e.g., C:\\path\\to\\img.png -> C:/path/to/img.png)
+          {% if local_image_host %}
+          - Prefix image URLs with http://{{ local_image_host }}/static/
+          {% endif %}
+
+        - Format your answer with Markdown for readability.                
+        - Always use the language used by the user in their question.
+
+        {% if extra_docs %}
+        ====
+
+        RULES PROVIDED BY USER
+
+        The following rules are provided by the user, and you must follow them strictly.
+
+        {% for key, value in extra_docs.items() %}
+        ### {{ key }}
+        {{ value }}
+        {% endfor %}        
+        {% endif %}
+
+        """
+
+        import os
+        extra_docs = {}
+        rules_dir = os.path.join(self.args.source_dir, ".autocoderrules")
+        if os.path.isdir(rules_dir):
+            for fname in os.listdir(rules_dir):
+                if fname.endswith(".md"):
+                    fpath = os.path.join(rules_dir, fname)
+                    try:
+                        with open(fpath, "r", encoding="utf-8") as f:
+                            content = f.read()
+                            key = os.path.splitext(fname)[0]
+                            extra_docs[key] = content
+                    except Exception:
+                        continue
+        return {"extra_docs": extra_docs}
 
 class SingleRoundStrategy(QAConversationStrategy):
     """
@@ -81,7 +155,7 @@ class SingleRoundStrategy(QAConversationStrategy):
         return messages
     
     @byzerllm.prompt()
-    def _single_round_answer_question(
+    def _single_round_answer_question_old(
         self, relevant_docs: List[str], conversations: List[Dict[str, str]], local_image_host: str
     ) -> Generator[str, None, None]:
         """        
@@ -120,26 +194,105 @@ class SingleRoundStrategy(QAConversationStrategy):
         例如：/path/to/images/image.png， 返回 http://{{ local_image_host }}/static/path/to/images/image.png
         {% endif %}
         """
+    
+    @byzerllm.prompt()
+    def _single_round_answer_question(
+        self, relevant_docs: List[str], conversations: List[Dict[str, str]], local_image_host: str
+    ) -> Generator[str, None, None]:
+        """
+        You are a knowledgeable assistant capable of answering any user question strictly based on the retrieved documents.
+
+        ====
 
-def get_qa_strategy(strategy_name: str) -> QAConversationStrategy:
+        FILES CONTEXT
+
+        The following files are provided to you as context for the user's task. Use these files to understand the project and answer questions strictly based on their content.
+
+        <documents>
+        {% for doc in relevant_docs %}
+        {{ doc }}
+        {% endfor %}
+        </documents>
+
+        ====
+        {% endif %}
+
+        USER CONVERSATION HISTORY
+
+        {% for msg in conversations %}
+        <{{ msg.role }}>: {{ msg.content }}
+        {% endfor %}
+
+        ====
+
+        INSTRUCTIONS
+
+        - Use ONLY the information from the provided documents and extension docs.
+        - If the documents do not contain enough information to answer, reply: "抱歉,文档中没有足够的信息来回答这个问题。"
+        - Do NOT invent, guess, or add information beyond what is provided.
+
+        - For Markdown images like ![image](/path/to/image.png):
+          - Analyze surrounding text to determine relevance.
+          - Include relevant images naturally in your answer, preserving image paths.
+          - Convert Windows paths to Linux style (e.g., C:\\path\\to\\img.png -> C:/path/to/img.png)
+          {% if local_image_host %}
+          - Prefix image URLs with http://{{ local_image_host }}/static/
+          {% endif %}
+
+        - Format your answer with Markdown for readability.        
+        - Always use the language used by the user in their question.
+
+        {% if extra_docs %}
+        ====
+
+        RULES PROVIDED BY USER
+
+        The following rules are provided by the user, and you must follow them strictly.
+
+        {% for key, value in extra_docs.items() %}
+        ### {{ key }}
+        {{ value }}
+        {% endfor %}        
+        {% endif %}
+
+        """
+        import os
+        extra_docs = {}
+        rules_dir = os.path.join(getattr(self, 'args', None).source_dir if getattr(self, 'args', None) else ".", ".autocoderrules")
+        if os.path.isdir(rules_dir):
+            for fname in os.listdir(rules_dir):
+                if fname.endswith(".md"):
+                    fpath = os.path.join(rules_dir, fname)
+                    try:
+                        with open(fpath, "r", encoding="utf-8") as f:
+                            content = f.read()
+                            key = os.path.splitext(fname)[0]
+                            extra_docs[key] = content
+                    except Exception:
+                        continue
+        return {"extra_docs": extra_docs}
+
+def get_qa_strategy(args: AutoCoderArgs) -> QAConversationStrategy:
     """
-    Factory method to get the appropriate conversation strategy
-    
+    Factory method to get the appropriate conversation strategy based on AutoCoderArgs
+
     Args:
-        strategy_name: Name of the strategy to use
-        
+        args: AutoCoderArgs instance containing configuration, including strategy name in `rag_qa_conversation_strategy`
+
     Returns:
         An instance of the requested strategy
-        
+
     Raises:
         ValueError: If the requested strategy doesn't exist
     """
+    strategy_name = getattr(args, 'rag_qa_conversation_strategy', None) or "multi_round"
+
     strategies = {
         "multi_round": MultiRoundStrategy,
         "single_round": SingleRoundStrategy,
     }
-    
+
     if strategy_name not in strategies:
         raise ValueError(f"Unknown strategy: {strategy_name}. Available strategies: {list(strategies.keys())}")
-    
+
     return strategies[strategy_name]()

autocoder/version.py

@@ -1 +1 @@
-__version__ = "0.1.345"
+__version__ = "0.1.347"