Fix Python docstring escaping and namespace imports

reflectapi-demo/clients/python/api_client/myapi/__init__.py

@@ -51,7 +51,7 @@
 
 class MyapiHealthCheckFail(BaseModel):
     model_config = ConfigDict(
-        extra="ignore", populate_by_name=True, protected_namespaces=()
+        extra="ignore", populate_by_name=True, protected_namespaces=(), defer_build=True
     )
 
 
@@ -61,11 +61,4 @@ class MyapiHealthCheckFail(BaseModel):
 from . import model
 from . import proto
 
-try:
-    from .._rebuild import rebuild_models as _rebuild_models
-
-    _rebuild_models()
-except ImportError:
-    pass
-
 __all__ = ["HealthCheckFail", "MyapiHealthCheckFail", "model", "proto"]

reflectapi-demo/clients/python/api_client/myapi/model/__init__.py

@@ -53,7 +53,7 @@ class MyapiModelBehaviorAggressiveVariant(BaseModel):
     """Aggressive variant"""
 
     model_config = ConfigDict(
-        extra="ignore", populate_by_name=True, protected_namespaces=()
+        extra="ignore", populate_by_name=True, protected_namespaces=(), defer_build=True
     )
 
     field_0: float = Field(description="aggressiveness level")
@@ -64,7 +64,7 @@ class MyapiModelBehaviorOtherVariant(BaseModel):
     """Other variant"""
 
     model_config = ConfigDict(
-        extra="ignore", populate_by_name=True, protected_namespaces=()
+        extra="ignore", populate_by_name=True, protected_namespaces=(), defer_build=True
     )
 
     description: str = Field(description="Custom provided description of a behavior")
@@ -125,7 +125,7 @@ class MyapiModelKindDog(BaseModel):
     """A dog"""
 
     model_config = ConfigDict(
-        extra="ignore", populate_by_name=True, protected_namespaces=()
+        extra="ignore", populate_by_name=True, protected_namespaces=(), defer_build=True
     )
 
     type: Literal["dog"] = Field(default="dog", description="Discriminator field")
@@ -136,7 +136,7 @@ class MyapiModelKindCat(BaseModel):
     """A cat"""
 
     model_config = ConfigDict(
-        extra="ignore", populate_by_name=True, protected_namespaces=()
+        extra="ignore", populate_by_name=True, protected_namespaces=(), defer_build=True
     )
 
     type: Literal["cat"] = Field(default="cat", description="Discriminator field")
@@ -147,7 +147,7 @@ class MyapiModelKindBird(BaseModel):
     """Test for unit variants in internally tagged enums"""
 
     model_config = ConfigDict(
-        extra="ignore", populate_by_name=True, protected_namespaces=()
+        extra="ignore", populate_by_name=True, protected_namespaces=(), defer_build=True
     )
 
     type: Literal["bird"] = Field(default="bird", description="Discriminator field")

reflectapi-demo/clients/python/api_client/myapi/model/input/__init__.py

@@ -51,7 +51,7 @@
 
 class MyapiModelInputPet(BaseModel):
     model_config = ConfigDict(
-        extra="ignore", populate_by_name=True, protected_namespaces=()
+        extra="ignore", populate_by_name=True, protected_namespaces=(), defer_build=True
     )
 
     name: str = Field(description="identity")

reflectapi-demo/clients/python/api_client/myapi/model/output/__init__.py

@@ -51,7 +51,7 @@
 
 class MyapiModelOutputPet(BaseModel):
     model_config = ConfigDict(
-        extra="ignore", populate_by_name=True, protected_namespaces=()
+        extra="ignore", populate_by_name=True, protected_namespaces=(), defer_build=True
     )
 
     name: str = Field(description="identity")

reflectapi-demo/clients/python/api_client/myapi/proto/__init__.py

@@ -42,6 +42,11 @@
 T = TypeVar("T")
 
 
+import sys
+from ... import myapi
+
+myapi.proto = sys.modules[__name__]
+
 # External type definitions
 StdNumNonZeroU32 = Annotated[int, "Rust NonZero u32 type"]
 StdNumNonZeroU64 = Annotated[int, "Rust NonZero u64 type"]
@@ -51,23 +56,23 @@
 
 class MyapiProtoHeaders(BaseModel):
     model_config = ConfigDict(
-        extra="ignore", populate_by_name=True, protected_namespaces=()
+        extra="ignore", populate_by_name=True, protected_namespaces=(), defer_build=True
     )
 
     authorization: str = Field(description="Authorization header")
 
 
 class MyapiProtoInternalError(BaseModel):
     model_config = ConfigDict(
-        extra="ignore", populate_by_name=True, protected_namespaces=()
+        extra="ignore", populate_by_name=True, protected_namespaces=(), defer_build=True
     )
 
     message: str
 
 
 class MyapiProtoPaginated(BaseModel, Generic[T]):
     model_config = ConfigDict(
-        extra="ignore", populate_by_name=True, protected_namespaces=()
+        extra="ignore", populate_by_name=True, protected_namespaces=(), defer_build=True
     )
 
     items: list[T] = Field(description="slice of a collection")
