hana-ai 1.0.25070202__tar.gz → 1.0.25070203__tar.gz

{hana_ai-1.0.25070202/src/hana_ai.egg-info → hana_ai-1.0.25070203}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hana_ai
-Version: 1.0.25070202
+Version: 1.0.25070203
 Summary: Generative AI Toolkit for SAP HANA Cloud
 Author: SAP
 License: Apache-2.0

{hana_ai-1.0.25070202 → hana_ai-1.0.25070203}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "hana_ai"
-version = "1.0.25070202"
+version = "1.0.25070203"
 authors = [
     {name = "SAP"}
 ]

{hana_ai-1.0.25070202 → hana_ai-1.0.25070203}/src/hana_ai/__init__.py

@@ -2,4 +2,4 @@
 hana_ai is a Python package for AI/ML related utilities.
 """
 
-__version__ = "1.0.25070202"
+__version__ = "1.0.25070203"

{hana_ai-1.0.25070202 → hana_ai-1.0.25070203}/src/hana_ai/agents/hanaml_agent_with_memory.py

@@ -9,11 +9,10 @@ The following class is available:
 
 #pylint: disable=ungrouped-imports, abstract-method
 import json
-import inspect
 import logging
 from deprecated import deprecated
 import pandas as pd
-from pydantic import ValidationError
+#from pydantic import ValidationError
 from langchain.agents import initialize_agent, AgentType, Tool
 from langchain.callbacks.base import BaseCallbackHandler
 from langchain_core.chat_history import InMemoryChatMessageHistory
@@ -22,64 +21,15 @@ from langchain_core.prompts import ChatPromptTemplate, MessagesPlaceholder
 from langchain_core.runnables import Runnable
 from langchain_core.runnables.history import RunnableWithMessageHistory
 from langchain.schema.messages import AIMessage
-from langchain.load.dump import dumps
+#from langchain.load.dump import dumps
+from hana_ai.agents.hanaml_rag_agent import stateless_chat
+#from hana_ai.agents.utilities import _inspect_python_code, _check_generated_cap_for_bas
 
 logging.getLogger().setLevel(logging.ERROR)
 
 CHATBOT_SYSTEM_PROMPT = """You're an assistant skilled in data science using hana-ml tools.
 Ask for missing parameters if needed. Regardless of whether this tool has been called before, it must be called."""
 
-def _check_generated_cap_for_bas(intermediate_steps):
-    """
-    Check if the generated CAP artifacts are valid.
-
-    Parameters
-    ----------
-    intermediate_steps : str
-        The intermediate steps to check.
-
-    Returns
-    -------
-    bool
-        True if the generated CAP artifacts are valid, False otherwise.
-    """
-    try:
-        ss = json.loads(intermediate_steps)
-    except:
-        return False
-    if intermediate_steps is None:
-        return False
-    if not isinstance(ss, list):
-        return False
-    for step in ss:
-        for substep in step:
-            if isinstance(substep, dict) and 'type' in substep and substep['type'] == 'constructor':
-                if 'kwargs' in substep and 'tool' in substep['kwargs']:
-                    tool_name = substep['kwargs']['tool']
-                    if tool_name == "cap_artifacts_for_bas":
-                        return True
-    return False
-
-def _inspect_python_code(intermediate_steps, tools):
-    try:
-        ss = json.loads(intermediate_steps)
-    except:
-        return None
-    if intermediate_steps is None:
-        return None
-    collect_tool_call = []
-    if not isinstance(ss, list):
-        return None
-    for step in ss:
-        for substep in step:
-            if isinstance(substep, dict) and 'type' in substep and substep['type'] == 'constructor':
-                if 'kwargs' in substep and 'tool' in substep['kwargs']:
-                    tool_name = substep['kwargs']['tool']
-                    for tool in tools:
-                        if tool.name == tool_name:
-                            collect_tool_call.append({"tool_name": tool_name, "parameters": json.dumps(substep['kwargs']['tool_input']), "python_code": inspect.getsource(tool._run)})
-                            break
-    return collect_tool_call
 class _ToolObservationCallbackHandler(BaseCallbackHandler):
     def __init__(self, memory_getter, max_observations=5):
         super().__init__()
@@ -339,68 +289,72 @@ def stateless_call(llm, tools, question, chat_history=None, verbose=False, retur
     if chat_history is None:
         chat_history = []
 
-    prompt = ChatPromptTemplate.from_messages([
-        ("system", system_prompt),
-        MessagesPlaceholder(variable_name="history", messages=chat_history),
-        ("human", "{question}"),
-    ])
-    agent: Runnable = prompt | initialize_agent(tools, llm, agent=AgentType.STRUCTURED_CHAT_ZERO_SHOT_REACT_DESCRIPTION, verbose=verbose, return_intermediate_steps=return_intermediate_steps)
-    intermediate_steps = None
-    try:
-        response = agent.invoke({"question": question, "history": chat_history})
-        if return_intermediate_steps is True:
-            intermediate_steps = response.get("intermediate_steps")
-    except ValidationError as e:
-        # Parse Pydantic error details for feedback
-        error_details = "\n".join([f"{err['loc'][0]}: {err['msg']}" for err in e.errors()])
-        error_message = f"Please provide the parameters:\n {error_details}"
-        chat_history.append(("system", error_message))
-        response = {"output": error_message}
-    except Exception as e:
-        error_message = str(e)
-        response = f"The error message is `{error_message}`. Please display the error message, and then analyze the error message and provide the solution."
-        if return_intermediate_steps is True:
-            response = {
-                "output": response,
-                "intermediate_steps": dumps(intermediate_steps) if return_intermediate_steps else None
-            }
-            response["inspect_script"] = _inspect_python_code(response["intermediate_steps"], tools)
-            response["generated_cap_project"] = _check_generated_cap_for_bas(response["intermediate_steps"])
-        return response
-
-    if isinstance(response, dict) and 'output' in response:
-        response = response['output']
-    if isinstance(response, str):
-        if response.startswith("Action:"): # force to call tool if return a Action string
-            action_json = response[7:]
-            try:
-                response = json.loads(action_json)
-            except Exception as e:
-                error_message = str(e)
-                response = f"The error message is `{error_message}`. Please display the error message, and then analyze the error message and provide the solution."
-        if "action" in response and "action_input" in response:
-            try:
-                response = json.loads(response)
-            except:
-                pass
-        if isinstance(response, str) and response.strip() == "":
-            response = "I'm sorry, I don't understand. Please ask me again."
-    if isinstance(response, dict) and 'action' in response and 'action_input' in response:
-        action = response.get("action")
-        for tool in tools:
-            if tool.name == action:
-                action_input = response.get("action_input")
-                try:
-                    response = tool.run(action_input)
-                except Exception as e:
-                    error_message = str(e)
-                    response = f"The error message is `{error_message}`. Please display the error message, and then analyze the error message and provide the solution."
-    if return_intermediate_steps is True and 'intermediate_steps' not in response:
-        # Add the intermediate steps to the response if requested
-        response = {
-            "output": response,
-            "intermediate_steps": dumps(intermediate_steps) if intermediate_steps else None
-        }
-        response["inspect_script"] = _inspect_python_code(response["intermediate_steps"], tools)
-        response["generated_cap_project"] = _check_generated_cap_for_bas(response["intermediate_steps"])
+    # prompt = ChatPromptTemplate.from_messages([
+    #     ("system", system_prompt),
+    #     MessagesPlaceholder(variable_name="history", messages=chat_history),
+    #     ("human", "{question}"),
+    # ])
+    # agent: Runnable = prompt | initialize_agent(tools, llm, agent=AgentType.STRUCTURED_CHAT_ZERO_SHOT_REACT_DESCRIPTION, verbose=verbose, return_intermediate_steps=return_intermediate_steps)
+    # intermediate_steps = None
+    # try:
+    #     response = agent.invoke({"question": question, "history": chat_history})
+    #     if return_intermediate_steps is True:
+    #         intermediate_steps = response.get("intermediate_steps")
+    # except ValidationError as e:
+    #     # Parse Pydantic error details for feedback
+    #     error_details = "\n".join([f"{err['loc'][0]}: {err['msg']}" for err in e.errors()])
+    #     error_message = f"Please provide the parameters:\n {error_details}"
+    #     chat_history.append(("system", error_message))
+    #     response = {"output": error_message}
+    # except Exception as e:
+    #     error_message = str(e)
+    #     response = f"The error message is `{error_message}`. Please display the error message, and then analyze the error message and provide the solution."
+    #     if return_intermediate_steps is True:
+    #         response = {
+    #             "output": response,
+    #             "intermediate_steps": dumps(intermediate_steps) if return_intermediate_steps else None
+    #         }
+    #         response["inspect_script"] = _inspect_python_code(response["intermediate_steps"], tools)
+    #         response["generated_cap_project"] = _check_generated_cap_for_bas(response["intermediate_steps"])
+    #     return response
+
+    # if isinstance(response, dict) and 'output' in response:
+    #     response = response['output']
+    # if isinstance(response, str):
+    #     if response.startswith("Action:"): # force to call tool if return a Action string
+    #         action_json = response[7:]
+    #         try:
+    #             response = json.loads(action_json)
+    #         except Exception as e:
+    #             error_message = str(e)
+    #             response = f"The error message is `{error_message}`. Please display the error message, and then analyze the error message and provide the solution."
+    #     if "action" in response and "action_input" in response:
+    #         try:
+    #             response = json.loads(response)
+    #         except:
+    #             pass
+    #     if isinstance(response, str) and response.strip() == "":
+    #         response = "I'm sorry, I don't understand. Please ask me again."
+    # if isinstance(response, dict) and 'action' in response and 'action_input' in response:
+    #     action = response.get("action")
+    #     for tool in tools:
+    #         if tool.name == action:
+    #             action_input = response.get("action_input")
+    #             try:
+    #                 response = tool.run(action_input)
+    #             except Exception as e:
+    #                 error_message = str(e)
+    #                 response = f"The error message is `{error_message}`. Please display the error message, and then analyze the error message and provide the solution."
+    # if return_intermediate_steps is True and 'intermediate_steps' not in response:
+    #     # Add the intermediate steps to the response if requested
+    #     response = {
+    #         "output": response,
+    #         "intermediate_steps": dumps(intermediate_steps) if intermediate_steps else None
+    #     }
+    #     response["inspect_script"] = _inspect_python_code(response["intermediate_steps"], tools)
+    #     response["generated_cap_project"] = _check_generated_cap_for_bas(response["intermediate_steps"])
+    response = stateless_chat(query=question,
+                              tools=tools,
+                              llm=llm,
+                              memory=chat_history)
     return response

{hana_ai-1.0.25070202 → hana_ai-1.0.25070203}/src/hana_ai/agents/hanaml_rag_agent.py

@@ -6,6 +6,8 @@ The following class is available:
         * :class `HANAMLRAGAgent`
 """
 
