[DOP-24446] change uuid6 to default uuid in type annotation (#194)

* [DOP-24446] change uuid6 to default uuid in type annotation

* [DOP-24446] remove 'type-ignore'

Author: TiGrib

data_rentgen/db/models/column_lineage.py

@@ -4,6 +4,7 @@
 from __future__ import annotations
 
 from datetime import datetime
+from uuid import UUID
 
 from sqlalchemy import UUID as SQL_UUID
 from sqlalchemy import (
@@ -12,7 +13,6 @@
     PrimaryKeyConstraint,
 )
 from sqlalchemy.orm import Mapped, mapped_column, relationship
-from uuid6 import UUID
 
 from data_rentgen.db.models.base import Base
 from data_rentgen.db.models.dataset import Dataset

data_rentgen/db/models/dataset_column_relation.py

@@ -4,6 +4,7 @@
 from __future__ import annotations
 
 from enum import Flag
+from uuid import UUID
 
 from sqlalchemy import UUID as SQL_UUID
 from sqlalchemy import (
@@ -15,7 +16,6 @@
     func,
 )
 from sqlalchemy.orm import Mapped, mapped_column
-from uuid6 import UUID
 
 from data_rentgen.db.models.base import Base
 

data_rentgen/db/models/input.py

@@ -4,11 +4,11 @@
 from __future__ import annotations
 
 from datetime import datetime
+from uuid import UUID
 
 from sqlalchemy import UUID as SQL_UUID
 from sqlalchemy import BigInteger, DateTime, PrimaryKeyConstraint
 from sqlalchemy.orm import Mapped, mapped_column, relationship
-from uuid6 import UUID
 
 from data_rentgen.db.models.base import Base
 from data_rentgen.db.models.dataset import Dataset

data_rentgen/db/models/operation.py

@@ -5,12 +5,12 @@
 
 from datetime import datetime
 from enum import Enum, IntEnum
+from uuid import UUID
 
 from sqlalchemy import UUID as SQL_UUID
 from sqlalchemy import DateTime, Integer, PrimaryKeyConstraint, SmallInteger, String
 from sqlalchemy.orm import Mapped, mapped_column, relationship
 from sqlalchemy_utils import ChoiceType
-from uuid6 import UUID
 
 from data_rentgen.db.models.base import Base
 from data_rentgen.db.models.run import Run

data_rentgen/db/models/output.py

@@ -5,12 +5,12 @@
 
 from datetime import datetime
 from enum import Enum
+from uuid import UUID
 
 from sqlalchemy import UUID as SQL_UUID
 from sqlalchemy import BigInteger, DateTime, PrimaryKeyConstraint, String
 from sqlalchemy.orm import Mapped, mapped_column, relationship
 from sqlalchemy_utils import ChoiceType
-from uuid6 import UUID
 
 from data_rentgen.db.models.base import Base
 from data_rentgen.db.models.dataset import Dataset

data_rentgen/db/models/run.py

@@ -5,6 +5,7 @@
 
 from datetime import datetime
 from enum import Enum, IntEnum
+from uuid import UUID
 
 from sqlalchemy import UUID as SQL_UUID
 from sqlalchemy import (
@@ -19,7 +20,6 @@
 from sqlalchemy.dialects.postgresql import TSVECTOR
 from sqlalchemy.orm import Mapped, mapped_column, relationship
 from sqlalchemy_utils import ChoiceType
-from uuid6 import UUID
 
 from data_rentgen.db.models.base import Base
 from data_rentgen.db.models.job import Job

data_rentgen/db/repositories/input.py

@@ -4,10 +4,10 @@
 from dataclasses import dataclass
 from datetime import datetime, timezone
 from typing import Literal
+from uuid import UUID
 
 from sqlalchemy import ColumnElement, Row, any_, func, literal_column, select
 from sqlalchemy.dialects.postgresql import insert
-from uuid6 import UUID
 
 from data_rentgen.db.models import Input, Schema
 from data_rentgen.db.repositories.base import Repository

data_rentgen/db/repositories/output.py

@@ -4,10 +4,10 @@
 from dataclasses import dataclass
 from datetime import datetime, timezone
 from typing import Literal
+from uuid import UUID
 
 from sqlalchemy import ColumnElement, Row, any_, func, literal_column, select
 from sqlalchemy.dialects.postgresql import insert
-from uuid6 import UUID
 
 from data_rentgen.db.models import Output, OutputType, Schema
 from data_rentgen.db.repositories.base import Repository

data_rentgen/dto/column_lineage.py

@@ -7,8 +7,6 @@
 from functools import cached_property
 from uuid import UUID
 
-from uuid6 import UUID as UUIDv6  # noqa: N811
-
 from data_rentgen.db.utils.uuid import generate_static_uuid
 from data_rentgen.dto.dataset import DatasetDTO
 from data_rentgen.dto.dataset_column_relation import (
@@ -26,7 +24,7 @@ class ColumnLineageDTO:
     dataset_column_relations: InitVar[list[DatasetColumnRelationDTO]]
     _dataset_column_relations: list[DatasetColumnRelationDTO] = field(default_factory=list, init=False)
     # id is generated using other ids combination
-    id: UUIDv6 | None = None
+    id: UUID | None = None
 
     def __post_init__(self, dataset_column_relations: list[DatasetColumnRelationDTO]):
         self._dataset_column_relations = merge_dataset_column_relations(dataset_column_relations)

data_rentgen/dto/dataset_column_relation.py

@@ -5,8 +5,7 @@
 
 from dataclasses import dataclass
 from enum import IntFlag
-
-from uuid6 import UUID
+from uuid import UUID
 
 
 class DatasetColumnRelationTypeDTO(IntFlag):