IChatGptSchema.IOneOf.discriminator

package.json

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

src/converters/ChatGptConverter.ts

@@ -130,6 +130,21 @@ export namespace ChatGptConverter {
       return {
         ...props.schema,
         oneOf: oneOf.filter((v) => v !== null),
+        discriminator: props.schema.discriminator
+          ? {
+              propertyName: props.schema.discriminator.propertyName,
+              mapping: props.schema.discriminator.mapping
+                ? Object.fromEntries(
+                    Object.entries(props.schema.discriminator.mapping).map(
+                      ([key, value]) => [
+                        key,
+                        value.replace("#/components/schemas/", "#/$defs/"),
+                      ],
+                    ),
+                  )
+                : undefined,
+            }
+          : undefined,
       };
     }
     return props.schema;

src/structures/IChatGptSchema.ts

@@ -67,7 +67,7 @@ export namespace IChatGptSchema {
      * Exclusive minimum value restriction.
      *
      * For reference, even though your Swagger (or OpenAPI) document has
-     * defined the `exclusiveMinimum` value as `number`, {@link OpenApi}
+     * defined the `exclusiveMinimum` value as `number`, {@link IChatGptSchema}
      * forcibly converts it to `boolean` type, and assign the numeric value to
      * the {@link minimum} property.
      */
@@ -77,7 +77,7 @@ export namespace IChatGptSchema {
      * Exclusive maximum value restriction.
      *
      * For reference, even though your Swagger (or OpenAPI) document has
-     * defined the `exclusiveMaximum` value as `number`, {@link OpenApi}
+     * defined the `exclusiveMaximum` value as `number`, {@link IChatGptSchema}
      * forcibly converts it to `boolean` type, and assign the numeric value to
      * the {@link maximum} property.
      */
@@ -375,11 +375,11 @@ export namespace IChatGptSchema {
      *
      * The `ref` is a reference to the named schema. Format of the `$ref` is
      * following the JSON Pointer specification. In the OpenAPI, the `$ref`
-     * starts with `#/components/schemas/` which means the type is stored in
-     * the {@link OpenApi.IComponents.schemas} object.
+     * starts with `#/$defs/` which means the type is stored in
+     * the {@link IChatGptSchema.ITop.$defs} object.
      *
-     * - `#/components/schemas/SomeObject`
-     * - `#/components/schemas/AnotherObject`
+     * - `#/$defs/SomeObject`
+     * - `#/$defs/AnotherObject`
      */
     $ref: Key;
   }
@@ -390,7 +390,7 @@ export namespace IChatGptSchema {
    * IOneOf` represents an union type of the TypeScript (`A | B | C`).
    *
    * For reference, even though your Swagger (or OpenAPI) document has
-   * defined `anyOf` instead of the `oneOf`, {@link OpenApi} forcibly
+   * defined `anyOf` instead of the `oneOf`, {@link IChatGptSchema} forcibly
    * converts it to `oneOf` type.
    */
   export interface IOneOf extends __IAttribute {
@@ -420,7 +420,7 @@ export namespace IChatGptSchema {
        * This property is valid only for {@link IReference} typed
        * {@link IOneOf.oneof} elements. Therefore, `key` of `mapping` is
        * the discriminator value, and `value` of `mapping` is the
-       * schema name like `#/components/schemas/SomeObject`.
+       * schema name like `#/$defs/SomeObject`.
        */
       mapping?: Record<string, string>;
     }

src/structures/IHttpLlmApplication.ts

@@ -74,7 +74,7 @@ export interface IHttpLlmApplication<
   Schema extends
     | ILlmSchemaV3
     | ILlmSchemaV3_1
-    | IChatGptSchema
+    | IChatGptSchema.ITop
     | IGeminiSchema = IHttpLlmApplication.ModelSchema[Model],
   Operation extends OpenApi.IOperation = OpenApi.IOperation,
   Route extends IHttpMigrateRoute = IHttpMigrateRoute,
@@ -112,7 +112,7 @@ export namespace IHttpLlmApplication {
   export type ModelSchema = {
     "3.0": ILlmSchemaV3;
     "3.1": ILlmSchemaV3_1;
-    chatgpt: IChatGptSchema;
+    chatgpt: IChatGptSchema.ITop;
     gemini: IGeminiSchema;
   };
 
@@ -166,7 +166,7 @@ export namespace IHttpLlmApplication {
     Schema extends
       | ILlmSchemaV3
       | ILlmSchemaV3_1
-      | IChatGptSchema
+      | IChatGptSchema.ITop
       | IGeminiSchema = IHttpLlmApplication.ModelSchema[Model],
   > {
     /**

src/structures/IHttpLlmFunction.ts

@@ -58,7 +58,11 @@ import { ILlmSchemaV3_1 } from "./ILlmSchemaV3_1";
  * @author Jeongho Nam - https://github.com/samchon
  */
 export interface IHttpLlmFunction<
-  Schema extends ILlmSchemaV3 | ILlmSchemaV3_1 | IChatGptSchema | IGeminiSchema,
+  Schema extends
+    | ILlmSchemaV3
+    | ILlmSchemaV3_1
+    | IChatGptSchema.ITop
+    | IGeminiSchema,
   Operation extends OpenApi.IOperation = OpenApi.IOperation,
   Route extends IHttpMigrateRoute = IHttpMigrateRoute,
 > {
@@ -231,7 +235,7 @@ export namespace IHttpLlmFunction {
     Schema extends
       | ILlmSchemaV3
       | ILlmSchemaV3_1
-      | IChatGptSchema
+      | IChatGptSchema.ITop
       | IGeminiSchema,
   > {
     /**
@@ -252,7 +256,7 @@ export namespace IHttpLlmFunction {
     Schema extends
       | ILlmSchemaV3
       | ILlmSchemaV3_1
-      | IChatGptSchema
+      | IChatGptSchema.ITop
       | IGeminiSchema,
   > {
     /**

src/structures/ILlmApplication.ts

@@ -39,7 +39,7 @@ export interface ILlmApplication<
   Schema extends
     | ILlmSchemaV3
     | ILlmSchemaV3_1
-    | IChatGptSchema
+    | IChatGptSchema.ITop
     | IGeminiSchema = ILlmApplication.ModelSchema[Model],
 > {
   /**
@@ -64,7 +64,7 @@ export namespace ILlmApplication {
   export type ModelSchema = {
     "3.0": ILlmSchemaV3;
     "3.1": ILlmSchemaV3_1;
-    chatgpt: IChatGptSchema;
+    chatgpt: IChatGptSchema.ITop;
     gemini: IGeminiSchema;
   };
 
@@ -76,7 +76,7 @@ export namespace ILlmApplication {
     Schema extends
       | ILlmSchemaV3
       | ILlmSchemaV3_1
-      | IChatGptSchema
+      | IChatGptSchema.ITop
       | IGeminiSchema = ILlmApplication.ModelSchema[Model],
   > {
     /**

src/structures/ILlmFunction.ts

@@ -26,7 +26,11 @@ import { ILlmSchemaV3_1 } from "./ILlmSchemaV3_1";
  * @author Jeongho Nam - https://github.com/samchon
  */
 export interface ILlmFunction<
-  Schema extends ILlmSchemaV3 | ILlmSchemaV3_1 | IChatGptSchema | IGeminiSchema,
+  Schema extends
+    | ILlmSchemaV3
+    | ILlmSchemaV3_1
+    | IChatGptSchema.ITop
+    | IGeminiSchema,
 > {
   /**
    * Representative name of the function.
@@ -88,7 +92,7 @@ export namespace ILlmFunction {
     Schema extends
       | ILlmSchemaV3
       | ILlmSchemaV3_1
-      | IChatGptSchema
+      | IChatGptSchema.ITop
       | IGeminiSchema,
   > {
     /**
@@ -109,7 +113,7 @@ export namespace ILlmFunction {
     Schema extends
       | ILlmSchemaV3
       | ILlmSchemaV3_1
-      | IChatGptSchema
+      | IChatGptSchema.ITop
       | IGeminiSchema,
   > {
     /**

test/features/llm/chatgpt/test_chatgpt_schema_oneof_discriminator.ts

@@ -0,0 +1,62 @@
+import { TestValidator } from "@nestia/e2e";
+import { IChatGptSchema } from "@samchon/openapi";
+import { ChatGptConverter } from "@samchon/openapi/lib/converters/ChatGptConverter";
+import typia, { IJsonApplication } from "typia";
+
+export const test_chatgpt_schema_oneof_discriminator = (): void => {
+  const collection: IJsonApplication =
+    typia.json.application<[IPoint | ILine | ITriangle | IRectangle]>();
+  const schema = ChatGptConverter.schema({
+    components: collection.components,
+    schema: collection.schemas[0],
+  });
+  TestValidator.equals("discriminator")({
+    oneOf: [
+      {
+        $ref: "#/$defs/IPoint",
+      },
+      {
+        $ref: "#/$defs/ILine",
+      },
+      {
+        $ref: "#/$defs/ITriangle",
+      },
+      {
+        $ref: "#/$defs/IRectangle",
+      },
+    ],
+    discriminator: {
+      propertyName: "type",
+      mapping: {
+        point: "#/$defs/IPoint",
+        line: "#/$defs/ILine",
+        triangle: "#/$defs/ITriangle",
+        rectangle: "#/$defs/IRectangle",
+      },
+    },
+  } satisfies IChatGptSchema as IChatGptSchema)(schema as IChatGptSchema);
+};
+
+interface IPoint {
+  type: "point";
+  x: number;
+  y: number;
+}
+interface ILine {
+  type: "line";
+  p1: IPoint;
+  p2: IPoint;
+}
+interface ITriangle {
+  type: "triangle";
+  p1: IPoint;
+  p2: IPoint;
+  p3: IPoint;
+}
+interface IRectangle {
+  type: "rectangle";
+  p1: IPoint;
+  p2: IPoint;
+  p3: IPoint;
+  p4: IPoint;
+}

test/features/llm/v3.1/test_llm_schema_v31_ultimate_union.ts

@@ -0,0 +1,19 @@
+import { OpenApi } from "@samchon/openapi";
+import { HttpLlmConverter } from "@samchon/openapi/lib/converters/HttpLlmConverter";
+import typia from "typia";
+
+export const test_llm_schema_v31_ultimate_union = (): void => {
+  const collection = typia.json.application<[IJsonSchemaCollection[]]>();
+  HttpLlmConverter.schema({
+    model: "3.1",
+    components: collection.components,
+    schema: collection.schemas[0],
+    recursive: 3,
+  });
+};
+
+interface IJsonSchemaCollection {
+  version: "3.1";
+  components: OpenApi.IComponents;
+  schemas: OpenApi.IJsonSchema[];
+}