adbpg-mcp-server 1.0.5__tar.gz → 1.0.7__tar.gz

adbpg_mcp_server-1.0.7/LICENSE

@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

adbpg_mcp_server-1.0.7/PKG-INFO

@@ -0,0 +1,10 @@
+Metadata-Version: 2.4
+Name: adbpg-mcp-server
+Version: 1.0.7
+Summary: MCP server for AnalyticDB PostgreSQL
+License-File: LICENSE
+Requires-Python: >=3.10
+Requires-Dist: mcp>=1.4.0
+Requires-Dist: psycopg>=3.1.0
+Requires-Dist: pydantic>=2.0.0
+Requires-Dist: python-dotenv>=1.0.0

{adbpg_mcp_server-1.0.5 → adbpg_mcp_server-1.0.7}/README.md

@@ -132,6 +132,7 @@ pip install adbpg_mcp_server
         - `metadata` (`json`): The metadata json(optional).
         - `memory_type` (`text`): The memory type(optional).
         - `prompt` (`text`): The prompt(optional).
+        
         **Note:**  
         At least one of `user_id`, `run_id`, or `agent_id` should be provided.
 
@@ -141,6 +142,7 @@ pip install adbpg_mcp_server
         - `user_id` (`text`): User ID.
         - `run_id` (`text`): Run ID.
         - `agent_id` (`text`): Agent ID.
+        
         **Note:**  
         At least one of `user_id`, `run_id`, or `agent_id` should be provided.
 
@@ -152,6 +154,7 @@ pip install adbpg_mcp_server
         - `run_id` (`text`): Run ID.
         - `agent_id` (`text`): Agent ID.
         - `filter` (`json`): Additional filter conditions in JSON format (optional).
+        
         **Note:**  
         At least one of `user_id`, `run_id`, or `agent_id` should be provided.
 
@@ -161,6 +164,7 @@ pip install adbpg_mcp_server
         - `user_id` (`text`): User ID.
         - `run_id` (`text`): Run ID.
         - `agent_id` (`text`): Agent ID.
+       
         **Note:**  
         At least one of `user_id`, `run_id`, or `agent_id` should be provided.
 

{adbpg_mcp_server-1.0.5/adbpg_mcp_server → adbpg_mcp_server-1.0.7}/adbpg_mcp_server.py

@@ -84,7 +84,8 @@ def get_graphrag_config():
         "embedding_url": os.getenv("GRAPHRAG_EMBEDDING_BASE_URL"),
         "language": os.getenv("GRAPHRAG_LANGUAGE", "English"),
         "entity_types": os.getenv("GRAPHRAG_ENTITY_TYPES"),
-        "relationship_types": os.getenv("GRAPHRAG_RELATIONSHIP_TYPES")
+        "relationship_types": os.getenv("GRAPHRAG_RELATIONSHIP_TYPES"),
+        "postgres_password": os.getenv("ADBPG_PASSWORD")
     }
     return graphrag_config
     
@@ -144,6 +145,7 @@ def get_db_config():
 GRAPHRAG_CONN: Connection | None = None
 def get_graphrag_tool_connection() -> Connection:
     global GRAPHRAG_CONN
+    global GRAPHRAG_ENV_IS_READY
     config = get_db_config()
     # 如果未连接，或者连接失效 重新连接
     if GRAPHRAG_CONN is None or GRAPHRAG_CONN.closed:
@@ -156,6 +158,7 @@ def get_graphrag_tool_connection() -> Connection:
                 logger.info(f"[GraphRAG] Use the connection {id(graphrag_conn)} when executing the graphrag init")
             logger.info("Successfully initialize the graphrag server\n")
         except Exception as e:
+            GRAPHRAG_ENV_IS_READY = False
             logger.error(f"Failed to initialize the graphrag server: {e}")
         # 重新执行初始化
     else:
