From 243f98716bbf0b8391e39593ca597ac723f5dce3 Mon Sep 17 00:00:00 2001 From: ShivangiReja <45216704+ShivangiReja@users.noreply.github.com> Date: Thu, 24 Jul 2025 14:50:29 -0700 Subject: [PATCH 1/3] Expose protocol methods for Graders and Containers --- api/OpenAI.net8.0.cs | 383 ++++++++++++++++++ api/OpenAI.netstandard2.0.cs | 351 ++++++++++++++++ specification/client/containers.client.tsp | 15 + specification/client/graders.client.tsp | 8 + specification/main.tsp | 2 + src/Custom/Containers/ContainerClient.cs | 54 ++- src/Custom/Containers/GeneratorStubs.cs | 12 + .../Containers/Internal/GeneratorStubs.cs | 87 ---- src/Custom/Graders/GeneratorStubs.cs | 20 + src/Custom/Graders/GraderClient.cs | 53 ++- src/Custom/Graders/Internal/GeneratorStubs.cs | 81 ---- src/Custom/OpenAIClient.cs | 18 + src/Generated/ContainerClient.RestClient.cs | 2 +- src/Generated/ContainerClient.cs | 170 +------- src/Generated/GraderClient.RestClient.cs | 2 +- src/Generated/GraderClient.cs | 43 +- ...ontainerFileListResource.Serialization.cs} | 50 +-- ...source.cs => ContainerFileListResource.cs} | 12 +- ...=> ContainerFileResource.Serialization.cs} | 42 +- ...leResource.cs => ContainerFileResource.cs} | 8 +- ...=> ContainerListResource.Serialization.cs} | 50 +-- ...stResource.cs => ContainerListResource.cs} | 12 +- ....cs => ContainerResource.Serialization.cs} | 46 +-- ...tainerResource.cs => ContainerResource.cs} | 10 +- ...inerResourceExpiresAfter.Serialization.cs} | 40 +- ...er.cs => ContainerResourceExpiresAfter.cs} | 8 +- ...s => CreateContainerBody.Serialization.cs} | 46 +-- ...ontainerBody.cs => CreateContainerBody.cs} | 12 +- ...ontainerBodyExpiresAfter.Serialization.cs} | 42 +- ....cs => CreateContainerBodyExpiresAfter.cs} | 8 +- ... CreateContainerFileBody.Serialization.cs} | 40 +- ...FileBody.cs => CreateContainerFileBody.cs} | 12 +- ...eteContainerFileResponse.Serialization.cs} | 42 +- ...onse.cs => DeleteContainerFileResponse.cs} | 8 +- ... DeleteContainerResponse.Serialization.cs} | 42 +- ...Response.cs => DeleteContainerResponse.cs} | 8 +- ...valGraderLabelModelParams.Serialization.cs | 6 +- .../InternalEvalGraderLabelModelParams.cs | 4 +- ...lGraderLabelModelResource.Serialization.cs | 6 +- .../InternalEvalGraderLabelModelResource.cs | 4 +- .../Models/Evals/InternalEvalGraderParams.cs | 6 +- ...nalEvalGraderPythonParams.Serialization.cs | 6 +- .../Evals/InternalEvalGraderPythonParams.cs | 4 +- ...lEvalGraderPythonResource.Serialization.cs | 6 +- .../Evals/InternalEvalGraderPythonResource.cs | 4 +- .../Evals/InternalEvalGraderResource.cs | 6 +- ...valGraderScoreModelParams.Serialization.cs | 6 +- .../InternalEvalGraderScoreModelParams.cs | 4 +- ...lGraderScoreModelResource.Serialization.cs | 6 +- .../InternalEvalGraderScoreModelResource.cs | 4 +- ...alGraderStringCheckParams.Serialization.cs | 10 +- .../InternalEvalGraderStringCheckParams.cs | 6 +- ...raderTextSimilarityParams.Serialization.cs | 10 +- .../InternalEvalGraderTextSimilarityParams.cs | 6 +- ...derTextSimilarityResource.Serialization.cs | 10 +- ...nternalEvalGraderTextSimilarityResource.cs | 6 +- ...alUnknownEvalGraderParams.Serialization.cs | 4 +- .../Evals/InternalUnknownEvalGraderParams.cs | 2 +- ...UnknownEvalGraderResource.Serialization.cs | 4 +- .../InternalUnknownEvalGraderResource.cs | 2 +- ...neTuneReinforcementMethod.Serialization.cs | 4 +- .../InternalFineTuneReinforcementMethod.cs | 4 +- ...forcementHyperparameters.Serialization.cs} | 40 +- ...> FineTuneReinforcementHyperparameters.cs} | 8 +- ...rialization.cs => Grader.Serialization.cs} | 56 +-- .../Graders/{InternalGrader.cs => Grader.cs} | 10 +- ...n.cs => GraderLabelModel.Serialization.cs} | 46 +-- ...raderLabelModel.cs => GraderLabelModel.cs} | 8 +- ...zation.cs => GraderMulti.Serialization.cs} | 46 +-- ...{InternalGraderMulti.cs => GraderMulti.cs} | 8 +- ...ation.cs => GraderPython.Serialization.cs} | 46 +-- ...nternalGraderPython.cs => GraderPython.cs} | 8 +- ...n.cs => GraderScoreModel.Serialization.cs} | 46 +-- ...raderScoreModel.cs => GraderScoreModel.cs} | 8 +- ....cs => GraderStringCheck.Serialization.cs} | 50 +-- ...derStringCheck.cs => GraderStringCheck.cs} | 10 +- .../Graders/GraderStringCheckOperation.cs | 52 +++ ... => GraderTextSimilarity.Serialization.cs} | 50 +-- ...tSimilarity.cs => GraderTextSimilarity.cs} | 10 +- .../GraderTextSimilarityEvaluationMetric.cs | 70 ++++ src/Generated/Models/Graders/GraderType.cs | 58 +++ .../InternalGraderStringCheckOperation.cs | 50 --- ...nalGraderTextSimilarityEvaluationMetric.cs | 68 ---- .../Models/Graders/InternalGraderType.cs | 56 --- .../Models/Graders/InternalUnknownGrader.cs | 16 - ...n.cs => RunGraderRequest.Serialization.cs} | 42 +- ...unGraderRequest.cs => RunGraderRequest.cs} | 14 +- ....cs => RunGraderResponse.Serialization.cs} | 46 +-- ...GraderResponse.cs => RunGraderResponse.cs} | 10 +- ...unGraderResponseMetadata.Serialization.cs} | 46 +-- ...tadata.cs => RunGraderResponseMetadata.cs} | 10 +- ...erResponseMetadataErrors.Serialization.cs} | 42 +- ....cs => RunGraderResponseMetadataErrors.cs} | 8 +- ...tion.cs => UnknownGrader.Serialization.cs} | 46 +-- src/Generated/Models/Graders/UnknownGrader.cs | 18 + ...=> ValidateGraderRequest.Serialization.cs} | 42 +- ...derRequest.cs => ValidateGraderRequest.cs} | 11 +- ...> ValidateGraderResponse.Serialization.cs} | 40 +- ...rResponse.cs => ValidateGraderResponse.cs} | 8 +- src/Generated/OpenAIModelFactory.cs | 175 ++++++++ 100 files changed, 2075 insertions(+), 1282 deletions(-) create mode 100644 specification/client/containers.client.tsp create mode 100644 specification/client/graders.client.tsp create mode 100644 src/Custom/Containers/GeneratorStubs.cs delete mode 100644 src/Custom/Containers/Internal/GeneratorStubs.cs create mode 100644 src/Custom/Graders/GeneratorStubs.cs delete mode 100644 src/Custom/Graders/Internal/GeneratorStubs.cs rename src/Generated/Models/Containers/{InternalContainerFileListResource.Serialization.cs => ContainerFileListResource.Serialization.cs} (64%) rename src/Generated/Models/Containers/{InternalContainerFileListResource.cs => ContainerFileListResource.cs} (64%) rename src/Generated/Models/Containers/{InternalContainerFileResource.Serialization.cs => ContainerFileResource.Serialization.cs} (71%) rename src/Generated/Models/Containers/{InternalContainerFileResource.cs => ContainerFileResource.cs} (72%) rename src/Generated/Models/Containers/{InternalContainerListResource.Serialization.cs => ContainerListResource.Serialization.cs} (65%) rename src/Generated/Models/Containers/{InternalContainerListResource.cs => ContainerListResource.cs} (65%) rename src/Generated/Models/Containers/{InternalContainerResource.Serialization.cs => ContainerResource.Serialization.cs} (69%) rename src/Generated/Models/Containers/{InternalContainerResource.cs => ContainerResource.cs} (67%) rename src/Generated/Models/Containers/{InternalContainerResourceExpiresAfter.Serialization.cs => ContainerResourceExpiresAfter.Serialization.cs} (60%) rename src/Generated/Models/Containers/{InternalContainerResourceExpiresAfter.cs => ContainerResourceExpiresAfter.cs} (68%) rename src/Generated/Models/Containers/{InternalCreateContainerBody.Serialization.cs => CreateContainerBody.Serialization.cs} (66%) rename src/Generated/Models/Containers/{InternalCreateContainerBody.cs => CreateContainerBody.cs} (67%) rename src/Generated/Models/Containers/{InternalCreateContainerBodyExpiresAfter.Serialization.cs => CreateContainerBodyExpiresAfter.Serialization.cs} (58%) rename src/Generated/Models/Containers/{InternalCreateContainerBodyExpiresAfter.cs => CreateContainerBodyExpiresAfter.cs} (69%) rename src/Generated/Models/Containers/{InternalCreateContainerFileBody.Serialization.cs => CreateContainerFileBody.Serialization.cs} (62%) rename src/Generated/Models/Containers/{InternalCreateContainerFileBody.cs => CreateContainerFileBody.cs} (61%) rename src/Generated/Models/Containers/{InternalDeleteContainerResponse.Serialization.cs => DeleteContainerFileResponse.Serialization.cs} (62%) rename src/Generated/Models/Containers/{InternalDeleteContainerFileResponse.cs => DeleteContainerFileResponse.cs} (70%) rename src/Generated/Models/Containers/{InternalDeleteContainerFileResponse.Serialization.cs => DeleteContainerResponse.Serialization.cs} (62%) rename src/Generated/Models/Containers/{InternalDeleteContainerResponse.cs => DeleteContainerResponse.cs} (71%) rename src/Generated/Models/Graders/{InternalFineTuneReinforcementHyperparameters.Serialization.cs => FineTuneReinforcementHyperparameters.Serialization.cs} (77%) rename src/Generated/Models/Graders/{InternalFineTuneReinforcementHyperparameters.cs => FineTuneReinforcementHyperparameters.cs} (71%) rename src/Generated/Models/Graders/{InternalGrader.Serialization.cs => Grader.Serialization.cs} (53%) rename src/Generated/Models/Graders/{InternalGrader.cs => Grader.cs} (66%) rename src/Generated/Models/Graders/{InternalGraderLabelModel.Serialization.cs => GraderLabelModel.Serialization.cs} (72%) rename src/Generated/Models/Graders/{InternalGraderLabelModel.cs => GraderLabelModel.cs} (68%) rename src/Generated/Models/Graders/{InternalGraderMulti.Serialization.cs => GraderMulti.Serialization.cs} (61%) rename src/Generated/Models/Graders/{InternalGraderMulti.cs => GraderMulti.cs} (62%) rename src/Generated/Models/Graders/{InternalGraderPython.Serialization.cs => GraderPython.Serialization.cs} (59%) rename src/Generated/Models/Graders/{InternalGraderPython.cs => GraderPython.cs} (58%) rename src/Generated/Models/Graders/{InternalGraderScoreModel.Serialization.cs => GraderScoreModel.Serialization.cs} (71%) rename src/Generated/Models/Graders/{InternalGraderScoreModel.cs => GraderScoreModel.cs} (67%) rename src/Generated/Models/Graders/{InternalGraderStringCheck.Serialization.cs => GraderStringCheck.Serialization.cs} (60%) rename src/Generated/Models/Graders/{InternalGraderStringCheck.cs => GraderStringCheck.cs} (55%) create mode 100644 src/Generated/Models/Graders/GraderStringCheckOperation.cs rename src/Generated/Models/Graders/{InternalGraderTextSimilarity.Serialization.cs => GraderTextSimilarity.Serialization.cs} (59%) rename src/Generated/Models/Graders/{InternalGraderTextSimilarity.cs => GraderTextSimilarity.cs} (54%) create mode 100644 src/Generated/Models/Graders/GraderTextSimilarityEvaluationMetric.cs create mode 100644 src/Generated/Models/Graders/GraderType.cs delete mode 100644 src/Generated/Models/Graders/InternalGraderStringCheckOperation.cs delete mode 100644 src/Generated/Models/Graders/InternalGraderTextSimilarityEvaluationMetric.cs delete mode 100644 src/Generated/Models/Graders/InternalGraderType.cs delete mode 100644 src/Generated/Models/Graders/InternalUnknownGrader.cs rename src/Generated/Models/Graders/{InternalRunGraderRequest.Serialization.cs => RunGraderRequest.Serialization.cs} (67%) rename src/Generated/Models/Graders/{InternalRunGraderRequest.cs => RunGraderRequest.cs} (62%) rename src/Generated/Models/Graders/{InternalRunGraderResponse.Serialization.cs => RunGraderResponse.Serialization.cs} (66%) rename src/Generated/Models/Graders/{InternalRunGraderResponse.cs => RunGraderResponse.cs} (66%) rename src/Generated/Models/Graders/{InternalRunGraderResponseMetadata.Serialization.cs => RunGraderResponseMetadata.Serialization.cs} (72%) rename src/Generated/Models/Graders/{InternalRunGraderResponseMetadata.cs => RunGraderResponseMetadata.cs} (66%) rename src/Generated/Models/Graders/{InternalRunGraderResponseMetadataErrors.Serialization.cs => RunGraderResponseMetadataErrors.Serialization.cs} (82%) rename src/Generated/Models/Graders/{InternalRunGraderResponseMetadataErrors.cs => RunGraderResponseMetadataErrors.cs} (72%) rename src/Generated/Models/Graders/{InternalUnknownGrader.Serialization.cs => UnknownGrader.Serialization.cs} (51%) create mode 100644 src/Generated/Models/Graders/UnknownGrader.cs rename src/Generated/Models/Graders/{InternalValidateGraderRequest.Serialization.cs => ValidateGraderRequest.Serialization.cs} (59%) rename src/Generated/Models/Graders/{InternalValidateGraderRequest.cs => ValidateGraderRequest.cs} (66%) rename src/Generated/Models/Graders/{InternalValidateGraderResponse.Serialization.cs => ValidateGraderResponse.Serialization.cs} (61%) rename src/Generated/Models/Graders/{InternalValidateGraderResponse.cs => ValidateGraderResponse.cs} (68%) diff --git a/api/OpenAI.net8.0.cs b/api/OpenAI.net8.0.cs index e2cd12337..c424c16cf 100644 --- a/api/OpenAI.net8.0.cs +++ b/api/OpenAI.net8.0.cs @@ -12,11 +12,15 @@ public class OpenAIClient { [Experimental("OPENAI001")] public virtual BatchClient GetBatchClient(); public virtual ChatClient GetChatClient(string model); + [Experimental("OPENAI001")] + public virtual Containers.ContainerClient GetContainerClient(); public virtual EmbeddingClient GetEmbeddingClient(string model); [Experimental("OPENAI001")] public virtual EvaluationClient GetEvaluationClient(); [Experimental("OPENAI001")] public virtual FineTuningClient GetFineTuningClient(); + [Experimental("OPENAI001")] + public virtual Graders.GraderClient GetGraderClient(); public virtual ImageClient GetImageClient(string model); public virtual ModerationClient GetModerationClient(string model); public virtual OpenAIFileClient GetOpenAIFileClient(); @@ -2094,6 +2098,143 @@ public class UserChatMessage : ChatMessage, IJsonModel, IPersis protected override BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options); } } +namespace OpenAI.Containers { + [Experimental("OPENAI001")] + public class ContainerClient { + protected ContainerClient(); + public ContainerClient(ApiKeyCredential credential, OpenAIClientOptions options); + public ContainerClient(ApiKeyCredential credential); + protected internal ContainerClient(ClientPipeline pipeline, OpenAIClientOptions options); + public ContainerClient(string apiKey); + public ClientPipeline Pipeline { get; } + public virtual ClientResult CreateContainer(BinaryContent content, RequestOptions options = null); + public virtual Task CreateContainerAsync(BinaryContent content, RequestOptions options = null); + public virtual ClientResult CreateContainerFile(string containerId, BinaryContent content, string contentType, RequestOptions options = null); + public virtual Task CreateContainerFileAsync(string containerId, BinaryContent content, string contentType, RequestOptions options = null); + public virtual ClientResult DeleteContainer(string containerId, RequestOptions options = null); + public virtual Task DeleteContainerAsync(string containerId, RequestOptions options = null); + public virtual ClientResult DeleteContainerFile(string containerId, string fileId, RequestOptions options = null); + public virtual Task DeleteContainerFileAsync(string containerId, string fileId, RequestOptions options = null); + public virtual ClientResult GetContainerFiles(string containerId, int? limit = null, string order = null, string after = null, RequestOptions options = null); + public virtual Task GetContainerFilesAsync(string containerId, int? limit = null, string order = null, string after = null, RequestOptions options = null); + public virtual ClientResult GetContainers(int? limit = null, string order = null, string after = null, RequestOptions options = null); + public virtual Task GetContainersAsync(int? limit = null, string order = null, string after = null, RequestOptions options = null); + public virtual ClientResult RetrieveContainer(string containerId, RequestOptions options = null); + public virtual Task RetrieveContainerAsync(string containerId, RequestOptions options = null); + public virtual ClientResult RetrieveContainerFile(string containerId, string fileId, RequestOptions options = null); + public virtual Task RetrieveContainerFileAsync(string containerId, string fileId, RequestOptions options = null); + public virtual ClientResult RetrieveContainerFileContent(string containerId, string fileId, RequestOptions options = null); + public virtual Task RetrieveContainerFileContentAsync(string containerId, string fileId, RequestOptions options = null); + } + [Experimental("OPENAI001")] + public class ContainerFileListResource : IJsonModel, IPersistableModel { + public IList Data { get; } + public string FirstId { get; } + public bool HasMore { get; } + public string LastId { get; } + public string Object { get; } + protected virtual ContainerFileListResource JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options); + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options); + protected virtual ContainerFileListResource PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options); + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options); + } + [Experimental("OPENAI001")] + public class ContainerFileResource : IJsonModel, IPersistableModel { + public int Bytes { get; } + public string ContainerId { get; } + public DateTimeOffset CreatedAt { get; } + public string Id { get; } + public string Object { get; } + public string Path { get; } + public string Source { get; } + protected virtual ContainerFileResource JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options); + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options); + protected virtual ContainerFileResource PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options); + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options); + } + [Experimental("OPENAI001")] + public class ContainerListResource : IJsonModel, IPersistableModel { + public IList Data { get; } + public string FirstId { get; } + public bool HasMore { get; } + public string LastId { get; } + public string Object { get; } + protected virtual ContainerListResource JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options); + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options); + protected virtual ContainerListResource PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options); + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options); + } + [Experimental("OPENAI001")] + public class ContainerResource : IJsonModel, IPersistableModel { + public DateTimeOffset CreatedAt { get; } + public ContainerResourceExpiresAfter ExpiresAfter { get; } + public string Id { get; } + public string Name { get; } + public string Object { get; } + public string Status { get; } + protected virtual ContainerResource JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options); + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options); + protected virtual ContainerResource PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options); + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options); + } + [Experimental("OPENAI001")] + public class ContainerResourceExpiresAfter : IJsonModel, IPersistableModel { + public string Anchor { get; } + public int? Minutes { get; } + protected virtual ContainerResourceExpiresAfter JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options); + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options); + protected virtual ContainerResourceExpiresAfter PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options); + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options); + } + [Experimental("OPENAI001")] + public class CreateContainerBody : IJsonModel, IPersistableModel { + public CreateContainerBodyExpiresAfter ExpiresAfter { get; } + public IList FileIds { get; } + public string Name { get; } + protected virtual CreateContainerBody JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options); + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options); + protected virtual CreateContainerBody PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options); + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options); + } + [Experimental("OPENAI001")] + public class CreateContainerBodyExpiresAfter : IJsonModel, IPersistableModel { + public string Anchor { get; } + public int Minutes { get; } + protected virtual CreateContainerBodyExpiresAfter JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options); + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options); + protected virtual CreateContainerBodyExpiresAfter PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options); + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options); + } + [Experimental("OPENAI001")] + public class CreateContainerFileBody : IJsonModel, IPersistableModel { + public BinaryData File { get; } + public string FileId { get; } + protected virtual CreateContainerFileBody JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options); + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options); + protected virtual CreateContainerFileBody PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options); + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options); + } + [Experimental("OPENAI001")] + public class DeleteContainerFileResponse : IJsonModel, IPersistableModel { + public bool Deleted { get; } + public string Id { get; } + public string Object { get; } + protected virtual DeleteContainerFileResponse JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options); + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options); + protected virtual DeleteContainerFileResponse PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options); + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options); + } + [Experimental("OPENAI001")] + public class DeleteContainerResponse : IJsonModel, IPersistableModel { + public bool Deleted { get; } + public string Id { get; } + public string Object { get; } + protected virtual DeleteContainerResponse JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options); + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options); + protected virtual DeleteContainerResponse PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options); + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options); + } +} namespace OpenAI.Embeddings { public class EmbeddingClient { protected EmbeddingClient(); @@ -2671,6 +2812,248 @@ public class WeightsAndBiasesIntegration : FineTuningIntegration, IJsonModel, IPersistableModel { + public BinaryData BatchSize { get; set; } + public BinaryData ComputeMultiplier { get; set; } + public BinaryData EvalInterval { get; set; } + public BinaryData EvalSamples { get; set; } + public BinaryData LearningRateMultiplier { get; set; } + public BinaryData NEpochs { get; set; } + protected virtual FineTuneReinforcementHyperparameters JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options); + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options); + protected virtual FineTuneReinforcementHyperparameters PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options); + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options); + } + [Experimental("OPENAI001")] + [PersistableModelProxy(typeof(UnknownGrader))] + public class Grader : IJsonModel, IPersistableModel { + protected virtual Grader JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options); + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options); + protected virtual Grader PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options); + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options); + } + [Experimental("OPENAI001")] + public class GraderClient { + protected GraderClient(); + public GraderClient(ApiKeyCredential credential, OpenAIClientOptions options); + public GraderClient(ApiKeyCredential credential); + protected internal GraderClient(ClientPipeline pipeline, OpenAIClientOptions options); + public GraderClient(string apiKey); + public ClientPipeline Pipeline { get; } + public virtual ClientResult RunGrader(BinaryContent content, RequestOptions options = null); + public virtual Task RunGraderAsync(BinaryContent content, RequestOptions options = null); + public virtual ClientResult ValidateGrader(BinaryContent content, RequestOptions options = null); + public virtual Task ValidateGraderAsync(BinaryContent content, RequestOptions options = null); + } + [Experimental("OPENAI001")] + public class GraderLabelModel : Grader, IJsonModel, IPersistableModel { + public IList Labels { get; } + public string Model { get; set; } + public string Name { get; set; } + public IList PassingLabels { get; } + protected override Grader JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options); + protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options); + protected override Grader PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options); + protected override BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options); + } + [Experimental("OPENAI001")] + public class GraderMulti : Grader, IJsonModel, IPersistableModel { + public GraderMulti(string name, BinaryData graders, string calculateOutput); + public string CalculateOutput { get; set; } + public BinaryData Graders { get; set; } + public string Name { get; set; } + protected override Grader JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options); + protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options); + protected override Grader PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options); + protected override BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options); + } + [Experimental("OPENAI001")] + public class GraderPython : Grader, IJsonModel, IPersistableModel { + public GraderPython(string name, string source); + public string ImageTag { get; set; } + public string Name { get; set; } + public string Source { get; set; } + protected override Grader JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options); + protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options); + protected override Grader PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options); + protected override BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options); + } + [Experimental("OPENAI001")] + public class GraderScoreModel : Grader, IJsonModel, IPersistableModel { + public string Model { get; set; } + public string Name { get; set; } + public IList Range { get; } + public BinaryData SamplingParams { get; set; } + protected override Grader JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options); + protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options); + protected override Grader PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options); + protected override BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options); + } + [Experimental("OPENAI001")] + public class GraderStringCheck : Grader, IJsonModel, IPersistableModel { + public GraderStringCheck(string name, string input, string reference, GraderStringCheckOperation operation); + public string Input { get; set; } + public string Name { get; set; } + public GraderStringCheckOperation Operation { get; set; } + public string Reference { get; set; } + protected override Grader JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options); + protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options); + protected override Grader PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options); + protected override BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options); + } + [Experimental("OPENAI001")] + public readonly partial struct GraderStringCheckOperation : IEquatable { + public GraderStringCheckOperation(string value); + public static GraderStringCheckOperation Eq { get; } + public static GraderStringCheckOperation Ilike { get; } + public static GraderStringCheckOperation Like { get; } + public static GraderStringCheckOperation Ne { get; } + public readonly bool Equals(GraderStringCheckOperation other); + [EditorBrowsable(EditorBrowsableState.Never)] + public override readonly bool Equals(object obj); + [EditorBrowsable(EditorBrowsableState.Never)] + public override readonly int GetHashCode(); + public static bool operator ==(GraderStringCheckOperation left, GraderStringCheckOperation right); + public static implicit operator GraderStringCheckOperation(string value); + public static bool operator !=(GraderStringCheckOperation left, GraderStringCheckOperation right); + public override readonly string ToString(); + } + [Experimental("OPENAI001")] + public class GraderTextSimilarity : Grader, IJsonModel, IPersistableModel { + public GraderTextSimilarity(string name, string input, string reference, GraderTextSimilarityEvaluationMetric evaluationMetric); + public GraderTextSimilarityEvaluationMetric EvaluationMetric { get; set; } + public string Input { get; set; } + public string Name { get; set; } + public string Reference { get; set; } + protected override Grader JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options); + protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options); + protected override Grader PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options); + protected override BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options); + } + [Experimental("OPENAI001")] + public readonly partial struct GraderTextSimilarityEvaluationMetric : IEquatable { + public GraderTextSimilarityEvaluationMetric(string value); + public static GraderTextSimilarityEvaluationMetric Bleu { get; } + public static GraderTextSimilarityEvaluationMetric FuzzyMatch { get; } + public static GraderTextSimilarityEvaluationMetric Gleu { get; } + public static GraderTextSimilarityEvaluationMetric Meteor { get; } + public static GraderTextSimilarityEvaluationMetric Rouge1 { get; } + public static GraderTextSimilarityEvaluationMetric Rouge2 { get; } + public static GraderTextSimilarityEvaluationMetric Rouge3 { get; } + public static GraderTextSimilarityEvaluationMetric Rouge4 { get; } + public static GraderTextSimilarityEvaluationMetric Rouge5 { get; } + public static GraderTextSimilarityEvaluationMetric RougeL { get; } + public readonly bool Equals(GraderTextSimilarityEvaluationMetric other); + [EditorBrowsable(EditorBrowsableState.Never)] + public override readonly bool Equals(object obj); + [EditorBrowsable(EditorBrowsableState.Never)] + public override readonly int GetHashCode(); + public static bool operator ==(GraderTextSimilarityEvaluationMetric left, GraderTextSimilarityEvaluationMetric right); + public static implicit operator GraderTextSimilarityEvaluationMetric(string value); + public static bool operator !=(GraderTextSimilarityEvaluationMetric left, GraderTextSimilarityEvaluationMetric right); + public override readonly string ToString(); + } + [Experimental("OPENAI001")] + public readonly partial struct GraderType : IEquatable { + public GraderType(string value); + public static GraderType LabelModel { get; } + public static GraderType Multi { get; } + public static GraderType Python { get; } + public static GraderType ScoreModel { get; } + public static GraderType StringCheck { get; } + public static GraderType TextSimilarity { get; } + public readonly bool Equals(GraderType other); + [EditorBrowsable(EditorBrowsableState.Never)] + public override readonly bool Equals(object obj); + [EditorBrowsable(EditorBrowsableState.Never)] + public override readonly int GetHashCode(); + public static bool operator ==(GraderType left, GraderType right); + public static implicit operator GraderType(string value); + public static bool operator !=(GraderType left, GraderType right); + public override readonly string ToString(); + } + [Experimental("OPENAI001")] + public class RunGraderRequest : IJsonModel, IPersistableModel { + public BinaryData Grader { get; } + public BinaryData Item { get; } + public string ModelSample { get; } + protected virtual RunGraderRequest JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options); + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options); + protected virtual RunGraderRequest PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options); + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options); + } + [Experimental("OPENAI001")] + public class RunGraderResponse : IJsonModel, IPersistableModel { + public RunGraderResponseMetadata Metadata { get; } + public BinaryData ModelGraderTokenUsagePerModel { get; } + public float Reward { get; } + public BinaryData SubRewards { get; } + protected virtual RunGraderResponse JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options); + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options); + protected virtual RunGraderResponse PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options); + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options); + } + [Experimental("OPENAI001")] + public class RunGraderResponseMetadata : IJsonModel, IPersistableModel { + public RunGraderResponseMetadataErrors Errors { get; } + public float ExecutionTime { get; } + public string Kind { get; } + public string Name { get; } + public string SampledModelName { get; } + public BinaryData Scores { get; } + public int? TokenUsage { get; } + protected virtual RunGraderResponseMetadata JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options); + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options); + protected virtual RunGraderResponseMetadata PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options); + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options); + } + [Experimental("OPENAI001")] + public class RunGraderResponseMetadataErrors : IJsonModel, IPersistableModel { + public bool FormulaParseError { get; } + public bool InvalidVariableError { get; } + public bool ModelGraderParseError { get; } + public bool ModelGraderRefusalError { get; } + public bool ModelGraderServerError { get; } + public string ModelGraderServerErrorDetails { get; } + public bool OtherError { get; } + public bool PythonGraderRuntimeError { get; } + public string PythonGraderRuntimeErrorDetails { get; } + public bool PythonGraderServerError { get; } + public string PythonGraderServerErrorType { get; } + public bool SampleParseError { get; } + public bool TruncatedObservationError { get; } + public bool UnresponsiveRewardError { get; } + protected virtual RunGraderResponseMetadataErrors JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options); + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options); + protected virtual RunGraderResponseMetadataErrors PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options); + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options); + } + [Experimental("OPENAI001")] + public class UnknownGrader : Grader, IJsonModel, IPersistableModel { + protected override Grader JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options); + protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options); + protected override Grader PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options); + protected override BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options); + } + [Experimental("OPENAI001")] + public class ValidateGraderRequest : IJsonModel, IPersistableModel { + public BinaryData Grader { get; } + protected virtual ValidateGraderRequest JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options); + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options); + protected virtual ValidateGraderRequest PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options); + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options); + } + [Experimental("OPENAI001")] + public class ValidateGraderResponse : IJsonModel, IPersistableModel { + public BinaryData Grader { get; } + protected virtual ValidateGraderResponse JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options); + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options); + protected virtual ValidateGraderResponse PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options); + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options); + } +} namespace OpenAI.Images { public class GeneratedImage : IJsonModel, IPersistableModel { public BinaryData ImageBytes { get; } diff --git a/api/OpenAI.netstandard2.0.cs b/api/OpenAI.netstandard2.0.cs index aa9102db7..6bc30b3cf 100644 --- a/api/OpenAI.netstandard2.0.cs +++ b/api/OpenAI.netstandard2.0.cs @@ -10,9 +10,11 @@ public class OpenAIClient { public virtual AudioClient GetAudioClient(string model); public virtual BatchClient GetBatchClient(); public virtual ChatClient GetChatClient(string model); + public virtual Containers.ContainerClient GetContainerClient(); public virtual EmbeddingClient GetEmbeddingClient(string model); public virtual EvaluationClient GetEvaluationClient(); public virtual FineTuningClient GetFineTuningClient(); + public virtual Graders.GraderClient GetGraderClient(); public virtual ImageClient GetImageClient(string model); public virtual ModerationClient GetModerationClient(string model); public virtual OpenAIFileClient GetOpenAIFileClient(); @@ -1816,6 +1818,132 @@ public class UserChatMessage : ChatMessage, IJsonModel, IPersis protected override BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options); } } +namespace OpenAI.Containers { + public class ContainerClient { + protected ContainerClient(); + public ContainerClient(ApiKeyCredential credential, OpenAIClientOptions options); + public ContainerClient(ApiKeyCredential credential); + protected internal ContainerClient(ClientPipeline pipeline, OpenAIClientOptions options); + public ContainerClient(string apiKey); + public ClientPipeline Pipeline { get; } + public virtual ClientResult CreateContainer(BinaryContent content, RequestOptions options = null); + public virtual Task CreateContainerAsync(BinaryContent content, RequestOptions options = null); + public virtual ClientResult CreateContainerFile(string containerId, BinaryContent content, string contentType, RequestOptions options = null); + public virtual Task CreateContainerFileAsync(string containerId, BinaryContent content, string contentType, RequestOptions options = null); + public virtual ClientResult DeleteContainer(string containerId, RequestOptions options = null); + public virtual Task DeleteContainerAsync(string containerId, RequestOptions options = null); + public virtual ClientResult DeleteContainerFile(string containerId, string fileId, RequestOptions options = null); + public virtual Task DeleteContainerFileAsync(string containerId, string fileId, RequestOptions options = null); + public virtual ClientResult GetContainerFiles(string containerId, int? limit = null, string order = null, string after = null, RequestOptions options = null); + public virtual Task GetContainerFilesAsync(string containerId, int? limit = null, string order = null, string after = null, RequestOptions options = null); + public virtual ClientResult GetContainers(int? limit = null, string order = null, string after = null, RequestOptions options = null); + public virtual Task GetContainersAsync(int? limit = null, string order = null, string after = null, RequestOptions options = null); + public virtual ClientResult RetrieveContainer(string containerId, RequestOptions options = null); + public virtual Task RetrieveContainerAsync(string containerId, RequestOptions options = null); + public virtual ClientResult RetrieveContainerFile(string containerId, string fileId, RequestOptions options = null); + public virtual Task RetrieveContainerFileAsync(string containerId, string fileId, RequestOptions options = null); + public virtual ClientResult RetrieveContainerFileContent(string containerId, string fileId, RequestOptions options = null); + public virtual Task RetrieveContainerFileContentAsync(string containerId, string fileId, RequestOptions options = null); + } + public class ContainerFileListResource : IJsonModel, IPersistableModel { + public IList Data { get; } + public string FirstId { get; } + public bool HasMore { get; } + public string LastId { get; } + public string Object { get; } + protected virtual ContainerFileListResource JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options); + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options); + protected virtual ContainerFileListResource PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options); + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options); + } + public class ContainerFileResource : IJsonModel, IPersistableModel { + public int Bytes { get; } + public string ContainerId { get; } + public DateTimeOffset CreatedAt { get; } + public string Id { get; } + public string Object { get; } + public string Path { get; } + public string Source { get; } + protected virtual ContainerFileResource JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options); + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options); + protected virtual ContainerFileResource PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options); + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options); + } + public class ContainerListResource : IJsonModel, IPersistableModel { + public IList Data { get; } + public string FirstId { get; } + public bool HasMore { get; } + public string LastId { get; } + public string Object { get; } + protected virtual ContainerListResource JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options); + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options); + protected virtual ContainerListResource PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options); + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options); + } + public class ContainerResource : IJsonModel, IPersistableModel { + public DateTimeOffset CreatedAt { get; } + public ContainerResourceExpiresAfter ExpiresAfter { get; } + public string Id { get; } + public string Name { get; } + public string Object { get; } + public string Status { get; } + protected virtual ContainerResource JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options); + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options); + protected virtual ContainerResource PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options); + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options); + } + public class ContainerResourceExpiresAfter : IJsonModel, IPersistableModel { + public string Anchor { get; } + public int? Minutes { get; } + protected virtual ContainerResourceExpiresAfter JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options); + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options); + protected virtual ContainerResourceExpiresAfter PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options); + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options); + } + public class CreateContainerBody : IJsonModel, IPersistableModel { + public CreateContainerBodyExpiresAfter ExpiresAfter { get; } + public IList FileIds { get; } + public string Name { get; } + protected virtual CreateContainerBody JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options); + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options); + protected virtual CreateContainerBody PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options); + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options); + } + public class CreateContainerBodyExpiresAfter : IJsonModel, IPersistableModel { + public string Anchor { get; } + public int Minutes { get; } + protected virtual CreateContainerBodyExpiresAfter JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options); + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options); + protected virtual CreateContainerBodyExpiresAfter PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options); + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options); + } + public class CreateContainerFileBody : IJsonModel, IPersistableModel { + public BinaryData File { get; } + public string FileId { get; } + protected virtual CreateContainerFileBody JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options); + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options); + protected virtual CreateContainerFileBody PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options); + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options); + } + public class DeleteContainerFileResponse : IJsonModel, IPersistableModel { + public bool Deleted { get; } + public string Id { get; } + public string Object { get; } + protected virtual DeleteContainerFileResponse JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options); + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options); + protected virtual DeleteContainerFileResponse PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options); + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options); + } + public class DeleteContainerResponse : IJsonModel, IPersistableModel { + public bool Deleted { get; } + public string Id { get; } + public string Object { get; } + protected virtual DeleteContainerResponse JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options); + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options); + protected virtual DeleteContainerResponse PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options); + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options); + } +} namespace OpenAI.Embeddings { public class EmbeddingClient { protected EmbeddingClient(); @@ -2328,6 +2456,229 @@ public class WeightsAndBiasesIntegration : FineTuningIntegration, IJsonModel, IPersistableModel { + public BinaryData BatchSize { get; set; } + public BinaryData ComputeMultiplier { get; set; } + public BinaryData EvalInterval { get; set; } + public BinaryData EvalSamples { get; set; } + public BinaryData LearningRateMultiplier { get; set; } + public BinaryData NEpochs { get; set; } + protected virtual FineTuneReinforcementHyperparameters JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options); + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options); + protected virtual FineTuneReinforcementHyperparameters PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options); + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options); + } + [PersistableModelProxy(typeof(UnknownGrader))] + public class Grader : IJsonModel, IPersistableModel { + protected virtual Grader JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options); + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options); + protected virtual Grader PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options); + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options); + } + public class GraderClient { + protected GraderClient(); + public GraderClient(ApiKeyCredential credential, OpenAIClientOptions options); + public GraderClient(ApiKeyCredential credential); + protected internal GraderClient(ClientPipeline pipeline, OpenAIClientOptions options); + public GraderClient(string apiKey); + public ClientPipeline Pipeline { get; } + public virtual ClientResult RunGrader(BinaryContent content, RequestOptions options = null); + public virtual Task RunGraderAsync(BinaryContent content, RequestOptions options = null); + public virtual ClientResult ValidateGrader(BinaryContent content, RequestOptions options = null); + public virtual Task ValidateGraderAsync(BinaryContent content, RequestOptions options = null); + } + public class GraderLabelModel : Grader, IJsonModel, IPersistableModel { + public IList Labels { get; } + public string Model { get; set; } + public string Name { get; set; } + public IList PassingLabels { get; } + protected override Grader JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options); + protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options); + protected override Grader PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options); + protected override BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options); + } + public class GraderMulti : Grader, IJsonModel, IPersistableModel { + public GraderMulti(string name, BinaryData graders, string calculateOutput); + public string CalculateOutput { get; set; } + public BinaryData Graders { get; set; } + public string Name { get; set; } + protected override Grader JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options); + protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options); + protected override Grader PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options); + protected override BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options); + } + public class GraderPython : Grader, IJsonModel, IPersistableModel { + public GraderPython(string name, string source); + public string ImageTag { get; set; } + public string Name { get; set; } + public string Source { get; set; } + protected override Grader JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options); + protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options); + protected override Grader PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options); + protected override BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options); + } + public class GraderScoreModel : Grader, IJsonModel, IPersistableModel { + public string Model { get; set; } + public string Name { get; set; } + public IList Range { get; } + public BinaryData SamplingParams { get; set; } + protected override Grader JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options); + protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options); + protected override Grader PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options); + protected override BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options); + } + public class GraderStringCheck : Grader, IJsonModel, IPersistableModel { + public GraderStringCheck(string name, string input, string reference, GraderStringCheckOperation operation); + public string Input { get; set; } + public string Name { get; set; } + public GraderStringCheckOperation Operation { get; set; } + public string Reference { get; set; } + protected override Grader JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options); + protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options); + protected override Grader PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options); + protected override BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options); + } + public readonly partial struct GraderStringCheckOperation : IEquatable { + public GraderStringCheckOperation(string value); + public static GraderStringCheckOperation Eq { get; } + public static GraderStringCheckOperation Ilike { get; } + public static GraderStringCheckOperation Like { get; } + public static GraderStringCheckOperation Ne { get; } + public readonly bool Equals(GraderStringCheckOperation other); + [EditorBrowsable(EditorBrowsableState.Never)] + public override readonly bool Equals(object obj); + [EditorBrowsable(EditorBrowsableState.Never)] + public override readonly int GetHashCode(); + public static bool operator ==(GraderStringCheckOperation left, GraderStringCheckOperation right); + public static implicit operator GraderStringCheckOperation(string value); + public static bool operator !=(GraderStringCheckOperation left, GraderStringCheckOperation right); + public override readonly string ToString(); + } + public class GraderTextSimilarity : Grader, IJsonModel, IPersistableModel { + public GraderTextSimilarity(string name, string input, string reference, GraderTextSimilarityEvaluationMetric evaluationMetric); + public GraderTextSimilarityEvaluationMetric EvaluationMetric { get; set; } + public string Input { get; set; } + public string Name { get; set; } + public string Reference { get; set; } + protected override Grader JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options); + protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options); + protected override Grader PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options); + protected override BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options); + } + public readonly partial struct GraderTextSimilarityEvaluationMetric : IEquatable { + public GraderTextSimilarityEvaluationMetric(string value); + public static GraderTextSimilarityEvaluationMetric Bleu { get; } + public static GraderTextSimilarityEvaluationMetric FuzzyMatch { get; } + public static GraderTextSimilarityEvaluationMetric Gleu { get; } + public static GraderTextSimilarityEvaluationMetric Meteor { get; } + public static GraderTextSimilarityEvaluationMetric Rouge1 { get; } + public static GraderTextSimilarityEvaluationMetric Rouge2 { get; } + public static GraderTextSimilarityEvaluationMetric Rouge3 { get; } + public static GraderTextSimilarityEvaluationMetric Rouge4 { get; } + public static GraderTextSimilarityEvaluationMetric Rouge5 { get; } + public static GraderTextSimilarityEvaluationMetric RougeL { get; } + public readonly bool Equals(GraderTextSimilarityEvaluationMetric other); + [EditorBrowsable(EditorBrowsableState.Never)] + public override readonly bool Equals(object obj); + [EditorBrowsable(EditorBrowsableState.Never)] + public override readonly int GetHashCode(); + public static bool operator ==(GraderTextSimilarityEvaluationMetric left, GraderTextSimilarityEvaluationMetric right); + public static implicit operator GraderTextSimilarityEvaluationMetric(string value); + public static bool operator !=(GraderTextSimilarityEvaluationMetric left, GraderTextSimilarityEvaluationMetric right); + public override readonly string ToString(); + } + public readonly partial struct GraderType : IEquatable { + public GraderType(string value); + public static GraderType LabelModel { get; } + public static GraderType Multi { get; } + public static GraderType Python { get; } + public static GraderType ScoreModel { get; } + public static GraderType StringCheck { get; } + public static GraderType TextSimilarity { get; } + public readonly bool Equals(GraderType other); + [EditorBrowsable(EditorBrowsableState.Never)] + public override readonly bool Equals(object obj); + [EditorBrowsable(EditorBrowsableState.Never)] + public override readonly int GetHashCode(); + public static bool operator ==(GraderType left, GraderType right); + public static implicit operator GraderType(string value); + public static bool operator !=(GraderType left, GraderType right); + public override readonly string ToString(); + } + public class RunGraderRequest : IJsonModel, IPersistableModel { + public BinaryData Grader { get; } + public BinaryData Item { get; } + public string ModelSample { get; } + protected virtual RunGraderRequest JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options); + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options); + protected virtual RunGraderRequest PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options); + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options); + } + public class RunGraderResponse : IJsonModel, IPersistableModel { + public RunGraderResponseMetadata Metadata { get; } + public BinaryData ModelGraderTokenUsagePerModel { get; } + public float Reward { get; } + public BinaryData SubRewards { get; } + protected virtual RunGraderResponse JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options); + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options); + protected virtual RunGraderResponse PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options); + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options); + } + public class RunGraderResponseMetadata : IJsonModel, IPersistableModel { + public RunGraderResponseMetadataErrors Errors { get; } + public float ExecutionTime { get; } + public string Kind { get; } + public string Name { get; } + public string SampledModelName { get; } + public BinaryData Scores { get; } + public int? TokenUsage { get; } + protected virtual RunGraderResponseMetadata JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options); + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options); + protected virtual RunGraderResponseMetadata PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options); + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options); + } + public class RunGraderResponseMetadataErrors : IJsonModel, IPersistableModel { + public bool FormulaParseError { get; } + public bool InvalidVariableError { get; } + public bool ModelGraderParseError { get; } + public bool ModelGraderRefusalError { get; } + public bool ModelGraderServerError { get; } + public string ModelGraderServerErrorDetails { get; } + public bool OtherError { get; } + public bool PythonGraderRuntimeError { get; } + public string PythonGraderRuntimeErrorDetails { get; } + public bool PythonGraderServerError { get; } + public string PythonGraderServerErrorType { get; } + public bool SampleParseError { get; } + public bool TruncatedObservationError { get; } + public bool UnresponsiveRewardError { get; } + protected virtual RunGraderResponseMetadataErrors JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options); + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options); + protected virtual RunGraderResponseMetadataErrors PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options); + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options); + } + public class UnknownGrader : Grader, IJsonModel, IPersistableModel { + protected override Grader JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options); + protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options); + protected override Grader PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options); + protected override BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options); + } + public class ValidateGraderRequest : IJsonModel, IPersistableModel { + public BinaryData Grader { get; } + protected virtual ValidateGraderRequest JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options); + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options); + protected virtual ValidateGraderRequest PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options); + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options); + } + public class ValidateGraderResponse : IJsonModel, IPersistableModel { + public BinaryData Grader { get; } + protected virtual ValidateGraderResponse JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options); + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options); + protected virtual ValidateGraderResponse PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options); + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options); + } +} namespace OpenAI.Images { public class GeneratedImage : IJsonModel, IPersistableModel { public BinaryData ImageBytes { get; } diff --git a/specification/client/containers.client.tsp b/specification/client/containers.client.tsp new file mode 100644 index 000000000..c4bbef5cc --- /dev/null +++ b/specification/client/containers.client.tsp @@ -0,0 +1,15 @@ +import "../base/typespec/containers/main.tsp"; +import "@azure-tools/typespec-client-generator-core"; + +using OpenAI; +using Azure.ClientGenerator.Core; + +@@convenientAPI(Containers.listContainers, false); +@@convenientAPI(Containers.createContainer, false); +@@convenientAPI(Containers.retrieveContainer, false); +@@convenientAPI(Containers.deleteContainer, false); +@@convenientAPI(Containers.createContainerFile, false); +@@convenientAPI(Containers.listContainerFiles, false); +@@convenientAPI(Containers.retrieveContainerFile, false); +@@convenientAPI(Containers.deleteContainerFile, false); +@@convenientAPI(Containers.retrieveContainerFileContent, false); \ No newline at end of file diff --git a/specification/client/graders.client.tsp b/specification/client/graders.client.tsp new file mode 100644 index 000000000..9d52ac63b --- /dev/null +++ b/specification/client/graders.client.tsp @@ -0,0 +1,8 @@ +import "../base/typespec/graders/main.tsp"; +import "@azure-tools/typespec-client-generator-core"; + +using OpenAI; +using Azure.ClientGenerator.Core; + +@@convenientAPI(Graders.runGrader, false); +@@convenientAPI(Graders.validateGrader, false); \ No newline at end of file diff --git a/specification/main.tsp b/specification/main.tsp index db5d7d3b9..1fdae54ce 100644 --- a/specification/main.tsp +++ b/specification/main.tsp @@ -11,6 +11,8 @@ import "./client/moderations.client.tsp"; import "./client/runs.client.tsp"; import "./client/threads.client.tsp"; import "./client/vector-stores.client.tsp"; +import "./client/graders.client.tsp"; +import "./client/containers.client.tsp"; import "./client/models/audio.models.tsp"; import "./client/models/common.models.tsp"; diff --git a/src/Custom/Containers/ContainerClient.cs b/src/Custom/Containers/ContainerClient.cs index de10530ea..3f93ef9ca 100644 --- a/src/Custom/Containers/ContainerClient.cs +++ b/src/Custom/Containers/ContainerClient.cs @@ -1,3 +1,4 @@ +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Diagnostics.CodeAnalysis; @@ -6,7 +7,58 @@ namespace OpenAI.Containers; [CodeGenType("Containers")] -internal partial class ContainerClient +[CodeGenSuppress("ContainerClient", typeof(ClientPipeline), typeof(Uri))] +public partial class ContainerClient { + // CUSTOM: Added as a convenience. + /// Initializes a new instance of . + /// The API key to authenticate with the service. + /// is null. + public ContainerClient(string apiKey) : this(new ApiKeyCredential(apiKey), new OpenAIClientOptions()) + { + } + + // CUSTOM: + // - Used a custom pipeline. + // - Demoted the endpoint parameter to be a property in the options class. + /// Initializes a new instance of . + /// The API key to authenticate with the service. + /// is null. + public ContainerClient(ApiKeyCredential credential) : this(credential, new OpenAIClientOptions()) + { + } + + // CUSTOM: + // - Used a custom pipeline. + // - Demoted the endpoint parameter to be a property in the options class. + /// Initializes a new instance of . + /// The API key to authenticate with the service. + /// The options to configure the client. + /// is null. + public ContainerClient(ApiKeyCredential credential, OpenAIClientOptions options) + { + Argument.AssertNotNull(credential, nameof(credential)); + options ??= new OpenAIClientOptions(); + + Pipeline = OpenAIClient.CreatePipeline(credential, options); + _endpoint = OpenAIClient.GetEndpoint(options); + } + + // CUSTOM: + // - Used a custom pipeline. + // - Demoted the endpoint parameter to be a property in the options class. + // - Made protected. + /// Initializes a new instance of . + /// The HTTP pipeline to send and receive REST requests and responses. + /// The options to configure the client. + /// is null. + protected internal ContainerClient(ClientPipeline pipeline, OpenAIClientOptions options) + { + Argument.AssertNotNull(pipeline, nameof(pipeline)); + options ??= new OpenAIClientOptions(); + + Pipeline = pipeline; + _endpoint = OpenAIClient.GetEndpoint(options); + } } diff --git a/src/Custom/Containers/GeneratorStubs.cs b/src/Custom/Containers/GeneratorStubs.cs new file mode 100644 index 000000000..a80297f2f --- /dev/null +++ b/src/Custom/Containers/GeneratorStubs.cs @@ -0,0 +1,12 @@ +namespace OpenAI.Containers; + +[CodeGenType("ContainerListResource")] public partial class ContainerListResource { } +[CodeGenType("ContainerResource")] public partial class ContainerResource { } +[CodeGenType("ContainerResourceExpiresAfter")] public partial class ContainerResourceExpiresAfter { } +[CodeGenType("CreateContainerBody")] public partial class CreateContainerBody { } +[CodeGenType("CreateContainerBodyExpiresAfter")] public partial class CreateContainerBodyExpiresAfter { } +[CodeGenType("DeleteContainerResponse")] public partial class DeleteContainerResponse { } +[CodeGenType("CreateContainerFileBody")] public partial class CreateContainerFileBody { } +[CodeGenType("ContainerFileResource")] public partial class ContainerFileResource { } +[CodeGenType("ContainerFileListResource")] public partial class ContainerFileListResource { } +[CodeGenType("DeleteContainerFileResponse")] public partial class DeleteContainerFileResponse { } diff --git a/src/Custom/Containers/Internal/GeneratorStubs.cs b/src/Custom/Containers/Internal/GeneratorStubs.cs deleted file mode 100644 index 622c7c90c..000000000 --- a/src/Custom/Containers/Internal/GeneratorStubs.cs +++ /dev/null @@ -1,87 +0,0 @@ -using System.ClientModel; -using System.ClientModel.Primitives; -using System.Diagnostics.CodeAnalysis; -using System.Text.Json; - -namespace OpenAI.Containers; - -[CodeGenType("ContainerListResourceObject")] internal readonly partial struct InternalContainerListResourceObject {} -[CodeGenType("ContainerResourceExpiresAfterAnchor")] internal readonly partial struct InternalContainerResourceExpiresAfterAnchor {} -[CodeGenType("CreateContainerBodyExpiresAfterAnchor")] internal readonly partial struct InternalCreateContainerBodyExpiresAfterAnchor {} -[CodeGenType("DeleteContainerResponseObject")] internal readonly partial struct InternalDeleteContainerResponseObject {} -[CodeGenType("ContainerFileListResourceObject")] internal readonly partial struct InternalContainerFileListResourceObject {} -[CodeGenType("DeleteContainerFileResponseObject")] internal readonly partial struct InternalDeleteContainerFileResponseObject {} -[CodeGenType("ContainerListResource")] -internal partial class InternalContainerListResource -{ - public static explicit operator InternalContainerListResource(ClientResult result) - { - using PipelineResponse response = result.GetRawResponse(); - using JsonDocument document = JsonDocument.Parse(response.Content); - return DeserializeInternalContainerListResource(document.RootElement, ModelSerializationExtensions.WireOptions); - } -} -[CodeGenType("ContainerResource")] -internal partial class InternalContainerResource -{ - public static explicit operator InternalContainerResource(ClientResult result) - { - using PipelineResponse response = result.GetRawResponse(); - using JsonDocument document = JsonDocument.Parse(response.Content); - return DeserializeInternalContainerResource(document.RootElement, ModelSerializationExtensions.WireOptions); - } -} -[CodeGenType("ContainerResourceExpiresAfter")] internal partial class InternalContainerResourceExpiresAfter {} -[CodeGenType("CreateContainerBody")] internal partial class InternalCreateContainerBody -{ - public static implicit operator BinaryContent(InternalCreateContainerBody internalCreateContainerBody) - { - if (internalCreateContainerBody == null) - { - return null; - } - return BinaryContent.Create(internalCreateContainerBody, ModelSerializationExtensions.WireOptions); - } -} -[CodeGenType("CreateContainerBodyExpiresAfter")] internal partial class InternalCreateContainerBodyExpiresAfter {} -[CodeGenType("DeleteContainerResponse")] -internal partial class InternalDeleteContainerResponse -{ - public static explicit operator InternalDeleteContainerResponse(ClientResult result) - { - using PipelineResponse response = result.GetRawResponse(); - using JsonDocument document = JsonDocument.Parse(response.Content); - return DeserializeInternalDeleteContainerResponse(document.RootElement, ModelSerializationExtensions.WireOptions); - } -} -[CodeGenType("CreateContainerFileBody")] internal partial class InternalCreateContainerFileBody {} -[CodeGenType("ContainerFileResource")] -internal partial class InternalContainerFileResource -{ - public static explicit operator InternalContainerFileResource(ClientResult result) - { - using PipelineResponse response = result.GetRawResponse(); - using JsonDocument document = JsonDocument.Parse(response.Content); - return DeserializeInternalContainerFileResource(document.RootElement, ModelSerializationExtensions.WireOptions); - } -} -[CodeGenType("ContainerFileListResource")] -internal partial class InternalContainerFileListResource -{ - public static explicit operator InternalContainerFileListResource(ClientResult result) - { - using PipelineResponse response = result.GetRawResponse(); - using JsonDocument document = JsonDocument.Parse(response.Content); - return DeserializeInternalContainerFileListResource(document.RootElement, ModelSerializationExtensions.WireOptions); - } -} -[CodeGenType("DeleteContainerFileResponse")] -internal partial class InternalDeleteContainerFileResponse -{ - public static explicit operator InternalDeleteContainerFileResponse(ClientResult result) - { - using PipelineResponse response = result.GetRawResponse(); - using JsonDocument document = JsonDocument.Parse(response.Content); - return DeserializeInternalDeleteContainerFileResponse(document.RootElement, ModelSerializationExtensions.WireOptions); - } -} \ No newline at end of file diff --git a/src/Custom/Graders/GeneratorStubs.cs b/src/Custom/Graders/GeneratorStubs.cs new file mode 100644 index 000000000..325f94b74 --- /dev/null +++ b/src/Custom/Graders/GeneratorStubs.cs @@ -0,0 +1,20 @@ +namespace OpenAI.Graders; + +[CodeGenType("GraderStringCheckOperation")] public readonly partial struct GraderStringCheckOperation { } +[CodeGenType("GraderType")] public readonly partial struct GraderType { } +[CodeGenType("GraderTextSimilarityEvaluationMetric")] public readonly partial struct GraderTextSimilarityEvaluationMetric { } +[CodeGenType("GraderStringCheck")] public partial class GraderStringCheck { } +[CodeGenType("Grader")] public partial class Grader { } +[CodeGenType("UnknownGrader")] public partial class UnknownGrader { } +[CodeGenType("GraderLabelModel")] public partial class GraderLabelModel { } +[CodeGenType("GraderTextSimilarity")] public partial class GraderTextSimilarity { } +[CodeGenType("GraderPython")] public partial class GraderPython { } +[CodeGenType("GraderScoreModel")] public partial class GraderScoreModel { } +[CodeGenType("GraderMulti")] public partial class GraderMulti { } +[CodeGenType("FineTuneReinforcementHyperparameters")] public partial class FineTuneReinforcementHyperparameters { } +[CodeGenType("RunGraderRequest")] public partial class RunGraderRequest { } +[CodeGenType("RunGraderResponse")] public partial class RunGraderResponse { } +[CodeGenType("RunGraderResponseMetadata")] public partial class RunGraderResponseMetadata { } +[CodeGenType("RunGraderResponseMetadataErrors")] public partial class RunGraderResponseMetadataErrors { } +[CodeGenType("ValidateGraderRequest")] public partial class ValidateGraderRequest { } +[CodeGenType("ValidateGraderResponse")] public partial class ValidateGraderResponse { } diff --git a/src/Custom/Graders/GraderClient.cs b/src/Custom/Graders/GraderClient.cs index 7378fce20..3b3fd22a7 100644 --- a/src/Custom/Graders/GraderClient.cs +++ b/src/Custom/Graders/GraderClient.cs @@ -1,3 +1,4 @@ +using System; using System.ClientModel; using System.ClientModel.Primitives; using System.Diagnostics.CodeAnalysis; @@ -6,7 +7,57 @@ namespace OpenAI.Graders; [CodeGenType("Graders")] -internal partial class GraderClient +[CodeGenSuppress("GraderClient", typeof(ClientPipeline), typeof(Uri))] +public partial class GraderClient { + // CUSTOM: Added as a convenience. + /// Initializes a new instance of . + /// The API key to authenticate with the service. + /// is null. + public GraderClient(string apiKey) : this(new ApiKeyCredential(apiKey), new OpenAIClientOptions()) + { + } + // CUSTOM: + // - Used a custom pipeline. + // - Demoted the endpoint parameter to be a property in the options class. + /// Initializes a new instance of . + /// The API key to authenticate with the service. + /// is null. + public GraderClient(ApiKeyCredential credential) : this(credential, new OpenAIClientOptions()) + { + } + + // CUSTOM: + // - Used a custom pipeline. + // - Demoted the endpoint parameter to be a property in the options class. + /// Initializes a new instance of . + /// The API key to authenticate with the service. + /// The options to configure the client. + /// is null. + public GraderClient(ApiKeyCredential credential, OpenAIClientOptions options) + { + Argument.AssertNotNull(credential, nameof(credential)); + options ??= new OpenAIClientOptions(); + + Pipeline = OpenAIClient.CreatePipeline(credential, options); + _endpoint = OpenAIClient.GetEndpoint(options); + } + + // CUSTOM: + // - Used a custom pipeline. + // - Demoted the endpoint parameter to be a property in the options class. + // - Made protected. + /// Initializes a new instance of . + /// The HTTP pipeline to send and receive REST requests and responses. + /// The options to configure the client. + /// is null. + protected internal GraderClient(ClientPipeline pipeline, OpenAIClientOptions options) + { + Argument.AssertNotNull(pipeline, nameof(pipeline)); + options ??= new OpenAIClientOptions(); + + Pipeline = pipeline; + _endpoint = OpenAIClient.GetEndpoint(options); + } } diff --git a/src/Custom/Graders/Internal/GeneratorStubs.cs b/src/Custom/Graders/Internal/GeneratorStubs.cs deleted file mode 100644 index 92445a65c..000000000 --- a/src/Custom/Graders/Internal/GeneratorStubs.cs +++ /dev/null @@ -1,81 +0,0 @@ -using OpenAI.Containers; -using System.ClientModel; -using System.ClientModel.Primitives; -using System.Diagnostics.CodeAnalysis; -using System.Text.Json; - -namespace OpenAI.Graders; - -[Experimental("OPENAI002")][CodeGenType("GraderStringCheckOperation")] internal readonly partial struct InternalGraderStringCheckOperation {} -[Experimental("OPENAI002")][CodeGenType("GraderType")] internal readonly partial struct InternalGraderType {} -[Experimental("OPENAI002")][CodeGenType("GraderTextSimilarityEvaluationMetric")] internal readonly partial struct InternalGraderTextSimilarityEvaluationMetric {} -[CodeGenType("GraderStringCheck")] internal partial class InternalGraderStringCheck {} -[CodeGenType("Grader")] internal partial class InternalGrader {} -[CodeGenType("UnknownGrader")] internal partial class InternalUnknownGrader {} -[CodeGenType("GraderLabelModel")] internal partial class InternalGraderLabelModel {} -[CodeGenType("GraderTextSimilarity")] internal partial class InternalGraderTextSimilarity {} -[CodeGenType("GraderPython")] internal partial class InternalGraderPython {} -[CodeGenType("GraderScoreModel")] internal partial class InternalGraderScoreModel {} -[CodeGenType("GraderMulti")] internal partial class InternalGraderMulti {} -[CodeGenType("FineTuneReinforcementHyperparameters")] internal partial class InternalFineTuneReinforcementHyperparameters { } - -[CodeGenType("RunGraderRequest")] -internal partial class InternalRunGraderRequest -{ - public static implicit operator BinaryContent(InternalRunGraderRequest internalRunGraderRequest) - { - if (internalRunGraderRequest == null) - { - return null; - } - return BinaryContent.Create(internalRunGraderRequest, ModelSerializationExtensions.WireOptions); - } - - public static explicit operator InternalRunGraderRequest(ClientResult result) - { - using PipelineResponse response = result.GetRawResponse(); - using JsonDocument document = JsonDocument.Parse(response.Content); - return DeserializeInternalRunGraderRequest(document.RootElement, ModelSerializationExtensions.WireOptions); - } -} -[CodeGenType("RunGraderResponse")] -internal partial class InternalRunGraderResponse -{ - public static explicit operator InternalRunGraderResponse(ClientResult result) - { - using PipelineResponse response = result.GetRawResponse(); - using JsonDocument document = JsonDocument.Parse(response.Content); - return DeserializeInternalRunGraderResponse(document.RootElement, ModelSerializationExtensions.WireOptions); - } -} -[CodeGenType("RunGraderResponseMetadata")] internal partial class InternalRunGraderResponseMetadata {} -[CodeGenType("RunGraderResponseMetadataErrors")] internal partial class InternalRunGraderResponseMetadataErrors {} -[CodeGenType("ValidateGraderRequest")] -internal partial class InternalValidateGraderRequest -{ - public static implicit operator BinaryContent(InternalValidateGraderRequest internalValidateGraderRequest) - { - if (internalValidateGraderRequest == null) - { - return null; - } - return BinaryContent.Create(internalValidateGraderRequest, ModelSerializationExtensions.WireOptions); - } - - public static explicit operator InternalValidateGraderRequest(ClientResult result) - { - using PipelineResponse response = result.GetRawResponse(); - using JsonDocument document = JsonDocument.Parse(response.Content); - return DeserializeInternalValidateGraderRequest(document.RootElement, ModelSerializationExtensions.WireOptions); - } -} -[CodeGenType("ValidateGraderResponse")] -internal partial class InternalValidateGraderResponse -{ - public static explicit operator InternalValidateGraderResponse(ClientResult result) - { - using PipelineResponse response = result.GetRawResponse(); - using JsonDocument document = JsonDocument.Parse(response.Content); - return DeserializeInternalValidateGraderResponse(document.RootElement, ModelSerializationExtensions.WireOptions); - } -} diff --git a/src/Custom/OpenAIClient.cs b/src/Custom/OpenAIClient.cs index d28d728e3..b3b724c9e 100644 --- a/src/Custom/OpenAIClient.cs +++ b/src/Custom/OpenAIClient.cs @@ -2,10 +2,12 @@ using OpenAI.Audio; using OpenAI.Batch; using OpenAI.Chat; +using OpenAI.Containers; using OpenAI.Embeddings; using OpenAI.Evals; using OpenAI.Files; using OpenAI.FineTuning; +using OpenAI.Graders; using OpenAI.Images; using OpenAI.Models; using OpenAI.Moderations; @@ -298,6 +300,22 @@ protected internal OpenAIClient(ClientPipeline pipeline, OpenAIClientOptions opt [Experimental("OPENAI001")] public virtual VectorStoreClient GetVectorStoreClient() => new(Pipeline, _options); + /// + /// Gets a new instance of that reuses the client configuration details provided to + /// the instance. + /// + /// + [Experimental("OPENAI001")] + public virtual GraderClient GetGraderClient() => new(Pipeline, _options); + + /// + /// Gets a new instance of that reuses the client configuration details provided to + /// the instance. + /// + /// + [Experimental("OPENAI001")] + public virtual ContainerClient GetContainerClient() => new(Pipeline, _options); + internal static ClientPipeline CreatePipeline(ApiKeyCredential credential, OpenAIClientOptions options) { return ClientPipeline.Create( diff --git a/src/Generated/ContainerClient.RestClient.cs b/src/Generated/ContainerClient.RestClient.cs index 39725815d..082984bbd 100644 --- a/src/Generated/ContainerClient.RestClient.cs +++ b/src/Generated/ContainerClient.RestClient.cs @@ -8,7 +8,7 @@ namespace OpenAI.Containers { - internal partial class ContainerClient + public partial class ContainerClient { private static PipelineMessageClassifier _pipelineMessageClassifier200; diff --git a/src/Generated/ContainerClient.cs b/src/Generated/ContainerClient.cs index 1564b7ff1..527198080 100644 --- a/src/Generated/ContainerClient.cs +++ b/src/Generated/ContainerClient.cs @@ -5,14 +5,14 @@ using System; using System.ClientModel; using System.ClientModel.Primitives; -using System.Threading; +using System.Diagnostics.CodeAnalysis; using System.Threading.Tasks; using OpenAI; -using OpenAI.VectorStores; namespace OpenAI.Containers { - internal partial class ContainerClient + [Experimental("OPENAI001")] + public partial class ContainerClient { private readonly Uri _endpoint; @@ -20,38 +20,20 @@ protected ContainerClient() { } - internal ContainerClient(ClientPipeline pipeline, Uri endpoint) - { - _endpoint = endpoint; - Pipeline = pipeline; - } - public ClientPipeline Pipeline { get; } - public virtual ClientResult GetContainers(int? limit, string order, string after, RequestOptions options) + public virtual ClientResult GetContainers(int? limit = default, string order = default, string after = default, RequestOptions options = null) { using PipelineMessage message = CreateGetContainersRequest(limit, order, after, options); return ClientResult.FromResponse(Pipeline.ProcessMessage(message, options)); } - public virtual async Task GetContainersAsync(int? limit, string order, string after, RequestOptions options) + public virtual async Task GetContainersAsync(int? limit = default, string order = default, string after = default, RequestOptions options = null) { using PipelineMessage message = CreateGetContainersRequest(limit, order, after, options); return ClientResult.FromResponse(await Pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false)); } - public virtual ClientResult GetContainers(int? limit = default, VectorStoreCollectionOrder? order = default, string after = default, CancellationToken cancellationToken = default) - { - ClientResult result = GetContainers(limit, order?.ToString(), after, cancellationToken.CanBeCanceled ? new RequestOptions { CancellationToken = cancellationToken } : null); - return ClientResult.FromValue((InternalContainerListResource)result, result.GetRawResponse()); - } - - public virtual async Task> GetContainersAsync(int? limit = default, VectorStoreCollectionOrder? order = default, string after = default, CancellationToken cancellationToken = default) - { - ClientResult result = await GetContainersAsync(limit, order?.ToString(), after, cancellationToken.CanBeCanceled ? new RequestOptions { CancellationToken = cancellationToken } : null).ConfigureAwait(false); - return ClientResult.FromValue((InternalContainerListResource)result, result.GetRawResponse()); - } - public virtual ClientResult CreateContainer(BinaryContent content, RequestOptions options = null) { Argument.AssertNotNull(content, nameof(content)); @@ -68,23 +50,7 @@ public virtual async Task CreateContainerAsync(BinaryContent conte return ClientResult.FromResponse(await Pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false)); } - public virtual ClientResult CreateContainer(InternalCreateContainerBody body, CancellationToken cancellationToken = default) - { - Argument.AssertNotNull(body, nameof(body)); - - ClientResult result = CreateContainer(body, cancellationToken.CanBeCanceled ? new RequestOptions { CancellationToken = cancellationToken } : null); - return ClientResult.FromValue((InternalContainerResource)result, result.GetRawResponse()); - } - - public virtual async Task> CreateContainerAsync(InternalCreateContainerBody body, CancellationToken cancellationToken = default) - { - Argument.AssertNotNull(body, nameof(body)); - - ClientResult result = await CreateContainerAsync(body, cancellationToken.CanBeCanceled ? new RequestOptions { CancellationToken = cancellationToken } : null).ConfigureAwait(false); - return ClientResult.FromValue((InternalContainerResource)result, result.GetRawResponse()); - } - - public virtual ClientResult RetrieveContainer(string containerId, RequestOptions options) + public virtual ClientResult RetrieveContainer(string containerId, RequestOptions options = null) { Argument.AssertNotNullOrEmpty(containerId, nameof(containerId)); @@ -92,7 +58,7 @@ public virtual ClientResult RetrieveContainer(string containerId, RequestOptions return ClientResult.FromResponse(Pipeline.ProcessMessage(message, options)); } - public virtual async Task RetrieveContainerAsync(string containerId, RequestOptions options) + public virtual async Task RetrieveContainerAsync(string containerId, RequestOptions options = null) { Argument.AssertNotNullOrEmpty(containerId, nameof(containerId)); @@ -100,23 +66,7 @@ public virtual async Task RetrieveContainerAsync(string containerI return ClientResult.FromResponse(await Pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false)); } - public virtual ClientResult RetrieveContainer(string containerId, CancellationToken cancellationToken = default) - { - Argument.AssertNotNullOrEmpty(containerId, nameof(containerId)); - - ClientResult result = RetrieveContainer(containerId, cancellationToken.CanBeCanceled ? new RequestOptions { CancellationToken = cancellationToken } : null); - return ClientResult.FromValue((InternalContainerResource)result, result.GetRawResponse()); - } - - public virtual async Task> RetrieveContainerAsync(string containerId, CancellationToken cancellationToken = default) - { - Argument.AssertNotNullOrEmpty(containerId, nameof(containerId)); - - ClientResult result = await RetrieveContainerAsync(containerId, cancellationToken.CanBeCanceled ? new RequestOptions { CancellationToken = cancellationToken } : null).ConfigureAwait(false); - return ClientResult.FromValue((InternalContainerResource)result, result.GetRawResponse()); - } - - public virtual ClientResult DeleteContainer(string containerId, RequestOptions options) + public virtual ClientResult DeleteContainer(string containerId, RequestOptions options = null) { Argument.AssertNotNullOrEmpty(containerId, nameof(containerId)); @@ -124,7 +74,7 @@ public virtual ClientResult DeleteContainer(string containerId, RequestOptions o return ClientResult.FromResponse(Pipeline.ProcessMessage(message, options)); } - public virtual async Task DeleteContainerAsync(string containerId, RequestOptions options) + public virtual async Task DeleteContainerAsync(string containerId, RequestOptions options = null) { Argument.AssertNotNullOrEmpty(containerId, nameof(containerId)); @@ -132,22 +82,6 @@ public virtual async Task DeleteContainerAsync(string containerId, return ClientResult.FromResponse(await Pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false)); } - public virtual ClientResult DeleteContainer(string containerId, CancellationToken cancellationToken = default) - { - Argument.AssertNotNullOrEmpty(containerId, nameof(containerId)); - - ClientResult result = DeleteContainer(containerId, cancellationToken.CanBeCanceled ? new RequestOptions { CancellationToken = cancellationToken } : null); - return ClientResult.FromValue((InternalDeleteContainerResponse)result, result.GetRawResponse()); - } - - public virtual async Task> DeleteContainerAsync(string containerId, CancellationToken cancellationToken = default) - { - Argument.AssertNotNullOrEmpty(containerId, nameof(containerId)); - - ClientResult result = await DeleteContainerAsync(containerId, cancellationToken.CanBeCanceled ? new RequestOptions { CancellationToken = cancellationToken } : null).ConfigureAwait(false); - return ClientResult.FromValue((InternalDeleteContainerResponse)result, result.GetRawResponse()); - } - public virtual ClientResult CreateContainerFile(string containerId, BinaryContent content, string contentType, RequestOptions options = null) { Argument.AssertNotNullOrEmpty(containerId, nameof(containerId)); @@ -166,7 +100,7 @@ public virtual async Task CreateContainerFileAsync(string containe return ClientResult.FromResponse(await Pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false)); } - public virtual ClientResult GetContainerFiles(string containerId, int? limit, string order, string after, RequestOptions options) + public virtual ClientResult GetContainerFiles(string containerId, int? limit = default, string order = default, string after = default, RequestOptions options = null) { Argument.AssertNotNullOrEmpty(containerId, nameof(containerId)); @@ -174,7 +108,7 @@ public virtual ClientResult GetContainerFiles(string containerId, int? limit, st return ClientResult.FromResponse(Pipeline.ProcessMessage(message, options)); } - public virtual async Task GetContainerFilesAsync(string containerId, int? limit, string order, string after, RequestOptions options) + public virtual async Task GetContainerFilesAsync(string containerId, int? limit = default, string order = default, string after = default, RequestOptions options = null) { Argument.AssertNotNullOrEmpty(containerId, nameof(containerId)); @@ -182,23 +116,7 @@ public virtual async Task GetContainerFilesAsync(string containerI return ClientResult.FromResponse(await Pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false)); } - public virtual ClientResult GetContainerFiles(string containerId, int? limit = default, VectorStoreCollectionOrder? order = default, string after = default, CancellationToken cancellationToken = default) - { - Argument.AssertNotNullOrEmpty(containerId, nameof(containerId)); - - ClientResult result = GetContainerFiles(containerId, limit, order?.ToString(), after, cancellationToken.CanBeCanceled ? new RequestOptions { CancellationToken = cancellationToken } : null); - return ClientResult.FromValue((InternalContainerFileListResource)result, result.GetRawResponse()); - } - - public virtual async Task> GetContainerFilesAsync(string containerId, int? limit = default, VectorStoreCollectionOrder? order = default, string after = default, CancellationToken cancellationToken = default) - { - Argument.AssertNotNullOrEmpty(containerId, nameof(containerId)); - - ClientResult result = await GetContainerFilesAsync(containerId, limit, order?.ToString(), after, cancellationToken.CanBeCanceled ? new RequestOptions { CancellationToken = cancellationToken } : null).ConfigureAwait(false); - return ClientResult.FromValue((InternalContainerFileListResource)result, result.GetRawResponse()); - } - - public virtual ClientResult RetrieveContainerFile(string containerId, string fileId, RequestOptions options) + public virtual ClientResult RetrieveContainerFile(string containerId, string fileId, RequestOptions options = null) { Argument.AssertNotNullOrEmpty(containerId, nameof(containerId)); Argument.AssertNotNullOrEmpty(fileId, nameof(fileId)); @@ -207,7 +125,7 @@ public virtual ClientResult RetrieveContainerFile(string containerId, string fil return ClientResult.FromResponse(Pipeline.ProcessMessage(message, options)); } - public virtual async Task RetrieveContainerFileAsync(string containerId, string fileId, RequestOptions options) + public virtual async Task RetrieveContainerFileAsync(string containerId, string fileId, RequestOptions options = null) { Argument.AssertNotNullOrEmpty(containerId, nameof(containerId)); Argument.AssertNotNullOrEmpty(fileId, nameof(fileId)); @@ -216,25 +134,7 @@ public virtual async Task RetrieveContainerFileAsync(string contai return ClientResult.FromResponse(await Pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false)); } - public virtual ClientResult RetrieveContainerFile(string containerId, string fileId, CancellationToken cancellationToken = default) - { - Argument.AssertNotNullOrEmpty(containerId, nameof(containerId)); - Argument.AssertNotNullOrEmpty(fileId, nameof(fileId)); - - ClientResult result = RetrieveContainerFile(containerId, fileId, cancellationToken.CanBeCanceled ? new RequestOptions { CancellationToken = cancellationToken } : null); - return ClientResult.FromValue((InternalContainerFileResource)result, result.GetRawResponse()); - } - - public virtual async Task> RetrieveContainerFileAsync(string containerId, string fileId, CancellationToken cancellationToken = default) - { - Argument.AssertNotNullOrEmpty(containerId, nameof(containerId)); - Argument.AssertNotNullOrEmpty(fileId, nameof(fileId)); - - ClientResult result = await RetrieveContainerFileAsync(containerId, fileId, cancellationToken.CanBeCanceled ? new RequestOptions { CancellationToken = cancellationToken } : null).ConfigureAwait(false); - return ClientResult.FromValue((InternalContainerFileResource)result, result.GetRawResponse()); - } - - public virtual ClientResult DeleteContainerFile(string containerId, string fileId, RequestOptions options) + public virtual ClientResult DeleteContainerFile(string containerId, string fileId, RequestOptions options = null) { Argument.AssertNotNullOrEmpty(containerId, nameof(containerId)); Argument.AssertNotNullOrEmpty(fileId, nameof(fileId)); @@ -243,7 +143,7 @@ public virtual ClientResult DeleteContainerFile(string containerId, string fileI return ClientResult.FromResponse(Pipeline.ProcessMessage(message, options)); } - public virtual async Task DeleteContainerFileAsync(string containerId, string fileId, RequestOptions options) + public virtual async Task DeleteContainerFileAsync(string containerId, string fileId, RequestOptions options = null) { Argument.AssertNotNullOrEmpty(containerId, nameof(containerId)); Argument.AssertNotNullOrEmpty(fileId, nameof(fileId)); @@ -252,25 +152,7 @@ public virtual async Task DeleteContainerFileAsync(string containe return ClientResult.FromResponse(await Pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false)); } - public virtual ClientResult DeleteContainerFile(string containerId, string fileId, CancellationToken cancellationToken = default) - { - Argument.AssertNotNullOrEmpty(containerId, nameof(containerId)); - Argument.AssertNotNullOrEmpty(fileId, nameof(fileId)); - - ClientResult result = DeleteContainerFile(containerId, fileId, cancellationToken.CanBeCanceled ? new RequestOptions { CancellationToken = cancellationToken } : null); - return ClientResult.FromValue((InternalDeleteContainerFileResponse)result, result.GetRawResponse()); - } - - public virtual async Task> DeleteContainerFileAsync(string containerId, string fileId, CancellationToken cancellationToken = default) - { - Argument.AssertNotNullOrEmpty(containerId, nameof(containerId)); - Argument.AssertNotNullOrEmpty(fileId, nameof(fileId)); - - ClientResult result = await DeleteContainerFileAsync(containerId, fileId, cancellationToken.CanBeCanceled ? new RequestOptions { CancellationToken = cancellationToken } : null).ConfigureAwait(false); - return ClientResult.FromValue((InternalDeleteContainerFileResponse)result, result.GetRawResponse()); - } - - public virtual ClientResult RetrieveContainerFileContent(string containerId, string fileId, RequestOptions options) + public virtual ClientResult RetrieveContainerFileContent(string containerId, string fileId, RequestOptions options = null) { Argument.AssertNotNullOrEmpty(containerId, nameof(containerId)); Argument.AssertNotNullOrEmpty(fileId, nameof(fileId)); @@ -279,7 +161,7 @@ public virtual ClientResult RetrieveContainerFileContent(string containerId, str return ClientResult.FromResponse(Pipeline.ProcessMessage(message, options)); } - public virtual async Task RetrieveContainerFileContentAsync(string containerId, string fileId, RequestOptions options) + public virtual async Task RetrieveContainerFileContentAsync(string containerId, string fileId, RequestOptions options = null) { Argument.AssertNotNullOrEmpty(containerId, nameof(containerId)); Argument.AssertNotNullOrEmpty(fileId, nameof(fileId)); @@ -287,23 +169,5 @@ public virtual async Task RetrieveContainerFileContentAsync(string using PipelineMessage message = CreateRetrieveContainerFileContentRequest(containerId, fileId, options); return ClientResult.FromResponse(await Pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false)); } - - public virtual ClientResult RetrieveContainerFileContent(string containerId, string fileId, CancellationToken cancellationToken = default) - { - Argument.AssertNotNullOrEmpty(containerId, nameof(containerId)); - Argument.AssertNotNullOrEmpty(fileId, nameof(fileId)); - - ClientResult result = RetrieveContainerFileContent(containerId, fileId, cancellationToken.CanBeCanceled ? new RequestOptions { CancellationToken = cancellationToken } : null); - return ClientResult.FromValue(result.GetRawResponse().Content, result.GetRawResponse()); - } - - public virtual async Task> RetrieveContainerFileContentAsync(string containerId, string fileId, CancellationToken cancellationToken = default) - { - Argument.AssertNotNullOrEmpty(containerId, nameof(containerId)); - Argument.AssertNotNullOrEmpty(fileId, nameof(fileId)); - - ClientResult result = await RetrieveContainerFileContentAsync(containerId, fileId, cancellationToken.CanBeCanceled ? new RequestOptions { CancellationToken = cancellationToken } : null).ConfigureAwait(false); - return ClientResult.FromValue(result.GetRawResponse().Content, result.GetRawResponse()); - } } } diff --git a/src/Generated/GraderClient.RestClient.cs b/src/Generated/GraderClient.RestClient.cs index 1f7273b73..b34bc8d66 100644 --- a/src/Generated/GraderClient.RestClient.cs +++ b/src/Generated/GraderClient.RestClient.cs @@ -8,7 +8,7 @@ namespace OpenAI.Graders { - internal partial class GraderClient + public partial class GraderClient { private static PipelineMessageClassifier _pipelineMessageClassifier200; diff --git a/src/Generated/GraderClient.cs b/src/Generated/GraderClient.cs index 204bc99c8..d621b6f47 100644 --- a/src/Generated/GraderClient.cs +++ b/src/Generated/GraderClient.cs @@ -5,13 +5,14 @@ using System; using System.ClientModel; using System.ClientModel.Primitives; -using System.Threading; +using System.Diagnostics.CodeAnalysis; using System.Threading.Tasks; using OpenAI; namespace OpenAI.Graders { - internal partial class GraderClient + [Experimental("OPENAI001")] + public partial class GraderClient { private readonly Uri _endpoint; @@ -19,12 +20,6 @@ protected GraderClient() { } - internal GraderClient(ClientPipeline pipeline, Uri endpoint) - { - _endpoint = endpoint; - Pipeline = pipeline; - } - public ClientPipeline Pipeline { get; } public virtual ClientResult RunGrader(BinaryContent content, RequestOptions options = null) @@ -43,22 +38,6 @@ public virtual async Task RunGraderAsync(BinaryContent content, Re return ClientResult.FromResponse(await Pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false)); } - public virtual ClientResult RunGrader(InternalRunGraderRequest request, CancellationToken cancellationToken = default) - { - Argument.AssertNotNull(request, nameof(request)); - - ClientResult result = RunGrader(request, cancellationToken.CanBeCanceled ? new RequestOptions { CancellationToken = cancellationToken } : null); - return ClientResult.FromValue((InternalRunGraderResponse)result, result.GetRawResponse()); - } - - public virtual async Task> RunGraderAsync(InternalRunGraderRequest request, CancellationToken cancellationToken = default) - { - Argument.AssertNotNull(request, nameof(request)); - - ClientResult result = await RunGraderAsync(request, cancellationToken.CanBeCanceled ? new RequestOptions { CancellationToken = cancellationToken } : null).ConfigureAwait(false); - return ClientResult.FromValue((InternalRunGraderResponse)result, result.GetRawResponse()); - } - public virtual ClientResult ValidateGrader(BinaryContent content, RequestOptions options = null) { Argument.AssertNotNull(content, nameof(content)); @@ -74,21 +53,5 @@ public virtual async Task ValidateGraderAsync(BinaryContent conten using PipelineMessage message = CreateValidateGraderRequest(content, options); return ClientResult.FromResponse(await Pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false)); } - - public virtual ClientResult ValidateGrader(InternalValidateGraderRequest request, CancellationToken cancellationToken = default) - { - Argument.AssertNotNull(request, nameof(request)); - - ClientResult result = ValidateGrader(request, cancellationToken.CanBeCanceled ? new RequestOptions { CancellationToken = cancellationToken } : null); - return ClientResult.FromValue((InternalValidateGraderResponse)result, result.GetRawResponse()); - } - - public virtual async Task> ValidateGraderAsync(InternalValidateGraderRequest request, CancellationToken cancellationToken = default) - { - Argument.AssertNotNull(request, nameof(request)); - - ClientResult result = await ValidateGraderAsync(request, cancellationToken.CanBeCanceled ? new RequestOptions { CancellationToken = cancellationToken } : null).ConfigureAwait(false); - return ClientResult.FromValue((InternalValidateGraderResponse)result, result.GetRawResponse()); - } } } diff --git a/src/Generated/Models/Containers/InternalContainerFileListResource.Serialization.cs b/src/Generated/Models/Containers/ContainerFileListResource.Serialization.cs similarity index 64% rename from src/Generated/Models/Containers/InternalContainerFileListResource.Serialization.cs rename to src/Generated/Models/Containers/ContainerFileListResource.Serialization.cs index c9800822d..3403b0f2f 100644 --- a/src/Generated/Models/Containers/InternalContainerFileListResource.Serialization.cs +++ b/src/Generated/Models/Containers/ContainerFileListResource.Serialization.cs @@ -10,13 +10,13 @@ namespace OpenAI.Containers { - internal partial class InternalContainerFileListResource : IJsonModel + public partial class ContainerFileListResource : IJsonModel { - internal InternalContainerFileListResource() : this(null, null, null, null, default, null) + internal ContainerFileListResource() : this(null, null, null, null, default, null) { } - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) { writer.WriteStartObject(); JsonModelWriteCore(writer, options); @@ -25,10 +25,10 @@ void IJsonModel.Write(Utf8JsonWriter writer, protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(InternalContainerFileListResource)} does not support writing '{format}' format."); + throw new FormatException($"The model {nameof(ContainerFileListResource)} does not support writing '{format}' format."); } if (_additionalBinaryDataProperties?.ContainsKey("object") != true) { @@ -39,7 +39,7 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit { writer.WritePropertyName("data"u8); writer.WriteStartArray(); - foreach (InternalContainerFileResource item in Data) + foreach (ContainerFileResource item in Data) { writer.WriteObjectValue(item, options); } @@ -82,27 +82,27 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit } } - InternalContainerFileListResource IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options); + ContainerFileListResource IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options); - protected virtual InternalContainerFileListResource JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) + protected virtual ContainerFileListResource JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(InternalContainerFileListResource)} does not support reading '{format}' format."); + throw new FormatException($"The model {nameof(ContainerFileListResource)} does not support reading '{format}' format."); } using JsonDocument document = JsonDocument.ParseValue(ref reader); - return DeserializeInternalContainerFileListResource(document.RootElement, options); + return DeserializeContainerFileListResource(document.RootElement, options); } - internal static InternalContainerFileListResource DeserializeInternalContainerFileListResource(JsonElement element, ModelReaderWriterOptions options) + internal static ContainerFileListResource DeserializeContainerFileListResource(JsonElement element, ModelReaderWriterOptions options) { if (element.ValueKind == JsonValueKind.Null) { return null; } string @object = default; - IList data = default; + IList data = default; string firstId = default; string lastId = default; bool hasMore = default; @@ -116,10 +116,10 @@ internal static InternalContainerFileListResource DeserializeInternalContainerFi } if (prop.NameEquals("data"u8)) { - List array = new List(); + List array = new List(); foreach (var item in prop.Value.EnumerateArray()) { - array.Add(InternalContainerFileResource.DeserializeInternalContainerFileResource(item, options)); + array.Add(ContainerFileResource.DeserializeContainerFileResource(item, options)); } data = array; continue; @@ -142,7 +142,7 @@ internal static InternalContainerFileListResource DeserializeInternalContainerFi // Plugin customization: remove options.Format != "W" check additionalBinaryDataProperties.Add(prop.Name, BinaryData.FromString(prop.Value.GetRawText())); } - return new InternalContainerFileListResource( + return new ContainerFileListResource( @object, data, firstId, @@ -151,37 +151,37 @@ internal static InternalContainerFileListResource DeserializeInternalContainerFi additionalBinaryDataProperties); } - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": return ModelReaderWriter.Write(this, options, OpenAIContext.Default); default: - throw new FormatException($"The model {nameof(InternalContainerFileListResource)} does not support writing '{options.Format}' format."); + throw new FormatException($"The model {nameof(ContainerFileListResource)} does not support writing '{options.Format}' format."); } } - InternalContainerFileListResource IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); + ContainerFileListResource IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); - protected virtual InternalContainerFileListResource PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) + protected virtual ContainerFileListResource PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": using (JsonDocument document = JsonDocument.Parse(data)) { - return DeserializeInternalContainerFileListResource(document.RootElement, options); + return DeserializeContainerFileListResource(document.RootElement, options); } default: - throw new FormatException($"The model {nameof(InternalContainerFileListResource)} does not support reading '{options.Format}' format."); + throw new FormatException($"The model {nameof(ContainerFileListResource)} does not support reading '{options.Format}' format."); } } - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; } } diff --git a/src/Generated/Models/Containers/InternalContainerFileListResource.cs b/src/Generated/Models/Containers/ContainerFileListResource.cs similarity index 64% rename from src/Generated/Models/Containers/InternalContainerFileListResource.cs rename to src/Generated/Models/Containers/ContainerFileListResource.cs index 3e38eccec..23ac3157c 100644 --- a/src/Generated/Models/Containers/InternalContainerFileListResource.cs +++ b/src/Generated/Models/Containers/ContainerFileListResource.cs @@ -4,16 +4,18 @@ using System; using System.Collections.Generic; +using System.Diagnostics.CodeAnalysis; using System.Linq; using OpenAI; namespace OpenAI.Containers { - internal partial class InternalContainerFileListResource + [Experimental("OPENAI001")] + public partial class ContainerFileListResource { private protected IDictionary _additionalBinaryDataProperties; - internal InternalContainerFileListResource(IEnumerable data, string firstId, string lastId, bool hasMore) + internal ContainerFileListResource(IEnumerable data, string firstId, string lastId, bool hasMore) { Data = data.ToList(); FirstId = firstId; @@ -21,11 +23,11 @@ internal InternalContainerFileListResource(IEnumerable data, string firstId, string lastId, bool hasMore, IDictionary additionalBinaryDataProperties) + internal ContainerFileListResource(string @object, IList data, string firstId, string lastId, bool hasMore, IDictionary additionalBinaryDataProperties) { // Plugin customization: ensure initialization of collections Object = @object; - Data = data ?? new ChangeTrackingList(); + Data = data ?? new ChangeTrackingList(); FirstId = firstId; LastId = lastId; HasMore = hasMore; @@ -34,7 +36,7 @@ internal InternalContainerFileListResource(string @object, IList Data { get; } + public IList Data { get; } public string FirstId { get; } diff --git a/src/Generated/Models/Containers/InternalContainerFileResource.Serialization.cs b/src/Generated/Models/Containers/ContainerFileResource.Serialization.cs similarity index 71% rename from src/Generated/Models/Containers/InternalContainerFileResource.Serialization.cs rename to src/Generated/Models/Containers/ContainerFileResource.Serialization.cs index 1b06bd61c..bf8697e8e 100644 --- a/src/Generated/Models/Containers/InternalContainerFileResource.Serialization.cs +++ b/src/Generated/Models/Containers/ContainerFileResource.Serialization.cs @@ -10,13 +10,13 @@ namespace OpenAI.Containers { - internal partial class InternalContainerFileResource : IJsonModel + public partial class ContainerFileResource : IJsonModel { - internal InternalContainerFileResource() + internal ContainerFileResource() { } - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) { writer.WriteStartObject(); JsonModelWriteCore(writer, options); @@ -25,10 +25,10 @@ void IJsonModel.Write(Utf8JsonWriter writer, Mode protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(InternalContainerFileResource)} does not support writing '{format}' format."); + throw new FormatException($"The model {nameof(ContainerFileResource)} does not support writing '{format}' format."); } if (_additionalBinaryDataProperties?.ContainsKey("id") != true) { @@ -87,20 +87,20 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit } } - InternalContainerFileResource IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options); + ContainerFileResource IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options); - protected virtual InternalContainerFileResource JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) + protected virtual ContainerFileResource JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(InternalContainerFileResource)} does not support reading '{format}' format."); + throw new FormatException($"The model {nameof(ContainerFileResource)} does not support reading '{format}' format."); } using JsonDocument document = JsonDocument.ParseValue(ref reader); - return DeserializeInternalContainerFileResource(document.RootElement, options); + return DeserializeContainerFileResource(document.RootElement, options); } - internal static InternalContainerFileResource DeserializeInternalContainerFileResource(JsonElement element, ModelReaderWriterOptions options) + internal static ContainerFileResource DeserializeContainerFileResource(JsonElement element, ModelReaderWriterOptions options) { if (element.ValueKind == JsonValueKind.Null) { @@ -154,7 +154,7 @@ internal static InternalContainerFileResource DeserializeInternalContainerFileRe // Plugin customization: remove options.Format != "W" check additionalBinaryDataProperties.Add(prop.Name, BinaryData.FromString(prop.Value.GetRawText())); } - return new InternalContainerFileResource( + return new ContainerFileResource( id, @object, containerId, @@ -165,37 +165,37 @@ internal static InternalContainerFileResource DeserializeInternalContainerFileRe additionalBinaryDataProperties); } - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": return ModelReaderWriter.Write(this, options, OpenAIContext.Default); default: - throw new FormatException($"The model {nameof(InternalContainerFileResource)} does not support writing '{options.Format}' format."); + throw new FormatException($"The model {nameof(ContainerFileResource)} does not support writing '{options.Format}' format."); } } - InternalContainerFileResource IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); + ContainerFileResource IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); - protected virtual InternalContainerFileResource PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) + protected virtual ContainerFileResource PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": using (JsonDocument document = JsonDocument.Parse(data)) { - return DeserializeInternalContainerFileResource(document.RootElement, options); + return DeserializeContainerFileResource(document.RootElement, options); } default: - throw new FormatException($"The model {nameof(InternalContainerFileResource)} does not support reading '{options.Format}' format."); + throw new FormatException($"The model {nameof(ContainerFileResource)} does not support reading '{options.Format}' format."); } } - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; } } diff --git a/src/Generated/Models/Containers/InternalContainerFileResource.cs b/src/Generated/Models/Containers/ContainerFileResource.cs similarity index 72% rename from src/Generated/Models/Containers/InternalContainerFileResource.cs rename to src/Generated/Models/Containers/ContainerFileResource.cs index ef1fbf977..ba54e46bf 100644 --- a/src/Generated/Models/Containers/InternalContainerFileResource.cs +++ b/src/Generated/Models/Containers/ContainerFileResource.cs @@ -4,14 +4,16 @@ using System; using System.Collections.Generic; +using System.Diagnostics.CodeAnalysis; namespace OpenAI.Containers { - internal partial class InternalContainerFileResource + [Experimental("OPENAI001")] + public partial class ContainerFileResource { private protected IDictionary _additionalBinaryDataProperties; - internal InternalContainerFileResource(string id, string @object, string containerId, DateTimeOffset createdAt, int bytes, string path, string source) + internal ContainerFileResource(string id, string @object, string containerId, DateTimeOffset createdAt, int bytes, string path, string source) { Id = id; Object = @object; @@ -22,7 +24,7 @@ internal InternalContainerFileResource(string id, string @object, string contain Source = source; } - internal InternalContainerFileResource(string id, string @object, string containerId, DateTimeOffset createdAt, int bytes, string path, string source, IDictionary additionalBinaryDataProperties) + internal ContainerFileResource(string id, string @object, string containerId, DateTimeOffset createdAt, int bytes, string path, string source, IDictionary additionalBinaryDataProperties) { Id = id; Object = @object; diff --git a/src/Generated/Models/Containers/InternalContainerListResource.Serialization.cs b/src/Generated/Models/Containers/ContainerListResource.Serialization.cs similarity index 65% rename from src/Generated/Models/Containers/InternalContainerListResource.Serialization.cs rename to src/Generated/Models/Containers/ContainerListResource.Serialization.cs index e3903d016..ac4defa66 100644 --- a/src/Generated/Models/Containers/InternalContainerListResource.Serialization.cs +++ b/src/Generated/Models/Containers/ContainerListResource.Serialization.cs @@ -10,13 +10,13 @@ namespace OpenAI.Containers { - internal partial class InternalContainerListResource : IJsonModel + public partial class ContainerListResource : IJsonModel { - internal InternalContainerListResource() : this(null, null, null, null, default, null) + internal ContainerListResource() : this(null, null, null, null, default, null) { } - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) { writer.WriteStartObject(); JsonModelWriteCore(writer, options); @@ -25,10 +25,10 @@ void IJsonModel.Write(Utf8JsonWriter writer, Mode protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(InternalContainerListResource)} does not support writing '{format}' format."); + throw new FormatException($"The model {nameof(ContainerListResource)} does not support writing '{format}' format."); } if (_additionalBinaryDataProperties?.ContainsKey("object") != true) { @@ -39,7 +39,7 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit { writer.WritePropertyName("data"u8); writer.WriteStartArray(); - foreach (InternalContainerResource item in Data) + foreach (ContainerResource item in Data) { writer.WriteObjectValue(item, options); } @@ -82,27 +82,27 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit } } - InternalContainerListResource IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options); + ContainerListResource IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options); - protected virtual InternalContainerListResource JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) + protected virtual ContainerListResource JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(InternalContainerListResource)} does not support reading '{format}' format."); + throw new FormatException($"The model {nameof(ContainerListResource)} does not support reading '{format}' format."); } using JsonDocument document = JsonDocument.ParseValue(ref reader); - return DeserializeInternalContainerListResource(document.RootElement, options); + return DeserializeContainerListResource(document.RootElement, options); } - internal static InternalContainerListResource DeserializeInternalContainerListResource(JsonElement element, ModelReaderWriterOptions options) + internal static ContainerListResource DeserializeContainerListResource(JsonElement element, ModelReaderWriterOptions options) { if (element.ValueKind == JsonValueKind.Null) { return null; } string @object = default; - IList data = default; + IList data = default; string firstId = default; string lastId = default; bool hasMore = default; @@ -116,10 +116,10 @@ internal static InternalContainerListResource DeserializeInternalContainerListRe } if (prop.NameEquals("data"u8)) { - List array = new List(); + List array = new List(); foreach (var item in prop.Value.EnumerateArray()) { - array.Add(InternalContainerResource.DeserializeInternalContainerResource(item, options)); + array.Add(ContainerResource.DeserializeContainerResource(item, options)); } data = array; continue; @@ -142,7 +142,7 @@ internal static InternalContainerListResource DeserializeInternalContainerListRe // Plugin customization: remove options.Format != "W" check additionalBinaryDataProperties.Add(prop.Name, BinaryData.FromString(prop.Value.GetRawText())); } - return new InternalContainerListResource( + return new ContainerListResource( @object, data, firstId, @@ -151,37 +151,37 @@ internal static InternalContainerListResource DeserializeInternalContainerListRe additionalBinaryDataProperties); } - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": return ModelReaderWriter.Write(this, options, OpenAIContext.Default); default: - throw new FormatException($"The model {nameof(InternalContainerListResource)} does not support writing '{options.Format}' format."); + throw new FormatException($"The model {nameof(ContainerListResource)} does not support writing '{options.Format}' format."); } } - InternalContainerListResource IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); + ContainerListResource IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); - protected virtual InternalContainerListResource PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) + protected virtual ContainerListResource PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": using (JsonDocument document = JsonDocument.Parse(data)) { - return DeserializeInternalContainerListResource(document.RootElement, options); + return DeserializeContainerListResource(document.RootElement, options); } default: - throw new FormatException($"The model {nameof(InternalContainerListResource)} does not support reading '{options.Format}' format."); + throw new FormatException($"The model {nameof(ContainerListResource)} does not support reading '{options.Format}' format."); } } - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; } } diff --git a/src/Generated/Models/Containers/InternalContainerListResource.cs b/src/Generated/Models/Containers/ContainerListResource.cs similarity index 65% rename from src/Generated/Models/Containers/InternalContainerListResource.cs rename to src/Generated/Models/Containers/ContainerListResource.cs index 85d150ff9..02f83cbb8 100644 --- a/src/Generated/Models/Containers/InternalContainerListResource.cs +++ b/src/Generated/Models/Containers/ContainerListResource.cs @@ -4,16 +4,18 @@ using System; using System.Collections.Generic; +using System.Diagnostics.CodeAnalysis; using System.Linq; using OpenAI; namespace OpenAI.Containers { - internal partial class InternalContainerListResource + [Experimental("OPENAI001")] + public partial class ContainerListResource { private protected IDictionary _additionalBinaryDataProperties; - internal InternalContainerListResource(IEnumerable data, string firstId, string lastId, bool hasMore) + internal ContainerListResource(IEnumerable data, string firstId, string lastId, bool hasMore) { Data = data.ToList(); FirstId = firstId; @@ -21,11 +23,11 @@ internal InternalContainerListResource(IEnumerable da HasMore = hasMore; } - internal InternalContainerListResource(string @object, IList data, string firstId, string lastId, bool hasMore, IDictionary additionalBinaryDataProperties) + internal ContainerListResource(string @object, IList data, string firstId, string lastId, bool hasMore, IDictionary additionalBinaryDataProperties) { // Plugin customization: ensure initialization of collections Object = @object; - Data = data ?? new ChangeTrackingList(); + Data = data ?? new ChangeTrackingList(); FirstId = firstId; LastId = lastId; HasMore = hasMore; @@ -34,7 +36,7 @@ internal InternalContainerListResource(string @object, IList Data { get; } + public IList Data { get; } public string FirstId { get; } diff --git a/src/Generated/Models/Containers/InternalContainerResource.Serialization.cs b/src/Generated/Models/Containers/ContainerResource.Serialization.cs similarity index 69% rename from src/Generated/Models/Containers/InternalContainerResource.Serialization.cs rename to src/Generated/Models/Containers/ContainerResource.Serialization.cs index 5f25abb98..80990a36b 100644 --- a/src/Generated/Models/Containers/InternalContainerResource.Serialization.cs +++ b/src/Generated/Models/Containers/ContainerResource.Serialization.cs @@ -10,13 +10,13 @@ namespace OpenAI.Containers { - internal partial class InternalContainerResource : IJsonModel + public partial class ContainerResource : IJsonModel { - internal InternalContainerResource() + internal ContainerResource() { } - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) { writer.WriteStartObject(); JsonModelWriteCore(writer, options); @@ -25,10 +25,10 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelRea protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(InternalContainerResource)} does not support writing '{format}' format."); + throw new FormatException($"The model {nameof(ContainerResource)} does not support writing '{format}' format."); } if (_additionalBinaryDataProperties?.ContainsKey("id") != true) { @@ -82,20 +82,20 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit } } - InternalContainerResource IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options); + ContainerResource IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options); - protected virtual InternalContainerResource JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) + protected virtual ContainerResource JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(InternalContainerResource)} does not support reading '{format}' format."); + throw new FormatException($"The model {nameof(ContainerResource)} does not support reading '{format}' format."); } using JsonDocument document = JsonDocument.ParseValue(ref reader); - return DeserializeInternalContainerResource(document.RootElement, options); + return DeserializeContainerResource(document.RootElement, options); } - internal static InternalContainerResource DeserializeInternalContainerResource(JsonElement element, ModelReaderWriterOptions options) + internal static ContainerResource DeserializeContainerResource(JsonElement element, ModelReaderWriterOptions options) { if (element.ValueKind == JsonValueKind.Null) { @@ -106,7 +106,7 @@ internal static InternalContainerResource DeserializeInternalContainerResource(J string name = default; DateTimeOffset createdAt = default; string status = default; - InternalContainerResourceExpiresAfter expiresAfter = default; + ContainerResourceExpiresAfter expiresAfter = default; IDictionary additionalBinaryDataProperties = new ChangeTrackingDictionary(); foreach (var prop in element.EnumerateObject()) { @@ -141,13 +141,13 @@ internal static InternalContainerResource DeserializeInternalContainerResource(J { continue; } - expiresAfter = InternalContainerResourceExpiresAfter.DeserializeInternalContainerResourceExpiresAfter(prop.Value, options); + expiresAfter = ContainerResourceExpiresAfter.DeserializeContainerResourceExpiresAfter(prop.Value, options); continue; } // Plugin customization: remove options.Format != "W" check additionalBinaryDataProperties.Add(prop.Name, BinaryData.FromString(prop.Value.GetRawText())); } - return new InternalContainerResource( + return new ContainerResource( id, @object, name, @@ -157,37 +157,37 @@ internal static InternalContainerResource DeserializeInternalContainerResource(J additionalBinaryDataProperties); } - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": return ModelReaderWriter.Write(this, options, OpenAIContext.Default); default: - throw new FormatException($"The model {nameof(InternalContainerResource)} does not support writing '{options.Format}' format."); + throw new FormatException($"The model {nameof(ContainerResource)} does not support writing '{options.Format}' format."); } } - InternalContainerResource IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); + ContainerResource IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); - protected virtual InternalContainerResource PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) + protected virtual ContainerResource PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": using (JsonDocument document = JsonDocument.Parse(data)) { - return DeserializeInternalContainerResource(document.RootElement, options); + return DeserializeContainerResource(document.RootElement, options); } default: - throw new FormatException($"The model {nameof(InternalContainerResource)} does not support reading '{options.Format}' format."); + throw new FormatException($"The model {nameof(ContainerResource)} does not support reading '{options.Format}' format."); } } - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; } } diff --git a/src/Generated/Models/Containers/InternalContainerResource.cs b/src/Generated/Models/Containers/ContainerResource.cs similarity index 67% rename from src/Generated/Models/Containers/InternalContainerResource.cs rename to src/Generated/Models/Containers/ContainerResource.cs index 7cb0b986e..514d5324d 100644 --- a/src/Generated/Models/Containers/InternalContainerResource.cs +++ b/src/Generated/Models/Containers/ContainerResource.cs @@ -4,14 +4,16 @@ using System; using System.Collections.Generic; +using System.Diagnostics.CodeAnalysis; namespace OpenAI.Containers { - internal partial class InternalContainerResource + [Experimental("OPENAI001")] + public partial class ContainerResource { private protected IDictionary _additionalBinaryDataProperties; - internal InternalContainerResource(string id, string @object, string name, DateTimeOffset createdAt, string status) + internal ContainerResource(string id, string @object, string name, DateTimeOffset createdAt, string status) { Id = id; Object = @object; @@ -20,7 +22,7 @@ internal InternalContainerResource(string id, string @object, string name, DateT Status = status; } - internal InternalContainerResource(string id, string @object, string name, DateTimeOffset createdAt, string status, InternalContainerResourceExpiresAfter expiresAfter, IDictionary additionalBinaryDataProperties) + internal ContainerResource(string id, string @object, string name, DateTimeOffset createdAt, string status, ContainerResourceExpiresAfter expiresAfter, IDictionary additionalBinaryDataProperties) { Id = id; Object = @object; @@ -41,7 +43,7 @@ internal InternalContainerResource(string id, string @object, string name, DateT public string Status { get; } - internal InternalContainerResourceExpiresAfter ExpiresAfter { get; } + public ContainerResourceExpiresAfter ExpiresAfter { get; } internal IDictionary SerializedAdditionalRawData { diff --git a/src/Generated/Models/Containers/InternalContainerResourceExpiresAfter.Serialization.cs b/src/Generated/Models/Containers/ContainerResourceExpiresAfter.Serialization.cs similarity index 60% rename from src/Generated/Models/Containers/InternalContainerResourceExpiresAfter.Serialization.cs rename to src/Generated/Models/Containers/ContainerResourceExpiresAfter.Serialization.cs index 3c54c0b7d..3320a26c6 100644 --- a/src/Generated/Models/Containers/InternalContainerResourceExpiresAfter.Serialization.cs +++ b/src/Generated/Models/Containers/ContainerResourceExpiresAfter.Serialization.cs @@ -10,9 +10,9 @@ namespace OpenAI.Containers { - internal partial class InternalContainerResourceExpiresAfter : IJsonModel + public partial class ContainerResourceExpiresAfter : IJsonModel { - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) { writer.WriteStartObject(); JsonModelWriteCore(writer, options); @@ -21,10 +21,10 @@ void IJsonModel.Write(Utf8JsonWriter writ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(InternalContainerResourceExpiresAfter)} does not support writing '{format}' format."); + throw new FormatException($"The model {nameof(ContainerResourceExpiresAfter)} does not support writing '{format}' format."); } if (Optional.IsDefined(Anchor) && _additionalBinaryDataProperties?.ContainsKey("anchor") != true) { @@ -58,20 +58,20 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit } } - InternalContainerResourceExpiresAfter IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options); + ContainerResourceExpiresAfter IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options); - protected virtual InternalContainerResourceExpiresAfter JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) + protected virtual ContainerResourceExpiresAfter JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(InternalContainerResourceExpiresAfter)} does not support reading '{format}' format."); + throw new FormatException($"The model {nameof(ContainerResourceExpiresAfter)} does not support reading '{format}' format."); } using JsonDocument document = JsonDocument.ParseValue(ref reader); - return DeserializeInternalContainerResourceExpiresAfter(document.RootElement, options); + return DeserializeContainerResourceExpiresAfter(document.RootElement, options); } - internal static InternalContainerResourceExpiresAfter DeserializeInternalContainerResourceExpiresAfter(JsonElement element, ModelReaderWriterOptions options) + internal static ContainerResourceExpiresAfter DeserializeContainerResourceExpiresAfter(JsonElement element, ModelReaderWriterOptions options) { if (element.ValueKind == JsonValueKind.Null) { @@ -99,40 +99,40 @@ internal static InternalContainerResourceExpiresAfter DeserializeInternalContain // Plugin customization: remove options.Format != "W" check additionalBinaryDataProperties.Add(prop.Name, BinaryData.FromString(prop.Value.GetRawText())); } - return new InternalContainerResourceExpiresAfter(anchor, minutes, additionalBinaryDataProperties); + return new ContainerResourceExpiresAfter(anchor, minutes, additionalBinaryDataProperties); } - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": return ModelReaderWriter.Write(this, options, OpenAIContext.Default); default: - throw new FormatException($"The model {nameof(InternalContainerResourceExpiresAfter)} does not support writing '{options.Format}' format."); + throw new FormatException($"The model {nameof(ContainerResourceExpiresAfter)} does not support writing '{options.Format}' format."); } } - InternalContainerResourceExpiresAfter IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); + ContainerResourceExpiresAfter IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); - protected virtual InternalContainerResourceExpiresAfter PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) + protected virtual ContainerResourceExpiresAfter PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": using (JsonDocument document = JsonDocument.Parse(data)) { - return DeserializeInternalContainerResourceExpiresAfter(document.RootElement, options); + return DeserializeContainerResourceExpiresAfter(document.RootElement, options); } default: - throw new FormatException($"The model {nameof(InternalContainerResourceExpiresAfter)} does not support reading '{options.Format}' format."); + throw new FormatException($"The model {nameof(ContainerResourceExpiresAfter)} does not support reading '{options.Format}' format."); } } - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; } } diff --git a/src/Generated/Models/Containers/InternalContainerResourceExpiresAfter.cs b/src/Generated/Models/Containers/ContainerResourceExpiresAfter.cs similarity index 68% rename from src/Generated/Models/Containers/InternalContainerResourceExpiresAfter.cs rename to src/Generated/Models/Containers/ContainerResourceExpiresAfter.cs index 47a300ec7..f09fce2bf 100644 --- a/src/Generated/Models/Containers/InternalContainerResourceExpiresAfter.cs +++ b/src/Generated/Models/Containers/ContainerResourceExpiresAfter.cs @@ -4,18 +4,20 @@ using System; using System.Collections.Generic; +using System.Diagnostics.CodeAnalysis; namespace OpenAI.Containers { - internal partial class InternalContainerResourceExpiresAfter + [Experimental("OPENAI001")] + public partial class ContainerResourceExpiresAfter { private protected IDictionary _additionalBinaryDataProperties; - internal InternalContainerResourceExpiresAfter() + internal ContainerResourceExpiresAfter() { } - internal InternalContainerResourceExpiresAfter(string anchor, int? minutes, IDictionary additionalBinaryDataProperties) + internal ContainerResourceExpiresAfter(string anchor, int? minutes, IDictionary additionalBinaryDataProperties) { Anchor = anchor; Minutes = minutes; diff --git a/src/Generated/Models/Containers/InternalCreateContainerBody.Serialization.cs b/src/Generated/Models/Containers/CreateContainerBody.Serialization.cs similarity index 66% rename from src/Generated/Models/Containers/InternalCreateContainerBody.Serialization.cs rename to src/Generated/Models/Containers/CreateContainerBody.Serialization.cs index 8c391fc1a..011d31189 100644 --- a/src/Generated/Models/Containers/InternalCreateContainerBody.Serialization.cs +++ b/src/Generated/Models/Containers/CreateContainerBody.Serialization.cs @@ -10,13 +10,13 @@ namespace OpenAI.Containers { - internal partial class InternalCreateContainerBody : IJsonModel + public partial class CreateContainerBody : IJsonModel { - internal InternalCreateContainerBody() : this(null, null, null, null) + internal CreateContainerBody() : this(null, null, null, null) { } - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) { writer.WriteStartObject(); JsonModelWriteCore(writer, options); @@ -25,10 +25,10 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelR protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(InternalCreateContainerBody)} does not support writing '{format}' format."); + throw new FormatException($"The model {nameof(CreateContainerBody)} does not support writing '{format}' format."); } if (_additionalBinaryDataProperties?.ContainsKey("name") != true) { @@ -77,20 +77,20 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit } } - InternalCreateContainerBody IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options); + CreateContainerBody IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options); - protected virtual InternalCreateContainerBody JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) + protected virtual CreateContainerBody JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(InternalCreateContainerBody)} does not support reading '{format}' format."); + throw new FormatException($"The model {nameof(CreateContainerBody)} does not support reading '{format}' format."); } using JsonDocument document = JsonDocument.ParseValue(ref reader); - return DeserializeInternalCreateContainerBody(document.RootElement, options); + return DeserializeCreateContainerBody(document.RootElement, options); } - internal static InternalCreateContainerBody DeserializeInternalCreateContainerBody(JsonElement element, ModelReaderWriterOptions options) + internal static CreateContainerBody DeserializeCreateContainerBody(JsonElement element, ModelReaderWriterOptions options) { if (element.ValueKind == JsonValueKind.Null) { @@ -98,7 +98,7 @@ internal static InternalCreateContainerBody DeserializeInternalCreateContainerBo } string name = default; IList fileIds = default; - InternalCreateContainerBodyExpiresAfter expiresAfter = default; + CreateContainerBodyExpiresAfter expiresAfter = default; IDictionary additionalBinaryDataProperties = new ChangeTrackingDictionary(); foreach (var prop in element.EnumerateObject()) { @@ -134,46 +134,46 @@ internal static InternalCreateContainerBody DeserializeInternalCreateContainerBo { continue; } - expiresAfter = InternalCreateContainerBodyExpiresAfter.DeserializeInternalCreateContainerBodyExpiresAfter(prop.Value, options); + expiresAfter = CreateContainerBodyExpiresAfter.DeserializeCreateContainerBodyExpiresAfter(prop.Value, options); continue; } // Plugin customization: remove options.Format != "W" check additionalBinaryDataProperties.Add(prop.Name, BinaryData.FromString(prop.Value.GetRawText())); } - return new InternalCreateContainerBody(name, fileIds ?? new ChangeTrackingList(), expiresAfter, additionalBinaryDataProperties); + return new CreateContainerBody(name, fileIds ?? new ChangeTrackingList(), expiresAfter, additionalBinaryDataProperties); } - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": return ModelReaderWriter.Write(this, options, OpenAIContext.Default); default: - throw new FormatException($"The model {nameof(InternalCreateContainerBody)} does not support writing '{options.Format}' format."); + throw new FormatException($"The model {nameof(CreateContainerBody)} does not support writing '{options.Format}' format."); } } - InternalCreateContainerBody IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); + CreateContainerBody IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); - protected virtual InternalCreateContainerBody PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) + protected virtual CreateContainerBody PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": using (JsonDocument document = JsonDocument.Parse(data)) { - return DeserializeInternalCreateContainerBody(document.RootElement, options); + return DeserializeCreateContainerBody(document.RootElement, options); } default: - throw new FormatException($"The model {nameof(InternalCreateContainerBody)} does not support reading '{options.Format}' format."); + throw new FormatException($"The model {nameof(CreateContainerBody)} does not support reading '{options.Format}' format."); } } - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; } } diff --git a/src/Generated/Models/Containers/InternalCreateContainerBody.cs b/src/Generated/Models/Containers/CreateContainerBody.cs similarity index 67% rename from src/Generated/Models/Containers/InternalCreateContainerBody.cs rename to src/Generated/Models/Containers/CreateContainerBody.cs index 1d9060d62..0b6103d85 100644 --- a/src/Generated/Models/Containers/InternalCreateContainerBody.cs +++ b/src/Generated/Models/Containers/CreateContainerBody.cs @@ -4,23 +4,23 @@ using System; using System.Collections.Generic; +using System.Diagnostics.CodeAnalysis; using OpenAI; namespace OpenAI.Containers { - internal partial class InternalCreateContainerBody + [Experimental("OPENAI001")] + public partial class CreateContainerBody { private protected IDictionary _additionalBinaryDataProperties; - public InternalCreateContainerBody(string name) + internal CreateContainerBody(string name) { - Argument.AssertNotNull(name, nameof(name)); - Name = name; FileIds = new ChangeTrackingList(); } - internal InternalCreateContainerBody(string name, IList fileIds, InternalCreateContainerBodyExpiresAfter expiresAfter, IDictionary additionalBinaryDataProperties) + internal CreateContainerBody(string name, IList fileIds, CreateContainerBodyExpiresAfter expiresAfter, IDictionary additionalBinaryDataProperties) { // Plugin customization: ensure initialization of collections Name = name; @@ -33,7 +33,7 @@ internal InternalCreateContainerBody(string name, IList fileIds, Interna public IList FileIds { get; } - internal InternalCreateContainerBodyExpiresAfter ExpiresAfter { get; set; } + public CreateContainerBodyExpiresAfter ExpiresAfter { get; } internal IDictionary SerializedAdditionalRawData { diff --git a/src/Generated/Models/Containers/InternalCreateContainerBodyExpiresAfter.Serialization.cs b/src/Generated/Models/Containers/CreateContainerBodyExpiresAfter.Serialization.cs similarity index 58% rename from src/Generated/Models/Containers/InternalCreateContainerBodyExpiresAfter.Serialization.cs rename to src/Generated/Models/Containers/CreateContainerBodyExpiresAfter.Serialization.cs index 73308b347..eb718883f 100644 --- a/src/Generated/Models/Containers/InternalCreateContainerBodyExpiresAfter.Serialization.cs +++ b/src/Generated/Models/Containers/CreateContainerBodyExpiresAfter.Serialization.cs @@ -10,13 +10,13 @@ namespace OpenAI.Containers { - internal partial class InternalCreateContainerBodyExpiresAfter : IJsonModel + public partial class CreateContainerBodyExpiresAfter : IJsonModel { - internal InternalCreateContainerBodyExpiresAfter() + internal CreateContainerBodyExpiresAfter() { } - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) { writer.WriteStartObject(); JsonModelWriteCore(writer, options); @@ -25,10 +25,10 @@ void IJsonModel.Write(Utf8JsonWriter wr protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(InternalCreateContainerBodyExpiresAfter)} does not support writing '{format}' format."); + throw new FormatException($"The model {nameof(CreateContainerBodyExpiresAfter)} does not support writing '{format}' format."); } if (_additionalBinaryDataProperties?.ContainsKey("anchor") != true) { @@ -62,20 +62,20 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit } } - InternalCreateContainerBodyExpiresAfter IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options); + CreateContainerBodyExpiresAfter IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options); - protected virtual InternalCreateContainerBodyExpiresAfter JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) + protected virtual CreateContainerBodyExpiresAfter JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(InternalCreateContainerBodyExpiresAfter)} does not support reading '{format}' format."); + throw new FormatException($"The model {nameof(CreateContainerBodyExpiresAfter)} does not support reading '{format}' format."); } using JsonDocument document = JsonDocument.ParseValue(ref reader); - return DeserializeInternalCreateContainerBodyExpiresAfter(document.RootElement, options); + return DeserializeCreateContainerBodyExpiresAfter(document.RootElement, options); } - internal static InternalCreateContainerBodyExpiresAfter DeserializeInternalCreateContainerBodyExpiresAfter(JsonElement element, ModelReaderWriterOptions options) + internal static CreateContainerBodyExpiresAfter DeserializeCreateContainerBodyExpiresAfter(JsonElement element, ModelReaderWriterOptions options) { if (element.ValueKind == JsonValueKind.Null) { @@ -99,40 +99,40 @@ internal static InternalCreateContainerBodyExpiresAfter DeserializeInternalCreat // Plugin customization: remove options.Format != "W" check additionalBinaryDataProperties.Add(prop.Name, BinaryData.FromString(prop.Value.GetRawText())); } - return new InternalCreateContainerBodyExpiresAfter(anchor, minutes, additionalBinaryDataProperties); + return new CreateContainerBodyExpiresAfter(anchor, minutes, additionalBinaryDataProperties); } - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": return ModelReaderWriter.Write(this, options, OpenAIContext.Default); default: - throw new FormatException($"The model {nameof(InternalCreateContainerBodyExpiresAfter)} does not support writing '{options.Format}' format."); + throw new FormatException($"The model {nameof(CreateContainerBodyExpiresAfter)} does not support writing '{options.Format}' format."); } } - InternalCreateContainerBodyExpiresAfter IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); + CreateContainerBodyExpiresAfter IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); - protected virtual InternalCreateContainerBodyExpiresAfter PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) + protected virtual CreateContainerBodyExpiresAfter PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": using (JsonDocument document = JsonDocument.Parse(data)) { - return DeserializeInternalCreateContainerBodyExpiresAfter(document.RootElement, options); + return DeserializeCreateContainerBodyExpiresAfter(document.RootElement, options); } default: - throw new FormatException($"The model {nameof(InternalCreateContainerBodyExpiresAfter)} does not support reading '{options.Format}' format."); + throw new FormatException($"The model {nameof(CreateContainerBodyExpiresAfter)} does not support reading '{options.Format}' format."); } } - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; } } diff --git a/src/Generated/Models/Containers/InternalCreateContainerBodyExpiresAfter.cs b/src/Generated/Models/Containers/CreateContainerBodyExpiresAfter.cs similarity index 69% rename from src/Generated/Models/Containers/InternalCreateContainerBodyExpiresAfter.cs rename to src/Generated/Models/Containers/CreateContainerBodyExpiresAfter.cs index 80e7c74cc..70a817daf 100644 --- a/src/Generated/Models/Containers/InternalCreateContainerBodyExpiresAfter.cs +++ b/src/Generated/Models/Containers/CreateContainerBodyExpiresAfter.cs @@ -4,19 +4,21 @@ using System; using System.Collections.Generic; +using System.Diagnostics.CodeAnalysis; namespace OpenAI.Containers { - internal partial class InternalCreateContainerBodyExpiresAfter + [Experimental("OPENAI001")] + public partial class CreateContainerBodyExpiresAfter { private protected IDictionary _additionalBinaryDataProperties; - public InternalCreateContainerBodyExpiresAfter(int minutes) + internal CreateContainerBodyExpiresAfter(int minutes) { Minutes = minutes; } - internal InternalCreateContainerBodyExpiresAfter(string anchor, int minutes, IDictionary additionalBinaryDataProperties) + internal CreateContainerBodyExpiresAfter(string anchor, int minutes, IDictionary additionalBinaryDataProperties) { Anchor = anchor; Minutes = minutes; diff --git a/src/Generated/Models/Containers/InternalCreateContainerFileBody.Serialization.cs b/src/Generated/Models/Containers/CreateContainerFileBody.Serialization.cs similarity index 62% rename from src/Generated/Models/Containers/InternalCreateContainerFileBody.Serialization.cs rename to src/Generated/Models/Containers/CreateContainerFileBody.Serialization.cs index b1281d6b0..ae63b9dc6 100644 --- a/src/Generated/Models/Containers/InternalCreateContainerFileBody.Serialization.cs +++ b/src/Generated/Models/Containers/CreateContainerFileBody.Serialization.cs @@ -10,9 +10,9 @@ namespace OpenAI.Containers { - internal partial class InternalCreateContainerFileBody : IJsonModel + public partial class CreateContainerFileBody : IJsonModel { - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) { writer.WriteStartObject(); JsonModelWriteCore(writer, options); @@ -21,10 +21,10 @@ void IJsonModel.Write(Utf8JsonWriter writer, Mo protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(InternalCreateContainerFileBody)} does not support writing '{format}' format."); + throw new FormatException($"The model {nameof(CreateContainerFileBody)} does not support writing '{format}' format."); } if (Optional.IsDefined(FileId) && _additionalBinaryDataProperties?.ContainsKey("file_id") != true) { @@ -58,20 +58,20 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit } } - InternalCreateContainerFileBody IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options); + CreateContainerFileBody IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options); - protected virtual InternalCreateContainerFileBody JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) + protected virtual CreateContainerFileBody JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(InternalCreateContainerFileBody)} does not support reading '{format}' format."); + throw new FormatException($"The model {nameof(CreateContainerFileBody)} does not support reading '{format}' format."); } using JsonDocument document = JsonDocument.ParseValue(ref reader); - return DeserializeInternalCreateContainerFileBody(document.RootElement, options); + return DeserializeCreateContainerFileBody(document.RootElement, options); } - internal static InternalCreateContainerFileBody DeserializeInternalCreateContainerFileBody(JsonElement element, ModelReaderWriterOptions options) + internal static CreateContainerFileBody DeserializeCreateContainerFileBody(JsonElement element, ModelReaderWriterOptions options) { if (element.ValueKind == JsonValueKind.Null) { @@ -99,40 +99,40 @@ internal static InternalCreateContainerFileBody DeserializeInternalCreateContain // Plugin customization: remove options.Format != "W" check additionalBinaryDataProperties.Add(prop.Name, BinaryData.FromString(prop.Value.GetRawText())); } - return new InternalCreateContainerFileBody(fileId, @file, additionalBinaryDataProperties); + return new CreateContainerFileBody(fileId, @file, additionalBinaryDataProperties); } - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": return ModelReaderWriter.Write(this, options, OpenAIContext.Default); default: - throw new FormatException($"The model {nameof(InternalCreateContainerFileBody)} does not support writing '{options.Format}' format."); + throw new FormatException($"The model {nameof(CreateContainerFileBody)} does not support writing '{options.Format}' format."); } } - InternalCreateContainerFileBody IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); + CreateContainerFileBody IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); - protected virtual InternalCreateContainerFileBody PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) + protected virtual CreateContainerFileBody PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": using (JsonDocument document = JsonDocument.Parse(data)) { - return DeserializeInternalCreateContainerFileBody(document.RootElement, options); + return DeserializeCreateContainerFileBody(document.RootElement, options); } default: - throw new FormatException($"The model {nameof(InternalCreateContainerFileBody)} does not support reading '{options.Format}' format."); + throw new FormatException($"The model {nameof(CreateContainerFileBody)} does not support reading '{options.Format}' format."); } } - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; } } diff --git a/src/Generated/Models/Containers/InternalCreateContainerFileBody.cs b/src/Generated/Models/Containers/CreateContainerFileBody.cs similarity index 61% rename from src/Generated/Models/Containers/InternalCreateContainerFileBody.cs rename to src/Generated/Models/Containers/CreateContainerFileBody.cs index ab108c7f5..17959c5fe 100644 --- a/src/Generated/Models/Containers/InternalCreateContainerFileBody.cs +++ b/src/Generated/Models/Containers/CreateContainerFileBody.cs @@ -4,27 +4,29 @@ using System; using System.Collections.Generic; +using System.Diagnostics.CodeAnalysis; namespace OpenAI.Containers { - internal partial class InternalCreateContainerFileBody + [Experimental("OPENAI001")] + public partial class CreateContainerFileBody { private protected IDictionary _additionalBinaryDataProperties; - public InternalCreateContainerFileBody() + internal CreateContainerFileBody() { } - internal InternalCreateContainerFileBody(string fileId, BinaryData @file, IDictionary additionalBinaryDataProperties) + internal CreateContainerFileBody(string fileId, BinaryData @file, IDictionary additionalBinaryDataProperties) { FileId = fileId; File = @file; _additionalBinaryDataProperties = additionalBinaryDataProperties; } - public string FileId { get; set; } + public string FileId { get; } - public BinaryData File { get; set; } + public BinaryData File { get; } internal IDictionary SerializedAdditionalRawData { diff --git a/src/Generated/Models/Containers/InternalDeleteContainerResponse.Serialization.cs b/src/Generated/Models/Containers/DeleteContainerFileResponse.Serialization.cs similarity index 62% rename from src/Generated/Models/Containers/InternalDeleteContainerResponse.Serialization.cs rename to src/Generated/Models/Containers/DeleteContainerFileResponse.Serialization.cs index 708fe805e..82a927141 100644 --- a/src/Generated/Models/Containers/InternalDeleteContainerResponse.Serialization.cs +++ b/src/Generated/Models/Containers/DeleteContainerFileResponse.Serialization.cs @@ -10,13 +10,13 @@ namespace OpenAI.Containers { - internal partial class InternalDeleteContainerResponse : IJsonModel + public partial class DeleteContainerFileResponse : IJsonModel { - internal InternalDeleteContainerResponse() + internal DeleteContainerFileResponse() { } - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) { writer.WriteStartObject(); JsonModelWriteCore(writer, options); @@ -25,10 +25,10 @@ void IJsonModel.Write(Utf8JsonWriter writer, Mo protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(InternalDeleteContainerResponse)} does not support writing '{format}' format."); + throw new FormatException($"The model {nameof(DeleteContainerFileResponse)} does not support writing '{format}' format."); } if (_additionalBinaryDataProperties?.ContainsKey("id") != true) { @@ -67,20 +67,20 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit } } - InternalDeleteContainerResponse IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options); + DeleteContainerFileResponse IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options); - protected virtual InternalDeleteContainerResponse JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) + protected virtual DeleteContainerFileResponse JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(InternalDeleteContainerResponse)} does not support reading '{format}' format."); + throw new FormatException($"The model {nameof(DeleteContainerFileResponse)} does not support reading '{format}' format."); } using JsonDocument document = JsonDocument.ParseValue(ref reader); - return DeserializeInternalDeleteContainerResponse(document.RootElement, options); + return DeserializeDeleteContainerFileResponse(document.RootElement, options); } - internal static InternalDeleteContainerResponse DeserializeInternalDeleteContainerResponse(JsonElement element, ModelReaderWriterOptions options) + internal static DeleteContainerFileResponse DeserializeDeleteContainerFileResponse(JsonElement element, ModelReaderWriterOptions options) { if (element.ValueKind == JsonValueKind.Null) { @@ -110,40 +110,40 @@ internal static InternalDeleteContainerResponse DeserializeInternalDeleteContain // Plugin customization: remove options.Format != "W" check additionalBinaryDataProperties.Add(prop.Name, BinaryData.FromString(prop.Value.GetRawText())); } - return new InternalDeleteContainerResponse(id, @object, deleted, additionalBinaryDataProperties); + return new DeleteContainerFileResponse(id, @object, deleted, additionalBinaryDataProperties); } - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": return ModelReaderWriter.Write(this, options, OpenAIContext.Default); default: - throw new FormatException($"The model {nameof(InternalDeleteContainerResponse)} does not support writing '{options.Format}' format."); + throw new FormatException($"The model {nameof(DeleteContainerFileResponse)} does not support writing '{options.Format}' format."); } } - InternalDeleteContainerResponse IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); + DeleteContainerFileResponse IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); - protected virtual InternalDeleteContainerResponse PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) + protected virtual DeleteContainerFileResponse PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": using (JsonDocument document = JsonDocument.Parse(data)) { - return DeserializeInternalDeleteContainerResponse(document.RootElement, options); + return DeserializeDeleteContainerFileResponse(document.RootElement, options); } default: - throw new FormatException($"The model {nameof(InternalDeleteContainerResponse)} does not support reading '{options.Format}' format."); + throw new FormatException($"The model {nameof(DeleteContainerFileResponse)} does not support reading '{options.Format}' format."); } } - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; } } diff --git a/src/Generated/Models/Containers/InternalDeleteContainerFileResponse.cs b/src/Generated/Models/Containers/DeleteContainerFileResponse.cs similarity index 70% rename from src/Generated/Models/Containers/InternalDeleteContainerFileResponse.cs rename to src/Generated/Models/Containers/DeleteContainerFileResponse.cs index ca1cb1936..21bf71c81 100644 --- a/src/Generated/Models/Containers/InternalDeleteContainerFileResponse.cs +++ b/src/Generated/Models/Containers/DeleteContainerFileResponse.cs @@ -4,19 +4,21 @@ using System; using System.Collections.Generic; +using System.Diagnostics.CodeAnalysis; namespace OpenAI.Containers { - internal partial class InternalDeleteContainerFileResponse + [Experimental("OPENAI001")] + public partial class DeleteContainerFileResponse { private protected IDictionary _additionalBinaryDataProperties; - internal InternalDeleteContainerFileResponse(string id) + internal DeleteContainerFileResponse(string id) { Id = id; } - internal InternalDeleteContainerFileResponse(string id, string @object, bool deleted, IDictionary additionalBinaryDataProperties) + internal DeleteContainerFileResponse(string id, string @object, bool deleted, IDictionary additionalBinaryDataProperties) { Id = id; Object = @object; diff --git a/src/Generated/Models/Containers/InternalDeleteContainerFileResponse.Serialization.cs b/src/Generated/Models/Containers/DeleteContainerResponse.Serialization.cs similarity index 62% rename from src/Generated/Models/Containers/InternalDeleteContainerFileResponse.Serialization.cs rename to src/Generated/Models/Containers/DeleteContainerResponse.Serialization.cs index f66468ecd..af377111c 100644 --- a/src/Generated/Models/Containers/InternalDeleteContainerFileResponse.Serialization.cs +++ b/src/Generated/Models/Containers/DeleteContainerResponse.Serialization.cs @@ -10,13 +10,13 @@ namespace OpenAI.Containers { - internal partial class InternalDeleteContainerFileResponse : IJsonModel + public partial class DeleteContainerResponse : IJsonModel { - internal InternalDeleteContainerFileResponse() + internal DeleteContainerResponse() { } - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) { writer.WriteStartObject(); JsonModelWriteCore(writer, options); @@ -25,10 +25,10 @@ void IJsonModel.Write(Utf8JsonWriter writer protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(InternalDeleteContainerFileResponse)} does not support writing '{format}' format."); + throw new FormatException($"The model {nameof(DeleteContainerResponse)} does not support writing '{format}' format."); } if (_additionalBinaryDataProperties?.ContainsKey("id") != true) { @@ -67,20 +67,20 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit } } - InternalDeleteContainerFileResponse IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options); + DeleteContainerResponse IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options); - protected virtual InternalDeleteContainerFileResponse JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) + protected virtual DeleteContainerResponse JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(InternalDeleteContainerFileResponse)} does not support reading '{format}' format."); + throw new FormatException($"The model {nameof(DeleteContainerResponse)} does not support reading '{format}' format."); } using JsonDocument document = JsonDocument.ParseValue(ref reader); - return DeserializeInternalDeleteContainerFileResponse(document.RootElement, options); + return DeserializeDeleteContainerResponse(document.RootElement, options); } - internal static InternalDeleteContainerFileResponse DeserializeInternalDeleteContainerFileResponse(JsonElement element, ModelReaderWriterOptions options) + internal static DeleteContainerResponse DeserializeDeleteContainerResponse(JsonElement element, ModelReaderWriterOptions options) { if (element.ValueKind == JsonValueKind.Null) { @@ -110,40 +110,40 @@ internal static InternalDeleteContainerFileResponse DeserializeInternalDeleteCon // Plugin customization: remove options.Format != "W" check additionalBinaryDataProperties.Add(prop.Name, BinaryData.FromString(prop.Value.GetRawText())); } - return new InternalDeleteContainerFileResponse(id, @object, deleted, additionalBinaryDataProperties); + return new DeleteContainerResponse(id, @object, deleted, additionalBinaryDataProperties); } - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": return ModelReaderWriter.Write(this, options, OpenAIContext.Default); default: - throw new FormatException($"The model {nameof(InternalDeleteContainerFileResponse)} does not support writing '{options.Format}' format."); + throw new FormatException($"The model {nameof(DeleteContainerResponse)} does not support writing '{options.Format}' format."); } } - InternalDeleteContainerFileResponse IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); + DeleteContainerResponse IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); - protected virtual InternalDeleteContainerFileResponse PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) + protected virtual DeleteContainerResponse PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": using (JsonDocument document = JsonDocument.Parse(data)) { - return DeserializeInternalDeleteContainerFileResponse(document.RootElement, options); + return DeserializeDeleteContainerResponse(document.RootElement, options); } default: - throw new FormatException($"The model {nameof(InternalDeleteContainerFileResponse)} does not support reading '{options.Format}' format."); + throw new FormatException($"The model {nameof(DeleteContainerResponse)} does not support reading '{options.Format}' format."); } } - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; } } diff --git a/src/Generated/Models/Containers/InternalDeleteContainerResponse.cs b/src/Generated/Models/Containers/DeleteContainerResponse.cs similarity index 71% rename from src/Generated/Models/Containers/InternalDeleteContainerResponse.cs rename to src/Generated/Models/Containers/DeleteContainerResponse.cs index 68b0c9832..0155cd58f 100644 --- a/src/Generated/Models/Containers/InternalDeleteContainerResponse.cs +++ b/src/Generated/Models/Containers/DeleteContainerResponse.cs @@ -4,19 +4,21 @@ using System; using System.Collections.Generic; +using System.Diagnostics.CodeAnalysis; namespace OpenAI.Containers { - internal partial class InternalDeleteContainerResponse + [Experimental("OPENAI001")] + public partial class DeleteContainerResponse { private protected IDictionary _additionalBinaryDataProperties; - internal InternalDeleteContainerResponse(string id) + internal DeleteContainerResponse(string id) { Id = id; } - internal InternalDeleteContainerResponse(string id, string @object, bool deleted, IDictionary additionalBinaryDataProperties) + internal DeleteContainerResponse(string id, string @object, bool deleted, IDictionary additionalBinaryDataProperties) { Id = id; Object = @object; diff --git a/src/Generated/Models/Evals/InternalEvalGraderLabelModelParams.Serialization.cs b/src/Generated/Models/Evals/InternalEvalGraderLabelModelParams.Serialization.cs index 3b7bad63b..6def1d092 100644 --- a/src/Generated/Models/Evals/InternalEvalGraderLabelModelParams.Serialization.cs +++ b/src/Generated/Models/Evals/InternalEvalGraderLabelModelParams.Serialization.cs @@ -13,7 +13,7 @@ namespace OpenAI.Evals { internal partial class InternalEvalGraderLabelModelParams : IJsonModel { - internal InternalEvalGraderLabelModelParams() : this(InternalGraderType.LabelModel, null, null, null, null, null, null) + internal InternalEvalGraderLabelModelParams() : this(GraderType.LabelModel, null, null, null, null, null, null) { } @@ -115,7 +115,7 @@ internal static InternalEvalGraderLabelModelParams DeserializeInternalEvalGrader { return null; } - InternalGraderType kind = default; + GraderType kind = default; IDictionary additionalBinaryDataProperties = new ChangeTrackingDictionary(); string name = default; string model = default; @@ -126,7 +126,7 @@ internal static InternalEvalGraderLabelModelParams DeserializeInternalEvalGrader { if (prop.NameEquals("type"u8)) { - kind = new InternalGraderType(prop.Value.GetString()); + kind = new GraderType(prop.Value.GetString()); continue; } if (prop.NameEquals("name"u8)) diff --git a/src/Generated/Models/Evals/InternalEvalGraderLabelModelParams.cs b/src/Generated/Models/Evals/InternalEvalGraderLabelModelParams.cs index d73f90622..37b26bb31 100644 --- a/src/Generated/Models/Evals/InternalEvalGraderLabelModelParams.cs +++ b/src/Generated/Models/Evals/InternalEvalGraderLabelModelParams.cs @@ -12,7 +12,7 @@ namespace OpenAI.Evals { internal partial class InternalEvalGraderLabelModelParams : InternalEvalGraderParams { - public InternalEvalGraderLabelModelParams(string name, string model, IEnumerable input, IEnumerable labels, IEnumerable passingLabels) : base(InternalGraderType.LabelModel) + public InternalEvalGraderLabelModelParams(string name, string model, IEnumerable input, IEnumerable labels, IEnumerable passingLabels) : base(GraderType.LabelModel) { Argument.AssertNotNull(name, nameof(name)); Argument.AssertNotNull(model, nameof(model)); @@ -27,7 +27,7 @@ public InternalEvalGraderLabelModelParams(string name, string model, IEnumerable PassingLabels = passingLabels.ToList(); } - internal InternalEvalGraderLabelModelParams(InternalGraderType kind, IDictionary additionalBinaryDataProperties, string name, string model, IList input, IList labels, IList passingLabels) : base(kind, additionalBinaryDataProperties) + internal InternalEvalGraderLabelModelParams(GraderType kind, IDictionary additionalBinaryDataProperties, string name, string model, IList input, IList labels, IList passingLabels) : base(kind, additionalBinaryDataProperties) { // Plugin customization: ensure initialization of collections Name = name; diff --git a/src/Generated/Models/Evals/InternalEvalGraderLabelModelResource.Serialization.cs b/src/Generated/Models/Evals/InternalEvalGraderLabelModelResource.Serialization.cs index fbefea86e..77fdbf073 100644 --- a/src/Generated/Models/Evals/InternalEvalGraderLabelModelResource.Serialization.cs +++ b/src/Generated/Models/Evals/InternalEvalGraderLabelModelResource.Serialization.cs @@ -13,7 +13,7 @@ namespace OpenAI.Evals { internal partial class InternalEvalGraderLabelModelResource : IJsonModel { - internal InternalEvalGraderLabelModelResource() : this(InternalGraderType.LabelModel, null, null, null, null, null, null) + internal InternalEvalGraderLabelModelResource() : this(GraderType.LabelModel, null, null, null, null, null, null) { } @@ -103,7 +103,7 @@ internal static InternalEvalGraderLabelModelResource DeserializeInternalEvalGrad { return null; } - InternalGraderType kind = default; + GraderType kind = default; IDictionary additionalBinaryDataProperties = new ChangeTrackingDictionary(); string name = default; string model = default; @@ -114,7 +114,7 @@ internal static InternalEvalGraderLabelModelResource DeserializeInternalEvalGrad { if (prop.NameEquals("type"u8)) { - kind = new InternalGraderType(prop.Value.GetString()); + kind = new GraderType(prop.Value.GetString()); continue; } if (prop.NameEquals("name"u8)) diff --git a/src/Generated/Models/Evals/InternalEvalGraderLabelModelResource.cs b/src/Generated/Models/Evals/InternalEvalGraderLabelModelResource.cs index cef952fd4..c8145adbe 100644 --- a/src/Generated/Models/Evals/InternalEvalGraderLabelModelResource.cs +++ b/src/Generated/Models/Evals/InternalEvalGraderLabelModelResource.cs @@ -12,7 +12,7 @@ namespace OpenAI.Evals { internal partial class InternalEvalGraderLabelModelResource : InternalEvalGraderResource { - internal InternalEvalGraderLabelModelResource(string name, string model, IEnumerable input, IEnumerable labels, IEnumerable passingLabels) : base(InternalGraderType.LabelModel) + internal InternalEvalGraderLabelModelResource(string name, string model, IEnumerable input, IEnumerable labels, IEnumerable passingLabels) : base(GraderType.LabelModel) { Name = name; Model = model; @@ -21,7 +21,7 @@ internal InternalEvalGraderLabelModelResource(string name, string model, IEnumer PassingLabels = passingLabels.ToList(); } - internal InternalEvalGraderLabelModelResource(InternalGraderType kind, IDictionary additionalBinaryDataProperties, string name, string model, IList input, IList labels, IList passingLabels) : base(kind, additionalBinaryDataProperties) + internal InternalEvalGraderLabelModelResource(GraderType kind, IDictionary additionalBinaryDataProperties, string name, string model, IList input, IList labels, IList passingLabels) : base(kind, additionalBinaryDataProperties) { // Plugin customization: ensure initialization of collections Name = name; diff --git a/src/Generated/Models/Evals/InternalEvalGraderParams.cs b/src/Generated/Models/Evals/InternalEvalGraderParams.cs index 782394818..24789473b 100644 --- a/src/Generated/Models/Evals/InternalEvalGraderParams.cs +++ b/src/Generated/Models/Evals/InternalEvalGraderParams.cs @@ -12,18 +12,18 @@ internal abstract partial class InternalEvalGraderParams { private protected IDictionary _additionalBinaryDataProperties; - private protected InternalEvalGraderParams(InternalGraderType kind) + private protected InternalEvalGraderParams(GraderType kind) { Kind = kind; } - internal InternalEvalGraderParams(InternalGraderType kind, IDictionary additionalBinaryDataProperties) + internal InternalEvalGraderParams(GraderType kind, IDictionary additionalBinaryDataProperties) { Kind = kind; _additionalBinaryDataProperties = additionalBinaryDataProperties; } - internal InternalGraderType Kind { get; set; } + internal GraderType Kind { get; set; } internal IDictionary SerializedAdditionalRawData { diff --git a/src/Generated/Models/Evals/InternalEvalGraderPythonParams.Serialization.cs b/src/Generated/Models/Evals/InternalEvalGraderPythonParams.Serialization.cs index 95b78aadf..048aae42b 100644 --- a/src/Generated/Models/Evals/InternalEvalGraderPythonParams.Serialization.cs +++ b/src/Generated/Models/Evals/InternalEvalGraderPythonParams.Serialization.cs @@ -13,7 +13,7 @@ namespace OpenAI.Evals { internal partial class InternalEvalGraderPythonParams : IJsonModel { - internal InternalEvalGraderPythonParams() : this(InternalGraderType.Python, null, null, null, null, default) + internal InternalEvalGraderPythonParams() : this(GraderType.Python, null, null, null, null, default) { } @@ -73,7 +73,7 @@ internal static InternalEvalGraderPythonParams DeserializeInternalEvalGraderPyth { return null; } - InternalGraderType kind = default; + GraderType kind = default; IDictionary additionalBinaryDataProperties = new ChangeTrackingDictionary(); string name = default; string source = default; @@ -83,7 +83,7 @@ internal static InternalEvalGraderPythonParams DeserializeInternalEvalGraderPyth { if (prop.NameEquals("type"u8)) { - kind = new InternalGraderType(prop.Value.GetString()); + kind = new GraderType(prop.Value.GetString()); continue; } if (prop.NameEquals("name"u8)) diff --git a/src/Generated/Models/Evals/InternalEvalGraderPythonParams.cs b/src/Generated/Models/Evals/InternalEvalGraderPythonParams.cs index 9af0de091..77a186e30 100644 --- a/src/Generated/Models/Evals/InternalEvalGraderPythonParams.cs +++ b/src/Generated/Models/Evals/InternalEvalGraderPythonParams.cs @@ -11,7 +11,7 @@ namespace OpenAI.Evals { internal partial class InternalEvalGraderPythonParams : InternalEvalGraderParams { - public InternalEvalGraderPythonParams(string name, string source) : base(InternalGraderType.Python) + public InternalEvalGraderPythonParams(string name, string source) : base(GraderType.Python) { Argument.AssertNotNull(name, nameof(name)); Argument.AssertNotNull(source, nameof(source)); @@ -20,7 +20,7 @@ public InternalEvalGraderPythonParams(string name, string source) : base(Interna Source = source; } - internal InternalEvalGraderPythonParams(InternalGraderType kind, IDictionary additionalBinaryDataProperties, string name, string source, string imageTag, float? passThreshold) : base(kind, additionalBinaryDataProperties) + internal InternalEvalGraderPythonParams(GraderType kind, IDictionary additionalBinaryDataProperties, string name, string source, string imageTag, float? passThreshold) : base(kind, additionalBinaryDataProperties) { Name = name; Source = source; diff --git a/src/Generated/Models/Evals/InternalEvalGraderPythonResource.Serialization.cs b/src/Generated/Models/Evals/InternalEvalGraderPythonResource.Serialization.cs index c65c50a86..d0901f081 100644 --- a/src/Generated/Models/Evals/InternalEvalGraderPythonResource.Serialization.cs +++ b/src/Generated/Models/Evals/InternalEvalGraderPythonResource.Serialization.cs @@ -13,7 +13,7 @@ namespace OpenAI.Evals { internal partial class InternalEvalGraderPythonResource : IJsonModel { - internal InternalEvalGraderPythonResource() : this(InternalGraderType.Python, null, null, null, null, default) + internal InternalEvalGraderPythonResource() : this(GraderType.Python, null, null, null, null, default) { } @@ -73,7 +73,7 @@ internal static InternalEvalGraderPythonResource DeserializeInternalEvalGraderPy { return null; } - InternalGraderType kind = default; + GraderType kind = default; IDictionary additionalBinaryDataProperties = new ChangeTrackingDictionary(); string name = default; string source = default; @@ -83,7 +83,7 @@ internal static InternalEvalGraderPythonResource DeserializeInternalEvalGraderPy { if (prop.NameEquals("type"u8)) { - kind = new InternalGraderType(prop.Value.GetString()); + kind = new GraderType(prop.Value.GetString()); continue; } if (prop.NameEquals("name"u8)) diff --git a/src/Generated/Models/Evals/InternalEvalGraderPythonResource.cs b/src/Generated/Models/Evals/InternalEvalGraderPythonResource.cs index da519df81..d29ed4542 100644 --- a/src/Generated/Models/Evals/InternalEvalGraderPythonResource.cs +++ b/src/Generated/Models/Evals/InternalEvalGraderPythonResource.cs @@ -10,13 +10,13 @@ namespace OpenAI.Evals { internal partial class InternalEvalGraderPythonResource : InternalEvalGraderResource { - internal InternalEvalGraderPythonResource(string name, string source) : base(InternalGraderType.Python) + internal InternalEvalGraderPythonResource(string name, string source) : base(GraderType.Python) { Name = name; Source = source; } - internal InternalEvalGraderPythonResource(InternalGraderType kind, IDictionary additionalBinaryDataProperties, string name, string source, string imageTag, float? passThreshold) : base(kind, additionalBinaryDataProperties) + internal InternalEvalGraderPythonResource(GraderType kind, IDictionary additionalBinaryDataProperties, string name, string source, string imageTag, float? passThreshold) : base(kind, additionalBinaryDataProperties) { Name = name; Source = source; diff --git a/src/Generated/Models/Evals/InternalEvalGraderResource.cs b/src/Generated/Models/Evals/InternalEvalGraderResource.cs index 82c26d0a2..b050b2c35 100644 --- a/src/Generated/Models/Evals/InternalEvalGraderResource.cs +++ b/src/Generated/Models/Evals/InternalEvalGraderResource.cs @@ -12,18 +12,18 @@ internal abstract partial class InternalEvalGraderResource { private protected IDictionary _additionalBinaryDataProperties; - private protected InternalEvalGraderResource(InternalGraderType kind) + private protected InternalEvalGraderResource(GraderType kind) { Kind = kind; } - internal InternalEvalGraderResource(InternalGraderType kind, IDictionary additionalBinaryDataProperties) + internal InternalEvalGraderResource(GraderType kind, IDictionary additionalBinaryDataProperties) { Kind = kind; _additionalBinaryDataProperties = additionalBinaryDataProperties; } - internal InternalGraderType Kind { get; set; } + internal GraderType Kind { get; set; } internal IDictionary SerializedAdditionalRawData { diff --git a/src/Generated/Models/Evals/InternalEvalGraderScoreModelParams.Serialization.cs b/src/Generated/Models/Evals/InternalEvalGraderScoreModelParams.Serialization.cs index 3c6f98891..5482f048c 100644 --- a/src/Generated/Models/Evals/InternalEvalGraderScoreModelParams.Serialization.cs +++ b/src/Generated/Models/Evals/InternalEvalGraderScoreModelParams.Serialization.cs @@ -13,7 +13,7 @@ namespace OpenAI.Evals { internal partial class InternalEvalGraderScoreModelParams : IJsonModel { - internal InternalEvalGraderScoreModelParams() : this(InternalGraderType.ScoreModel, null, null, null, null, null, null, default) + internal InternalEvalGraderScoreModelParams() : this(GraderType.ScoreModel, null, null, null, null, null, null, default) { } @@ -100,7 +100,7 @@ internal static InternalEvalGraderScoreModelParams DeserializeInternalEvalGrader { return null; } - InternalGraderType kind = default; + GraderType kind = default; IDictionary additionalBinaryDataProperties = new ChangeTrackingDictionary(); string name = default; string model = default; @@ -112,7 +112,7 @@ internal static InternalEvalGraderScoreModelParams DeserializeInternalEvalGrader { if (prop.NameEquals("type"u8)) { - kind = new InternalGraderType(prop.Value.GetString()); + kind = new GraderType(prop.Value.GetString()); continue; } if (prop.NameEquals("name"u8)) diff --git a/src/Generated/Models/Evals/InternalEvalGraderScoreModelParams.cs b/src/Generated/Models/Evals/InternalEvalGraderScoreModelParams.cs index 069b05e53..155dcd114 100644 --- a/src/Generated/Models/Evals/InternalEvalGraderScoreModelParams.cs +++ b/src/Generated/Models/Evals/InternalEvalGraderScoreModelParams.cs @@ -12,7 +12,7 @@ namespace OpenAI.Evals { internal partial class InternalEvalGraderScoreModelParams : InternalEvalGraderParams { - internal InternalEvalGraderScoreModelParams(string name, string model, IEnumerable input) : base(InternalGraderType.ScoreModel) + internal InternalEvalGraderScoreModelParams(string name, string model, IEnumerable input) : base(GraderType.ScoreModel) { Argument.AssertNotNull(name, nameof(name)); Argument.AssertNotNull(model, nameof(model)); @@ -24,7 +24,7 @@ internal InternalEvalGraderScoreModelParams(string name, string model, IEnumerab Range = new ChangeTrackingList(); } - internal InternalEvalGraderScoreModelParams(InternalGraderType kind, IDictionary additionalBinaryDataProperties, string name, string model, BinaryData samplingParams, IList input, IList range, float? passThreshold) : base(kind, additionalBinaryDataProperties) + internal InternalEvalGraderScoreModelParams(GraderType kind, IDictionary additionalBinaryDataProperties, string name, string model, BinaryData samplingParams, IList input, IList range, float? passThreshold) : base(kind, additionalBinaryDataProperties) { // Plugin customization: ensure initialization of collections Name = name; diff --git a/src/Generated/Models/Evals/InternalEvalGraderScoreModelResource.Serialization.cs b/src/Generated/Models/Evals/InternalEvalGraderScoreModelResource.Serialization.cs index f781ccf0e..4eeaaba34 100644 --- a/src/Generated/Models/Evals/InternalEvalGraderScoreModelResource.Serialization.cs +++ b/src/Generated/Models/Evals/InternalEvalGraderScoreModelResource.Serialization.cs @@ -13,7 +13,7 @@ namespace OpenAI.Evals { internal partial class InternalEvalGraderScoreModelResource : IJsonModel { - internal InternalEvalGraderScoreModelResource() : this(InternalGraderType.ScoreModel, null, null, null, null, null, null, default) + internal InternalEvalGraderScoreModelResource() : this(GraderType.ScoreModel, null, null, null, null, null, null, default) { } @@ -100,7 +100,7 @@ internal static InternalEvalGraderScoreModelResource DeserializeInternalEvalGrad { return null; } - InternalGraderType kind = default; + GraderType kind = default; IDictionary additionalBinaryDataProperties = new ChangeTrackingDictionary(); string name = default; string model = default; @@ -112,7 +112,7 @@ internal static InternalEvalGraderScoreModelResource DeserializeInternalEvalGrad { if (prop.NameEquals("type"u8)) { - kind = new InternalGraderType(prop.Value.GetString()); + kind = new GraderType(prop.Value.GetString()); continue; } if (prop.NameEquals("name"u8)) diff --git a/src/Generated/Models/Evals/InternalEvalGraderScoreModelResource.cs b/src/Generated/Models/Evals/InternalEvalGraderScoreModelResource.cs index 3f80299ec..8820ac3d0 100644 --- a/src/Generated/Models/Evals/InternalEvalGraderScoreModelResource.cs +++ b/src/Generated/Models/Evals/InternalEvalGraderScoreModelResource.cs @@ -12,7 +12,7 @@ namespace OpenAI.Evals { internal partial class InternalEvalGraderScoreModelResource : InternalEvalGraderResource { - internal InternalEvalGraderScoreModelResource(string name, string model, IEnumerable input) : base(InternalGraderType.ScoreModel) + internal InternalEvalGraderScoreModelResource(string name, string model, IEnumerable input) : base(GraderType.ScoreModel) { Name = name; Model = model; @@ -20,7 +20,7 @@ internal InternalEvalGraderScoreModelResource(string name, string model, IEnumer Range = new ChangeTrackingList(); } - internal InternalEvalGraderScoreModelResource(InternalGraderType kind, IDictionary additionalBinaryDataProperties, string name, string model, BinaryData samplingParams, IList input, IList range, float? passThreshold) : base(kind, additionalBinaryDataProperties) + internal InternalEvalGraderScoreModelResource(GraderType kind, IDictionary additionalBinaryDataProperties, string name, string model, BinaryData samplingParams, IList input, IList range, float? passThreshold) : base(kind, additionalBinaryDataProperties) { // Plugin customization: ensure initialization of collections Name = name; diff --git a/src/Generated/Models/Evals/InternalEvalGraderStringCheckParams.Serialization.cs b/src/Generated/Models/Evals/InternalEvalGraderStringCheckParams.Serialization.cs index 89ad93f61..0795b8b70 100644 --- a/src/Generated/Models/Evals/InternalEvalGraderStringCheckParams.Serialization.cs +++ b/src/Generated/Models/Evals/InternalEvalGraderStringCheckParams.Serialization.cs @@ -13,7 +13,7 @@ namespace OpenAI.Evals { internal partial class InternalEvalGraderStringCheckParams : IJsonModel { - internal InternalEvalGraderStringCheckParams() : this(InternalGraderType.StringCheck, null, null, null, null, default) + internal InternalEvalGraderStringCheckParams() : this(GraderType.StringCheck, null, null, null, null, default) { } @@ -73,17 +73,17 @@ internal static InternalEvalGraderStringCheckParams DeserializeInternalEvalGrade { return null; } - InternalGraderType kind = default; + GraderType kind = default; IDictionary additionalBinaryDataProperties = new ChangeTrackingDictionary(); string name = default; string input = default; string reference = default; - InternalGraderStringCheckOperation operation = default; + GraderStringCheckOperation operation = default; foreach (var prop in element.EnumerateObject()) { if (prop.NameEquals("type"u8)) { - kind = new InternalGraderType(prop.Value.GetString()); + kind = new GraderType(prop.Value.GetString()); continue; } if (prop.NameEquals("name"u8)) @@ -103,7 +103,7 @@ internal static InternalEvalGraderStringCheckParams DeserializeInternalEvalGrade } if (prop.NameEquals("operation"u8)) { - operation = new InternalGraderStringCheckOperation(prop.Value.GetString()); + operation = new GraderStringCheckOperation(prop.Value.GetString()); continue; } // Plugin customization: remove options.Format != "W" check diff --git a/src/Generated/Models/Evals/InternalEvalGraderStringCheckParams.cs b/src/Generated/Models/Evals/InternalEvalGraderStringCheckParams.cs index 0d86f8a47..a8514646c 100644 --- a/src/Generated/Models/Evals/InternalEvalGraderStringCheckParams.cs +++ b/src/Generated/Models/Evals/InternalEvalGraderStringCheckParams.cs @@ -11,7 +11,7 @@ namespace OpenAI.Evals { internal partial class InternalEvalGraderStringCheckParams : InternalEvalGraderParams { - internal InternalEvalGraderStringCheckParams(string name, string input, string reference, InternalGraderStringCheckOperation operation) : base(InternalGraderType.StringCheck) + public InternalEvalGraderStringCheckParams(string name, string input, string reference, GraderStringCheckOperation operation) : base(GraderType.StringCheck) { Argument.AssertNotNull(name, nameof(name)); Argument.AssertNotNull(input, nameof(input)); @@ -23,7 +23,7 @@ internal InternalEvalGraderStringCheckParams(string name, string input, string r Operation = operation; } - internal InternalEvalGraderStringCheckParams(InternalGraderType kind, IDictionary additionalBinaryDataProperties, string name, string input, string reference, InternalGraderStringCheckOperation operation) : base(kind, additionalBinaryDataProperties) + internal InternalEvalGraderStringCheckParams(GraderType kind, IDictionary additionalBinaryDataProperties, string name, string input, string reference, GraderStringCheckOperation operation) : base(kind, additionalBinaryDataProperties) { Name = name; Input = input; @@ -37,6 +37,6 @@ internal InternalEvalGraderStringCheckParams(InternalGraderType kind, IDictionar public string Reference { get; } - internal InternalGraderStringCheckOperation Operation { get; } + public GraderStringCheckOperation Operation { get; } } } diff --git a/src/Generated/Models/Evals/InternalEvalGraderTextSimilarityParams.Serialization.cs b/src/Generated/Models/Evals/InternalEvalGraderTextSimilarityParams.Serialization.cs index 961f98b6b..f7fb554bb 100644 --- a/src/Generated/Models/Evals/InternalEvalGraderTextSimilarityParams.Serialization.cs +++ b/src/Generated/Models/Evals/InternalEvalGraderTextSimilarityParams.Serialization.cs @@ -13,7 +13,7 @@ namespace OpenAI.Evals { internal partial class InternalEvalGraderTextSimilarityParams : IJsonModel { - internal InternalEvalGraderTextSimilarityParams() : this(InternalGraderType.TextSimilarity, null, null, null, null, default, default) + internal InternalEvalGraderTextSimilarityParams() : this(GraderType.TextSimilarity, null, null, null, null, default, default) { } @@ -78,18 +78,18 @@ internal static InternalEvalGraderTextSimilarityParams DeserializeInternalEvalGr { return null; } - InternalGraderType kind = default; + GraderType kind = default; IDictionary additionalBinaryDataProperties = new ChangeTrackingDictionary(); string name = default; string input = default; string reference = default; - InternalGraderTextSimilarityEvaluationMetric evaluationMetric = default; + GraderTextSimilarityEvaluationMetric evaluationMetric = default; float passThreshold = default; foreach (var prop in element.EnumerateObject()) { if (prop.NameEquals("type"u8)) { - kind = new InternalGraderType(prop.Value.GetString()); + kind = new GraderType(prop.Value.GetString()); continue; } if (prop.NameEquals("name"u8)) @@ -109,7 +109,7 @@ internal static InternalEvalGraderTextSimilarityParams DeserializeInternalEvalGr } if (prop.NameEquals("evaluation_metric"u8)) { - evaluationMetric = new InternalGraderTextSimilarityEvaluationMetric(prop.Value.GetString()); + evaluationMetric = new GraderTextSimilarityEvaluationMetric(prop.Value.GetString()); continue; } if (prop.NameEquals("pass_threshold"u8)) diff --git a/src/Generated/Models/Evals/InternalEvalGraderTextSimilarityParams.cs b/src/Generated/Models/Evals/InternalEvalGraderTextSimilarityParams.cs index 700aebdba..05b655832 100644 --- a/src/Generated/Models/Evals/InternalEvalGraderTextSimilarityParams.cs +++ b/src/Generated/Models/Evals/InternalEvalGraderTextSimilarityParams.cs @@ -11,7 +11,7 @@ namespace OpenAI.Evals { internal partial class InternalEvalGraderTextSimilarityParams : InternalEvalGraderParams { - internal InternalEvalGraderTextSimilarityParams(string name, string input, string reference, InternalGraderTextSimilarityEvaluationMetric evaluationMetric, float passThreshold) : base(InternalGraderType.TextSimilarity) + public InternalEvalGraderTextSimilarityParams(string name, string input, string reference, GraderTextSimilarityEvaluationMetric evaluationMetric, float passThreshold) : base(GraderType.TextSimilarity) { Argument.AssertNotNull(name, nameof(name)); Argument.AssertNotNull(input, nameof(input)); @@ -24,7 +24,7 @@ internal InternalEvalGraderTextSimilarityParams(string name, string input, strin PassThreshold = passThreshold; } - internal InternalEvalGraderTextSimilarityParams(InternalGraderType kind, IDictionary additionalBinaryDataProperties, string name, string input, string reference, InternalGraderTextSimilarityEvaluationMetric evaluationMetric, float passThreshold) : base(kind, additionalBinaryDataProperties) + internal InternalEvalGraderTextSimilarityParams(GraderType kind, IDictionary additionalBinaryDataProperties, string name, string input, string reference, GraderTextSimilarityEvaluationMetric evaluationMetric, float passThreshold) : base(kind, additionalBinaryDataProperties) { Name = name; Input = input; @@ -39,7 +39,7 @@ internal InternalEvalGraderTextSimilarityParams(InternalGraderType kind, IDictio public string Reference { get; } - internal InternalGraderTextSimilarityEvaluationMetric EvaluationMetric { get; } + public GraderTextSimilarityEvaluationMetric EvaluationMetric { get; } public float PassThreshold { get; } } diff --git a/src/Generated/Models/Evals/InternalEvalGraderTextSimilarityResource.Serialization.cs b/src/Generated/Models/Evals/InternalEvalGraderTextSimilarityResource.Serialization.cs index 7cf5943ea..5ddc78224 100644 --- a/src/Generated/Models/Evals/InternalEvalGraderTextSimilarityResource.Serialization.cs +++ b/src/Generated/Models/Evals/InternalEvalGraderTextSimilarityResource.Serialization.cs @@ -13,7 +13,7 @@ namespace OpenAI.Evals { internal partial class InternalEvalGraderTextSimilarityResource : IJsonModel { - internal InternalEvalGraderTextSimilarityResource() : this(InternalGraderType.TextSimilarity, null, null, null, null, default, default) + internal InternalEvalGraderTextSimilarityResource() : this(GraderType.TextSimilarity, null, null, null, null, default, default) { } @@ -78,18 +78,18 @@ internal static InternalEvalGraderTextSimilarityResource DeserializeInternalEval { return null; } - InternalGraderType kind = default; + GraderType kind = default; IDictionary additionalBinaryDataProperties = new ChangeTrackingDictionary(); string name = default; string input = default; string reference = default; - InternalGraderTextSimilarityEvaluationMetric evaluationMetric = default; + GraderTextSimilarityEvaluationMetric evaluationMetric = default; float passThreshold = default; foreach (var prop in element.EnumerateObject()) { if (prop.NameEquals("type"u8)) { - kind = new InternalGraderType(prop.Value.GetString()); + kind = new GraderType(prop.Value.GetString()); continue; } if (prop.NameEquals("name"u8)) @@ -109,7 +109,7 @@ internal static InternalEvalGraderTextSimilarityResource DeserializeInternalEval } if (prop.NameEquals("evaluation_metric"u8)) { - evaluationMetric = new InternalGraderTextSimilarityEvaluationMetric(prop.Value.GetString()); + evaluationMetric = new GraderTextSimilarityEvaluationMetric(prop.Value.GetString()); continue; } if (prop.NameEquals("pass_threshold"u8)) diff --git a/src/Generated/Models/Evals/InternalEvalGraderTextSimilarityResource.cs b/src/Generated/Models/Evals/InternalEvalGraderTextSimilarityResource.cs index d9c9ecbb3..9ed4dc846 100644 --- a/src/Generated/Models/Evals/InternalEvalGraderTextSimilarityResource.cs +++ b/src/Generated/Models/Evals/InternalEvalGraderTextSimilarityResource.cs @@ -10,7 +10,7 @@ namespace OpenAI.Evals { internal partial class InternalEvalGraderTextSimilarityResource : InternalEvalGraderResource { - internal InternalEvalGraderTextSimilarityResource(string name, string input, string reference, InternalGraderTextSimilarityEvaluationMetric evaluationMetric, float passThreshold) : base(InternalGraderType.TextSimilarity) + internal InternalEvalGraderTextSimilarityResource(string name, string input, string reference, GraderTextSimilarityEvaluationMetric evaluationMetric, float passThreshold) : base(GraderType.TextSimilarity) { Name = name; Input = input; @@ -19,7 +19,7 @@ internal InternalEvalGraderTextSimilarityResource(string name, string input, str PassThreshold = passThreshold; } - internal InternalEvalGraderTextSimilarityResource(InternalGraderType kind, IDictionary additionalBinaryDataProperties, string name, string input, string reference, InternalGraderTextSimilarityEvaluationMetric evaluationMetric, float passThreshold) : base(kind, additionalBinaryDataProperties) + internal InternalEvalGraderTextSimilarityResource(GraderType kind, IDictionary additionalBinaryDataProperties, string name, string input, string reference, GraderTextSimilarityEvaluationMetric evaluationMetric, float passThreshold) : base(kind, additionalBinaryDataProperties) { Name = name; Input = input; @@ -34,7 +34,7 @@ internal InternalEvalGraderTextSimilarityResource(InternalGraderType kind, IDict public string Reference { get; } - internal InternalGraderTextSimilarityEvaluationMetric EvaluationMetric { get; } + public GraderTextSimilarityEvaluationMetric EvaluationMetric { get; } public float PassThreshold { get; } } diff --git a/src/Generated/Models/Evals/InternalUnknownEvalGraderParams.Serialization.cs b/src/Generated/Models/Evals/InternalUnknownEvalGraderParams.Serialization.cs index 247d230da..3e89010f6 100644 --- a/src/Generated/Models/Evals/InternalUnknownEvalGraderParams.Serialization.cs +++ b/src/Generated/Models/Evals/InternalUnknownEvalGraderParams.Serialization.cs @@ -53,13 +53,13 @@ internal static InternalUnknownEvalGraderParams DeserializeInternalUnknownEvalGr { return null; } - InternalGraderType kind = default; + GraderType kind = default; IDictionary additionalBinaryDataProperties = new ChangeTrackingDictionary(); foreach (var prop in element.EnumerateObject()) { if (prop.NameEquals("type"u8)) { - kind = new InternalGraderType(prop.Value.GetString()); + kind = new GraderType(prop.Value.GetString()); continue; } // Plugin customization: remove options.Format != "W" check diff --git a/src/Generated/Models/Evals/InternalUnknownEvalGraderParams.cs b/src/Generated/Models/Evals/InternalUnknownEvalGraderParams.cs index 71bb4347f..cf956b7af 100644 --- a/src/Generated/Models/Evals/InternalUnknownEvalGraderParams.cs +++ b/src/Generated/Models/Evals/InternalUnknownEvalGraderParams.cs @@ -10,7 +10,7 @@ namespace OpenAI.Evals { internal partial class InternalUnknownEvalGraderParams : InternalEvalGraderParams { - internal InternalUnknownEvalGraderParams(InternalGraderType kind, IDictionary additionalBinaryDataProperties) : base(kind != default ? kind : "unknown", additionalBinaryDataProperties) + internal InternalUnknownEvalGraderParams(GraderType kind, IDictionary additionalBinaryDataProperties) : base(kind != default ? kind : "unknown", additionalBinaryDataProperties) { } } diff --git a/src/Generated/Models/Evals/InternalUnknownEvalGraderResource.Serialization.cs b/src/Generated/Models/Evals/InternalUnknownEvalGraderResource.Serialization.cs index e7ddff201..e52a6075a 100644 --- a/src/Generated/Models/Evals/InternalUnknownEvalGraderResource.Serialization.cs +++ b/src/Generated/Models/Evals/InternalUnknownEvalGraderResource.Serialization.cs @@ -53,13 +53,13 @@ internal static InternalUnknownEvalGraderResource DeserializeInternalUnknownEval { return null; } - InternalGraderType kind = default; + GraderType kind = default; IDictionary additionalBinaryDataProperties = new ChangeTrackingDictionary(); foreach (var prop in element.EnumerateObject()) { if (prop.NameEquals("type"u8)) { - kind = new InternalGraderType(prop.Value.GetString()); + kind = new GraderType(prop.Value.GetString()); continue; } // Plugin customization: remove options.Format != "W" check diff --git a/src/Generated/Models/Evals/InternalUnknownEvalGraderResource.cs b/src/Generated/Models/Evals/InternalUnknownEvalGraderResource.cs index a0d6169dd..df6ea881b 100644 --- a/src/Generated/Models/Evals/InternalUnknownEvalGraderResource.cs +++ b/src/Generated/Models/Evals/InternalUnknownEvalGraderResource.cs @@ -10,7 +10,7 @@ namespace OpenAI.Evals { internal partial class InternalUnknownEvalGraderResource : InternalEvalGraderResource { - internal InternalUnknownEvalGraderResource(InternalGraderType kind, IDictionary additionalBinaryDataProperties) : base(kind != default ? kind : "unknown", additionalBinaryDataProperties) + internal InternalUnknownEvalGraderResource(GraderType kind, IDictionary additionalBinaryDataProperties) : base(kind != default ? kind : "unknown", additionalBinaryDataProperties) { } } diff --git a/src/Generated/Models/FineTuning/InternalFineTuneReinforcementMethod.Serialization.cs b/src/Generated/Models/FineTuning/InternalFineTuneReinforcementMethod.Serialization.cs index 28ff9919c..f721f5e4e 100644 --- a/src/Generated/Models/FineTuning/InternalFineTuneReinforcementMethod.Serialization.cs +++ b/src/Generated/Models/FineTuning/InternalFineTuneReinforcementMethod.Serialization.cs @@ -90,7 +90,7 @@ internal static InternalFineTuneReinforcementMethod DeserializeInternalFineTuneR return null; } BinaryData grader = default; - InternalFineTuneReinforcementHyperparameters hyperparameters = default; + FineTuneReinforcementHyperparameters hyperparameters = default; IDictionary additionalBinaryDataProperties = new ChangeTrackingDictionary(); foreach (var prop in element.EnumerateObject()) { @@ -105,7 +105,7 @@ internal static InternalFineTuneReinforcementMethod DeserializeInternalFineTuneR { continue; } - hyperparameters = InternalFineTuneReinforcementHyperparameters.DeserializeInternalFineTuneReinforcementHyperparameters(prop.Value, options); + hyperparameters = FineTuneReinforcementHyperparameters.DeserializeFineTuneReinforcementHyperparameters(prop.Value, options); continue; } // Plugin customization: remove options.Format != "W" check diff --git a/src/Generated/Models/FineTuning/InternalFineTuneReinforcementMethod.cs b/src/Generated/Models/FineTuning/InternalFineTuneReinforcementMethod.cs index 27b5e38eb..62e2c9e59 100644 --- a/src/Generated/Models/FineTuning/InternalFineTuneReinforcementMethod.cs +++ b/src/Generated/Models/FineTuning/InternalFineTuneReinforcementMethod.cs @@ -20,7 +20,7 @@ public InternalFineTuneReinforcementMethod(BinaryData grader) Grader = grader; } - internal InternalFineTuneReinforcementMethod(BinaryData grader, InternalFineTuneReinforcementHyperparameters hyperparameters, IDictionary additionalBinaryDataProperties) + internal InternalFineTuneReinforcementMethod(BinaryData grader, FineTuneReinforcementHyperparameters hyperparameters, IDictionary additionalBinaryDataProperties) { Grader = grader; Hyperparameters = hyperparameters; @@ -29,7 +29,7 @@ internal InternalFineTuneReinforcementMethod(BinaryData grader, InternalFineTune public BinaryData Grader { get; set; } - internal InternalFineTuneReinforcementHyperparameters Hyperparameters { get; set; } + public FineTuneReinforcementHyperparameters Hyperparameters { get; set; } internal IDictionary SerializedAdditionalRawData { diff --git a/src/Generated/Models/Graders/InternalFineTuneReinforcementHyperparameters.Serialization.cs b/src/Generated/Models/Graders/FineTuneReinforcementHyperparameters.Serialization.cs similarity index 77% rename from src/Generated/Models/Graders/InternalFineTuneReinforcementHyperparameters.Serialization.cs rename to src/Generated/Models/Graders/FineTuneReinforcementHyperparameters.Serialization.cs index 4dfd94c1b..fff73f89a 100644 --- a/src/Generated/Models/Graders/InternalFineTuneReinforcementHyperparameters.Serialization.cs +++ b/src/Generated/Models/Graders/FineTuneReinforcementHyperparameters.Serialization.cs @@ -11,9 +11,9 @@ namespace OpenAI.Graders { - internal partial class InternalFineTuneReinforcementHyperparameters : IJsonModel + public partial class FineTuneReinforcementHyperparameters : IJsonModel { - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) { writer.WriteStartObject(); JsonModelWriteCore(writer, options); @@ -22,10 +22,10 @@ void IJsonModel.Write(Utf8JsonWrit protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(InternalFineTuneReinforcementHyperparameters)} does not support writing '{format}' format."); + throw new FormatException($"The model {nameof(FineTuneReinforcementHyperparameters)} does not support writing '{format}' format."); } if (Optional.IsDefined(BatchSize) && _additionalBinaryDataProperties?.ContainsKey("batch_size") != true) { @@ -126,20 +126,20 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit } } - InternalFineTuneReinforcementHyperparameters IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options); + FineTuneReinforcementHyperparameters IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options); - protected virtual InternalFineTuneReinforcementHyperparameters JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) + protected virtual FineTuneReinforcementHyperparameters JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(InternalFineTuneReinforcementHyperparameters)} does not support reading '{format}' format."); + throw new FormatException($"The model {nameof(FineTuneReinforcementHyperparameters)} does not support reading '{format}' format."); } using JsonDocument document = JsonDocument.ParseValue(ref reader); - return DeserializeInternalFineTuneReinforcementHyperparameters(document.RootElement, options); + return DeserializeFineTuneReinforcementHyperparameters(document.RootElement, options); } - internal static InternalFineTuneReinforcementHyperparameters DeserializeInternalFineTuneReinforcementHyperparameters(JsonElement element, ModelReaderWriterOptions options) + internal static FineTuneReinforcementHyperparameters DeserializeFineTuneReinforcementHyperparameters(JsonElement element, ModelReaderWriterOptions options) { if (element.ValueKind == JsonValueKind.Null) { @@ -221,7 +221,7 @@ internal static InternalFineTuneReinforcementHyperparameters DeserializeInternal // Plugin customization: remove options.Format != "W" check additionalBinaryDataProperties.Add(prop.Name, BinaryData.FromString(prop.Value.GetRawText())); } - return new InternalFineTuneReinforcementHyperparameters( + return new FineTuneReinforcementHyperparameters( batchSize, learningRateMultiplier, nEpochs, @@ -232,37 +232,37 @@ internal static InternalFineTuneReinforcementHyperparameters DeserializeInternal additionalBinaryDataProperties); } - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": return ModelReaderWriter.Write(this, options, OpenAIContext.Default); default: - throw new FormatException($"The model {nameof(InternalFineTuneReinforcementHyperparameters)} does not support writing '{options.Format}' format."); + throw new FormatException($"The model {nameof(FineTuneReinforcementHyperparameters)} does not support writing '{options.Format}' format."); } } - InternalFineTuneReinforcementHyperparameters IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); + FineTuneReinforcementHyperparameters IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); - protected virtual InternalFineTuneReinforcementHyperparameters PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) + protected virtual FineTuneReinforcementHyperparameters PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": using (JsonDocument document = JsonDocument.Parse(data)) { - return DeserializeInternalFineTuneReinforcementHyperparameters(document.RootElement, options); + return DeserializeFineTuneReinforcementHyperparameters(document.RootElement, options); } default: - throw new FormatException($"The model {nameof(InternalFineTuneReinforcementHyperparameters)} does not support reading '{options.Format}' format."); + throw new FormatException($"The model {nameof(FineTuneReinforcementHyperparameters)} does not support reading '{options.Format}' format."); } } - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; } } diff --git a/src/Generated/Models/Graders/InternalFineTuneReinforcementHyperparameters.cs b/src/Generated/Models/Graders/FineTuneReinforcementHyperparameters.cs similarity index 71% rename from src/Generated/Models/Graders/InternalFineTuneReinforcementHyperparameters.cs rename to src/Generated/Models/Graders/FineTuneReinforcementHyperparameters.cs index 33960dffe..3a28c7165 100644 --- a/src/Generated/Models/Graders/InternalFineTuneReinforcementHyperparameters.cs +++ b/src/Generated/Models/Graders/FineTuneReinforcementHyperparameters.cs @@ -4,19 +4,21 @@ using System; using System.Collections.Generic; +using System.Diagnostics.CodeAnalysis; using OpenAI.FineTuning; namespace OpenAI.Graders { - internal partial class InternalFineTuneReinforcementHyperparameters + [Experimental("OPENAI001")] + public partial class FineTuneReinforcementHyperparameters { private protected IDictionary _additionalBinaryDataProperties; - public InternalFineTuneReinforcementHyperparameters() + public FineTuneReinforcementHyperparameters() { } - internal InternalFineTuneReinforcementHyperparameters(BinaryData batchSize, BinaryData learningRateMultiplier, BinaryData nEpochs, InternalFineTuneReinforcementHyperparametersReasoningEffort? reasoningEffort, BinaryData computeMultiplier, BinaryData evalInterval, BinaryData evalSamples, IDictionary additionalBinaryDataProperties) + internal FineTuneReinforcementHyperparameters(BinaryData batchSize, BinaryData learningRateMultiplier, BinaryData nEpochs, InternalFineTuneReinforcementHyperparametersReasoningEffort? reasoningEffort, BinaryData computeMultiplier, BinaryData evalInterval, BinaryData evalSamples, IDictionary additionalBinaryDataProperties) { BatchSize = batchSize; LearningRateMultiplier = learningRateMultiplier; diff --git a/src/Generated/Models/Graders/InternalGrader.Serialization.cs b/src/Generated/Models/Graders/Grader.Serialization.cs similarity index 53% rename from src/Generated/Models/Graders/InternalGrader.Serialization.cs rename to src/Generated/Models/Graders/Grader.Serialization.cs index d4de904f2..0f09cd16c 100644 --- a/src/Generated/Models/Graders/InternalGrader.Serialization.cs +++ b/src/Generated/Models/Graders/Grader.Serialization.cs @@ -9,14 +9,14 @@ namespace OpenAI.Graders { - [PersistableModelProxy(typeof(InternalUnknownGrader))] - internal abstract partial class InternalGrader : IJsonModel + [PersistableModelProxy(typeof(UnknownGrader))] + public partial class Grader : IJsonModel { - internal InternalGrader() + internal Grader() { } - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) { writer.WriteStartObject(); JsonModelWriteCore(writer, options); @@ -25,10 +25,10 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOp protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(InternalGrader)} does not support writing '{format}' format."); + throw new FormatException($"The model {nameof(Grader)} does not support writing '{format}' format."); } if (_additionalBinaryDataProperties?.ContainsKey("type") != true) { @@ -57,20 +57,20 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit } } - InternalGrader IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options); + Grader IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options); - protected virtual InternalGrader JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) + protected virtual Grader JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(InternalGrader)} does not support reading '{format}' format."); + throw new FormatException($"The model {nameof(Grader)} does not support reading '{format}' format."); } using JsonDocument document = JsonDocument.ParseValue(ref reader); - return DeserializeInternalGrader(document.RootElement, options); + return DeserializeGrader(document.RootElement, options); } - internal static InternalGrader DeserializeInternalGrader(JsonElement element, ModelReaderWriterOptions options) + internal static Grader DeserializeGrader(JsonElement element, ModelReaderWriterOptions options) { if (element.ValueKind == JsonValueKind.Null) { @@ -81,53 +81,53 @@ internal static InternalGrader DeserializeInternalGrader(JsonElement element, Mo switch (discriminator.GetString()) { case "string_check": - return InternalGraderStringCheck.DeserializeInternalGraderStringCheck(element, options); + return GraderStringCheck.DeserializeGraderStringCheck(element, options); case "text_similarity": - return InternalGraderTextSimilarity.DeserializeInternalGraderTextSimilarity(element, options); + return GraderTextSimilarity.DeserializeGraderTextSimilarity(element, options); case "python": - return InternalGraderPython.DeserializeInternalGraderPython(element, options); + return GraderPython.DeserializeGraderPython(element, options); case "score_model": - return InternalGraderScoreModel.DeserializeInternalGraderScoreModel(element, options); + return GraderScoreModel.DeserializeGraderScoreModel(element, options); case "multi": - return InternalGraderMulti.DeserializeInternalGraderMulti(element, options); + return GraderMulti.DeserializeGraderMulti(element, options); case "label_model": - return InternalGraderLabelModel.DeserializeInternalGraderLabelModel(element, options); + return GraderLabelModel.DeserializeGraderLabelModel(element, options); } } - return InternalUnknownGrader.DeserializeInternalUnknownGrader(element, options); + return UnknownGrader.DeserializeUnknownGrader(element, options); } - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": return ModelReaderWriter.Write(this, options, OpenAIContext.Default); default: - throw new FormatException($"The model {nameof(InternalGrader)} does not support writing '{options.Format}' format."); + throw new FormatException($"The model {nameof(Grader)} does not support writing '{options.Format}' format."); } } - InternalGrader IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); + Grader IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); - protected virtual InternalGrader PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) + protected virtual Grader PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": using (JsonDocument document = JsonDocument.Parse(data)) { - return DeserializeInternalGrader(document.RootElement, options); + return DeserializeGrader(document.RootElement, options); } default: - throw new FormatException($"The model {nameof(InternalGrader)} does not support reading '{options.Format}' format."); + throw new FormatException($"The model {nameof(Grader)} does not support reading '{options.Format}' format."); } } - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; } } diff --git a/src/Generated/Models/Graders/InternalGrader.cs b/src/Generated/Models/Graders/Grader.cs similarity index 66% rename from src/Generated/Models/Graders/InternalGrader.cs rename to src/Generated/Models/Graders/Grader.cs index 0a05d06e9..2896edda9 100644 --- a/src/Generated/Models/Graders/InternalGrader.cs +++ b/src/Generated/Models/Graders/Grader.cs @@ -4,25 +4,27 @@ using System; using System.Collections.Generic; +using System.Diagnostics.CodeAnalysis; namespace OpenAI.Graders { - internal abstract partial class InternalGrader + [Experimental("OPENAI001")] + public partial class Grader { private protected IDictionary _additionalBinaryDataProperties; - private protected InternalGrader(InternalGraderType kind) + private protected Grader(GraderType kind) { Kind = kind; } - internal InternalGrader(InternalGraderType kind, IDictionary additionalBinaryDataProperties) + internal Grader(GraderType kind, IDictionary additionalBinaryDataProperties) { Kind = kind; _additionalBinaryDataProperties = additionalBinaryDataProperties; } - internal InternalGraderType Kind { get; set; } + internal GraderType Kind { get; set; } internal IDictionary SerializedAdditionalRawData { diff --git a/src/Generated/Models/Graders/InternalGraderLabelModel.Serialization.cs b/src/Generated/Models/Graders/GraderLabelModel.Serialization.cs similarity index 72% rename from src/Generated/Models/Graders/InternalGraderLabelModel.Serialization.cs rename to src/Generated/Models/Graders/GraderLabelModel.Serialization.cs index 0c2ba93ae..9d96888eb 100644 --- a/src/Generated/Models/Graders/InternalGraderLabelModel.Serialization.cs +++ b/src/Generated/Models/Graders/GraderLabelModel.Serialization.cs @@ -11,13 +11,13 @@ namespace OpenAI.Graders { - internal partial class InternalGraderLabelModel : IJsonModel + public partial class GraderLabelModel : IJsonModel { - internal InternalGraderLabelModel() : this(InternalGraderType.LabelModel, null, null, null, null, null, null) + internal GraderLabelModel() : this(GraderType.LabelModel, null, null, null, null, null, null) { } - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) { writer.WriteStartObject(); JsonModelWriteCore(writer, options); @@ -26,10 +26,10 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelRead protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(InternalGraderLabelModel)} does not support writing '{format}' format."); + throw new FormatException($"The model {nameof(GraderLabelModel)} does not support writing '{format}' format."); } base.JsonModelWriteCore(writer, options); if (_additionalBinaryDataProperties?.ContainsKey("name") != true) @@ -84,26 +84,26 @@ protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWri } } - InternalGraderLabelModel IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => (InternalGraderLabelModel)JsonModelCreateCore(ref reader, options); + GraderLabelModel IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => (GraderLabelModel)JsonModelCreateCore(ref reader, options); - protected override InternalGrader JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) + protected override Grader JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(InternalGraderLabelModel)} does not support reading '{format}' format."); + throw new FormatException($"The model {nameof(GraderLabelModel)} does not support reading '{format}' format."); } using JsonDocument document = JsonDocument.ParseValue(ref reader); - return DeserializeInternalGraderLabelModel(document.RootElement, options); + return DeserializeGraderLabelModel(document.RootElement, options); } - internal static InternalGraderLabelModel DeserializeInternalGraderLabelModel(JsonElement element, ModelReaderWriterOptions options) + internal static GraderLabelModel DeserializeGraderLabelModel(JsonElement element, ModelReaderWriterOptions options) { if (element.ValueKind == JsonValueKind.Null) { return null; } - InternalGraderType kind = default; + GraderType kind = default; IDictionary additionalBinaryDataProperties = new ChangeTrackingDictionary(); string name = default; string model = default; @@ -114,7 +114,7 @@ internal static InternalGraderLabelModel DeserializeInternalGraderLabelModel(Jso { if (prop.NameEquals("type"u8)) { - kind = new InternalGraderType(prop.Value.GetString()); + kind = new GraderType(prop.Value.GetString()); continue; } if (prop.NameEquals("name"u8)) @@ -174,7 +174,7 @@ internal static InternalGraderLabelModel DeserializeInternalGraderLabelModel(Jso // Plugin customization: remove options.Format != "W" check additionalBinaryDataProperties.Add(prop.Name, BinaryData.FromString(prop.Value.GetRawText())); } - return new InternalGraderLabelModel( + return new GraderLabelModel( kind, additionalBinaryDataProperties, name, @@ -184,37 +184,37 @@ internal static InternalGraderLabelModel DeserializeInternalGraderLabelModel(Jso passingLabels); } - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); protected override BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": return ModelReaderWriter.Write(this, options, OpenAIContext.Default); default: - throw new FormatException($"The model {nameof(InternalGraderLabelModel)} does not support writing '{options.Format}' format."); + throw new FormatException($"The model {nameof(GraderLabelModel)} does not support writing '{options.Format}' format."); } } - InternalGraderLabelModel IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => (InternalGraderLabelModel)PersistableModelCreateCore(data, options); + GraderLabelModel IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => (GraderLabelModel)PersistableModelCreateCore(data, options); - protected override InternalGrader PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) + protected override Grader PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": using (JsonDocument document = JsonDocument.Parse(data)) { - return DeserializeInternalGraderLabelModel(document.RootElement, options); + return DeserializeGraderLabelModel(document.RootElement, options); } default: - throw new FormatException($"The model {nameof(InternalGraderLabelModel)} does not support reading '{options.Format}' format."); + throw new FormatException($"The model {nameof(GraderLabelModel)} does not support reading '{options.Format}' format."); } } - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; } } diff --git a/src/Generated/Models/Graders/InternalGraderLabelModel.cs b/src/Generated/Models/Graders/GraderLabelModel.cs similarity index 68% rename from src/Generated/Models/Graders/InternalGraderLabelModel.cs rename to src/Generated/Models/Graders/GraderLabelModel.cs index c8773640a..9b9d5f590 100644 --- a/src/Generated/Models/Graders/InternalGraderLabelModel.cs +++ b/src/Generated/Models/Graders/GraderLabelModel.cs @@ -4,15 +4,17 @@ using System; using System.Collections.Generic; +using System.Diagnostics.CodeAnalysis; using System.Linq; using OpenAI; using OpenAI.Evals; namespace OpenAI.Graders { - internal partial class InternalGraderLabelModel : InternalGrader + [Experimental("OPENAI001")] + public partial class GraderLabelModel : Grader { - internal InternalGraderLabelModel(string name, string model, IEnumerable input, IEnumerable labels, IEnumerable passingLabels) : base(InternalGraderType.LabelModel) + internal GraderLabelModel(string name, string model, IEnumerable input, IEnumerable labels, IEnumerable passingLabels) : base(GraderType.LabelModel) { Argument.AssertNotNull(name, nameof(name)); Argument.AssertNotNull(model, nameof(model)); @@ -27,7 +29,7 @@ internal InternalGraderLabelModel(string name, string model, IEnumerable additionalBinaryDataProperties, string name, string model, IList input, IList labels, IList passingLabels) : base(kind, additionalBinaryDataProperties) + internal GraderLabelModel(GraderType kind, IDictionary additionalBinaryDataProperties, string name, string model, IList input, IList labels, IList passingLabels) : base(kind, additionalBinaryDataProperties) { // Plugin customization: ensure initialization of collections Name = name; diff --git a/src/Generated/Models/Graders/InternalGraderMulti.Serialization.cs b/src/Generated/Models/Graders/GraderMulti.Serialization.cs similarity index 61% rename from src/Generated/Models/Graders/InternalGraderMulti.Serialization.cs rename to src/Generated/Models/Graders/GraderMulti.Serialization.cs index 3b8e6edf5..bc8449b5a 100644 --- a/src/Generated/Models/Graders/InternalGraderMulti.Serialization.cs +++ b/src/Generated/Models/Graders/GraderMulti.Serialization.cs @@ -10,13 +10,13 @@ namespace OpenAI.Graders { - internal partial class InternalGraderMulti : IJsonModel + public partial class GraderMulti : IJsonModel { - internal InternalGraderMulti() : this(InternalGraderType.Multi, null, null, null, null) + internal GraderMulti() : this(GraderType.Multi, null, null, null, null) { } - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) { writer.WriteStartObject(); JsonModelWriteCore(writer, options); @@ -25,10 +25,10 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWri protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(InternalGraderMulti)} does not support writing '{format}' format."); + throw new FormatException($"The model {nameof(GraderMulti)} does not support writing '{format}' format."); } base.JsonModelWriteCore(writer, options); if (_additionalBinaryDataProperties?.ContainsKey("name") != true) @@ -55,26 +55,26 @@ protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWri } } - InternalGraderMulti IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => (InternalGraderMulti)JsonModelCreateCore(ref reader, options); + GraderMulti IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => (GraderMulti)JsonModelCreateCore(ref reader, options); - protected override InternalGrader JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) + protected override Grader JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(InternalGraderMulti)} does not support reading '{format}' format."); + throw new FormatException($"The model {nameof(GraderMulti)} does not support reading '{format}' format."); } using JsonDocument document = JsonDocument.ParseValue(ref reader); - return DeserializeInternalGraderMulti(document.RootElement, options); + return DeserializeGraderMulti(document.RootElement, options); } - internal static InternalGraderMulti DeserializeInternalGraderMulti(JsonElement element, ModelReaderWriterOptions options) + internal static GraderMulti DeserializeGraderMulti(JsonElement element, ModelReaderWriterOptions options) { if (element.ValueKind == JsonValueKind.Null) { return null; } - InternalGraderType kind = default; + GraderType kind = default; IDictionary additionalBinaryDataProperties = new ChangeTrackingDictionary(); string name = default; BinaryData graders = default; @@ -83,7 +83,7 @@ internal static InternalGraderMulti DeserializeInternalGraderMulti(JsonElement e { if (prop.NameEquals("type"u8)) { - kind = new InternalGraderType(prop.Value.GetString()); + kind = new GraderType(prop.Value.GetString()); continue; } if (prop.NameEquals("name"u8)) @@ -104,40 +104,40 @@ internal static InternalGraderMulti DeserializeInternalGraderMulti(JsonElement e // Plugin customization: remove options.Format != "W" check additionalBinaryDataProperties.Add(prop.Name, BinaryData.FromString(prop.Value.GetRawText())); } - return new InternalGraderMulti(kind, additionalBinaryDataProperties, name, graders, calculateOutput); + return new GraderMulti(kind, additionalBinaryDataProperties, name, graders, calculateOutput); } - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); protected override BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": return ModelReaderWriter.Write(this, options, OpenAIContext.Default); default: - throw new FormatException($"The model {nameof(InternalGraderMulti)} does not support writing '{options.Format}' format."); + throw new FormatException($"The model {nameof(GraderMulti)} does not support writing '{options.Format}' format."); } } - InternalGraderMulti IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => (InternalGraderMulti)PersistableModelCreateCore(data, options); + GraderMulti IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => (GraderMulti)PersistableModelCreateCore(data, options); - protected override InternalGrader PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) + protected override Grader PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": using (JsonDocument document = JsonDocument.Parse(data)) { - return DeserializeInternalGraderMulti(document.RootElement, options); + return DeserializeGraderMulti(document.RootElement, options); } default: - throw new FormatException($"The model {nameof(InternalGraderMulti)} does not support reading '{options.Format}' format."); + throw new FormatException($"The model {nameof(GraderMulti)} does not support reading '{options.Format}' format."); } } - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; } } diff --git a/src/Generated/Models/Graders/InternalGraderMulti.cs b/src/Generated/Models/Graders/GraderMulti.cs similarity index 62% rename from src/Generated/Models/Graders/InternalGraderMulti.cs rename to src/Generated/Models/Graders/GraderMulti.cs index 2b5242e4a..c8d8ec850 100644 --- a/src/Generated/Models/Graders/InternalGraderMulti.cs +++ b/src/Generated/Models/Graders/GraderMulti.cs @@ -4,13 +4,15 @@ using System; using System.Collections.Generic; +using System.Diagnostics.CodeAnalysis; using OpenAI; namespace OpenAI.Graders { - internal partial class InternalGraderMulti : InternalGrader + [Experimental("OPENAI001")] + public partial class GraderMulti : Grader { - public InternalGraderMulti(string name, BinaryData graders, string calculateOutput) : base(InternalGraderType.Multi) + public GraderMulti(string name, BinaryData graders, string calculateOutput) : base(GraderType.Multi) { Argument.AssertNotNull(name, nameof(name)); Argument.AssertNotNull(graders, nameof(graders)); @@ -21,7 +23,7 @@ public InternalGraderMulti(string name, BinaryData graders, string calculateOutp CalculateOutput = calculateOutput; } - internal InternalGraderMulti(InternalGraderType kind, IDictionary additionalBinaryDataProperties, string name, BinaryData graders, string calculateOutput) : base(kind, additionalBinaryDataProperties) + internal GraderMulti(GraderType kind, IDictionary additionalBinaryDataProperties, string name, BinaryData graders, string calculateOutput) : base(kind, additionalBinaryDataProperties) { Name = name; Graders = graders; diff --git a/src/Generated/Models/Graders/InternalGraderPython.Serialization.cs b/src/Generated/Models/Graders/GraderPython.Serialization.cs similarity index 59% rename from src/Generated/Models/Graders/InternalGraderPython.Serialization.cs rename to src/Generated/Models/Graders/GraderPython.Serialization.cs index 1413017d8..cc6646fa0 100644 --- a/src/Generated/Models/Graders/InternalGraderPython.Serialization.cs +++ b/src/Generated/Models/Graders/GraderPython.Serialization.cs @@ -10,13 +10,13 @@ namespace OpenAI.Graders { - internal partial class InternalGraderPython : IJsonModel + public partial class GraderPython : IJsonModel { - internal InternalGraderPython() : this(InternalGraderType.Python, null, null, null, null) + internal GraderPython() : this(GraderType.Python, null, null, null, null) { } - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) { writer.WriteStartObject(); JsonModelWriteCore(writer, options); @@ -25,10 +25,10 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWr protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(InternalGraderPython)} does not support writing '{format}' format."); + throw new FormatException($"The model {nameof(GraderPython)} does not support writing '{format}' format."); } base.JsonModelWriteCore(writer, options); if (_additionalBinaryDataProperties?.ContainsKey("name") != true) @@ -48,26 +48,26 @@ protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWri } } - InternalGraderPython IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => (InternalGraderPython)JsonModelCreateCore(ref reader, options); + GraderPython IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => (GraderPython)JsonModelCreateCore(ref reader, options); - protected override InternalGrader JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) + protected override Grader JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(InternalGraderPython)} does not support reading '{format}' format."); + throw new FormatException($"The model {nameof(GraderPython)} does not support reading '{format}' format."); } using JsonDocument document = JsonDocument.ParseValue(ref reader); - return DeserializeInternalGraderPython(document.RootElement, options); + return DeserializeGraderPython(document.RootElement, options); } - internal static InternalGraderPython DeserializeInternalGraderPython(JsonElement element, ModelReaderWriterOptions options) + internal static GraderPython DeserializeGraderPython(JsonElement element, ModelReaderWriterOptions options) { if (element.ValueKind == JsonValueKind.Null) { return null; } - InternalGraderType kind = default; + GraderType kind = default; IDictionary additionalBinaryDataProperties = new ChangeTrackingDictionary(); string name = default; string source = default; @@ -76,7 +76,7 @@ internal static InternalGraderPython DeserializeInternalGraderPython(JsonElement { if (prop.NameEquals("type"u8)) { - kind = new InternalGraderType(prop.Value.GetString()); + kind = new GraderType(prop.Value.GetString()); continue; } if (prop.NameEquals("name"u8)) @@ -97,40 +97,40 @@ internal static InternalGraderPython DeserializeInternalGraderPython(JsonElement // Plugin customization: remove options.Format != "W" check additionalBinaryDataProperties.Add(prop.Name, BinaryData.FromString(prop.Value.GetRawText())); } - return new InternalGraderPython(kind, additionalBinaryDataProperties, name, source, imageTag); + return new GraderPython(kind, additionalBinaryDataProperties, name, source, imageTag); } - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); protected override BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": return ModelReaderWriter.Write(this, options, OpenAIContext.Default); default: - throw new FormatException($"The model {nameof(InternalGraderPython)} does not support writing '{options.Format}' format."); + throw new FormatException($"The model {nameof(GraderPython)} does not support writing '{options.Format}' format."); } } - InternalGraderPython IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => (InternalGraderPython)PersistableModelCreateCore(data, options); + GraderPython IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => (GraderPython)PersistableModelCreateCore(data, options); - protected override InternalGrader PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) + protected override Grader PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": using (JsonDocument document = JsonDocument.Parse(data)) { - return DeserializeInternalGraderPython(document.RootElement, options); + return DeserializeGraderPython(document.RootElement, options); } default: - throw new FormatException($"The model {nameof(InternalGraderPython)} does not support reading '{options.Format}' format."); + throw new FormatException($"The model {nameof(GraderPython)} does not support reading '{options.Format}' format."); } } - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; } } diff --git a/src/Generated/Models/Graders/InternalGraderPython.cs b/src/Generated/Models/Graders/GraderPython.cs similarity index 58% rename from src/Generated/Models/Graders/InternalGraderPython.cs rename to src/Generated/Models/Graders/GraderPython.cs index 4e46de6f5..6fb43b521 100644 --- a/src/Generated/Models/Graders/InternalGraderPython.cs +++ b/src/Generated/Models/Graders/GraderPython.cs @@ -4,13 +4,15 @@ using System; using System.Collections.Generic; +using System.Diagnostics.CodeAnalysis; using OpenAI; namespace OpenAI.Graders { - internal partial class InternalGraderPython : InternalGrader + [Experimental("OPENAI001")] + public partial class GraderPython : Grader { - public InternalGraderPython(string name, string source) : base(InternalGraderType.Python) + public GraderPython(string name, string source) : base(GraderType.Python) { Argument.AssertNotNull(name, nameof(name)); Argument.AssertNotNull(source, nameof(source)); @@ -19,7 +21,7 @@ public InternalGraderPython(string name, string source) : base(InternalGraderTyp Source = source; } - internal InternalGraderPython(InternalGraderType kind, IDictionary additionalBinaryDataProperties, string name, string source, string imageTag) : base(kind, additionalBinaryDataProperties) + internal GraderPython(GraderType kind, IDictionary additionalBinaryDataProperties, string name, string source, string imageTag) : base(kind, additionalBinaryDataProperties) { Name = name; Source = source; diff --git a/src/Generated/Models/Graders/InternalGraderScoreModel.Serialization.cs b/src/Generated/Models/Graders/GraderScoreModel.Serialization.cs similarity index 71% rename from src/Generated/Models/Graders/InternalGraderScoreModel.Serialization.cs rename to src/Generated/Models/Graders/GraderScoreModel.Serialization.cs index c53ba23bc..7201472c8 100644 --- a/src/Generated/Models/Graders/InternalGraderScoreModel.Serialization.cs +++ b/src/Generated/Models/Graders/GraderScoreModel.Serialization.cs @@ -11,13 +11,13 @@ namespace OpenAI.Graders { - internal partial class InternalGraderScoreModel : IJsonModel + public partial class GraderScoreModel : IJsonModel { - internal InternalGraderScoreModel() : this(InternalGraderType.ScoreModel, null, null, null, null, null, null) + internal GraderScoreModel() : this(GraderType.ScoreModel, null, null, null, null, null, null) { } - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) { writer.WriteStartObject(); JsonModelWriteCore(writer, options); @@ -26,10 +26,10 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelRead protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(InternalGraderScoreModel)} does not support writing '{format}' format."); + throw new FormatException($"The model {nameof(GraderScoreModel)} does not support writing '{format}' format."); } base.JsonModelWriteCore(writer, options); if (_additionalBinaryDataProperties?.ContainsKey("name") != true) @@ -76,26 +76,26 @@ protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWri } } - InternalGraderScoreModel IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => (InternalGraderScoreModel)JsonModelCreateCore(ref reader, options); + GraderScoreModel IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => (GraderScoreModel)JsonModelCreateCore(ref reader, options); - protected override InternalGrader JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) + protected override Grader JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(InternalGraderScoreModel)} does not support reading '{format}' format."); + throw new FormatException($"The model {nameof(GraderScoreModel)} does not support reading '{format}' format."); } using JsonDocument document = JsonDocument.ParseValue(ref reader); - return DeserializeInternalGraderScoreModel(document.RootElement, options); + return DeserializeGraderScoreModel(document.RootElement, options); } - internal static InternalGraderScoreModel DeserializeInternalGraderScoreModel(JsonElement element, ModelReaderWriterOptions options) + internal static GraderScoreModel DeserializeGraderScoreModel(JsonElement element, ModelReaderWriterOptions options) { if (element.ValueKind == JsonValueKind.Null) { return null; } - InternalGraderType kind = default; + GraderType kind = default; IDictionary additionalBinaryDataProperties = new ChangeTrackingDictionary(); string name = default; string model = default; @@ -106,7 +106,7 @@ internal static InternalGraderScoreModel DeserializeInternalGraderScoreModel(Jso { if (prop.NameEquals("type"u8)) { - kind = new InternalGraderType(prop.Value.GetString()); + kind = new GraderType(prop.Value.GetString()); continue; } if (prop.NameEquals("name"u8)) @@ -155,7 +155,7 @@ internal static InternalGraderScoreModel DeserializeInternalGraderScoreModel(Jso // Plugin customization: remove options.Format != "W" check additionalBinaryDataProperties.Add(prop.Name, BinaryData.FromString(prop.Value.GetRawText())); } - return new InternalGraderScoreModel( + return new GraderScoreModel( kind, additionalBinaryDataProperties, name, @@ -165,37 +165,37 @@ internal static InternalGraderScoreModel DeserializeInternalGraderScoreModel(Jso range ?? new ChangeTrackingList()); } - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); protected override BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": return ModelReaderWriter.Write(this, options, OpenAIContext.Default); default: - throw new FormatException($"The model {nameof(InternalGraderScoreModel)} does not support writing '{options.Format}' format."); + throw new FormatException($"The model {nameof(GraderScoreModel)} does not support writing '{options.Format}' format."); } } - InternalGraderScoreModel IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => (InternalGraderScoreModel)PersistableModelCreateCore(data, options); + GraderScoreModel IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => (GraderScoreModel)PersistableModelCreateCore(data, options); - protected override InternalGrader PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) + protected override Grader PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": using (JsonDocument document = JsonDocument.Parse(data)) { - return DeserializeInternalGraderScoreModel(document.RootElement, options); + return DeserializeGraderScoreModel(document.RootElement, options); } default: - throw new FormatException($"The model {nameof(InternalGraderScoreModel)} does not support reading '{options.Format}' format."); + throw new FormatException($"The model {nameof(GraderScoreModel)} does not support reading '{options.Format}' format."); } } - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; } } diff --git a/src/Generated/Models/Graders/InternalGraderScoreModel.cs b/src/Generated/Models/Graders/GraderScoreModel.cs similarity index 67% rename from src/Generated/Models/Graders/InternalGraderScoreModel.cs rename to src/Generated/Models/Graders/GraderScoreModel.cs index 8ed123d6a..530cbad7b 100644 --- a/src/Generated/Models/Graders/InternalGraderScoreModel.cs +++ b/src/Generated/Models/Graders/GraderScoreModel.cs @@ -4,15 +4,17 @@ using System; using System.Collections.Generic; +using System.Diagnostics.CodeAnalysis; using System.Linq; using OpenAI; using OpenAI.Evals; namespace OpenAI.Graders { - internal partial class InternalGraderScoreModel : InternalGrader + [Experimental("OPENAI001")] + public partial class GraderScoreModel : Grader { - internal InternalGraderScoreModel(string name, string model, IEnumerable input) : base(InternalGraderType.ScoreModel) + internal GraderScoreModel(string name, string model, IEnumerable input) : base(GraderType.ScoreModel) { Argument.AssertNotNull(name, nameof(name)); Argument.AssertNotNull(model, nameof(model)); @@ -24,7 +26,7 @@ internal InternalGraderScoreModel(string name, string model, IEnumerable(); } - internal InternalGraderScoreModel(InternalGraderType kind, IDictionary additionalBinaryDataProperties, string name, string model, BinaryData samplingParams, IList input, IList range) : base(kind, additionalBinaryDataProperties) + internal GraderScoreModel(GraderType kind, IDictionary additionalBinaryDataProperties, string name, string model, BinaryData samplingParams, IList input, IList range) : base(kind, additionalBinaryDataProperties) { // Plugin customization: ensure initialization of collections Name = name; diff --git a/src/Generated/Models/Graders/InternalGraderStringCheck.Serialization.cs b/src/Generated/Models/Graders/GraderStringCheck.Serialization.cs similarity index 60% rename from src/Generated/Models/Graders/InternalGraderStringCheck.Serialization.cs rename to src/Generated/Models/Graders/GraderStringCheck.Serialization.cs index 6e5dfa762..f69f9d482 100644 --- a/src/Generated/Models/Graders/InternalGraderStringCheck.Serialization.cs +++ b/src/Generated/Models/Graders/GraderStringCheck.Serialization.cs @@ -10,13 +10,13 @@ namespace OpenAI.Graders { - internal partial class InternalGraderStringCheck : IJsonModel + public partial class GraderStringCheck : IJsonModel { - internal InternalGraderStringCheck() : this(InternalGraderType.StringCheck, null, null, null, null, default) + internal GraderStringCheck() : this(GraderType.StringCheck, null, null, null, null, default) { } - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) { writer.WriteStartObject(); JsonModelWriteCore(writer, options); @@ -25,10 +25,10 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelRea protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(InternalGraderStringCheck)} does not support writing '{format}' format."); + throw new FormatException($"The model {nameof(GraderStringCheck)} does not support writing '{format}' format."); } base.JsonModelWriteCore(writer, options); if (_additionalBinaryDataProperties?.ContainsKey("name") != true) @@ -53,36 +53,36 @@ protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWri } } - InternalGraderStringCheck IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => (InternalGraderStringCheck)JsonModelCreateCore(ref reader, options); + GraderStringCheck IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => (GraderStringCheck)JsonModelCreateCore(ref reader, options); - protected override InternalGrader JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) + protected override Grader JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(InternalGraderStringCheck)} does not support reading '{format}' format."); + throw new FormatException($"The model {nameof(GraderStringCheck)} does not support reading '{format}' format."); } using JsonDocument document = JsonDocument.ParseValue(ref reader); - return DeserializeInternalGraderStringCheck(document.RootElement, options); + return DeserializeGraderStringCheck(document.RootElement, options); } - internal static InternalGraderStringCheck DeserializeInternalGraderStringCheck(JsonElement element, ModelReaderWriterOptions options) + internal static GraderStringCheck DeserializeGraderStringCheck(JsonElement element, ModelReaderWriterOptions options) { if (element.ValueKind == JsonValueKind.Null) { return null; } - InternalGraderType kind = default; + GraderType kind = default; IDictionary additionalBinaryDataProperties = new ChangeTrackingDictionary(); string name = default; string input = default; string reference = default; - InternalGraderStringCheckOperation operation = default; + GraderStringCheckOperation operation = default; foreach (var prop in element.EnumerateObject()) { if (prop.NameEquals("type"u8)) { - kind = new InternalGraderType(prop.Value.GetString()); + kind = new GraderType(prop.Value.GetString()); continue; } if (prop.NameEquals("name"u8)) @@ -102,13 +102,13 @@ internal static InternalGraderStringCheck DeserializeInternalGraderStringCheck(J } if (prop.NameEquals("operation"u8)) { - operation = new InternalGraderStringCheckOperation(prop.Value.GetString()); + operation = new GraderStringCheckOperation(prop.Value.GetString()); continue; } // Plugin customization: remove options.Format != "W" check additionalBinaryDataProperties.Add(prop.Name, BinaryData.FromString(prop.Value.GetRawText())); } - return new InternalGraderStringCheck( + return new GraderStringCheck( kind, additionalBinaryDataProperties, name, @@ -117,37 +117,37 @@ internal static InternalGraderStringCheck DeserializeInternalGraderStringCheck(J operation); } - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); protected override BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": return ModelReaderWriter.Write(this, options, OpenAIContext.Default); default: - throw new FormatException($"The model {nameof(InternalGraderStringCheck)} does not support writing '{options.Format}' format."); + throw new FormatException($"The model {nameof(GraderStringCheck)} does not support writing '{options.Format}' format."); } } - InternalGraderStringCheck IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => (InternalGraderStringCheck)PersistableModelCreateCore(data, options); + GraderStringCheck IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => (GraderStringCheck)PersistableModelCreateCore(data, options); - protected override InternalGrader PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) + protected override Grader PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": using (JsonDocument document = JsonDocument.Parse(data)) { - return DeserializeInternalGraderStringCheck(document.RootElement, options); + return DeserializeGraderStringCheck(document.RootElement, options); } default: - throw new FormatException($"The model {nameof(InternalGraderStringCheck)} does not support reading '{options.Format}' format."); + throw new FormatException($"The model {nameof(GraderStringCheck)} does not support reading '{options.Format}' format."); } } - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; } } diff --git a/src/Generated/Models/Graders/InternalGraderStringCheck.cs b/src/Generated/Models/Graders/GraderStringCheck.cs similarity index 55% rename from src/Generated/Models/Graders/InternalGraderStringCheck.cs rename to src/Generated/Models/Graders/GraderStringCheck.cs index 47218b744..f5f51316e 100644 --- a/src/Generated/Models/Graders/InternalGraderStringCheck.cs +++ b/src/Generated/Models/Graders/GraderStringCheck.cs @@ -4,13 +4,15 @@ using System; using System.Collections.Generic; +using System.Diagnostics.CodeAnalysis; using OpenAI; namespace OpenAI.Graders { - internal partial class InternalGraderStringCheck : InternalGrader + [Experimental("OPENAI001")] + public partial class GraderStringCheck : Grader { - internal InternalGraderStringCheck(string name, string input, string reference, InternalGraderStringCheckOperation operation) : base(InternalGraderType.StringCheck) + public GraderStringCheck(string name, string input, string reference, GraderStringCheckOperation operation) : base(GraderType.StringCheck) { Argument.AssertNotNull(name, nameof(name)); Argument.AssertNotNull(input, nameof(input)); @@ -22,7 +24,7 @@ internal InternalGraderStringCheck(string name, string input, string reference, Operation = operation; } - internal InternalGraderStringCheck(InternalGraderType kind, IDictionary additionalBinaryDataProperties, string name, string input, string reference, InternalGraderStringCheckOperation operation) : base(kind, additionalBinaryDataProperties) + internal GraderStringCheck(GraderType kind, IDictionary additionalBinaryDataProperties, string name, string input, string reference, GraderStringCheckOperation operation) : base(kind, additionalBinaryDataProperties) { Name = name; Input = input; @@ -36,6 +38,6 @@ internal InternalGraderStringCheck(InternalGraderType kind, IDictionary + +#nullable disable + +using System; +using System.ComponentModel; +using System.Diagnostics.CodeAnalysis; +using OpenAI; + +namespace OpenAI.Graders +{ + [Experimental("OPENAI001")] + public readonly partial struct GraderStringCheckOperation : IEquatable + { + private readonly string _value; + private const string EqValue = "eq"; + private const string NeValue = "ne"; + private const string LikeValue = "like"; + private const string IlikeValue = "ilike"; + + public GraderStringCheckOperation(string value) + { + Argument.AssertNotNull(value, nameof(value)); + + _value = value; + } + + public static GraderStringCheckOperation Eq { get; } = new GraderStringCheckOperation(EqValue); + + public static GraderStringCheckOperation Ne { get; } = new GraderStringCheckOperation(NeValue); + + public static GraderStringCheckOperation Like { get; } = new GraderStringCheckOperation(LikeValue); + + public static GraderStringCheckOperation Ilike { get; } = new GraderStringCheckOperation(IlikeValue); + + public static bool operator ==(GraderStringCheckOperation left, GraderStringCheckOperation right) => left.Equals(right); + + public static bool operator !=(GraderStringCheckOperation left, GraderStringCheckOperation right) => !left.Equals(right); + + public static implicit operator GraderStringCheckOperation(string value) => new GraderStringCheckOperation(value); + + [EditorBrowsable(EditorBrowsableState.Never)] + public override bool Equals(object obj) => obj is GraderStringCheckOperation other && Equals(other); + + public bool Equals(GraderStringCheckOperation other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase); + + [EditorBrowsable(EditorBrowsableState.Never)] + public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0; + + public override string ToString() => _value; + } +} diff --git a/src/Generated/Models/Graders/InternalGraderTextSimilarity.Serialization.cs b/src/Generated/Models/Graders/GraderTextSimilarity.Serialization.cs similarity index 59% rename from src/Generated/Models/Graders/InternalGraderTextSimilarity.Serialization.cs rename to src/Generated/Models/Graders/GraderTextSimilarity.Serialization.cs index ab6ad3e0f..673e4ddca 100644 --- a/src/Generated/Models/Graders/InternalGraderTextSimilarity.Serialization.cs +++ b/src/Generated/Models/Graders/GraderTextSimilarity.Serialization.cs @@ -10,13 +10,13 @@ namespace OpenAI.Graders { - internal partial class InternalGraderTextSimilarity : IJsonModel + public partial class GraderTextSimilarity : IJsonModel { - internal InternalGraderTextSimilarity() : this(InternalGraderType.TextSimilarity, null, null, null, null, default) + internal GraderTextSimilarity() : this(GraderType.TextSimilarity, null, null, null, null, default) { } - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) { writer.WriteStartObject(); JsonModelWriteCore(writer, options); @@ -25,10 +25,10 @@ void IJsonModel.Write(Utf8JsonWriter writer, Model protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(InternalGraderTextSimilarity)} does not support writing '{format}' format."); + throw new FormatException($"The model {nameof(GraderTextSimilarity)} does not support writing '{format}' format."); } base.JsonModelWriteCore(writer, options); if (_additionalBinaryDataProperties?.ContainsKey("name") != true) @@ -53,36 +53,36 @@ protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWri } } - InternalGraderTextSimilarity IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => (InternalGraderTextSimilarity)JsonModelCreateCore(ref reader, options); + GraderTextSimilarity IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => (GraderTextSimilarity)JsonModelCreateCore(ref reader, options); - protected override InternalGrader JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) + protected override Grader JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(InternalGraderTextSimilarity)} does not support reading '{format}' format."); + throw new FormatException($"The model {nameof(GraderTextSimilarity)} does not support reading '{format}' format."); } using JsonDocument document = JsonDocument.ParseValue(ref reader); - return DeserializeInternalGraderTextSimilarity(document.RootElement, options); + return DeserializeGraderTextSimilarity(document.RootElement, options); } - internal static InternalGraderTextSimilarity DeserializeInternalGraderTextSimilarity(JsonElement element, ModelReaderWriterOptions options) + internal static GraderTextSimilarity DeserializeGraderTextSimilarity(JsonElement element, ModelReaderWriterOptions options) { if (element.ValueKind == JsonValueKind.Null) { return null; } - InternalGraderType kind = default; + GraderType kind = default; IDictionary additionalBinaryDataProperties = new ChangeTrackingDictionary(); string name = default; string input = default; string reference = default; - InternalGraderTextSimilarityEvaluationMetric evaluationMetric = default; + GraderTextSimilarityEvaluationMetric evaluationMetric = default; foreach (var prop in element.EnumerateObject()) { if (prop.NameEquals("type"u8)) { - kind = new InternalGraderType(prop.Value.GetString()); + kind = new GraderType(prop.Value.GetString()); continue; } if (prop.NameEquals("name"u8)) @@ -102,13 +102,13 @@ internal static InternalGraderTextSimilarity DeserializeInternalGraderTextSimila } if (prop.NameEquals("evaluation_metric"u8)) { - evaluationMetric = new InternalGraderTextSimilarityEvaluationMetric(prop.Value.GetString()); + evaluationMetric = new GraderTextSimilarityEvaluationMetric(prop.Value.GetString()); continue; } // Plugin customization: remove options.Format != "W" check additionalBinaryDataProperties.Add(prop.Name, BinaryData.FromString(prop.Value.GetRawText())); } - return new InternalGraderTextSimilarity( + return new GraderTextSimilarity( kind, additionalBinaryDataProperties, name, @@ -117,37 +117,37 @@ internal static InternalGraderTextSimilarity DeserializeInternalGraderTextSimila evaluationMetric); } - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); protected override BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": return ModelReaderWriter.Write(this, options, OpenAIContext.Default); default: - throw new FormatException($"The model {nameof(InternalGraderTextSimilarity)} does not support writing '{options.Format}' format."); + throw new FormatException($"The model {nameof(GraderTextSimilarity)} does not support writing '{options.Format}' format."); } } - InternalGraderTextSimilarity IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => (InternalGraderTextSimilarity)PersistableModelCreateCore(data, options); + GraderTextSimilarity IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => (GraderTextSimilarity)PersistableModelCreateCore(data, options); - protected override InternalGrader PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) + protected override Grader PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": using (JsonDocument document = JsonDocument.Parse(data)) { - return DeserializeInternalGraderTextSimilarity(document.RootElement, options); + return DeserializeGraderTextSimilarity(document.RootElement, options); } default: - throw new FormatException($"The model {nameof(InternalGraderTextSimilarity)} does not support reading '{options.Format}' format."); + throw new FormatException($"The model {nameof(GraderTextSimilarity)} does not support reading '{options.Format}' format."); } } - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; } } diff --git a/src/Generated/Models/Graders/InternalGraderTextSimilarity.cs b/src/Generated/Models/Graders/GraderTextSimilarity.cs similarity index 54% rename from src/Generated/Models/Graders/InternalGraderTextSimilarity.cs rename to src/Generated/Models/Graders/GraderTextSimilarity.cs index cdd30704a..189704c80 100644 --- a/src/Generated/Models/Graders/InternalGraderTextSimilarity.cs +++ b/src/Generated/Models/Graders/GraderTextSimilarity.cs @@ -4,13 +4,15 @@ using System; using System.Collections.Generic; +using System.Diagnostics.CodeAnalysis; using OpenAI; namespace OpenAI.Graders { - internal partial class InternalGraderTextSimilarity : InternalGrader + [Experimental("OPENAI001")] + public partial class GraderTextSimilarity : Grader { - internal InternalGraderTextSimilarity(string name, string input, string reference, InternalGraderTextSimilarityEvaluationMetric evaluationMetric) : base(InternalGraderType.TextSimilarity) + public GraderTextSimilarity(string name, string input, string reference, GraderTextSimilarityEvaluationMetric evaluationMetric) : base(GraderType.TextSimilarity) { Argument.AssertNotNull(name, nameof(name)); Argument.AssertNotNull(input, nameof(input)); @@ -22,7 +24,7 @@ internal InternalGraderTextSimilarity(string name, string input, string referenc EvaluationMetric = evaluationMetric; } - internal InternalGraderTextSimilarity(InternalGraderType kind, IDictionary additionalBinaryDataProperties, string name, string input, string reference, InternalGraderTextSimilarityEvaluationMetric evaluationMetric) : base(kind, additionalBinaryDataProperties) + internal GraderTextSimilarity(GraderType kind, IDictionary additionalBinaryDataProperties, string name, string input, string reference, GraderTextSimilarityEvaluationMetric evaluationMetric) : base(kind, additionalBinaryDataProperties) { Name = name; Input = input; @@ -36,6 +38,6 @@ internal InternalGraderTextSimilarity(InternalGraderType kind, IDictionary + +#nullable disable + +using System; +using System.ComponentModel; +using System.Diagnostics.CodeAnalysis; +using OpenAI; + +namespace OpenAI.Graders +{ + [Experimental("OPENAI001")] + public readonly partial struct GraderTextSimilarityEvaluationMetric : IEquatable + { + private readonly string _value; + private const string FuzzyMatchValue = "fuzzy_match"; + private const string BleuValue = "bleu"; + private const string GleuValue = "gleu"; + private const string MeteorValue = "meteor"; + private const string Rouge1Value = "rouge_1"; + private const string Rouge2Value = "rouge_2"; + private const string Rouge3Value = "rouge_3"; + private const string Rouge4Value = "rouge_4"; + private const string Rouge5Value = "rouge_5"; + private const string RougeLValue = "rouge_l"; + + public GraderTextSimilarityEvaluationMetric(string value) + { + Argument.AssertNotNull(value, nameof(value)); + + _value = value; + } + + public static GraderTextSimilarityEvaluationMetric FuzzyMatch { get; } = new GraderTextSimilarityEvaluationMetric(FuzzyMatchValue); + + public static GraderTextSimilarityEvaluationMetric Bleu { get; } = new GraderTextSimilarityEvaluationMetric(BleuValue); + + public static GraderTextSimilarityEvaluationMetric Gleu { get; } = new GraderTextSimilarityEvaluationMetric(GleuValue); + + public static GraderTextSimilarityEvaluationMetric Meteor { get; } = new GraderTextSimilarityEvaluationMetric(MeteorValue); + + public static GraderTextSimilarityEvaluationMetric Rouge1 { get; } = new GraderTextSimilarityEvaluationMetric(Rouge1Value); + + public static GraderTextSimilarityEvaluationMetric Rouge2 { get; } = new GraderTextSimilarityEvaluationMetric(Rouge2Value); + + public static GraderTextSimilarityEvaluationMetric Rouge3 { get; } = new GraderTextSimilarityEvaluationMetric(Rouge3Value); + + public static GraderTextSimilarityEvaluationMetric Rouge4 { get; } = new GraderTextSimilarityEvaluationMetric(Rouge4Value); + + public static GraderTextSimilarityEvaluationMetric Rouge5 { get; } = new GraderTextSimilarityEvaluationMetric(Rouge5Value); + + public static GraderTextSimilarityEvaluationMetric RougeL { get; } = new GraderTextSimilarityEvaluationMetric(RougeLValue); + + public static bool operator ==(GraderTextSimilarityEvaluationMetric left, GraderTextSimilarityEvaluationMetric right) => left.Equals(right); + + public static bool operator !=(GraderTextSimilarityEvaluationMetric left, GraderTextSimilarityEvaluationMetric right) => !left.Equals(right); + + public static implicit operator GraderTextSimilarityEvaluationMetric(string value) => new GraderTextSimilarityEvaluationMetric(value); + + [EditorBrowsable(EditorBrowsableState.Never)] + public override bool Equals(object obj) => obj is GraderTextSimilarityEvaluationMetric other && Equals(other); + + public bool Equals(GraderTextSimilarityEvaluationMetric other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase); + + [EditorBrowsable(EditorBrowsableState.Never)] + public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0; + + public override string ToString() => _value; + } +} diff --git a/src/Generated/Models/Graders/GraderType.cs b/src/Generated/Models/Graders/GraderType.cs new file mode 100644 index 000000000..30f39fef6 --- /dev/null +++ b/src/Generated/Models/Graders/GraderType.cs @@ -0,0 +1,58 @@ +// + +#nullable disable + +using System; +using System.ComponentModel; +using System.Diagnostics.CodeAnalysis; +using OpenAI; + +namespace OpenAI.Graders +{ + [Experimental("OPENAI001")] + public readonly partial struct GraderType : IEquatable + { + private readonly string _value; + private const string StringCheckValue = "string_check"; + private const string TextSimilarityValue = "text_similarity"; + private const string ScoreModelValue = "score_model"; + private const string LabelModelValue = "label_model"; + private const string PythonValue = "python"; + private const string MultiValue = "multi"; + + public GraderType(string value) + { + Argument.AssertNotNull(value, nameof(value)); + + _value = value; + } + + public static GraderType StringCheck { get; } = new GraderType(StringCheckValue); + + public static GraderType TextSimilarity { get; } = new GraderType(TextSimilarityValue); + + public static GraderType ScoreModel { get; } = new GraderType(ScoreModelValue); + + public static GraderType LabelModel { get; } = new GraderType(LabelModelValue); + + public static GraderType Python { get; } = new GraderType(PythonValue); + + public static GraderType Multi { get; } = new GraderType(MultiValue); + + public static bool operator ==(GraderType left, GraderType right) => left.Equals(right); + + public static bool operator !=(GraderType left, GraderType right) => !left.Equals(right); + + public static implicit operator GraderType(string value) => new GraderType(value); + + [EditorBrowsable(EditorBrowsableState.Never)] + public override bool Equals(object obj) => obj is GraderType other && Equals(other); + + public bool Equals(GraderType other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase); + + [EditorBrowsable(EditorBrowsableState.Never)] + public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0; + + public override string ToString() => _value; + } +} diff --git a/src/Generated/Models/Graders/InternalGraderStringCheckOperation.cs b/src/Generated/Models/Graders/InternalGraderStringCheckOperation.cs deleted file mode 100644 index 126b4ad39..000000000 --- a/src/Generated/Models/Graders/InternalGraderStringCheckOperation.cs +++ /dev/null @@ -1,50 +0,0 @@ -// - -#nullable disable - -using System; -using System.ComponentModel; -using OpenAI; - -namespace OpenAI.Graders -{ - internal readonly partial struct InternalGraderStringCheckOperation : IEquatable - { - private readonly string _value; - private const string EqValue = "eq"; - private const string NeValue = "ne"; - private const string LikeValue = "like"; - private const string IlikeValue = "ilike"; - - public InternalGraderStringCheckOperation(string value) - { - Argument.AssertNotNull(value, nameof(value)); - - _value = value; - } - - internal static InternalGraderStringCheckOperation Eq { get; } = new InternalGraderStringCheckOperation(EqValue); - - internal static InternalGraderStringCheckOperation Ne { get; } = new InternalGraderStringCheckOperation(NeValue); - - internal static InternalGraderStringCheckOperation Like { get; } = new InternalGraderStringCheckOperation(LikeValue); - - internal static InternalGraderStringCheckOperation Ilike { get; } = new InternalGraderStringCheckOperation(IlikeValue); - - public static bool operator ==(InternalGraderStringCheckOperation left, InternalGraderStringCheckOperation right) => left.Equals(right); - - public static bool operator !=(InternalGraderStringCheckOperation left, InternalGraderStringCheckOperation right) => !left.Equals(right); - - public static implicit operator InternalGraderStringCheckOperation(string value) => new InternalGraderStringCheckOperation(value); - - [EditorBrowsable(EditorBrowsableState.Never)] - public override bool Equals(object obj) => obj is InternalGraderStringCheckOperation other && Equals(other); - - public bool Equals(InternalGraderStringCheckOperation other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase); - - [EditorBrowsable(EditorBrowsableState.Never)] - public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0; - - public override string ToString() => _value; - } -} diff --git a/src/Generated/Models/Graders/InternalGraderTextSimilarityEvaluationMetric.cs b/src/Generated/Models/Graders/InternalGraderTextSimilarityEvaluationMetric.cs deleted file mode 100644 index d8a15c3a8..000000000 --- a/src/Generated/Models/Graders/InternalGraderTextSimilarityEvaluationMetric.cs +++ /dev/null @@ -1,68 +0,0 @@ -// - -#nullable disable - -using System; -using System.ComponentModel; -using OpenAI; - -namespace OpenAI.Graders -{ - internal readonly partial struct InternalGraderTextSimilarityEvaluationMetric : IEquatable - { - private readonly string _value; - private const string FuzzyMatchValue = "fuzzy_match"; - private const string BleuValue = "bleu"; - private const string GleuValue = "gleu"; - private const string MeteorValue = "meteor"; - private const string Rouge1Value = "rouge_1"; - private const string Rouge2Value = "rouge_2"; - private const string Rouge3Value = "rouge_3"; - private const string Rouge4Value = "rouge_4"; - private const string Rouge5Value = "rouge_5"; - private const string RougeLValue = "rouge_l"; - - public InternalGraderTextSimilarityEvaluationMetric(string value) - { - Argument.AssertNotNull(value, nameof(value)); - - _value = value; - } - - internal static InternalGraderTextSimilarityEvaluationMetric FuzzyMatch { get; } = new InternalGraderTextSimilarityEvaluationMetric(FuzzyMatchValue); - - internal static InternalGraderTextSimilarityEvaluationMetric Bleu { get; } = new InternalGraderTextSimilarityEvaluationMetric(BleuValue); - - internal static InternalGraderTextSimilarityEvaluationMetric Gleu { get; } = new InternalGraderTextSimilarityEvaluationMetric(GleuValue); - - internal static InternalGraderTextSimilarityEvaluationMetric Meteor { get; } = new InternalGraderTextSimilarityEvaluationMetric(MeteorValue); - - internal static InternalGraderTextSimilarityEvaluationMetric Rouge1 { get; } = new InternalGraderTextSimilarityEvaluationMetric(Rouge1Value); - - internal static InternalGraderTextSimilarityEvaluationMetric Rouge2 { get; } = new InternalGraderTextSimilarityEvaluationMetric(Rouge2Value); - - internal static InternalGraderTextSimilarityEvaluationMetric Rouge3 { get; } = new InternalGraderTextSimilarityEvaluationMetric(Rouge3Value); - - internal static InternalGraderTextSimilarityEvaluationMetric Rouge4 { get; } = new InternalGraderTextSimilarityEvaluationMetric(Rouge4Value); - - internal static InternalGraderTextSimilarityEvaluationMetric Rouge5 { get; } = new InternalGraderTextSimilarityEvaluationMetric(Rouge5Value); - - internal static InternalGraderTextSimilarityEvaluationMetric RougeL { get; } = new InternalGraderTextSimilarityEvaluationMetric(RougeLValue); - - public static bool operator ==(InternalGraderTextSimilarityEvaluationMetric left, InternalGraderTextSimilarityEvaluationMetric right) => left.Equals(right); - - public static bool operator !=(InternalGraderTextSimilarityEvaluationMetric left, InternalGraderTextSimilarityEvaluationMetric right) => !left.Equals(right); - - public static implicit operator InternalGraderTextSimilarityEvaluationMetric(string value) => new InternalGraderTextSimilarityEvaluationMetric(value); - - [EditorBrowsable(EditorBrowsableState.Never)] - public override bool Equals(object obj) => obj is InternalGraderTextSimilarityEvaluationMetric other && Equals(other); - - public bool Equals(InternalGraderTextSimilarityEvaluationMetric other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase); - - [EditorBrowsable(EditorBrowsableState.Never)] - public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0; - - public override string ToString() => _value; - } -} diff --git a/src/Generated/Models/Graders/InternalGraderType.cs b/src/Generated/Models/Graders/InternalGraderType.cs deleted file mode 100644 index f6463093e..000000000 --- a/src/Generated/Models/Graders/InternalGraderType.cs +++ /dev/null @@ -1,56 +0,0 @@ -// - -#nullable disable - -using System; -using System.ComponentModel; -using OpenAI; - -namespace OpenAI.Graders -{ - internal readonly partial struct InternalGraderType : IEquatable - { - private readonly string _value; - private const string StringCheckValue = "string_check"; - private const string TextSimilarityValue = "text_similarity"; - private const string ScoreModelValue = "score_model"; - private const string LabelModelValue = "label_model"; - private const string PythonValue = "python"; - private const string MultiValue = "multi"; - - public InternalGraderType(string value) - { - Argument.AssertNotNull(value, nameof(value)); - - _value = value; - } - - internal static InternalGraderType StringCheck { get; } = new InternalGraderType(StringCheckValue); - - internal static InternalGraderType TextSimilarity { get; } = new InternalGraderType(TextSimilarityValue); - - internal static InternalGraderType ScoreModel { get; } = new InternalGraderType(ScoreModelValue); - - internal static InternalGraderType LabelModel { get; } = new InternalGraderType(LabelModelValue); - - internal static InternalGraderType Python { get; } = new InternalGraderType(PythonValue); - - internal static InternalGraderType Multi { get; } = new InternalGraderType(MultiValue); - - public static bool operator ==(InternalGraderType left, InternalGraderType right) => left.Equals(right); - - public static bool operator !=(InternalGraderType left, InternalGraderType right) => !left.Equals(right); - - public static implicit operator InternalGraderType(string value) => new InternalGraderType(value); - - [EditorBrowsable(EditorBrowsableState.Never)] - public override bool Equals(object obj) => obj is InternalGraderType other && Equals(other); - - public bool Equals(InternalGraderType other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase); - - [EditorBrowsable(EditorBrowsableState.Never)] - public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0; - - public override string ToString() => _value; - } -} diff --git a/src/Generated/Models/Graders/InternalUnknownGrader.cs b/src/Generated/Models/Graders/InternalUnknownGrader.cs deleted file mode 100644 index b6ee0c889..000000000 --- a/src/Generated/Models/Graders/InternalUnknownGrader.cs +++ /dev/null @@ -1,16 +0,0 @@ -// - -#nullable disable - -using System; -using System.Collections.Generic; - -namespace OpenAI.Graders -{ - internal partial class InternalUnknownGrader : InternalGrader - { - internal InternalUnknownGrader(InternalGraderType kind, IDictionary additionalBinaryDataProperties) : base(kind != default ? kind : "unknown", additionalBinaryDataProperties) - { - } - } -} diff --git a/src/Generated/Models/Graders/InternalRunGraderRequest.Serialization.cs b/src/Generated/Models/Graders/RunGraderRequest.Serialization.cs similarity index 67% rename from src/Generated/Models/Graders/InternalRunGraderRequest.Serialization.cs rename to src/Generated/Models/Graders/RunGraderRequest.Serialization.cs index bc32bb2a3..d853cdd7c 100644 --- a/src/Generated/Models/Graders/InternalRunGraderRequest.Serialization.cs +++ b/src/Generated/Models/Graders/RunGraderRequest.Serialization.cs @@ -10,13 +10,13 @@ namespace OpenAI.Graders { - internal partial class InternalRunGraderRequest : IJsonModel + public partial class RunGraderRequest : IJsonModel { - internal InternalRunGraderRequest() + internal RunGraderRequest() { } - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) { writer.WriteStartObject(); JsonModelWriteCore(writer, options); @@ -25,10 +25,10 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelRead protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(InternalRunGraderRequest)} does not support writing '{format}' format."); + throw new FormatException($"The model {nameof(RunGraderRequest)} does not support writing '{format}' format."); } if (_additionalBinaryDataProperties?.ContainsKey("grader") != true) { @@ -81,20 +81,20 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit } } - InternalRunGraderRequest IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options); + RunGraderRequest IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options); - protected virtual InternalRunGraderRequest JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) + protected virtual RunGraderRequest JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(InternalRunGraderRequest)} does not support reading '{format}' format."); + throw new FormatException($"The model {nameof(RunGraderRequest)} does not support reading '{format}' format."); } using JsonDocument document = JsonDocument.ParseValue(ref reader); - return DeserializeInternalRunGraderRequest(document.RootElement, options); + return DeserializeRunGraderRequest(document.RootElement, options); } - internal static InternalRunGraderRequest DeserializeInternalRunGraderRequest(JsonElement element, ModelReaderWriterOptions options) + internal static RunGraderRequest DeserializeRunGraderRequest(JsonElement element, ModelReaderWriterOptions options) { if (element.ValueKind == JsonValueKind.Null) { @@ -128,40 +128,40 @@ internal static InternalRunGraderRequest DeserializeInternalRunGraderRequest(Jso // Plugin customization: remove options.Format != "W" check additionalBinaryDataProperties.Add(prop.Name, BinaryData.FromString(prop.Value.GetRawText())); } - return new InternalRunGraderRequest(grader, item, modelSample, additionalBinaryDataProperties); + return new RunGraderRequest(grader, item, modelSample, additionalBinaryDataProperties); } - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": return ModelReaderWriter.Write(this, options, OpenAIContext.Default); default: - throw new FormatException($"The model {nameof(InternalRunGraderRequest)} does not support writing '{options.Format}' format."); + throw new FormatException($"The model {nameof(RunGraderRequest)} does not support writing '{options.Format}' format."); } } - InternalRunGraderRequest IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); + RunGraderRequest IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); - protected virtual InternalRunGraderRequest PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) + protected virtual RunGraderRequest PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": using (JsonDocument document = JsonDocument.Parse(data)) { - return DeserializeInternalRunGraderRequest(document.RootElement, options); + return DeserializeRunGraderRequest(document.RootElement, options); } default: - throw new FormatException($"The model {nameof(InternalRunGraderRequest)} does not support reading '{options.Format}' format."); + throw new FormatException($"The model {nameof(RunGraderRequest)} does not support reading '{options.Format}' format."); } } - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; } } diff --git a/src/Generated/Models/Graders/InternalRunGraderRequest.cs b/src/Generated/Models/Graders/RunGraderRequest.cs similarity index 62% rename from src/Generated/Models/Graders/InternalRunGraderRequest.cs rename to src/Generated/Models/Graders/RunGraderRequest.cs index 59d5ab635..d8d1f8bf4 100644 --- a/src/Generated/Models/Graders/InternalRunGraderRequest.cs +++ b/src/Generated/Models/Graders/RunGraderRequest.cs @@ -4,24 +4,22 @@ using System; using System.Collections.Generic; -using OpenAI; +using System.Diagnostics.CodeAnalysis; namespace OpenAI.Graders { - internal partial class InternalRunGraderRequest + [Experimental("OPENAI001")] + public partial class RunGraderRequest { private protected IDictionary _additionalBinaryDataProperties; - public InternalRunGraderRequest(BinaryData grader, string modelSample) + internal RunGraderRequest(BinaryData grader, string modelSample) { - Argument.AssertNotNull(grader, nameof(grader)); - Argument.AssertNotNull(modelSample, nameof(modelSample)); - Grader = grader; ModelSample = modelSample; } - internal InternalRunGraderRequest(BinaryData grader, BinaryData item, string modelSample, IDictionary additionalBinaryDataProperties) + internal RunGraderRequest(BinaryData grader, BinaryData item, string modelSample, IDictionary additionalBinaryDataProperties) { Grader = grader; Item = item; @@ -31,7 +29,7 @@ internal InternalRunGraderRequest(BinaryData grader, BinaryData item, string mod public BinaryData Grader { get; } - public BinaryData Item { get; set; } + public BinaryData Item { get; } public string ModelSample { get; } diff --git a/src/Generated/Models/Graders/InternalRunGraderResponse.Serialization.cs b/src/Generated/Models/Graders/RunGraderResponse.Serialization.cs similarity index 66% rename from src/Generated/Models/Graders/InternalRunGraderResponse.Serialization.cs rename to src/Generated/Models/Graders/RunGraderResponse.Serialization.cs index c5199852c..e9b165c6f 100644 --- a/src/Generated/Models/Graders/InternalRunGraderResponse.Serialization.cs +++ b/src/Generated/Models/Graders/RunGraderResponse.Serialization.cs @@ -10,13 +10,13 @@ namespace OpenAI.Graders { - internal partial class InternalRunGraderResponse : IJsonModel + public partial class RunGraderResponse : IJsonModel { - internal InternalRunGraderResponse() + internal RunGraderResponse() { } - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) { writer.WriteStartObject(); JsonModelWriteCore(writer, options); @@ -25,10 +25,10 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelRea protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(InternalRunGraderResponse)} does not support writing '{format}' format."); + throw new FormatException($"The model {nameof(RunGraderResponse)} does not support writing '{format}' format."); } if (_additionalBinaryDataProperties?.ContainsKey("reward") != true) { @@ -86,27 +86,27 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit } } - InternalRunGraderResponse IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options); + RunGraderResponse IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options); - protected virtual InternalRunGraderResponse JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) + protected virtual RunGraderResponse JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(InternalRunGraderResponse)} does not support reading '{format}' format."); + throw new FormatException($"The model {nameof(RunGraderResponse)} does not support reading '{format}' format."); } using JsonDocument document = JsonDocument.ParseValue(ref reader); - return DeserializeInternalRunGraderResponse(document.RootElement, options); + return DeserializeRunGraderResponse(document.RootElement, options); } - internal static InternalRunGraderResponse DeserializeInternalRunGraderResponse(JsonElement element, ModelReaderWriterOptions options) + internal static RunGraderResponse DeserializeRunGraderResponse(JsonElement element, ModelReaderWriterOptions options) { if (element.ValueKind == JsonValueKind.Null) { return null; } float reward = default; - InternalRunGraderResponseMetadata metadata = default; + RunGraderResponseMetadata metadata = default; BinaryData subRewards = default; BinaryData modelGraderTokenUsagePerModel = default; IDictionary additionalBinaryDataProperties = new ChangeTrackingDictionary(); @@ -119,7 +119,7 @@ internal static InternalRunGraderResponse DeserializeInternalRunGraderResponse(J } if (prop.NameEquals("metadata"u8)) { - metadata = InternalRunGraderResponseMetadata.DeserializeInternalRunGraderResponseMetadata(prop.Value, options); + metadata = RunGraderResponseMetadata.DeserializeRunGraderResponseMetadata(prop.Value, options); continue; } if (prop.NameEquals("sub_rewards"u8)) @@ -135,40 +135,40 @@ internal static InternalRunGraderResponse DeserializeInternalRunGraderResponse(J // Plugin customization: remove options.Format != "W" check additionalBinaryDataProperties.Add(prop.Name, BinaryData.FromString(prop.Value.GetRawText())); } - return new InternalRunGraderResponse(reward, metadata, subRewards, modelGraderTokenUsagePerModel, additionalBinaryDataProperties); + return new RunGraderResponse(reward, metadata, subRewards, modelGraderTokenUsagePerModel, additionalBinaryDataProperties); } - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": return ModelReaderWriter.Write(this, options, OpenAIContext.Default); default: - throw new FormatException($"The model {nameof(InternalRunGraderResponse)} does not support writing '{options.Format}' format."); + throw new FormatException($"The model {nameof(RunGraderResponse)} does not support writing '{options.Format}' format."); } } - InternalRunGraderResponse IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); + RunGraderResponse IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); - protected virtual InternalRunGraderResponse PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) + protected virtual RunGraderResponse PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": using (JsonDocument document = JsonDocument.Parse(data)) { - return DeserializeInternalRunGraderResponse(document.RootElement, options); + return DeserializeRunGraderResponse(document.RootElement, options); } default: - throw new FormatException($"The model {nameof(InternalRunGraderResponse)} does not support reading '{options.Format}' format."); + throw new FormatException($"The model {nameof(RunGraderResponse)} does not support reading '{options.Format}' format."); } } - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; } } diff --git a/src/Generated/Models/Graders/InternalRunGraderResponse.cs b/src/Generated/Models/Graders/RunGraderResponse.cs similarity index 66% rename from src/Generated/Models/Graders/InternalRunGraderResponse.cs rename to src/Generated/Models/Graders/RunGraderResponse.cs index 72dc93a4b..9511c3751 100644 --- a/src/Generated/Models/Graders/InternalRunGraderResponse.cs +++ b/src/Generated/Models/Graders/RunGraderResponse.cs @@ -4,14 +4,16 @@ using System; using System.Collections.Generic; +using System.Diagnostics.CodeAnalysis; namespace OpenAI.Graders { - internal partial class InternalRunGraderResponse + [Experimental("OPENAI001")] + public partial class RunGraderResponse { private protected IDictionary _additionalBinaryDataProperties; - internal InternalRunGraderResponse(float reward, InternalRunGraderResponseMetadata metadata, BinaryData subRewards, BinaryData modelGraderTokenUsagePerModel) + internal RunGraderResponse(float reward, RunGraderResponseMetadata metadata, BinaryData subRewards, BinaryData modelGraderTokenUsagePerModel) { Reward = reward; Metadata = metadata; @@ -19,7 +21,7 @@ internal InternalRunGraderResponse(float reward, InternalRunGraderResponseMetada ModelGraderTokenUsagePerModel = modelGraderTokenUsagePerModel; } - internal InternalRunGraderResponse(float reward, InternalRunGraderResponseMetadata metadata, BinaryData subRewards, BinaryData modelGraderTokenUsagePerModel, IDictionary additionalBinaryDataProperties) + internal RunGraderResponse(float reward, RunGraderResponseMetadata metadata, BinaryData subRewards, BinaryData modelGraderTokenUsagePerModel, IDictionary additionalBinaryDataProperties) { Reward = reward; Metadata = metadata; @@ -30,7 +32,7 @@ internal InternalRunGraderResponse(float reward, InternalRunGraderResponseMetada public float Reward { get; } - internal InternalRunGraderResponseMetadata Metadata { get; } + public RunGraderResponseMetadata Metadata { get; } public BinaryData SubRewards { get; } diff --git a/src/Generated/Models/Graders/InternalRunGraderResponseMetadata.Serialization.cs b/src/Generated/Models/Graders/RunGraderResponseMetadata.Serialization.cs similarity index 72% rename from src/Generated/Models/Graders/InternalRunGraderResponseMetadata.Serialization.cs rename to src/Generated/Models/Graders/RunGraderResponseMetadata.Serialization.cs index 55c841759..753ce8fb5 100644 --- a/src/Generated/Models/Graders/InternalRunGraderResponseMetadata.Serialization.cs +++ b/src/Generated/Models/Graders/RunGraderResponseMetadata.Serialization.cs @@ -10,13 +10,13 @@ namespace OpenAI.Graders { - internal partial class InternalRunGraderResponseMetadata : IJsonModel + public partial class RunGraderResponseMetadata : IJsonModel { - internal InternalRunGraderResponseMetadata() + internal RunGraderResponseMetadata() { } - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) { writer.WriteStartObject(); JsonModelWriteCore(writer, options); @@ -25,10 +25,10 @@ void IJsonModel.Write(Utf8JsonWriter writer, protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(InternalRunGraderResponseMetadata)} does not support writing '{format}' format."); + throw new FormatException($"The model {nameof(RunGraderResponseMetadata)} does not support writing '{format}' format."); } if (_additionalBinaryDataProperties?.ContainsKey("name") != true) { @@ -108,20 +108,20 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit } } - InternalRunGraderResponseMetadata IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options); + RunGraderResponseMetadata IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options); - protected virtual InternalRunGraderResponseMetadata JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) + protected virtual RunGraderResponseMetadata JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(InternalRunGraderResponseMetadata)} does not support reading '{format}' format."); + throw new FormatException($"The model {nameof(RunGraderResponseMetadata)} does not support reading '{format}' format."); } using JsonDocument document = JsonDocument.ParseValue(ref reader); - return DeserializeInternalRunGraderResponseMetadata(document.RootElement, options); + return DeserializeRunGraderResponseMetadata(document.RootElement, options); } - internal static InternalRunGraderResponseMetadata DeserializeInternalRunGraderResponseMetadata(JsonElement element, ModelReaderWriterOptions options) + internal static RunGraderResponseMetadata DeserializeRunGraderResponseMetadata(JsonElement element, ModelReaderWriterOptions options) { if (element.ValueKind == JsonValueKind.Null) { @@ -129,7 +129,7 @@ internal static InternalRunGraderResponseMetadata DeserializeInternalRunGraderRe } string name = default; string kind = default; - InternalRunGraderResponseMetadataErrors errors = default; + RunGraderResponseMetadataErrors errors = default; float executionTime = default; BinaryData scores = default; int? tokenUsage = default; @@ -149,7 +149,7 @@ internal static InternalRunGraderResponseMetadata DeserializeInternalRunGraderRe } if (prop.NameEquals("errors"u8)) { - errors = InternalRunGraderResponseMetadataErrors.DeserializeInternalRunGraderResponseMetadataErrors(prop.Value, options); + errors = RunGraderResponseMetadataErrors.DeserializeRunGraderResponseMetadataErrors(prop.Value, options); continue; } if (prop.NameEquals("execution_time"u8)) @@ -185,7 +185,7 @@ internal static InternalRunGraderResponseMetadata DeserializeInternalRunGraderRe // Plugin customization: remove options.Format != "W" check additionalBinaryDataProperties.Add(prop.Name, BinaryData.FromString(prop.Value.GetRawText())); } - return new InternalRunGraderResponseMetadata( + return new RunGraderResponseMetadata( name, kind, errors, @@ -196,37 +196,37 @@ internal static InternalRunGraderResponseMetadata DeserializeInternalRunGraderRe additionalBinaryDataProperties); } - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": return ModelReaderWriter.Write(this, options, OpenAIContext.Default); default: - throw new FormatException($"The model {nameof(InternalRunGraderResponseMetadata)} does not support writing '{options.Format}' format."); + throw new FormatException($"The model {nameof(RunGraderResponseMetadata)} does not support writing '{options.Format}' format."); } } - InternalRunGraderResponseMetadata IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); + RunGraderResponseMetadata IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); - protected virtual InternalRunGraderResponseMetadata PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) + protected virtual RunGraderResponseMetadata PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": using (JsonDocument document = JsonDocument.Parse(data)) { - return DeserializeInternalRunGraderResponseMetadata(document.RootElement, options); + return DeserializeRunGraderResponseMetadata(document.RootElement, options); } default: - throw new FormatException($"The model {nameof(InternalRunGraderResponseMetadata)} does not support reading '{options.Format}' format."); + throw new FormatException($"The model {nameof(RunGraderResponseMetadata)} does not support reading '{options.Format}' format."); } } - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; } } diff --git a/src/Generated/Models/Graders/InternalRunGraderResponseMetadata.cs b/src/Generated/Models/Graders/RunGraderResponseMetadata.cs similarity index 66% rename from src/Generated/Models/Graders/InternalRunGraderResponseMetadata.cs rename to src/Generated/Models/Graders/RunGraderResponseMetadata.cs index 375561c9c..9dc4315fe 100644 --- a/src/Generated/Models/Graders/InternalRunGraderResponseMetadata.cs +++ b/src/Generated/Models/Graders/RunGraderResponseMetadata.cs @@ -4,14 +4,16 @@ using System; using System.Collections.Generic; +using System.Diagnostics.CodeAnalysis; namespace OpenAI.Graders { - internal partial class InternalRunGraderResponseMetadata + [Experimental("OPENAI001")] + public partial class RunGraderResponseMetadata { private protected IDictionary _additionalBinaryDataProperties; - internal InternalRunGraderResponseMetadata(string name, string kind, InternalRunGraderResponseMetadataErrors errors, float executionTime, BinaryData scores, int? tokenUsage, string sampledModelName) + internal RunGraderResponseMetadata(string name, string kind, RunGraderResponseMetadataErrors errors, float executionTime, BinaryData scores, int? tokenUsage, string sampledModelName) { Name = name; Kind = kind; @@ -22,7 +24,7 @@ internal InternalRunGraderResponseMetadata(string name, string kind, InternalRun SampledModelName = sampledModelName; } - internal InternalRunGraderResponseMetadata(string name, string kind, InternalRunGraderResponseMetadataErrors errors, float executionTime, BinaryData scores, int? tokenUsage, string sampledModelName, IDictionary additionalBinaryDataProperties) + internal RunGraderResponseMetadata(string name, string kind, RunGraderResponseMetadataErrors errors, float executionTime, BinaryData scores, int? tokenUsage, string sampledModelName, IDictionary additionalBinaryDataProperties) { Name = name; Kind = kind; @@ -38,7 +40,7 @@ internal InternalRunGraderResponseMetadata(string name, string kind, InternalRun public string Kind { get; } - internal InternalRunGraderResponseMetadataErrors Errors { get; } + public RunGraderResponseMetadataErrors Errors { get; } public float ExecutionTime { get; } diff --git a/src/Generated/Models/Graders/InternalRunGraderResponseMetadataErrors.Serialization.cs b/src/Generated/Models/Graders/RunGraderResponseMetadataErrors.Serialization.cs similarity index 82% rename from src/Generated/Models/Graders/InternalRunGraderResponseMetadataErrors.Serialization.cs rename to src/Generated/Models/Graders/RunGraderResponseMetadataErrors.Serialization.cs index d48adf2ce..13df8b74e 100644 --- a/src/Generated/Models/Graders/InternalRunGraderResponseMetadataErrors.Serialization.cs +++ b/src/Generated/Models/Graders/RunGraderResponseMetadataErrors.Serialization.cs @@ -10,13 +10,13 @@ namespace OpenAI.Graders { - internal partial class InternalRunGraderResponseMetadataErrors : IJsonModel + public partial class RunGraderResponseMetadataErrors : IJsonModel { - internal InternalRunGraderResponseMetadataErrors() + internal RunGraderResponseMetadataErrors() { } - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) { writer.WriteStartObject(); JsonModelWriteCore(writer, options); @@ -25,10 +25,10 @@ void IJsonModel.Write(Utf8JsonWriter wr protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(InternalRunGraderResponseMetadataErrors)} does not support writing '{format}' format."); + throw new FormatException($"The model {nameof(RunGraderResponseMetadataErrors)} does not support writing '{format}' format."); } if (_additionalBinaryDataProperties?.ContainsKey("formula_parse_error") != true) { @@ -143,20 +143,20 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit } } - InternalRunGraderResponseMetadataErrors IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options); + RunGraderResponseMetadataErrors IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options); - protected virtual InternalRunGraderResponseMetadataErrors JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) + protected virtual RunGraderResponseMetadataErrors JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(InternalRunGraderResponseMetadataErrors)} does not support reading '{format}' format."); + throw new FormatException($"The model {nameof(RunGraderResponseMetadataErrors)} does not support reading '{format}' format."); } using JsonDocument document = JsonDocument.ParseValue(ref reader); - return DeserializeInternalRunGraderResponseMetadataErrors(document.RootElement, options); + return DeserializeRunGraderResponseMetadataErrors(document.RootElement, options); } - internal static InternalRunGraderResponseMetadataErrors DeserializeInternalRunGraderResponseMetadataErrors(JsonElement element, ModelReaderWriterOptions options) + internal static RunGraderResponseMetadataErrors DeserializeRunGraderResponseMetadataErrors(JsonElement element, ModelReaderWriterOptions options) { if (element.ValueKind == JsonValueKind.Null) { @@ -267,7 +267,7 @@ internal static InternalRunGraderResponseMetadataErrors DeserializeInternalRunGr // Plugin customization: remove options.Format != "W" check additionalBinaryDataProperties.Add(prop.Name, BinaryData.FromString(prop.Value.GetRawText())); } - return new InternalRunGraderResponseMetadataErrors( + return new RunGraderResponseMetadataErrors( formulaParseError, sampleParseError, truncatedObservationError, @@ -285,37 +285,37 @@ internal static InternalRunGraderResponseMetadataErrors DeserializeInternalRunGr additionalBinaryDataProperties); } - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": return ModelReaderWriter.Write(this, options, OpenAIContext.Default); default: - throw new FormatException($"The model {nameof(InternalRunGraderResponseMetadataErrors)} does not support writing '{options.Format}' format."); + throw new FormatException($"The model {nameof(RunGraderResponseMetadataErrors)} does not support writing '{options.Format}' format."); } } - InternalRunGraderResponseMetadataErrors IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); + RunGraderResponseMetadataErrors IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); - protected virtual InternalRunGraderResponseMetadataErrors PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) + protected virtual RunGraderResponseMetadataErrors PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": using (JsonDocument document = JsonDocument.Parse(data)) { - return DeserializeInternalRunGraderResponseMetadataErrors(document.RootElement, options); + return DeserializeRunGraderResponseMetadataErrors(document.RootElement, options); } default: - throw new FormatException($"The model {nameof(InternalRunGraderResponseMetadataErrors)} does not support reading '{options.Format}' format."); + throw new FormatException($"The model {nameof(RunGraderResponseMetadataErrors)} does not support reading '{options.Format}' format."); } } - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; } } diff --git a/src/Generated/Models/Graders/InternalRunGraderResponseMetadataErrors.cs b/src/Generated/Models/Graders/RunGraderResponseMetadataErrors.cs similarity index 72% rename from src/Generated/Models/Graders/InternalRunGraderResponseMetadataErrors.cs rename to src/Generated/Models/Graders/RunGraderResponseMetadataErrors.cs index 8819c6a62..a95fe9964 100644 --- a/src/Generated/Models/Graders/InternalRunGraderResponseMetadataErrors.cs +++ b/src/Generated/Models/Graders/RunGraderResponseMetadataErrors.cs @@ -4,14 +4,16 @@ using System; using System.Collections.Generic; +using System.Diagnostics.CodeAnalysis; namespace OpenAI.Graders { - internal partial class InternalRunGraderResponseMetadataErrors + [Experimental("OPENAI001")] + public partial class RunGraderResponseMetadataErrors { private protected IDictionary _additionalBinaryDataProperties; - internal InternalRunGraderResponseMetadataErrors(bool formulaParseError, bool sampleParseError, bool truncatedObservationError, bool unresponsiveRewardError, bool invalidVariableError, bool otherError, bool pythonGraderServerError, string pythonGraderServerErrorType, bool pythonGraderRuntimeError, string pythonGraderRuntimeErrorDetails, bool modelGraderServerError, bool modelGraderRefusalError, bool modelGraderParseError, string modelGraderServerErrorDetails) + internal RunGraderResponseMetadataErrors(bool formulaParseError, bool sampleParseError, bool truncatedObservationError, bool unresponsiveRewardError, bool invalidVariableError, bool otherError, bool pythonGraderServerError, string pythonGraderServerErrorType, bool pythonGraderRuntimeError, string pythonGraderRuntimeErrorDetails, bool modelGraderServerError, bool modelGraderRefusalError, bool modelGraderParseError, string modelGraderServerErrorDetails) { FormulaParseError = formulaParseError; SampleParseError = sampleParseError; @@ -29,7 +31,7 @@ internal InternalRunGraderResponseMetadataErrors(bool formulaParseError, bool sa ModelGraderServerErrorDetails = modelGraderServerErrorDetails; } - internal InternalRunGraderResponseMetadataErrors(bool formulaParseError, bool sampleParseError, bool truncatedObservationError, bool unresponsiveRewardError, bool invalidVariableError, bool otherError, bool pythonGraderServerError, string pythonGraderServerErrorType, bool pythonGraderRuntimeError, string pythonGraderRuntimeErrorDetails, bool modelGraderServerError, bool modelGraderRefusalError, bool modelGraderParseError, string modelGraderServerErrorDetails, IDictionary additionalBinaryDataProperties) + internal RunGraderResponseMetadataErrors(bool formulaParseError, bool sampleParseError, bool truncatedObservationError, bool unresponsiveRewardError, bool invalidVariableError, bool otherError, bool pythonGraderServerError, string pythonGraderServerErrorType, bool pythonGraderRuntimeError, string pythonGraderRuntimeErrorDetails, bool modelGraderServerError, bool modelGraderRefusalError, bool modelGraderParseError, string modelGraderServerErrorDetails, IDictionary additionalBinaryDataProperties) { FormulaParseError = formulaParseError; SampleParseError = sampleParseError; diff --git a/src/Generated/Models/Graders/InternalUnknownGrader.Serialization.cs b/src/Generated/Models/Graders/UnknownGrader.Serialization.cs similarity index 51% rename from src/Generated/Models/Graders/InternalUnknownGrader.Serialization.cs rename to src/Generated/Models/Graders/UnknownGrader.Serialization.cs index b51a20da7..20332f28f 100644 --- a/src/Generated/Models/Graders/InternalUnknownGrader.Serialization.cs +++ b/src/Generated/Models/Graders/UnknownGrader.Serialization.cs @@ -10,13 +10,13 @@ namespace OpenAI.Graders { - internal partial class InternalUnknownGrader : IJsonModel + public partial class UnknownGrader : IJsonModel { - internal InternalUnknownGrader() : this(default, null) + internal UnknownGrader() : this(default, null) { } - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) { writer.WriteStartObject(); JsonModelWriteCore(writer, options); @@ -25,79 +25,79 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOp protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(InternalGrader)} does not support writing '{format}' format."); + throw new FormatException($"The model {nameof(Grader)} does not support writing '{format}' format."); } base.JsonModelWriteCore(writer, options); } - InternalGrader IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options); + Grader IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options); - protected override InternalGrader JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) + protected override Grader JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(InternalGrader)} does not support reading '{format}' format."); + throw new FormatException($"The model {nameof(Grader)} does not support reading '{format}' format."); } using JsonDocument document = JsonDocument.ParseValue(ref reader); - return DeserializeInternalGrader(document.RootElement, options); + return DeserializeGrader(document.RootElement, options); } - internal static InternalUnknownGrader DeserializeInternalUnknownGrader(JsonElement element, ModelReaderWriterOptions options) + internal static UnknownGrader DeserializeUnknownGrader(JsonElement element, ModelReaderWriterOptions options) { if (element.ValueKind == JsonValueKind.Null) { return null; } - InternalGraderType kind = default; + GraderType kind = default; IDictionary additionalBinaryDataProperties = new ChangeTrackingDictionary(); foreach (var prop in element.EnumerateObject()) { if (prop.NameEquals("type"u8)) { - kind = new InternalGraderType(prop.Value.GetString()); + kind = new GraderType(prop.Value.GetString()); continue; } // Plugin customization: remove options.Format != "W" check additionalBinaryDataProperties.Add(prop.Name, BinaryData.FromString(prop.Value.GetRawText())); } - return new InternalUnknownGrader(kind, additionalBinaryDataProperties); + return new UnknownGrader(kind, additionalBinaryDataProperties); } - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); protected override BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": return ModelReaderWriter.Write(this, options, OpenAIContext.Default); default: - throw new FormatException($"The model {nameof(InternalGrader)} does not support writing '{options.Format}' format."); + throw new FormatException($"The model {nameof(Grader)} does not support writing '{options.Format}' format."); } } - InternalGrader IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); + Grader IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); - protected override InternalGrader PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) + protected override Grader PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": using (JsonDocument document = JsonDocument.Parse(data)) { - return DeserializeInternalGrader(document.RootElement, options); + return DeserializeGrader(document.RootElement, options); } default: - throw new FormatException($"The model {nameof(InternalGrader)} does not support reading '{options.Format}' format."); + throw new FormatException($"The model {nameof(Grader)} does not support reading '{options.Format}' format."); } } - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; } } diff --git a/src/Generated/Models/Graders/UnknownGrader.cs b/src/Generated/Models/Graders/UnknownGrader.cs new file mode 100644 index 000000000..dca83bfe3 --- /dev/null +++ b/src/Generated/Models/Graders/UnknownGrader.cs @@ -0,0 +1,18 @@ +// + +#nullable disable + +using System; +using System.Collections.Generic; +using System.Diagnostics.CodeAnalysis; + +namespace OpenAI.Graders +{ + [Experimental("OPENAI001")] + public partial class UnknownGrader : Grader + { + internal UnknownGrader(GraderType kind, IDictionary additionalBinaryDataProperties) : base(kind != default ? kind : "unknown", additionalBinaryDataProperties) + { + } + } +} diff --git a/src/Generated/Models/Graders/InternalValidateGraderRequest.Serialization.cs b/src/Generated/Models/Graders/ValidateGraderRequest.Serialization.cs similarity index 59% rename from src/Generated/Models/Graders/InternalValidateGraderRequest.Serialization.cs rename to src/Generated/Models/Graders/ValidateGraderRequest.Serialization.cs index 7e5228ef3..f20e2d0ae 100644 --- a/src/Generated/Models/Graders/InternalValidateGraderRequest.Serialization.cs +++ b/src/Generated/Models/Graders/ValidateGraderRequest.Serialization.cs @@ -10,13 +10,13 @@ namespace OpenAI.Graders { - internal partial class InternalValidateGraderRequest : IJsonModel + public partial class ValidateGraderRequest : IJsonModel { - internal InternalValidateGraderRequest() + internal ValidateGraderRequest() { } - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) { writer.WriteStartObject(); JsonModelWriteCore(writer, options); @@ -25,10 +25,10 @@ void IJsonModel.Write(Utf8JsonWriter writer, Mode protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(InternalValidateGraderRequest)} does not support writing '{format}' format."); + throw new FormatException($"The model {nameof(ValidateGraderRequest)} does not support writing '{format}' format."); } if (_additionalBinaryDataProperties?.ContainsKey("grader") != true) { @@ -64,20 +64,20 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit } } - InternalValidateGraderRequest IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options); + ValidateGraderRequest IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options); - protected virtual InternalValidateGraderRequest JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) + protected virtual ValidateGraderRequest JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(InternalValidateGraderRequest)} does not support reading '{format}' format."); + throw new FormatException($"The model {nameof(ValidateGraderRequest)} does not support reading '{format}' format."); } using JsonDocument document = JsonDocument.ParseValue(ref reader); - return DeserializeInternalValidateGraderRequest(document.RootElement, options); + return DeserializeValidateGraderRequest(document.RootElement, options); } - internal static InternalValidateGraderRequest DeserializeInternalValidateGraderRequest(JsonElement element, ModelReaderWriterOptions options) + internal static ValidateGraderRequest DeserializeValidateGraderRequest(JsonElement element, ModelReaderWriterOptions options) { if (element.ValueKind == JsonValueKind.Null) { @@ -95,40 +95,40 @@ internal static InternalValidateGraderRequest DeserializeInternalValidateGraderR // Plugin customization: remove options.Format != "W" check additionalBinaryDataProperties.Add(prop.Name, BinaryData.FromString(prop.Value.GetRawText())); } - return new InternalValidateGraderRequest(grader, additionalBinaryDataProperties); + return new ValidateGraderRequest(grader, additionalBinaryDataProperties); } - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": return ModelReaderWriter.Write(this, options, OpenAIContext.Default); default: - throw new FormatException($"The model {nameof(InternalValidateGraderRequest)} does not support writing '{options.Format}' format."); + throw new FormatException($"The model {nameof(ValidateGraderRequest)} does not support writing '{options.Format}' format."); } } - InternalValidateGraderRequest IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); + ValidateGraderRequest IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); - protected virtual InternalValidateGraderRequest PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) + protected virtual ValidateGraderRequest PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": using (JsonDocument document = JsonDocument.Parse(data)) { - return DeserializeInternalValidateGraderRequest(document.RootElement, options); + return DeserializeValidateGraderRequest(document.RootElement, options); } default: - throw new FormatException($"The model {nameof(InternalValidateGraderRequest)} does not support reading '{options.Format}' format."); + throw new FormatException($"The model {nameof(ValidateGraderRequest)} does not support reading '{options.Format}' format."); } } - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; } } diff --git a/src/Generated/Models/Graders/InternalValidateGraderRequest.cs b/src/Generated/Models/Graders/ValidateGraderRequest.cs similarity index 66% rename from src/Generated/Models/Graders/InternalValidateGraderRequest.cs rename to src/Generated/Models/Graders/ValidateGraderRequest.cs index 6f6e665c0..44fe9773e 100644 --- a/src/Generated/Models/Graders/InternalValidateGraderRequest.cs +++ b/src/Generated/Models/Graders/ValidateGraderRequest.cs @@ -4,22 +4,21 @@ using System; using System.Collections.Generic; -using OpenAI; +using System.Diagnostics.CodeAnalysis; namespace OpenAI.Graders { - internal partial class InternalValidateGraderRequest + [Experimental("OPENAI001")] + public partial class ValidateGraderRequest { private protected IDictionary _additionalBinaryDataProperties; - public InternalValidateGraderRequest(BinaryData grader) + internal ValidateGraderRequest(BinaryData grader) { - Argument.AssertNotNull(grader, nameof(grader)); - Grader = grader; } - internal InternalValidateGraderRequest(BinaryData grader, IDictionary additionalBinaryDataProperties) + internal ValidateGraderRequest(BinaryData grader, IDictionary additionalBinaryDataProperties) { Grader = grader; _additionalBinaryDataProperties = additionalBinaryDataProperties; diff --git a/src/Generated/Models/Graders/InternalValidateGraderResponse.Serialization.cs b/src/Generated/Models/Graders/ValidateGraderResponse.Serialization.cs similarity index 61% rename from src/Generated/Models/Graders/InternalValidateGraderResponse.Serialization.cs rename to src/Generated/Models/Graders/ValidateGraderResponse.Serialization.cs index 9da1c49e7..a7e27b032 100644 --- a/src/Generated/Models/Graders/InternalValidateGraderResponse.Serialization.cs +++ b/src/Generated/Models/Graders/ValidateGraderResponse.Serialization.cs @@ -10,9 +10,9 @@ namespace OpenAI.Graders { - internal partial class InternalValidateGraderResponse : IJsonModel + public partial class ValidateGraderResponse : IJsonModel { - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) { writer.WriteStartObject(); JsonModelWriteCore(writer, options); @@ -21,10 +21,10 @@ void IJsonModel.Write(Utf8JsonWriter writer, Mod protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(InternalValidateGraderResponse)} does not support writing '{format}' format."); + throw new FormatException($"The model {nameof(ValidateGraderResponse)} does not support writing '{format}' format."); } if (Optional.IsDefined(Grader) && _additionalBinaryDataProperties?.ContainsKey("grader") != true) { @@ -60,20 +60,20 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit } } - InternalValidateGraderResponse IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options); + ValidateGraderResponse IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options); - protected virtual InternalValidateGraderResponse JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) + protected virtual ValidateGraderResponse JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(InternalValidateGraderResponse)} does not support reading '{format}' format."); + throw new FormatException($"The model {nameof(ValidateGraderResponse)} does not support reading '{format}' format."); } using JsonDocument document = JsonDocument.ParseValue(ref reader); - return DeserializeInternalValidateGraderResponse(document.RootElement, options); + return DeserializeValidateGraderResponse(document.RootElement, options); } - internal static InternalValidateGraderResponse DeserializeInternalValidateGraderResponse(JsonElement element, ModelReaderWriterOptions options) + internal static ValidateGraderResponse DeserializeValidateGraderResponse(JsonElement element, ModelReaderWriterOptions options) { if (element.ValueKind == JsonValueKind.Null) { @@ -95,40 +95,40 @@ internal static InternalValidateGraderResponse DeserializeInternalValidateGrader // Plugin customization: remove options.Format != "W" check additionalBinaryDataProperties.Add(prop.Name, BinaryData.FromString(prop.Value.GetRawText())); } - return new InternalValidateGraderResponse(grader, additionalBinaryDataProperties); + return new ValidateGraderResponse(grader, additionalBinaryDataProperties); } - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": return ModelReaderWriter.Write(this, options, OpenAIContext.Default); default: - throw new FormatException($"The model {nameof(InternalValidateGraderResponse)} does not support writing '{options.Format}' format."); + throw new FormatException($"The model {nameof(ValidateGraderResponse)} does not support writing '{options.Format}' format."); } } - InternalValidateGraderResponse IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); + ValidateGraderResponse IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); - protected virtual InternalValidateGraderResponse PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) + protected virtual ValidateGraderResponse PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) { - string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": using (JsonDocument document = JsonDocument.Parse(data)) { - return DeserializeInternalValidateGraderResponse(document.RootElement, options); + return DeserializeValidateGraderResponse(document.RootElement, options); } default: - throw new FormatException($"The model {nameof(InternalValidateGraderResponse)} does not support reading '{options.Format}' format."); + throw new FormatException($"The model {nameof(ValidateGraderResponse)} does not support reading '{options.Format}' format."); } } - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; } } diff --git a/src/Generated/Models/Graders/InternalValidateGraderResponse.cs b/src/Generated/Models/Graders/ValidateGraderResponse.cs similarity index 68% rename from src/Generated/Models/Graders/InternalValidateGraderResponse.cs rename to src/Generated/Models/Graders/ValidateGraderResponse.cs index 36b263e6a..730abaf78 100644 --- a/src/Generated/Models/Graders/InternalValidateGraderResponse.cs +++ b/src/Generated/Models/Graders/ValidateGraderResponse.cs @@ -4,18 +4,20 @@ using System; using System.Collections.Generic; +using System.Diagnostics.CodeAnalysis; namespace OpenAI.Graders { - internal partial class InternalValidateGraderResponse + [Experimental("OPENAI001")] + public partial class ValidateGraderResponse { private protected IDictionary _additionalBinaryDataProperties; - internal InternalValidateGraderResponse() + internal ValidateGraderResponse() { } - internal InternalValidateGraderResponse(BinaryData grader, IDictionary additionalBinaryDataProperties) + internal ValidateGraderResponse(BinaryData grader, IDictionary additionalBinaryDataProperties) { Grader = grader; _additionalBinaryDataProperties = additionalBinaryDataProperties; diff --git a/src/Generated/OpenAIModelFactory.cs b/src/Generated/OpenAIModelFactory.cs index a0e21804c..301682df7 100644 --- a/src/Generated/OpenAIModelFactory.cs +++ b/src/Generated/OpenAIModelFactory.cs @@ -8,9 +8,11 @@ using OpenAI.Assistants; using OpenAI.Audio; using OpenAI.Chat; +using OpenAI.Containers; using OpenAI.Embeddings; using OpenAI.Files; using OpenAI.FineTuning; +using OpenAI.Graders; using OpenAI.Images; using OpenAI.Models; using OpenAI.Moderations; @@ -358,6 +360,43 @@ public static HyperparametersForDPO HyperparametersForDPO(BinaryData batchSize = return new HyperparametersForDPO(batchSize, nEpochs, learningRateMultiplier, beta, additionalBinaryDataProperties: null); } + public static GraderStringCheck GraderStringCheck(string name = default, string input = default, string reference = default, GraderStringCheckOperation operation = default) + { + return new GraderStringCheck( + GraderType.StringCheck, + additionalBinaryDataProperties: null, + name, + input, + reference, + operation); + } + + public static Grader Grader(string kind = default) + { + return new UnknownGrader(new GraderType(kind), additionalBinaryDataProperties: null); + } + + public static GraderTextSimilarity GraderTextSimilarity(string name = default, string input = default, string reference = default, GraderTextSimilarityEvaluationMetric evaluationMetric = default) + { + return new GraderTextSimilarity( + GraderType.TextSimilarity, + additionalBinaryDataProperties: null, + name, + input, + reference, + evaluationMetric); + } + + public static GraderPython GraderPython(string name = default, string source = default, string imageTag = default) + { + return new GraderPython(GraderType.Python, additionalBinaryDataProperties: null, name, source, imageTag); + } + + public static GraderMulti GraderMulti(string name = default, BinaryData graders = default, string calculateOutput = default) + { + return new GraderMulti(GraderType.Multi, additionalBinaryDataProperties: null, name, graders, calculateOutput); + } + public static FineTuningError FineTuningError(string code = default, string message = default, string invalidParameter = default) { return new FineTuningError(code, message, invalidParameter, additionalBinaryDataProperties: null); @@ -1035,5 +1074,141 @@ public static AudioTokenLogProbabilityDetails AudioTokenLogProbabilityDetails(st { return new AudioTokenLogProbabilityDetails(token, logProbability, utf8Bytes, additionalBinaryDataProperties: null); } + + public static RunGraderRequest RunGraderRequest(BinaryData grader = default, BinaryData item = default, string modelSample = default) + { + return new RunGraderRequest(grader, item, modelSample, additionalBinaryDataProperties: null); + } + + public static RunGraderResponse RunGraderResponse(float reward = default, RunGraderResponseMetadata metadata = default, BinaryData subRewards = default, BinaryData modelGraderTokenUsagePerModel = default) + { + return new RunGraderResponse(reward, metadata, subRewards, modelGraderTokenUsagePerModel, additionalBinaryDataProperties: null); + } + + public static RunGraderResponseMetadata RunGraderResponseMetadata(string name = default, string kind = default, RunGraderResponseMetadataErrors errors = default, float executionTime = default, BinaryData scores = default, int? tokenUsage = default, string sampledModelName = default) + { + return new RunGraderResponseMetadata( + name, + kind, + errors, + executionTime, + scores, + tokenUsage, + sampledModelName, + additionalBinaryDataProperties: null); + } + + public static RunGraderResponseMetadataErrors RunGraderResponseMetadataErrors(bool formulaParseError = default, bool sampleParseError = default, bool truncatedObservationError = default, bool unresponsiveRewardError = default, bool invalidVariableError = default, bool otherError = default, bool pythonGraderServerError = default, string pythonGraderServerErrorType = default, bool pythonGraderRuntimeError = default, string pythonGraderRuntimeErrorDetails = default, bool modelGraderServerError = default, bool modelGraderRefusalError = default, bool modelGraderParseError = default, string modelGraderServerErrorDetails = default) + { + return new RunGraderResponseMetadataErrors( + formulaParseError, + sampleParseError, + truncatedObservationError, + unresponsiveRewardError, + invalidVariableError, + otherError, + pythonGraderServerError, + pythonGraderServerErrorType, + pythonGraderRuntimeError, + pythonGraderRuntimeErrorDetails, + modelGraderServerError, + modelGraderRefusalError, + modelGraderParseError, + modelGraderServerErrorDetails, + additionalBinaryDataProperties: null); + } + + public static ValidateGraderRequest ValidateGraderRequest(BinaryData grader = default) + { + return new ValidateGraderRequest(grader, additionalBinaryDataProperties: null); + } + + public static ValidateGraderResponse ValidateGraderResponse(BinaryData grader = default) + { + return new ValidateGraderResponse(grader, additionalBinaryDataProperties: null); + } + + public static ContainerListResource ContainerListResource(string @object = default, IEnumerable data = default, string firstId = default, string lastId = default, bool hasMore = default) + { + data ??= new ChangeTrackingList(); + + return new ContainerListResource( + @object, + data?.ToList(), + firstId, + lastId, + hasMore, + additionalBinaryDataProperties: null); + } + + public static ContainerResource ContainerResource(string id = default, string @object = default, string name = default, DateTimeOffset createdAt = default, string status = default, ContainerResourceExpiresAfter expiresAfter = default) + { + return new ContainerResource( + id, + @object, + name, + createdAt, + status, + expiresAfter, + additionalBinaryDataProperties: null); + } + + public static ContainerResourceExpiresAfter ContainerResourceExpiresAfter(string anchor = default, int? minutes = default) + { + return new ContainerResourceExpiresAfter(anchor, minutes, additionalBinaryDataProperties: null); + } + + public static CreateContainerBody CreateContainerBody(string name = default, IEnumerable fileIds = default, CreateContainerBodyExpiresAfter expiresAfter = default) + { + fileIds ??= new ChangeTrackingList(); + + return new CreateContainerBody(name, fileIds?.ToList(), expiresAfter, additionalBinaryDataProperties: null); + } + + public static CreateContainerBodyExpiresAfter CreateContainerBodyExpiresAfter(string anchor = default, int minutes = default) + { + return new CreateContainerBodyExpiresAfter(anchor, minutes, additionalBinaryDataProperties: null); + } + + public static DeleteContainerResponse DeleteContainerResponse(string id = default, string @object = default, bool deleted = default) + { + return new DeleteContainerResponse(id, @object, deleted, additionalBinaryDataProperties: null); + } + + public static CreateContainerFileBody CreateContainerFileBody(string fileId = default, BinaryData @file = default) + { + return new CreateContainerFileBody(fileId, @file, additionalBinaryDataProperties: null); + } + + public static ContainerFileResource ContainerFileResource(string id = default, string @object = default, string containerId = default, DateTimeOffset createdAt = default, int bytes = default, string path = default, string source = default) + { + return new ContainerFileResource( + id, + @object, + containerId, + createdAt, + bytes, + path, + source, + additionalBinaryDataProperties: null); + } + + public static ContainerFileListResource ContainerFileListResource(string @object = default, IEnumerable data = default, string firstId = default, string lastId = default, bool hasMore = default) + { + data ??= new ChangeTrackingList(); + + return new ContainerFileListResource( + @object, + data?.ToList(), + firstId, + lastId, + hasMore, + additionalBinaryDataProperties: null); + } + + public static DeleteContainerFileResponse DeleteContainerFileResponse(string id = default, string @object = default, bool deleted = default) + { + return new DeleteContainerFileResponse(id, @object, deleted, additionalBinaryDataProperties: null); + } } } From fb1ce96ab8f68173cedbe854eae770342b93da0e Mon Sep 17 00:00:00 2001 From: ShivangiReja <45216704+ShivangiReja@users.noreply.github.com> Date: Fri, 25 Jul 2025 02:31:53 -0700 Subject: [PATCH 2/3] Feedback --- api/OpenAI.net8.0.cs | 16 +-- api/OpenAI.netstandard2.0.cs | 16 +-- scripts/Export-Api.ps1 | 2 + specification/client/containers.client.tsp | 6 +- specification/main.tsp | 4 +- src/Generated/ContainerClient.RestClient.cs | 6 +- src/Generated/ContainerClient.cs | 24 ++--- src/Generated/OpenAIModelFactory.cs | 106 ++++++++++---------- 8 files changed, 93 insertions(+), 87 deletions(-) diff --git a/api/OpenAI.net8.0.cs b/api/OpenAI.net8.0.cs index c424c16cf..57bff3c5d 100644 --- a/api/OpenAI.net8.0.cs +++ b/api/OpenAI.net8.0.cs @@ -13,14 +13,14 @@ public class OpenAIClient { public virtual BatchClient GetBatchClient(); public virtual ChatClient GetChatClient(string model); [Experimental("OPENAI001")] - public virtual Containers.ContainerClient GetContainerClient(); + public virtual ContainerClient GetContainerClient(); public virtual EmbeddingClient GetEmbeddingClient(string model); [Experimental("OPENAI001")] public virtual EvaluationClient GetEvaluationClient(); [Experimental("OPENAI001")] public virtual FineTuningClient GetFineTuningClient(); [Experimental("OPENAI001")] - public virtual Graders.GraderClient GetGraderClient(); + public virtual GraderClient GetGraderClient(); public virtual ImageClient GetImageClient(string model); public virtual ModerationClient GetModerationClient(string model); public virtual OpenAIFileClient GetOpenAIFileClient(); @@ -2115,16 +2115,16 @@ public class ContainerClient { public virtual Task DeleteContainerAsync(string containerId, RequestOptions options = null); public virtual ClientResult DeleteContainerFile(string containerId, string fileId, RequestOptions options = null); public virtual Task DeleteContainerFileAsync(string containerId, string fileId, RequestOptions options = null); + public virtual ClientResult GetContainer(string containerId, RequestOptions options = null); + public virtual Task GetContainerAsync(string containerId, RequestOptions options = null); + public virtual ClientResult GetContainerFile(string containerId, string fileId, RequestOptions options = null); + public virtual Task GetContainerFileAsync(string containerId, string fileId, RequestOptions options = null); + public virtual ClientResult GetContainerFileContent(string containerId, string fileId, RequestOptions options = null); + public virtual Task GetContainerFileContentAsync(string containerId, string fileId, RequestOptions options = null); public virtual ClientResult GetContainerFiles(string containerId, int? limit = null, string order = null, string after = null, RequestOptions options = null); public virtual Task GetContainerFilesAsync(string containerId, int? limit = null, string order = null, string after = null, RequestOptions options = null); public virtual ClientResult GetContainers(int? limit = null, string order = null, string after = null, RequestOptions options = null); public virtual Task GetContainersAsync(int? limit = null, string order = null, string after = null, RequestOptions options = null); - public virtual ClientResult RetrieveContainer(string containerId, RequestOptions options = null); - public virtual Task RetrieveContainerAsync(string containerId, RequestOptions options = null); - public virtual ClientResult RetrieveContainerFile(string containerId, string fileId, RequestOptions options = null); - public virtual Task RetrieveContainerFileAsync(string containerId, string fileId, RequestOptions options = null); - public virtual ClientResult RetrieveContainerFileContent(string containerId, string fileId, RequestOptions options = null); - public virtual Task RetrieveContainerFileContentAsync(string containerId, string fileId, RequestOptions options = null); } [Experimental("OPENAI001")] public class ContainerFileListResource : IJsonModel, IPersistableModel { diff --git a/api/OpenAI.netstandard2.0.cs b/api/OpenAI.netstandard2.0.cs index 6bc30b3cf..10c9b626b 100644 --- a/api/OpenAI.netstandard2.0.cs +++ b/api/OpenAI.netstandard2.0.cs @@ -10,11 +10,11 @@ public class OpenAIClient { public virtual AudioClient GetAudioClient(string model); public virtual BatchClient GetBatchClient(); public virtual ChatClient GetChatClient(string model); - public virtual Containers.ContainerClient GetContainerClient(); + public virtual ContainerClient GetContainerClient(); public virtual EmbeddingClient GetEmbeddingClient(string model); public virtual EvaluationClient GetEvaluationClient(); public virtual FineTuningClient GetFineTuningClient(); - public virtual Graders.GraderClient GetGraderClient(); + public virtual GraderClient GetGraderClient(); public virtual ImageClient GetImageClient(string model); public virtual ModerationClient GetModerationClient(string model); public virtual OpenAIFileClient GetOpenAIFileClient(); @@ -1834,16 +1834,16 @@ public class ContainerClient { public virtual Task DeleteContainerAsync(string containerId, RequestOptions options = null); public virtual ClientResult DeleteContainerFile(string containerId, string fileId, RequestOptions options = null); public virtual Task DeleteContainerFileAsync(string containerId, string fileId, RequestOptions options = null); + public virtual ClientResult GetContainer(string containerId, RequestOptions options = null); + public virtual Task GetContainerAsync(string containerId, RequestOptions options = null); + public virtual ClientResult GetContainerFile(string containerId, string fileId, RequestOptions options = null); + public virtual Task GetContainerFileAsync(string containerId, string fileId, RequestOptions options = null); + public virtual ClientResult GetContainerFileContent(string containerId, string fileId, RequestOptions options = null); + public virtual Task GetContainerFileContentAsync(string containerId, string fileId, RequestOptions options = null); public virtual ClientResult GetContainerFiles(string containerId, int? limit = null, string order = null, string after = null, RequestOptions options = null); public virtual Task GetContainerFilesAsync(string containerId, int? limit = null, string order = null, string after = null, RequestOptions options = null); public virtual ClientResult GetContainers(int? limit = null, string order = null, string after = null, RequestOptions options = null); public virtual Task GetContainersAsync(int? limit = null, string order = null, string after = null, RequestOptions options = null); - public virtual ClientResult RetrieveContainer(string containerId, RequestOptions options = null); - public virtual Task RetrieveContainerAsync(string containerId, RequestOptions options = null); - public virtual ClientResult RetrieveContainerFile(string containerId, string fileId, RequestOptions options = null); - public virtual Task RetrieveContainerFileAsync(string containerId, string fileId, RequestOptions options = null); - public virtual ClientResult RetrieveContainerFileContent(string containerId, string fileId, RequestOptions options = null); - public virtual Task RetrieveContainerFileContentAsync(string containerId, string fileId, RequestOptions options = null); } public class ContainerFileListResource : IJsonModel, IPersistableModel { public IList Data { get; } diff --git a/scripts/Export-Api.ps1 b/scripts/Export-Api.ps1 index 9afddbe60..50708a4e8 100644 --- a/scripts/Export-Api.ps1 +++ b/scripts/Export-Api.ps1 @@ -244,10 +244,12 @@ function Invoke-GenAPI { $content = $content -creplace "Batch\.", "" $content = $content -creplace "Chat\.", "" $content = $content -creplace "Common\.", "" + $content = $content -creplace "Containers\.", "" $content = $content -creplace "Embeddings\.", "" $content = $content -creplace "Evals\.", "" $content = $content -creplace "Files\.", "" $content = $content -creplace "FineTuning\.", "" + $content = $content -creplace "Graders\.", "" $content = $content -creplace "Images\.", "" $content = $content -creplace "Models\.", "" $content = $content -creplace "Moderations\.", "" diff --git a/specification/client/containers.client.tsp b/specification/client/containers.client.tsp index c4bbef5cc..124c8acc5 100644 --- a/specification/client/containers.client.tsp +++ b/specification/client/containers.client.tsp @@ -12,4 +12,8 @@ using Azure.ClientGenerator.Core; @@convenientAPI(Containers.listContainerFiles, false); @@convenientAPI(Containers.retrieveContainerFile, false); @@convenientAPI(Containers.deleteContainerFile, false); -@@convenientAPI(Containers.retrieveContainerFileContent, false); \ No newline at end of file +@@convenientAPI(Containers.retrieveContainerFileContent, false); + +@@clientName(Containers.retrieveContainer, "GetContainer"); +@@clientName(Containers.retrieveContainerFile, "GetContainerFile"); +@@clientName(Containers.retrieveContainerFileContent, "GetContainerFileContent"); \ No newline at end of file diff --git a/specification/main.tsp b/specification/main.tsp index 1fdae54ce..609d39ffb 100644 --- a/specification/main.tsp +++ b/specification/main.tsp @@ -2,17 +2,17 @@ import "./client/assistants.client.tsp"; import "./client/audio.client.tsp"; import "./client/batch.client.tsp"; import "./client/chat.client.tsp"; +import "./client/containers.client.tsp"; import "./client/embeddings.client.tsp"; import "./client/files.client.tsp"; import "./client/fine-tuning.client.tsp"; +import "./client/graders.client.tsp"; import "./client/images.client.tsp"; import "./client/messages.client.tsp"; import "./client/moderations.client.tsp"; import "./client/runs.client.tsp"; import "./client/threads.client.tsp"; import "./client/vector-stores.client.tsp"; -import "./client/graders.client.tsp"; -import "./client/containers.client.tsp"; import "./client/models/audio.models.tsp"; import "./client/models/common.models.tsp"; diff --git a/src/Generated/ContainerClient.RestClient.cs b/src/Generated/ContainerClient.RestClient.cs index 082984bbd..8b73b8bac 100644 --- a/src/Generated/ContainerClient.RestClient.cs +++ b/src/Generated/ContainerClient.RestClient.cs @@ -58,7 +58,7 @@ internal virtual PipelineMessage CreateCreateContainerRequest(BinaryContent cont return message; } - internal virtual PipelineMessage CreateRetrieveContainerRequest(string containerId, RequestOptions options) + internal virtual PipelineMessage CreateGetContainerRequest(string containerId, RequestOptions options) { PipelineMessage message = Pipeline.CreateMessage(); message.ResponseClassifier = PipelineMessageClassifier200; @@ -138,7 +138,7 @@ internal virtual PipelineMessage CreateGetContainerFilesRequest(string container return message; } - internal virtual PipelineMessage CreateRetrieveContainerFileRequest(string containerId, string fileId, RequestOptions options) + internal virtual PipelineMessage CreateGetContainerFileRequest(string containerId, string fileId, RequestOptions options) { PipelineMessage message = Pipeline.CreateMessage(); message.ResponseClassifier = PipelineMessageClassifier200; @@ -174,7 +174,7 @@ internal virtual PipelineMessage CreateDeleteContainerFileRequest(string contain return message; } - internal virtual PipelineMessage CreateRetrieveContainerFileContentRequest(string containerId, string fileId, RequestOptions options) + internal virtual PipelineMessage CreateGetContainerFileContentRequest(string containerId, string fileId, RequestOptions options) { PipelineMessage message = Pipeline.CreateMessage(); message.ResponseClassifier = PipelineMessageClassifier200; diff --git a/src/Generated/ContainerClient.cs b/src/Generated/ContainerClient.cs index 527198080..b66d45eff 100644 --- a/src/Generated/ContainerClient.cs +++ b/src/Generated/ContainerClient.cs @@ -50,19 +50,19 @@ public virtual async Task CreateContainerAsync(BinaryContent conte return ClientResult.FromResponse(await Pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false)); } - public virtual ClientResult RetrieveContainer(string containerId, RequestOptions options = null) + public virtual ClientResult GetContainer(string containerId, RequestOptions options = null) { Argument.AssertNotNullOrEmpty(containerId, nameof(containerId)); - using PipelineMessage message = CreateRetrieveContainerRequest(containerId, options); + using PipelineMessage message = CreateGetContainerRequest(containerId, options); return ClientResult.FromResponse(Pipeline.ProcessMessage(message, options)); } - public virtual async Task RetrieveContainerAsync(string containerId, RequestOptions options = null) + public virtual async Task GetContainerAsync(string containerId, RequestOptions options = null) { Argument.AssertNotNullOrEmpty(containerId, nameof(containerId)); - using PipelineMessage message = CreateRetrieveContainerRequest(containerId, options); + using PipelineMessage message = CreateGetContainerRequest(containerId, options); return ClientResult.FromResponse(await Pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false)); } @@ -116,21 +116,21 @@ public virtual async Task GetContainerFilesAsync(string containerI return ClientResult.FromResponse(await Pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false)); } - public virtual ClientResult RetrieveContainerFile(string containerId, string fileId, RequestOptions options = null) + public virtual ClientResult GetContainerFile(string containerId, string fileId, RequestOptions options = null) { Argument.AssertNotNullOrEmpty(containerId, nameof(containerId)); Argument.AssertNotNullOrEmpty(fileId, nameof(fileId)); - using PipelineMessage message = CreateRetrieveContainerFileRequest(containerId, fileId, options); + using PipelineMessage message = CreateGetContainerFileRequest(containerId, fileId, options); return ClientResult.FromResponse(Pipeline.ProcessMessage(message, options)); } - public virtual async Task RetrieveContainerFileAsync(string containerId, string fileId, RequestOptions options = null) + public virtual async Task GetContainerFileAsync(string containerId, string fileId, RequestOptions options = null) { Argument.AssertNotNullOrEmpty(containerId, nameof(containerId)); Argument.AssertNotNullOrEmpty(fileId, nameof(fileId)); - using PipelineMessage message = CreateRetrieveContainerFileRequest(containerId, fileId, options); + using PipelineMessage message = CreateGetContainerFileRequest(containerId, fileId, options); return ClientResult.FromResponse(await Pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false)); } @@ -152,21 +152,21 @@ public virtual async Task DeleteContainerFileAsync(string containe return ClientResult.FromResponse(await Pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false)); } - public virtual ClientResult RetrieveContainerFileContent(string containerId, string fileId, RequestOptions options = null) + public virtual ClientResult GetContainerFileContent(string containerId, string fileId, RequestOptions options = null) { Argument.AssertNotNullOrEmpty(containerId, nameof(containerId)); Argument.AssertNotNullOrEmpty(fileId, nameof(fileId)); - using PipelineMessage message = CreateRetrieveContainerFileContentRequest(containerId, fileId, options); + using PipelineMessage message = CreateGetContainerFileContentRequest(containerId, fileId, options); return ClientResult.FromResponse(Pipeline.ProcessMessage(message, options)); } - public virtual async Task RetrieveContainerFileContentAsync(string containerId, string fileId, RequestOptions options = null) + public virtual async Task GetContainerFileContentAsync(string containerId, string fileId, RequestOptions options = null) { Argument.AssertNotNullOrEmpty(containerId, nameof(containerId)); Argument.AssertNotNullOrEmpty(fileId, nameof(fileId)); - using PipelineMessage message = CreateRetrieveContainerFileContentRequest(containerId, fileId, options); + using PipelineMessage message = CreateGetContainerFileContentRequest(containerId, fileId, options); return ClientResult.FromResponse(await Pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false)); } } diff --git a/src/Generated/OpenAIModelFactory.cs b/src/Generated/OpenAIModelFactory.cs index 301682df7..abbb173c5 100644 --- a/src/Generated/OpenAIModelFactory.cs +++ b/src/Generated/OpenAIModelFactory.cs @@ -1075,59 +1075,6 @@ public static AudioTokenLogProbabilityDetails AudioTokenLogProbabilityDetails(st return new AudioTokenLogProbabilityDetails(token, logProbability, utf8Bytes, additionalBinaryDataProperties: null); } - public static RunGraderRequest RunGraderRequest(BinaryData grader = default, BinaryData item = default, string modelSample = default) - { - return new RunGraderRequest(grader, item, modelSample, additionalBinaryDataProperties: null); - } - - public static RunGraderResponse RunGraderResponse(float reward = default, RunGraderResponseMetadata metadata = default, BinaryData subRewards = default, BinaryData modelGraderTokenUsagePerModel = default) - { - return new RunGraderResponse(reward, metadata, subRewards, modelGraderTokenUsagePerModel, additionalBinaryDataProperties: null); - } - - public static RunGraderResponseMetadata RunGraderResponseMetadata(string name = default, string kind = default, RunGraderResponseMetadataErrors errors = default, float executionTime = default, BinaryData scores = default, int? tokenUsage = default, string sampledModelName = default) - { - return new RunGraderResponseMetadata( - name, - kind, - errors, - executionTime, - scores, - tokenUsage, - sampledModelName, - additionalBinaryDataProperties: null); - } - - public static RunGraderResponseMetadataErrors RunGraderResponseMetadataErrors(bool formulaParseError = default, bool sampleParseError = default, bool truncatedObservationError = default, bool unresponsiveRewardError = default, bool invalidVariableError = default, bool otherError = default, bool pythonGraderServerError = default, string pythonGraderServerErrorType = default, bool pythonGraderRuntimeError = default, string pythonGraderRuntimeErrorDetails = default, bool modelGraderServerError = default, bool modelGraderRefusalError = default, bool modelGraderParseError = default, string modelGraderServerErrorDetails = default) - { - return new RunGraderResponseMetadataErrors( - formulaParseError, - sampleParseError, - truncatedObservationError, - unresponsiveRewardError, - invalidVariableError, - otherError, - pythonGraderServerError, - pythonGraderServerErrorType, - pythonGraderRuntimeError, - pythonGraderRuntimeErrorDetails, - modelGraderServerError, - modelGraderRefusalError, - modelGraderParseError, - modelGraderServerErrorDetails, - additionalBinaryDataProperties: null); - } - - public static ValidateGraderRequest ValidateGraderRequest(BinaryData grader = default) - { - return new ValidateGraderRequest(grader, additionalBinaryDataProperties: null); - } - - public static ValidateGraderResponse ValidateGraderResponse(BinaryData grader = default) - { - return new ValidateGraderResponse(grader, additionalBinaryDataProperties: null); - } - public static ContainerListResource ContainerListResource(string @object = default, IEnumerable data = default, string firstId = default, string lastId = default, bool hasMore = default) { data ??= new ChangeTrackingList(); @@ -1210,5 +1157,58 @@ public static DeleteContainerFileResponse DeleteContainerFileResponse(string id { return new DeleteContainerFileResponse(id, @object, deleted, additionalBinaryDataProperties: null); } + + public static RunGraderRequest RunGraderRequest(BinaryData grader = default, BinaryData item = default, string modelSample = default) + { + return new RunGraderRequest(grader, item, modelSample, additionalBinaryDataProperties: null); + } + + public static RunGraderResponse RunGraderResponse(float reward = default, RunGraderResponseMetadata metadata = default, BinaryData subRewards = default, BinaryData modelGraderTokenUsagePerModel = default) + { + return new RunGraderResponse(reward, metadata, subRewards, modelGraderTokenUsagePerModel, additionalBinaryDataProperties: null); + } + + public static RunGraderResponseMetadata RunGraderResponseMetadata(string name = default, string kind = default, RunGraderResponseMetadataErrors errors = default, float executionTime = default, BinaryData scores = default, int? tokenUsage = default, string sampledModelName = default) + { + return new RunGraderResponseMetadata( + name, + kind, + errors, + executionTime, + scores, + tokenUsage, + sampledModelName, + additionalBinaryDataProperties: null); + } + + public static RunGraderResponseMetadataErrors RunGraderResponseMetadataErrors(bool formulaParseError = default, bool sampleParseError = default, bool truncatedObservationError = default, bool unresponsiveRewardError = default, bool invalidVariableError = default, bool otherError = default, bool pythonGraderServerError = default, string pythonGraderServerErrorType = default, bool pythonGraderRuntimeError = default, string pythonGraderRuntimeErrorDetails = default, bool modelGraderServerError = default, bool modelGraderRefusalError = default, bool modelGraderParseError = default, string modelGraderServerErrorDetails = default) + { + return new RunGraderResponseMetadataErrors( + formulaParseError, + sampleParseError, + truncatedObservationError, + unresponsiveRewardError, + invalidVariableError, + otherError, + pythonGraderServerError, + pythonGraderServerErrorType, + pythonGraderRuntimeError, + pythonGraderRuntimeErrorDetails, + modelGraderServerError, + modelGraderRefusalError, + modelGraderParseError, + modelGraderServerErrorDetails, + additionalBinaryDataProperties: null); + } + + public static ValidateGraderRequest ValidateGraderRequest(BinaryData grader = default) + { + return new ValidateGraderRequest(grader, additionalBinaryDataProperties: null); + } + + public static ValidateGraderResponse ValidateGraderResponse(BinaryData grader = default) + { + return new ValidateGraderResponse(grader, additionalBinaryDataProperties: null); + } } } From d2b98b3a4f445df8b4d7d342fb583d52c5b6b9e4 Mon Sep 17 00:00:00 2001 From: ShivangiReja <45216704+ShivangiReja@users.noreply.github.com> Date: Fri, 25 Jul 2025 02:34:56 -0700 Subject: [PATCH 3/3] Add empty line --- specification/client/containers.client.tsp | 2 +- specification/client/graders.client.tsp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/client/containers.client.tsp b/specification/client/containers.client.tsp index 124c8acc5..8d7f06afb 100644 --- a/specification/client/containers.client.tsp +++ b/specification/client/containers.client.tsp @@ -16,4 +16,4 @@ using Azure.ClientGenerator.Core; @@clientName(Containers.retrieveContainer, "GetContainer"); @@clientName(Containers.retrieveContainerFile, "GetContainerFile"); -@@clientName(Containers.retrieveContainerFileContent, "GetContainerFileContent"); \ No newline at end of file +@@clientName(Containers.retrieveContainerFileContent, "GetContainerFileContent"); diff --git a/specification/client/graders.client.tsp b/specification/client/graders.client.tsp index 9d52ac63b..c7e5992a8 100644 --- a/specification/client/graders.client.tsp +++ b/specification/client/graders.client.tsp @@ -5,4 +5,4 @@ using OpenAI; using Azure.ClientGenerator.Core; @@convenientAPI(Graders.runGrader, false); -@@convenientAPI(Graders.validateGrader, false); \ No newline at end of file +@@convenientAPI(Graders.validateGrader, false);