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

merging

Browse Source
This commit is contained in:
Khaleel Al-Adhami 2024-10-02 11:21:51 -07:00
commit c39de662c8
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
reflex/components/dynamic.py
View File

@ -2,6 +2,7 @@
from reflex import constants from reflex import constants
from reflex.utils import imports from reflex.utils import imports
from reflex.utils.format import format_library_name
from reflex.utils.serializers import serializer from reflex.utils.serializers import serializer
from reflex.vars import Var, get_unique_variable_name from reflex.vars import Var, get_unique_variable_name
from reflex.vars.base import VarData, transform from reflex.vars.base import VarData, transform
@ -64,11 +65,12 @@ def load_dynamic_serializer():
imports = {} imports = {}
for lib, names in component._get_all_imports().items(): for lib, names in component._get_all_imports().items():
formatted_lib_name = format_library_name(lib)
if ( if (
not lib.startswith((".", "/")) not lib.startswith((".", "/"))
and not lib.startswith("http") and not lib.startswith("http")
and all( and all(
not lib.startswith(lib_in_window) formatted_lib_name != lib_in_window
for lib_in_window in libs_in_window for lib_in_window in libs_in_window
) )
): ):

5
reflex/model.py
View File

@ -22,7 +22,7 @@ from reflex import constants
from reflex.base import Base from reflex.base import Base
from reflex.config import get_config from reflex.config import get_config
from reflex.utils import console from reflex.utils import console
from reflex.utils.compat import sqlmodel from reflex.utils.compat import sqlmodel, sqlmodel_field_has_primary_key
def get_engine(url: str | None = None) -> sqlalchemy.engine.Engine: def get_engine(url: str | None = None) -> sqlalchemy.engine.Engine:
@ -166,8 +166,7 @@ class Model(Base, sqlmodel.SQLModel): # pyright: ignore [reportGeneralTypeIssue
non_default_primary_key_fields = [ non_default_primary_key_fields = [
field_name field_name
for field_name, field in cls.__fields__.items() for field_name, field in cls.__fields__.items()
if field_name != "id" if field_name != "id" and sqlmodel_field_has_primary_key(field)
and getattr(field.field_info, "primary_key", None) is True
] ]
if non_default_primary_key_fields: if non_default_primary_key_fields:
cls.__fields__.pop("id", None) cls.__fields__.pop("id", None)