bisheng-langchain 1.3.0__py3-none-any.whl → 1.3.1__py3-none-any.whl

bisheng_langchain/gpts/agent_types/llm_react_agent.py

@@ -64,7 +64,7 @@ def create_agent_executor(agent_runnable, tools, input_schema=None) -> CompiledS
         The `CompiledStateGraph` object.
     """
 
-    tool_executor = ToolNode(tools=tools)
+    tool_executor = {one.name: one for one in tools}
 
     state = _get_agent_state(input_schema)
 
@@ -95,7 +95,18 @@ def create_agent_executor(agent_runnable, tools, input_schema=None) -> CompiledS
         agent_action = data['agent_outcome']
         if not isinstance(agent_action, list):
             agent_action = [agent_action]
-        output = tool_executor.batch(agent_action, config, return_exceptions=True)
+
+        output = []
+        for action in agent_action:
+            if action.tool not in tool_executor:
+                output.append(f"Tool {action.tool} not found in tool executor.")
+                continue
+            try:
+                result = tool_executor[action.tool].invoke(action.tool_input, config)
+                output.append(result)
+            except Exception as e:
+                output.append(f"invoke tool {action.tool} failed: {str(e)[-50:]}")
+
         return {
             'intermediate_steps': [(action, str(out)) for action, out in zip(agent_action, output)]
         }
@@ -105,7 +116,17 @@ def create_agent_executor(agent_runnable, tools, input_schema=None) -> CompiledS
         agent_action = data['agent_outcome']
         if not isinstance(agent_action, list):
             agent_action = [agent_action]
-        output = await tool_executor.abatch(agent_action, config, return_exceptions=True)
+        output = []
+        for action in agent_action:
+            if action.tool not in tool_executor:
+                output.append(f"Tool {action.tool} not found in tool executor.")
+                continue
+            try:
+                result = await tool_executor[action.tool].ainvoke(action.tool_input, config)
+                output.append(result)
+            except Exception as e:
+                output.append(f"invoke tool {action.tool} failed: {str(e)[-50:]}")
+
         return {
             'intermediate_steps': [(action, str(out)) for action, out in zip(agent_action, output)]
         }

bisheng_langchain/rag/bisheng_rag_tool.py

@@ -301,8 +301,9 @@ if __name__ == '__main__':
                                        description='金融年报财报知识库问答',
                                        vector_store=vector_store,
                                        keyword_store=keyword_store,
-                                       llm=llm)
-    print(tool.run('能否根据2020年金宇生物技术股份有限公司的年报，给我简要介绍一下报告期内公司的社会责任工作情况？'))
+                                       llm=llm,
+                                       max_content=15000)
+    print(tool.run('能否根据2020年金宇生物技术股份有限公司的年报，给我简要介绍一下报告期内公司的社会责任工作情况？', return_only_outputs=False))
 
     # tool = BishengRAGTool.get_rag_tool(
     #     name='rag_knowledge_retrieve',

bisheng_langchain/rag/prompts/prompt.py

@@ -17,9 +17,15 @@ BASE_PROMPT = PromptTemplate(
 )
 
 
-system_template = """Use the following pieces of context to answer the user's question. 
-If you don't know the answer, just say that you don't know, don't try to make up an answer.
-----------------
+system_template = """# 任务
+你是一位知识库问答助手，遵守以下规则回答问题：
+1. 严谨、专业地回答用户的问题。
+2. 回答时须严格基于【参考文本】中的内容：
+- 如果【参考文本】中有明确与用户问题相关的文字内容，请依据相关内容进行回答；如果【参考文本】中没有任何与用户问题相关的内容，则直接回复：“没有找到相关内容”。
+- 如果相关内容中包含 markdown 格式的图片（例如 ![image](路径/IMAGE_1.png)），必须严格保留其原始 markdown 格式，不得添加引号、代码块（`或```）或其他特殊符号，也不得修改图片路径，保证可以正常渲染 markdown 图片。
+3. 当【参考文本】中的内容来源于多个不同的信息源时，若相关内容存在明显差异或冲突，请分别列出这些差异或冲突的答案；若无差异或冲突，只给出一个统一的回答即可。
+
+# 参考文本
 {context}"""
 messages = [
     SystemMessagePromptTemplate.from_template(system_template),

bisheng_langchain/utils/azure_dalle_image_generator.py

@@ -60,73 +60,7 @@ class AzureDallEWrapper(DallEAPIWrapper):
     @classmethod
     def validate_environment(cls, values: Dict) -> Dict:
         """Validate that api key and python package exists in environment."""
-        # Check OPENAI_KEY for backwards compatibility.
-        # TODO: Remove OPENAI_API_KEY support to avoid possible conflict when using
-        # other forms of azure credentials.
-        openai_api_key = (values['openai_api_key'] or os.getenv('AZURE_OPENAI_API_KEY')
-                          or os.getenv('OPENAI_API_KEY'))
-        values['openai_api_key'] = (convert_to_secret_str(openai_api_key)
-                                    if openai_api_key else None)
-        values['openai_api_base'] = (values['openai_api_base'] if 'openai_api_base' in values else
-                                     os.getenv('OPENAI_API_BASE'))
-        values['openai_api_version'] = values['openai_api_version'] or os.getenv(
-            'OPENAI_API_VERSION', default='2023-05-15')
-        values['openai_api_type'] = get_from_dict_or_env(values,
-                                                         'openai_api_type',
-                                                         'OPENAI_API_TYPE',
-                                                         default='azure')
-        values['openai_organization'] = (values['openai_organization']
-                                         or os.getenv('OPENAI_ORG_ID')
-                                         or os.getenv('OPENAI_ORGANIZATION'))
-        values['openai_proxy'] = get_from_dict_or_env(values,
-                                                      'openai_proxy',
-                                                      'OPENAI_PROXY',
-                                                      default='')
-        values['azure_endpoint'] = values['azure_endpoint'] or os.getenv('AZURE_OPENAI_ENDPOINT')
-        azure_ad_token = values['azure_ad_token'] or os.getenv('AZURE_OPENAI_AD_TOKEN')
-        values['azure_ad_token'] = (convert_to_secret_str(azure_ad_token)
-                                    if azure_ad_token else None)
-        # For backwards compatibility. Before openai v1, no distinction was made
-        # between azure_endpoint and base_url (openai_api_base).
-        openai_api_base = values['openai_api_base']
-        if openai_api_base and values['validate_base_url']:
-            if '/openai' not in openai_api_base:
-                values['openai_api_base'] += '/openai'
-                raise ValueError('As of openai>=1.0.0, Azure endpoints should be specified via '
-                                 'the `azure_endpoint` param not `openai_api_base` '
-                                 '(or alias `base_url`). ')
-            if values['deployment']:
-                raise ValueError('As of openai>=1.0.0, if `deployment` (or alias '
-                                 '`azure_deployment`) is specified then '
-                                 '`openai_api_base` (or alias `base_url`) should not be. '
-                                 'Instead use `deployment` (or alias `azure_deployment`) '
-                                 'and `azure_endpoint`.')
-        client_params = {
-            'api_version':
-            values['openai_api_version'],
-            'azure_endpoint':
-            values['azure_endpoint'],
-            'azure_deployment':
-            values['deployment'],
-            'api_key':
-            (values['openai_api_key'].get_secret_value() if values['openai_api_key'] else None),
-            'azure_ad_token':
-            (values['azure_ad_token'].get_secret_value() if values['azure_ad_token'] else None),
-            'azure_ad_token_provider':
-            values['azure_ad_token_provider'],
-            'organization':
-            values['openai_organization'],
-            'base_url':
-            values['openai_api_base'],
-            'timeout':
-            values['request_timeout'],
-            'max_retries':
-            values['max_retries'],
-            'default_headers':
-            values['default_headers'],
-            'default_query':
-            values['default_query'],
-        }
+        client_params = values.copy()
         if not values.get('client'):
             values['client'] = openai.AzureOpenAI(**client_params).images
         if not values.get('async_client'):

{bisheng_langchain-1.3.0.dist-info → bisheng_langchain-1.3.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: bisheng-langchain
-Version: 1.3.0
+Version: 1.3.1
 Summary: bisheng langchain modules
 Home-page: https://github.com/dataelement/bisheng
 Author: DataElem
@@ -24,7 +24,7 @@ Requires-Dist: Pillow==9.5.0
 Requires-Dist: bisheng-pyautogen
 Requires-Dist: jieba==0.42.1
 Requires-Dist: pydantic
-Requires-Dist: pymupdf==1.23.8
+Requires-Dist: pymupdf==1.26.*
 Requires-Dist: shapely==2.0.2
 Requires-Dist: filetype==1.2.0
 Requires-Dist: langgraph==0.3.*

{bisheng_langchain-1.3.0.dist-info → bisheng_langchain-1.3.1.dist-info}/RECORD

@@ -78,7 +78,7 @@ bisheng_langchain/gpts/message_types.py,sha256=7EJOx62j9E1U67jxWgxE_I7a8IjAvvKAN
 bisheng_langchain/gpts/utils.py,sha256=t3YDxaJ0OYd6EKsek7PJFRYnsezwzEFK5oVU-PRbu5g,6671
 bisheng_langchain/gpts/agent_types/__init__.py,sha256=88tFt1GfrfIqa4hCg0cMJk7rTeUmCSSdiVhR41CW4rM,381
 bisheng_langchain/gpts/agent_types/llm_functions_agent.py,sha256=RgWSeeWl5JxEzzyF-336rq9NUDjJcF18LquZe4a-PPY,7126
-bisheng_langchain/gpts/agent_types/llm_react_agent.py,sha256=rMddCaNVN0dXLVirvpxhXoqeLBDadf9xK3rnOU0uKL0,6523
+bisheng_langchain/gpts/agent_types/llm_react_agent.py,sha256=9StjcRByFIFhaQMgOt0lN9jG0Ne33vCPz2iHVEIJYyg,7311
 bisheng_langchain/gpts/prompts/__init__.py,sha256=pOnXvk6_PjqAoLrh68sI9o3o6znKGxoLMVFP-0XTCJo,704
 bisheng_langchain/gpts/prompts/assistant_prompt_base.py,sha256=Yp9M1XbZb5jHeBG_txcwWA84Euvl89t0g-GbJMa5Ur0,1133
 bisheng_langchain/gpts/prompts/assistant_prompt_cohere.py,sha256=GLQ77oXqSlE7Xes2ObsFsNon5nOJOCRhQOKE5bUpgaI,2421
@@ -125,7 +125,7 @@ bisheng_langchain/rag/__init__.py,sha256=Rm_cDxOJINt0H4bOeUo3JctPxaI6xKKXZcS-R_w
 bisheng_langchain/rag/bisheng_rag_chain.py,sha256=75HCIkUAMGrD1E6BaSA9dhnug137PZvDnKUZxihStIE,6149
 bisheng_langchain/rag/bisheng_rag_pipeline.py,sha256=neoBK3TtuQ07_WeuJCzYlvtsDQNepUa_68NT8VCgytw,13749
 bisheng_langchain/rag/bisheng_rag_pipeline_v2.py,sha256=iOoF7mbLp9qDGPsV0fEmgph_Ba8VnECYvCPebXk8xmo,16144
-bisheng_langchain/rag/bisheng_rag_tool.py,sha256=JAxsoASwaCaGHrFlAylYOZQZ9ZdnMcfYvAaZZKvIz0g,13676
+bisheng_langchain/rag/bisheng_rag_tool.py,sha256=MqhGWphTmXsQdTm3QCy0zxJ64I38z1Trz5FFMtQTSh4,13761
 bisheng_langchain/rag/extract_info.py,sha256=QEFlAaC_9-87dl4BtTz9ciQaQhfE_XjWUnQrwnUfRiw,2215
 bisheng_langchain/rag/run_qa_gen_web.py,sha256=-fIvHNnD3lD0iNU5m0Me1GDwRjlcsB8tE5RnPtFRG2s,1840
 bisheng_langchain/rag/run_rag_evaluate_web.py,sha256=a9vMhq-ZhEiHHr43uKUzKtjdk280uAP_UHQW_eOaQMw,2224
@@ -144,7 +144,7 @@ bisheng_langchain/rag/init_retrievers/mix_retriever.py,sha256=t65WLFMDEQ8LlbUEG4
 bisheng_langchain/rag/init_retrievers/smaller_chunks_retriever.py,sha256=a_IWcU1zZUndwQW2nXy3DjQA0ct6_7VDGWflY2UEXTI,3774
 bisheng_langchain/rag/prompts/__init__.py,sha256=IUCq9gzqGQN_6IDk0D_F5t3mOUI_KbmSzYnnXoX4VKE,223
 bisheng_langchain/rag/prompts/extract_key_prompt.py,sha256=THdcwolRzaKkddgEhabUDytn-caHs9UwECPkPxijWAs,1456
-bisheng_langchain/rag/prompts/prompt.py,sha256=VdRJ5V8zysFALPwA1Ge98aLmk6hnuySegVtL6twMJaI,1916
+bisheng_langchain/rag/prompts/prompt.py,sha256=XhMDIrgTwp3pfgMxftxc3XUo7wOjb-3hl_JQfNAMjrI,2695
 bisheng_langchain/rag/prompts/prompt_cohere.py,sha256=FhW-RCIVnIfKtEqV_-7aQav1riIJmA0jV2hGxCSoysk,8151
 bisheng_langchain/rag/qa_corpus/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bisheng_langchain/rag/qa_corpus/qa_generator.py,sha256=M8B739ZwwTfF1HXlfTss_pGH38KncJoL9xU0OvEGKCA,6100
@@ -160,13 +160,13 @@ bisheng_langchain/retrievers/mix_es_vector.py,sha256=dSrrsuMPSgGiu181EOzACyIKiDX
 bisheng_langchain/sql/__init__.py,sha256=2arRtNQ-kUvIsy_8v_PrLxf5r9W-S7mbqptG_l4_1RE,88
 bisheng_langchain/sql/base.py,sha256=RQq7BdWroTp2aKzKr_5AMMUaSTxefMJ1DF3r1Rsi0EQ,6162
 bisheng_langchain/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-bisheng_langchain/utils/azure_dalle_image_generator.py,sha256=Aok-YOBmULhlsjkUm7DmRHtYg-mwyyWyl8u3n-jSOHc,6596
+bisheng_langchain/utils/azure_dalle_image_generator.py,sha256=QkLXnXYl_onR-uNuMDIcwLx9r4Snn4WuIkyfNFFCLes,2753
 bisheng_langchain/utils/requests.py,sha256=QSvZQeqL-vfW8dPanJNkeclHt2Gx-Wl9cu7XGaRQzbM,8625
 bisheng_langchain/vectorstores/__init__.py,sha256=zCZgDe7LyQ0iDkfcm5UJ5NxwKQSRHnqrsjx700Fy11M,213
 bisheng_langchain/vectorstores/elastic_keywords_search.py,sha256=BxvT9FUTju4AZPtQFTbYLmIIKKw8bqcact5Cav_5H2I,15357
 bisheng_langchain/vectorstores/milvus.py,sha256=jWq_lce-ihOz07D1kwj5ctPzElYexNCjJ-xSv-pK1CI,37172
 bisheng_langchain/vectorstores/retriever.py,sha256=fNtk8qSwBo2Qrlt1NpZVXaNATW2tBywkyS0q0NtN5MI,4326
-bisheng_langchain-1.3.0.dist-info/METADATA,sha256=Osl1j2o-wDqBmnqjsqVEWW-sNmiNHr-mTmRpHYbFy_g,2435
-bisheng_langchain-1.3.0.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-bisheng_langchain-1.3.0.dist-info/top_level.txt,sha256=Z6pPNyCo4ihyr9iqGQbH8sJiC4dAUwA_mAyGRQB5_Fs,18
-bisheng_langchain-1.3.0.dist-info/RECORD,,
+bisheng_langchain-1.3.1.dist-info/METADATA,sha256=AMeyOnK3Iam_Jo-c1fJHu0hFOcw2xseOKREu11xeKVQ,2435
+bisheng_langchain-1.3.1.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+bisheng_langchain-1.3.1.dist-info/top_level.txt,sha256=Z6pPNyCo4ihyr9iqGQbH8sJiC4dAUwA_mAyGRQB5_Fs,18
+bisheng_langchain-1.3.1.dist-info/RECORD,,