moved isOpenAITool to existing entrypoint

langchain-ai · Jun 13, 2024 · 592dba9 · 592dba9
1 parent 82cd2bb
commit 592dba9
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 35 deletions.
diff --git a/langchain-core/.gitignore b/langchain-core/.gitignore
@@ -214,10 +214,6 @@ utils/types.cjs
 utils/types.js
 utils/types.d.ts
 utils/types.d.cts
-utils/is_openai_tool.cjs
-utils/is_openai_tool.js
-utils/is_openai_tool.d.ts
-utils/is_openai_tool.d.cts
 vectorstores.cjs
 vectorstores.js
 vectorstores.d.ts

diff --git a/langchain-core/langchain.config.js b/langchain-core/langchain.config.js
@@ -66,7 +66,6 @@ export const config = {
     "utils/testing": "utils/testing/index",
     "utils/tiktoken": "utils/tiktoken",
     "utils/types": "utils/types/index",
-    "utils/is_openai_tool": "utils/is_openai_tool",
     vectorstores: "vectorstores",
   },
   tsConfigPath: resolve("./tsconfig.json"),

diff --git a/langchain-core/package.json b/langchain-core/package.json
@@ -581,15 +581,6 @@
       "import": "./utils/types.js",
       "require": "./utils/types.cjs"
     },
-    "./utils/is_openai_tool": {
-      "types": {
-        "import": "./utils/is_openai_tool.d.ts",
-        "require": "./utils/is_openai_tool.d.cts",
-        "default": "./utils/is_openai_tool.d.ts"
-      },
-      "import": "./utils/is_openai_tool.js",
-      "require": "./utils/is_openai_tool.cjs"
-    },
     "./vectorstores": {
       "types": {
         "import": "./vectorstores.d.ts",
@@ -819,10 +810,6 @@
     "utils/types.js",
     "utils/types.d.ts",
     "utils/types.d.cts",
-    "utils/is_openai_tool.cjs",
-    "utils/is_openai_tool.js",
-    "utils/is_openai_tool.d.ts",
-    "utils/is_openai_tool.d.cts",
     "vectorstores.cjs",
     "vectorstores.js",
     "vectorstores.d.ts",

diff --git a/langchain-core/src/language_models/base.ts b/langchain-core/src/language_models/base.ts
@@ -82,6 +82,27 @@ export const getModelContextSize = (modelName: string): number => {
   }
 };
 
+/**
+ * Whether or not the input matches the OpenAI tool definition.
+ * @param {unknown} tool The input to check.
+ * @returns {boolean} Whether the input is an OpenAI tool definition.
+ */
+export function isOpenAITool(tool: unknown): tool is ToolDefinition {
+  if (typeof tool !== "object" || !tool) return false;
+  if (
+    "type" in tool &&
+    tool.type === "function" &&
+    "function" in tool &&
+    typeof tool.function === "object" &&
+    tool.function &&
+    "name" in tool.function &&
+    "parameters" in tool.function
+  ) {
+    return true;
+  }
+  return false;
+}
+
 interface CalculateMaxTokenProps {
   prompt: string;
   modelName: TiktokenModel;

diff --git a/langchain-core/src/utils/is_openai_tool.ts b/langchain-core/src/utils/is_openai_tool.ts
diff --git a/langchain-core/utils/is_openai_tool.cjs b/langchain-core/utils/is_openai_tool.cjs
@@ -0,0 +1 @@
+module.exports = require('../dist/utils/is_openai_tool.cjs');
diff --git a/langchain-core/utils/is_openai_tool.d.cts b/langchain-core/utils/is_openai_tool.d.cts
@@ -0,0 +1 @@
+export * from '../dist/utils/is_openai_tool.js'
diff --git a/langchain-core/utils/is_openai_tool.d.ts b/langchain-core/utils/is_openai_tool.d.ts
@@ -0,0 +1 @@
+export * from '../dist/utils/is_openai_tool.js'
diff --git a/langchain-core/utils/is_openai_tool.js b/langchain-core/utils/is_openai_tool.js
@@ -0,0 +1 @@
+export * from '../dist/utils/is_openai_tool.js'
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		module.exports = require('../dist/utils/is_openai_tool.cjs');
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		export * from '../dist/utils/is_openai_tool.js'