[DOP-31720] Improve Literal annotation usage

dolfinus · dolfinus · commit 09150f0c4b81 · 2026-03-02T18:29:35.000+03:00
diff --git a/syncmaster/schemas/v1/auth/basic.py b/syncmaster/schemas/v1/auth/basic.py
@@ -8,7 +8,7 @@
 
 
 class ReadBasicAuthSchema(SecretDumpMixin):
-    type: Literal["basic"] = Field(description="Auth type")
+    type: Literal["basic"] = Field(default="basic", description="Auth type")
     user: str
 
 
diff --git a/syncmaster/schemas/v1/auth/iceberg_rest_s3_delegated/bearer.py b/syncmaster/schemas/v1/auth/iceberg_rest_s3_delegated/bearer.py
@@ -8,7 +8,7 @@
 
 
 class ReadIcebergRESTCatalogBearerAuthSchema(SecretDumpMixin):
-    type: Literal["iceberg_rest_bearer"] = Field(description="Auth type")
+    type: Literal["iceberg_rest_bearer"] = Field(default="iceberg_rest_bearer", description="Auth type")
 
 
 class CreateIcebergRESTCatalogBearerAuthSchema(ReadIcebergRESTCatalogBearerAuthSchema):
diff --git a/syncmaster/schemas/v1/auth/iceberg_rest_s3_delegated/oauth2_client_credentials.py b/syncmaster/schemas/v1/auth/iceberg_rest_s3_delegated/oauth2_client_credentials.py
@@ -9,7 +9,10 @@
 
 
 class ReadIcebergRESTCatalogOAuth2ClientCredentialsAuthSchema(SecretDumpMixin):
-    type: Literal["iceberg_rest_oauth2_client_credentials"] = Field(description="Auth type")
+    type: Literal["iceberg_rest_oauth2_client_credentials"] = Field(
+        default="iceberg_rest_oauth2_client_credentials",
+        description="Auth type",
+    )
     rest_catalog_oauth2_client_id: str
     rest_catalog_oauth2_scopes: list[str] = Field(default_factory=list)
     rest_catalog_oauth2_resource: str | None = None
diff --git a/syncmaster/schemas/v1/auth/iceberg_rest_s3_direct/bearer.py b/syncmaster/schemas/v1/auth/iceberg_rest_s3_direct/bearer.py
@@ -8,7 +8,10 @@
 
 
 class ReadIcebergRESTCatalogBearerS3BasicAuthSchema(SecretDumpMixin):
-    type: Literal["iceberg_rest_bearer_s3_basic"] = Field(description="Auth type")
+    type: Literal["iceberg_rest_bearer_s3_basic"] = Field(
+        default="iceberg_rest_bearer_s3_basic",
+        description="Auth type",
+    )
     s3_access_key: str
 
 
diff --git a/syncmaster/schemas/v1/auth/iceberg_rest_s3_direct/oauth2_client_credentials.py b/syncmaster/schemas/v1/auth/iceberg_rest_s3_direct/oauth2_client_credentials.py
@@ -8,7 +8,10 @@
 
 
 class ReadIcebergRESTCatalogOAuth2ClientCredentialsS3BasicAuthSchema(SecretDumpMixin):
-    type: Literal["iceberg_rest_oauth2_client_credentials_s3_basic"] = Field(description="Auth type")
+    type: Literal["iceberg_rest_oauth2_client_credentials_s3_basic"] = Field(
+        default="iceberg_rest_oauth2_client_credentials_s3_basic",
+        description="Auth type",
+    )
     rest_catalog_oauth2_client_id: str
     rest_catalog_oauth2_scopes: list[str] = Field(default_factory=list)
     rest_catalog_oauth2_resource: str | None = None
diff --git a/syncmaster/schemas/v1/auth/s3.py b/syncmaster/schemas/v1/auth/s3.py
@@ -8,7 +8,7 @@
 
 
 class ReadS3AuthSchema(SecretDumpMixin):
-    type: Literal["s3"] = Field(description="Auth type")
+    type: Literal["s3"] = Field(default="s3", description="Auth type")
     access_key: str
 
 
diff --git a/syncmaster/schemas/v1/auth/samba.py b/syncmaster/schemas/v1/auth/samba.py
@@ -8,7 +8,7 @@
 
 
 class ReadSambaAuthSchema(SecretDumpMixin):
-    type: Literal["samba"] = Field(description="Auth type")
+    type: Literal["samba"] = Field(default="samba", description="Auth type")
     user: str
     auth_type: Literal["NTLMv1", "NTLMv2"] = "NTLMv2"
 
