bisheng-langchain 0.3.2.2__py3-none-any.whl → 0.3.3rc1__py3-none-any.whl

bisheng_langchain/gpts/agent_types/__init__.py

@@ -2,9 +2,11 @@ from bisheng_langchain.gpts.agent_types.llm_functions_agent import (
     get_openai_functions_agent_executor, 
     get_qwen_local_functions_agent_executor
 )
+from bisheng_langchain.gpts.agent_types.llm_react_agent import get_react_agent_executor
 
 
 __all__ = [
     "get_openai_functions_agent_executor",
-    "get_qwen_local_functions_agent_executor"
+    "get_qwen_local_functions_agent_executor",
+    "get_react_agent_executor"
 ]

bisheng_langchain/gpts/agent_types/llm_react_agent.py

@@ -0,0 +1,171 @@
+import operator
+from typing import Annotated, Sequence, TypedDict, Union
+from langchain.tools import BaseTool
+from langchain_core.agents import AgentAction, AgentFinish
+from langchain_core.messages import BaseMessage
+from langchain_core.language_models import LanguageModelLike
+from langgraph.graph import END, StateGraph
+from langgraph.graph.state import CompiledStateGraph
+from langgraph.prebuilt.tool_executor import ToolExecutor
+from langgraph.utils import RunnableCallable
+from langchain.agents import create_structured_chat_agent
+from bisheng_langchain.gpts.prompts.react_agent_prompt import react_agent_prompt
+
+
+def get_react_agent_executor(
+    tools: list[BaseTool], 
+    llm: LanguageModelLike,
+    system_message: str, 
+    interrupt_before_action: bool,
+    **kwargs
+):
+    prompt = react_agent_prompt
+    prompt = prompt.partial(assistant_message=system_message)
+    agent = create_structured_chat_agent(llm, tools, prompt)
+    agent_executer = create_agent_executor(agent, tools)
+    return agent_executer
+
+
+def _get_agent_state(input_schema=None):
+    if input_schema is None:
+
+        class AgentState(TypedDict):
+            # The input string
+            input: str
+            # The list of previous messages in the conversation
+            chat_history: Sequence[BaseMessage]
+            # The outcome of a given call to the agent
+            # Needs `None` as a valid type, since this is what this will start as
+            agent_outcome: Union[AgentAction, AgentFinish, None]
+            # List of actions and corresponding observations
+            # Here we annotate this with `operator.add` to indicate that operations to
+            # this state should be ADDED to the existing values (not overwrite it)
+            intermediate_steps: Annotated[list[tuple[AgentAction, str]], operator.add]
+
+    else:
+
+        class AgentState(input_schema):
+            # The outcome of a given call to the agent
+            # Needs `None` as a valid type, since this is what this will start as
+            agent_outcome: Union[AgentAction, AgentFinish, None]
+            # List of actions and corresponding observations
+            # Here we annotate this with `operator.add` to indicate that operations to
+            # this state should be ADDED to the existing values (not overwrite it)
+            intermediate_steps: Annotated[list[tuple[AgentAction, str]], operator.add]
+
+    return AgentState
+
+
+def create_agent_executor(
+    agent_runnable, tools, input_schema=None
+) -> CompiledStateGraph:
+    """This is a helper function for creating a graph that works with LangChain Agents.
+
+    Args:
+        agent_runnable (RunnableLike): The agent runnable.
+        tools (list): A list of tools to be used by the agent.
+        input_schema (dict, optional): The input schema for the agent. Defaults to None.
+
+    Returns:
+        The `CompiledStateGraph` object.
+    """
+
+    if isinstance(tools, ToolExecutor):
+        tool_executor = tools
+    else:
+        tool_executor = ToolExecutor(tools)
+
+    state = _get_agent_state(input_schema)
+
+    # Define logic that will be used to determine which conditional edge to go down
+
+    def should_continue(data):
+        # If the agent outcome is an AgentFinish, then we return `exit` string
+        # This will be used when setting up the graph to define the flow
+        if isinstance(data["agent_outcome"], AgentFinish):
+            return "end"
+        # Otherwise, an AgentAction is returned
+        # Here we return `continue` string
+        # This will be used when setting up the graph to define the flow
+        else:
+            return "continue"
+
+    def run_agent(data, config):
+        agent_outcome = agent_runnable.invoke(data, config)
+        return {"agent_outcome": agent_outcome}
+
+    async def arun_agent(data, config):
+        agent_outcome = await agent_runnable.ainvoke(data, config)
+        return {"agent_outcome": agent_outcome}
+
+    # Define the function to execute tools
+    def execute_tools(data, config):
+        # Get the most recent agent_outcome - this is the key added in the `agent` above
+        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)
+        return {
+            "intermediate_steps": [
+                (action, str(out)) for action, out in zip(agent_action, output)
+            ]
+        }
+
+    async def aexecute_tools(data, config):
+        # Get the most recent agent_outcome - this is the key added in the `agent` above
+        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
+        )
+        return {
+            "intermediate_steps": [
+                (action, str(out)) for action, out in zip(agent_action, output)
+            ]
+        }
+
+    # Define a new graph
+    workflow = StateGraph(state)
+
+    # Define the two nodes we will cycle between
+    workflow.add_node("agent", RunnableCallable(run_agent, arun_agent))
+    workflow.add_node("tools", RunnableCallable(execute_tools, aexecute_tools))
+
+    # Set the entrypoint as `agent`
+    # This means that this node is the first one called
+    workflow.set_entry_point("agent")
+
+    # We now add a conditional edge
+    workflow.add_conditional_edges(
+        # First, we define the start node. We use `agent`.
+        # This means these are the edges taken after the `agent` node is called.
+        "agent",
+        # Next, we pass in the function that will determine which node is called next.
+        should_continue,
+        # Finally we pass in a mapping.
+        # The keys are strings, and the values are other nodes.
+        # END is a special node marking that the graph should finish.
+        # What will happen is we will call `should_continue`, and then the output of that
+        # will be matched against the keys in this mapping.
+        # Based on which one it matches, that node will then be called.
+        {
+            # If `tools`, then we call the tool node.
+            "continue": "tools",
+            # Otherwise we finish.
+            "end": END,
+        },
+    )
+
+    # We now add a normal edge from `tools` to `agent`.
+    # This means that after `tools` is called, `agent` node is called next.
+    workflow.add_edge("tools", "agent")
+
+    # Finally, we compile it!
+    # This compiles it into a LangChain Runnable,
+    # meaning you can use it as you would any other runnable
+    return workflow.compile()
+
+
+if __name__ == "__main__":
+    pass

