openmetadata-ingestion 1.4.8.0__py3-none-any.whl → 1.5.0.0rc2__py3-none-any.whl

metadata/generated/schema/type/entityHierarchy.py

@@ -1,39 +1,48 @@
 # generated by datamodel-codegen:
 #   filename:  type/entityHierarchy.json
-#   timestamp: 2024-08-21T07:08:21+00:00
+#   timestamp: 2024-08-22T13:36:48+00:00
 
 from __future__ import annotations
 
 from typing import List, Optional
 
-from pydantic import BaseModel, Extra, Field
+from pydantic import ConfigDict, Field
+from typing_extensions import Annotated
+
+from metadata.ingestion.models.custom_pydantic import BaseModel
 
 from . import basic
 
 
 class EntityHierarchy(BaseModel):
-    class Config:
-        extra = Extra.forbid
-
-    id: basic.Uuid = Field(
-        ..., description='Unique identifier of an entity hierarchy instance.'
-    )
-    name: basic.EntityName = Field(
-        ..., description='Preferred name for the entity hierarchy.'
-    )
-    displayName: Optional[str] = Field(
-        None, description='Display name that identifies this hierarchy.'
-    )
-    description: basic.Markdown = Field(
-        ..., description='Description of the entity hierarchy.'
+    model_config = ConfigDict(
+        extra='forbid',
     )
-    fullyQualifiedName: Optional[basic.FullyQualifiedEntityName] = Field(
-        None,
-        description='A unique name that identifies an entity within the hierarchy. It captures name hierarchy in the form of `rootEntity.childEntity`.',
-    )
-    children: Optional[List[EntityHierarchy]] = Field(
-        None, description='Other entities that are children of this entity.'
-    )
-
-
-EntityHierarchy.update_forward_refs()
+    id: Annotated[
+        basic.Uuid,
+        Field(description='Unique identifier of an entity hierarchy instance.'),
+    ]
+    name: Annotated[
+        basic.EntityName, Field(description='Preferred name for the entity hierarchy.')
+    ]
+    displayName: Annotated[
+        Optional[str],
+        Field(None, description='Display name that identifies this hierarchy.'),
+    ]
+    description: Annotated[
+        basic.Markdown, Field(description='Description of the entity hierarchy.')
+    ]
+    fullyQualifiedName: Annotated[
+        Optional[basic.FullyQualifiedEntityName],
+        Field(
+            None,
+            description='A unique name that identifies an entity within the hierarchy. It captures name hierarchy in the form of `rootEntity.childEntity`.',
+        ),
+    ]
+    children: Annotated[
+        Optional[List[EntityHierarchy]],
+        Field(None, description='Other entities that are children of this entity.'),
+    ]
+
+
+EntityHierarchy.model_rebuild()

metadata/generated/schema/type/entityHistory.py

@@ -1,69 +1,95 @@
 # generated by datamodel-codegen:
 #   filename:  type/entityHistory.json
-#   timestamp: 2024-08-21T07:08:21+00:00
+#   timestamp: 2024-08-22T13:36:48+00:00
 
 from __future__ import annotations
 
 from typing import Any, List, Optional
 
-from pydantic import BaseModel, Extra, Field, confloat
+from pydantic import ConfigDict, Field, RootModel
+from typing_extensions import Annotated
 
+from metadata.ingestion.models.custom_pydantic import BaseModel
 
-class EntityVersionHistory(BaseModel):
-    class Config:
-        extra = Extra.forbid
 
-    entityType: str = Field(
-        ...,
-        description='Entity type, such as `database`, `table`, `dashboard`, for which this version history is produced.',
+class EntityVersionHistory(BaseModel):
+    model_config = ConfigDict(
+        extra='forbid',
     )
+    entityType: Annotated[
+        str,
+        Field(
+            description='Entity type, such as `database`, `table`, `dashboard`, for which this version history is produced.'
+        ),
+    ]
     versions: List
 
 
-class EntityVersion(BaseModel):
-    __root__: confloat(ge=0.1, multiple_of=0.1) = Field(
-        ...,
-        description='Metadata version of the entity in the form `Major.Minor`. First version always starts from `0.1` when the entity is created. When the backward compatible changes are made to the entity, only the `Minor` version is incremented - example `1.0` is changed to `1.1`. When backward incompatible changes are made the `Major` version is incremented - example `1.1` to `2.0`.',
-    )
+class EntityVersion(RootModel[float]):
+    root: Annotated[
+        float,
+        Field(
+            description='Metadata version of the entity in the form `Major.Minor`. First version always starts from `0.1` when the entity is created. When the backward compatible changes are made to the entity, only the `Minor` version is incremented - example `1.0` is changed to `1.1`. When backward incompatible changes are made the `Major` version is incremented - example `1.1` to `2.0`.',
+            ge=0.1,
+            multiple_of=0.1,
+        ),
+    ]
 
 
-class FieldName(BaseModel):
-    __root__: str = Field(..., description='Name of the field of an entity.')
+class FieldName(RootModel[str]):
+    root: Annotated[str, Field(description='Name of the field of an entity.')]
 
 
 class FieldChange(BaseModel):
-    class Config:
-        extra = Extra.forbid
-
-    name: Optional[FieldName] = Field(
-        None, description='Name of the entity field that changed.'
-    )
-    oldValue: Optional[Any] = Field(
-        None,
-        description='Previous value of the field. Note that this is a JSON string and use the corresponding field type to deserialize it.',
-    )
-    newValue: Optional[Any] = Field(
-        None,
-        description='New value of the field. Note that this is a JSON string and use the corresponding field type to deserialize it.',
+    model_config = ConfigDict(
+        extra='forbid',
     )
+    name: Annotated[
+        Optional[FieldName],
+        Field(None, description='Name of the entity field that changed.'),
+    ]
+    oldValue: Annotated[
+        Optional[Any],
+        Field(
+            None,
+            description='Previous value of the field. Note that this is a JSON string and use the corresponding field type to deserialize it.',
+        ),
+    ]
+    newValue: Annotated[
+        Optional[Any],
+        Field(
+            None,
+            description='New value of the field. Note that this is a JSON string and use the corresponding field type to deserialize it.',
+        ),
+    ]
 
 
 class ChangeDescription(BaseModel):
-    class Config:
-        extra = Extra.forbid
-
-    fieldsAdded: Optional[List[FieldChange]] = Field(
-        None, description='Names of fields added during the version changes.'
-    )
-    fieldsUpdated: Optional[List[FieldChange]] = Field(
-        None,
-        description='Fields modified during the version changes with old and new values.',
-    )
-    fieldsDeleted: Optional[List[FieldChange]] = Field(
-        None,
-        description='Fields deleted during the version changes with old value before deleted.',
-    )
-    previousVersion: Optional[EntityVersion] = Field(
-        None,
-        description='When a change did not result in change, this could be same as the current version.',
+    model_config = ConfigDict(
+        extra='forbid',
     )
+    fieldsAdded: Annotated[
+        Optional[List[FieldChange]],
+        Field(None, description='Names of fields added during the version changes.'),
+    ]
+    fieldsUpdated: Annotated[
+        Optional[List[FieldChange]],
+        Field(
+            None,
+            description='Fields modified during the version changes with old and new values.',
+        ),
+    ]
+    fieldsDeleted: Annotated[
+        Optional[List[FieldChange]],
+        Field(
+            None,
+            description='Fields deleted during the version changes with old value before deleted.',
+        ),
+    ]
+    previousVersion: Annotated[
+        Optional[EntityVersion],
+        Field(
+            None,
+            description='When a change did not result in change, this could be same as the current version.',
+        ),
+    ]

metadata/generated/schema/type/entityLineage.py

@@ -1,30 +1,42 @@
 # generated by datamodel-codegen:
 #   filename:  type/entityLineage.json
-#   timestamp: 2024-08-21T07:08:21+00:00
+#   timestamp: 2024-08-22T13:36:48+00:00
 
 from __future__ import annotations
 
 from enum import Enum
 from typing import List, Optional
 
-from pydantic import BaseModel, Extra, Field
+from pydantic import ConfigDict, Field
+from typing_extensions import Annotated
+
+from metadata.ingestion.models.custom_pydantic import BaseModel
 
 from . import basic, entityReference
 
 
 class ColumnLineage(BaseModel):
-    fromColumns: Optional[List[basic.FullyQualifiedEntityName]] = Field(
-        None,
-        description='One or more source columns identified by fully qualified column name used by transformation function to create destination column.',
-    )
-    toColumn: Optional[basic.FullyQualifiedEntityName] = Field(
-        None,
-        description='Destination column identified by fully qualified column name created by the transformation of source columns.',
-    )
-    function: Optional[basic.SqlFunction] = Field(
-        None,
-        description='Transformation function applied to source columns to create destination column. That is `function(fromColumns) -> toColumn`.',
-    )
+    fromColumns: Annotated[
+        Optional[List[basic.FullyQualifiedEntityName]],
+        Field(
+            None,
+            description='One or more source columns identified by fully qualified column name used by transformation function to create destination column.',
+        ),
+    ]
+    toColumn: Annotated[
+        Optional[basic.FullyQualifiedEntityName],
+        Field(
+            None,
+            description='Destination column identified by fully qualified column name created by the transformation of source columns.',
+        ),
+    ]
+    function: Annotated[
+        Optional[basic.SqlFunction],
+        Field(
+            None,
+            description='Transformation function applied to source columns to create destination column. That is `function(fromColumns) -> toColumn`.',
+        ),
+    ]
 
 
 class Source(Enum):
@@ -40,63 +52,83 @@ class Source(Enum):
 
 
 class LineageDetails(BaseModel):
-    sqlQuery: Optional[basic.SqlQuery] = Field(
-        None, description='SQL used for transformation.'
-    )
-    columnsLineage: Optional[List[ColumnLineage]] = Field(
-        None,
-        description='Lineage information of how upstream columns were combined to get downstream column.',
-    )
-    pipeline: Optional[entityReference.EntityReference] = Field(
-        None, description='Pipeline where the sqlQuery is periodically run.'
-    )
-    description: Optional[str] = Field(None, description='description of lineage')
-    source: Optional[Source] = Field(
-        Source.Manual, description='Lineage type describes how a lineage was created.'
-    )
+    sqlQuery: Annotated[
+        Optional[basic.SqlQuery],
+        Field(None, description='SQL used for transformation.'),
+    ]
+    columnsLineage: Annotated[
+        Optional[List[ColumnLineage]],
+        Field(
+            None,
+            description='Lineage information of how upstream columns were combined to get downstream column.',
+        ),
+    ]
+    pipeline: Annotated[
+        Optional[entityReference.EntityReference],
+        Field(None, description='Pipeline where the sqlQuery is periodically run.'),
+    ]
+    description: Annotated[
+        Optional[str], Field(None, description='description of lineage')
+    ]
+    source: Annotated[
+        Optional[Source],
+        Field(
+            Source.Manual,
+            description='Lineage type describes how a lineage was created.',
+        ),
+    ]
 
 
 class Edge(BaseModel):
-    class Config:
-        extra = Extra.forbid
-
-    fromEntity: basic.Uuid = Field(
-        ..., description='From entity that is upstream of lineage edge.'
-    )
-    toEntity: basic.Uuid = Field(
-        ..., description='To entity that is downstream of lineage edge.'
+    model_config = ConfigDict(
+        extra='forbid',
     )
+    fromEntity: Annotated[
+        basic.Uuid, Field(description='From entity that is upstream of lineage edge.')
+    ]
+    toEntity: Annotated[
+        basic.Uuid, Field(description='To entity that is downstream of lineage edge.')
+    ]
     description: Optional[basic.Markdown] = None
-    lineageDetails: Optional[LineageDetails] = Field(
-        None,
-        description='Optional lineageDetails provided only for table to table lineage edge.',
-    )
+    lineageDetails: Annotated[
+        Optional[LineageDetails],
+        Field(
+            None,
+            description='Optional lineageDetails provided only for table to table lineage edge.',
+        ),
+    ]
 
 
 class EntitiesEdge(BaseModel):
-    class Config:
-        extra = Extra.forbid
-
-    fromEntity: entityReference.EntityReference = Field(
-        ..., description='From entity that is upstream of lineage edge.'
-    )
-    toEntity: entityReference.EntityReference = Field(
-        ..., description='To entity that is downstream of lineage edge.'
+    model_config = ConfigDict(
+        extra='forbid',
     )
+    fromEntity: Annotated[
+        entityReference.EntityReference,
+        Field(description='From entity that is upstream of lineage edge.'),
+    ]
+    toEntity: Annotated[
+        entityReference.EntityReference,
+        Field(description='To entity that is downstream of lineage edge.'),
+    ]
     description: Optional[basic.Markdown] = None
-    lineageDetails: Optional[LineageDetails] = Field(
-        None,
-        description='Optional lineageDetails provided only for table to table lineage edge.',
-    )
+    lineageDetails: Annotated[
+        Optional[LineageDetails],
+        Field(
+            None,
+            description='Optional lineageDetails provided only for table to table lineage edge.',
+        ),
+    ]
 
 
 class EntityLineage(BaseModel):
-    class Config:
-        extra = Extra.forbid
-
-    entity: entityReference.EntityReference = Field(
-        ..., description='Primary entity for which this lineage graph is created.'
+    model_config = ConfigDict(
+        extra='forbid',
     )
+    entity: Annotated[
+        entityReference.EntityReference,
+        Field(description='Primary entity for which this lineage graph is created.'),
+    ]
     nodes: Optional[List[entityReference.EntityReference]] = None
     upstreamEdges: Optional[List[Edge]] = None
     downstreamEdges: Optional[List[Edge]] = None

metadata/generated/schema/type/entityReference.py

@@ -1,43 +1,64 @@
 # generated by datamodel-codegen:
 #   filename:  type/entityReference.json
-#   timestamp: 2024-08-21T07:08:21+00:00
+#   timestamp: 2024-08-22T13:36:48+00:00
 
 from __future__ import annotations
 
 from typing import Optional
 
-from pydantic import BaseModel, Extra, Field
+from pydantic import ConfigDict, Field
+from typing_extensions import Annotated
+
+from metadata.ingestion.models.custom_pydantic import BaseModel
 
 from . import basic
 
 
 class EntityReference(BaseModel):
-    class Config:
-        extra = Extra.forbid
-
-    id: basic.Uuid = Field(
-        ..., description='Unique identifier that identifies an entity instance.'
-    )
-    type: str = Field(
-        ...,
-        description='Entity type/class name - Examples: `database`, `table`, `metrics`, `databaseService`, `dashboardService`...',
-    )
-    name: Optional[str] = Field(None, description='Name of the entity instance.')
-    fullyQualifiedName: Optional[str] = Field(
-        None,
-        description="Fully qualified name of the entity instance. For entities such as tables, databases fullyQualifiedName is returned in this field. For entities that don't have name hierarchy such as `user` and `team` this will be same as the `name` field.",
-    )
-    description: Optional[basic.Markdown] = Field(
-        None, description='Optional description of entity.'
-    )
-    displayName: Optional[str] = Field(
-        None, description='Display Name that identifies this entity.'
-    )
-    deleted: Optional[bool] = Field(
-        None, description='If true the entity referred to has been soft-deleted.'
-    )
-    inherited: Optional[bool] = Field(
-        None,
-        description='If true the relationship indicated by this entity reference is inherited from the parent entity.',
+    model_config = ConfigDict(
+        extra='forbid',
     )
-    href: Optional[basic.Href] = Field(None, description='Link to the entity resource.')
+    id: Annotated[
+        basic.Uuid,
+        Field(description='Unique identifier that identifies an entity instance.'),
+    ]
+    type: Annotated[
+        str,
+        Field(
+            description='Entity type/class name - Examples: `database`, `table`, `metrics`, `databaseService`, `dashboardService`...'
+        ),
+    ]
+    name: Annotated[
+        Optional[str], Field(None, description='Name of the entity instance.')
+    ]
+    fullyQualifiedName: Annotated[
+        Optional[str],
+        Field(
+            None,
+            description="Fully qualified name of the entity instance. For entities such as tables, databases fullyQualifiedName is returned in this field. For entities that don't have name hierarchy such as `user` and `team` this will be same as the `name` field.",
+        ),
+    ]
+    description: Annotated[
+        Optional[basic.Markdown],
+        Field(None, description='Optional description of entity.'),
+    ]
+    displayName: Annotated[
+        Optional[str],
+        Field(None, description='Display Name that identifies this entity.'),
+    ]
+    deleted: Annotated[
+        Optional[bool],
+        Field(
+            None, description='If true the entity referred to has been soft-deleted.'
+        ),
+    ]
+    inherited: Annotated[
+        Optional[bool],
+        Field(
+            None,
+            description='If true the relationship indicated by this entity reference is inherited from the parent entity.',
+        ),
+    ]
+    href: Annotated[
+        Optional[basic.Href], Field(None, description='Link to the entity resource.')
+    ]

metadata/generated/schema/type/entityReferenceList.py

@@ -1,19 +1,22 @@
 # generated by datamodel-codegen:
 #   filename:  type/entityReferenceList.json
-#   timestamp: 2024-08-21T07:08:21+00:00
+#   timestamp: 2024-08-22T13:36:48+00:00
 
 from __future__ import annotations
 
 from typing import List
 
-from pydantic import BaseModel, Field
+from pydantic import Field, RootModel
+from typing_extensions import Annotated
 
 from . import entityReference
 
 
-class EntityReferenceList(BaseModel):
-    __root__: List[entityReference.EntityReference] = Field(
-        ...,
-        description='This schema defines the EntityReferenceList type used for referencing an entity. EntityReference is used for capturing relationships from one entity to another. For example, a table has an attribute called database of type EntityReference that captures the relationship of a table `belongs to a` database.',
-        title='Entity Reference List',
-    )
+class EntityReferenceList(RootModel[List[entityReference.EntityReference]]):
+    root: Annotated[
+        List[entityReference.EntityReference],
+        Field(
+            description='This schema defines the EntityReferenceList type used for referencing an entity. EntityReference is used for capturing relationships from one entity to another. For example, a table has an attribute called database of type EntityReference that captures the relationship of a table `belongs to a` database.',
+            title='Entity Reference List',
+        ),
+    ]

metadata/generated/schema/type/entityRelationship.py

@@ -1,13 +1,16 @@
 # generated by datamodel-codegen:
 #   filename:  type/entityRelationship.json
-#   timestamp: 2024-08-21T07:08:21+00:00
+#   timestamp: 2024-08-22T13:36:48+00:00
 
 from __future__ import annotations
 
 from enum import Enum
 from typing import Optional
 
-from pydantic import BaseModel, Extra, Field, conint
+from pydantic import ConfigDict, Field
+from typing_extensions import Annotated
+
+from metadata.ingestion.models.custom_pydantic import BaseModel
 
 from . import basic
 
@@ -38,41 +41,67 @@ class RelationshipType(Enum):
 
 
 class EntityRelationship(BaseModel):
-    class Config:
-        extra = Extra.forbid
-
-    fromId: Optional[basic.Uuid] = Field(
-        None,
-        description='Unique identifier that identifies the entity from which the relationship originates.',
-    )
-    fromFQN: Optional[str] = Field(
-        None,
-        description='Fully qualified name of the entity from which the relationship originates.',
-    )
-    fromEntity: str = Field(
-        ...,
-        description='Type of the entity from which the relationship originates. Examples: `database`, `table`, `metrics` ...',
-    )
-    toId: Optional[basic.Uuid] = Field(
-        None,
-        description='Unique identifier that identifies the entity towards which the relationship refers to.',
-    )
-    toFQN: Optional[str] = Field(
-        None,
-        description='Fully qualified name of the entity towards which the relationship refers to.',
-    )
-    toEntity: str = Field(
-        ...,
-        description='Type of the entity towards which the relationship refers to. Examples: `database`, `table`, `metrics` ...',
-    )
-    relation: Optional[conint(ge=0)] = Field(
-        None,
-        description='Describes relationship between the two entities as an integer.',
-    )
-    relationshipType: RelationshipType = Field(
-        ...,
-        description='Describes relationship between the two entities. Eg: Database --- Contains --> Table.',
-    )
-    deleted: Optional[bool] = Field(
-        False, description='`true` indicates the relationship has been soft deleted.'
+    model_config = ConfigDict(
+        extra='forbid',
     )
+    fromId: Annotated[
+        Optional[basic.Uuid],
+        Field(
+            None,
+            description='Unique identifier that identifies the entity from which the relationship originates.',
+        ),
+    ]
+    fromFQN: Annotated[
+        Optional[str],
+        Field(
+            None,
+            description='Fully qualified name of the entity from which the relationship originates.',
+        ),
+    ]
+    fromEntity: Annotated[
+        str,
+        Field(
+            description='Type of the entity from which the relationship originates. Examples: `database`, `table`, `metrics` ...'
+        ),
+    ]
+    toId: Annotated[
+        Optional[basic.Uuid],
+        Field(
+            None,
+            description='Unique identifier that identifies the entity towards which the relationship refers to.',
+        ),
+    ]
+    toFQN: Annotated[
+        Optional[str],
+        Field(
+            None,
+            description='Fully qualified name of the entity towards which the relationship refers to.',
+        ),
+    ]
+    toEntity: Annotated[
+        str,
+        Field(
+            description='Type of the entity towards which the relationship refers to. Examples: `database`, `table`, `metrics` ...'
+        ),
+    ]
+    relation: Annotated[
+        Optional[int],
+        Field(
+            None,
+            description='Describes relationship between the two entities as an integer.',
+            ge=0,
+        ),
+    ]
+    relationshipType: Annotated[
+        RelationshipType,
+        Field(
+            description='Describes relationship between the two entities. Eg: Database --- Contains --> Table.'
+        ),
+    ]
+    deleted: Annotated[
+        Optional[bool],
+        Field(
+            False,
+            description='`true` indicates the relationship has been soft deleted.',
+        ),
+    ]