+#pylint: disable=attribute-defined-outside-init, ununsed-argument, no-else-return
+
 import re
 from typing import Dict, List, Any, Optional, Tuple, Union
 from datetime import datetime
@@ -16,12 +18,14 @@ from langchain.agents import Tool, AgentExecutor, create_openai_functions_agent
 from langchain.memory import ConversationBufferWindowMemory
 from langchain.prompts import ChatPromptTemplate, MessagesPlaceholder, HumanMessagePromptTemplate
 from langchain.schema import SystemMessage, HumanMessage, AIMessage, AgentAction, AgentFinish
+from langchain.load.dump import dumps
 from langchain_core.callbacks.manager import CallbackManagerForChainRun
 from langchain_core.tools import BaseTool
 from langchain_community.chat_message_histories import SQLChatMessageHistory
 from langchain_community.vectorstores import FAISS
 
 from sentence_transformers import CrossEncoder
+from hana_ai.agents.utilities import _check_generated_cap_for_bas, _inspect_python_code
 from hana_ai.vectorstore.embedding_service import GenAIHubEmbeddings
 
 # Configure logging
@@ -401,3 +405,73 @@ class HANAMLRAGAgent:
         response = self.executor.invoke(agent_input)
         self._update_long_term_memory(user_input, response['output'])
         return response['output']
