Fix ChatGptSchemaComposer's strict mode (#145)

Author: samchon

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@samchon/openapi",
-  "version": "2.5.1",
+  "version": "2.5.2",
   "description": "OpenAPI definitions and converters for 'typia' and 'nestia'.",
   "main": "./lib/index.js",
   "module": "./lib/index.mjs",

src/composers/llm/ChatGptSchemaComposer.ts

@@ -43,10 +43,16 @@ export namespace ChatGptSchemaComposer {
 
     // returns with transformation
     for (const key of Object.keys(result.value.$defs))
-      result.value.$defs[key] = transform(result.value.$defs[key]);
+      result.value.$defs[key] = transform({
+        config: props.config,
+        schema: result.value.$defs[key],
+      });
     return {
       success: true,
-      value: transform(result.value) as IChatGptSchema.IParameters,
+      value: transform({
+        config: props.config,
+        schema: result.value,
+      }) as IChatGptSchema.IParameters,
     };
   };
 
@@ -77,10 +83,16 @@ export namespace ChatGptSchemaComposer {
     // returns with transformation
     for (const key of Object.keys(props.$defs))
       if (oldbie.has(key) === false)
-        props.$defs[key] = transform(props.$defs[key]);
+        props.$defs[key] = transform({
+          config: props.config,
+          schema: props.$defs[key],
+        });
     return {
       success: true,
-      value: transform(result.value),
+      value: transform({
+        config: props.config,
+        schema: result.value,
+      }),
     };
   };
 
@@ -109,13 +121,16 @@ export namespace ChatGptSchemaComposer {
     return reasons;
   };
 
-  const transform = (schema: ILlmSchemaV3_1): IChatGptSchema => {
+  const transform = (props: {
+    config: IChatGptSchema.IConfig;
+    schema: ILlmSchemaV3_1;
+  }): IChatGptSchema => {
     const union: Array<IChatGptSchema> = [];
     const attribute: IChatGptSchema.__IAttribute = {
-      title: schema.title,
-      description: schema.description,
-      example: schema.example,
-      examples: schema.examples,
+      title: props.schema.title,
+      description: props.schema.description,
+      example: props.schema.example,
+      examples: props.schema.examples,
       ...Object.fromEntries(
         Object.entries(schema).filter(
           ([key, value]) => key.startsWith("x-") && value !== undefined,
@@ -127,22 +142,33 @@ export namespace ChatGptSchemaComposer {
       else if (LlmTypeCheckerV3_1.isArray(input))
         union.push({
           ...input,
-          items: transform(input.items),
+          items: transform({
+            config: props.config,
+            schema: input.items,
+          }),
         });
       else if (LlmTypeCheckerV3_1.isObject(input))
         union.push({
           ...input,
           properties: Object.fromEntries(
             Object.entries(input.properties).map(([key, value]) => [
               key,
-              transform(value),
+              transform({
+                config: props.config,
+                schema: value,
+              }),
             ]),
           ),
           additionalProperties:
-            typeof input.additionalProperties === "object" &&
-            input.additionalProperties !== null
-              ? transform(input.additionalProperties)
-              : input.additionalProperties,
+            props.config.strict === true
+              ? false
+              : typeof input.additionalProperties === "object" &&
+                  input.additionalProperties !== null
+                ? transform({
+                    config: props.config,
+                    schema: input.additionalProperties,
+                  })
+                : input.additionalProperties,
         });
       else if (LlmTypeCheckerV3_1.isConstant(input) === false)
         union.push(input);
@@ -167,8 +193,8 @@ export namespace ChatGptSchemaComposer {
       else if (OpenApiTypeChecker.isOneOf(input))
         input.oneOf.forEach(visitConstant);
     };
-    visit(schema);
-    visitConstant(schema);
+    visit(props.schema);
+    visitConstant(props.schema);
     if (union.length === 0)
       return {
         ...attribute,

test/features/llm/chatgpt/test_chatgpt_schema_strict.ts

@@ -0,0 +1,42 @@
+import { TestValidator } from "@nestia/e2e";
+import { ILlmSchema, IOpenApiSchemaError, IResult } from "@samchon/openapi";
+import { LlmSchemaComposer } from "@samchon/openapi/lib/composers/LlmSchemaComposer";
+import typia, { IJsonSchemaCollection } from "typia";
+
+export const test_chatgpt_schema_strict = (): void => {
+  const collection: IJsonSchemaCollection = typia.json.schemas<
+    [
+      {
+        id: string;
+        name: string;
+        hobbies: {
+          id: string;
+          name: string;
+        }[];
+      },
+    ]
+  >();
+  const res: IResult<ILlmSchema, IOpenApiSchemaError> =
+    LlmSchemaComposer.schema("chatgpt")({
+      config: {
+        ...LlmSchemaComposer.defaultConfig("chatgpt"),
+        strict: true,
+      },
+      components: collection.components,
+      schema: collection.schemas[0],
+      $defs: {},
+    } as any);
+  TestValidator.equals("strict")({
+    type: "object",
+    additionalProperties: false,
+    properties: {
+      hobbies: {
+        type: "array",
+        items: {
+          type: "object",
+          additionalProperties: false,
+        },
+      },
+    },
+  })((res.success ? res.value : null) as any);
+};