Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: deepseek func call #130

Merged
merged 1 commit into from
Aug 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions lib/core/util/chat_title.dart
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ abstract final class ChatTitleUtil {

static final claudeEndReg = RegExp(r'\[\]\(ID:\d+\|UUID:\S+');

static const toolPrompt = '''
Only returns the toolCall part.
If there is no toolCall section returned, return the message as empty.''';
// static const toolPrompt = '''
// Only returns the toolCall part.
// If there is no toolCall section returned, return the message as empty.''';

static const titlePrompt = '''
Generate a title for the user content behind `$userCotentLocator` with requirements:
Expand Down
105 changes: 89 additions & 16 deletions lib/core/util/tool_func/func/http.dart
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,24 @@ final class TfHttpReq extends ToolFunc {
description: '''
Send an HTTP request. It can be used for searching, downloading, etc.

If user wants to search, use `bing.com` as the search engine and set `forSearch` to true.

If user want to access some content having an json API, use the API directly.
Such as api.github.com. You can use all the APIs that you(AI model) know.


If users wants to search:
- set `forSearch` to true
- set `url` to search engine's url
- set `headers` to search engine's headers, includes cookies, headers and etc.

Example search engines:
- Google: `https://www.google.com/search?q=`
- Baidu: `https://www.baidu.com/s?wd=`
- Bing: `https://www.bing.com/search?q=`
Default:
- user's language is Chinese: Baidu
- Non-Chinese: Google


Both request/response body is String. If json, encode it into String.
If blob, encode it into base64 String.''',
Expand Down Expand Up @@ -130,21 +147,25 @@ If blob, encode it into base64 String.''',
if (count++ > 5) break;
final url = entry.value;
log('Http $method -> $url');
final resp = await myDio.request(
entry.value,
options: Options(
method: 'GET',
maxRedirects: followRedirects,
validateStatus: (_) => true,
responseType: ResponseType.plain,
),
);

final data = resp.data;
if (data is! String) continue;
final html = await compute(_filterHtmlBody, data);
if (html != null) {
respBody += html;
try {
final resp = await myDio.request(
entry.value,
options: Options(
method: 'GET',
maxRedirects: followRedirects,
validateStatus: (_) => true,
responseType: ResponseType.plain,
),
);

final data = resp.data;
if (data is! String) continue;
final html = await compute(_filterHtmlBody, data);
if (html != null) {
respBody += html;
}
} catch (e) {
log('Http $method -> ${l10n.error}: $e');
}
}
}
Expand All @@ -161,3 +182,55 @@ If blob, encode it into base64 String.''',
return [ChatContent.text(respBody)];
}
}

/// Only return the content insides body tag as a <title: url> map.
Map<String, String> _filterHtmlUrls(String html) {
// Remove the first line of <!DOCTYPE html>
if (html.startsWith('<!')) {
html = html.substring(html.indexOf('>') + 1);
}
final doc = html_parser.parse(html);
final aInBody = doc.querySelectorAll('body a');
final map = <String, String>{};
// Find all <a> tag with href.
for (final a in aInBody) {
var href = a.attributes['href'];
if (href == null) continue;
// If there is no complete url in href, ignore it.
// Usually, the uncomplete url is a relative path for the search engine.
if (!httpReg.hasMatch(href)) continue;
final title = a.text;
// `/url?q=` is the query string for google search result.
if (href.startsWith('/url?q=')) {
final uri = Uri.parse(href);
href = uri.queryParameters['q'] ?? href;
}
map[title] = href;
}
return map;
}

/// Return all text content insides body tag.
String? _filterHtmlBody(String raw) {
final doc = html_parser.parse(raw);
final body = doc.querySelector('body');
final text = body?.text;
if (text == null || text.isEmpty) return null;

final lines = text.split('\n');
final rmIdxs = <int>[];
for (var i = 0; i < lines.length; i++) {
final line = lines[i];
if (line.trim().isEmpty) {
rmIdxs.add(i);
}
}

for (var i = rmIdxs.length - 1; i >= 0; i--) {
lines.removeAt(rmIdxs[i]);
}

return lines.join('\n');
}

final httpReg = RegExp(r'https?://');
52 changes: 0 additions & 52 deletions lib/core/util/tool_func/type.dart
Original file line number Diff line number Diff line change
Expand Up @@ -24,55 +24,3 @@ Future<Map<String, dynamic>> _parseMap(dynamic value) async {
if (value is Map<String, dynamic>) return value;
return {};
}

/// Only return the content insides body tag as a <title: url> map.
Map<String, String> _filterHtmlUrls(String html) {
// Remove the first line of <!DOCTYPE html>
if (html.startsWith('<!')) {
html = html.substring(html.indexOf('>') + 1);
}
final doc = html_parser.parse(html);
final aInBody = doc.querySelectorAll('body a');
final map = <String, String>{};
// Find all <a> tag with href.
for (final a in aInBody) {
var href = a.attributes['href'];
if (href == null) continue;
// If there is no complete url in href, ignore it.
// Usually, the uncomplete url is a relative path for the search engine.
if (!httpReg.hasMatch(href)) continue;
final title = a.text;
// `/url?q=` is the query string for google search result.
if (href.startsWith('/url?q=')) {
final uri = Uri.parse(href);
href = uri.queryParameters['q'] ?? href;
}
map[title] = href;
}
return map;
}

/// Return all text content insides body tag.
String? _filterHtmlBody(String raw) {
final doc = html_parser.parse(raw);
final body = doc.querySelector('body');
final text = body?.text;
if (text == null || text.isEmpty) return null;

final lines = text.split('\n');
final rmIdxs = <int>[];
for (var i = 0; i < lines.length; i++) {
final line = lines[i];
if (line.trim().isEmpty) {
rmIdxs.add(i);
}
}

for (var i = rmIdxs.length - 1; i >= 0; i--) {
lines.removeAt(rmIdxs[i]);
}

return lines.join('\n');
}

final httpReg = RegExp(r'https?://');
8 changes: 1 addition & 7 deletions lib/view/page/home/req.dart
Original file line number Diff line number Diff line change
Expand Up @@ -155,13 +155,7 @@ Future<void> _onCreateText(
try {
resp = await OpenAI.instance.chat.create(
model: config.model,
messages: [
ChatHistoryItem.single(
role: ChatRole.system,
raw: ChatTitleUtil.toolPrompt,
).toOpenAI,
...msgs,
],
messages: msgs,
tools: availableTools,
);
} catch (e, s) {
Expand Down
Loading