Skip to content
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

Mixpanel grouping improvements #2610

Merged
merged 7 commits into from
Apr 15, 2024

Conversation

schustmi
Copy link
Contributor

@schustmi schustmi commented Apr 12, 2024

Describe changes

This PR contains two improvements for mixpanel groups:

  • Use server_id instead of group_id in the segment group call
  • Enable customizing the server_id when deploying a server so we can set it to the tenant ID when deploying cloud tenants

Pre-requisites

Please ensure you have done the following:

  • I have read the CONTRIBUTING.md document.
  • If my change requires a change to docs, I have updated the documentation accordingly.
  • I have added tests to cover my changes.
  • I have based my new branch on develop and the open PR is targeting develop. If your branch wasn't based on develop read Contribution guide on rebasing branch to develop.
  • If my changes require changes to the dashboard, these changes are communicated/requested.

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Other (add details above)

Copy link
Contributor

coderabbitai bot commented Apr 12, 2024

Important

Auto Review Skipped

Auto reviews are disabled on this repository.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository.

To trigger a single review, invoke the @coderabbitai review command.


Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

Share
Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai generate interesting stats about this repository and render them as a table.
    • @coderabbitai show all the console.log statements in this repository.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (invoked as PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger a review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai help to get help.

Additionally, you can add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.

CodeRabbit Configration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

@github-actions github-actions bot added internal To filter out internal PRs and issues enhancement New feature or request labels Apr 12, 2024
Copy link
Contributor

Quickstart template updates in examples/quickstart have been pushed.

Copy link

Check out this pull request on  ReviewNB

See visual diffs & provide feedback on Jupyter Notebooks.


Powered by ReviewNB

Copy link
Contributor

LLM Finetuning template updates in examples/llm_finetuning have been pushed.

IdentitySchema(
id=str(GlobalConfiguration().user_id).replace("-", "")
)
deployment_id = os.getenv(
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@stefannica I'm unsure whether this is the right place to use this environment variable. When implemented like this, the environment variable will only be respected when deploying the server for the first time. We could use it to have precedence over the DB entry by checking for the env variable existence in SQLZenStore.get_deployment_id(). What do you think?

Copy link
Contributor

@stefannica stefannica Apr 12, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I suggest not adding yet another environment variable for this, it just complicates this even more. We already have ZENML_USER_ID that can be used to override the GlobalConfiguration().user_id.

If I understand correctly, you're just trying to override the server identity as reported by the server (server_info.id) with the tenant ID when the server is deployed as a cloud tenant:

  • use the ZENML_SERVER_EXTERNAL_SERVER_ID environment variable (or call server_config().external_server_id if set and if running on server), instead of this new ENV_ZENML_DEPLOYMENT_ID env var. This takes care of newly deployed tenants.
  • for existing tenants, you can either manually update the IDs in the database to retrospectively match their tenant IDs, or you can also patch SQLZenStore.get_deployment_id() to use the same override. I prefer the former, because it keeps things nice and consistent and persists all information in the DB. Also easier to apply without upgrades.

Please note that this change is disruptive in many ways, because the deployment ID is used in quite a few places:

  • all existing API tokens are invalidated (users will have to re-login, running pipelines will fail unless they use service accounts)
  • obviously, it's like a complete change of identity, so new telemetry events will be disconnected from the old ones, unless some other means are used to group them

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree we should probably reuse the ZENML_SERVER_EXTERNAL_SERVER_ID env variable. But even if doing that, my question remains the same: Should I just use it once when the DB is first initialized and from that point on use the value stored in the Identity table of the database. Or should this env variable be checked anytime the server_info.id is checked?

Copy link
Contributor

E2E template updates in examples/e2e have been pushed.

Copy link
Contributor

NLP template updates in examples/e2e_nlp have been pushed.

src/zenml/analytics/context.py Show resolved Hide resolved
src/zenml/zen_stores/sql_zen_store.py Outdated Show resolved Hide resolved
IdentitySchema(
id=str(GlobalConfiguration().user_id).replace("-", "")
)
deployment_id = os.getenv(
Copy link
Contributor

@stefannica stefannica Apr 12, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I suggest not adding yet another environment variable for this, it just complicates this even more. We already have ZENML_USER_ID that can be used to override the GlobalConfiguration().user_id.

If I understand correctly, you're just trying to override the server identity as reported by the server (server_info.id) with the tenant ID when the server is deployed as a cloud tenant:

  • use the ZENML_SERVER_EXTERNAL_SERVER_ID environment variable (or call server_config().external_server_id if set and if running on server), instead of this new ENV_ZENML_DEPLOYMENT_ID env var. This takes care of newly deployed tenants.
  • for existing tenants, you can either manually update the IDs in the database to retrospectively match their tenant IDs, or you can also patch SQLZenStore.get_deployment_id() to use the same override. I prefer the former, because it keeps things nice and consistent and persists all information in the DB. Also easier to apply without upgrades.

Please note that this change is disruptive in many ways, because the deployment ID is used in quite a few places:

  • all existing API tokens are invalidated (users will have to re-login, running pipelines will fail unless they use service accounts)
  • obviously, it's like a complete change of identity, so new telemetry events will be disconnected from the old ones, unless some other means are used to group them

Copy link
Contributor

@stefannica stefannica left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Aside from the comment regarding extra hyphens, this looks good

Comment on lines +1380 to 1383
id_ = (
ServerConfiguration.get_server_config().external_server_id
or GlobalConfiguration().user_id
)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You missed the replace("-", "") part here. Is that intentional ? In the database, UUIDs are stored without their hyphens.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah that was intentional. The UUID is stored as a string without their hyphens, but sqlmodel/pydantic takes care of that for us (We use UUID in lots of other places). What really happened here I think is the following:

  • We convert the UUID to a string and replace the hyphens
  • We create the pydantic/SQLModel object, which converts the string to a UUID.
  • When storing in the DB, SQLModel again converts to a string and replaces the hyphens 😄

@schustmi schustmi merged commit bbc97f2 into develop Apr 15, 2024
63 checks passed
@schustmi schustmi deleted the feature/mixpanel-grouping-improvements branch April 15, 2024 12:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request internal To filter out internal PRs and issues run-slow-ci
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants