diff --git a/README.md b/README.md
index e1ec321..553f054 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@
- Offline providers like Ollama and LlamaCpp provide privacy by operating on your local machine or network without cloud services.
- - Online providers like OpenAI offer cutting-edge models via APIs, which have different privacy policies than their chat services, giving you greater control over your data.
+ - Online providers like OpenAI and Anthropic offer cutting-edge models via APIs, which have different privacy policies than their chat services, giving you greater control over your data.
@@ -67,7 +67,7 @@ In a nutshell, ConfiChat caters to users who value transparent control over thei
- **Local Model Support (Ollama and LlamaCpp)**: [Ollama](https://ollama.com) & [LlamaCpp](https://github.com/ggerganov/llama.cpp) both offer a range of lightweight, open-source local models, such as [Llama by Meta](https://ai.meta.com/llama/), [Gemma by Google](https://ai.google.dev/gemma), and [Llava](https://github.com/haotian-liu/LLaVA) for multimodal/image support. These models are designed to run efficiently even on machines with limited resources.
-- **OpenAI Integration**: Seamlessly integrates with [OpenAI](https://openai.com) to provide advanced language model capabilities using your [own API key](https://platform.openai.com/docs/quickstart). Please note that while the API does not store conversations like ChatGPT does, OpenAI retains input data for abuse monitoring purposes. You can review their latest [data retention and security policies](https://openai.com/enterprise-privacy/). In particular, check the "How does OpenAI handle data retention and monitoring for API usage?" in their FAQ (https://openai.com/enterprise-privacy/).
+- **OpenAI and Anthropic Support**: Seamlessly integrates with [OpenAI](https://openai.com) and [Anthropic](https://anthropic.com) to provide advanced language model capabilities using your [own API key](https://platform.openai.com/docs/quickstart). Please note that while the API does not store conversations like ChatGPT does, OpenAI retains input data for abuse monitoring purposes. You can review their latest [data retention and security policies](https://openai.com/enterprise-privacy/). In particular, check the "How does OpenAI handle data retention and monitoring for API usage?" in their FAQ (https://openai.com/enterprise-privacy/).
- **Privacy-Focused**: Privacy is at the core of ConfiChat's development. The app is designed to prioritize user confidentiality, with optional chat history encryption ensuring that your data remains secure.
diff --git a/confichat/lib/api_anthropic.dart b/confichat/lib/api_anthropic.dart
new file mode 100644
index 0000000..cfeb6f6
--- /dev/null
+++ b/confichat/lib/api_anthropic.dart
@@ -0,0 +1,306 @@
+/*
+ * Copyright 2024 Rune Berg (http://runeberg.io | https://github.com/1runeberg)
+ * Licensed under Apache 2.0 (https://www.apache.org/licenses/LICENSE-2.0)
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import 'dart:async';
+import 'dart:io';
+
+import 'package:flutter/foundation.dart';
+import 'package:path_provider/path_provider.dart';
+import 'package:http/http.dart' as http;
+import 'dart:convert';
+import 'interfaces.dart';
+
+import 'package:confichat/app_data.dart';
+
+
+class ApiAnthropic extends LlmApi{
+
+ static String version = '2023-06-01';
+ static final ApiAnthropic _instance = ApiAnthropic._internal();
+ static ApiAnthropic get instance => _instance;
+
+ factory ApiAnthropic() {
+ return _instance;
+ }
+ ApiAnthropic._internal() : super(AiProvider.anthropic) {
+
+ scheme = 'https';
+ host = 'api.anthropic.com';
+ port = 443;
+ path = '/v1';
+
+ defaultTemperature = 1.0;
+ defaultProbability = 1.0;
+ defaultMaxTokens = 1024;
+ defaultStopSequences = [];
+
+ temperature = 1.0;
+ probability = 1.0;
+ maxTokens = 1024;
+ stopSequences = [];
+ }
+
+ bool isImageTypeSupported(String extension){
+ const allowedExtensions = ['jpeg', 'png', 'gif', 'webp'];
+ return allowedExtensions.contains(extension.toLowerCase());
+ }
+
+ // Implementations
+ @override
+ Future loadSettings() async {
+ final directory = AppData.instance.rootPath.isEmpty ? await getApplicationDocumentsDirectory() : Directory(AppData.instance.rootPath);
+ final filePath ='${directory.path}/${AppData.appStoragePath}/${AppData.appSettingsFile}';
+
+ if (await File(filePath).exists()) {
+ final fileContent = await File(filePath).readAsString();
+ final Map settings = json.decode(fileContent);
+
+ if (settings.containsKey(AiProvider.anthropic.name)) {
+
+ // Override values in memory from disk
+ apiKey = settings[AiProvider.anthropic.name]['apikey'] ?? '';
+ }
+ }
+ }
+
+ @override
+ Future getModels(List outModels) async {
+
+ // As of this writing, there doesn't seem to be an api endpoint to grab model names
+ outModels.add(ModelItem('claude-3-5-sonnet-20240620', 'claude-3-5-sonnet-20240620'));
+ outModels.add(ModelItem('claude-3-opus-20240229', 'claude-3-opus-20240229'));
+ outModels.add(ModelItem('claude-3-sonnet-20240229', 'claude-3-sonnet-20240229'));
+ outModels.add(ModelItem('claude-3-haiku-20240307', 'claude-3-haiku-20240307'));
+ }
+
+ @override
+ Future getCachedMessagesInModel(List outCachedMessages, String modelId) async {
+ }
+
+ @override
+ Future loadModelToMemory(String modelId) async {
+ return; // no need to preload model with chatgpt online models
+ }
+
+ @override
+ Future getModelInfo(ModelInfo outModelInfo, String modelId) async {
+ // No function for this exists in Anthropic as of this writing
+ }
+
+ @override
+ Future deleteModel(String modelId) async {
+ // todo: allow deletion of tuned models
+ }
+
+ @override
+ Future sendPrompt({
+ required String modelId,
+ required List> messages,
+ bool? getSummary,
+ Map? documents,
+ Map? codeFiles,
+ CallbackPassVoidReturnInt? onStreamRequestSuccess,
+ CallbackPassIntReturnBool? onStreamCancel,
+ CallbackPassIntChunkReturnVoid? onStreamChunkReceived,
+ CallbackPassIntReturnVoid? onStreamComplete,
+ CallbackPassDynReturnVoid? onStreamRequestError,
+ CallbackPassIntDynReturnVoid? onStreamingError
+ }) async {
+ try {
+
+ // Set if this is a summary request
+ getSummary = getSummary ?? false;
+
+ // Add documents if present
+ applyDocumentContext(messages: messages, documents: documents, codeFiles: codeFiles );
+
+ // Filter out empty stop sequences
+ List filteredStopSequences = stopSequences.where((s) => s.trim().isNotEmpty).toList();
+
+ // Assemble headers - this sequence seems to matter with Anthropic streaming
+ Map headers = {'anthropic-version': version};
+ headers.addAll(AppData.headerJson);
+ headers.addAll({'x-api-key': apiKey});
+
+ // Parse message for sending to chatgpt
+ List> apiMessages = [];
+
+ String systemPrompt = '';
+ for (var message in messages) {
+ List> contentList = [];
+
+ // Add the text content
+ if (message['content'] != null && message['content'].isNotEmpty) {
+ contentList.add({
+ "type": "text",
+ "text": message['content'],
+ });
+ }
+
+ // Add the images if any
+ if (message['images'] != null) {
+ for (var imageFile in message['images']) {
+
+ if(isImageTypeSupported(imageFile['ext'])){
+ contentList.add({
+ "type": "image",
+ "source": {
+ "type": "base64",
+ "media_type": "image/${imageFile['ext']}",
+ "data": imageFile['base64'],
+ }
+ });
+ }
+
+ }
+ }
+
+ // Check for valid message
+ if(message.containsKey('role')) {
+
+ // Check for system prompt
+ if(message['role'] == 'system') {
+ systemPrompt = message['content'];
+ } else {
+ // Add to message history
+ apiMessages.add({
+ "role": message['role'],
+ "content": contentList,
+ });
+ }
+ }
+ }
+
+ // Add summary prompt
+ if( getSummary ) {
+ apiMessages.add({
+ "role": 'user',
+ "content": summaryPrompt,
+ });
+ }
+
+ // Assemble request
+ final request = http.Request('POST', getUri('/messages'))
+ ..headers.addAll(headers);
+
+ request.body = jsonEncode({
+ 'model': modelId,
+ 'messages': apiMessages,
+ 'temperature': temperature,
+ 'top_p': probability,
+ 'max_tokens': maxTokens,
+ if (filteredStopSequences.isNotEmpty) 'stop_sequences': filteredStopSequences,
+ if (systemPrompt.isNotEmpty) 'system': systemPrompt,
+ 'stream': true
+ });
+
+ // Send request and await streamed response
+ final response = await request.send();
+
+ // Check the status of the response
+ if (response.statusCode == 200) {
+
+ // Handle callback if any
+ int indexPayload = 0;
+ if(onStreamRequestSuccess != null) { indexPayload = onStreamRequestSuccess(); }
+
+ // Listen for json object stream from api
+ StreamSubscription? streamSub;
+ streamSub = response.stream
+ .transform(utf8.decoder)
+ .transform(const LineSplitter()) // Split by lines
+ .transform(SseTransformer()) // Transform into SSE events
+ .listen((chunk) {
+
+ // Check if user requested a cancel
+ bool cancelRequested = onStreamCancel != null;
+ if(cancelRequested){ cancelRequested = onStreamCancel(indexPayload); }
+ if(cancelRequested){
+ if(onStreamComplete != null) { onStreamComplete(indexPayload); }
+ streamSub?.cancel();
+ return;
+ }
+
+ // Handle callback (if any)
+ if(chunk.isNotEmpty)
+ {
+ // Uncomment for testing
+ //print(chunk);
+
+ // Parse the JSON string
+ Map jsonMap = jsonDecode(chunk);
+
+ // Extract the first choice
+ if (jsonMap.containsKey('delta') && jsonMap['delta'].isNotEmpty) {
+ var delta = jsonMap['delta'];
+
+ // Extract the content
+ if (delta.containsKey('text')) {
+ String content = delta['text'];
+ if (content.isNotEmpty && onStreamChunkReceived != null) {
+ onStreamChunkReceived(indexPayload, StreamChunk(content));
+ }
+ }
+ }
+
+ }
+
+ }, onDone: () {
+
+ if(onStreamComplete != null) { onStreamComplete(indexPayload); }
+
+ }, onError: (error) {
+
+ if (kDebugMode) {print('Streamed data request failed with error: $error');}
+ if(onStreamingError != null) { onStreamingError(indexPayload, error); }
+ });
+
+ } else {
+ if (kDebugMode) {print('Streamed data request failed with status: ${response.statusCode}\n');}
+ if(onStreamRequestError != null) { onStreamRequestError(response.statusCode); }
+ }
+ } catch (e) {
+ if (kDebugMode) {
+ print('Unable to get chat response: $e\n $responseData');
+ }
+ }
+
+ }
+
+}
+
+class SseTransformer extends StreamTransformerBase {
+
+ @override
+ Stream bind(Stream stream) {
+ final controller = StreamController();
+ final buffer = StringBuffer();
+
+ stream.listen((line) {
+
+ // Uncomment for troubleshooting
+ //print(line);
+
+ if (line.startsWith('data: {"type":"content_block_delta')) { // We're only interested with the content deltas
+ buffer.write(line.substring(6)); // Append line data to buffer, excluding the 'data: ' prefix
+ } else if (line.isEmpty) {
+ // Empty line indicates end of an event
+ if (buffer.isNotEmpty) {
+ final event = buffer.toString();
+ if (event != '[DONE]') { controller.add(event); }
+ buffer.clear();
+ }
+ }
+ }, onDone: () {
+ controller.close();
+ }, onError: (error) {
+ controller.addError(error);
+ });
+
+ return controller.stream;
+ }
+
+}
diff --git a/confichat/lib/api_ollama.dart b/confichat/lib/api_ollama.dart
index f0a2e03..6989544 100644
--- a/confichat/lib/api_ollama.dart
+++ b/confichat/lib/api_ollama.dart
@@ -233,6 +233,29 @@ class ApiOllama extends LlmApi{
// Filter out empty stop sequences
List filteredStopSequences = stopSequences.where((s) => s.trim().isNotEmpty).toList();
+ // Process messages to extract images
+ List> processedMessages = messages.map((message) {
+ // Check for images in the message
+ if (message['images'] != null) {
+ // If images exist, extract the base64 values
+ List base64Images = [];
+ var images = message['images'] as List>;
+
+ for (var image in images) {
+ base64Images.add(image['base64'] ?? '');
+ }
+
+ // Create a new message with extracted base64 images
+ return {
+ "role": message['role'],
+ "content": message['content'],
+ "images": base64Images, // Use only base64 images
+ };
+ }
+ return message; // Return the message as is if no images
+ }).toList();
+
+
// Assemble request
final request = http.Request('POST', getUri('/chat'))
..headers.addAll(AppData.headerJson);
@@ -249,7 +272,7 @@ class ApiOllama extends LlmApi{
request.body = jsonEncode({
'model': modelId,
'messages': [
- ...messages,
+ ...processedMessages,
if (getSummary) summaryRequest,
],
'options': {
diff --git a/confichat/lib/api_openai.dart b/confichat/lib/api_openai.dart
index cf1511b..347c544 100644
--- a/confichat/lib/api_openai.dart
+++ b/confichat/lib/api_openai.dart
@@ -192,10 +192,10 @@ class ApiChatGPT extends LlmApi{
// Add the images if any
if (message['images'] != null) {
- for (var imageUrl in message['images']) {
+ for (var imageFile in message['images']) {
contentList.add({
"type": "image_url",
- "image_url": {"url": "data:image/jpeg;base64,$imageUrl"},
+ "image_url": {"url": "data:image/${imageFile['ext']};base64,${imageFile['base64']}"},
});
}
}
@@ -302,4 +302,38 @@ class ApiChatGPT extends LlmApi{
}
-} // ApiChatGPT
+}
+
+class SseTransformer extends StreamTransformerBase {
+
+ @override
+ Stream bind(Stream stream) {
+ final controller = StreamController();
+ final buffer = StringBuffer();
+
+ stream.listen((line) {
+
+ // Uncomment for troubleshooting
+ // print(line);
+
+ if (line.startsWith('data: ')) {
+ // Append line data to buffer, excluding the 'data: ' prefix
+ buffer.write(line.substring(6));
+ } else if (line.isEmpty) {
+ // Empty line indicates end of an event
+ if (buffer.isNotEmpty) {
+ final event = buffer.toString();
+ if (event != '[DONE]') { controller.add(event); }
+ buffer.clear();
+ }
+ }
+ }, onDone: () {
+ controller.close();
+ }, onError: (error) {
+ controller.addError(error);
+ });
+
+ return controller.stream;
+ }
+
+}
\ No newline at end of file
diff --git a/confichat/lib/app_data.dart b/confichat/lib/app_data.dart
index 9331a75..eead6e4 100644
--- a/confichat/lib/app_data.dart
+++ b/confichat/lib/app_data.dart
@@ -62,11 +62,14 @@ class AppData {
case AiProvider.ollama:
api = LlmApiFactory.create(AiProvider.ollama.name);
break;
+ case AiProvider.llamacpp:
+ api = LlmApiFactory.create(AiProvider.llamacpp.name);
+ break;
case AiProvider.openai:
api = LlmApiFactory.create(AiProvider.openai.name);
break;
- case AiProvider.llamacpp:
- api = LlmApiFactory.create(AiProvider.llamacpp.name);
+ case AiProvider.anthropic:
+ api = LlmApiFactory.create(AiProvider.anthropic.name);
break;
default:
if (kDebugMode) { print('Unknown AI provider.'); }
@@ -93,8 +96,9 @@ class AppData {
enum AiProvider {
ollama('Ollama', 0),
- openai('OpenAI', 1),
- llamacpp('LlamaCpp', 2);
+ llamacpp('LlamaCpp', 1),
+ openai('OpenAI', 2),
+ anthropic('Anthropic', 3);
final String name;
final int id;
diff --git a/confichat/lib/factories.dart b/confichat/lib/factories.dart
index d03220d..0a7b1a2 100644
--- a/confichat/lib/factories.dart
+++ b/confichat/lib/factories.dart
@@ -5,20 +5,25 @@
*/
+import 'package:confichat/interfaces.dart';
+
+import 'package:confichat/api_ollama.dart';
import 'package:confichat/api_llamacpp.dart';
import 'package:confichat/api_openai.dart';
-import 'package:confichat/api_ollama.dart';
-import 'package:confichat/interfaces.dart';
+import 'package:confichat/api_anthropic.dart';
+
class LlmApiFactory {
static LlmApi create(String apiProvider) {
switch (apiProvider.toLowerCase()) {
case 'ollama':
return ApiOllama();
- case 'openai':
- return ApiChatGPT();
case 'llamacpp':
return ApiLlamaCpp();
+ case 'openai':
+ return ApiChatGPT();
+ case 'anthropic':
+ return ApiAnthropic();
default:
throw Exception('Unsupported API provider: $apiProvider');
}
diff --git a/confichat/lib/file_parser.dart b/confichat/lib/file_parser.dart
index fec110f..8400c96 100644
--- a/confichat/lib/file_parser.dart
+++ b/confichat/lib/file_parser.dart
@@ -23,6 +23,14 @@ enum ParserFileType {
unknown,
}
+
+class ImageFile {
+ final String base64;
+ final String ext;
+
+ ImageFile(this.base64, this.ext);
+}
+
class FileParser {
static const List imageFormats = [
@@ -65,13 +73,35 @@ class FileParser {
return ParserFileType.unknown;
}
+ static String getImageExtension(String filename){
+
+ final parts = filename.split('.');
+ if (parts.length < 2) {
+ return '';
+ }
+
+ final extension = parts.last.toLowerCase();
+ if(imageFormats.contains(extension)){
+ if(extension == 'jpg' || extension == 'jpeg' ) {
+ return 'jpeg';
+ }
+
+ return extension;
+ }
+
+ return '';
+ }
+
static Future processImages({
required File file,
- required List outImages,
+ required List outImages,
}) async {
List imageBytes = file.readAsBytesSync();
- String base64String = base64Encode(imageBytes);
- outImages.add(base64String);
+ ImageFile imageFile = ImageFile(base64Encode(imageBytes), getImageExtension(file.path));
+
+ if(imageFile.ext.isNotEmpty && imageFile.base64.isNotEmpty){
+ outImages.add(imageFile);
+ }
}
static Future processTextDocuments({
@@ -127,7 +157,7 @@ class FileParser {
static Future processPlatformFiles({
required List files,
required BuildContext context,
- List? outImages,
+ List? outImages,
Map? outDocuments,
Map? outCodeFiles,
}) async {
@@ -177,7 +207,7 @@ class FileParser {
static Future processDroppedFiles({
required DropDoneDetails details,
required BuildContext context,
- List? outImages,
+ List? outImages,
Map? outDocuments,
Map? outCodeFiles,
}) async {
diff --git a/confichat/lib/interfaces.dart b/confichat/lib/interfaces.dart
index aac9461..e8a50ac 100644
--- a/confichat/lib/interfaces.dart
+++ b/confichat/lib/interfaces.dart
@@ -252,33 +252,3 @@ abstract class LlmApi {
} // LlmApi
-
-class SseTransformer extends StreamTransformerBase {
-
- @override
- Stream bind(Stream stream) {
- final controller = StreamController();
- final buffer = StringBuffer();
-
- stream.listen((line) {
- if (line.startsWith('data: ')) {
- // Append line data to buffer, excluding the 'data: ' prefix
- buffer.write(line.substring(6));
- } else if (line.isEmpty) {
- // Empty line indicates end of an event
- if (buffer.isNotEmpty) {
- final event = buffer.toString();
- if (event != '[DONE]') { controller.add(event); }
- buffer.clear();
- }
- }
- }, onDone: () {
- controller.close();
- }, onError: (error) {
- controller.addError(error);
- });
-
- return controller.stream;
- }
-
-}
diff --git a/confichat/lib/main.dart b/confichat/lib/main.dart
index b5df1cc..494e326 100644
--- a/confichat/lib/main.dart
+++ b/confichat/lib/main.dart
@@ -77,11 +77,14 @@ class ConfiChat extends StatelessWidget {
case 'ollama':
selectedProvider = AiProvider.ollama;
break;
+ case 'llamacpp':
+ selectedProvider = AiProvider.llamacpp;
+ break;
case 'openai':
selectedProvider = AiProvider.openai;
break;
- case 'llamacpp':
- selectedProvider = AiProvider.llamacpp;
+ case 'anthropic':
+ selectedProvider = AiProvider.anthropic;
break;
default:
selectedProvider = AiProvider.ollama; // Fallback to Ollama if the string doesn't match
@@ -119,11 +122,7 @@ class ConfiChat extends StatelessWidget {
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
- Image.asset(
- 'assets/confichat_logo.png',
- width: 100, // Set the desired width for the logo
- height: 100, // Set the desired height for the logo
- ),
+ Image.asset('assets/confichat_logo.png', width: 100, height: 100,),
const SizedBox(height: 20),
const CircularProgressIndicator(),
],
diff --git a/confichat/lib/persistent_storage.dart b/confichat/lib/persistent_storage.dart
index ab4f914..29ef933 100644
--- a/confichat/lib/persistent_storage.dart
+++ b/confichat/lib/persistent_storage.dart
@@ -381,12 +381,11 @@ static String encryptStringIV({
return base64IV;
}
- static void encryptChatData({
+ static void encryptChatData({
required encrypt.IV iv,
required String userKey,
required List> chatData,
}) {
-
for (var entry in chatData) {
// Encrypt content
if (entry['content'] != null) {
@@ -400,30 +399,69 @@ static String encryptStringIV({
// Encrypt images if they exist
if (entry['images'] != null && entry['images'] is List) {
+
entry['images'] = (entry['images'] as List).map((image) {
+
if (image is String) {
+
+ // If the image is a base64 string, encrypt it - v0.4.0 and below
final encryptedImage = CryptoUtils.encryptString(
iv: iv,
userKey: userKey,
data: image,
);
- return encryptedImage;
+
+ return {
+ 'ext': 'jpeg', // Use a default extension if needed
+ 'base64': encryptedImage,
+ };
+
+ } else if (image is Map) {
+
+ // If the image is a map, encrypt the base64 - v0.5.0 and above
+ final encryptedBase64 = CryptoUtils.encryptString(
+ iv: iv,
+ userKey: userKey,
+ data: image['base64'] ?? '',
+ );
+
+ return {
+ 'ext': image['ext'] ?? 'jpeg', // Keep the existing extension or default to 'jpeg'
+ 'base64': encryptedBase64,
+ };
+
+ } else if (image is Map) {
+
+ // If the image is a map, encrypt the base64 - failsafe for other platforms
+ final encryptedBase64 = CryptoUtils.encryptString(
+ iv: iv,
+ userKey: userKey,
+ data: image['base64'] ?? '',
+ );
+
+ return {
+ 'ext': image['ext'] ?? 'jpeg', // Keep the existing extension or default to 'jpeg'
+ 'base64': encryptedBase64,
+ };
+
} else {
- if (kDebugMode) { print('Warning: Non-string image data encountered'); }
+ if (kDebugMode) {
+ print('Warning: Non-string or non-map image data encountered');
+ }
return null;
}
- }).whereType().toList();
+ }).whereType>().toList(); // Filter out nulls and ensure the output is a List