+
+def stateless_chat(
+    query: str,
+    tools: List[BaseTool],
+    llm: Any,
+    memory: List[str]
+) -> str:
+    """
+    Stateless chat function that integrates tools and memory for RAG.
+
+    Parameters
+    ----------
+    query : str
+        The user query to process.
+    tools : List[BaseTool]
+        List of tools available for the agent to use.
+    llm : Any
+        The language model instance to generate responses.
+    memory : List[str]
+        List of long-term memory entries to integrate into the context.
+    """
+
+    # 1. 构建系统上下文 (整合长时记忆)
+    def build_system_context(query: str, memory: List[str]) -> SystemMessage:
+        """
+        Build the system context message with long-term memory integration.
+        """
+        valid_memories = [m for m in memory if m.strip()]
+        memory_block = "\n".join([f"- {m}" for m in valid_memories]) if valid_memories else "No long-term memory available."
+
+        context_content = [
+            {"type": "text", "text": "## System Instructions"},
+            {"type": "text", "text": "You are a helpful assistant with access to tools. Always use tools when appropriate."},
+            {"type": "text", "text": "## Recent Chat History"},
+            {"type": "text", "text": memory_block},
+            {"type": "text", "text": "## Operating Rules\n1. Respond directly to simple questions\n2. Use tools when calculation/query is needed"}
+        ]
+        return SystemMessage(content=context_content)
+
+    # 2. 初始化提示模板
+    system_message = build_system_context(query, memory)
+    prompt_template = ChatPromptTemplate.from_messages([
+        system_message,
+        MessagesPlaceholder(variable_name="chat_history"),
+        HumanMessagePromptTemplate.from_template("{input}"),
+        MessagesPlaceholder(variable_name="agent_scratchpad")
+    ])
+
+    # 3. 创建带空记忆的代理
+    agent = create_openai_functions_agent(llm, tools, prompt_template)
+    agent_executor = FormatSafeAgentExecutor(
+        agent=agent,
+        tools=tools,
+        max_iterations=10,
+        handle_parsing_errors=True,
+        memory=ConversationBufferWindowMemory(  # 空短期记忆
+            memory_key="chat_history",
+            k=0,
+            return_messages=True
+        ),
+        return_intermediate_steps=True,
+    )
+
+    # 4. 执行查询并返回响应
+    response = agent_executor.invoke({"input": query})
+    intermediate_steps = response.get("intermediate_steps")
+    response["intermediate_steps"] = dumps(intermediate_steps) if intermediate_steps else None
+    response["inspect_script"] = _inspect_python_code(response["intermediate_steps"], tools)
+    response["generated_cap_project"] = _check_generated_cap_for_bas(response["intermediate_steps"])
+    return response

