Skip to content

Commit

Permalink
Update cuenca-validations type annotations from Metadata to LogConfig
Browse files Browse the repository at this point in the history
  • Loading branch information
gabino committed Jan 29, 2025
1 parent b286db3 commit d351e50
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 12 deletions.
8 changes: 6 additions & 2 deletions cuenca/resources/api_keys.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
import datetime as dt
from typing import Annotated, ClassVar, Optional

from cuenca_validations.types import ApiKeyQuery, ApiKeyUpdateRequest, Metadata
from cuenca_validations.types import (
ApiKeyQuery,
ApiKeyUpdateRequest,
LogConfig,
)
from pydantic import ConfigDict

from ..http import Session, session as global_session
Expand All @@ -12,7 +16,7 @@ class ApiKey(Creatable, Queryable, Retrievable, Updateable):
_resource: ClassVar = 'api_keys'
_query_params: ClassVar = ApiKeyQuery

secret: Annotated[str, Metadata(sensitive=True, log_chars=4)]
secret: Annotated[str, LogConfig(masked=True, unmasked_chars_length=4)]
deactivated_at: Optional[dt.datetime] = None
user_id: Optional[str] = None
model_config = ConfigDict(
Expand Down
6 changes: 3 additions & 3 deletions cuenca/resources/jwt_tokens.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import datetime as dt
from typing import Annotated, ClassVar

from cuenca_validations.types import Metadata
from cuenca_validations.types import LogConfig
from pydantic import ConfigDict

from ..http import Session, session as global_session
Expand All @@ -11,8 +11,8 @@
class JwtToken(Creatable):
_resource: ClassVar = 'token'

id: Annotated[str, Metadata(sensitive=True, log_chars=4)]
token: Annotated[str, Metadata(sensitive=True, log_chars=4)]
id: Annotated[str, LogConfig(masked=True, unmasked_chars_length=4)]
token: Annotated[str, LogConfig(masked=True, unmasked_chars_length=4)]
created_at: dt.datetime
api_key_uri: str

Expand Down
4 changes: 2 additions & 2 deletions cuenca/resources/login_tokens.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from typing import Annotated, ClassVar

from cuenca_validations.types import Metadata
from cuenca_validations.types import LogConfig
from pydantic import ConfigDict

from ..http import Session, session as global_session
Expand All @@ -10,7 +10,7 @@
class LoginToken(Creatable):
_resource: ClassVar = 'login_tokens'

id: Annotated[str, Metadata(sensitive=True, log_chars=4)]
id: Annotated[str, LogConfig(masked=True, unmasked_chars_length=4)]

model_config = ConfigDict(
json_schema_extra={'example': {'id': 'LTNEUInh69SuKXXmK95sROwQ'}}
Expand Down
4 changes: 2 additions & 2 deletions cuenca/resources/otps.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from typing import Annotated, ClassVar

from cuenca_validations.types import Metadata
from cuenca_validations.types import LogConfig
from pydantic import ConfigDict

from ..http import Session, session as global_session
Expand All @@ -9,7 +9,7 @@

class Otp(Creatable):
_resource: ClassVar = 'otps'
secret: Annotated[str, Metadata(sensitive=True, log_chars=4)]
secret: Annotated[str, LogConfig(masked=True, unmasked_chars_length=4)]

model_config = ConfigDict(
json_schema_extra={
Expand Down
4 changes: 2 additions & 2 deletions cuenca/resources/sessions.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import datetime as dt
from typing import Annotated, ClassVar, Optional

from cuenca_validations.types import Metadata, SessionRequest, SessionType
from cuenca_validations.types import LogConfig, SessionRequest, SessionType
from cuenca_validations.types.general import SerializableAnyUrl
from pydantic import ConfigDict

Expand All @@ -12,7 +12,7 @@
class Session(Creatable, Retrievable, Queryable):
_resource: ClassVar = 'sessions'

id: Annotated[str, Metadata(sensitive=True, log_chars=4)]
id: Annotated[str, LogConfig(masked=True, unmasked_chars_length=4)]
created_at: dt.datetime
user_id: str
platform_id: str
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
requests==2.32.3
cuenca-validations==2.0.5.dev3
cuenca-validations==2.0.5.dev5
pydantic-extra-types==2.10.2

0 comments on commit d351e50

Please sign in to comment.