feat: restructure directories

Signed-off-by: Akihiko Kuroda <akihikokuroda2020@gmail.com>
i-am-bee · Oct 29, 2024 · 0635d92 · 0635d92
1 parent cf85dc2
commit 0635d92
Show file tree

Hide file tree

Showing 22 changed files with 17 additions and 31 deletions.
diff --git a/examples/tsconfig.json b/examples/tsconfig.json
diff --git a/package.json b/package.json
@@ -56,12 +56,12 @@
     "clean": "rimraf dist",
     "build": "yarn clean && yarn ts:check && tsup",
     "ts:check": "tsc --noEmit && tsc -p tsconfig.examples.json --noEmit",
-    "start": "tsx --tsconfig tsconfig.examples.json examples/agents/manyToolsAgent.ts",
+    "start": "tsx",
     "lint": "yarn eslint",
     "lint:fix": "yarn eslint --fix",
     "format": "yarn prettier --check .",
     "format:fix": "yarn prettier --write .",
-    "test:unit": "vitest run src",
+    "test:unit": "vitest run --exclude=\"tools/airtable/tests\" --exclude=\"tools/imageDescriptions/tests\"",
     "test:unit:watch": "vitest run src",
     "test:e2e": "vitest run tests",
     "test:e2e:watch": "vitest watch tests",

diff --git a/src/tools/airtable.ts → tools/airtable/airtable.ts b/src/tools/airtable.ts → tools/airtable/airtable.ts
diff --git a/src/tools/airtableTestData.json → tools/airtable/airtableTestData.json b/src/tools/airtableTestData.json → tools/airtable/airtableTestData.json
diff --git a/src/tools/airtableTool.test.ts → tools/airtable/airtableTool.ts b/src/tools/airtableTool.test.ts → tools/airtable/airtableTool.ts
@@ -15,7 +15,7 @@
  */
 
 import { describe, test } from "vitest";
-import { AirtableTool, AirtableToolOptions } from "@/tools/airtable.js";
+import { AirtableTool, AirtableToolOptions } from "@tools/airtable/airtable.js";
 
 import { setupServer } from "msw/node";
 

diff --git a/examples/agents/airTableToolAgent.ts → tools/airtable/examples/airTableToolAgent.ts b/examples/agents/airTableToolAgent.ts → tools/airtable/examples/airTableToolAgent.ts
@@ -17,7 +17,7 @@
 import "dotenv/config.js";
 import { BAMChatLLM } from "bee-agent-framework/adapters/bam/chat";
 import { BeeAgent } from "bee-agent-framework/agents/bee/agent";
-import { createConsoleReader } from "../helpers/io.js";
+import { createConsoleReader } from "@tools/examples/helpers/io.js";
 import { FrameworkError } from "bee-agent-framework/errors";
 import { TokenMemory } from "bee-agent-framework/memory/tokenMemory";
 import { Logger } from "bee-agent-framework/logger/logger";
@@ -39,7 +39,7 @@ import { DuckDuckGoSearchTool } from "bee-agent-framework/tools/search/duckDuckG
 import { WikipediaTool } from "bee-agent-framework/tools/search/wikipedia";
 
 // AirTable tool
-import { AirtableTool } from "bee-community-tools/tools/airtable";
+import { AirtableTool } from "@tools/airtable/airtable.js";
 
 const AIRTABLE_TOKEN: string = parseEnv("AIRTABLE_TOKEN", z.string());
 const AIRTABLE_BASE: string = parseEnv("AIRTABLE_BASE", z.string());

diff --git a/tests/e2e/airtable.test.ts → tools/airtable/tests/e2e/airtable.test.ts b/tests/e2e/airtable.test.ts → tools/airtable/tests/e2e/airtable.test.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { AirtableTool } from "@/tools/airtable.js";
+import { AirtableTool } from "@tools/airtable/airtable.js";
 import { beforeEach, expect } from "vitest";
 
 const AIRTABLE_TOKEN: string = process.env.AIRTABLE_TOKEN as string;

diff --git a/examples/helpers/io.ts → tools/examples/helpers/io.ts b/examples/helpers/io.ts → tools/examples/helpers/io.ts
diff --git a/src/tools/helloWorld.test.ts → tools/helloWorld/helloWorld.test.ts b/src/tools/helloWorld.test.ts → tools/helloWorld/helloWorld.test.ts
diff --git a/src/tools/helloWorld.ts → tools/helloWorld/helloWorld.ts b/src/tools/helloWorld.ts → tools/helloWorld/helloWorld.ts
diff --git a/tests/e2e/dummy.test.ts → tools/helloWorld/tests/e2e/dummy.test.ts b/tests/e2e/dummy.test.ts → tools/helloWorld/tests/e2e/dummy.test.ts
diff --git a/src/tools/imageDescription.test.ts → ...mageDescriptions/imageDescription.test.ts b/src/tools/imageDescription.test.ts → ...mageDescriptions/imageDescription.test.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { ImageDescriptionTool } from "@/tools/imageDescription.js";
+import { ImageDescriptionTool } from "./imageDescription.js";
 
 import { afterAll, afterEach, beforeAll, expect, describe, test, vi } from "vitest";
 import { setupServer } from "msw/node";

diff --git a/src/tools/imageDescription.ts → tools/imageDescriptions/imageDescription.ts b/src/tools/imageDescription.ts → tools/imageDescriptions/imageDescription.ts
diff --git a/tests/e2e/imageDescription.test.ts → ...ptions/tests/e2e/imageDescription.test.ts b/tests/e2e/imageDescription.test.ts → ...ptions/tests/e2e/imageDescription.test.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { ImageDescriptionTool } from "@/tools/imageDescription.js";
+import { ImageDescriptionTool } from "@tools/imageDescriptions/imageDescription.js";
 
 import { beforeEach, expect } from "vitest";
 

diff --git a/examples/agents/manyToolsAgent.ts → tools/openLibrary/examples/manyToolsAgent.ts b/examples/agents/manyToolsAgent.ts → tools/openLibrary/examples/manyToolsAgent.ts
@@ -17,7 +17,7 @@
 import "dotenv/config.js";
 import { BAMChatLLM } from "bee-agent-framework/adapters/bam/chat";
 import { BeeAgent } from "bee-agent-framework/agents/bee/agent";
-import { createConsoleReader } from "../helpers/io.js";
+import { createConsoleReader } from "@helpers/io.js";
 import { FrameworkError } from "bee-agent-framework/errors";
 import { TokenMemory } from "bee-agent-framework/memory/tokenMemory";
 import { Logger } from "bee-agent-framework/logger/logger";
@@ -36,13 +36,10 @@ import {
 // core tools
 import { DuckDuckGoSearchTool } from "bee-agent-framework/tools/search/duckDuckGoSearch";
 import { WikipediaTool } from "bee-agent-framework/tools/search/wikipedia";
-// import { OpenMeteoTool } from "bee-agent-framework/tools/weather/openMeteo";
-// import { ArXivTool } from "bee-agent-framework/tools/arxiv";
 
 // contrib tools
-// import { HelloWorldTool } from "@/tools/helloWorld.js";
-import { OpenLibraryTool } from "bee-community-tools/tools/openLibrary";
-import { ImageDescriptionTool } from "bee-community-tools/tools/imageDescription";
+import { OpenLibraryTool } from "@tools/openLibrary/openLibrary.js";
+import { ImageDescriptionTool } from "@tools/imageDescriptions/imageDescription.js";
 
 Logger.root.level = "silent"; // disable internal logs
 const logger = new Logger({ name: "app", level: "trace" });

diff --git a/src/tools/openLibrary.test.ts → tools/openLibrary/openLibrary.test.ts b/src/tools/openLibrary.test.ts → tools/openLibrary/openLibrary.test.ts
diff --git a/src/tools/openLibrary.ts → tools/openLibrary/openLibrary.ts b/src/tools/openLibrary.ts → tools/openLibrary/openLibrary.ts
diff --git a/tests/e2e/openLibrary.test.ts → ...openLibrary/tests/e2e/openLibrary.test.ts b/tests/e2e/openLibrary.test.ts → ...openLibrary/tests/e2e/openLibrary.test.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { OpenLibraryTool } from "@/tools/openLibrary.js";
+import { OpenLibraryTool } from "@tools/openLibrary/openLibrary.js";
 
 import { beforeEach, expect } from "vitest";
 

diff --git a/src/version.test.ts → tools/version.test.ts b/src/version.test.ts → tools/version.test.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { Version } from "@/version.js";
+import { Version } from "./version.js";
 
 describe("Version", () => {
   it("has a valid version", () => {

diff --git a/src/version.ts → tools/version.ts b/src/version.ts → tools/version.ts
diff --git a/tsconfig.examples.json b/tsconfig.examples.json
@@ -1,3 +1,3 @@
 {
-  "extends": "./examples/tsconfig.json"
+  "extends": "./tools/tsconfig.json"
 }
diff --git a/tsconfig.json b/tsconfig.json
@@ -26,7 +26,9 @@
     "skipLibCheck": true,
     "paths": {
       "@/*": ["./src/*"],
-      "@tests/*": ["./tests/*"]
+      "@tests/*": ["./tests/*"],
+      "@tools/*": ["./tools/*"],
+      "@helpers/*": ["./tools/examples/helpers/*"]
     },
     "useUnknownInCatchVariables": false
   },