Skip to content

Commit

Permalink
Merge pull request #89 from CommandDash/rel-0.1.3
Browse files Browse the repository at this point in the history 
Rel 0.1.3
  • Loading branch information
@samyakkkk
samyakkkk authored Jun 14, 2024
2 parents 8070ce0 + c32ff22 commit 0ce11ca
Show file tree
Hide file tree
Showing 3 changed files with 75 additions and 78 deletions.
4 changes: 2 additions & 2 deletions commanddash/lib/runner.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class VersionCommand extends Command {
@override
void run() {
/// It is not possible to fetch version from pubspec.yaml hence assigning manually
print('0.1.2');
print('0.1.3');
}
}

Expand All @@ -49,6 +49,6 @@ class MinimumClientVersionCommand extends Command {

@override
void run() {
print('0.4.4');
print('0.4.0');
}
}
147 changes: 72 additions & 75 deletions commanddash/lib/steps/chat/chat_step.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,86 +85,83 @@ class ChatStep extends Step {
final Map<String, int> nestedCodes = {};

// This function is commented out because it is not used as contextual code is not added for now.
// void appendNestedCodeCount(String filePath, {int priority = 1}) {
// nestedCodes[filePath] = (nestedCodes[filePath] ?? 0) + priority;
// }
void appendNestedCodeCount(String filePath, {int priority = 1}) {
nestedCodes[filePath] = (nestedCodes[filePath] ?? 0) + priority;
}

void markIncludedInPrompt(
{required String path, required List<Range> ranges}) {
final existingFileIndex =
includedInPrompt.indexWhere((file) => file.path == path);
if (existingFileIndex != -1) {
includedInPrompt[existingFileIndex].selectedRanges.addAll(ranges);
} else {
includedInPrompt
.add(WorkspaceFile.fromPath(path, selectedRanges: ranges));
}
}

// void markIncludedInPrompt(
// {required String path, required List<Range> ranges}) {
// final existingFileIndex =
// includedInPrompt.indexWhere((file) => file.path == path);
// if (existingFileIndex != -1) {
// includedInPrompt[existingFileIndex].selectedRanges.addAll(ranges);
// } else {
// includedInPrompt
// .add(WorkspaceFile.fromPath(path, selectedRanges: ranges));
// }
// }
for (CodeInput code in codeInputs) {
/// add the code file itself as context
appendNestedCodeCount(code.filePath, priority: 10);
markIncludedInPrompt(path: code.filePath, ranges: [code.range]);

// Skipping adding contextual code for now due to the lack of a consistent way to retrieve document definitions for all languages.
// This feature may be added in the future when a reliable method becomes available.
// Commented out the code below that adds contextual code.
// for (CodeInput code in codeInputs) {
// /// add the code file itself as context
// appendNestedCodeCount(code.filePath, priority: 10);
// Skipping adding contextual code for now due to the lack of a consistent way to retrieve document definitions for all languages.
// This feature may be added in the future when a reliable method becomes available.

// final data = await taskAssist.processStep(
// kind: "context",
// args: {
// "filePath": code.filePath,
// "range": code.range.toJson(),
// },
// timeoutKind: TimeoutKind.stretched,
// );
// final context = data['context'];
// if (context != null) {
// final listOfContext = List<Map<String, dynamic>>.from(context);
// for (final nestedCode in listOfContext) {
// final filePath = nestedCode['filePath'];
// appendNestedCodeCount(filePath);
// }
// }
// }
// final data = await taskAssist.processStep(
// kind: "context",
// args: {
// "filePath": code.filePath,
// "range": code.range.toJson(),
// },
// timeoutKind: TimeoutKind.stretched,
// );
// final context = data['context'];
// if (context != null) {
// final listOfContext = List<Map<String, dynamic>>.from(context);
// for (final nestedCode in listOfContext) {
// final filePath = nestedCode['filePath'];
// appendNestedCodeCount(filePath);
// }
// }
}
// nestedCode sorted by frequency
// final sortedNestedCode = nestedCodes.entries.toList()
// ..sort(((a, b) {
// return b.value.compareTo(a.value);
// }));
// String contextualCodePrefix =
// "[CONTEXTUAL CODE FOR YOUR INFORMATION FROM USER PROJECT]\n\n";
// String contextualCode = "";
final sortedNestedCode = nestedCodes.entries.toList()
..sort(((a, b) {
return b.value.compareTo(a.value);
}));
String contextualCodePrefix =
"[CONTEXTUAL CODE FOR YOUR INFORMATION FROM USER PROJECT]\n\n";
String contextualCode = "";

for (final nestedFilePath in sortedNestedCode.map((e) => e.key)) {
final includedInPromptIndex = includedInPrompt
.indexWhere((element) => element.path == nestedFilePath);
if (includedInPromptIndex != -1) {
final content =
includedInPrompt[includedInPromptIndex].surroundingContent;
if (content != null) {
if (availableToken - content.length > 0) {
contextualCode =
'$contextualCode$nestedFilePath\n```$content```\n\n';
availableToken -= content.length;
}
}
continue;
}
final content = (await File(nestedFilePath).readAsString())
.replaceAll(RegExp(r"[\n\s]+"), "");
if (availableToken - content.length < 0) continue;
contextualCode = '$contextualCode$nestedFilePath\n```$content```\n\n';
availableToken -= content.length;
}
if (contextualCode.isNotEmpty) {
contextualCode =
'$contextualCodePrefix$contextualCode\n\n[END OF CONTEXTUAL CODE.]\n\n';
prompt = '$contextualCode$prompt';
}

// ///TODO: Figure out a way to attach the most relevant part of the file if the full file is extremely long
// for (final nestedFilePath in sortedNestedCode.map((e) => e.key)) {
// final includedInPromptIndex = includedInPrompt
// .indexWhere((element) => element.path == nestedFilePath);
// if (includedInPromptIndex != -1) {
// final content =
// includedInPrompt[includedInPromptIndex].surroundingContent;
// if (content != null) {
// if (availableToken - content.length > 0) {
// contextualCode =
// '$contextualCode$nestedFilePath\n```$content```\n\n';
// availableToken -= content.length;
// }
// }
// continue;
// }
// final content = (await File(nestedFilePath).readAsString())
// .replaceAll(RegExp(r"[\n\s]+"), "");
// if (content.length > 9500) {
// continue; // Don't include extremely large nested code files.
// }
// if (availableToken - content.length < 0) continue;
// contextualCode = '$contextualCode$nestedFilePath\n```$content```\n\n';
// availableToken -= content.length;
// }
// if (contextualCode.isNotEmpty) {
// contextualCode =
// '$contextualCodePrefix$contextualCode\n\n[END OF CONTEXTUAL CODE.]\n\n';
// prompt = '$contextualCode$prompt';
// }
print(prompt);
var filesInvolved = Set<String>.from(
includedInPrompt.map((e) => e.path).toList() +
nestedCodes.keys.toList())
Expand Down
2 changes: 1 addition & 1 deletion commanddash/pubspec.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: commanddash
description: Processing engine for CommandDash clients like the IDEs
version: 0.1.1
version: 0.1.3
repository: https://github.com/Welltested-AI/commanddash

environment:
Expand Down

0 comments on commit 0ce11ca

Please sign in to comment.