update db_query parameters ‘form' to 'llm'

Author: junjie.miao

db_query/tools/db_util.py

@@ -25,12 +25,13 @@ def __init__(self, db_type: str,
         self.engine = create_engine(self.get_url(), pool_size=100, pool_recycle=36)
 
     def get_driver_name(self):
-        driver_name = self.db_type
-        if self.db_type == 'mysql':
+        db_type = self.db_type.lower()
+        driver_name = db_type
+        if db_type == 'mysql':
             driver_name = 'mysql+pymysql'
-        elif self.db_type == 'oracle':
+        elif db_type == 'oracle':
             driver_name = 'oracle+oracledb'
-        elif self.db_type == 'postgresql':
+        elif db_type == 'postgresql':
             driver_name = 'postgresql+psycopg2'
         return driver_name
 

db_query/tools/sql_query.py

@@ -17,6 +17,7 @@ def _invoke(
         invoke tools
         """
         db_type = tool_parameters.get("db_type", "")
+        print(db_type)
         if not db_type:
             raise ValueError("Please select the database type")
         db_host = tool_parameters.get("db_host", "")

db_query/tools/sql_query.yaml

@@ -36,7 +36,7 @@ parameters:
     human_description:
       en_US: Used for selecting the database type, mysql, oracle or postgresql.
       zh_Hans: 用于选择数据库类型，mysql、oracle或postgresql。
-    form: form
+    form: llm
   - name: db_host
     type: string
     required: true
@@ -47,7 +47,7 @@ parameters:
     human_description:
       en_US: database hostname or IP address.
       zh_Hans: 数据库的主机名或IP地址。
-    form: form
+    form: llm
   - name: db_port
     type: number
     required: false
@@ -57,7 +57,7 @@ parameters:
     human_description:
       en_US: database port.
       zh_Hans: 数据库的端口。
-    form: form
+    form: llm
   - name: db_username
     type: string
     required: true
@@ -67,7 +67,7 @@ parameters:
     human_description:
       en_US: database username.
       zh_Hans: 数据库的用户名。
-    form: form
+    form: llm
   - name: db_password
     type: secret-input
     required: true
@@ -77,7 +77,7 @@ parameters:
     human_description:
       en_US: database password.
       zh_Hans: 数据库的密码。
-    form: form
+    form: llm
   - name: db_name
     type: string
     required: false
@@ -87,7 +87,7 @@ parameters:
     human_description:
       en_US: database name.
       zh_Hans: 数据库的名称。
-    form: form
+    form: llm
   - name: db_properties
     type: string
     required: false
@@ -97,7 +97,7 @@ parameters:
     human_description:
       en_US: 'Database properties, for example: alt_host=host1&alt_host=host2&ssl_cipher=/path/to/crt'
       zh_Hans: 数据库属性，例如：alt_host=host1&alt_host=host2&ssl_cipher=/path/to/crt
-    form: form
+    form: llm
   - name: query_sql
     type: string
     required: true

db_query_pre_auth/tools/db_util.py

@@ -25,12 +25,13 @@ def __init__(self, db_type: str,
         self.engine = create_engine(self.get_url(), pool_size=100, pool_recycle=36)
 
     def get_driver_name(self):
-        driver_name = self.db_type
-        if self.db_type == 'mysql':
+        db_type = self.db_type.lower()
+        driver_name = db_type
+        if db_type == 'mysql':
             driver_name = 'mysql+pymysql'
-        elif self.db_type == 'oracle':
+        elif db_type == 'oracle':
             driver_name = 'oracle+oracledb'
-        elif self.db_type == 'postgresql':
+        elif db_type == 'postgresql':
             driver_name = 'postgresql+psycopg2'
         return driver_name