laipeng/reflex
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

types adjustments

Browse Source
This commit is contained in:
Benedikt Bartscher 2024-02-28 23:53:51 +01:00
parent 8e692cd305
commit 95f9b12829
No known key found for this signature in database
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
reflex/utils/types.py
View File

@ -22,7 +22,6 @@ from typing import (
) )
import sqlalchemy import sqlalchemy
from pydantic.fields import ModelField
from sqlalchemy.ext.hybrid import hybrid_property from sqlalchemy.ext.hybrid import hybrid_property
from sqlalchemy.orm import DeclarativeBase, Mapped, QueryableAttribute, Relationship from sqlalchemy.orm import DeclarativeBase, Mapped, QueryableAttribute, Relationship
@ -165,13 +164,11 @@ def get_attribute_access_type(cls: GenericType, name: str) -> GenericType | None
attr = getattr(cls, name, None) attr = getattr(cls, name, None)
if hint := get_property_hint(attr): if hint := get_property_hint(attr):
return hint return hint
if hasattr(cls, "__fields__") and name in cls.__fields__: if hasattr(cls, "model_fields") and name in cls.model_fields:
# pydantic models # pydantic models
field = cls.__fields__[name] field = cls.model_fields[name]
type_ = field.outer_type_ type_ = field.annotation
if isinstance(type_, ModelField): if not field.is_required() and field.default is None and field.default_factory is None:
type_ = type_.type_
if not field.required and field.default is None:
# Ensure frontend uses null coalescing when accessing. # Ensure frontend uses null coalescing when accessing.
type_ = Optional[type_] type_ = Optional[type_]
return type_ return type_
@ -201,8 +198,9 @@ def get_attribute_access_type(cls: GenericType, name: str) -> GenericType | None
type_origin = get_origin(type_) type_origin = get_origin(type_)
if isinstance(type_origin, type) and issubclass(type_origin, Mapped): if isinstance(type_origin, type) and issubclass(type_origin, Mapped):
return get_args(type_)[0] # SQLAlchemy v2 return get_args(type_)[0] # SQLAlchemy v2
if isinstance(type_, ModelField): # TODO: pydantic v2
return type_.type_ # SQLAlchemy v1.4 # if isinstance(type_, ModelField):
# return type_.type_ # SQLAlchemy v1.4
return type_ return type_
elif is_union(cls): elif is_union(cls):
# Check in each arg of the annotation. # Check in each arg of the annotation.