bugfix gen_keyword for doc_qa

ye7love7 · Feb 16, 2024 · 59a0e47 · 59a0e47
1 parent c9dfe77
commit 59a0e47
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 16 deletions.
diff --git a/qwen_agent/llm/oai.py b/qwen_agent/llm/oai.py
@@ -26,10 +26,9 @@ def __init__(self, cfg: Optional[Dict] = None):
             ),
         ).strip()
 
-        api_key = self.cfg.get(
-            'api_key',
-            os.getenv('OPENAI_API_KEY', 'EMPTY'),
-        ).strip()
+        api_key = self.cfg.get('api_key', '').strip()
+        if not api_key:
+            api_key = os.getenv('OPENAI_API_KEY', 'EMPTY').strip()
 
         if openai.__version__.startswith('0.'):
             if api_base:

diff --git a/qwen_agent/llm/qwen_dashscope.py b/qwen_agent/llm/qwen_dashscope.py
@@ -20,10 +20,10 @@ def __init__(self, cfg: Optional[Dict] = None):
         super().__init__(cfg)
 
         self.model = self.cfg.get('model', 'qwen-max')
-        dashscope.api_key = self.cfg.get(
-            'api_key',
-            os.getenv('DASHSCOPE_API_KEY', 'EMPTY'),
-        ).strip()
+        api_key = self.cfg.get('api_key', '').strip()
+        if not api_key:
+            api_key = os.getenv('DASHSCOPE_API_KEY', 'EMPTY').strip()
+        dashscope.api_key = api_key
 
     def _chat_stream(
         self,

diff --git a/qwen_agent/llm/qwenvl_dashscope.py b/qwen_agent/llm/qwenvl_dashscope.py
@@ -16,10 +16,10 @@ def __init__(self, cfg: Optional[Dict] = None):
         super().__init__(cfg)
 
         self.model = self.cfg.get('model', 'qwen-vl-max')
-        dashscope.api_key = self.cfg.get(
-            'api_key',
-            os.getenv('DASHSCOPE_API_KEY', 'EMPTY'),
-        ).strip()
+        api_key = self.cfg.get('api_key', '').strip()
+        if not api_key:
+            api_key = os.getenv('DASHSCOPE_API_KEY', 'EMPTY').strip()
+        dashscope.api_key = api_key
 
     def _chat_stream(
         self,

diff --git a/qwen_agent/prompts/gen_keyword.py b/qwen_agent/prompts/gen_keyword.py
@@ -57,10 +57,11 @@ def __init__(self,
                  llm: Optional[Union[Dict, BaseChatModel]] = None,
                  system_message: Optional[str] = DEFAULT_SYSTEM_MESSAGE,
                  **kwargs):
-        llm = copy.deepcopy(llm)
-        if isinstance(llm, dict):
-            llm = get_chat_model(llm)
-        llm.generate_cfg['stop'].append('Observation:')
+        if llm is not None:  # TODO: Why this happens?
+            llm = copy.deepcopy(llm)
+            if isinstance(llm, dict):
+                llm = get_chat_model(llm)
+            llm.generate_cfg['stop'].append('Observation:')
         super().__init__(function_list, llm, system_message, **kwargs)
 
     def _run(self,