-
Notifications
You must be signed in to change notification settings - Fork 1.7k
feat: capture pre-init Python environment in init telemetry #6534
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
FarhanAliRaza
wants to merge
4
commits into
reflex-dev:main
Choose a base branch
from
FarhanAliRaza:init-even-venv
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
c0d2971
feat: capture pre-init Python environment in init telemetry
FarhanAliRaza c040730
test: cover requirements.txt detection in init telemetry env
FarhanAliRaza adecb73
Merge remote-tracking branch 'upstream/main' into init-even-venv
FarhanAliRaza c8c41a5
feat(telemetry): extend init env snapshot with uv.lock and reflex.lock
FarhanAliRaza File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,13 +5,17 @@ | |
| import importlib.metadata | ||
| import json | ||
| import multiprocessing | ||
| import os | ||
| import platform | ||
| import sys | ||
| import warnings | ||
| from contextlib import suppress | ||
| from datetime import datetime, timezone | ||
| from pathlib import Path | ||
| from typing import Any, TypedDict, cast | ||
|
|
||
| from reflex_base import constants | ||
| from reflex_base.config import get_config | ||
| from reflex_base.environment import environment | ||
| from reflex_base.utils.decorator import once, once_unless_none | ||
| from reflex_base.utils.exceptions import ReflexError | ||
|
|
@@ -166,6 +170,38 @@ def get_cpu_count() -> int: | |
| return multiprocessing.cpu_count() | ||
|
|
||
|
|
||
| def is_in_virtualenv() -> bool: | ||
| """Whether the current Python is running inside a virtual environment. | ||
|
|
||
| Returns: | ||
| True if a virtual environment appears to be active. | ||
| """ | ||
| if sys.prefix != sys.base_prefix: | ||
| return True | ||
| return bool(os.environ.get("VIRTUAL_ENV")) | ||
|
|
||
|
|
||
| def get_init_environment() -> dict[str, bool]: | ||
| """Return Python tooling flags for the current working directory. | ||
|
|
||
| Returns: | ||
| A dict with ``in_virtualenv``, ``has_pyproject_toml``, | ||
| ``has_requirements_txt``, ``has_uv_lock`` and ``has_reflex_lock`` | ||
| boolean flags, or an empty dict when telemetry is disabled (so the | ||
| filesystem stats are skipped when their results would be discarded). | ||
| """ | ||
| if not get_config().telemetry_enabled: | ||
| return {} | ||
|
|
||
| return { | ||
| "in_virtualenv": is_in_virtualenv(), | ||
| "has_pyproject_toml": Path(constants.PyprojectToml.FILE).exists(), | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. add
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. added |
||
| "has_requirements_txt": Path(constants.RequirementsTxt.FILE).exists(), | ||
| "has_uv_lock": Path(constants.UvLock.FILE).exists(), | ||
| "has_reflex_lock": Path(constants.Bun.ROOT_LOCKFILE_DIR).is_dir(), | ||
| } | ||
|
|
||
|
|
||
| def get_reflex_enterprise_version() -> str | None: | ||
| """Get the version of reflex-enterprise if installed. | ||
|
|
||
|
|
@@ -349,8 +385,6 @@ def _send( | |
| properties: dict[str, Any] | None = None, | ||
| **kwargs, | ||
| ) -> bool: | ||
| from reflex_base.config import get_config | ||
|
|
||
| # Get the telemetry_enabled from the config if it is not specified. | ||
| if telemetry_enabled is None: | ||
| telemetry_enabled = get_config().telemetry_enabled | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
short circuit when telemetry is not enabled
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
fixed