PyPI - hana-ai - Versions diffs - 1.0.25122300__tar.gz → 1.0.26011600__tar.gz - Mend

Files changed (549) hide show

hana_ai-1.0.25122300/src/hana_ai/tools/mcp_tools.py DELETED Viewed

@@ -1,152 +0,0 @@
-"""
-hana_ai.tools.mcp_tools
-"""
-import asyncio
-import json
-from typing import Annotated
-from fastmcp import FastMCP, Context
-from hana_ml import ConnectionContext
-from hana_ai.tools.hana_ml_tools.graph_tools import DiscoveryAgentTool, DataAgentTool
-mcp = FastMCP("HANA ML Tools")
-@mcp.tool(
-        name="set_hana_connection",
-        description="Set HANA connection parameters for subsequent tools."
-)
-async def set_hana_connection(
-    host: Annotated[str, "The HANA database host (hostname or IP)."],
-    port: Annotated[int, "The HANA database port."],
-    user: Annotated[str, "The HANA database user name."],
-    password: Annotated[str, "The HANA database user password."],
-    context: Context
-) -> str:
-    """
-    Set HANA connection parameters in the context.
-    Parameters
-    ----------
-    host : str
-        The HANA database host.
-    port : int
-        The HANA database port.
-    user : str
-        The HANA database user.
-    password : str
-        The HANA database password.
-    """
-    connection_context = {
-        "host": host,
-        "port": port,
-        "user": user,
-        "password": password
-    }
-    context.set_state("hana_connection", connection_context)
-    return "HANA connection set successfully."
-def get_discovery_agent_tool(context: Context):
-    """Get or create the HANA discovery agent tool instance for the current session"""
-    if context.get_state("discovery_agent") is None:
-        # Get connection info from context (must be set by another tool first)
-        conn_info = context.get_state("hana_connection")
-        if not conn_info:
-            raise ValueError("Please set HANA connection first.")
-        # Create tool instance
-        connection_context = ConnectionContext(
-            host=conn_info["host"],
-            port=conn_info["port"],
-            user=conn_info["user"],
-            password=conn_info["password"]
-        )
-        context.set_state("discovery_agent", DiscoveryAgentTool(
-            connection_context=connection_context))
-    return context.get_state("discovery_agent")
-def get_data_agent_tool(context: Context):
-    """Get or create the HANA data agent tool instance for the current session"""
-    if context.get_state("data_agent") is None:
-        # 从context中获取连接信息（需要先通过其他tool设置）
-        conn_info = context.get_state("hana_connection")
-        if not conn_info:
-            raise ValueError("Please set HANA connection first.")
-        # 创建工具实例
-        connection_context = ConnectionContext(
-            host=conn_info["host"],
-            port=conn_info["port"],
-            user=conn_info["user"],
-            password=conn_info["password"]
-        )
-        context.set_state("data_agent", DataAgentTool(
-            connection_context=connection_context))
-    return context.get_state("data_agent")
- # Wrap _run method as FastMCP tool
-@mcp.tool(
-        name="discovery_agent",
-        description="Tool for discovering HANA objects via knowledge graph."
-)
-async def discovery_agent(query: Annotated[str, "The query to discover HANA objects via knowledge graph."],
-                          context: Context,
-                          remote_source_name: Annotated[str, "The name of the remote source to connect to AI Core. Default is 'HANA_DISCOVERY_AGENT_CREDENTIALS'."] = "HANA_DISCOVERY_AGENT_CREDENTIALS",
-                          rag_schema_name: Annotated[str, "The schema name where RAG tables are stored. Default is 'SYSTEM'."] = "SYSTEM",
-                          rag_table_name: Annotated[str, "The table name where RAG data is stored. Default is 'RAG'."] = "RAG",
-                          graph_name: Annotated[str, "he name of the knowledge graph to use. Default is 'HANA_OBJECTS'."] = "HANA_OBJECTS",
-                          ) -> str:
-    """
-    Use the HANA discovery agent tool to run a query.
-    """
-    tool = get_discovery_agent_tool(context)
-    additional_config = {
-        "remoteSourceName": remote_source_name,
-        "ragSchemaName": rag_schema_name,
-        "ragTableName": rag_table_name,
-        "graphName": graph_name
-    }
-    result = await asyncio.to_thread(tool._run, query, additional_config)
-    return result
-@mcp.tool(
-        name="data_agent",
-        description="Tool for querying HANA data via knowledge graph."
-)
-async def data_agent(query: Annotated[str, "The query to discover HANA objects via knowledge graph."],
-                     context: Context,
-                     remote_source_name: Annotated[str, "The name of the remote source to connect to AI Core. Default is 'HANA_DISCOVERY_AGENT_CREDENTIALS'."] = "HANA_DISCOVERY_AGENT_CREDENTIALS",
-                     rag_schema_name: Annotated[str, "The schema name where RAG tables are stored. Default is 'SYSTEM'."] = "SYSTEM",
-                     rag_table_name: Annotated[str, "The table name where RAG data is stored. Default is 'RAG'."] = "RAG",
-                     graph_name: Annotated[str, "he name of the knowledge graph to use. Default is 'HANA_OBJECTS'."] = "HANA_OBJECTS",) -> str:
-    """
-    Use the HANA data agent tool to run a query.
-    """
-    tool = get_data_agent_tool(context)
-    additional_config = {
-        "remoteSourceName": remote_source_name,
-        "ragSchemaName": rag_schema_name,
-        "ragTableName": rag_table_name,
-        "graphName": graph_name
-    }
-    result = await asyncio.to_thread(tool._run, query, additional_config)
-    return result
- # Debug tool: view current session's connection info and created tools
-@mcp.tool(
-        name="debug_session",
-        description="View current session's HANA connection info and created tools."
-)
-async def debug_session(context: Context) -> str:
-    """
-    View current session's HANA connection info and created tools.
-    """
-    info = {
-        "hana_connection": context.get_state("hana_connection"),
-        "has_discovery_agent": context.get_state("discovery_agent") is not None,
-        "has_data_agent": context.get_state("data_agent") is not None,
-    }
-    return json.dumps(info, ensure_ascii=False)

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

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

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