@@ -177,12 +180,14 @@ def get_graphrag_tool_connection() -> Connection:
                     logger.info(f"[GraphRAG] Use the connection {id(graphrag_conn)} when executing the graphrag init")
                 logger.info("Successfully initialize the graphrag server\n")
             except Exception as e:
+                GRAPHRAG_ENV_IS_READY = False
                 logger.error(f"Failed to initialize the graphrag server: {e}")
     
     return GRAPHRAG_CONN
 
 LLM_MEMORY_CONN: Connection | None = None
 def get_llm_memory_tool_connection() -> Connection:
+    global LLMEMORY_ENV_IS_READY
     global LLM_MEMORY_CONN
     config = get_db_config()
     # 如果未连接，或者连接失效 重新连接
@@ -196,6 +201,7 @@ def get_llm_memory_tool_connection() -> Connection:
                 logger.info(f"[LLM Memory] Use the connection {id(llm_memory_conn)} when executing the llm_memory init")
             logger.info("Successfully initialize the llm server\n")
         except Exception as e:
+            LLMEMORY_ENV_IS_READY = False
             logger.error(f"Failed to initialize the llm_memory server: {e}")
     else:
         # 发送一个轻量级查询 检测 连接是否健康
@@ -215,6 +221,7 @@ def get_llm_memory_tool_connection() -> Connection:
                     logger.info(f"[LLM Memory] Use the connection {id(llm_memory_conn)} when executing the llm_memory init")
                 logger.info("Successfully initialize the llm server\n")
             except Exception as e:
+                LLMEMORY_ENV_IS_READY = False
                 logger.error(f"Failed to initialize the llm_memory server: {e}")
 
     return LLM_MEMORY_CONN
@@ -501,7 +508,7 @@ async def list_tools() -> list[Tool]:
         #### graphrag & llm_memory tool list
         Tool(
             name = "adbpg_graphrag_upload",
-            description = "Upload a text file (with its name) and file content to graphrag to generate a knowledge graph.",
+            description = "Execute graphrag upload operation",
             # 参数：filename text， context text
             # filename 表示文件名称， context 表示文件内容
             inputSchema = {
@@ -509,11 +516,11 @@ async def list_tools() -> list[Tool]:
                 "properties": {
                     "filename": {
                         "type": "string",
-                        "description": "The name of the file to be uploaded"
+                        "description": "The file name need to upload"
                     },
                     "context": {
                         "type": "string",
-                        "description": "The textual content of the file."
+                        "description": "the context of your file"
                     }
                 },
                 "required": ["filename", "context"]
@@ -521,7 +528,7 @@ async def list_tools() -> list[Tool]:
         ),
         Tool(
             name = "adbpg_graphrag_query",
-            description = "Query the graphrag using the specified query string and mode.",
+            description = "Execute graphrag query operation",
             # 参数：query_str text, [query_mode text]
             # query_str 是询问的问题，query_mode 选择查询模式
             inputSchema = {
@@ -529,11 +536,15 @@ async def list_tools() -> list[Tool]:
                 "properties": {
                     "query_str": {
                         "type": "string",
-                        "description": "The query content."
+                        "description": "The query you want to ask"
                     },
                     "query_mode": {
                         "type": "string",
-                        "description": "The query mode, choose from [bypass, naive, local, global, hybrid, mix]. If null, defaults to mix."
+                        "description": "The query mode you need to choose [ bypass,naive, local, global, hybrid, mix[default], tree ]."
+                    },
+                    "start_search_node_id": {
+                        "type": "string",
+                        "description": "If using 'tree' query mode, set the start node ID of tree."
                     }
                 },
                 "required": ["query_str"]
@@ -587,24 +598,40 @@ async def list_tools() -> list[Tool]:
                     "root_node_entity": {
                         "type": "string",
                         "description": "the root_noot_entity"
+                        
                     }
                 },
                 "required": ["root_node_entity"]
             }
         ),
