reflex 0.4.5a1__py3-none-any.whl → 0.4.6__py3-none-any.whl

reflex/utils/telemetry.py

@@ -11,6 +11,7 @@ import psutil
 
 from reflex import constants
 from reflex.utils import console
+from reflex.utils.exec import should_skip_compile
 from reflex.utils.prerequisites import ensure_reflex_installation_id, get_project_hash
 
 POSTHOG_API_URL: str = "https://app.posthog.com/capture/"
@@ -64,6 +65,22 @@ def get_memory() -> int:
         return 0
 
 
+def _raise_on_missing_project_hash() -> bool:
+    """Check if an error should be raised when project hash is missing.
+
+    When running reflex with --backend-only, or doing database migration
+    operations, there is no requirement for a .web directory, so the reflex.json
+    file may not exist, and this should not be considered an error.
+
+    Returns:
+        False when compilation should be skipped (i.e. no .web directory is required).
+        Otherwise return True.
+    """
+    if should_skip_compile():
+        return False
+    return True
+
+
 def _prepare_event(event: str) -> dict:
     """Prepare the event to be sent to the PostHog server.
 
@@ -74,7 +91,7 @@ def _prepare_event(event: str) -> dict:
         The event data.
     """
     installation_id = ensure_reflex_installation_id()
-    project_hash = get_project_hash(raise_on_fail=True)
+    project_hash = get_project_hash(raise_on_fail=_raise_on_missing_project_hash())
 
     if installation_id is None or project_hash is None:
         console.debug(

reflex/utils/types.py

@@ -7,6 +7,7 @@ import inspect
 import types
 from functools import wraps
 from typing import (
+    TYPE_CHECKING,
     Any,
     Callable,
     Iterable,
@@ -22,7 +23,18 @@ from typing import (
 )
 
 import sqlalchemy
-from pydantic.fields import ModelField
+
+try:
+    # TODO The type checking guard can be removed once
+    # reflex-hosting-cli tools are compatible with pydantic v2
+
+    if not TYPE_CHECKING:
+        import pydantic.v1.fields as ModelField
+    else:
+        raise ModuleNotFoundError
+except ModuleNotFoundError:
+    from pydantic.fields import ModelField
+
 from sqlalchemy.ext.associationproxy import AssociationProxyInstance
 from sqlalchemy.ext.hybrid import hybrid_property
 from sqlalchemy.orm import DeclarativeBase, Mapped, QueryableAttribute, Relationship
@@ -202,7 +214,7 @@ def get_attribute_access_type(cls: GenericType, name: str) -> GenericType | None
                     attr.remote_attr.key,  # type: ignore[attr-defined]
                 )
             ]
-    elif isinstance(cls, type) and issubclass(cls, Model):
+    elif isinstance(cls, type) and not is_generic_alias(cls) and issubclass(cls, Model):
         # Check in the annotations directly (for sqlmodel.Relationship)
         hints = get_type_hints(cls)
         if name in hints:

reflex/vars.py

@@ -677,6 +677,33 @@ class Var:
             _var_is_string=False,
         )
 
+    def __getattribute__(self, name: str) -> Any:
+        """Get a var attribute.
+
+        Args:
+            name: The name of the attribute.
+
+        Returns:
+            The var attribute.
+
+        Raises:
+            AttributeError: If the attribute cannot be found, or if __getattr__ fallback should be used.
+        """
+        try:
+            var_attribute = super().__getattribute__(name)
+            if not name.startswith("_"):
+                # Check if the attribute should be accessed through the Var instead of
+                # accessing one of the Var operations
+                type_ = types.get_attribute_access_type(
+                    super().__getattribute__("_var_type"), name
+                )
+                if type_ is not None:
+                    raise AttributeError(f"{name} is being accessed through the Var.")
+            # Return the attribute as-is.
+            return var_attribute
+        except AttributeError:
+            raise  # fall back to __getattr__ anyway
+
     def __getattr__(self, name: str) -> Var:
         """Get a var attribute.
 
@@ -1861,6 +1888,8 @@ class ComputedVar(Var, property):
         # handle caching
         if not hasattr(instance, self._cache_attr):
             setattr(instance, self._cache_attr, super().__get__(instance, owner))
+            # Ensure the computed var gets serialized to redis.
+            instance._was_touched = True
         return getattr(instance, self._cache_attr)
 
     def _deps(
@@ -1889,8 +1918,9 @@ class ComputedVar(Var, property):
         """
         d = set()
         if obj is None:
-            if self.fget is not None:
-                obj = cast(FunctionType, self.fget)
+            fget = property.__getattribute__(self, "fget")
+            if fget is not None:
+                obj = cast(FunctionType, fget)
             else:
                 return set()
         with contextlib.suppress(AttributeError):