diff --git a/syncmaster/schemas/v1/connections/iceberg.py b/syncmaster/schemas/v1/connections/iceberg.py
@@ -24,7 +24,7 @@
 
 
 class IcebergRESTCatalogS3DirectConnectionDataSchema(BaseModel):
-    type: Literal["iceberg_rest_s3_direct"]
+    type: Literal["iceberg_rest_s3_direct"] = "iceberg_rest_s3_direct"
     rest_catalog_url: URL
     s3_warehouse_path: str
     s3_host: str
@@ -37,7 +37,7 @@ class IcebergRESTCatalogS3DirectConnectionDataSchema(BaseModel):
 
 
 class IcebergRESTCatalogS3DelegatedConnectionDataSchema(BaseModel):
-    type: Literal["iceberg_rest_s3_delegated"]
+    type: Literal["iceberg_rest_s3_delegated"] = "iceberg_rest_s3_delegated"
     rest_catalog_url: URL
     s3_warehouse_name: str | None = None
     s3_access_delegation: Literal["vended-credentials", "remote-signing"] = "vended-credentials"
diff --git a/syncmaster/schemas/v1/transfers/file_format.py b/syncmaster/schemas/v1/transfers/file_format.py
@@ -58,7 +58,7 @@ class XMLCompression(str, Enum):  # noqa: UP042
 
 
 class CSV(BaseModel):
-    type: CSV_FORMAT
+    type: CSV_FORMAT = "csv"
     delimiter: str = ","
     encoding: str = "utf-8"
     quote: str = '"'
@@ -69,37 +69,37 @@ class CSV(BaseModel):
 
 
 class JSONLine(BaseModel):
-    type: JSONLINE_FORMAT
+    type: JSONLINE_FORMAT = "jsonline"
     encoding: str = "utf-8"
     line_sep: str = "\n"
     compression: JSONCompression = JSONCompression.GZIP
 
 
 class JSON(BaseModel):
-    type: JSON_FORMAT
+    type: JSON_FORMAT = "json"
     encoding: str = "utf-8"
     line_sep: str = "\n"
     compression: JSONCompression = JSONCompression.GZIP
 
 
 class Excel(BaseModel):
-    type: EXCEL_FORMAT
+    type: EXCEL_FORMAT = "excel"
     include_header: bool = False
     start_cell: str | None = None
 
 
 class XML(BaseModel):
-    type: XML_FORMAT
+    type: XML_FORMAT = "xml"
     root_tag: str
     row_tag: str
     compression: XMLCompression = XMLCompression.GZIP
 
 
 class ORC(BaseModel):
-    type: ORC_FORMAT
+    type: ORC_FORMAT = "orc"
     compression: ORCCompression = ORCCompression.ZLIB
 
 
 class Parquet(BaseModel):
-    type: PARQUET_FORMAT
+    type: PARQUET_FORMAT = "parquet"
     compression: ParquetCompression = ParquetCompression.SNAPPY
diff --git a/syncmaster/schemas/v1/transfers/transformations/dataframe_columns_filter.py b/syncmaster/schemas/v1/transfers/transformations/dataframe_columns_filter.py
@@ -10,22 +10,22 @@ class BaseColumnsFilter(BaseModel):
 
 
 class IncludeFilter(BaseColumnsFilter):
-    type: Literal["include"]
+    type: Literal["include"] = "include"
 
 
 class RenameFilter(BaseColumnsFilter):
-    type: Literal["rename"]
+    type: Literal["rename"] = "rename"
     to: str = Field(examples=["new_column_name"])
 
 
 class CastFilter(BaseColumnsFilter):
-    type: Literal["cast"]
+    type: Literal["cast"] = "cast"
     as_type: str = Field(examples=["int"])
 
 
 ColumnsFilter = IncludeFilter | RenameFilter | CastFilter
 
 
 class DataframeColumnsFilter(BaseModel):
-    type: Literal["dataframe_columns_filter"]
+    type: Literal["dataframe_columns_filter"] = "dataframe_columns_filter"
     filters: list[Annotated[ColumnsFilter, Field(discriminator="type")]] = Field(default_factory=list)
diff --git a/syncmaster/schemas/v1/transfers/transformations/dataframe_rows_filter.py b/syncmaster/schemas/v1/transfers/transformations/dataframe_rows_filter.py
@@ -10,65 +10,65 @@ class BaseRowsFilter(BaseModel):
 
 
 class IsNullFilter(BaseRowsFilter):
-    type: Literal["is_null"]
+    type: Literal["is_null"] = "is_null"
 
 
 class IsNotNullFilter(BaseRowsFilter):
-    type: Literal["is_not_null"]
+    type: Literal["is_not_null"] = "is_not_null"
 
 
 class EqualFilter(BaseRowsFilter):
-    type: Literal["equal"]
+    type: Literal["equal"] = "equal"
     value: str = Field(examples=["123"])
 
 
 class NotEqualFilter(BaseRowsFilter):
-    type: Literal["not_equal"]
+    type: Literal["not_equal"] = "not_equal"
     value: str = Field(examples=["123"])
 
 
 class GreaterThanFilter(BaseRowsFilter):
-    type: Literal["greater_than"]
+    type: Literal["greater_than"] = "greater_than"
     value: str = Field(examples=["123"])
 
 
 class GreaterOrEqualFilter(BaseRowsFilter):
-    type: Literal["greater_or_equal"]
+    type: Literal["greater_or_equal"] = "greater_or_equal"
     value: str = Field(examples=["123"])
 
 
 class LessThanFilter(BaseRowsFilter):
-    type: Literal["less_than"]
+    type: Literal["less_than"] = "less_than"
     value: str = Field(examples=["123"])
 
 
 class LessOrEqualFilter(BaseRowsFilter):
-    type: Literal["less_or_equal"]
+    type: Literal["less_or_equal"] = "less_or_equal"
     value: str = Field(examples=["123"])
 
 
 class LikeFilter(BaseRowsFilter):
-    type: Literal["like"]
+    type: Literal["like"] = "like"
     value: str = Field(examples=["%.json"])
 
 
 class ILikeFilter(BaseRowsFilter):
-    type: Literal["ilike"]
+    type: Literal["ilike"] = "ilike"
     value: str = Field(examples=["%.json"])
 
 
 class NotLikeFilter(BaseRowsFilter):
-    type: Literal["not_like"]
+    type: Literal["not_like"] = "not_like"
     value: str = Field(examples=["%.json"])
 
 
 class NotILikeFilter(BaseRowsFilter):
-    type: Literal["not_ilike"]
+    type: Literal["not_ilike"] = "not_ilike"
     value: str = Field(examples=["%.json"])
 
 
 class RegexpFilter(BaseRowsFilter):
-    type: Literal["regexp"]
+    type: Literal["regexp"] = "regexp"
     value: str = Field(examples=[r"^\d+\.json$"])
 
 
diff --git a/syncmaster/schemas/v1/transfers/transformations/file_metadata_filter.py b/syncmaster/schemas/v1/transfers/transformations/file_metadata_filter.py
@@ -8,7 +8,7 @@
 
 
 class NameGlobFilter(BaseModel):
-    type: Literal["name_glob"]
+    type: Literal["name_glob"] = "name_glob"
     value: str = Field(examples=["*.json"])
 
     @field_validator("value", mode="before")
@@ -22,7 +22,7 @@ def _validate_pattern(cls, value: str) -> str:
 
 
 class NameRegexpFilter(BaseModel):
-    type: Literal["name_regexp"]
+    type: Literal["name_regexp"] = "name_regexp"
     value: str = Field(examples=[r"^\d+\.json$"])
 
     @field_validator("value", mode="before")
@@ -38,18 +38,18 @@ def _validate_pattern(cls, value: str) -> str:
 
 
 class FileSizeMinFilter(BaseModel):
-    type: Literal["file_size_min"]
+    type: Literal["file_size_min"] = "file_size_min"
     value: ByteSize = Field(examples=[1024 * 1024])
 
 
 class FileSizeMaxFilter(BaseModel):
-    type: Literal["file_size_max"]
+    type: Literal["file_size_max"] = "file_size_max"
     value: ByteSize = Field(examples=[1024 * 1024 * 1024])
 
 
 MetadataFilter = NameGlobFilter | NameRegexpFilter | FileSizeMinFilter | FileSizeMaxFilter
 
 
 class FileMetadataFilter(BaseModel):
-    type: Literal["file_metadata_filter"]
+    type: Literal["file_metadata_filter"] = "file_metadata_filter"
     filters: list[Annotated[MetadataFilter, Field(discriminator="type")]] = Field(default_factory=list)
diff --git a/syncmaster/schemas/v1/transfers/transformations/sql.py b/syncmaster/schemas/v1/transfers/transformations/sql.py
@@ -10,7 +10,7 @@
 
 
 class Sql(BaseModel):
-    type: Literal["sql"]
+    type: Literal["sql"] = "sql"
     query: str = Field(examples=["SELECT col1, col2 FROM source WHERE col3 <= 20"])
     dialect: Literal["spark"] = Field(default="spark", description="Static value for now")
 
