@gammatech/aijsx 0.14.0-dev.2024-07-15 → 0.15.0-dev.2024-07-30

package/dist/index.d.mts

@@ -1,5 +1,5 @@
-import { L as LogChatCompletionRequest, A as AINode, C as ChatMessage, R as RenderContext, a as LogImplementation, S as SpanProcessor, b as ContextValues, c as Context, T as Tracer, d as ReadableSpan, e as SpanAttributes, f as SpanExporter, g as AIComponent, P as Prompt, h as ChatCompletionRequestPayloads, D as DebugMessage, E as EvaluatorResult, i as EvaluatorFn, j as PromptParsed, J as JSX } from './jsx-dev-runtime-S--1HQKU.mjs';
-export { y as AIElement, l as AIFragment, B as BoundLogger, n as ChatRole, u as CombinedLogger, s as ConsoleLogger, I as ImagePart, o as ImagePartProps, v as Literal, p as LogChatCompletionResponse, q as LogLevel, r as Logger, N as NoopLogImplementation, V as OutputParser, F as PropsOfAIComponent, w as RenderResult, z as Renderable, K as Span, G as SpanContext, M as SpanEvent, H as SpanStatus, Q as TracingContext, O as TracingContextKey, U as TracingContextManager, x as attachedContextSymbol, k as createAIElement, m as createContext, t as toDebugMessage } from './jsx-dev-runtime-S--1HQKU.mjs';
+import { L as LogChatCompletionRequest, A as AINode, C as ChatMessage, R as RenderContext, a as LogImplementation, S as SpanProcessor, b as ContextValues, c as Context, T as Tracer, d as ReadableSpan, e as SpanAttributes, f as SpanExporter, g as AIComponent, P as Prompt, h as ChatCompletionRequestPayloads, D as DebugMessage, E as EvaluatorResult, i as EvaluatorFn, j as PromptParsed, J as JSX } from './jsx-dev-runtime-lYsmphqH.mjs';
+export { y as AIElement, l as AIFragment, B as BoundLogger, n as ChatRole, u as CombinedLogger, s as ConsoleLogger, I as ImagePart, o as ImagePartProps, v as Literal, p as LogChatCompletionResponse, q as LogLevel, r as Logger, N as NoopLogImplementation, V as OutputParser, F as PropsOfAIComponent, w as RenderResult, z as Renderable, K as Span, G as SpanContext, M as SpanEvent, H as SpanStatus, Q as TracingContext, O as TracingContextKey, U as TracingContextManager, x as attachedContextSymbol, k as createAIElement, m as createContext, t as toDebugMessage } from './jsx-dev-runtime-lYsmphqH.mjs';
 import { ZodObject, ZodRawShape, ZodTypeAny, ZodString, z } from 'zod';
 import { OpenAI } from 'openai';
 export { OpenAI as OpenAIClient } from 'openai';

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import { L as LogChatCompletionRequest, A as AINode, C as ChatMessage, R as RenderContext, a as LogImplementation, S as SpanProcessor, b as ContextValues, c as Context, T as Tracer, d as ReadableSpan, e as SpanAttributes, f as SpanExporter, g as AIComponent, P as Prompt, h as ChatCompletionRequestPayloads, D as DebugMessage, E as EvaluatorResult, i as EvaluatorFn, j as PromptParsed, J as JSX } from './jsx-dev-runtime-S--1HQKU.js';
-export { y as AIElement, l as AIFragment, B as BoundLogger, n as ChatRole, u as CombinedLogger, s as ConsoleLogger, I as ImagePart, o as ImagePartProps, v as Literal, p as LogChatCompletionResponse, q as LogLevel, r as Logger, N as NoopLogImplementation, V as OutputParser, F as PropsOfAIComponent, w as RenderResult, z as Renderable, K as Span, G as SpanContext, M as SpanEvent, H as SpanStatus, Q as TracingContext, O as TracingContextKey, U as TracingContextManager, x as attachedContextSymbol, k as createAIElement, m as createContext, t as toDebugMessage } from './jsx-dev-runtime-S--1HQKU.js';
+import { L as LogChatCompletionRequest, A as AINode, C as ChatMessage, R as RenderContext, a as LogImplementation, S as SpanProcessor, b as ContextValues, c as Context, T as Tracer, d as ReadableSpan, e as SpanAttributes, f as SpanExporter, g as AIComponent, P as Prompt, h as ChatCompletionRequestPayloads, D as DebugMessage, E as EvaluatorResult, i as EvaluatorFn, j as PromptParsed, J as JSX } from './jsx-dev-runtime-lYsmphqH.js';
+export { y as AIElement, l as AIFragment, B as BoundLogger, n as ChatRole, u as CombinedLogger, s as ConsoleLogger, I as ImagePart, o as ImagePartProps, v as Literal, p as LogChatCompletionResponse, q as LogLevel, r as Logger, N as NoopLogImplementation, V as OutputParser, F as PropsOfAIComponent, w as RenderResult, z as Renderable, K as Span, G as SpanContext, M as SpanEvent, H as SpanStatus, Q as TracingContext, O as TracingContextKey, U as TracingContextManager, x as attachedContextSymbol, k as createAIElement, m as createContext, t as toDebugMessage } from './jsx-dev-runtime-lYsmphqH.js';
 import { ZodObject, ZodRawShape, ZodTypeAny, ZodString, z } from 'zod';
 import { OpenAI } from 'openai';
 export { OpenAI as OpenAIClient } from 'openai';

