Merge pull request #42 from mylxsw/develop

v1.0.5

Author: mylxsw

Makefile

@@ -16,11 +16,10 @@ build-android:
 build-macos:
 	flutter build macos --no-tree-shake-icons --release
 	codesign -f -s "Developer ID Application: YIYAO  GUAN (N95437SZ2A)" build/macos/Build/Products/Release/AIdea.app
-	productbuild --component AIdea.app /Applications --sign "Developer ID Installer: YIYAO  GUAN (N95437SZ2A)" --product AIdea.app/Contents/Info.plist AIdea.pkg
 	open build/macos/Build/Products/Release/
 
 build-web:
-	flutter build web --web-renderer canvaskit --release --pwa-strategy none --dart2js-optimization O4 --dart-define=FLUTTER_WEB_CANVASKIT_URL=https://resources.aicode.cc/canvaskit/
+	flutter build web --web-renderer canvaskit --release --dart-define=FLUTTER_WEB_CANVASKIT_URL=https://resources.aicode.cc/canvaskit/
 	cd scripts && go run main.go ../build/web/main.dart.js && cd ..
 	rm -fr build/web/fonts/ && mkdir build/web/fonts
 	cp -r scripts/s build/web/fonts/s

README.md

@@ -7,9 +7,10 @@
 
 一款集成了主流大语言模型以及绘图模型的 APP， 采用 Flutter 开发，代码完全开源，支持以下功能：
 
-- 支持 GPT-3.5/4 问答聊天
-- 支持国产模型：通义千问，文心一言、讯飞星火、商汤日日新
-- 支持开源模型：Llama2 ，ChatGLM2 ，AquilaChat 7B ，Bloomz 7B 等，后续还将开放更多
+- 支持 OpenAI 的 GPT-3.5，GPT-4 大语言模型
+- 支持 Anthropic 的 Claude instant，Claude 2.0 大语言模型
+- 支持国产模型：通义千问，文心一言，讯飞星火，商汤日日新，腾讯混元大语言模型
+- 支持开源大模型：Llama2，ChatGLM2，AquilaChat 7B，Bloomz 7B 等，后续还将开放更多
 - 支持文生图、图生图、超分辨率、黑白图片上色等功能，集成 Stable Diffusion 模型，支持 SDXL 1.0
 
 开源代码：

ios/Podfile.lock

@@ -196,12 +196,12 @@ SPEC CHECKSUMS:
   in_app_purchase_storekit: 4fb7ee9e824b1f09107fbfbbce8c4b276366dc43
   libwebp: f62cb61d0a484ba548448a4bd52aabf150ff6eef
   Mantle: c5aa8794a29a022dfbbfc9799af95f477a69b62d
-  path_provider_foundation: eaf5b3e458fc0e5fbb9940fb09980e853fe058b8
+  path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943
   record: cae05d8dd3cdb1dea3511b20e5a5811a1ae00d0d
   SDWebImage: fd7e1a22f00303e058058278639bf6196ee431fe
   SDWebImageWebPCoder: 295a6573c512f54ad2dd58098e64e17dcf008499
   share_plus: 056a1e8ac890df3e33cb503afffaf1e9b4fbae68
-  shared_preferences_foundation: e2dae3258e06f44cc55f49d42024fd8dd03c590c
+  shared_preferences_foundation: 5b919d13b803cadd15ed2dc053125c68730e5126
   sign_in_with_apple: f3bf75217ea4c2c8b91823f225d70230119b8440
   sqflite: 31f7eba61e3074736dff8807a9b41581e4f7f15a
   SwiftyGif: 93a1cc87bf3a51916001cf8f3d63835fb64c819f
@@ -211,4 +211,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 4e8f8b2be68aeea4c0d5beb6ff1e79fface1d048
 
-COCOAPODS: 1.11.3
+COCOAPODS: 1.12.1

ios/Runner.xcodeproj/project.pbxproj

@@ -162,7 +162,7 @@
 		97C146E61CF9000F007C117D /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1300;
