plugin run state & fix

onlyGuo · Apr 20, 2024 · eaa26ca · eaa26ca
1 parent 189c23e
commit eaa26ca
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 26 deletions.
diff --git a/README.md b/README.md
@@ -44,7 +44,7 @@ You can download the latest version of GPTCraft from the [release page](https://
 - [x] Model switching support
 - [ ] Image upload support
 - [x] Support for DALL-E image outputs
-- [ ] Support for plugins and the multimodal approach of official ChatGPT-Plus.
+- [x] Support for plugins and the multimodal approach of official ChatGPT-Plus.
 - [ ] Session cleanup support
 - [x] Session editing support
 - [ ] Voice output support

diff --git a/lib/components/chat/message/CodeHightLightView.dart b/lib/components/chat/message/CodeHightLightView.dart
@@ -71,30 +71,54 @@ class CodeElementBuilder extends MarkdownElementBuilder {
       );
     }
     if(language == 'call-function'){
-      GPTPluginInterface plugin = GPTPluginController.getByFunctionName(element.textContent.replaceAll("\n", ""));
-      return Row(
-        children: [
-          Container(
-              padding: const EdgeInsets.only(left: 5, right: 5, top: 3, bottom: 3),
-              margin: const EdgeInsets.only(top: 2, bottom: 2),
-              decoration: BoxDecoration(
-                color: const Color.fromRGBO(220, 220, 220, 0.5),
-                borderRadius: BorderRadius.circular(5),
-              ),
-              child: Row(
-                children: [
-                  SizedBox(
-                    width: 20,
-                    height: 20,
-                    child: plugin.icon,
-                  ),
-                  const SizedBox(width: 5,),
-                  Text(plugin.name),
-                ],
-              )
-          ),
-          Expanded(child: Container(),),
-        ],
+      String name = element.textContent.contains("!end") ?
+      element.textContent.substring(0, element.textContent.indexOf("!end")) : element.textContent;
+      GPTPluginInterface plugin = GPTPluginController.getByFunctionName(name.replaceAll("\n", ""));
+      return Container(
+        color: Colors.white,
+        child: Row(
+          children: [
+            Container(
+                padding: const EdgeInsets.only(left: 5, right: 5, top: 3, bottom: 3),
+                margin: const EdgeInsets.only(top: 2, bottom: 2),
+                decoration: BoxDecoration(
+                  color: const Color.fromRGBO(220, 220, 220, 0.5),
+                  borderRadius: BorderRadius.circular(5),
+                ),
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    Row(
+                      children: [
+                        SizedBox(
+                          width: 20,
+                          height: 20,
+                          child: plugin.icon,
+                        ),
+                        const SizedBox(width: 5,),
+                        Text(plugin.name),
+                      ],
+                    ),
+                    if(element.textContent.contains("!end"))
+                      const Row(
+                        children: [
+                          Icon(Icons.check, color: Colors.green, size: 12,),
+                          Text('Completed!', style: TextStyle(fontSize: 12, color: Colors.grey),),
+                        ],
+                      )
+                    else
+                      const Row(
+                        children: [
+                          Icon(Icons.timer, color: Colors.blue, size: 12,),
+                          Text('Running...', style: TextStyle(fontSize: 12, color: Colors.grey),),
+                        ],
+                      )
+                  ],
+                ),
+            ),
+            Expanded(child: Container())
+          ],
+        ),
       );
 
     }

diff --git a/lib/gpt/plugins/impl/core.dart b/lib/gpt/plugins/impl/core.dart
@@ -37,6 +37,9 @@ class DrawPlugin extends GPTPluginInterface {
       String basicUrl, String accessKey) {
     if(method == 'dall_e_draw'){
       basicUrl = basicUrl.endsWith('/') ? basicUrl : '$basicUrl/';
+      if(params['size'] != null && !['1024x1024', '1792x1024', '1024x1792'].contains(params['size'])){
+        params['size'] = '1024x1024';
+      }
       try{
         return Util.post('${basicUrl}v1/images/generations', {
           "Authorization": "Bearer $accessKey",

diff --git a/lib/utils/Util.dart b/lib/utils/Util.dart
@@ -216,7 +216,7 @@ class Util{
               if(tool["function"]["name"] != null){
                 callFunction = tool["function"]["name"];
                 callFunctionId = tool["id"];
-                showContent += "\n\n```call-function\n$callFunction\n```\n";
+                showContent += "\n\n```call-function\n$callFunction";
               }
               callFunctionParams += tool["function"]["arguments"];
             }
@@ -246,6 +246,7 @@ class Util{
                   Map<String, dynamic> functionParam = jsonDecode(callFunctionParams);
                   p.execute(method.name, functionParam, basicUrl, accessKey).then((value) {
                     message.add(ChatMessage(content: value, role: 'tool', time: '', toolsCallId: callFunctionId));
+                    showContent += '!end\n```\n';
                     askGPT(basicUrl, model, temperature, accessKey, plugin, message, callback, err,
                         bufferContent: showContent);
                   });