Skip to content

Reviewer cleanups for #2667: single enablement flag, drop unused NAME, assertNull #3

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.

Sign up for GitHub

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

Closed
Buktal wants to merge 1 commit into from
Closed

Reviewer cleanups for #2667: single enablement flag, drop unused NAME, assertNull #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 4 additions & 3 deletions agentscope-harness/src/main/java/io/agentscope/harness/agent/HarnessAgent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2412,6 +2412,8 @@ public HarnessAgent build() {
if (agentTracingLogEnabled) {
inner.middleware(new AgentTraceMiddleware());
}
boolean artifactDeliveryEnabled =
artifactDeliveryTarget != null && !disableFilesystemTools;
if (!disableWorkspaceContext) {
WorkspaceContextMiddleware markdownMw =
new WorkspaceContextMiddleware(
Expand All @@ -2422,8 +2424,7 @@ public HarnessAgent build() {
disableMemoryTools,
disableMemoryHooks);
markdownMw.setAdditionalContextFiles(additionalContextFiles);
markdownMw.setArtifactDeliveryEnabled(
artifactDeliveryTarget != null && !disableFilesystemTools);
markdownMw.setArtifactDeliveryEnabled(artifactDeliveryEnabled);
inner.middleware(markdownMw);
}
if (!disableAtPathExpansion) {
Expand Down Expand Up @@ -2602,7 +2603,7 @@ public HarnessAgent build() {
if (!disableFilesystemTools) {
agentToolkit.registerTool(new FilesystemTool(filesystem, pathNormalizer));
}
if (artifactDeliveryTarget != null && !disableFilesystemTools) {
if (artifactDeliveryEnabled) {
agentToolkit.registerTool(
new ArtifactDeliveryTool(
filesystem, pathNormalizer, artifactDeliveryTarget));
Expand Down
5 changes: 0 additions & 5 deletions agentscope-harness/src/main/java/io/agentscope/harness/agent/tool/ArtifactDeliveryTool.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,6 @@
*/
public class ArtifactDeliveryTool {

/**
* Registered tool name.
*/
public static final String NAME = "deliver_artifact";

private final AbstractFilesystem filesystem;
private final WorkspacePathNormalizer pathNormalizer;
private final ArtifactDeliveryTarget target;
Expand Down
3 changes: 2 additions & 1 deletion ...cope-harness/src/test/java/io/agentscope/harness/agent/tool/ArtifactDeliveryToolTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;
Expand Down Expand Up @@ -76,7 +77,7 @@ void deliverArtifact_downloadsBytesAndForwardsToTarget_withDefaults() {
assertEquals("outputs/report.docx", request.filePath());
assertArrayEquals(content, request.content());
assertEquals("report.docx", request.fileName());
assertEquals(null, request.description());
assertNull(request.description());
assertFalse(request.force());
}

Expand Down