Skip to content

Conversation

Weves
Copy link
Contributor

@Weves Weves commented May 9, 2025

Description

Fixes https://linear.app/danswer/issue/DAN-1955/remove-any-references-to-ee-code-from-the-mit-version-of-onyx

How Has This Been Tested?

Tested:

  • permission syncing (both doc sync, group sync, and UI)
  • celery tasks still run
  • Query history
  • Slack bot

Backporting (check the box to trigger backport action)

Note: You have to check that the action passes, otherwise resolve the conflicts manually and tag the patches.

  • This PR should be backported (make sure to check that the backport attempt succeeds)
  • [Optional] Override Linear Check

@Weves Weves requested a review from a team as a code owner May 9, 2025 01:13
Copy link

vercel bot commented May 9, 2025

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Comments Updated (UTC)
internal-search ✅ Ready (Inspect) Visit Preview 💬 Add feedback May 11, 2025 9:13pm

Copy link
Contributor

@greptile-apps greptile-apps bot left a comment

Choose a reason for hiding this comment

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

PR Summary

This PR moves several enterprise edition (EE) features and configurations from the MIT version to the EE version of Onyx, focusing on cleaning up code organization and dependencies.

Key changes:

  • Relocated OAuth client configurations (Slack, Confluence, Google Drive) from EE to MIT version's app_configs.py
  • Moved external group syncing and cloud task management to EE-specific directories
  • Transferred query history export tasks from MIT to EE version
  • Relocated standard answer models from EE to MIT version while maintaining functionality
  • Implemented dynamic feature loading for EE-specific functionality using fetch_ee_implementation_or_noop

The changes appear well-structured but there are a few concerns:

  • Some files still contain EE imports that need to be addressed (e.g., ee.onyx.server.oauth.api_router)
  • Moving get_all_query_history_export_tasks to EE while trying to remove EE references seems contradictory
  • The datetime usage in cleanup tasks doesn't account for timezone awareness

29 file(s) reviewed, 10 comment(s)
Edit PR Review Bot Settings | Greptile

@Weves Weves enabled auto-merge May 11, 2025 21:16
@Weves Weves added this pull request to the merge queue May 11, 2025
Merged via the queue into main with commit 913f7cc May 11, 2025
11 checks passed
@Weves Weves deleted the fix/remove-ee-from-mit branch May 11, 2025 23:06
ferdinandl007 pushed a commit to ferdinandl007/onyx that referenced this pull request May 19, 2025
* Remove some ee imports

* more

* Remove all ee imports

* Fix

* Autodiscover

* fix

* Fix typing

* More celery task stuff

* Fix import
ZhipengHe pushed a commit to ZhipengHe/onyx that referenced this pull request Jun 6, 2025
* Remove some ee imports

* more

* Remove all ee imports

* Fix

* Autodiscover

* fix

* Fix typing

* More celery task stuff

* Fix import
AnkitTukatek pushed a commit to TukaTek/onyx that referenced this pull request Sep 23, 2025
* Remove some ee imports

* more

* Remove all ee imports

* Fix

* Autodiscover

* fix

* Fix typing

* More celery task stuff

* Fix import
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants