Don't import the connector manifest schema (#20218)

* Don't import the connector manifest schema

* Revert "Don't import the connector manifest schema"

This reverts commit 84589dc.

* revert

* revert

* reset

airbyte-connector-builder-server/connector_builder/generated/models/add_fields.py

@@ -6,7 +6,7 @@
 import re  # noqa: F401
 from typing import Any, Dict, List, Optional  # noqa: F401
 
-from pydantic import AnyUrl, BaseModel, EmailStr, validator  # noqa: F401
+from pydantic import AnyUrl, BaseModel, EmailStr, Field, validator  # noqa: F401
 from connector_builder.generated.models.add_fields_all_of import AddFieldsAllOf
 from connector_builder.generated.models.added_field_definition import AddedFieldDefinition
 from connector_builder.generated.models.parsed_add_field_definition import ParsedAddFieldDefinition
@@ -23,7 +23,7 @@ class AddFields(BaseModel):
         parsed_fields: The parsed_fields of this AddFields [Optional].
     """
 
-    fields: List[AddedFieldDefinition]
-    parsed_fields: Optional[List[ParsedAddFieldDefinition]] = None
+    fields: List[AddedFieldDefinition] = Field(alias="fields")
+    parsed_fields: Optional[List[ParsedAddFieldDefinition]] = Field(alias="_parsed_fields", default=None)
 
-AddFields.update_forward_refs()
+AddFields.update_forward_refs()

airbyte-connector-builder-server/connector_builder/generated/models/add_fields_all_of.py

@@ -6,7 +6,7 @@
 import re  # noqa: F401
 from typing import Any, Dict, List, Optional  # noqa: F401
 
-from pydantic import AnyUrl, BaseModel, EmailStr, validator  # noqa: F401
+from pydantic import AnyUrl, BaseModel, EmailStr, Field, validator  # noqa: F401
 from connector_builder.generated.models.added_field_definition import AddedFieldDefinition
 from connector_builder.generated.models.parsed_add_field_definition import ParsedAddFieldDefinition
 
@@ -22,7 +22,7 @@ class AddFieldsAllOf(BaseModel):
         parsed_fields: The parsed_fields of this AddFieldsAllOf [Optional].
     """
 
-    fields: List[AddedFieldDefinition]
-    parsed_fields: Optional[List[ParsedAddFieldDefinition]] = None
+    fields: List[AddedFieldDefinition] = Field(alias="fields")
+    parsed_fields: Optional[List[ParsedAddFieldDefinition]] = Field(alias="_parsed_fields", default=None)
 
-AddFieldsAllOf.update_forward_refs()
+AddFieldsAllOf.update_forward_refs()

airbyte-connector-builder-server/connector_builder/generated/models/added_field_definition.py

@@ -6,7 +6,7 @@
 import re  # noqa: F401
 from typing import Any, Dict, List, Optional  # noqa: F401
 
-from pydantic import AnyUrl, BaseModel, EmailStr, validator  # noqa: F401
+from pydantic import AnyUrl, BaseModel, EmailStr, Field, validator  # noqa: F401
 from connector_builder.generated.models.any_of_interpolated_stringstring import AnyOfInterpolatedStringstring
 
 
@@ -21,7 +21,7 @@ class AddedFieldDefinition(BaseModel):
         value: The value of this AddedFieldDefinition.
     """
 
-    path: List[str]
-    value: AnyOfInterpolatedStringstring
+    path: List[str] = Field(alias="path")
+    value: AnyOfInterpolatedStringstring = Field(alias="value")
 
-AddedFieldDefinition.update_forward_refs()
+AddedFieldDefinition.update_forward_refs()

airbyte-connector-builder-server/connector_builder/generated/models/api_key_authenticator.py

@@ -6,7 +6,7 @@
 import re  # noqa: F401
 from typing import Any, Dict, List, Optional  # noqa: F401
 
-from pydantic import AnyUrl, BaseModel, EmailStr, validator  # noqa: F401
+from pydantic import AnyUrl, BaseModel, EmailStr, Field, validator  # noqa: F401
 from connector_builder.generated.models.any_of_interpolated_stringstring import AnyOfInterpolatedStringstring
 from connector_builder.generated.models.api_key_authenticator_all_of import ApiKeyAuthenticatorAllOf
 
@@ -23,8 +23,8 @@ class ApiKeyAuthenticator(BaseModel):
         config: The config of this ApiKeyAuthenticator.
     """
 
-    header: AnyOfInterpolatedStringstring
-    api_token: AnyOfInterpolatedStringstring
-    config: Dict[str, Any]
+    header: AnyOfInterpolatedStringstring = Field(alias="header")
+    api_token: AnyOfInterpolatedStringstring = Field(alias="api_token")
+    config: Dict[str, Any] = Field(alias="config")
 
-ApiKeyAuthenticator.update_forward_refs()
+ApiKeyAuthenticator.update_forward_refs()

airbyte-connector-builder-server/connector_builder/generated/models/api_key_authenticator_all_of.py

@@ -6,7 +6,7 @@
 import re  # noqa: F401
 from typing import Any, Dict, List, Optional  # noqa: F401
 
-from pydantic import AnyUrl, BaseModel, EmailStr, validator  # noqa: F401
+from pydantic import AnyUrl, BaseModel, EmailStr, Field, validator  # noqa: F401
 from connector_builder.generated.models.any_of_interpolated_stringstring import AnyOfInterpolatedStringstring
 
 
@@ -22,8 +22,8 @@ class ApiKeyAuthenticatorAllOf(BaseModel):
         config: The config of this ApiKeyAuthenticatorAllOf.
     """
 
-    header: AnyOfInterpolatedStringstring
-    api_token: AnyOfInterpolatedStringstring
-    config: Dict[str, Any]
+    header: AnyOfInterpolatedStringstring = Field(alias="header")
+    api_token: AnyOfInterpolatedStringstring = Field(alias="api_token")
+    config: Dict[str, Any] = Field(alias="config")
 
-ApiKeyAuthenticatorAllOf.update_forward_refs()
+ApiKeyAuthenticatorAllOf.update_forward_refs()

airbyte-connector-builder-server/connector_builder/generated/models/basic_http_authenticator.py

@@ -6,7 +6,7 @@
 import re  # noqa: F401
 from typing import Any, Dict, List, Optional  # noqa: F401
 
-from pydantic import AnyUrl, BaseModel, EmailStr, validator  # noqa: F401
+from pydantic import AnyUrl, BaseModel, EmailStr, Field, validator  # noqa: F401
 from connector_builder.generated.models.any_of_interpolated_stringstring import AnyOfInterpolatedStringstring
 from connector_builder.generated.models.basic_http_authenticator_all_of import BasicHttpAuthenticatorAllOf
 
@@ -23,8 +23,8 @@ class BasicHttpAuthenticator(BaseModel):
         password: The password of this BasicHttpAuthenticator [Optional].
     """
 
-    username: AnyOfInterpolatedStringstring
-    config: Dict[str, Any]
-    password: Optional[AnyOfInterpolatedStringstring] = None
+    username: AnyOfInterpolatedStringstring = Field(alias="username")
+    config: Dict[str, Any] = Field(alias="config")
+    password: Optional[AnyOfInterpolatedStringstring] = Field(alias="password", default=None)
 
-BasicHttpAuthenticator.update_forward_refs()
+BasicHttpAuthenticator.update_forward_refs()

airbyte-connector-builder-server/connector_builder/generated/models/basic_http_authenticator_all_of.py

@@ -6,7 +6,7 @@
 import re  # noqa: F401
 from typing import Any, Dict, List, Optional  # noqa: F401
 
-from pydantic import AnyUrl, BaseModel, EmailStr, validator  # noqa: F401
+from pydantic import AnyUrl, BaseModel, EmailStr, Field, validator  # noqa: F401
 from connector_builder.generated.models.any_of_interpolated_stringstring import AnyOfInterpolatedStringstring
 
 
@@ -22,8 +22,8 @@ class BasicHttpAuthenticatorAllOf(BaseModel):
         password: The password of this BasicHttpAuthenticatorAllOf [Optional].
     """
 
-    username: AnyOfInterpolatedStringstring
-    config: Dict[str, Any]
-    password: Optional[AnyOfInterpolatedStringstring] = None
+    username: AnyOfInterpolatedStringstring = Field(alias="username")
+    config: Dict[str, Any] = Field(alias="config")
+    password: Optional[AnyOfInterpolatedStringstring] = Field(alias="password", default=None)
 
-BasicHttpAuthenticatorAllOf.update_forward_refs()
+BasicHttpAuthenticatorAllOf.update_forward_refs()

airbyte-connector-builder-server/connector_builder/generated/models/bearer_authenticator.py

@@ -6,7 +6,7 @@
 import re  # noqa: F401
 from typing import Any, Dict, List, Optional  # noqa: F401
 
-from pydantic import AnyUrl, BaseModel, EmailStr, validator  # noqa: F401
+from pydantic import AnyUrl, BaseModel, EmailStr, Field, validator  # noqa: F401
 from connector_builder.generated.models.any_of_interpolated_stringstring import AnyOfInterpolatedStringstring
 from connector_builder.generated.models.bearer_authenticator_all_of import BearerAuthenticatorAllOf
 
@@ -22,7 +22,7 @@ class BearerAuthenticator(BaseModel):
         config: The config of this BearerAuthenticator.
     """
 
-    api_token: AnyOfInterpolatedStringstring
-    config: Dict[str, Any]
+    api_token: AnyOfInterpolatedStringstring = Field(alias="api_token")
+    config: Dict[str, Any] = Field(alias="config")
 
-BearerAuthenticator.update_forward_refs()
+BearerAuthenticator.update_forward_refs()

airbyte-connector-builder-server/connector_builder/generated/models/bearer_authenticator_all_of.py

@@ -6,7 +6,7 @@
 import re  # noqa: F401
 from typing import Any, Dict, List, Optional  # noqa: F401
 
-from pydantic import AnyUrl, BaseModel, EmailStr, validator  # noqa: F401
+from pydantic import AnyUrl, BaseModel, EmailStr, Field, validator  # noqa: F401
 from connector_builder.generated.models.any_of_interpolated_stringstring import AnyOfInterpolatedStringstring
 
 
@@ -21,7 +21,7 @@ class BearerAuthenticatorAllOf(BaseModel):
         config: The config of this BearerAuthenticatorAllOf.
     """
 
-    api_token: AnyOfInterpolatedStringstring
-    config: Dict[str, Any]
+    api_token: AnyOfInterpolatedStringstring = Field(alias="api_token")
+    config: Dict[str, Any] = Field(alias="config")
 
-BearerAuthenticatorAllOf.update_forward_refs()
+BearerAuthenticatorAllOf.update_forward_refs()

airbyte-connector-builder-server/connector_builder/generated/models/cartesian_product_stream_slicer.py

@@ -6,7 +6,7 @@
 import re  # noqa: F401
 from typing import Any, Dict, List, Optional  # noqa: F401
 
-from pydantic import AnyUrl, BaseModel, EmailStr, validator  # noqa: F401
+from pydantic import AnyUrl, BaseModel, EmailStr, Field, validator  # noqa: F401
 from connector_builder.generated.models.any_of_cartesian_product_stream_slicer_datetime_stream_slicer_list_stream_slicer_single_slice_substream_slicer import AnyOfCartesianProductStreamSlicerDatetimeStreamSlicerListStreamSlicerSingleSliceSubstreamSlicer
 from connector_builder.generated.models.cartesian_product_stream_slicer_all_of import CartesianProductStreamSlicerAllOf
 from connector_builder.generated.models.stream_slicer import StreamSlicer
@@ -22,6 +22,6 @@ class CartesianProductStreamSlicer(BaseModel):
         stream_slicers: The stream_slicers of this CartesianProductStreamSlicer.
     """
 
-    stream_slicers: List[AnyOfCartesianProductStreamSlicerDatetimeStreamSlicerListStreamSlicerSingleSliceSubstreamSlicer]
+    stream_slicers: List[AnyOfCartesianProductStreamSlicerDatetimeStreamSlicerListStreamSlicerSingleSliceSubstreamSlicer] = Field(alias="stream_slicers")
 
-CartesianProductStreamSlicer.update_forward_refs()
+CartesianProductStreamSlicer.update_forward_refs()

airbyte-connector-builder-server/connector_builder/generated/models/cartesian_product_stream_slicer_all_of.py

@@ -6,7 +6,7 @@
 import re  # noqa: F401
 from typing import Any, Dict, List, Optional  # noqa: F401
 
-from pydantic import AnyUrl, BaseModel, EmailStr, validator  # noqa: F401
+from pydantic import AnyUrl, BaseModel, EmailStr, Field, validator  # noqa: F401
 from connector_builder.generated.models.any_of_cartesian_product_stream_slicer_datetime_stream_slicer_list_stream_slicer_single_slice_substream_slicer import AnyOfCartesianProductStreamSlicerDatetimeStreamSlicerListStreamSlicerSingleSliceSubstreamSlicer
 
 
@@ -20,6 +20,6 @@ class CartesianProductStreamSlicerAllOf(BaseModel):
         stream_slicers: The stream_slicers of this CartesianProductStreamSlicerAllOf.
     """
 
-    stream_slicers: List[AnyOfCartesianProductStreamSlicerDatetimeStreamSlicerListStreamSlicerSingleSliceSubstreamSlicer]
+    stream_slicers: List[AnyOfCartesianProductStreamSlicerDatetimeStreamSlicerListStreamSlicerSingleSliceSubstreamSlicer] = Field(alias="stream_slicers")
 
-CartesianProductStreamSlicerAllOf.update_forward_refs()
+CartesianProductStreamSlicerAllOf.update_forward_refs()

airbyte-connector-builder-server/connector_builder/generated/models/check_stream.py

@@ -6,7 +6,7 @@
 import re  # noqa: F401
 from typing import Any, Dict, List, Optional  # noqa: F401
 
-from pydantic import AnyUrl, BaseModel, EmailStr, validator  # noqa: F401
+from pydantic import AnyUrl, BaseModel, EmailStr, Field, validator  # noqa: F401
 
 
 class CheckStream(BaseModel):
@@ -19,6 +19,6 @@ class CheckStream(BaseModel):
         stream_names: The stream_names of this CheckStream.
     """
 
-    stream_names: List[str]
+    stream_names: List[str] = Field(alias="stream_names")
 
-CheckStream.update_forward_refs()
+CheckStream.update_forward_refs()

airbyte-connector-builder-server/connector_builder/generated/models/composite_error_handler.py

@@ -6,7 +6,7 @@
 import re  # noqa: F401
 from typing import Any, Dict, List, Optional  # noqa: F401
 
-from pydantic import AnyUrl, BaseModel, EmailStr, validator  # noqa: F401
+from pydantic import AnyUrl, BaseModel, EmailStr, Field, validator  # noqa: F401
 from connector_builder.generated.models.any_of_composite_error_handler_default_error_handler import AnyOfCompositeErrorHandlerDefaultErrorHandler
 from connector_builder.generated.models.composite_error_handler_all_of import CompositeErrorHandlerAllOf
 
@@ -21,6 +21,6 @@ class CompositeErrorHandler(BaseModel):
         error_handlers: The error_handlers of this CompositeErrorHandler.
     """
 
-    error_handlers: List[AnyOfCompositeErrorHandlerDefaultErrorHandler]
+    error_handlers: List[AnyOfCompositeErrorHandlerDefaultErrorHandler] = Field(alias="error_handlers")
 
-CompositeErrorHandler.update_forward_refs()
+CompositeErrorHandler.update_forward_refs()

airbyte-connector-builder-server/connector_builder/generated/models/composite_error_handler_all_of.py

@@ -6,7 +6,7 @@
 import re  # noqa: F401
 from typing import Any, Dict, List, Optional  # noqa: F401
 
-from pydantic import AnyUrl, BaseModel, EmailStr, validator  # noqa: F401
+from pydantic import AnyUrl, BaseModel, EmailStr, Field, validator  # noqa: F401
 from connector_builder.generated.models.any_of_composite_error_handler_default_error_handler import AnyOfCompositeErrorHandlerDefaultErrorHandler
 
 
@@ -20,6 +20,6 @@ class CompositeErrorHandlerAllOf(BaseModel):
         error_handlers: The error_handlers of this CompositeErrorHandlerAllOf.
     """
 
-    error_handlers: List[AnyOfCompositeErrorHandlerDefaultErrorHandler]
+    error_handlers: List[AnyOfCompositeErrorHandlerDefaultErrorHandler] = Field(alias="error_handlers")
 
-CompositeErrorHandlerAllOf.update_forward_refs()
+CompositeErrorHandlerAllOf.update_forward_refs()

airbyte-connector-builder-server/connector_builder/generated/models/config_component_schema.py

@@ -6,7 +6,7 @@
 import re  # noqa: F401
 from typing import Any, Dict, List, Optional  # noqa: F401
 
-from pydantic import AnyUrl, BaseModel, EmailStr, validator  # noqa: F401
+from pydantic import AnyUrl, BaseModel, EmailStr, Field, validator  # noqa: F401
 from connector_builder.generated.models.check_stream import CheckStream
 from connector_builder.generated.models.declarative_stream import DeclarativeStream
 
@@ -23,8 +23,8 @@ class ConfigComponentSchema(BaseModel):
         streams: The streams of this ConfigComponentSchema.
     """
 
-    version: str
-    check: CheckStream
-    streams: List[DeclarativeStream]
+    version: str = Field(alias="version")
+    check: CheckStream = Field(alias="check")
+    streams: List[DeclarativeStream] = Field(alias="streams")
 
-ConfigComponentSchema.update_forward_refs()
+ConfigComponentSchema.update_forward_refs()

airbyte-connector-builder-server/connector_builder/generated/models/connector_manifest.py

@@ -6,7 +6,7 @@
 import re  # noqa: F401
 from typing import Any, Dict, List, Optional  # noqa: F401
 
-from pydantic import AnyUrl, BaseModel, EmailStr, validator  # noqa: F401
+from pydantic import AnyUrl, BaseModel, EmailStr, Field, validator  # noqa: F401
 from connector_builder.generated.models.check_stream import CheckStream
 from connector_builder.generated.models.declarative_stream import DeclarativeStream
 
@@ -23,8 +23,8 @@ class ConnectorManifest(BaseModel):
         streams: The streams of this ConnectorManifest.
     """
 
-    version: str
-    check: CheckStream
-    streams: List[DeclarativeStream]
+    version: str = Field(alias="version")
+    check: CheckStream = Field(alias="check")
+    streams: List[DeclarativeStream] = Field(alias="streams")
 
-ConnectorManifest.update_forward_refs()
+ConnectorManifest.update_forward_refs()

airbyte-connector-builder-server/connector_builder/generated/models/constant_backoff_strategy.py

@@ -6,7 +6,7 @@
 import re  # noqa: F401
 from typing import Any, Dict, List, Optional  # noqa: F401
 
-from pydantic import AnyUrl, BaseModel, EmailStr, validator  # noqa: F401
+from pydantic import AnyUrl, BaseModel, EmailStr, Field, validator  # noqa: F401
 from connector_builder.generated.models.any_of_interpolated_stringnumberstring import AnyOfInterpolatedStringnumberstring
 from connector_builder.generated.models.constant_backoff_strategy_all_of import ConstantBackoffStrategyAllOf
 
@@ -22,7 +22,7 @@ class ConstantBackoffStrategy(BaseModel):
         config: The config of this ConstantBackoffStrategy.
     """
 
-    backoff_time_in_seconds: AnyOfInterpolatedStringnumberstring
-    config: Dict[str, Any]
+    backoff_time_in_seconds: AnyOfInterpolatedStringnumberstring = Field(alias="backoff_time_in_seconds")
+    config: Dict[str, Any] = Field(alias="config")
 
-ConstantBackoffStrategy.update_forward_refs()
+ConstantBackoffStrategy.update_forward_refs()

airbyte-connector-builder-server/connector_builder/generated/models/constant_backoff_strategy_all_of.py

@@ -6,7 +6,7 @@
 import re  # noqa: F401
 from typing import Any, Dict, List, Optional  # noqa: F401
 
-from pydantic import AnyUrl, BaseModel, EmailStr, validator  # noqa: F401
+from pydantic import AnyUrl, BaseModel, EmailStr, Field, validator  # noqa: F401
 from connector_builder.generated.models.any_of_interpolated_stringnumberstring import AnyOfInterpolatedStringnumberstring
 
 
@@ -21,7 +21,7 @@ class ConstantBackoffStrategyAllOf(BaseModel):
         config: The config of this ConstantBackoffStrategyAllOf.
     """
 
-    backoff_time_in_seconds: AnyOfInterpolatedStringnumberstring
-    config: Dict[str, Any]
+    backoff_time_in_seconds: AnyOfInterpolatedStringnumberstring = Field(alias="backoff_time_in_seconds")
+    config: Dict[str, Any] = Field(alias="config")
 
-ConstantBackoffStrategyAllOf.update_forward_refs()
+ConstantBackoffStrategyAllOf.update_forward_refs()