@@ -1974,7 +2004,7 @@ class ComputedVar(Var, property):
         Returns:
             The type of the var.
         """
-        hints = get_type_hints(self.fget)
+        hints = get_type_hints(property.__getattribute__(self, "fget"))
         if "return" in hints:
             return hints["return"]
         return Any

{reflex-0.4.5a1.dist-info → reflex-0.4.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: reflex
-Version: 0.4.5a1
+Version: 0.4.6
 Summary: Web apps in pure Python.
 Home-page: https://reflex.dev
 License: Apache-2.0
@@ -15,36 +15,38 @@ Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
-Requires-Dist: alembic (>=1.11.1,<2.0.0)
-Requires-Dist: build (>=1.0.3,<2.0.0)
-Requires-Dist: charset-normalizer (>=3.3.2,<4.0.0)
-Requires-Dist: cloudpickle (>=2.2.1,<3.0.0)
-Requires-Dist: distro (>=1.8.0,<2.0.0) ; sys_platform == "linux"
-Requires-Dist: fastapi (>=0.96.0,<0.97.0)
-Requires-Dist: gunicorn (>=20.1.0,<21.0.0)
-Requires-Dist: httpx (>=0.25.1)
-Requires-Dist: jinja2 (>=3.1.2,<4.0.0)
-Requires-Dist: packaging (>=23.1,<24.0)
-Requires-Dist: platformdirs (>=3.10.0,<4.0.0)
-Requires-Dist: psutil (>=5.9.4,<6.0.0)
-Requires-Dist: pydantic (>=1.10.2,<2.0.0)
+Requires-Dist: alembic (>=1.11.1,<2.0)
+Requires-Dist: build (>=1.0.3,<2.0)
+Requires-Dist: charset-normalizer (>=3.3.2,<4.0)
+Requires-Dist: dill (>=0.3.8,<0.4)
+Requires-Dist: distro (>=1.8.0,<2.0) ; sys_platform == "linux"
+Requires-Dist: fastapi (>=0.96.0,<1.0)
+Requires-Dist: gunicorn (>=20.1.0,<22.0)
+Requires-Dist: httpx (>=0.25.1,<1.0)
+Requires-Dist: jinja2 (>=3.1.2,<4.0)
+Requires-Dist: packaging (>=23.1,<25.0)
+Requires-Dist: platformdirs (>=3.10.0,<5.0)
+Requires-Dist: psutil (>=5.9.4,<6.0)
+Requires-Dist: pydantic (>=1.10.2,<3.0)
 Requires-Dist: python-engineio (!=4.6.0)
-Requires-Dist: python-multipart (>=0.0.5,<0.0.6)
-Requires-Dist: python-socketio (>=5.7.0,<6.0.0)
-Requires-Dist: redis (>=4.3.5,<5.0.0)
-Requires-Dist: reflex-hosting-cli (>=0.1.2)
-Requires-Dist: rich (>=13.0.0,<14.0.0)
-Requires-Dist: setuptools (>=69.1.1,<70.0.0)
-Requires-Dist: sqlmodel (>=0.0.14,<0.0.15)
-Requires-Dist: starlette-admin (>=0.9.0,<0.10.0)
-Requires-Dist: typer (>=0.4.2,<1)
+Requires-Dist: python-multipart (>=0.0.5,<0.1)
+Requires-Dist: python-socketio (>=5.7.0,<6.0)
+Requires-Dist: redis (>=4.3.5,<6.0)
+Requires-Dist: reflex-hosting-cli (>=0.1.2,<2.0)
+Requires-Dist: rich (>=13.0.0,<14.0)
+Requires-Dist: setuptools (>=69.1.1,<70.0)
+Requires-Dist: sqlmodel (>=0.0.14,<0.1)
+Requires-Dist: starlette-admin (>=0.11.0,<1.0)
+Requires-Dist: tomlkit (>=0.12.4,<1.0)
+Requires-Dist: twine (>=4.0.0,<6.0)
+Requires-Dist: typer (>=0.4.2,<1.0)
 Requires-Dist: uvicorn (>=0.20.0,<0.21.0) ; python_version < "3.12"
 Requires-Dist: uvicorn (>=0.24.0,<0.25.0) ; python_version >= "3.12"
-Requires-Dist: watchdog (>=2.3.1,<3.0.0)
-Requires-Dist: watchfiles (>=0.19.0,<0.20.0)
-Requires-Dist: wheel (>=0.42.0,<0.43.0)
-Requires-Dist: wrapt (>=1.11.0,<2.0.0) ; python_version < "3.11"
-Requires-Dist: wrapt (>=1.14.0,<2.0.0) ; python_version >= "3.11"
+Requires-Dist: watchdog (>=2.3.1,<5.0)
+Requires-Dist: watchfiles (>=0.19.0,<1.0)
+Requires-Dist: wheel (>=0.42.0,<1.0)
+Requires-Dist: wrapt (>=1.11.0,<2.0) ; python_version < "3.11"
+Requires-Dist: wrapt (>=1.14.0,<2.0) ; python_version >= "3.11"
 Project-URL: Documentation, https://reflex.dev/docs/getting-started/introduction
 Project-URL: Repository, https://github.com/reflex-dev/reflex
 Description-Content-Type: text/markdown
@@ -256,7 +258,7 @@ You can create a multi-page app by adding more pages.
 
 <div align="center">
 
-📑 [Docs](https://reflex.dev/docs/getting-started/introduction) &nbsp; |  &nbsp; 🗞️ [Blog](https://reflex.dev/blog) &nbsp; |  &nbsp; 📱 [Component Library](https://reflex.dev/docs/library) &nbsp; |  &nbsp; 🖼️ [Gallery](https://reflex.dev/docs/gallery) &nbsp; |  &nbsp; 🛸 [Deployment](https://reflex.dev/docs/hosting/deploy)  &nbsp;   
+📑 [Docs](https://reflex.dev/docs/getting-started/introduction) &nbsp; |  &nbsp; 🗞️ [Blog](https://reflex.dev/blog) &nbsp; |  &nbsp; 📱 [Component Library](https://reflex.dev/docs/library) &nbsp; |  &nbsp; 🖼️ [Gallery](https://reflex.dev/docs/gallery) &nbsp; |  &nbsp; 🛸 [Deployment](https://reflex.dev/docs/hosting/deploy-quick-start)  &nbsp;   
 
 </div>