diff options
| author | Ben Sima <ben@bensima.com> | 2025-12-02 15:51:42 -0500 |
|---|---|---|
| committer | Ben Sima <ben@bensima.com> | 2025-12-02 15:51:42 -0500 |
| commit | 9e65e80276aeb33c0f917d005e621a18158fffee (patch) | |
| tree | 223c3a0167141ebde5c73cc8f0e3d1e20c14bbc2 | |
| parent | 4c1ccb6d43f90db7db08b56239ca229404f0acfd (diff) | |
Fix Admin.py imports for bild local dep detection
- Change 'from Biz.X import Y' to 'import Biz.X as X' style
- bild only recognizes 'import X as Y' for local dep detection
- Add setuptools to Python deps (required by newer nixpkgs)
Amp-Thread-ID: https://ampcode.com/threads/T-fe8328a9-7709-4544-9d31-b099f04aa120
Co-authored-by: Amp <amp@ampcode.com>
| -rw-r--r-- | Biz/PodcastItLater/Admin.py | 73 | ||||
| -rw-r--r-- | Biz/PodcastItLater/Admin/__init__.py | 1 | ||||
| -rw-r--r-- | Omni/Bild/Deps/Python.nix | 1 |
3 files changed, 35 insertions, 40 deletions
diff --git a/Biz/PodcastItLater/Admin.py b/Biz/PodcastItLater/Admin.py index 3fc6f61..29332df 100644 --- a/Biz/PodcastItLater/Admin.py +++ b/Biz/PodcastItLater/Admin.py @@ -12,48 +12,44 @@ Admin pages and functionality for managing users and queue items. # : dep pytest-asyncio # : dep pytest-mock -# i need to import these unused because bild cannot get local transitive python -# dependencies yet -import Omni.App as App # noqa: F401 -import Omni.Log as Log # noqa: F401 -import Omni.Test as Test # noqa: F401 +import Biz.PodcastItLater.Admin.Handlers as Handlers +import Biz.PodcastItLater.Admin.Views as Views import sys -from Biz.PodcastItLater.Admin.Handlers import admin_metrics -from Biz.PodcastItLater.Admin.Handlers import admin_queue_status -from Biz.PodcastItLater.Admin.Handlers import admin_users -from Biz.PodcastItLater.Admin.Handlers import delete_queue_item -from Biz.PodcastItLater.Admin.Handlers import retry_queue_item -from Biz.PodcastItLater.Admin.Handlers import toggle_episode_public -from Biz.PodcastItLater.Admin.Handlers import update_user_status -# Import all views and handlers from the new modules -from Biz.PodcastItLater.Admin.Views import ActionButtons -from Biz.PodcastItLater.Admin.Views import ActionButtonsAttrs -from Biz.PodcastItLater.Admin.Views import AdminUsers -from Biz.PodcastItLater.Admin.Views import AdminUsersAttrs -from Biz.PodcastItLater.Admin.Views import AdminView -from Biz.PodcastItLater.Admin.Views import AdminViewAttrs -from Biz.PodcastItLater.Admin.Views import EpisodeTableRow -from Biz.PodcastItLater.Admin.Views import EpisodeTableRowAttrs -from Biz.PodcastItLater.Admin.Views import MetricCard -from Biz.PodcastItLater.Admin.Views import MetricCardAttrs -from Biz.PodcastItLater.Admin.Views import MetricsAttrs -from Biz.PodcastItLater.Admin.Views import MetricsDashboard -from Biz.PodcastItLater.Admin.Views import QueueTableRow -from Biz.PodcastItLater.Admin.Views import QueueTableRowAttrs -from Biz.PodcastItLater.Admin.Views import StatusBadge -from Biz.PodcastItLater.Admin.Views import StatusBadgeAttrs -from Biz.PodcastItLater.Admin.Views import TopEpisodesTable -from Biz.PodcastItLater.Admin.Views import TopEpisodesTableAttrs -from Biz.PodcastItLater.Admin.Views import TruncatedText -from Biz.PodcastItLater.Admin.Views import TruncatedTextAttrs -from Biz.PodcastItLater.Admin.Views import UserTableRow -from Biz.PodcastItLater.Admin.Views import UserTableRowAttrs -from Biz.PodcastItLater.Admin.Views import create_table_header +# Re-export all symbols for backward compatibility +ActionButtons = Views.ActionButtons +ActionButtonsAttrs = Views.ActionButtonsAttrs +AdminUsers = Views.AdminUsers +AdminUsersAttrs = Views.AdminUsersAttrs +AdminView = Views.AdminView +AdminViewAttrs = Views.AdminViewAttrs +EpisodeTableRow = Views.EpisodeTableRow +EpisodeTableRowAttrs = Views.EpisodeTableRowAttrs +MetricCard = Views.MetricCard +MetricCardAttrs = Views.MetricCardAttrs +MetricsAttrs = Views.MetricsAttrs +MetricsDashboard = Views.MetricsDashboard +QueueTableRow = Views.QueueTableRow +QueueTableRowAttrs = Views.QueueTableRowAttrs +StatusBadge = Views.StatusBadge +StatusBadgeAttrs = Views.StatusBadgeAttrs +TopEpisodesTable = Views.TopEpisodesTable +TopEpisodesTableAttrs = Views.TopEpisodesTableAttrs +TruncatedText = Views.TruncatedText +TruncatedTextAttrs = Views.TruncatedTextAttrs +UserTableRow = Views.UserTableRow +UserTableRowAttrs = Views.UserTableRowAttrs +create_table_header = Views.create_table_header + +admin_metrics = Handlers.admin_metrics +admin_queue_status = Handlers.admin_queue_status +admin_users = Handlers.admin_users +delete_queue_item = Handlers.delete_queue_item +retry_queue_item = Handlers.retry_queue_item +toggle_episode_public = Handlers.toggle_episode_public +update_user_status = Handlers.update_user_status -# Export all symbols for backward compatibility __all__ = [ - # Views "ActionButtons", "ActionButtonsAttrs", "AdminUsers", @@ -76,7 +72,6 @@ __all__ = [ "TruncatedTextAttrs", "UserTableRow", "UserTableRowAttrs", - # Handlers "admin_metrics", "admin_queue_status", "admin_users", diff --git a/Biz/PodcastItLater/Admin/__init__.py b/Biz/PodcastItLater/Admin/__init__.py deleted file mode 100644 index 04e3e32..0000000 --- a/Biz/PodcastItLater/Admin/__init__.py +++ /dev/null @@ -1 +0,0 @@ -"""PodcastItLater Admin package.""" diff --git a/Omni/Bild/Deps/Python.nix b/Omni/Bild/Deps/Python.nix index 2b8531b..d21e129 100644 --- a/Omni/Bild/Deps/Python.nix +++ b/Omni/Bild/Deps/Python.nix @@ -23,6 +23,7 @@ "pytest-asyncio" "pytest-mock" "requests" + "setuptools" "slixmpp" "sqids" "starlette" |