@@ -76,7 +81,7 @@ class MyapiProtoPaginated(BaseModel, Generic[T]):
 
 class MyapiProtoPetsListRequest(BaseModel):
     model_config = ConfigDict(
-        extra="ignore", populate_by_name=True, protected_namespaces=()
+        extra="ignore", populate_by_name=True, protected_namespaces=(), defer_build=True
     )
 
     limit: int | None = None
@@ -85,7 +90,7 @@ class MyapiProtoPetsListRequest(BaseModel):
 
 class MyapiProtoPetsRemoveRequest(BaseModel):
     model_config = ConfigDict(
-        extra="ignore", populate_by_name=True, protected_namespaces=()
+        extra="ignore", populate_by_name=True, protected_namespaces=(), defer_build=True
     )
 
     name: str = Field(description="identity")
@@ -97,6 +102,7 @@ class MyapiProtoPetsUpdateRequest(ReflectapiPartialModel):
         populate_by_name=True,
         validate_assignment=True,
         protected_namespaces=(),
+        defer_build=True,
     )
 
     name: str = Field(description="identity")
@@ -113,7 +119,7 @@ class MyapiProtoPetsUpdateRequest(ReflectapiPartialModel):
 
 class MyapiProtoValidationA(BaseModel):
     model_config = ConfigDict(
-        extra="ignore", populate_by_name=True, protected_namespaces=()
+        extra="ignore", populate_by_name=True, protected_namespaces=(), defer_build=True
     )
 
     message: str
@@ -123,7 +129,7 @@ class MyapiProtoPetsCreateErrorInvalidIdentityVariant(BaseModel):
     """InvalidIdentity variant"""
 
     model_config = ConfigDict(
-        extra="ignore", populate_by_name=True, protected_namespaces=()
+        extra="ignore", populate_by_name=True, protected_namespaces=(), defer_build=True
     )
 
     message: str
@@ -179,7 +185,7 @@ def _serialize(self):
 
 class MyapiProtoPetsListErrorInvalidCursor(BaseModel):
     model_config = ConfigDict(
-        extra="ignore", populate_by_name=True, protected_namespaces=()
+        extra="ignore", populate_by_name=True, protected_namespaces=(), defer_build=True
     )
 
     kind: Literal["InvalidCursor"] = Field(
@@ -189,7 +195,7 @@ class MyapiProtoPetsListErrorInvalidCursor(BaseModel):
 
 class MyapiProtoPetsListErrorUnauthorized(BaseModel):
     model_config = ConfigDict(
-        extra="ignore", populate_by_name=True, protected_namespaces=()
+        extra="ignore", populate_by_name=True, protected_namespaces=(), defer_build=True
     )
 
     kind: Literal["Unauthorized"] = Field(
@@ -199,7 +205,7 @@ class MyapiProtoPetsListErrorUnauthorized(BaseModel):
 
 class MyapiProtoPetsListErrorInternal(BaseModel):
     model_config = ConfigDict(
-        extra="ignore", populate_by_name=True, protected_namespaces=()
+        extra="ignore", populate_by_name=True, protected_namespaces=(), defer_build=True
     )
 
     kind: Literal["Internal"] = Field(
@@ -228,10 +234,10 @@ class MyapiProtoPetsUpdateErrorValidationVariant(BaseModel):
     """Validation variant"""
 
     model_config = ConfigDict(
-        extra="ignore", populate_by_name=True, protected_namespaces=()
+        extra="ignore", populate_by_name=True, protected_namespaces=(), defer_build=True
     )
 
-    field_0: list[myapi.proto.ValidationError]
+    field_0: list[ValidationError]
 
 
 # Externally tagged enum using RootModel
@@ -284,10 +290,10 @@ class MyapiProtoValidationErrorValidationAVariant(BaseModel):
     """ValidationA variant"""
 
     model_config = ConfigDict(
-        extra="ignore", populate_by_name=True, protected_namespaces=()
+        extra="ignore", populate_by_name=True, protected_namespaces=(), defer_build=True
     )
 
-    field_0: myapi.proto.ValidationA
+    field_0: ValidationA
 
 
 # Externally tagged enum using RootModel

reflectapi-demo/clients/typescript/generated.ts

@@ -23,8 +23,11 @@ export { ClientInstance };
 export type { Client, RequestOptions };
 
 type IsAny<T> = 0 extends 1 & T ? true : false;
-export type NullToEmptyObject<T> =
-  IsAny<T> extends true ? unknown : T extends null ? {} : T;
+export type NullToEmptyObject<T> = IsAny<T> extends true
+  ? unknown
+  : T extends null
+    ? {}
+    : T;
 
 export type AsyncResult<T, E> = Promise<Result<T, Err<E>>>;