From 10d492e91f4032a7770a08818079f4974eccc2f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lu=C3=ADs=20Portela=20Afonso?= Date: Tue, 4 Feb 2025 09:58:58 +0000 Subject: [PATCH 1/2] fix: missing migrations for pydantic v2 --- pyproject.toml | 3 ++- src/ydata/sdk/common/model.py | 3 +-- src/ydata/sdk/common/status.py | 8 ++++---- src/ydata/sdk/datasources/_models/metadata/column.py | 8 ++++---- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 67896aec..a93e58c9 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -43,7 +43,8 @@ dependencies = [ "prettytable==3.13.*", "pydantic>=2.0.0", "typeguard==2.13.3", - "ydata-datascience" + "ydata-datascience", + "requests==2.*", ] [project.license] diff --git a/src/ydata/sdk/common/model.py b/src/ydata/sdk/common/model.py index bd11b14a..7aafba2b 100644 --- a/src/ydata/sdk/common/model.py +++ b/src/ydata/sdk/common/model.py @@ -1,5 +1,4 @@ -from pydantic import BaseModel as PydanticBaseModel -from pydantic import ConfigDict +from pydantic import BaseModel as PydanticBaseModel, ConfigDict class Config(ConfigDict): diff --git a/src/ydata/sdk/common/status.py b/src/ydata/sdk/common/status.py index 8427adac..ad7b09e7 100644 --- a/src/ydata/sdk/common/status.py +++ b/src/ydata/sdk/common/status.py @@ -1,6 +1,6 @@ from typing import Generic, Optional, TypeVar -from pydantic import Field +from pydantic import Field, ConfigDict from .model import BaseModel @@ -8,7 +8,7 @@ class GenericStateErrorStatus(BaseModel, Generic[T]): - state: Optional[T] = Field(None) - - class Config: + model_config = ConfigDict( use_enum_values = True + ) + state: Optional[T] = Field(None) diff --git a/src/ydata/sdk/datasources/_models/metadata/column.py b/src/ydata/sdk/datasources/_models/metadata/column.py index 1cc50275..2423eb1e 100644 --- a/src/ydata/sdk/datasources/_models/metadata/column.py +++ b/src/ydata/sdk/datasources/_models/metadata/column.py @@ -1,18 +1,18 @@ -from pydantic import Field +from pydantic import Field, ConfigDict from ydata.sdk.common.model import BaseModel from ydata.sdk.datasources._models.metadata.data_types import DataType, VariableType class Column(BaseModel): + model_config = ConfigDict( + use_enum_values = True + ) name: str datatype: DataType = Field(alias='dataType') vartype: VariableType = Field(alias='varType') - class Config: - use_enum_values = True - def __repr__(self) -> str: return f"Column(name={self.name}, datatype={self.datatype}, vartype={self.vartype})" From 94b2496c507fb061eea87d98b88300bda4fb3c8a Mon Sep 17 00:00:00 2001 From: Azory YData Bot Date: Tue, 4 Feb 2025 10:29:34 +0000 Subject: [PATCH 2/2] fix(linting): code formatting --- src/ydata/sdk/common/model.py | 3 ++- src/ydata/sdk/common/status.py | 4 ++-- src/ydata/sdk/datasources/_models/metadata/column.py | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/ydata/sdk/common/model.py b/src/ydata/sdk/common/model.py index 7aafba2b..bd11b14a 100644 --- a/src/ydata/sdk/common/model.py +++ b/src/ydata/sdk/common/model.py @@ -1,4 +1,5 @@ -from pydantic import BaseModel as PydanticBaseModel, ConfigDict +from pydantic import BaseModel as PydanticBaseModel +from pydantic import ConfigDict class Config(ConfigDict): diff --git a/src/ydata/sdk/common/status.py b/src/ydata/sdk/common/status.py index ad7b09e7..5e14dece 100644 --- a/src/ydata/sdk/common/status.py +++ b/src/ydata/sdk/common/status.py @@ -1,6 +1,6 @@ from typing import Generic, Optional, TypeVar -from pydantic import Field, ConfigDict +from pydantic import ConfigDict, Field from .model import BaseModel @@ -9,6 +9,6 @@ class GenericStateErrorStatus(BaseModel, Generic[T]): model_config = ConfigDict( - use_enum_values = True + use_enum_values=True ) state: Optional[T] = Field(None) diff --git a/src/ydata/sdk/datasources/_models/metadata/column.py b/src/ydata/sdk/datasources/_models/metadata/column.py index 2423eb1e..ebf816e9 100644 --- a/src/ydata/sdk/datasources/_models/metadata/column.py +++ b/src/ydata/sdk/datasources/_models/metadata/column.py @@ -1,4 +1,4 @@ -from pydantic import Field, ConfigDict +from pydantic import ConfigDict, Field from ydata.sdk.common.model import BaseModel from ydata.sdk.datasources._models.metadata.data_types import DataType, VariableType @@ -6,7 +6,7 @@ class Column(BaseModel): model_config = ConfigDict( - use_enum_values = True + use_enum_values=True ) name: str