-
-
+        Tool(
+            name = "adbpg_graphrag_reset_tree_query",
+            description = " Reset the decision tree in the tree query mode",
+            # para: 
+            inputSchema = {
+                "type": "object",
+                "required": []
+            }
+        ),
         Tool(
             name = "adbpg_llm_memory_add",
-            description = "Add LLM long memory with a specific user, run or agent.",
+            description = "Execute llm_memory add operation",
             # 参数：messages json, user_id text, run_id text, agent_id text, metadata json
             # 增加新的记忆
             inputSchema={
                 "type": "object",
                 "properties": {
                     "messages": {
-                        "type": "json",
-                        "description": "llm_memory messages"
+                        "type": "array",
+                        "items": {
+                            "type": "object",
+                            "properties": {
+                                "role": {"type": "string"},
+                                "content": {"type": "string"}
+                            },
+                            "required": ["role", "content"]
+                        },
+                        "description": "List of messages objects (e.g., conversation history)"
                     },
                     "user_id": {
                         "type": "string",
@@ -619,7 +646,7 @@ async def list_tools() -> list[Tool]:
                         "description": "the agent_id"
                     },
                     "metadata": {
-                        "type": "json",
+                        "type": "object",
                         "description": "the metatdata json"
                     },
                     "memory_type": {
@@ -636,7 +663,7 @@ async def list_tools() -> list[Tool]:
         ),
         Tool(
             name = "adbpg_llm_memory_get_all",
-            description = "Retrieves all memory records associated with a specific user, run or agent.",
+            description = "Execute llm_memory get_all operation",
             # 参数：user_id text, run_id text, agent_id text
             # 获取某个用户或者某个agent的所有记忆
             inputSchema={
@@ -660,7 +687,7 @@ async def list_tools() -> list[Tool]:
         ),
         Tool(
             name = "adbpg_llm_memory_search",
-            description = "Retrieves memories relevant to the given query for a specific user, run, or agent.",
+            description = "Execute llm_memory search operation",
             # 参数：query text, user_id text, run_id text, agent_id text, filter json
             # 获取与给定 query 相关的记忆
             inputSchema={
@@ -683,7 +710,7 @@ async def list_tools() -> list[Tool]:
                         "description": "The search of agent_id"
                     },
                     "filter": {
-                        "type": "json",
+                        "type": "object",
                         "description": "The search of filter"
                     }
                 },
@@ -693,7 +720,7 @@ async def list_tools() -> list[Tool]:
         ,
         Tool(
             name = "adbpg_llm_memory_delete_all",
-            description = "Delete all memory records associated with a specific user, run or agent.",
+            description = "Execute llm_memory delete_all operation",
             # 参数：user_id text, run_id text, agent_id text
             # 删除某个用户或者agent的所有记忆
             inputSchema={
@@ -735,6 +762,7 @@ def get_llm_memory_tool_result(wrapped_sql, params) -> list[TextContent]:
     try:
         conn = get_llm_memory_tool_connection()
         with conn.cursor() as cursor:
+
             cursor.execute(wrapped_sql, params)
             
             if cursor.description:
@@ -782,6 +810,11 @@ async def call_tool(name: str, arguments: dict) -> list[TextContent]:
             raise ValueError("Query is required")
         if not query.strip().upper().startswith("SELECT"):
             raise ValueError("Query must be a SELECT statement")
+        query = query.rstrip().rstrip(';')
+        query = f"""
+            SELECT json_agg(row_to_json(t))
+            FROM ({query}) AS t
+        """
     elif name == "execute_dml_sql":
         query = arguments.get("query")
         if not query:
@@ -792,7 +825,7 @@ async def call_tool(name: str, arguments: dict) -> list[TextContent]:
         query = arguments.get("query")
         if not query:
             raise ValueError("Query is required")
-        if not any(query.strip().upper().startswith(keyword) for keyword in ["CREATE", "ALTER", "DROP"]):
+        if not any(query.strip().upper().startswith(keyword) for keyword in ["CREATE", "ALTER", "DROP", "TRUNCATE"]):
             raise ValueError("Query must be a DDL statement (CREATE, ALTER, DROP)")
     elif name == "analyze_table":
         schema = arguments.get("schema")
@@ -830,18 +863,32 @@ async def call_tool(name: str, arguments: dict) -> list[TextContent]:
             raise ValueError("GraphRAG Server initialization failed. This tool cannot be used.") 
         query_str = arguments.get("query_str")
         query_mode = arguments.get("query_mode")
+        start_search_node_id = arguments.get("start_search_node_id")
+
         if not query_str:
             raise ValueError("Query is required")
         if not query_mode:
             # default mode
             query_mode = "mix"
+        if not start_search_node_id:
+            start_search_node_id = None
+
         # 命令拼接
         wrapped_sql = f"""
-                SELECT adbpg_graphrag.query(%s::text, %s::text)
+                SELECT adbpg_graphrag.query(%s::text, %s::text, %s::text)
             """
-        params = [query_str, query_mode]
+        params = [query_str, query_mode, start_search_node_id]
         return get_graphrag_tool_result(wrapped_sql, params)
-
+    
+    elif name == "adbpg_graphrag_reset_tree_query":
+        if GRAPHRAG_ENV_IS_READY == False:
+            raise ValueError("GraphRAG Server initialization failed. This tool cannot be used.")
+        wrapped_sql = f"""
+            SELECT adbpg_graphrag.reset_tree_query()
+        """
+        params = []
+        return get_graphrag_tool_result(wrapped_sql, params)
+    
     elif name == "adbpg_graphrag_upload_decision_tree":
         if GRAPHRAG_ENV_IS_READY == False:
             raise ValueError("GraphRAG Server initialization failed. This tool cannot be used.")
@@ -1034,15 +1081,8 @@ async def call_tool(name: str, arguments: dict) -> list[TextContent]:
             conn.autocommit = True
             with conn.cursor() as cursor:
                 
-                #cursor.execute("SET statement_timeout = 300000")
-                #过滤子查询的分号
-                query = query.rstrip().rstrip(';')
-                wrapped_query = f"""
-                SELECT json_agg(row_to_json(t))
-                FROM ({query}) AS t
-                """
-                cursor.execute(wrapped_query)
-
+                cursor.execute(query)
+                
                 if name == "analyze_table":
                     return [TextContent(type="text", text=f"Successfully analyzed table {schema}.{table}")]
 
@@ -1051,7 +1091,6 @@ async def call_tool(name: str, arguments: dict) -> list[TextContent]:
                     json_result = cursor.fetchone()[0]
                     json_str = json.dumps(json_result, ensure_ascii = False, indent = 2)
                     result = [TextContent(type="text", text=json_str)]
-
                     try:
                         json.loads(result[0].text)
                     except json.JSONDecodeError as e:

adbpg_mcp_server-1.0.7/pyproject.toml

@@ -0,0 +1,21 @@
+[build-system]
+requires = ["hatchling"]
+build-backend = "hatchling.build"
+
+[project]
+name = "adbpg-mcp-server"
+version = "1.0.7"
+description = "MCP server for AnalyticDB PostgreSQL"
+requires-python = ">=3.10"
+dependencies = [
+    "mcp>=1.4.0",
+    "psycopg>=3.1.0",
+    "python-dotenv>=1.0.0",
+    "pydantic>=2.0.0"
+]
+
+[project.scripts]
+adbpg-mcp-server = "adbpg_mcp_server:run"
+
+[tool.hatch.run]
+adbpg-mcp-server = { cmd = "python adbpg_mcp_server.py" } 

adbpg_mcp_server-1.0.7/requirements.txt

@@ -0,0 +1,3 @@
+mcp>=0.1.0
+psycopg>=3.1.0
+pydantic>=2.0.0