Merge pull request #81 from sjjian/dev_0_8_0

Dev 0 8 0

Author: sjjian

README.md

@@ -33,7 +33,7 @@ openhare is an AI-powered, cross-platform desktop SQL client with multi-database
 - **Multi-Database Support**: Effortlessly connect to and manage various SQL databases.
 
 ## Framework
-1. Application: - [Flutter](https://flutter.dev/), [flutter_rust_bridge](https://github.com/fzyzcjy/flutter_rust_bridge)
+1. Application: [Flutter](https://flutter.dev/), [flutter_rust_bridge](https://github.com/fzyzcjy/flutter_rust_bridge)
 2. State Management: [Riverpod](https://riverpod.dev/), [GoRouter](https://pub.dev/packages/go_router)
 3. UI: [SQL Editor](https://github.com/reqable/re-editor), [HugeIcons](https://github.com/hugeicons/hugeicons-flutter), [Window Manager](https://github.com/leanflutter/window_manager)
 4. Storage: [ObjectBox](https://objectbox.io/)

client/analysis_options.yaml

@@ -33,6 +33,7 @@ analyzer:
 
 formatter:
   page_width: 120
+  trailing_commas: preserve
 
 # Additional information about this file can be found at
 # https://dart.dev/guides/language/analysis-options

client/lib/l10n/app_en.arb

@@ -131,6 +131,10 @@
   "@display_msg_no_data": {
     "description": "No data"
   },
+  "display_msg_execution_success": "Execution successful",
+  "@display_msg_execution_success": {
+    "description": "SQL execution success message"
+  },
   "effect_rows": "Effect rows",
   "@effect_rows": {
     "description": "Effect rows"
@@ -315,6 +319,10 @@
   "@button_tooltip_sql_result_download": {
     "description": "Button tooltip download SQL result"
   },
+  "button_tooltip_refresh_metadata": "Refresh Database metadata",
+  "@button_tooltip_refresh_metadata": {
+    "description": "Button tooltip refresh metadata"
+  },
   "button_tooltip_ai_test": "Test LLM API",
   "@button_tooltip_ai_test": {
     "description": "Button tooltip test LLM API"

client/lib/l10n/app_zh.arb

@@ -32,6 +32,7 @@
     "db_base_config": "基础配置",
     "field_val_msg_value_reqiured": "值不能为空",
     "display_msg_no_data": "暂无数据",
+    "display_msg_execution_success": "执行成功",
     "effect_rows": "影响行数",
     "duration": "执行时间",
     "query": "语句",
@@ -78,6 +79,7 @@
     "button_tooltip_sql_result": "SQL结果视图",
     "button_tooltip_ai_chat": "AI对话",
     "button_tooltip_sql_result_download": "下载SQL结果",
+    "button_tooltip_refresh_metadata": "刷新数据库元信息",
     "button_tooltip_ai_test": "测试 LLM API",
     "metadata_tree_database": "数据库",
     "metadata_tree_schema": "模式",

client/lib/main.dart

@@ -25,10 +25,12 @@ void main(List<String> args) async {
 
   await windowManager.ensureInitialized();
 
-  runApp(ProviderScope(
-    retry: (retryCount, error) => null,
-    child: App(),
-  ));
+  runApp(
+    ProviderScope(
+      retry: (retryCount, error) => null,
+      child: App(),
+    ),
+  );
 
   doWhenWindowReady(() {
     const initialSize = Size(1400, 1000);

client/lib/models/ai.dart

@@ -241,10 +241,12 @@ abstract class AIChatMessageToolCallsModel with _$AIChatMessageToolCallsModel {
         'success': true,
         'affectedRows': result.affectedRows.toString(),
         'columns': result.columns
-            .map((c) => {
-                  'name': c.name,
-                  'type': c.dataType().name,
-                })
+            .map(
+              (c) => {
+                'name': c.name,
+                'type': c.dataType().name,
+              },
+            )
             .toList(),
         'rows': result.rows.map((row) {
           final rowMap = <String, dynamic>{};

client/lib/models/instances.dart

@@ -91,4 +91,19 @@ abstract class InstanceMetadataModel with _$InstanceMetadataModel {
     required List<MetaDataNode> metadata,
     required String? version,
   }) = _InstanceMetadataModel;
+
+  const InstanceMetadataModel._();
+
+  List<String> get schemas {
+    final schemas = List<String>.empty(growable: true);
+    for (final meta in metadata) {
+      meta.visitor((node, parent) {
+        if (node.type == MetaType.schema) {
+          schemas.add(node.value);
+        }
+        return true;
+      });
+    }
+    return schemas;
+  }
 }

client/lib/repositories/ai/agent.dart

@@ -1,7 +1,8 @@
 import 'package:client/models/ai.dart';
 import 'package:client/repositories/repo.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
-import 'package:objectbox/objectbox.dart';
+// ignore: unnecessary_import
+import 'package:objectbox/objectbox.dart'; // 必须引入, 不然objectbox不能正常使用
 import 'package:client/repositories/objectbox.g.dart';
 
 part 'agent.g.dart';
@@ -30,8 +31,8 @@ class LLMApiSettingStorage {
     required this.modelName,
     DateTime? createdAt,
     DateTime? lastChatUsedAt,
-  })  : createdAt = createdAt ?? DateTime.now(),
-        lastChatUsedAt = lastChatUsedAt ?? DateTime(1970, 1, 1);
+  }) : createdAt = createdAt ?? DateTime.now(),
+       lastChatUsedAt = lastChatUsedAt ?? DateTime(1970, 1, 1);
 }
 
 class LLMAgentRepoImpl implements LLMAgentRepo {
@@ -50,16 +51,17 @@ class LLMAgentRepoImpl implements LLMAgentRepo {
 
   LLMAgentModel _toModel(LLMApiSettingStorage setting) {
     return LLMAgentModel(
-        id: LLMAgentId(value: setting.id),
-        setting: LLMAgentSettingModel(
-          name: setting.name,
-          baseUrl: setting.baseUrl,
-          apiKey: setting.apiKey,
-          modelName: setting.modelName,
-        ),
-        status: _getStatus(
-          LLMAgentId(value: setting.id),
-        ));
+      id: LLMAgentId(value: setting.id),
+      setting: LLMAgentSettingModel(
+        name: setting.name,
+        baseUrl: setting.baseUrl,
+        apiKey: setting.apiKey,
+        modelName: setting.modelName,
+      ),
+      status: _getStatus(
+        LLMAgentId(value: setting.id),
+      ),
+    );
   }
 
   @override
@@ -93,12 +95,14 @@ class LLMAgentRepoImpl implements LLMAgentRepo {
 
   @override
   void create(LLMAgentSettingModel setting) {
-    final model = _llmAgentSettingBox.put(LLMApiSettingStorage(
-      name: setting.name,
-      baseUrl: setting.baseUrl,
-      apiKey: setting.apiKey,
-      modelName: setting.modelName,
-    ));
+    final model = _llmAgentSettingBox.put(
+      LLMApiSettingStorage(
+        name: setting.name,
+        baseUrl: setting.baseUrl,
+        apiKey: setting.apiKey,
+        modelName: setting.modelName,
+      ),
+    );
 
     _status[LLMAgentId(value: model)] = const LLMAgentStatusModel(state: LLMAgentState.unknown);
   }
@@ -125,12 +129,15 @@ class LLMAgentRepoImpl implements LLMAgentRepo {
 
   @override
   void updateSetting(LLMAgentId id, LLMAgentSettingModel setting) {
-    _llmAgentSettingBox.put(LLMApiSettingStorage(
+    _llmAgentSettingBox.put(
+      LLMApiSettingStorage(
         id: id.value,
         name: setting.name,
         baseUrl: setting.baseUrl,
         apiKey: setting.apiKey,
-        modelName: setting.modelName));
+        modelName: setting.modelName,
+      ),
+    );
 
     // 更新setting后，状态重置为unknown
     _status[id] = const LLMAgentStatusModel(state: LLMAgentState.unknown);

client/lib/repositories/instances/instances.dart

@@ -1,6 +1,7 @@
 import 'package:client/models/instances.dart';
 import 'package:client/repositories/instances/session_conn.dart';
-import 'package:objectbox/objectbox.dart';
+// ignore: unnecessary_import
+import 'package:objectbox/objectbox.dart'; // 必须引入, 不然objectbox不能正常使用
 import 'package:client/repositories/objectbox.g.dart';
 import 'package:client/repositories/repo.dart';
 import 'package:client/utils/active_set.dart';
@@ -28,9 +29,10 @@ class InstanceStorage {
 
   /// 目的地址：目前支持 host:port 和 dbFile 两种类型
   String targetJson;
-  
+
   /// 弃用，现在都存在 target 中
   String host;
+
   /// 弃用，现在都存在 target 中
   int? port;
 
@@ -41,7 +43,7 @@ class InstanceStorage {
   /// 使用字符串类型存储 custom 的 json 字符串， 使用时进行 json 解析。 原因：ObjectBox 不支持 json 类型。
   /// 本来使用的 @Transient 注解加自定义类型，但是更新后好像失效，弃用了。
   String customJson;
-  
+
   @Transient()
   Map<String, String> get custom {
     if (customJson.isEmpty) {
@@ -71,7 +73,7 @@ class InstanceStorage {
     required int stDbType,
     required this.name,
     required this.targetJson,
-    required this.host, 
+    required this.host,
     this.port,
     required this.user,
     required this.password,
@@ -81,31 +83,30 @@ class InstanceStorage {
     ActiveSet<String>? activeSchemas,
     DateTime? createdAt,
     DateTime? latestOpenAt,
-  })  : activeSchemas = activeSchemas ?? ActiveSet<String>(List.empty()),
-        dbType = DatabaseType.values[stDbType],
-        createdAt = createdAt ?? DateTime.now(),
-        latestOpenAt = latestOpenAt ?? DateTime(1970, 1, 1); //latestOpenAt 默认值未很早之前的时间
+  }) : activeSchemas = activeSchemas ?? ActiveSet<String>(List.empty()),
+       dbType = DatabaseType.values[stDbType],
+       createdAt = createdAt ?? DateTime.now(),
+       latestOpenAt = latestOpenAt ?? DateTime(1970, 1, 1); //latestOpenAt 默认值未很早之前的时间
 
   InstanceStorage.fromModel(InstanceModel model)
-      : id = model.id.value,
-        dbType = model.dbType,
-        name = model.name,
-        targetJson = jsonEncode(model.connectValue.target.toJson()),
-        host = "deprecated",
-        user = model.user,
-        password = model.password,
-        desc = model.desc,
-        customJson = jsonEncode(model.custom),
-        initQuerys = model.initQuerys,
-        activeSchemas = ActiveSet<String>(model.activeSchemas),
-        createdAt = model.createdAt,
-        latestOpenAt = model.latestOpenAt; 
+    : id = model.id.value,
+      dbType = model.dbType,
+      name = model.name,
+      targetJson = jsonEncode(model.connectValue.target.toJson()),
+      host = "deprecated",
+      user = model.user,
+      password = model.password,
+      desc = model.desc,
+      customJson = jsonEncode(model.custom),
+      initQuerys = model.initQuerys,
+      activeSchemas = ActiveSet<String>(model.activeSchemas),
+      createdAt = model.createdAt,
+      latestOpenAt = model.latestOpenAt;
 
   ConnectTarget _parseTarget() {
     if (targetJson.trim().isNotEmpty) {
       try {
-        return ConnectTarget.fromJson(
-            Map<String, dynamic>.from(jsonDecode(targetJson)));
+        return ConnectTarget.fromJson(Map<String, dynamic>.from(jsonDecode(targetJson)));
       } catch (_) {
         return ConnectTarget.network(host: "", port: port ?? 0);
       }
@@ -162,21 +163,21 @@ class InstanceRepoImpl extends InstanceRepo {
   }
 
   @override
-// todo: aync
+  // todo: aync
   bool isInstanceExist(String name) {
     final instance = getInstanceByName(name);
     return instance != null;
   }
 
   @override
-// todo: aync
+  // todo: aync
   InstanceModel? getInstanceByName(String name) {
     final build = _instanceBox.query(InstanceStorage_.name.equals(name)).build();
     return build.findFirst()?.toModel();
   }
 
   @override
-// todo: 替换 getInstance
+  // todo: 替换 getInstance
   InstanceModel? getInstanceById(InstanceId id) {
     return _instanceBox.get(id.value)?.toModel();
   }

client/lib/repositories/instances/session_conn.dart

@@ -20,14 +20,16 @@ class SessionConnRepoImpl extends SessionConnRepo {
   @override
   SessionConnListModel getConns() {
     return SessionConnListModel(
-      conns: conns.map((key, value) => MapEntry(
-            ConnId(value: key),
-            SessionConnModel(
-              connId: ConnId(value: key),
-              state: value.state,
-              errorMsg: value.errorMsg,
-            ),
-          )),
+      conns: conns.map(
+        (key, value) => MapEntry(
+          ConnId(value: key),
+          SessionConnModel(
+            connId: ConnId(value: key),
+            state: value.state,
+            errorMsg: value.errorMsg,
+          ),
+        ),
+      ),
     );
   }