Merge pull request #60 from jaguarliuu/main

优化异常处理 优化用户提示信息

Author: jaguarliuu

.github/workflows/main.yml

@@ -0,0 +1,25 @@
+name: Sync to CNB
+on: [push]
+
+jobs:
+  sync:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      
+      - name: Sync to CNB Repository
+        run: |
+          docker run --rm \
+            -v ${{ github.workspace }}:${{ github.workspace }} \
+            -w ${{ github.workspace }} \
+            -e PLUGIN_TARGET_URL="https://cnb.cool/jaguarliu.cool/dify-tool/rookie_text2data.git" \
+            -e PLUGIN_AUTH_TYPE="https" \
+            -e PLUGIN_USERNAME="cnb" \
+            -e PLUGIN_PASSWORD=${{ secrets.CNB_TOKEN }} \
+            -e PLUGIN_BRANCH="main" \
+            -e PLUGIN_GIT_USER="cnb" \
+            -e PLUGIN_GIT_EMAIL="cnb@cnb.cool" \
+            -e PLUGIN_FORCE="true" \
+            tencentcom/git-sync

.ide/Dockerfile

@@ -3,7 +3,7 @@ FROM python:3.13.0
 # RUN apt-get update && apt-get install -y git
 
 # 下载插件并设置权限，重命名后复制到系统路径
-RUN wget https://github.com/langgenius/dify-plugin-daemon/releases/download/0.0.6/dify-plugin-linux-amd64 -O /tmp/dify-plugin-linux-amd64 && \
+RUN wget https://github.com/langgenius/dify-plugin-daemon/releases/download/0.0.7/dify-plugin-linux-amd64 -O /tmp/dify-plugin-linux-amd64 && \
     chmod +x /tmp/dify-plugin-linux-amd64 && \
     mv /tmp/dify-plugin-linux-amd64 /usr/local/bin/dify
 

README.md

@@ -1,7 +1,7 @@
 ## rookie_text2data
 
 **Author:** jaguarliuu
-**Version:** 0.3.0
+**Version:** 0.3.1
 **Type:** tool
 
 ### Description

README_ZH.md

@@ -1,7 +1,7 @@
 ## rookie_text2data
 
 **Author:** jaguarliuu
-**Version:** 0.3.0
+**Version:** 0.3.1
 **Type:** tool
 
 ### Description

manifest.yaml

@@ -1,4 +1,4 @@
-version: 0.3.0
+version: 0.3.1
 type: plugin
 author: jaguarliuu
 name: rookie_text2data

requirements.txt

@@ -1,9 +1,9 @@
 # 核心依赖
-dify_plugin~=0.0.1b67
+dify_plugin~=0.0.1b72
 sqlalchemy>=2.0.0
 
 # 数据库驱动
-# pyodbc>=4.0.39       # SQL Server新驱动
+pyodbc>=4.0.39       # SQL Server新驱动
 pymysql>=1.1.1       # MySQL驱动
 psycopg2-binary>=2.9.10  # PostgreSQL驱动
 

tools/rookie_text2data.py

@@ -4,11 +4,8 @@
 from dify_plugin import Tool
 from dify_plugin.entities.tool import ToolInvokeMessage
 from dify_plugin.entities.model.llm import LLMModelConfig
-from dify_plugin.entities.tool import ToolInvokeMessage
 from dify_plugin.entities.model.message import SystemPromptMessage, UserPromptMessage
 from utils.prompt_loader import PromptLoader
-# from utils.alchemy_db_client import format_schema_dsl
-# from utils.alchemy_db_client import get_db_schema
 from database_schema.connector import get_db_schema
 from database_schema.formatter import format_schema_dsl
 

utils/alchemy_db_client.py

@@ -219,16 +219,10 @@ def _build_connection_uri(
     database: str,
 ) -> str:
     """构建数据库连接字符串"""
-<<<<<<< HEAD
-    separator = ':' if db_type != 'sqlserver' else ','
-    db_type = db_type if db_type != 'sqlserver' else 'mssql'
-    extra_info = '' if driver_info == None else f'?driver={driver_info}'
 
-    return f"{db_type}+{driver}://{username}:{password}@{host}{separator}{port}/{database}{extra_info}"
-=======
     db_type = db_type if db_type != 'sqlserver' else 'mssql'
     return f"{db_type}+{driver}://{username}:{password}@{host}:{port}/{database}"
->>>>>>> debug
+
 
 def _process_result(result_proxy) -> Union[list[dict], dict, None]:
     """处理执行结果"""