reflex 0.8.0a4__py3-none-any.whl → 0.8.0a6__py3-none-any.whl

reflex/utils/processes.py

@@ -4,17 +4,17 @@ from __future__ import annotations
 
 import collections
 import contextlib
-import importlib.metadata
 import os
 import signal
+import socket
 import subprocess
 from collections.abc import Callable, Generator, Sequence
 from concurrent import futures
+from contextlib import closing
 from pathlib import Path
 from typing import Any, Literal, overload
 
 import click
-import psutil
 from redis.exceptions import RedisError
 from rich.progress import Progress
 
@@ -52,29 +52,6 @@ def get_num_workers() -> int:
     return (os.cpu_count() or 1) * 2 + 1
 
 
-def get_process_on_port(port: int) -> psutil.Process | None:
-    """Get the process on the given port.
-
-    Args:
-        port: The port.
-
-    Returns:
-        The process on the given port.
-    """
-    for proc in psutil.process_iter(["pid", "name", "cmdline"]):
-        with contextlib.suppress(
-            psutil.NoSuchProcess, psutil.AccessDenied, psutil.ZombieProcess
-        ):
-            if importlib.metadata.version("psutil") >= "6.0.0":
-                conns = proc.net_connections(kind="inet")
-            else:
-                conns = proc.connections(kind="inet")
-            for conn in conns:
-                if conn.laddr.port == int(port):
-                    return proc
-    return None
-
-
 def is_process_on_port(port: int) -> bool:
     """Check if a process is running on the given port.
 
@@ -84,18 +61,8 @@ def is_process_on_port(port: int) -> bool:
     Returns:
         Whether a process is running on the given port.
     """
-    return get_process_on_port(port) is not None
-
-
-def kill_process_on_port(port: int):
-    """Kill the process on the given port.
-
-    Args:
-        port: The port.
-    """
-    if get_process_on_port(port) is not None:
-        with contextlib.suppress(psutil.AccessDenied):
-            get_process_on_port(port).kill()  # pyright: ignore [reportOptionalMemberAccess]
+    with closing(socket.socket(socket.AF_INET, socket.SOCK_STREAM)) as sock:
+        return sock.connect_ex(("127.0.0.1", port)) == 0
 
 
 def change_port(port: int, _type: str) -> int:
@@ -133,13 +100,13 @@ def handle_port(service_name: str, port: int, auto_increment: bool) -> int:
     Raises:
         Exit:when the port is in use.
     """
-    if (process := get_process_on_port(port)) is None:
+    console.debug(f"Checking if {service_name.capitalize()} port: {port} is in use.")
+    if not is_process_on_port(port):
+        console.debug(f"{service_name.capitalize()} port: {port} is not in use.")
         return port
     if auto_increment:
         return change_port(port, service_name)
-    console.error(
-        f"{service_name.capitalize()} port: {port} is already in use by PID: {process.pid}."
-    )
+    console.error(f"{service_name.capitalize()} port: {port} is already in use.")
     raise click.exceptions.Exit
 
 

reflex/utils/pyi_generator.py

@@ -13,7 +13,6 @@ import subprocess
 import sys
 import typing
 from collections.abc import Callable, Iterable, Sequence
-from fileinput import FileInput
 from hashlib import md5
 from inspect import getfullargspec
 from itertools import chain
@@ -67,7 +66,6 @@ OVERWRITE_TYPES = {
 }
 
 DEFAULT_TYPING_IMPORTS = {
-    "overload",
     "Any",
     "Callable",
     "Dict",
@@ -677,10 +675,7 @@ def _generate_component_create_functiondef(
                 value=ast.Constant(value=Ellipsis),
             ),
         ],
-        decorator_list=[
-            ast.Name(id="overload"),
-            *decorator_list,
-        ],
+        decorator_list=list(decorator_list),
         lineno=lineno,
         returns=ast.Constant(value=clz.__name__),
     )
@@ -896,7 +891,7 @@ class StubGenerator(ast.NodeTransformer):
             The modified ImportFrom node.
         """
         if node.module == "__future__":
-            return None  # ignore __future__ imports
+            return None  # ignore __future__ imports: https://docs.astral.sh/ruff/rules/future-annotations-in-stub/
         return self.visit_Import(node)
 
     def visit_ClassDef(self, node: ast.ClassDef) -> ast.ClassDef:
@@ -1109,9 +1104,10 @@ class PyiGenerator:
 
     def _get_init_lazy_imports(self, mod: tuple | ModuleType, new_tree: ast.AST):
         # retrieve the _SUBMODULES and _SUBMOD_ATTRS from an init file if present.
-        sub_mods = getattr(mod, "_SUBMODULES", None)
-        sub_mod_attrs = getattr(mod, "_SUBMOD_ATTRS", None)
-        pyright_ignore_imports = getattr(mod, "_PYRIGHT_IGNORE_IMPORTS", [])
+        sub_mods: set[str] | None = getattr(mod, "_SUBMODULES", None)
+        sub_mod_attrs: dict[str, list[str | tuple[str, str]]] | None = getattr(
+            mod, "_SUBMOD_ATTRS", None
+        )
 
         if not sub_mods and not sub_mod_attrs:
             return None
@@ -1119,31 +1115,34 @@ class PyiGenerator:
         sub_mod_attrs_imports = []
 
         if sub_mods:
-            sub_mods_imports = [
-                f"from . import {mod} as {mod}" for mod in sorted(sub_mods)
-            ]
+            sub_mods_imports = [f"from . import {mod}" for mod in sorted(sub_mods)]
             sub_mods_imports.append("")
 
         if sub_mod_attrs:
-            sub_mod_attrs = {
-                attr: mod for mod, attrs in sub_mod_attrs.items() for attr in attrs
+            flattened_sub_mod_attrs = {
+                imported: module
+                for module, attrs in sub_mod_attrs.items()
+                for imported in attrs
             }
             # construct the import statement and handle special cases for aliases
             sub_mod_attrs_imports = [
-                f"from .{path} import {mod if not isinstance(mod, tuple) else mod[0]} as {mod if not isinstance(mod, tuple) else mod[1]}"
+                f"from .{module} import "
                 + (
-                    "  # type: ignore"
-                    if mod in pyright_ignore_imports
-                    else "  # noqa: F401"  # ignore ruff formatting here for cases like rx.list.
-                    if isinstance(mod, tuple)
-                    else ""
+                    (
+                        (imported[0] + " as " + imported[1])
+                        if imported[0] != imported[1]
+                        else imported[0]
+                    )
+                    if isinstance(imported, tuple)
+                    else imported
                 )
-                for mod, path in sub_mod_attrs.items()
+                for imported, module in flattened_sub_mod_attrs.items()
             ]
             sub_mod_attrs_imports.append("")
 
         text = "\n" + "\n".join([*sub_mods_imports, *sub_mod_attrs_imports])
-        text += ast.unparse(new_tree) + "\n"
+        text += ast.unparse(new_tree) + "\n\n"
+        text += f"__all__ = {getattr(mod, '__all__', [])!r}\n"
         return text
 
     def _scan_file(self, module_path: Path) -> tuple[str, str] | None:
@@ -1258,10 +1257,7 @@ class PyiGenerator:
         if file_paths:
             subprocess.run(["ruff", "format", *file_paths])
             subprocess.run(["ruff", "check", "--fix", *file_paths])
-
-        # For some reason, we need to format the __init__.pyi files again after fixing...
-        init_files = [f for f in file_paths if "/__init__.pyi" in f]
-        subprocess.run(["ruff", "format", *init_files])
+            subprocess.run(["ruff", "format", *file_paths])
 
         if use_json:
             if file_paths and changed_files is None:
@@ -1327,19 +1323,6 @@ class PyiGenerator:
                         json.dumps(pyi_hashes, indent=2, sort_keys=True) + "\n"
                     )
 
-        # Post-process the generated pyi files to add hacky type: ignore comments
-        for file_path in file_paths:
-            with FileInput(file_path, inplace=True) as f:
-                for line in f:
-                    # Hack due to ast not supporting comments in the tree.
-                    if (
-                        "def create(" in line
-                        or "Var[Figure]" in line
-                        or "Var[Template]" in line
-                    ):
-                        line = line.rstrip() + "  # type: ignore\n"
-                    print(line, end="")  # noqa: T201
-
 
 if __name__ == "__main__":
     import argparse

reflex/utils/telemetry.py

@@ -13,7 +13,6 @@ from datetime import datetime, timezone
 from typing import TypedDict
 
 import httpx
-import psutil
 
 from reflex import constants
 from reflex.environment import environment
@@ -89,18 +88,6 @@ def get_reflex_enterprise_version() -> str | None:
         return None
 
 
-def get_memory() -> int:
-    """Get the total memory in MB.
-
-    Returns:
-        The total memory in MB.
-    """
-    try:
-        return psutil.virtual_memory().total >> 20
-    except ValueError:  # needed to pass ubuntu test
-        return 0
-
-
 def _raise_on_missing_project_hash() -> bool:
     """Check if an error should be raised when project hash is missing.
 
@@ -128,7 +115,6 @@ class _Properties(TypedDict):
     bun_version: str | None
     reflex_enterprise_version: str | None
     cpu_count: int
-    memory: int
     cpu_info: dict
 
 
@@ -182,7 +168,6 @@ def _get_event_defaults() -> _DefaultEvent | None:
             ),
             "reflex_enterprise_version": get_reflex_enterprise_version(),
             "cpu_count": get_cpu_count(),
-            "memory": get_memory(),
             "cpu_info": dataclasses.asdict(cpuinfo) if cpuinfo else {},
         },
     }

reflex/utils/types.py

@@ -495,7 +495,7 @@ def get_attribute_access_type(cls: GenericType, name: str) -> GenericType | None
                 return list[
                     get_attribute_access_type(
                         attr.target_class,
-                        attr.remote_attr.key,  # type: ignore[attr-defined]
+                        attr.remote_attr.key,  # pyright: ignore [reportAttributeAccessIssue]
                     )
                 ]
     elif isinstance(cls, type) and not is_generic_alias(cls) and issubclass(cls, Model):

{reflex-0.8.0a4.dist-info → reflex-0.8.0a6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: reflex
-Version: 0.8.0a4
+Version: 0.8.0a6
 Summary: Web apps in pure Python.
 Project-URL: homepage, https://reflex.dev
 Project-URL: repository, https://github.com/reflex-dev/reflex
@@ -19,14 +19,14 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Requires-Python: <4.0,>=3.10
 Requires-Dist: alembic<2.0,>=1.15.2
-Requires-Dist: click>=8
+Requires-Dist: click>=8.2
 Requires-Dist: fastapi>=0.115.0
 Requires-Dist: granian[reload]>=2.2.5
 Requires-Dist: httpx<1.0,>=0.28.0
 Requires-Dist: jinja2<4.0,>=3.1.2
 Requires-Dist: packaging<26,>=24.2
 Requires-Dist: platformdirs<5.0,>=4.3.7
-Requires-Dist: psutil<8.0,>=7.0.0
+Requires-Dist: psutil<8.0,>=7.0.0; sys_platform == 'win32'
 Requires-Dist: pydantic<3.0,>=1.10.21
 Requires-Dist: python-multipart<1.0,>=0.0.20
 Requires-Dist: python-socketio<6.0,>=5.12.0