hana_ai-1.0.25070203/src/hana_ai/agents/utilities.py

@@ -0,0 +1,58 @@
+"""
+Utilities for HANA AI agents.
+"""
+
+import json
+import inspect
+
+def _check_generated_cap_for_bas(intermediate_steps):
+    """
+    Check if the generated CAP artifacts are valid.
+
+    Parameters
+    ----------
+    intermediate_steps : str
+        The intermediate steps to check.
+
+    Returns
+    -------
+    bool
+        True if the generated CAP artifacts are valid, False otherwise.
+    """
+    try:
+        ss = json.loads(intermediate_steps)
+    except:
+        return False
+    if intermediate_steps is None:
+        return False
+    if not isinstance(ss, list):
+        return False
+    for step in ss:
+        for substep in step:
+            if isinstance(substep, dict) and 'type' in substep and substep['type'] == 'constructor':
+                if 'kwargs' in substep and 'tool' in substep['kwargs']:
+                    tool_name = substep['kwargs']['tool']
+                    if tool_name == "cap_artifacts_for_bas":
+                        return True
+    return False
+
+def _inspect_python_code(intermediate_steps, tools):
+    try:
+        ss = json.loads(intermediate_steps)
+    except:
+        return None
+    if intermediate_steps is None:
+        return None
+    collect_tool_call = []
+    if not isinstance(ss, list):
+        return None
+    for step in ss:
+        for substep in step:
+            if isinstance(substep, dict) and 'type' in substep and substep['type'] == 'constructor':
+                if 'kwargs' in substep and 'tool' in substep['kwargs']:
+                    tool_name = substep['kwargs']['tool']
+                    for tool in tools:
+                        if tool.name == tool_name:
+                            collect_tool_call.append({"tool_name": tool_name, "parameters": json.dumps(substep['kwargs']['tool_input']), "python_code": inspect.getsource(tool._run)})
+                            break
+    return collect_tool_call

{hana_ai-1.0.25070202 → hana_ai-1.0.25070203/src/hana_ai.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hana_ai
-Version: 1.0.25070202
+Version: 1.0.25070203
 Summary: Generative AI Toolkit for SAP HANA Cloud
 Author: SAP
 License: Apache-2.0

{hana_ai-1.0.25070202 → hana_ai-1.0.25070203}/src/hana_ai.egg-info/SOURCES.txt

@@ -33,6 +33,7 @@ src/hana_ai/agents/hana_dataframe_prompt.py
 src/hana_ai/agents/hana_sql_agent.py
 src/hana_ai/agents/hanaml_agent_with_memory.py
 src/hana_ai/agents/hanaml_rag_agent.py
+src/hana_ai/agents/utilities.py
 src/hana_ai/tools/__init__.py
 src/hana_ai/tools/agent_as_a_tool.py
 src/hana_ai/tools/code_template_tools.py