From b565e8934ac640b5ddd90560727f0a4066b110fd Mon Sep 17 00:00:00 2001 From: Benedikt Bartscher Date: Fri, 1 Mar 2024 18:06:42 +0100 Subject: [PATCH] dict -> model_dump and field_info fixes --- reflex/components/chakra/forms/multiselect.py | 2 +- reflex/components/suneditor/editor.py | 2 +- reflex/event.py | 2 +- reflex/model.py | 2 +- reflex/vars.py | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/reflex/components/chakra/forms/multiselect.py b/reflex/components/chakra/forms/multiselect.py index db4739c97..7d9a73e06 100644 --- a/reflex/components/chakra/forms/multiselect.py +++ b/reflex/components/chakra/forms/multiselect.py @@ -348,7 +348,7 @@ class Select(Component): converted_options.append(Option(label=str(option), value=option)) else: converted_options.append(option) - props["options"] = [o.dict() for o in converted_options] + props["options"] = [o.model_dump() for o in converted_options] else: props["options"] = options return super().create(*[], **props) diff --git a/reflex/components/suneditor/editor.py b/reflex/components/suneditor/editor.py index 77d1acf84..2b7198557 100644 --- a/reflex/components/suneditor/editor.py +++ b/reflex/components/suneditor/editor.py @@ -225,7 +225,7 @@ class Editor(NoSSRComponent): raise ValueError("EditorOptions cannot be a state Var") props["set_options"] = { to_camel_case(k): v - for k, v in set_options.dict().items() + for k, v in set_options.model_dump().items() if v is not None } return super().create(*[], **props) diff --git a/reflex/event.py b/reflex/event.py index b9c39f0c2..26ef59d0a 100644 --- a/reflex/event.py +++ b/reflex/event.py @@ -262,7 +262,7 @@ class CallableEventSpec(EventSpec): default_event_spec = fn() super().__init__( fn=fn, # type: ignore - **default_event_spec.dict(), + **default_event_spec.model_dump(), **kwargs, ) else: diff --git a/reflex/model.py b/reflex/model.py index f7396fad5..5448c665a 100644 --- a/reflex/model.py +++ b/reflex/model.py @@ -63,7 +63,7 @@ class Model(Base, sqlmodel.SQLModel): field_name for field_name, field in cls.model_fields.items() if field_name != "id" - and getattr(field.field_info, "primary_key", None) is True + and getattr(field, "primary_key", None) is True ] if non_default_primary_key_fields: cls.model_fields.pop("id", None) diff --git a/reflex/vars.py b/reflex/vars.py index e0b94da78..7a502ed89 100644 --- a/reflex/vars.py +++ b/reflex/vars.py @@ -199,7 +199,7 @@ class VarData(Base): "state": self.state, "interpolations": list(self.interpolations), "imports": { - lib: [import_var.dict() for import_var in import_vars] + lib: [import_var.model_dump() for import_var in import_vars] for lib, import_vars in self.imports.items() }, "hooks": list(self.hooks),