@langchain/google-genai 0.0.19 → 0.0.20

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. package/dist/utils/common.cjs +68 -68
  2. package/dist/utils/common.d.ts +1 -1
  3. package/dist/utils/common.js +68 -68
  4. package/package.json +1 -1
package/dist/utils/common.cjs CHANGED
@@ -53,84 +53,84 @@ function messageContentMedia(content) {
53
53
  }
54
54
  throw new Error("Invalid media content");
55
55
  }
56
- function convertMessageContentToParts(message, isMultimodalModel, role) {
57
- if (typeof message.content === "string") {
56
+ function convertMessageContentToParts(message, isMultimodalModel) {
57
+ if (typeof message.content === "string" && message.content !== "") {
58
58
  return [{ text: message.content }];
59
59
  }
60
- let functionCallParts = [];
61
- if (role === "function") {
62
- if (message.name && typeof message.content === "string") {
63
- functionCallParts.push({
60
+ let functionCalls = [];
61
+ let functionResponses = [];
62
+ let messageParts = [];
63
+ if ("tool_calls" in message &&
64
+ Array.isArray(message.tool_calls) &&
65
+ message.tool_calls.length > 0) {
66
+ functionCalls = message.tool_calls.map((tc) => ({
67
+ functionCall: {
68
+ name: tc.name,
69
+ args: tc.args,
70
+ },
71
+ }));
72
+ }
73
+ else if (message._getType() === "tool" && message.name && message.content) {
74
+ functionResponses = [
75
+ {
64
76
  functionResponse: {
65
77
  name: message.name,
66
78
  response: message.content,
67
79
  },
68
- });
69
- }
70
- else {
71
- throw new Error("ChatGoogleGenerativeAI requires tool messages to contain the tool name, and a string content.");
72
- }
73
- }
74
- if ("tool_calls" in message) {
75
- const castMessage = message;
76
- if (castMessage.tool_calls && castMessage.tool_calls.length > 0) {
77
- functionCallParts = castMessage.tool_calls.map((tc) => ({
78
- functionCall: {
79
- name: tc.name,
80
- args: tc.args,
81
- },
82
- }));
83
- }
80
+ },
81
+ ];
84
82
  }
85
- const messageContentParts = message.content.map((c) => {
86
- if (c.type === "text") {
87
- return {
88
- text: c.text,
89
- };
90
- }
91
- if (c.type === "image_url") {
92
- if (!isMultimodalModel) {
93
- throw new Error(`This model does not support images`);
94
- }
95
- let source;
96
- if (typeof c.image_url === "string") {
97
- source = c.image_url;
83
+ else if (Array.isArray(message.content)) {
84
+ messageParts = message.content.map((c) => {
85
+ if (c.type === "text") {
86
+ return {
87
+ text: c.text,
88
+ };
98
89
  }
99
- else if (typeof c.image_url === "object" && "url" in c.image_url) {
100
- source = c.image_url.url;
101
- }
102
- else {
103
- throw new Error("Please provide image as base64 encoded data URL");
90
+ if (c.type === "image_url") {
91
+ if (!isMultimodalModel) {
92
+ throw new Error(`This model does not support images`);
93
+ }
94
+ let source;
95
+ if (typeof c.image_url === "string") {
96
+ source = c.image_url;
97
+ }
98
+ else if (typeof c.image_url === "object" && "url" in c.image_url) {
99
+ source = c.image_url.url;
100
+ }
101
+ else {
102
+ throw new Error("Please provide image as base64 encoded data URL");
103
+ }
104
+ const [dm, data] = source.split(",");
105
+ if (!dm.startsWith("data:")) {
106
+ throw new Error("Please provide image as base64 encoded data URL");
107
+ }
108
+ const [mimeType, encoding] = dm.replace(/^data:/, "").split(";");
109
+ if (encoding !== "base64") {
110
+ throw new Error("Please provide image as base64 encoded data URL");
111
+ }
112
+ return {
113
+ inlineData: {
114
+ data,
115
+ mimeType,
116
+ },
117
+ };
104
118
  }
105
- const [dm, data] = source.split(",");
106
- if (!dm.startsWith("data:")) {
107
- throw new Error("Please provide image as base64 encoded data URL");
119
+ else if (c.type === "media") {
120
+ return messageContentMedia(c);
108
121
  }
109
- const [mimeType, encoding] = dm.replace(/^data:/, "").split(";");
110
- if (encoding !== "base64") {
111
- throw new Error("Please provide image as base64 encoded data URL");
122
+ else if (c.type === "tool_use") {
123
+ return {
124
+ functionCall: {
125
+ name: c.name,
126
+ args: c.input,
127
+ },
128
+ };
112
129
  }
113
- return {
114
- inlineData: {
115
- data,
116
- mimeType,
117
- },
118
- };
119
- }
120
- else if (c.type === "media") {
121
- return messageContentMedia(c);
122
- }
123
- else if (c.type === "tool_use") {
124
- return {
125
- functionCall: {
126
- name: c.name,
127
- args: c.input,
128
- },
129
- };
130
- }
131
- throw new Error(`Unknown content type ${c.type}`);
132
- });
133
- return [...messageContentParts, ...functionCallParts];
130
+ throw new Error(`Unknown content type ${c.type}`);
131
+ });
132
+ }
133
+ return [...messageParts, ...functionCalls, ...functionResponses];
134
134
  }
135
135
  exports.convertMessageContentToParts = convertMessageContentToParts;
136
136
  function convertBaseMessagesToContent(messages, isMultimodalModel) {
@@ -149,7 +149,7 @@ function convertBaseMessagesToContent(messages, isMultimodalModel) {
149
149
  prevContent.role === role) {
150
150
  throw new Error("Google Generative AI requires alternate messages between authors");
151
151
  }
152
- const parts = convertMessageContentToParts(message, isMultimodalModel, role);
152
+ const parts = convertMessageContentToParts(message, isMultimodalModel);
153
153
  if (acc.mergeWithPreviousContent) {
154
154
  const prevContent = acc.content[acc.content.length - 1];
155
155
  if (!prevContent) {
package/dist/utils/common.d.ts CHANGED
@@ -10,7 +10,7 @@ export declare function getMessageAuthor(message: BaseMessage): string;
10
10
  * @returns The message type mapped to a Google Generative AI chat author.
11
11
  */
12
12
  export declare function convertAuthorToRole(author: string): (typeof POSSIBLE_ROLES)[number];
13
- export declare function convertMessageContentToParts(message: BaseMessage, isMultimodalModel: boolean, role: (typeof POSSIBLE_ROLES)[number]): Part[];
13
+ export declare function convertMessageContentToParts(message: BaseMessage, isMultimodalModel: boolean): Part[];
14
14
  export declare function convertBaseMessagesToContent(messages: BaseMessage[], isMultimodalModel: boolean): Content[];
15
15
  export declare function mapGenerateContentResultToChatResult(response: EnhancedGenerateContentResponse, extra?: {
16
16
  usageMetadata: UsageMetadata | undefined;
package/dist/utils/common.js CHANGED
@@ -48,84 +48,84 @@ function messageContentMedia(content) {
48
48
  }
49
49
  throw new Error("Invalid media content");
50
50
  }
51
- export function convertMessageContentToParts(message, isMultimodalModel, role) {
52
- if (typeof message.content === "string") {
51
+ export function convertMessageContentToParts(message, isMultimodalModel) {
52
+ if (typeof message.content === "string" && message.content !== "") {
53
53
  return [{ text: message.content }];
54
54
  }
55
- let functionCallParts = [];
56
- if (role === "function") {
57
- if (message.name && typeof message.content === "string") {
58
- functionCallParts.push({
55
+ let functionCalls = [];
56
+ let functionResponses = [];
57
+ let messageParts = [];
58
+ if ("tool_calls" in message &&
59
+ Array.isArray(message.tool_calls) &&
60
+ message.tool_calls.length > 0) {
61
+ functionCalls = message.tool_calls.map((tc) => ({
62
+ functionCall: {
63
+ name: tc.name,
64
+ args: tc.args,
65
+ },
66
+ }));
67
+ }
68
+ else if (message._getType() === "tool" && message.name && message.content) {
69
+ functionResponses = [
70
+ {
59
71
  functionResponse: {
60
72
  name: message.name,
61
73
  response: message.content,
62
74
  },
63
- });
64
- }
65
- else {
66
- throw new Error("ChatGoogleGenerativeAI requires tool messages to contain the tool name, and a string content.");
67
- }
68
- }
69
- if ("tool_calls" in message) {
70
- const castMessage = message;
71
- if (castMessage.tool_calls && castMessage.tool_calls.length > 0) {
72
- functionCallParts = castMessage.tool_calls.map((tc) => ({
73
- functionCall: {
74
- name: tc.name,
75
- args: tc.args,
76
- },
77
- }));
78
- }
75
+ },
76
+ ];
79
77
  }
80
- const messageContentParts = message.content.map((c) => {
81
- if (c.type === "text") {
82
- return {
83
- text: c.text,
84
- };
85
- }
86
- if (c.type === "image_url") {
87
- if (!isMultimodalModel) {
88
- throw new Error(`This model does not support images`);
89
- }
90
- let source;
91
- if (typeof c.image_url === "string") {
92
- source = c.image_url;
78
+ else if (Array.isArray(message.content)) {
79
+ messageParts = message.content.map((c) => {
80
+ if (c.type === "text") {
81
+ return {
82
+ text: c.text,
83
+ };
93
84
  }
94
- else if (typeof c.image_url === "object" && "url" in c.image_url) {
95
- source = c.image_url.url;
96
- }
97
- else {
98
- throw new Error("Please provide image as base64 encoded data URL");
85
+ if (c.type === "image_url") {
86
+ if (!isMultimodalModel) {
87
+ throw new Error(`This model does not support images`);
88
+ }
89
+ let source;
90
+ if (typeof c.image_url === "string") {
91
+ source = c.image_url;
92
+ }
93
+ else if (typeof c.image_url === "object" && "url" in c.image_url) {
94
+ source = c.image_url.url;
95
+ }
96
+ else {
97
+ throw new Error("Please provide image as base64 encoded data URL");
98
+ }
99
+ const [dm, data] = source.split(",");
100
+ if (!dm.startsWith("data:")) {
101
+ throw new Error("Please provide image as base64 encoded data URL");
102
+ }
103
+ const [mimeType, encoding] = dm.replace(/^data:/, "").split(";");
104
+ if (encoding !== "base64") {
105
+ throw new Error("Please provide image as base64 encoded data URL");
106
+ }
107
+ return {
108
+ inlineData: {
109
+ data,
110
+ mimeType,
111
+ },
112
+ };
99
113
  }
100
- const [dm, data] = source.split(",");
101
- if (!dm.startsWith("data:")) {
102
- throw new Error("Please provide image as base64 encoded data URL");
114
+ else if (c.type === "media") {
115
+ return messageContentMedia(c);
103
116
  }
104
- const [mimeType, encoding] = dm.replace(/^data:/, "").split(";");
105
- if (encoding !== "base64") {
106
- throw new Error("Please provide image as base64 encoded data URL");
117
+ else if (c.type === "tool_use") {
118
+ return {
119
+ functionCall: {
120
+ name: c.name,
121
+ args: c.input,
122
+ },
123
+ };
107
124
  }
108
- return {
109
- inlineData: {
110
- data,
111
- mimeType,
112
- },
113
- };
114
- }
115
- else if (c.type === "media") {
116
- return messageContentMedia(c);
117
- }
118
- else if (c.type === "tool_use") {
119
- return {
120
- functionCall: {
121
- name: c.name,
122
- args: c.input,
123
- },
124
- };
125
- }
126
- throw new Error(`Unknown content type ${c.type}`);
127
- });
128
- return [...messageContentParts, ...functionCallParts];
125
+ throw new Error(`Unknown content type ${c.type}`);
126
+ });
127
+ }
128
+ return [...messageParts, ...functionCalls, ...functionResponses];
129
129
  }
130
130
  export function convertBaseMessagesToContent(messages, isMultimodalModel) {
131
131
  return messages.reduce((acc, message, index) => {
@@ -143,7 +143,7 @@ export function convertBaseMessagesToContent(messages, isMultimodalModel) {
143
143
  prevContent.role === role) {
144
144
  throw new Error("Google Generative AI requires alternate messages between authors");
145
145
  }
146
- const parts = convertMessageContentToParts(message, isMultimodalModel, role);
146
+ const parts = convertMessageContentToParts(message, isMultimodalModel);
147
147
  if (acc.mergeWithPreviousContent) {
148
148
  const prevContent = acc.content[acc.content.length - 1];
149
149
  if (!prevContent) {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@langchain/google-genai",
3
- "version": "0.0.19",
3
+ "version": "0.0.20",
4
4
  "description": "Sample integration for LangChain.js",
5
5
  "type": "module",
6
6
  "engines": {