+				LastUpgradeCheck = 1430;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					97C146ED1CF9000F007C117D = {

ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1300"
+   LastUpgradeVersion = "1430"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

lib/helper/ability.dart

@@ -1,11 +1,15 @@
 import 'package:askaide/helper/constant.dart';
+import 'package:askaide/helper/platform.dart';
+import 'package:askaide/repo/api/info.dart';
 import 'package:askaide/repo/settings_repo.dart';
 
 class Ability {
   late final SettingRepository setting;
+  late final Capabilities capabilities;
 
-  init(SettingRepository setting) {
+  init(SettingRepository setting, Capabilities capabilities) {
     this.setting = setting;
+    this.capabilities = capabilities;
   }
 
   /// 单例
@@ -16,6 +20,39 @@ class Ability {
     return _instance;
   }
 
+  /// 首页支持的模型列表
+  List<HomeModel> get homeModels {
+    return capabilities.homeModels;
+  }
+
+  /// 是否支持 OpenAI
+  bool get enableOpenAI {
+    return capabilities.openaiEnabled;
+  }
+
+  /// 是否支持支付宝
+  bool get enableAlipay {
+    return capabilities.alipayEnabled;
+  }
+
+  /// 是否支持 ApplePay
+  bool get enableApplePay {
+    return capabilities.applePayEnabled;
+  }
+
+  /// 是否支持支付功能
+  bool get enablePayment {
+    if (!enableApplePay && !enableAlipay) {
+      return false;
+    }
+
+    if (PlatformTool.isIOS() && enableApplePay) {
+      return true;
+    }
+
+    return enableAlipay;
+  }
+
   /// 是否支持API Server
   bool supportAPIServer() {
     return setting.stringDefault(settingAPIServerToken, '') != '';

lib/helper/constant.dart

@@ -1,15 +1,17 @@
 import 'package:flutter/material.dart';
 
 // 客户端应用版本号
-const VERSION = '1.0.4';
+const clientVersion = '1.0.5';
 // 本地数据库版本号
-const DB_VERSION = 23;
+const databaseVersion = 23;
 
 const maxRoomNumForNonVIP = 50;
 const coinSign = '个';
 
 // API 服务器地址
 const apiServerURL = 'https://ai-api.aicode.cc';
+// const apiServerURL = 'http://localhost';
+
 const settingAPIServerToken = 'api-token';
 const settingUserInfo = 'user-info';
 const settingUsingGuestMode = 'using-guest-mode';

lib/helper/error.dart

@@ -3,6 +3,7 @@ import 'package:askaide/lang/lang.dart';
 import 'package:dart_openai/openai.dart';
 
 Object resolveErrorMessage(dynamic e) {
+  // TODO
   if (e is RequestFailedException) {
     final msg = resolveHTTPStatusCode(e.statusCode);
     if (msg != null) {

lib/helper/model_resolver.dart

@@ -1,9 +1,9 @@
+import 'dart:convert';
 import 'dart:io';
 
 import 'package:askaide/helper/constant.dart';
 import 'package:askaide/helper/error.dart';
 import 'package:askaide/helper/helper.dart';
-import 'package:askaide/helper/model.dart';
 import 'package:askaide/repo/api_server.dart';
 import 'package:askaide/repo/deepai_repo.dart';
 import 'package:askaide/repo/model/message.dart';
@@ -166,24 +166,24 @@ class ModelResolver {
     }
 
     // 聊天模型
-    if ((await ModelAggregate.model(room.model)).isChatModel) {
-      var chatContext = _buildRobotRequestContext(room, contextMessages);
-      return await openAIRepo.chatStream(
-        chatContext,
-        onMessage,
-        model: room.modelName(),
-        maxTokens: maxTokens,
-        roomId: room.isLocalRoom ? null : room.id,
-      );
-    }
-
-    // 非聊天模型
-    return await openAIRepo.completionStream(
-      room.modelName(),
-      message.text,
-      maxTokens: maxTokens,
+    // if ((await ModelAggregate.model(room.model)).isChatModel) {
+    var chatContext = _buildRobotRequestContext(room, contextMessages);
+    return await openAIRepo.chatStream(
+      chatContext,
       onMessage,
+      model: room.modelName(),
+      maxTokens: maxTokens,
+      roomId: room.isLocalRoom ? null : room.id,
     );
+    // }
+
+    // // 非聊天模型
+    // return await openAIRepo.completionStream(
+    //   room.modelName(),
+    //   message.text,
+    //   maxTokens: maxTokens,
+    //   onMessage,
+    // );
   }
 
   /// 构建机器人请求上下文
@@ -205,7 +205,7 @@ class ModelResolver {
 
     var contextMessages = recentMessages
         .where((e) => !e.isSystem() && !e.isInitMessage())
-        .map((e) => e.user == 'robot'
+        .map((e) => e.role == Role.receiver
             ? OpenAIChatCompletionChoiceMessageModel(
                 role: OpenAIChatMessageRole.assistant, content: e.text)
             : OpenAIChatCompletionChoiceMessageModel(

lib/lang/lang.dart

@@ -93,6 +93,7 @@ mixin AppLocale {
 
   static const String nameRequiredMessage = 'name-required-message';
   static const String promptFormatError = 'prompt-format-error';
+  static const String modelRequiredMessage = 'model-required-message';
 
   static const String writeYourIdeas = 'write-your-ideas';
   static const String describeYourImages = 'describe-your-images';
@@ -274,6 +275,7 @@ mixin AppLocale {
     promptUsage: '领域设定用于设置 AI 数字人的行为',
     nameRequiredMessage: '请输入数字人名称',
     promptFormatError: '角色设定不能超过1000字',
+    modelRequiredMessage: '请选择 AI 模型',
     operateSuccess: '操作成功',
     operateFailed: '操作失败',
     confirmDelete: '确定要删除这些项目？',
@@ -345,14 +347,14 @@ mixin AppLocale {
     signInWithApple: '使用 Apple 账号登录',
     readAndAgree: '已阅读并同意',
     andWord: '和',
-    accountInputTips: '输入您的手机号',
+    accountInputTips: '输入您的手机或邮箱账号',
     phoneInputTips: '输入您的手机号',
     passwordInputTips: '输入您的密码',
     pleaseReadAgreeProtocol: '请先阅读并同意用户协议和隐私条款',
     signInSuccess: '登录成功',
     signInFailed: '登录失败',
     accountRequired: '请输入账号',
-    accountFormatError: '账号格式有误\n请输入手机号',
+    accountFormatError: '账号格式有误\n请输入手机号或邮箱账号',
     phoneNumberFormatError: '手机号码格式有误',
     passwordRequired: '请输入密码',
     passwordFormatError: '密码格式有误\n必须为8-20位字母、数字、特殊符号组合',
@@ -361,7 +363,7 @@ mixin AppLocale {
     verifyCode: '验证码',
     verifyCodeInputTips: '输入验证码',
     retryInSeconds: '秒后重试',
-    verifyCodeSendSuccess: '验证码已发送至您的',
+    verifyCodeSendSuccess: '验证码已发送',
     pleaseGetVerifyCodeFirst: '请先获取验证码',
     verifyCodeRequired: '请输入验证码',
     verifyCodeFormatError: '验证码格式有误',
@@ -463,6 +465,7 @@ mixin AppLocale {
     promptUsage: 'Prompt is used to set the behavior of the AI character',
     nameRequiredMessage: 'Please enter the name of the character',
     promptFormatError: 'Prompt cannot exceed 1000 words',
+    modelRequiredMessage: 'Please select AI model',
     operateSuccess: 'Success',
     operateFailed: 'Failed',
     confirmDelete: 'Confirm to delete?',
@@ -541,15 +544,16 @@ mixin AppLocale {
     signInWithApple: 'Sign in with Apple',
     readAndAgree: 'Read and agree',
     andWord: 'and',
-    accountInputTips: 'Enter your phone number',
+    accountInputTips: 'Enter your phone number or email',
     phoneInputTips: 'Enter your phone number',
     passwordInputTips: 'Enter your password',
     pleaseReadAgreeProtocol:
         'Please read and agree to the user agreement and privacy policy first',
     signInSuccess: 'Sign in success',
     signInFailed: 'Sign in failed',
     accountRequired: 'Please enter your account',
-    accountFormatError: 'Account format error\nPlease enter your phone number',
+    accountFormatError:
+        'Account format error\nPlease enter your phone number or email',
     phoneNumberFormatError: 'Phone number format error',
     passwordRequired: 'Please enter your password',
     passwordFormatError:
@@ -559,7 +563,7 @@ mixin AppLocale {
     verifyCode: 'Verify code',
     verifyCodeInputTips: 'Enter verify code',
     retryInSeconds: 'Retry in',
-    verifyCodeSendSuccess: 'Verify code has been sent to your',
+    verifyCodeSendSuccess: 'Verify code has been sent',
     pleaseGetVerifyCodeFirst: 'Please get the verification code first',
     verifyCodeRequired: 'Please enter the verification code',
     verifyCodeFormatError: 'Verification code format error',