Skip to content

Commit c7fa184

Browse files
committed
refactor: unify capability types with data-studio-agent
- Remove duplicate capabilities/types.rs and capabilities/registry.rs - Import types and registry from data-studio-agent - Replace SourceKind::SqlKit with SourceKind::AppLocal - Update init_registry() call to pass registration function array - Update agent/executor.rs and agent_adapters.rs to use data-studio-agent paths
1 parent c761179 commit c7fa184

15 files changed

Lines changed: 22 additions & 169 deletions

File tree

‎src-tauri/Cargo.lock‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src-tauri/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ http = "1"
8989
log = "0.4"
9090
futures = "0.3"
9191
rand = "0.8"
92-
data-studio-agent = { git = "https://github.com/geek-fun/data-studio-agent.git", tag = "v0.1.4" }
92+
data-studio-agent = { git = "https://github.com/geek-fun/data-studio-agent.git", branch = "feat/unified-capability-types" }
9393

9494
# Archive extraction (JRE downloads)
9595
flate2 = "1.0"

‎src-tauri/src/agent/executor.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ impl ToolExecutor for SqlKitToolExecutor {
3131
Some(connection_config.clone())
3232
};
3333

34-
let raw = crate::capabilities::registry::invoke_capability_inner(
34+
let raw = data_studio_agent::capabilities::registry::invoke_capability_inner(
3535
tool_name,
3636
arguments.clone(),
3737
conn_opt,

‎src-tauri/src/agent_adapters.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ pub async fn run_agent_loop(
5858
.unwrap_or(Value::Null);
5959

6060
let is_parallel_ok = |name: &str| -> bool {
61-
crate::capabilities::registry::registry()
61+
data_studio_agent::capabilities::registry::registry()
6262
.get(name)
6363
.map(|c| c.parallel_ok)
6464
.unwrap_or(false)

‎src-tauri/src/capabilities/commands.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1+
use data_studio_agent::capabilities::registry;
2+
use data_studio_agent::capabilities::types::Capability;
13
use serde_json::{json, Value};
24
use tauri::AppHandle;
35
use tauri::Manager;
46

5-
use super::registry;
6-
77
#[tauri::command]
88
pub async fn invoke_capability(
99
name: String,
@@ -38,7 +38,7 @@ pub async fn get_available_tools(source_kinds: Option<Vec<String>>) -> Result<St
3838
serde_json::to_string(&result).map_err(|e| e.to_string())
3939
}
4040

41-
fn to_openai_tool(cap: &super::Capability) -> Value {
41+
fn to_openai_tool(cap: &Capability) -> Value {
4242
json!({
4343
"type": "function",
4444
"function": {
@@ -49,7 +49,7 @@ fn to_openai_tool(cap: &super::Capability) -> Value {
4949
})
5050
}
5151

52-
fn to_metadata(cap: &super::Capability) -> Value {
52+
fn to_metadata(cap: &Capability) -> Value {
5353
json!({
5454
"riskLevel": cap.risk_level,
5555
"requiredPermission": cap.required_permission

‎src-tauri/src/capabilities/mod.rs‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,7 @@
11
pub mod commands;
22
pub mod mysql;
33
pub mod postgres;
4-
pub mod registry;
54
pub mod sql;
65
pub mod sqlite;
76
pub mod sqlkit;
87
pub mod sqlserver;
9-
pub mod types;
10-
11-
pub use registry::init_registry;
12-
pub use registry::registry;
13-
pub use types::Capability;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
use super::registry::CapabilityRegistry;
1+
use data_studio_agent::capabilities::registry::CapabilityRegistry;
22

33
pub fn register_all(_reg: &mut CapabilityRegistry) {}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
use super::registry::CapabilityRegistry;
1+
use data_studio_agent::capabilities::registry::CapabilityRegistry;
22

33
pub fn register_all(_reg: &mut CapabilityRegistry) {}

‎src-tauri/src/capabilities/registry.rs‎

Lines changed: 0 additions & 90 deletions
This file was deleted.

‎src-tauri/src/capabilities/sql.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ use tauri_plugin_store::StoreExt;
88
use crate::database::{DatabaseAdapter, QueryResult};
99
use crate::state::{ActiveConnection, ServerConfig};
1010

11-
use super::registry::CapabilityRegistry;
12-
use super::types::{Capability, CapabilityHandler, RiskLevel, SourceKind};
11+
use data_studio_agent::capabilities::registry::CapabilityRegistry;
12+
use data_studio_agent::capabilities::types::{Capability, CapabilityHandler, RiskLevel, SourceKind};
1313

1414
fn app_handle() -> AppHandle {
1515
crate::APP_HANDLE

0 commit comments

Comments
 (0)