package/dist/index.js

@@ -89,6 +89,12 @@ var ChatCompletionError = class extends Error {
 };
 
 // src/chat/image.ts
+var SUPPORTED_TYPES = [
+  "image/jpeg",
+  "image/png",
+  "image/gif",
+  "image/webp"
+];
 var IMAGE_RENDERED_PROPS = {
   ImagePart: {
     url: true,
@@ -104,8 +110,7 @@ var ImagePart = (_props) => {
 async function fetchImageAndConvertToBase64(url) {
   const response = await fetch(url);
   const contentType = response.headers.get("content-type");
-  const allowedTypes = ["image/jpeg", "image/png", "image/gif", "image/webp"];
-  if (!contentType || !allowedTypes.includes(contentType)) {
+  if (!contentType || !RE_ALLOWED_MEDIA_TYPES.test(contentType)) {
     throw new Error(`Unsupported media type: ${contentType}`);
   }
   const blob = await response.blob();
@@ -116,10 +121,40 @@ async function fetchImageAndConvertToBase64(url) {
     mediaType: contentType
   };
 }
-async function processImageMessageProps(props, downloadUrl) {
+var RE_ALLOWED_MEDIA_TYPES = new RegExp(
+  `^(${SUPPORTED_TYPES.join("|")})$`,
+  "i"
+);
+var RE_DATA_IMAGE = new RegExp(
+  `^data:(${SUPPORTED_TYPES.join("|")});base64,(.+)$`,
+  "i"
+);
+var parseDataUrl = (dataUrl) => {
+  const matches = dataUrl.match(RE_DATA_IMAGE);
+  if (!matches) {
+    return null;
+  }
+  const [, mediaType, base64] = matches;
+  return {
+    mediaType,
+    base64
+  };
+};
+async function processImageMessageProps(props, opts) {
   const { dimensions, detail, ...rest } = props;
-  if ("url" in rest) {
-    if (downloadUrl) {
+  if ("url" in rest && rest.url) {
+    const parsed = parseDataUrl(rest.url);
+    if (parsed) {
+      const { mediaType, base64 } = parsed;
+      return {
+        url: null,
+        data: base64,
+        mediaType,
+        dimensions,
+        detail
+      };
+    }
+    if (opts.downloadUrl) {
       const { base64, mediaType } = await fetchImageAndConvertToBase64(rest.url);
       return {
         url: rest.url,
@@ -138,6 +173,16 @@ async function processImageMessageProps(props, downloadUrl) {
     };
   }
   if ("data" in rest) {
+    const parsed = parseDataUrl(rest.data);
+    if (parsed) {
+      return {
+        url: null,
+        mediaType: parsed.mediaType,
+        data: parsed.base64,
+        dimensions,
+        detail
+      };
+    }
     return {
       url: null,
       mediaType: rest.mediaType,
@@ -159,6 +204,9 @@ var cleanProps = (props) => {
   }
   return res;
 };
+var buildDataUri = (mediaType, base64) => {
+  return `data:${mediaType};base64,${base64}`;
+};
 
 // src/chat/ChatMessage.ts
 var toDebugMessage = (message) => {
@@ -185,8 +233,8 @@ var toDebugMessage = (message) => {
   };
 };
 var UserChatMessageBuilder = class {
-  constructor(useBase64) {
-    this.useBase64 = useBase64;
+  constructor(opts) {
+    this.opts = opts;
   }
   content = [];
   text(text) {
@@ -206,7 +254,9 @@ var UserChatMessageBuilder = class {
             text: part
           };
         } else {
-          const image = await processImageMessageProps(part, this.useBase64);
+          const image = await processImageMessageProps(part, {
+            downloadUrl: this.opts.useBase64Images
+          });
           return {
             type: "image",
             image
@@ -221,7 +271,7 @@ var UserChatMessageBuilder = class {
   }
 };
 var userChatMessageBuilder = (opts) => {
-  return new UserChatMessageBuilder(opts.useBase64);
+  return new UserChatMessageBuilder(opts);
 };
 
 // src/chat/components.ts
@@ -2073,7 +2123,7 @@ async function buildChatMessages(ctx, children, opts) {
   const nodes = await toXml(ctx, children);
   const handleUserMessage = async (node) => {
     const childNodes = node.childNodes;
-    const builder = userChatMessageBuilder({ useBase64: opts.useBase64Images });
+    const builder = userChatMessageBuilder(opts);
     for (const n of childNodes) {
       if (n.nodeName === "#text") {
         builder.text(n.value);
@@ -2142,7 +2192,7 @@ function buildOpenAIMessages(chatMessages) {
           };
         }
         if (part.type === "image") {
-          const url = part.image.url || part.image.data;
+          const url = part.image.url ?? buildDataUri(part.image.mediaType, part.image.data);
           return {
             type: "image_url",
             image_url: {

package/dist/index.mjs

@@ -19,6 +19,12 @@ var ChatCompletionError = class extends Error {
 };
 
 // src/chat/image.ts
+var SUPPORTED_TYPES = [
+  "image/jpeg",
+  "image/png",
+  "image/gif",
+  "image/webp"
+];
 var IMAGE_RENDERED_PROPS = {
   ImagePart: {
     url: true,
@@ -34,8 +40,7 @@ var ImagePart = (_props) => {
 async function fetchImageAndConvertToBase64(url) {
   const response = await fetch(url);
   const contentType = response.headers.get("content-type");
-  const allowedTypes = ["image/jpeg", "image/png", "image/gif", "image/webp"];
-  if (!contentType || !allowedTypes.includes(contentType)) {
+  if (!contentType || !RE_ALLOWED_MEDIA_TYPES.test(contentType)) {
     throw new Error(`Unsupported media type: ${contentType}`);
   }
   const blob = await response.blob();
@@ -46,10 +51,40 @@ async function fetchImageAndConvertToBase64(url) {
     mediaType: contentType
   };
 }
-async function processImageMessageProps(props, downloadUrl) {
+var RE_ALLOWED_MEDIA_TYPES = new RegExp(
+  `^(${SUPPORTED_TYPES.join("|")})$`,
+  "i"
+);
+var RE_DATA_IMAGE = new RegExp(
+  `^data:(${SUPPORTED_TYPES.join("|")});base64,(.+)$`,
+  "i"
+);
+var parseDataUrl = (dataUrl) => {
+  const matches = dataUrl.match(RE_DATA_IMAGE);
+  if (!matches) {
+    return null;
+  }
+  const [, mediaType, base64] = matches;
+  return {
+    mediaType,
+    base64
+  };
+};
+async function processImageMessageProps(props, opts) {
   const { dimensions, detail, ...rest } = props;
-  if ("url" in rest) {
-    if (downloadUrl) {
+  if ("url" in rest && rest.url) {
+    const parsed = parseDataUrl(rest.url);
+    if (parsed) {
+      const { mediaType, base64 } = parsed;
+      return {
+        url: null,
+        data: base64,
+        mediaType,
+        dimensions,
+        detail
+      };
+    }
+    if (opts.downloadUrl) {
       const { base64, mediaType } = await fetchImageAndConvertToBase64(rest.url);
       return {
         url: rest.url,
@@ -68,6 +103,16 @@ async function processImageMessageProps(props, downloadUrl) {
     };
   }
   if ("data" in rest) {
+    const parsed = parseDataUrl(rest.data);
+    if (parsed) {
+      return {
+        url: null,
+        mediaType: parsed.mediaType,
+        data: parsed.base64,
+        dimensions,
+        detail
+      };
+    }
     return {
       url: null,
       mediaType: rest.mediaType,
@@ -89,6 +134,9 @@ var cleanProps = (props) => {
   }
   return res;
 };
+var buildDataUri = (mediaType, base64) => {
+  return `data:${mediaType};base64,${base64}`;
+};
 
 // src/chat/ChatMessage.ts
 var toDebugMessage = (message) => {
@@ -115,8 +163,8 @@ var toDebugMessage = (message) => {
   };
 };
 var UserChatMessageBuilder = class {
-  constructor(useBase64) {
-    this.useBase64 = useBase64;
+  constructor(opts) {
+    this.opts = opts;
   }
   content = [];
   text(text) {
@@ -136,7 +184,9 @@ var UserChatMessageBuilder = class {
             text: part
           };
         } else {
-          const image = await processImageMessageProps(part, this.useBase64);
+          const image = await processImageMessageProps(part, {
+            downloadUrl: this.opts.useBase64Images
+          });
           return {
             type: "image",
             image
@@ -151,7 +201,7 @@ var UserChatMessageBuilder = class {
   }
 };
 var userChatMessageBuilder = (opts) => {
-  return new UserChatMessageBuilder(opts.useBase64);
+  return new UserChatMessageBuilder(opts);
 };
 
 // src/chat/components.ts
@@ -1970,7 +2020,7 @@ async function buildChatMessages(ctx, children, opts) {
   const nodes = await toXml(ctx, children);
   const handleUserMessage = async (node) => {
     const childNodes = node.childNodes;
-    const builder = userChatMessageBuilder({ useBase64: opts.useBase64Images });
+    const builder = userChatMessageBuilder(opts);
     for (const n of childNodes) {
       if (n.nodeName === "#text") {
         builder.text(n.value);
@@ -2039,7 +2089,7 @@ function buildOpenAIMessages(chatMessages) {
           };
         }
         if (part.type === "image") {
-          const url = part.image.url || part.image.data;
+          const url = part.image.url ?? buildDataUri(part.image.mediaType, part.image.data);
           return {
             type: "image_url",
             image_url: {

package/dist/{jsx-dev-runtime-S--1HQKU.d.mts → jsx-dev-runtime-lYsmphqH.d.mts}

@@ -1,6 +1,7 @@
 import { ZodTypeAny, ZodObject, ZodRawShape } from 'zod';
 
-type ImageMediaType = 'image/jpeg' | 'image/png' | 'image/gif' | 'image/webp';
+declare const SUPPORTED_TYPES: readonly ["image/jpeg", "image/png", "image/gif", "image/webp"];
+type ImageMediaType = (typeof SUPPORTED_TYPES)[number];
 type ImageMessageExtraProps = {
     dimensions?: {
         width: number;

package/dist/{jsx-dev-runtime-S--1HQKU.d.ts → jsx-dev-runtime-lYsmphqH.d.ts}

@@ -1,6 +1,7 @@
 import { ZodTypeAny, ZodObject, ZodRawShape } from 'zod';
 
-type ImageMediaType = 'image/jpeg' | 'image/png' | 'image/gif' | 'image/webp';
+declare const SUPPORTED_TYPES: readonly ["image/jpeg", "image/png", "image/gif", "image/webp"];
+type ImageMediaType = (typeof SUPPORTED_TYPES)[number];
 type ImageMessageExtraProps = {
     dimensions?: {
         width: number;

package/dist/jsx-dev-runtime.d.mts

@@ -1,2 +1,2 @@
-export { Z as Fragment, J as JSX, W as jsx, X as jsxDEV, Y as jsxs } from './jsx-dev-runtime-S--1HQKU.mjs';
+export { Z as Fragment, J as JSX, W as jsx, X as jsxDEV, Y as jsxs } from './jsx-dev-runtime-lYsmphqH.mjs';
 import 'zod';

package/dist/jsx-dev-runtime.d.ts

@@ -1,2 +1,2 @@
-export { Z as Fragment, J as JSX, W as jsx, X as jsxDEV, Y as jsxs } from './jsx-dev-runtime-S--1HQKU.js';
+export { Z as Fragment, J as JSX, W as jsx, X as jsxDEV, Y as jsxs } from './jsx-dev-runtime-lYsmphqH.js';
 import 'zod';

package/dist/jsx-runtime.d.mts

@@ -1,2 +1,2 @@
-export { Z as Fragment, J as JSX, W as jsx, X as jsxDEV, Y as jsxs } from './jsx-dev-runtime-S--1HQKU.mjs';
+export { Z as Fragment, J as JSX, W as jsx, X as jsxDEV, Y as jsxs } from './jsx-dev-runtime-lYsmphqH.mjs';
 import 'zod';

package/dist/jsx-runtime.d.ts

@@ -1,2 +1,2 @@
-export { Z as Fragment, J as JSX, W as jsx, X as jsxDEV, Y as jsxs } from './jsx-dev-runtime-S--1HQKU.js';
+export { Z as Fragment, J as JSX, W as jsx, X as jsxDEV, Y as jsxs } from './jsx-dev-runtime-lYsmphqH.js';
 import 'zod';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gammatech/aijsx",
-  "version": "0.14.0-dev.2024-07-15",
+  "version": "0.15.0-dev.2024-07-30",
   "description": "Rewrite of aijsx",
   "author": "Jordan Garcia",
   "license": "MIT",
@@ -58,6 +58,7 @@
     "eslint-plugin-prettier": "^4.2.1",
     "eslint-plugin-react": "^7.24.0",
     "eslint-plugin-react-hooks": "^4.2.0",
+    "fetch-mock-jest": "^1.5.1",
     "jest": "^29.7.0",
     "prettier": "^2.2.1",
     "tinybench": "^2.5.1",