reflex 0.7.2a2__py3-none-any.whl → 0.7.3__py3-none-any.whl

reflex/vars/number.py

@@ -23,6 +23,7 @@ from reflex.utils.exceptions import (
     VarValueError,
 )
 from reflex.utils.imports import ImportDict, ImportVar
+from reflex.utils.types import safe_issubclass
 
 from .base import (
     CustomVarOperationReturn,
@@ -524,7 +525,7 @@ class NumberVar(Var[NUMBER_T], python_types=(int, float)):
         Returns:
             bool: True if the number is a float.
         """
-        return issubclass(self._var_type, float)
+        return safe_issubclass(self._var_type, float)
 
     def _is_strict_int(self) -> bool:
         """Check if the number is an int.
@@ -532,7 +533,7 @@ class NumberVar(Var[NUMBER_T], python_types=(int, float)):
         Returns:
             bool: True if the number is an int.
         """
-        return issubclass(self._var_type, int)
+        return safe_issubclass(self._var_type, int)
 
     def __format__(self, format_spec: str) -> str:
         """Format the number.
@@ -546,6 +547,20 @@ class NumberVar(Var[NUMBER_T], python_types=(int, float)):
         Raises:
             VarValueError: If the format specifier is not supported.
         """
+        from .sequence import (
+            get_decimal_string_operation,
+            get_decimal_string_separator_operation,
+        )
+
+        separator = ""
+
+        if format_spec and format_spec[:1] == ",":
+            separator = ","
+            format_spec = format_spec[1:]
+        elif format_spec and format_spec[:1] == "_":
+            separator = "_"
+            format_spec = format_spec[1:]
+
         if (
             format_spec
             and format_spec[-1] == "f"
@@ -553,14 +568,17 @@ class NumberVar(Var[NUMBER_T], python_types=(int, float)):
             and format_spec[1:-1].isdigit()
         ):
             how_many_decimals = int(format_spec[1:-1])
+            return f"{get_decimal_string_operation(self, Var.create(how_many_decimals), Var.create(separator))}"
+
+        if not format_spec and separator:
             return (
-                f"{get_decimal_string_operation(self, Var.create(how_many_decimals))}"
+                f"{get_decimal_string_separator_operation(self, Var.create(separator))}"
             )
 
         if format_spec:
             raise VarValueError(
                 (
-                    "Unknown format code '{}' for object of type 'NumberVar'. It is only supported to use '.f' for float numbers."
+                    "Unknown format code '{}' for object of type 'NumberVar'. It is only supported to use ',', '_', and '.f' for float numbers."
                     "If possible, use computed variables instead: https://reflex.dev/docs/vars/computed-vars/"
                 ).format(format_spec)
             )
@@ -568,23 +586,6 @@ class NumberVar(Var[NUMBER_T], python_types=(int, float)):
         return super().__format__(format_spec)
 
 
-@var_operation
-def get_decimal_string_operation(value: NumberVar, decimals: NumberVar):
-    """Get the decimal string of the number.
-
-    Args:
-        value: The number.
-        decimals: The number of decimals.
-
-    Returns:
-        The decimal string of the number.
-    """
-    return var_operation_return(
-        js_expression=f"({value}.toFixed({decimals}))",
-        var_type=str,
-    )
-
-
 def binary_number_operation(
     func: Callable[[NumberVar, NumberVar], str],
 ) -> Callable[[number_types, number_types], NumberVar]:

reflex/vars/object.py

@@ -202,6 +202,12 @@ class ObjectVar(Var[OBJECT_TYPE], python_types=Mapping):
         key: Var | Any,
     ) -> ObjectVar[Mapping[OTHER_KEY_TYPE, VALUE_TYPE]]: ...
 
+    @overload
+    def __getitem__(
+        self: ObjectVar[Mapping[Any, VALUE_TYPE]],
+        key: Var | Any,
+    ) -> Var[VALUE_TYPE]: ...
+
     def __getitem__(self, key: Var | Any) -> Var:
         """Get an item from the object.
 
@@ -221,6 +227,29 @@ class ObjectVar(Var[OBJECT_TYPE], python_types=Mapping):
             return self.__getattr__(key)
         return ObjectItemOperation.create(self, key).guess_type()
 
+    def get(self, key: Var | Any, default: Var | Any | None = None) -> Var:
+        """Get an item from the object.
+
+        Args:
+            key: The key to get from the object.
+            default: The default value if the key is not found.
+
+        Returns:
+            The item from the object.
+        """
+        from reflex.components.core.cond import cond
+
+        if default is None:
+            default = Var.create(None)
+
+        value = self.__getitem__(key)  # pyright: ignore[reportUnknownVariableType,reportAttributeAccessIssue,reportUnknownMemberType]
+
+        return cond(  # pyright: ignore[reportUnknownVariableType]
+            value,
+            value,
+            default,
+        )
+
     # NoReturn is used here to catch when key value is Any
     @overload
     def __getattr__(  # pyright: ignore [reportOverlappingOverload]

reflex/vars/sequence.py

@@ -1202,6 +1202,43 @@ def string_replace_operation(
     )
 
 
+@var_operation
+def get_decimal_string_separator_operation(value: NumberVar, separator: StringVar):
+    """Get the decimal string separator.
+
+    Args:
+        value: The number.
+        separator: The separator.
+
+    Returns:
+        The decimal string separator.
+    """
+    return var_operation_return(
+        js_expression=f"({value}.toLocaleString('en-US').replaceAll(',', {separator}))",
+        var_type=str,
+    )
+
+
+@var_operation
+def get_decimal_string_operation(
+    value: NumberVar, decimals: NumberVar, separator: StringVar
+):
+    """Get the decimal string of the number.
+
+    Args:
+        value: The number.
+        decimals: The number of decimals.
+        separator: The separator.
+
+    Returns:
+        The decimal string of the number.
+    """
+    return var_operation_return(
+        js_expression=f"({value}.toLocaleString('en-US', ((decimals) => ({{minimumFractionDigits: decimals, maximumFractionDigits: decimals}}))({decimals})).replaceAll(',', {separator}))",
+        var_type=str,
+    )
+
+
 # Compile regex for finding reflex var tags.
 _decode_var_pattern_re = (
     rf"{constants.REFLEX_VAR_OPENING_TAG}(.*?){constants.REFLEX_VAR_CLOSING_TAG}"

{reflex-0.7.2a2.dist-info → reflex-0.7.3.dist-info}/METADATA

@@ -1,12 +1,15 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: reflex
-Version: 0.7.2a2
+Version: 0.7.3
 Summary: Web apps in pure Python.
+Project-URL: homepage, https://reflex.dev
+Project-URL: repository, https://github.com/reflex-dev/reflex
+Project-URL: documentation, https://reflex.dev/docs/getting-started/introduction
+Author-email: Nikhil Rao <nikhil@reflex.dev>, Alek Petuskey <alek@reflex.dev>, Masen Furer <masen@reflex.dev>, Elijah Ahianyo <elijahahianyo@gmail.com>, Thomas Brandeho <thomas@reflex.dev>, Khaleel Al-Adhami <khaleel@reflex.dev>
+Maintainer-email: Masen Furer <masen@reflex.dev>, Thomas Brandeho <thomas@reflex.dev>, Khaleel Al-Adhami <khaleel@reflex.dev>
 License: Apache-2.0
-Keywords: web,framework
-Author: Nikhil Rao
-Author-email: nikhil@reflex.dev
-Requires-Python: >=3.10,<4.0
+License-File: LICENSE
+Keywords: framework,web
 Classifier: Development Status :: 4 - Beta
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Programming Language :: Python :: 3
@@ -14,41 +17,38 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
-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: distro (>=1.8.0,<2.0) ; sys_platform == "linux"
-Requires-Dist: fastapi (>=0.96.0,!=0.111.0,!=0.111.1)
-Requires-Dist: gunicorn (>=20.1.0,<24.0)
-Requires-Dist: httpx (>=0.25.1,<1.0)
-Requires-Dist: jinja2 (>=3.1.2,<4.0)
-Requires-Dist: lazy_loader (>=0.4)
-Requires-Dist: packaging (>=23.1,<25.0)
-Requires-Dist: platformdirs (>=3.10.0,<5.0)
-Requires-Dist: psutil (>=5.9.4,<7.0)
-Requires-Dist: pydantic (>=1.10.21,<3.0)
-Requires-Dist: python-engineio (!=4.6.0)
-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.29)
-Requires-Dist: rich (>=13.0.0,<14.0)
-Requires-Dist: setuptools (>=75.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,<7.0)
-Requires-Dist: typer (>=0.15.1,<1.0)
-Requires-Dist: typing_extensions (>=4.6.0)
-Requires-Dist: uvicorn (>=0.20.0)
-Requires-Dist: wheel (>=0.42.0,<1.0)
-Requires-Dist: wrapt (>=1.17.0,<2.0)
-Project-URL: Documentation, https://reflex.dev/docs/getting-started/introduction
-Project-URL: Homepage, https://reflex.dev
-Project-URL: Repository, https://github.com/reflex-dev/reflex
+Requires-Python: <4.0,>=3.10
+Requires-Dist: alembic<2.0,>=1.11.1
+Requires-Dist: build<2.0,>=1.0.3
+Requires-Dist: charset-normalizer<4.0,>=3.3.2
+Requires-Dist: distro<2.0,>=1.8.0; platform_system == 'Linux'
+Requires-Dist: fastapi!=0.111.0,!=0.111.1,>=0.96.0
+Requires-Dist: gunicorn<24.0,>=20.1.0
+Requires-Dist: httpx<1.0,>=0.25.1
+Requires-Dist: jinja2<4.0,>=3.1.2
+Requires-Dist: lazy-loader>=0.4
+Requires-Dist: packaging<25.0,>=23.1
+Requires-Dist: platformdirs<5.0,>=3.10.0
+Requires-Dist: psutil<8.0,>=5.9.4
+Requires-Dist: pydantic<3.0,>=1.10.21
+Requires-Dist: python-engineio!=4.6.0
+Requires-Dist: python-multipart<0.1,>=0.0.5
+Requires-Dist: python-socketio<6.0,>=5.7.0
+Requires-Dist: redis<6.0,>=4.3.5
+Requires-Dist: reflex-hosting-cli>=0.1.29
+Requires-Dist: rich<14.0,>=13.0.0
+Requires-Dist: setuptools>=75.0
+Requires-Dist: sqlmodel<0.1,>=0.0.14
+Requires-Dist: starlette-admin<1.0,>=0.11.0
+Requires-Dist: tomlkit<1.0,>=0.12.4
+Requires-Dist: twine<7.0,>=4.0.0
+Requires-Dist: typer<1.0,>=0.15.1
+Requires-Dist: typing-extensions>=4.6.0
+Requires-Dist: uvicorn>=0.20.0
+Requires-Dist: wheel<1.0,>=0.42.0
+Requires-Dist: wrapt<2.0,>=1.17.0
 Description-Content-Type: text/markdown
 
-
 <div align="center">
 <img src="https://raw.githubusercontent.com/reflex-dev/reflex/main/docs/images/reflex_dark.svg#gh-light-mode-only" alt="Reflex Logo" width="300px">
 <img src="https://raw.githubusercontent.com/reflex-dev/reflex/main/docs/images/reflex_light.svg#gh-dark-mode-only" alt="Reflex Logo" width="300px">
@@ -56,10 +56,12 @@ Description-Content-Type: text/markdown
 <hr>
 
 ### **✨ Performant, customizable web apps in pure Python. Deploy in seconds. ✨**
+
 [![PyPI version](https://badge.fury.io/py/reflex.svg)](https://badge.fury.io/py/reflex)
 ![versions](https://img.shields.io/pypi/pyversions/reflex.svg)
 [![Documentation](https://img.shields.io/badge/Documentation%20-Introduction%20-%20%23007ec6)](https://reflex.dev/docs/getting-started/introduction)
 [![Discord](https://img.shields.io/discord/1029853095527727165?color=%237289da&label=Discord)](https://discord.gg/T5WSbC2YtQ)
+
 </div>
 
 ---
@@ -73,9 +75,10 @@ Description-Content-Type: text/markdown
 Reflex is a library to build full-stack web apps in pure Python.
 
 Key features:
-* **Pure Python** - Write your app's frontend and backend all in Python, no need to learn Javascript.
-* **Full Flexibility** - Reflex is easy to get started with, but can also scale to complex apps.
-* **Deploy Instantly** - After building, deploy your app with a [single command](https://reflex.dev/docs/hosting/deploy-quick-start/) or host it on your own server.
+
+- **Pure Python** - Write your app's frontend and backend all in Python, no need to learn Javascript.
+- **Full Flexibility** - Reflex is easy to get started with, but can also scale to complex apps.
+- **Deploy Instantly** - After building, deploy your app with a [single command](https://reflex.dev/docs/hosting/deploy-quick-start/) or host it on your own server.
 
 See our [architecture page](https://reflex.dev/blog/2024-03-21-reflex-architecture/#the-reflex-architecture) to learn how Reflex works under the hood.
 
@@ -99,7 +102,7 @@ cd my_app_name
 reflex init
 ```
 
-This command initializes a template app in your new directory. 
+This command initializes a template app in your new directory.
 
 You can run this app in development mode:
 
@@ -111,7 +114,6 @@ You should see your app running at http://localhost:3000.
 
 Now you can modify the source code in `my_app_name/my_app_name.py`. Reflex has fast refreshes so you can see your changes instantly when you save your code.
 
-
 ## 🫧 Example App
 
 Let's go over an example: creating an image generation UI around [DALL·E](https://platform.openai.com/docs/guides/images/image-generation?context=node). For simplicity, we just call the [OpenAI API](https://platform.openai.com/docs/api-reference/authentication), but you could replace this with an ML model run locally.
@@ -126,8 +128,6 @@ Let's go over an example: creating an image generation UI around [DALL·E](https
 
 Here is the complete code to create this. This is all done in one Python file!
 
-
-  
 ```python
 import reflex as rx
 import openai
@@ -167,7 +167,7 @@ def index():
                 width="25em",
             ),
             rx.button(
-                "Generate Image", 
+                "Generate Image",
                 on_click=State.get_image,
                 width="25em",
                 loading=State.processing
@@ -187,17 +187,12 @@ app = rx.App()
 app.add_page(index, title="Reflex:DALL-E")
 ```
 
-
-
-
-
 ## Let's break this down.
 
 <div align="center">
 <img src="docs/images/dalle_colored_code_example.png" alt="Explaining the differences between backend and frontend parts of the DALL-E app." width="900" />
 </div>
 
-
 ### **Reflex UI**
 
 Let's start with the UI.
@@ -275,11 +270,10 @@ 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; 🖼️ [Templates](https://reflex.dev/templates/) &nbsp; |  &nbsp; 🛸 [Deployment](https://reflex.dev/docs/hosting/deploy-quick-start)  &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; 🖼️ [Templates](https://reflex.dev/templates/) &nbsp; | &nbsp; 🛸 [Deployment](https://reflex.dev/docs/hosting/deploy-quick-start) &nbsp;
 
 </div>
 
-
 ## ✅ Status
 
 Reflex launched in December 2022 with the name Pynecone.
@@ -292,14 +286,14 @@ Reflex has new releases and features coming every other week! Make sure to :star
 
 We welcome contributions of any size! Below are some good ways to get started in the Reflex community.
 
--   **Join Our Discord**: Our [Discord](https://discord.gg/T5WSbC2YtQ) is the best place to get help on your Reflex project and to discuss how you can contribute.
--   **GitHub Discussions**: A great way to talk about features you want added or things that are confusing/need clarification.
--   **GitHub Issues**: [Issues](https://github.com/reflex-dev/reflex/issues) are an excellent way to report bugs. Additionally, you can try and solve an existing issue and submit a PR.
+- **Join Our Discord**: Our [Discord](https://discord.gg/T5WSbC2YtQ) is the best place to get help on your Reflex project and to discuss how you can contribute.
+- **GitHub Discussions**: A great way to talk about features you want added or things that are confusing/need clarification.
+- **GitHub Issues**: [Issues](https://github.com/reflex-dev/reflex/issues) are an excellent way to report bugs. Additionally, you can try and solve an existing issue and submit a PR.
 
 We are actively looking for contributors, no matter your skill level or experience. To contribute check out [CONTRIBUTING.md](https://github.com/reflex-dev/reflex/blob/main/CONTRIBUTING.md)
 
-
 ## All Thanks To Our Contributors:
+
 <a href="https://github.com/reflex-dev/reflex/graphs/contributors">
   <img src="https://contrib.rocks/image?repo=reflex-dev/reflex" />
 </a>
@@ -307,4 +301,3 @@ We are actively looking for contributors, no matter your skill level or experien
 ## License
 
 Reflex is open-source and licensed under the [Apache License 2.0](LICENSE).
-