From 484302fa71a5621da5535c8b49927936d64e5f08 Mon Sep 17 00:00:00 2001
From: Deep Singhvi <deep@buildwithfern.com>
Date: Wed, 12 Feb 2025 21:01:46 -0500
Subject: [PATCH] fix(csharp): literal support in wrapped requests (#5982)

---
 .../context/AbstractCsharpGeneratorContext.ts    | 16 ++++++++++++++--
 .../csharp/model/src/object/ObjectGenerator.ts   | 11 ++---------
 .../wrapped-request/WrappedRequestGenerator.ts   |  8 ++++++--
 generators/csharp/sdk/versions.yml               |  8 ++++++++
 .../SeedAnyAuth/Auth/Requests/GetTokenRequest.cs |  4 ++--
 .../User/Requests/CreateUserRequest.cs           |  4 ++--
 .../Requests/SendLiteralsInlinedRequest.cs       |  6 +++---
 .../Auth/Requests/GetTokenRequest.cs             |  4 ++--
 .../Auth/Requests/RefreshTokenRequest.cs         |  4 ++--
 .../Auth/Requests/GetTokenRequest.cs             |  2 +-
 .../Auth/Requests/GetTokenRequest.cs             |  4 ++--
 .../Auth/Requests/RefreshTokenRequest.cs         |  4 ++--
 .../Auth/Requests/GetTokenRequest.cs             |  4 ++--
 .../Auth/Requests/GetTokenRequest.cs             |  4 ++--
 .../Auth/Requests/RefreshTokenRequest.cs         |  4 ++--
 .../Dummy/Requests/GenerateStreamRequest.cs      |  2 +-
 .../Dummy/Requests/Generateequest.cs             |  2 +-
 17 files changed, 54 insertions(+), 37 deletions(-)

diff --git a/generators/csharp/codegen/src/context/AbstractCsharpGeneratorContext.ts b/generators/csharp/codegen/src/context/AbstractCsharpGeneratorContext.ts
index 3da93d823c7..b9f64e57728 100644
--- a/generators/csharp/codegen/src/context/AbstractCsharpGeneratorContext.ts
+++ b/generators/csharp/codegen/src/context/AbstractCsharpGeneratorContext.ts
@@ -453,11 +453,23 @@ export abstract class AbstractCsharpGeneratorContext<
     /**
      * Returns the literal value from a Type Reference (doesn't unbox containers to find a literal).
      */
-    public getLiteralFromTypeReference({
+    public getLiteralInitializerFromTypeReference({
         typeReference
     }: {
         typeReference: TypeReference;
-    }): string | boolean | undefined {
+    }): csharp.CodeBlock | undefined {
+        const literalValue = this.getLiteralValue(typeReference);
+        if (literalValue != null) {
+            return csharp.codeblock(
+                typeof literalValue === "boolean" 
+                    ? `${literalValue.toString().toLowerCase()}`
+                    : `"${literalValue}"`
+            );
+        }
+        return undefined;
+    }
+
+    private getLiteralValue(typeReference: TypeReference): string | boolean | undefined {
         if (typeReference.type === "container" && typeReference.container.type === "literal") {
             const literal = typeReference.container.literal;
             switch (literal.type) {
diff --git a/generators/csharp/model/src/object/ObjectGenerator.ts b/generators/csharp/model/src/object/ObjectGenerator.ts
index 67129684066..fc61be85c3a 100644
--- a/generators/csharp/model/src/object/ObjectGenerator.ts
+++ b/generators/csharp/model/src/object/ObjectGenerator.ts
@@ -41,7 +41,7 @@ export class ObjectGenerator extends FileGenerator<CSharpFile, ModelCustomConfig
         ];
         flattenedProperties.forEach((property) => {
             const fieldType = this.context.csharpTypeMapper.convert({ reference: property.valueType });
-            const maybeLiteralInitializer = this.context.getLiteralFromTypeReference({
+            const maybeLiteralInitializer = this.context.getLiteralInitializerFromTypeReference({
                 typeReference: property.valueType
             });
 
@@ -55,14 +55,7 @@ export class ObjectGenerator extends FileGenerator<CSharpFile, ModelCustomConfig
                     summary: property.docs,
                     jsonPropertyName: property.name.wireValue,
                     useRequired: true,
-                    initializer:
-                        maybeLiteralInitializer != null
-                            ? csharp.codeblock(
-                                  typeof maybeLiteralInitializer === "boolean"
-                                      ? `${maybeLiteralInitializer.toString().toLowerCase()}`
-                                      : `"${maybeLiteralInitializer}"`
-                              )
-                            : undefined
+                    initializer: maybeLiteralInitializer
                 })
             );
         });
diff --git a/generators/csharp/sdk/src/wrapped-request/WrappedRequestGenerator.ts b/generators/csharp/sdk/src/wrapped-request/WrappedRequestGenerator.ts
index dee32b596cf..3677e703ea1 100644
--- a/generators/csharp/sdk/src/wrapped-request/WrappedRequestGenerator.ts
+++ b/generators/csharp/sdk/src/wrapped-request/WrappedRequestGenerator.ts
@@ -1,5 +1,5 @@
 import { CSharpFile, FileGenerator, csharp } from "@fern-api/csharp-codegen";
-import { ExampleGenerator, getUndiscriminatedUnionSerializerAnnotation } from "@fern-api/fern-csharp-model";
+import { ExampleGenerator } from "@fern-api/fern-csharp-model";
 import { RelativeFilePath, join } from "@fern-api/fs-utils";
 
 import {
@@ -113,6 +113,9 @@ export class WrappedRequestGenerator extends FileGenerator<CSharpFile, SdkCustom
             inlinedRequestBody: (request) => {
                 for (const property of [...request.properties, ...(request.extendedProperties ?? [])]) {
                     const propertyName = property.name.name.pascalCase.safeName;
+                    const maybeLiteralInitializer = this.context.getLiteralInitializerFromTypeReference({
+                        typeReference: property.valueType
+                    });
                     class_.addField(
                         csharp.field({
                             name: propertyName,
@@ -122,7 +125,8 @@ export class WrappedRequestGenerator extends FileGenerator<CSharpFile, SdkCustom
                             set: true,
                             summary: property.docs,
                             jsonPropertyName: addJsonAnnotations ? property.name.wireValue : undefined,
-                            useRequired: true
+                            useRequired: true,
+                            initializer: maybeLiteralInitializer
                         })
                     );
 
diff --git a/generators/csharp/sdk/versions.yml b/generators/csharp/sdk/versions.yml
index ba5ec6e86b4..ee9a8d57b53 100644
--- a/generators/csharp/sdk/versions.yml
+++ b/generators/csharp/sdk/versions.yml
@@ -7,6 +7,14 @@
 #         Set `enable-forward-compatible-enums` to `false` in the configuration to generate the old enums.
 #   irVersion: 53
 
+- version: 1.9.19
+  createdAt: "2025-02-06"
+  irVersion: 53          
+  changelogEntry:
+    - type: fix
+      summary: | 
+        Support literals in wrapped requests (). For example, if a field in a wrapped request has a literal value of "foo", we will now set that value as the default value for the field.
+        Note that wrapped requests are just a bag of properties that include query parameters, body properties, and headers. 
 - version: 1.9.19
   createdAt: "2025-02-06"
   changelogEntry:
diff --git a/seed/csharp-sdk/any-auth/src/SeedAnyAuth/Auth/Requests/GetTokenRequest.cs b/seed/csharp-sdk/any-auth/src/SeedAnyAuth/Auth/Requests/GetTokenRequest.cs
index 9a243f12773..e4f9b7da3ff 100644
--- a/seed/csharp-sdk/any-auth/src/SeedAnyAuth/Auth/Requests/GetTokenRequest.cs
+++ b/seed/csharp-sdk/any-auth/src/SeedAnyAuth/Auth/Requests/GetTokenRequest.cs
@@ -12,10 +12,10 @@ public record GetTokenRequest
     public required string ClientSecret { get; set; }
 
     [JsonPropertyName("audience")]
-    public required string Audience { get; set; }
+    public string Audience { get; set; } = "https://api.example.com";
 
     [JsonPropertyName("grant_type")]
-    public required string GrantType { get; set; }
+    public string GrantType { get; set; } = "client_credentials";
 
     [JsonPropertyName("scope")]
     public string? Scope { get; set; }
diff --git a/seed/csharp-sdk/extra-properties/src/SeedExtraProperties/User/Requests/CreateUserRequest.cs b/seed/csharp-sdk/extra-properties/src/SeedExtraProperties/User/Requests/CreateUserRequest.cs
index 73ed765cda3..c71710898f8 100644
--- a/seed/csharp-sdk/extra-properties/src/SeedExtraProperties/User/Requests/CreateUserRequest.cs
+++ b/seed/csharp-sdk/extra-properties/src/SeedExtraProperties/User/Requests/CreateUserRequest.cs
@@ -6,10 +6,10 @@ namespace SeedExtraProperties;
 public record CreateUserRequest
 {
     [JsonPropertyName("_type")]
-    public required string Type { get; set; }
+    public string Type { get; set; } = "CreateUserRequest";
 
     [JsonPropertyName("_version")]
-    public required string Version { get; set; }
+    public string Version { get; set; } = "v1";
 
     [JsonPropertyName("name")]
     public required string Name { get; set; }
diff --git a/seed/csharp-sdk/literal/src/SeedLiteral/Inlined/Requests/SendLiteralsInlinedRequest.cs b/seed/csharp-sdk/literal/src/SeedLiteral/Inlined/Requests/SendLiteralsInlinedRequest.cs
index 9e77d525c39..a5660563706 100644
--- a/seed/csharp-sdk/literal/src/SeedLiteral/Inlined/Requests/SendLiteralsInlinedRequest.cs
+++ b/seed/csharp-sdk/literal/src/SeedLiteral/Inlined/Requests/SendLiteralsInlinedRequest.cs
@@ -6,7 +6,7 @@ namespace SeedLiteral;
 public record SendLiteralsInlinedRequest
 {
     [JsonPropertyName("prompt")]
-    public required string Prompt { get; set; }
+    public string Prompt { get; set; } = "You are a helpful assistant";
 
     [JsonPropertyName("context")]
     public string? Context { get; set; }
@@ -18,10 +18,10 @@ public record SendLiteralsInlinedRequest
     public double? Temperature { get; set; }
 
     [JsonPropertyName("stream")]
-    public required bool Stream { get; set; }
+    public bool Stream { get; set; } = false;
 
     [JsonPropertyName("aliasedContext")]
-    public required string AliasedContext { get; set; }
+    public string AliasedContext { get; set; } = "You're super wise";
 
     [JsonPropertyName("maybeContext")]
     public string? MaybeContext { get; set; }
diff --git a/seed/csharp-sdk/oauth-client-credentials-custom/src/SeedOauthClientCredentials/Auth/Requests/GetTokenRequest.cs b/seed/csharp-sdk/oauth-client-credentials-custom/src/SeedOauthClientCredentials/Auth/Requests/GetTokenRequest.cs
index bb1989dde2b..94c75e99db0 100644
--- a/seed/csharp-sdk/oauth-client-credentials-custom/src/SeedOauthClientCredentials/Auth/Requests/GetTokenRequest.cs
+++ b/seed/csharp-sdk/oauth-client-credentials-custom/src/SeedOauthClientCredentials/Auth/Requests/GetTokenRequest.cs
@@ -18,10 +18,10 @@ public record GetTokenRequest
     public required string EntityId { get; set; }
 
     [JsonPropertyName("audience")]
-    public required string Audience { get; set; }
+    public string Audience { get; set; } = "https://api.example.com";
 
     [JsonPropertyName("grant_type")]
-    public required string GrantType { get; set; }
+    public string GrantType { get; set; } = "client_credentials";
 
     [JsonPropertyName("scope")]
     public string? Scope { get; set; }
diff --git a/seed/csharp-sdk/oauth-client-credentials-custom/src/SeedOauthClientCredentials/Auth/Requests/RefreshTokenRequest.cs b/seed/csharp-sdk/oauth-client-credentials-custom/src/SeedOauthClientCredentials/Auth/Requests/RefreshTokenRequest.cs
index aaf74337520..9ff85a40c5f 100644
--- a/seed/csharp-sdk/oauth-client-credentials-custom/src/SeedOauthClientCredentials/Auth/Requests/RefreshTokenRequest.cs
+++ b/seed/csharp-sdk/oauth-client-credentials-custom/src/SeedOauthClientCredentials/Auth/Requests/RefreshTokenRequest.cs
@@ -15,10 +15,10 @@ public record RefreshTokenRequest
     public required string RefreshToken { get; set; }
 
     [JsonPropertyName("audience")]
-    public required string Audience { get; set; }
+    public string Audience { get; set; } = "https://api.example.com";
 
     [JsonPropertyName("grant_type")]
-    public required string GrantType { get; set; }
+    public string GrantType { get; set; } = "refresh_token";
 
     [JsonPropertyName("scope")]
     public string? Scope { get; set; }
diff --git a/seed/csharp-sdk/oauth-client-credentials-default/src/SeedOauthClientCredentialsDefault/Auth/Requests/GetTokenRequest.cs b/seed/csharp-sdk/oauth-client-credentials-default/src/SeedOauthClientCredentialsDefault/Auth/Requests/GetTokenRequest.cs
index 71b84910f2f..3d479178e59 100644
--- a/seed/csharp-sdk/oauth-client-credentials-default/src/SeedOauthClientCredentialsDefault/Auth/Requests/GetTokenRequest.cs
+++ b/seed/csharp-sdk/oauth-client-credentials-default/src/SeedOauthClientCredentialsDefault/Auth/Requests/GetTokenRequest.cs
@@ -12,7 +12,7 @@ public record GetTokenRequest
     public required string ClientSecret { get; set; }
 
     [JsonPropertyName("grant_type")]
-    public required string GrantType { get; set; }
+    public string GrantType { get; set; } = "client_credentials";
 
     public override string ToString()
     {
diff --git a/seed/csharp-sdk/oauth-client-credentials-environment-variables/src/SeedOauthClientCredentialsEnvironmentVariables/Auth/Requests/GetTokenRequest.cs b/seed/csharp-sdk/oauth-client-credentials-environment-variables/src/SeedOauthClientCredentialsEnvironmentVariables/Auth/Requests/GetTokenRequest.cs
index 6e9f174f172..4bbc32507d7 100644
--- a/seed/csharp-sdk/oauth-client-credentials-environment-variables/src/SeedOauthClientCredentialsEnvironmentVariables/Auth/Requests/GetTokenRequest.cs
+++ b/seed/csharp-sdk/oauth-client-credentials-environment-variables/src/SeedOauthClientCredentialsEnvironmentVariables/Auth/Requests/GetTokenRequest.cs
@@ -12,10 +12,10 @@ public record GetTokenRequest
     public required string ClientSecret { get; set; }
 
     [JsonPropertyName("audience")]
-    public required string Audience { get; set; }
+    public string Audience { get; set; } = "https://api.example.com";
 
     [JsonPropertyName("grant_type")]
-    public required string GrantType { get; set; }
+    public string GrantType { get; set; } = "client_credentials";
 
     [JsonPropertyName("scope")]
     public string? Scope { get; set; }
diff --git a/seed/csharp-sdk/oauth-client-credentials-environment-variables/src/SeedOauthClientCredentialsEnvironmentVariables/Auth/Requests/RefreshTokenRequest.cs b/seed/csharp-sdk/oauth-client-credentials-environment-variables/src/SeedOauthClientCredentialsEnvironmentVariables/Auth/Requests/RefreshTokenRequest.cs
index 68b08f63883..f3b32cf18b0 100644
--- a/seed/csharp-sdk/oauth-client-credentials-environment-variables/src/SeedOauthClientCredentialsEnvironmentVariables/Auth/Requests/RefreshTokenRequest.cs
+++ b/seed/csharp-sdk/oauth-client-credentials-environment-variables/src/SeedOauthClientCredentialsEnvironmentVariables/Auth/Requests/RefreshTokenRequest.cs
@@ -15,10 +15,10 @@ public record RefreshTokenRequest
     public required string RefreshToken { get; set; }
 
     [JsonPropertyName("audience")]
-    public required string Audience { get; set; }
+    public string Audience { get; set; } = "https://api.example.com";
 
     [JsonPropertyName("grant_type")]
-    public required string GrantType { get; set; }
+    public string GrantType { get; set; } = "refresh_token";
 
     [JsonPropertyName("scope")]
     public string? Scope { get; set; }
diff --git a/seed/csharp-sdk/oauth-client-credentials-nested-root/src/SeedOauthClientCredentials/Auth/Requests/GetTokenRequest.cs b/seed/csharp-sdk/oauth-client-credentials-nested-root/src/SeedOauthClientCredentials/Auth/Requests/GetTokenRequest.cs
index da87872f12b..47e2db316db 100644
--- a/seed/csharp-sdk/oauth-client-credentials-nested-root/src/SeedOauthClientCredentials/Auth/Requests/GetTokenRequest.cs
+++ b/seed/csharp-sdk/oauth-client-credentials-nested-root/src/SeedOauthClientCredentials/Auth/Requests/GetTokenRequest.cs
@@ -12,10 +12,10 @@ public record GetTokenRequest
     public required string ClientSecret { get; set; }
 
     [JsonPropertyName("audience")]
-    public required string Audience { get; set; }
+    public string Audience { get; set; } = "https://api.example.com";
 
     [JsonPropertyName("grant_type")]
-    public required string GrantType { get; set; }
+    public string GrantType { get; set; } = "client_credentials";
 
     [JsonPropertyName("scope")]
     public string? Scope { get; set; }
diff --git a/seed/csharp-sdk/oauth-client-credentials/src/SeedOauthClientCredentials/Auth/Requests/GetTokenRequest.cs b/seed/csharp-sdk/oauth-client-credentials/src/SeedOauthClientCredentials/Auth/Requests/GetTokenRequest.cs
index 82e4a3c74ae..28491fe96e9 100644
--- a/seed/csharp-sdk/oauth-client-credentials/src/SeedOauthClientCredentials/Auth/Requests/GetTokenRequest.cs
+++ b/seed/csharp-sdk/oauth-client-credentials/src/SeedOauthClientCredentials/Auth/Requests/GetTokenRequest.cs
@@ -12,10 +12,10 @@ public record GetTokenRequest
     public required string ClientSecret { get; set; }
 
     [JsonPropertyName("audience")]
-    public required string Audience { get; set; }
+    public string Audience { get; set; } = "https://api.example.com";
 
     [JsonPropertyName("grant_type")]
-    public required string GrantType { get; set; }
+    public string GrantType { get; set; } = "client_credentials";
 
     [JsonPropertyName("scope")]
     public string? Scope { get; set; }
diff --git a/seed/csharp-sdk/oauth-client-credentials/src/SeedOauthClientCredentials/Auth/Requests/RefreshTokenRequest.cs b/seed/csharp-sdk/oauth-client-credentials/src/SeedOauthClientCredentials/Auth/Requests/RefreshTokenRequest.cs
index aaf74337520..9ff85a40c5f 100644
--- a/seed/csharp-sdk/oauth-client-credentials/src/SeedOauthClientCredentials/Auth/Requests/RefreshTokenRequest.cs
+++ b/seed/csharp-sdk/oauth-client-credentials/src/SeedOauthClientCredentials/Auth/Requests/RefreshTokenRequest.cs
@@ -15,10 +15,10 @@ public record RefreshTokenRequest
     public required string RefreshToken { get; set; }
 
     [JsonPropertyName("audience")]
-    public required string Audience { get; set; }
+    public string Audience { get; set; } = "https://api.example.com";
 
     [JsonPropertyName("grant_type")]
-    public required string GrantType { get; set; }
+    public string GrantType { get; set; } = "refresh_token";
 
     [JsonPropertyName("scope")]
     public string? Scope { get; set; }
diff --git a/seed/csharp-sdk/streaming/src/SeedStreaming/Dummy/Requests/GenerateStreamRequest.cs b/seed/csharp-sdk/streaming/src/SeedStreaming/Dummy/Requests/GenerateStreamRequest.cs
index fe067894b33..f829cf721b6 100644
--- a/seed/csharp-sdk/streaming/src/SeedStreaming/Dummy/Requests/GenerateStreamRequest.cs
+++ b/seed/csharp-sdk/streaming/src/SeedStreaming/Dummy/Requests/GenerateStreamRequest.cs
@@ -6,7 +6,7 @@ namespace SeedStreaming;
 public record GenerateStreamRequest
 {
     [JsonPropertyName("stream")]
-    public required bool Stream { get; set; }
+    public bool Stream { get; set; } = true;
 
     [JsonPropertyName("num_events")]
     public required int NumEvents { get; set; }
diff --git a/seed/csharp-sdk/streaming/src/SeedStreaming/Dummy/Requests/Generateequest.cs b/seed/csharp-sdk/streaming/src/SeedStreaming/Dummy/Requests/Generateequest.cs
index 5a8bcc431ef..dbff6e094a3 100644
--- a/seed/csharp-sdk/streaming/src/SeedStreaming/Dummy/Requests/Generateequest.cs
+++ b/seed/csharp-sdk/streaming/src/SeedStreaming/Dummy/Requests/Generateequest.cs
@@ -6,7 +6,7 @@ namespace SeedStreaming;
 public record Generateequest
 {
     [JsonPropertyName("stream")]
-    public required bool Stream { get; set; }
+    public bool Stream { get; set; } = false;
 
     [JsonPropertyName("num_events")]
     public required int NumEvents { get; set; }