fix circular import

Author: ctlai95

packages/core/src/codewhispererChat/controllers/chat/controller.ts

@@ -89,8 +89,9 @@ import {
 import { ChatSession } from '../../clients/chat/v0/chat'
 import { ChatHistoryManager } from '../../storages/chatHistory'
 import { amazonQTabSuffix } from '../../../shared/constants'
-import { OutputKind, Tool, ToolUtils } from '../../tools/toolShared'
+import { OutputKind } from '../../tools/toolShared'
 import { Writable } from 'stream'
+import { ToolUtils, Tool } from '../../tools/toolUtils'
 
 export interface ChatControllerMessagePublishers {
     readonly processPromptChatMessage: MessagePublisher<PromptMessage>

packages/core/src/codewhispererChat/tools/toolShared.ts

@@ -5,11 +5,6 @@
 
 import path from 'path'
 import fs from '../../shared/fs/fs'
-import { Writable } from 'stream'
-import { FsRead, FsReadParams } from './fsRead'
-import { FsWrite, FsWriteParams } from './fsWrite'
-import { ExecuteBash, ExecuteBashParams } from './executeBash'
-import { ToolResult, ToolResultContentBlock, ToolResultStatus, ToolUse } from '@amzn/codewhisperer-streaming'
 
 export const maxToolResponseSize = 30720 // 30KB
 
@@ -25,122 +20,6 @@ export interface InvokeOutput {
     }
 }
 
-export enum ToolType {
-    FsRead = 'fsRead',
-    FsWrite = 'fsWrite',
-    ExecuteBash = 'executeBash',
-}
-
-export type Tool =
-    | { type: ToolType.FsRead; tool: FsRead }
-    | { type: ToolType.FsWrite; tool: FsWrite }
-    | { type: ToolType.ExecuteBash; tool: ExecuteBash }
-
-export class ToolUtils {
-    static displayName(tool: Tool): string {
-        switch (tool.type) {
-            case ToolType.FsRead:
-                return 'Read from filesystem'
-            case ToolType.FsWrite:
-                return 'Write to filesystem'
-            case ToolType.ExecuteBash:
-                return 'Execute shell command'
-        }
-    }
-
-    static requiresAcceptance(tool: Tool) {
-        switch (tool.type) {
-            case ToolType.FsRead:
-                return false
-            case ToolType.FsWrite:
-                return true
-            case ToolType.ExecuteBash:
-                return tool.tool.requiresAcceptance()
-        }
-    }
-
-    static async invoke(tool: Tool, updates: Writable): Promise<InvokeOutput> {
-        switch (tool.type) {
-            case ToolType.FsRead:
-                return tool.tool.invoke(updates)
-            case ToolType.FsWrite:
-                return tool.tool.invoke(updates)
-            case ToolType.ExecuteBash:
-                return tool.tool.invoke(updates)
-        }
-    }
-
-    static queueDescription(tool: Tool, updates: Writable): void {
-        switch (tool.type) {
-            case ToolType.FsRead:
-                tool.tool.queueDescription(updates)
-                break
-            case ToolType.FsWrite:
-                tool.tool.queueDescription(updates)
-                break
-            case ToolType.ExecuteBash:
-                tool.tool.queueDescription(updates)
-                break
-        }
-    }
-
-    static async validate(tool: Tool): Promise<void> {
-        switch (tool.type) {
-            case ToolType.FsRead:
-                return tool.tool.validate()
-            case ToolType.FsWrite:
-                return tool.tool.validate()
-            case ToolType.ExecuteBash:
-                return tool.tool.validate()
-        }
-    }
-
-    static tryFromToolUse(value: ToolUse): Tool | ToolResult {
-        const mapErr = (parseError: any): ToolResult => ({
-            toolUseId: value.toolUseId,
-            content: [
-                {
-                    type: 'text',
-                    text: `Failed to validate tool parameters: ${parseError}. The model has either suggested tool parameters which are incompatible with the existing tools, or has suggested one or more tool that does not exist in the list of known tools.`,
-                } as ToolResultContentBlock,
-            ],
-            status: ToolResultStatus.ERROR,
-        })
-
-        try {
-            switch (value.name) {
-                case ToolType.FsRead:
-                    return {
-                        type: ToolType.FsRead,
-                        tool: new FsRead(value.input as unknown as FsReadParams),
-                    }
-                case ToolType.FsWrite:
-                    return {
-                        type: ToolType.FsWrite,
-                        tool: new FsWrite(value.input as unknown as FsWriteParams),
-                    }
-                case ToolType.ExecuteBash:
-                    return {
-                        type: ToolType.ExecuteBash,
-                        tool: new ExecuteBash(value.input as unknown as ExecuteBashParams),
-                    }
-                default:
-                    return {
-                        toolUseId: value.toolUseId,
-                        content: [
-                            {
-                                type: 'text',
-                                text: `The tool, "${value.name}" is not supported by the client`,
-                            } as ToolResultContentBlock,
-                        ],
-                    }
-            }
-        } catch (error) {
-            return mapErr(error)
-        }
-    }
-}
-
 export function sanitizePath(inputPath: string): string {
     let sanitized = inputPath.trim()
 

packages/core/src/test/codewhispererChat/tools/toolShared.test.ts

@@ -6,14 +6,8 @@
 import assert from 'assert'
 import * as sinon from 'sinon'
 import { Writable } from 'stream'
-import {
-    ToolUtils,
-    Tool,
-    ToolType,
-    sanitizePath,
-    OutputKind,
-    InvokeOutput,
-} from '../../../codewhispererChat/tools/toolShared'
+import { sanitizePath, OutputKind, InvokeOutput } from '../../../codewhispererChat/tools/toolShared'
+import { ToolUtils, Tool, ToolType } from '../../../codewhispererChat/tools/toolUtils'
 import { FsRead } from '../../../codewhispererChat/tools/fsRead'
 import { FsWrite } from '../../../codewhispererChat/tools/fsWrite'
 import { ExecuteBash } from '../../../codewhispererChat/tools/executeBash'