@gammatech/aijsx 0.5.0-dev.2024-03-14.2 → 0.5.0-dev.2024-03-19

package/dist/index.js

@@ -1127,6 +1127,25 @@ function escape(html) {
   }
   return html.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;");
 }
+function collapseTextNodes(nodes) {
+  const result = [];
+  let accumulatedText = "";
+  for (const node of nodes) {
+    if (node.nodeName === "#text") {
+      accumulatedText += node.value;
+    } else {
+      if (accumulatedText !== "") {
+        result.push(new XmlNode(node.parent, "#text", {}, accumulatedText));
+        accumulatedText = "";
+      }
+      result.push(node);
+    }
+  }
+  if (accumulatedText !== "") {
+    result.push(new XmlNode(nodes[0].parent, "#text", {}, accumulatedText));
+  }
+  return result;
+}
 
 // src/jsx-runtime.ts
 function jsx(type, config, maybeKey) {
@@ -2033,13 +2052,16 @@ function OpenAIVisionChatCompletion(props, { logger, render, tracer, getContext
         messages: openAIMessages,
         stream: true
       };
+      const chatCompletionRequestToLog = cleanChatCompletionRequest(
+        chatCompletionRequest
+      );
       const logRequestData = {
         startTime,
         model,
         provider,
         providerRegion,
         inputMessages: renderedMessages,
-        request: chatCompletionRequest
+        request: chatCompletionRequestToLog
       };
       logger.chatCompletionRequest("openai", logRequestData);
       span.setAttributes({
@@ -2047,7 +2069,7 @@ function OpenAIVisionChatCompletion(props, { logger, render, tracer, getContext
         provider,
         providerRegion,
         requestType: "openai",
-        chatCompletionRequest
+        chatCompletionRequest: chatCompletionRequestToLog
       });
       let chatResponse;
       try {
@@ -2107,6 +2129,44 @@ function OpenAIVisionChatCompletion(props, { logger, render, tracer, getContext
     }
   );
 }
+function cleanChatCompletionRequest(chatCompletionRequest) {
+  const { messages, ...rest } = chatCompletionRequest;
+  return {
+    ...rest,
+    messages: messages.map((message) => {
+      if (message.role !== "user") {
+        return message;
+      }
+      if (typeof message.content === "string") {
+        return message;
+      }
+      return {
+        ...message,
+        content: message.content.map((part) => {
+          if (part.type === "text") {
+            return part;
+          }
+          if (part.image_url.url.startsWith("data:image")) {
+            return {
+              type: "image_url",
+              image_url: {
+                url: part.image_url.url.slice(0, 22) + "...",
+                detail: part.image_url.detail
+              }
+            };
+          }
+          return {
+            type: "image_url",
+            image_url: {
+              url: part.image_url.url,
+              detail: part.image_url.detail
+            }
+          };
+        })
+      };
+    })
+  };
+}
 
 // src/lib/openai/index.ts
 var import_openai3 = require("openai");
@@ -2147,14 +2207,15 @@ function buildAnthropicMessages(childrenXml) {
   }
   for (const node of parsed.childNodes) {
     if (node.nodeName === "UserMessage") {
-      if (node.childNodes?.length === 1 && node.childNodes[0].nodeName === "#text") {
+      const childNodes = collapseTextNodes(node.childNodes);
+      if (childNodes.length === 1 && childNodes[0].nodeName === "#text") {
         messages.push({
-          content: node.childNodes[0].value,
+          content: childNodes[0].value,
           role: "user"
         });
         continue;
       }
-      const parts = node.childNodes.map((n) => {
+      const parts = childNodes.map((n) => {
         if (n.nodeName === "#text") {
           return {
             type: "text",
@@ -2174,7 +2235,7 @@ function buildAnthropicMessages(childrenXml) {
         throw new Error(
           "Invalid ChatCompletionContentPart, expecting text or ContentTypeImage"
         );
-      });
+      }).filter((n) => n.type !== "text" || n.text.trim().length > 0);
       messages.push({
         content: parts,
         role: "user"
@@ -2223,13 +2284,16 @@ function AnthropicChatCompletion(props, { render, logger, tracer, getContext })
         temperature: props.temperature,
         model: props.model
       };
+      const chatCompletionRequestToLog = cleanChatCompletionRequest2(
+        anthropicCompletionRequest
+      );
       const logRequestData = {
         startTime,
         model: props.model,
         provider,
         providerRegion,
         inputMessages,
-        request: anthropicCompletionRequest
+        request: chatCompletionRequestToLog
       };
       logger.chatCompletionRequest("anthropic", logRequestData);
       span.setAttributes({
@@ -2237,7 +2301,7 @@ function AnthropicChatCompletion(props, { render, logger, tracer, getContext })
         provider,
         providerRegion,
         requestType: "anthropic",
-        chatCompletionRequest: anthropicCompletionRequest
+        chatCompletionRequest: chatCompletionRequestToLog
       });
       let response;
       try {
@@ -2353,6 +2417,39 @@ var renderChatMessageContent2 = (content) => {
     throw new Error("Invalid ImageBlockParam type");
   }).join("\n\n");
 };
+function cleanChatCompletionRequest2(chatCompletionRequest) {
+  const { messages, ...rest } = chatCompletionRequest;
+  return {
+    ...rest,
+    messages: messages.map((message) => {
+      if (message.role !== "user") {
+        return message;
+      }
+      if (typeof message.content === "string") {
+        return message;
+      }
+      return {
+        ...message,
+        content: message.content.map((part) => {
+          if (typeof part === "string") {
+            return part;
+          } else if (part.type === "text") {
+            return part;
+          } else if ("source" in part && typeof part.source === "object") {
+            return {
+              ...part,
+              source: {
+                ...part.source,
+                data: part.source.data.slice(0, 22) + "..."
+              }
+            };
+          }
+          return part;
+        })
+      };
+    })
+  };
+}
 
 // src/lib/anthropic/ClaudeImageBlock.tsx
 var ClaudeImageBlockParam = (_props) => {

package/dist/index.mjs

@@ -1036,6 +1036,25 @@ function escape(html) {
   }
   return html.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;");
 }
+function collapseTextNodes(nodes) {
+  const result = [];
+  let accumulatedText = "";
+  for (const node of nodes) {
+    if (node.nodeName === "#text") {
+      accumulatedText += node.value;
+    } else {
+      if (accumulatedText !== "") {
+        result.push(new XmlNode(node.parent, "#text", {}, accumulatedText));
+        accumulatedText = "";
+      }
+      result.push(node);
+    }
+  }
+  if (accumulatedText !== "") {
+    result.push(new XmlNode(nodes[0].parent, "#text", {}, accumulatedText));
+  }
+  return result;
+}
 
 // src/context.tsx
 var StreamRenderContext = class _StreamRenderContext {
@@ -1935,13 +1954,16 @@ function OpenAIVisionChatCompletion(props, { logger, render, tracer, getContext
         messages: openAIMessages,
         stream: true
       };
+      const chatCompletionRequestToLog = cleanChatCompletionRequest(
+        chatCompletionRequest
+      );
       const logRequestData = {
         startTime,
         model,
         provider,
         providerRegion,
         inputMessages: renderedMessages,
-        request: chatCompletionRequest
+        request: chatCompletionRequestToLog
       };
       logger.chatCompletionRequest("openai", logRequestData);
       span.setAttributes({
@@ -1949,7 +1971,7 @@ function OpenAIVisionChatCompletion(props, { logger, render, tracer, getContext
         provider,
         providerRegion,
         requestType: "openai",
-        chatCompletionRequest
+        chatCompletionRequest: chatCompletionRequestToLog
       });
       let chatResponse;
       try {
@@ -2009,6 +2031,44 @@ function OpenAIVisionChatCompletion(props, { logger, render, tracer, getContext
     }
   );
 }
+function cleanChatCompletionRequest(chatCompletionRequest) {
+  const { messages, ...rest } = chatCompletionRequest;
+  return {
+    ...rest,
+    messages: messages.map((message) => {
+      if (message.role !== "user") {
+        return message;
+      }
+      if (typeof message.content === "string") {
+        return message;
+      }
+      return {
+        ...message,
+        content: message.content.map((part) => {
+          if (part.type === "text") {
+            return part;
+          }
+          if (part.image_url.url.startsWith("data:image")) {
+            return {
+              type: "image_url",
+              image_url: {
+                url: part.image_url.url.slice(0, 22) + "...",
+                detail: part.image_url.detail
+              }
+            };
+          }
+          return {
+            type: "image_url",
+            image_url: {
+              url: part.image_url.url,
+              detail: part.image_url.detail
+            }
+          };
+        })
+      };
+    })
+  };
+}
 
 // src/lib/openai/index.ts
 import { OpenAI as OpenAIClient3 } from "openai";
@@ -2049,14 +2109,15 @@ function buildAnthropicMessages(childrenXml) {
   }
   for (const node of parsed.childNodes) {
     if (node.nodeName === "UserMessage") {
-      if (node.childNodes?.length === 1 && node.childNodes[0].nodeName === "#text") {
+      const childNodes = collapseTextNodes(node.childNodes);
+      if (childNodes.length === 1 && childNodes[0].nodeName === "#text") {
         messages.push({
-          content: node.childNodes[0].value,
+          content: childNodes[0].value,
           role: "user"
         });
         continue;
       }
-      const parts = node.childNodes.map((n) => {
+      const parts = childNodes.map((n) => {
         if (n.nodeName === "#text") {
           return {
             type: "text",
@@ -2076,7 +2137,7 @@ function buildAnthropicMessages(childrenXml) {
         throw new Error(
           "Invalid ChatCompletionContentPart, expecting text or ContentTypeImage"
         );
-      });
+      }).filter((n) => n.type !== "text" || n.text.trim().length > 0);
       messages.push({
         content: parts,
         role: "user"
@@ -2125,13 +2186,16 @@ function AnthropicChatCompletion(props, { render, logger, tracer, getContext })
         temperature: props.temperature,
         model: props.model
       };
+      const chatCompletionRequestToLog = cleanChatCompletionRequest2(
+        anthropicCompletionRequest
+      );
       const logRequestData = {
         startTime,
         model: props.model,
         provider,
         providerRegion,
         inputMessages,
-        request: anthropicCompletionRequest
+        request: chatCompletionRequestToLog
       };
       logger.chatCompletionRequest("anthropic", logRequestData);
       span.setAttributes({
@@ -2139,7 +2203,7 @@ function AnthropicChatCompletion(props, { render, logger, tracer, getContext })
         provider,
         providerRegion,
         requestType: "anthropic",
-        chatCompletionRequest: anthropicCompletionRequest
+        chatCompletionRequest: chatCompletionRequestToLog
       });
       let response;
       try {
@@ -2255,6 +2319,39 @@ var renderChatMessageContent2 = (content) => {
     throw new Error("Invalid ImageBlockParam type");
   }).join("\n\n");
 };
+function cleanChatCompletionRequest2(chatCompletionRequest) {
+  const { messages, ...rest } = chatCompletionRequest;
+  return {
+    ...rest,
+    messages: messages.map((message) => {
+      if (message.role !== "user") {
+        return message;
+      }
+      if (typeof message.content === "string") {
+        return message;
+      }
+      return {
+        ...message,
+        content: message.content.map((part) => {
+          if (typeof part === "string") {
+            return part;
+          } else if (part.type === "text") {
+            return part;
+          } else if ("source" in part && typeof part.source === "object") {
+            return {
+              ...part,
+              source: {
+                ...part.source,
+                data: part.source.data.slice(0, 22) + "..."
+              }
+            };
+          }
+          return part;
+        })
+      };
+    })
+  };
+}
 
 // src/lib/anthropic/ClaudeImageBlock.tsx
 var ClaudeImageBlockParam = (_props) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gammatech/aijsx",
-  "version": "0.5.0-dev.2024-03-14.2",
+  "version": "0.5.0-dev.2024-03-19",
   "description": "Rewrite of aijsx",
   "author": "Jordan Garcia",
   "license": "MIT",