@@ -138,11 +138,14 @@ def _get_deployment_id(credentials: dict) -> str:
     if response.status_code == 200:
         deployments_data = response.json()
+        logger.info("Deployments details: %s", deployments_data)
         resources = deployments_data.get("resources", [])
         if resources:
-            deployment_id = resources[0].get("id", "")
-            logger.info("Successfully obtained deployment ID: %s", deployment_id)
-            return deployment_id
+            for res in resources:
+                d_id = res.get("id", None)
+                if res.get("scenarioId", None) == "orchestration":
+                    logger.info("Successfully obtained deployment ID: %s", d_id)
+                    return d_id
         else:
             raise Exception("No deployments found.")
     else:

@@ -27,6 +27,7 @@ class HANAAgentToolInput(BaseModel):
     rag_schema_name: Optional[str] = Field(description="The schema name where RAG tables are stored. Default is 'SYSTEM'.", default="SYSTEM")
     rag_table_name: Optional[str] = Field(description="The table name where RAG data is stored. Default is 'RAG'.", default="RAG")
     graph_name: Optional[str] = Field(description="The name of the knowledge graph to use. Default is 'HANA_OBJECTS'.", default="HANA_OBJECTS")
+    model_name: Optional[str] = Field(description="The name of the AI Core model to use. Default is None.", default='gpt-4.1')
 class CreateRemoteSourceInput(BaseModel):
     """
@@ -154,7 +155,10 @@ class DiscoveryAgentTool(BaseTool):
         additional_config = {
             "ragSchemaName": rag_schema_name,
             "ragTableName": rag_table_name,
-            "graphName": graph_name
+            "graphName": graph_name,
+            "model": {
+                "name": kwargs.get("model_name", "gpt-4.1")
+            }
         }
         da = DiscoveryAgent(
             connection_context=self.connection_context
@@ -222,7 +226,10 @@ class DataAgentTool(BaseTool):
         additional_config = {
             "ragSchemaName": rag_schema_name,
             "ragTableName": rag_table_name,
-            "graphName": graph_name
+            "graphName": graph_name,
+            "model": {
+                "name": kwargs.get("model_name", "gpt-4.1")
+            }
         }
         da = DataAgent(
             connection_context=self.connection_context

@@ -166,6 +166,36 @@ class HANAMLToolkit(BaseToolkit):
                 self.used_tools.remove(tool)
                 break
+    def reset_tools(self, tools: Optional[List[BaseTool]] = None):
+        """
+        Reset the toolkit's tools.
+        Parameters
+        ----------
+        tools : list of BaseTool or list of str, optional
+            If provided, the toolkit will only contain these tools. When a list of
+            strings is provided, tools will be matched by name from the default tools.
+            If None, reset to default tools.
+        """
+        if tools is None:
+            # Reset to the default tools list
+            self.used_tools = self.default_tools
+            return
+        new_tools: List[BaseTool] = []
+        for t in tools:
+            if isinstance(t, BaseTool):
+                new_tools.append(t)
+            elif isinstance(t, str):
+                # Match by name from default tools
+                for dt in self.default_tools:
+                    if getattr(dt, "name", None) == t:
+                        new_tools.append(dt)
+                        break
+            # Ignore invalid entries silently
+        self.used_tools = new_tools
     def set_bas(self, bas=True):
         """
         Set the BAS mode for all tools in the toolkit.

@@ -30,7 +30,6 @@ src/hana_ai/client/mcp_client.py
 src/hana_ai/tools/__init__.py
 src/hana_ai/tools/agent_as_a_tool.py
 src/hana_ai/tools/code_template_tools.py
-src/hana_ai/tools/mcp_tools.py
 src/hana_ai/tools/toolkit.py
 src/hana_ai/tools/df_tools/__init__.py
 src/hana_ai/tools/df_tools/additive_model_forecast_tools.py

hana-ai 1.0.25122300__tar.gz → 1.0.26011600__tar.gz

hana-ai 1.0.25122300tar.gz → 1.0.26011600tar.gz