bisheng_langchain/gpts/assistant.py

@@ -97,9 +97,9 @@ class BishengAssistant:
 
         # init agent executor
         agent_executor_params = self.assistant_params['agent_executor']
-        agent_executor_type = agent_executor_params.pop('type')
+        self.agent_executor_type = agent_executor_params.pop('type')
         self.assistant = ConfigurableAssistant(
-            agent_executor_type=agent_executor_type, 
+            agent_executor_type=self.agent_executor_type, 
             tools=tools, 
             llm=llm, 
             assistant_message=assistant_message, 
@@ -119,7 +119,10 @@ class BishengAssistant:
             inputs.append(HumanMessage(content=chat_history[i]))
             inputs.append(AIMessage(content=chat_history[i+1]))
         inputs.append(HumanMessage(content=query))
-        result = asyncio.run(self.assistant.ainvoke(inputs))
+        if self.agent_executor_type == 'get_react_agent_executor':
+            result = asyncio.run(self.assistant.ainvoke({"input": inputs[-1].content, "chat_history": inputs[:-1]}))
+        else:
+            result = asyncio.run(self.assistant.ainvoke(inputs))
         return result
 
 
@@ -127,14 +130,12 @@ if __name__ == "__main__":
     from langchain.globals import set_debug
 
     # set_debug(True)
-    chat_history = []
-    query = "请简要分析中科创达软件股份有限公司2019年聘任、解聘会计师事务的情况。"
-    # chat_history = ['你好', '你好，有什么可以帮助你吗？', '福蓉科技股价多少?', '福蓉科技（股票代码：300049）的当前股价为48.67元。']
-    # query = '去年这个时候的股价是多少？'
-    # bisheng_assistant = BishengAssistant("config/base_scene.yaml")
+    # chat_history = []
+    # query = "600519、300750股价多少？"
+    chat_history = ['你好', '你好，有什么可以帮助你吗？', '福蓉科技股价多少?', '福蓉科技（股票代码：300049）的当前股价为48.67元。']
+    query = '今天是什么时候？去年这个时候的股价是多少？'
+    bisheng_assistant = BishengAssistant("config/base_scene.yaml")
     # bisheng_assistant = BishengAssistant("config/knowledge_scene.yaml")
-    bisheng_assistant = BishengAssistant("config/rag_scene.yaml")
+    # bisheng_assistant = BishengAssistant("config/rag_scene.yaml")
     result = bisheng_assistant.run(query, chat_history=chat_history)
-    for r in result:
-        print(f'------------------')
-        print(type(r), r)
+    print(result)

bisheng_langchain/gpts/prompts/react_agent_prompt.py

@@ -0,0 +1,68 @@
+from typing import List, Union
+from langchain_core.prompts.chat import (
+    ChatPromptTemplate,
+    HumanMessagePromptTemplate,
+    SystemMessagePromptTemplate,
+    MessagesPlaceholder
+)
+from langchain_core.prompts.prompt import PromptTemplate
+from langchain_core.messages import FunctionMessage, SystemMessage, ToolMessage, AIMessage, HumanMessage, ChatMessage
+
+
+system_temp = """
+{assistant_message}
+
+Respond to the human as helpfully and accurately as possible. You have access to the following tools:
+
+{tools}
+
+Use a json blob to specify a tool by providing an action key (tool name) and an action_input key (tool input).
+
+Valid "action" values: "Final Answer" or {tool_names}
+
+Provide only ONE action per $JSON_BLOB, as shown:
+
+```
+{{{{
+  "action": $TOOL_NAME,
+  "action_input": $INPUT
+}}}}
+```
+
+Follow this format:
+
+Question: input question to answer
+Thought: consider previous and subsequent steps
+Action:
+```
+$JSON_BLOB
+```
+Observation: action result
+... (repeat Thought/Action/Observation N times)
+Thought: I know what to respond
+Action:
+```
+{{{{
+  "action": "Final Answer",
+  "action_input": "Final response to human"
+}}}}
+
+Begin! Reminder to ALWAYS respond with a valid json blob of a single action. Use tools if necessary. Respond directly if appropriate. Format is Action:```$JSON_BLOB```then Observation
+"""
+
+human_temp = """Question: {input}
+
+Thought: {agent_scratchpad}
+(reminder to respond in a JSON blob no matter what)"""
+
+
+react_agent_prompt = ChatPromptTemplate(
+    input_variables=['agent_scratchpad', 'input', 'tool_names', 'tools', 'assistant_message'], 
+    optional_variables=['chat_history'], 
+    input_types={'chat_history': List[Union[AIMessage, HumanMessage, ChatMessage, SystemMessage, FunctionMessage, ToolMessage]]}, 
+    messages=[
+        SystemMessagePromptTemplate.from_template(system_temp),
+        MessagesPlaceholder(variable_name='chat_history', optional=True), 
+        HumanMessagePromptTemplate.from_template(human_temp)
+    ]
+)

bisheng_langchain/rag/bisheng_rag_chain.py

@@ -97,6 +97,7 @@ class BishengRetrievalQA(Chain):
         max_content: int = 15000,
         sort_by_source_and_index: bool = False,
         callbacks: Callbacks = None,
+        return_source_documents: bool = False,
         **kwargs: Any,
     ) -> BishengRetrievalQA:
         bisheng_rag_tool = BishengRAGTool(
@@ -111,6 +112,7 @@ class BishengRetrievalQA(Chain):
         return cls(
             bisheng_rag_tool=bisheng_rag_tool,
             callbacks=callbacks,
+            return_source_documents=return_source_documents,
             **kwargs,
         )
 

{bisheng_langchain-0.3.2.2.dist-info → bisheng_langchain-0.3.3rc1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: bisheng-langchain
-Version: 0.3.2.2
+Version: 0.3.3rc1
 Summary: bisheng langchain modules
 Home-page: https://github.com/dataelement/bisheng
 Author: DataElem
@@ -28,7 +28,7 @@ Requires-Dist: pydantic ==1.10.13
 Requires-Dist: pymupdf ==1.23.8
 Requires-Dist: shapely ==2.0.2
 Requires-Dist: filetype ==1.2.0
-Requires-Dist: langgraph ==0.0.30
+Requires-Dist: langgraph ==0.0.50
 Requires-Dist: openai ==1.14.3
 Requires-Dist: langchain-openai ==0.1.0
 Requires-Dist: llama-index ==0.9.48

{bisheng_langchain-0.3.2.2.dist-info → bisheng_langchain-0.3.3rc1.dist-info}/RECORD

@@ -70,20 +70,22 @@ bisheng_langchain/embeddings/interface/__init__.py,sha256=GNY3tibpRxpAdAfSvQmXBK
 bisheng_langchain/embeddings/interface/types.py,sha256=VdurbtsnjCPdlOjPFcK2Mg6r9bJYYHb3tepvkk-y3nM,461
 bisheng_langchain/embeddings/interface/wenxin.py,sha256=5d9gI4enmfkD80s0FHKiDt33O0mwM8Xc5WTubnMUy8c,3104
 bisheng_langchain/gpts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-bisheng_langchain/gpts/assistant.py,sha256=OEB9HA-FpNKGOviVoafld4MHDIEQS5u9AU0QlMuJ-po,5344
+bisheng_langchain/gpts/assistant.py,sha256=lObPDRSSzRcz6jijj76zr9dtfWOIztCaII429BPTHsU,5444
 bisheng_langchain/gpts/auto_optimization.py,sha256=WNsC19rgvuDYQlSIaYThq5RqCbuobDbzCwAJW4Ksw0c,3626
 bisheng_langchain/gpts/auto_tool_selected.py,sha256=21WETf9o0YS-QEBwv3mmZRObKWszefQkXEqAA6KzoaM,1582
 bisheng_langchain/gpts/load_tools.py,sha256=LiiK1OqFu7Ki-F_Rhfi1rgp0wBQCSrTDdqsgwciTOIU,8099
 bisheng_langchain/gpts/message_types.py,sha256=7EJOx62j9E1U67jxWgxE_I7a8IjAvvKANknXkD2gFm0,213
 bisheng_langchain/gpts/utils.py,sha256=t3YDxaJ0OYd6EKsek7PJFRYnsezwzEFK5oVU-PRbu5g,6671
-bisheng_langchain/gpts/agent_types/__init__.py,sha256=bg0zlTYGfNXoSBqcICHlzNpVQbejMYeyji_dzvP5qQ0,261
+bisheng_langchain/gpts/agent_types/__init__.py,sha256=88tFt1GfrfIqa4hCg0cMJk7rTeUmCSSdiVhR41CW4rM,381
 bisheng_langchain/gpts/agent_types/llm_functions_agent.py,sha256=IXg5u8dSk-FcLvjrvvLcN5revGccXylXkD73ZWhaDWs,8715
+bisheng_langchain/gpts/agent_types/llm_react_agent.py,sha256=W6IJMwoFUj_a2cXZ_nXOpzaHBjP5IBrFxRTSejNVi9A,6678
 bisheng_langchain/gpts/prompts/__init__.py,sha256=pOnXvk6_PjqAoLrh68sI9o3o6znKGxoLMVFP-0XTCJo,704
 bisheng_langchain/gpts/prompts/assistant_prompt_base.py,sha256=Q69qWxtwaeGPPwMWXQ44OsQPg7wHB7nYT17wbqQe3kM,57
 bisheng_langchain/gpts/prompts/assistant_prompt_cohere.py,sha256=GLQ77oXqSlE7Xes2ObsFsNon5nOJOCRhQOKE5bUpgaI,2421
 bisheng_langchain/gpts/prompts/assistant_prompt_opt.py,sha256=TZsRK4XPMrUhGg0PoMyiE3wE-aG34UmlVflkCl_c0QI,4151
 bisheng_langchain/gpts/prompts/breif_description_prompt.py,sha256=w4A5et0jB-GkxEMQBp4i6GKX3RkVeu7NzWEjOZZAicM,5336
 bisheng_langchain/gpts/prompts/opening_dialog_prompt.py,sha256=VVF0JLHtetupVB0kabiFHWDHlQaa4nFLcbYXgIBA3nw,5965
+bisheng_langchain/gpts/prompts/react_agent_prompt.py,sha256=YGaO4S0r9AZhzt9Idyiw2mcd5QH1GLIIGc2oAN2YKdE,1976
 bisheng_langchain/gpts/prompts/select_tools_prompt.py,sha256=AyvVnrLEsQy7RHuGTPkcrMUxgA98Q0TzF-xweoc7GyY,1400
 bisheng_langchain/gpts/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bisheng_langchain/gpts/tools/api_tools/__init__.py,sha256=CkEjgIFM4GIv86V1B7SsFLaB6M86c54QuO8wIRizUZ8,1608
@@ -107,7 +109,7 @@ bisheng_langchain/input_output/__init__.py,sha256=sW_GB7MlrHYsqY1Meb_LeimQqNsMz1
 bisheng_langchain/input_output/input.py,sha256=I5YDmgbvvj1o2lO9wi8LE37wM0wP5jkhUREU32YrZMQ,1094
 bisheng_langchain/input_output/output.py,sha256=6U-az6-Cwz665C2YmcH3SYctWVjPFjmW8s70CA_qphk,11585
 bisheng_langchain/rag/__init__.py,sha256=Rm_cDxOJINt0H4bOeUo3JctPxaI6xKKXZcS-R_wkoGs,198
-bisheng_langchain/rag/bisheng_rag_chain.py,sha256=pbvaLuAwBWyGyvi0qBcqrOz9HScEPfpfEE9GWobVv-M,5891
+bisheng_langchain/rag/bisheng_rag_chain.py,sha256=2GMDUPJaW-D7tpOQ9qPt2vGZwmcXBS0UrcibO7J2S1g,5999
 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=8M59rQqUGS7b1GH_pjNwcqJa2HikK3B4ZqWl59ZCUJY,13113
@@ -150,7 +152,7 @@ bisheng_langchain/vectorstores/__init__.py,sha256=zCZgDe7LyQ0iDkfcm5UJ5NxwKQSRHn
 bisheng_langchain/vectorstores/elastic_keywords_search.py,sha256=Pm1rS50GJ0HWbjBsFDgs28SVuVbjGSRPOor6yJlnE7w,13347
 bisheng_langchain/vectorstores/milvus.py,sha256=lrnezKnYXhyH5M1g3a-Mcwpj9mwzAj44TKmzyUXlQYY,36297
 bisheng_langchain/vectorstores/retriever.py,sha256=hj4nAAl352EV_ANnU2OHJn7omCH3nBK82ydo14KqMH4,4353
-bisheng_langchain-0.3.2.2.dist-info/METADATA,sha256=bpPBmNOC74Lta6zplA_rXDTiNBJwGFabRjNiKAYcJnU,2486
-bisheng_langchain-0.3.2.2.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-bisheng_langchain-0.3.2.2.dist-info/top_level.txt,sha256=Z6pPNyCo4ihyr9iqGQbH8sJiC4dAUwA_mAyGRQB5_Fs,18
-bisheng_langchain-0.3.2.2.dist-info/RECORD,,
+bisheng_langchain-0.3.3rc1.dist-info/METADATA,sha256=g-nXaJGFy9IawsFS-md6KPFWVSn7RsZ4c6aK_DPkIqg,2487
+bisheng_langchain-0.3.3rc1.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+bisheng_langchain-0.3.3rc1.dist-info/top_level.txt,sha256=Z6pPNyCo4ihyr9iqGQbH8sJiC4dAUwA_mAyGRQB5_Fs,18
+bisheng_langchain-0.3.3rc1.dist-info/RECORD,,