refactor(ui): consolidate output architecture with rich library and unified output_manager imports

pyproject.toml

@@ -30,6 +30,7 @@ dependencies = [
     "requests",
     "cryptography",
     "fabric-cicd>=0.3.1",
+    "rich>=13.7.0",
 ]
 
 [project.scripts]

requirements-dev.txt

@@ -12,6 +12,7 @@ psutil==7.0.0
 requests
 cryptography
 fabric-cicd>=0.3.1
+rich>=13.7.0
 
 # Testing and Building Requirements
 tox>=4.20.0

src/fabric_cli/client/fab_api_client.py

@@ -13,7 +13,8 @@
 from requests.adapters import HTTPAdapter, Retry
 
 from fabric_cli.client.fab_api_types import ApiResponse
-from fabric_cli.core import fab_constant, fab_logger, fab_state_config
+from fabric_cli.core import fab_constant, fab_state_config
+from fabric_cli.utils import fab_output_manager as fab_logger
 from fabric_cli.core.fab_exceptions import (
     AzureAPIError,
     FabricAPIError,
@@ -23,7 +24,7 @@
 from fabric_cli.errors import ErrorMessages
 from fabric_cli.utils import fab_error_parser as utils_errors
 from fabric_cli.utils import fab_files as files_utils
-from fabric_cli.utils import fab_ui as utils_ui
+from fabric_cli.utils import fab_output_manager as utils_ui
 from fabric_cli.utils.fab_http_polling_utils import get_polling_interval
 
 GUID_PATTERN = r"([a-f0-9\-]{36})"

src/fabric_cli/client/fab_api_utils.py

@@ -10,7 +10,7 @@
 from fabric_cli.core import fab_constant as constant
 from fabric_cli.core.fab_exceptions import FabricCLIError
 from fabric_cli.errors import ErrorMessages
-from fabric_cli.utils import fab_ui as utils_ui
+from fabric_cli.utils import fab_output_manager as utils_ui
 
 
 def delete_resource(

src/fabric_cli/commands/acls/fab_acls_get.py

@@ -10,7 +10,8 @@
 from fabric_cli.client import fab_api_item as api_items
 from fabric_cli.client import fab_api_onelake as api_onelake
 from fabric_cli.client import fab_api_workspace as api_workspaces
-from fabric_cli.core import fab_constant, fab_logger
+from fabric_cli.core import fab_constant
+from fabric_cli.utils import fab_output_manager as fab_logger
 from fabric_cli.core.fab_exceptions import FabricAPIError, FabricCLIError
 from fabric_cli.core.fab_types import ItemType, VirtualWorkspaceItemType
 from fabric_cli.core.hiearchy.fab_hiearchy import (
@@ -23,7 +24,7 @@
 from fabric_cli.errors import ErrorMessages
 from fabric_cli.utils import fab_jmespath as utils_jmespath
 from fabric_cli.utils import fab_storage as utils_storage
-from fabric_cli.utils import fab_ui
+from fabric_cli.utils import fab_output_manager as fab_ui
 from fabric_cli.utils import fab_util as utils
 
 

src/fabric_cli/commands/acls/fab_acls_ls.py

@@ -9,7 +9,8 @@
 from fabric_cli.client import fab_api_item as api_items
 from fabric_cli.client import fab_api_onelake as api_onelake
 from fabric_cli.client import fab_api_workspace as api_workspaces
-from fabric_cli.core import fab_constant, fab_logger
+from fabric_cli.core import fab_constant
+from fabric_cli.utils import fab_output_manager as fab_logger
 from fabric_cli.core.fab_exceptions import FabricAPIError, FabricCLIError
 from fabric_cli.core.fab_types import ItemType, VirtualWorkspaceItemType
 from fabric_cli.core.hiearchy.fab_hiearchy import (
@@ -21,7 +22,7 @@
 )
 from fabric_cli.errors import ErrorMessages
 from fabric_cli.utils import fab_cmd_ls_utils as utils_ls
-from fabric_cli.utils import fab_ui
+from fabric_cli.utils import fab_output_manager as fab_ui
 
 
 def exec_command(args: Namespace, context: FabricElement) -> None:

src/fabric_cli/commands/acls/fab_acls_rm.py

@@ -9,12 +9,12 @@
 from fabric_cli.client import fab_api_gateway as api_gateway
 from fabric_cli.client import fab_api_workspace as api_workspaces
 from fabric_cli.core import fab_constant as constant
-from fabric_cli.core import fab_logger
+from fabric_cli.utils import fab_output_manager as fab_logger
 from fabric_cli.core.fab_exceptions import FabricCLIError
 from fabric_cli.core.fab_types import VirtualWorkspaceItemType
 from fabric_cli.core.hiearchy.fab_hiearchy import FabricElement, Workspace
 from fabric_cli.core.hiearchy.fab_virtual_workspace_item import VirtualWorkspaceItem
-from fabric_cli.utils import fab_ui as utils_ui
+from fabric_cli.utils import fab_output_manager as utils_ui
 
 
 def exec_command(args: Namespace, context: FabricElement) -> None:

src/fabric_cli/commands/acls/fab_acls_set.py

@@ -8,12 +8,13 @@
 from fabric_cli.client import fab_api_connection as api_connection
 from fabric_cli.client import fab_api_gateway as api_gateway
 from fabric_cli.client import fab_api_workspace as api_workspaces
-from fabric_cli.core import fab_constant, fab_logger
+from fabric_cli.core import fab_constant
+from fabric_cli.utils import fab_output_manager as fab_logger
 from fabric_cli.core.fab_exceptions import FabricCLIError
 from fabric_cli.core.fab_types import VirtualWorkspaceItemType
 from fabric_cli.core.hiearchy.fab_hiearchy import FabricElement, Workspace
 from fabric_cli.core.hiearchy.fab_virtual_workspace_item import VirtualWorkspaceItem
-from fabric_cli.utils import fab_ui as utils_ui
+from fabric_cli.utils import fab_output_manager as utils_ui
 
 # Valid roles for different contexts
 WORKSPACE_ROLES = ["Admin", "Member", "Contributor", "Viewer"]

src/fabric_cli/commands/api/fab_api_request.py

@@ -8,7 +8,7 @@
 
 from fabric_cli.client import fab_api_client as fabric_api
 from fabric_cli.utils import fab_jmespath as utils_jmespath
-from fabric_cli.utils import fab_ui
+from fabric_cli.utils import fab_output_manager as fab_ui
 from fabric_cli.utils import fab_util as utils
 
 

src/fabric_cli/commands/auth/fab_auth.py

@@ -4,13 +4,15 @@
 from argparse import Namespace
 from typing import Any, Optional
 
-from fabric_cli.core import fab_constant, fab_logger
+from fabric_cli.core import fab_constant
+from fabric_cli.utils import fab_output_manager as fab_logger
 from fabric_cli.core.fab_auth import FabAuth
 from fabric_cli.core.fab_context import Context
 from fabric_cli.core.fab_exceptions import FabricCLIError
 from fabric_cli.errors import ErrorMessages
 from fabric_cli.utils import fab_mem_store as utils_mem_store
-from fabric_cli.utils import fab_ui, fab_version_check
+from fabric_cli.utils import fab_version_check
+from fabric_cli.utils import fab_output_manager as fab_ui
 
 
 def init(args: Namespace) -> Any:

src/fabric_cli/commands/config/fab_config_clear_cache.py

@@ -4,7 +4,7 @@
 from argparse import Namespace
 
 from fabric_cli.utils import fab_mem_store as utils_mem_store
-from fabric_cli.utils import fab_ui as utils_ui
+from fabric_cli.utils import fab_output_manager as utils_ui
 
 
 def exec_command(args: Namespace) -> None:

src/fabric_cli/commands/config/fab_config_get.py

@@ -6,7 +6,7 @@
 from fabric_cli.core import fab_constant, fab_state_config
 from fabric_cli.core.fab_exceptions import FabricCLIError
 from fabric_cli.errors import ErrorMessages
-from fabric_cli.utils import fab_ui as utils_ui
+from fabric_cli.utils import fab_output_manager as utils_ui
 
 
 def exec_command(args: Namespace) -> None:

src/fabric_cli/commands/config/fab_config_set.py

@@ -10,7 +10,7 @@
 from fabric_cli.core import fab_constant, fab_state_config
 from fabric_cli.core.fab_exceptions import FabricCLIError
 from fabric_cli.errors import ErrorMessages
-from fabric_cli.utils import fab_ui as utils_ui
+from fabric_cli.utils import fab_output_manager as utils_ui
 from fabric_cli.utils import fab_util as utils
 
 

src/fabric_cli/commands/fs/assign/fab_fs_assign_domain.py

@@ -5,7 +5,8 @@
 from argparse import Namespace
 
 from fabric_cli.client import fab_api_domain as domain_api
-from fabric_cli.core import fab_constant, fab_logger
+from fabric_cli.core import fab_constant
+from fabric_cli.utils import fab_output_manager as fab_logger
 from fabric_cli.core.fab_exceptions import FabricCLIError
 from fabric_cli.core.hiearchy.fab_hiearchy import (
     FabricElement,

src/fabric_cli/commands/fs/cp/fab_fs_cp_folder.py

@@ -14,7 +14,7 @@
 from fabric_cli.core.hiearchy.fab_folder import Folder
 from fabric_cli.core.hiearchy.fab_hiearchy import Folder, Item, Workspace
 from fabric_cli.utils import fab_cmd_fs_utils as utils_fs
-from fabric_cli.utils import fab_ui as utils_ui
+from fabric_cli.utils import fab_output_manager as utils_ui
 
 
 def copy_folders(

src/fabric_cli/commands/fs/cp/fab_fs_cp_item.py

@@ -8,15 +8,15 @@
 from fabric_cli.client import fab_api_item as item_api
 from fabric_cli.core import fab_constant
 from fabric_cli.core import fab_handle_context as handle_context
-from fabric_cli.core import fab_logger
+from fabric_cli.utils import fab_output_manager as fab_logger
 from fabric_cli.core.fab_commands import Command
 from fabric_cli.core.fab_exceptions import FabricCLIError
 from fabric_cli.core.fab_types import ItemType
 from fabric_cli.core.hiearchy.fab_hiearchy import Folder, Item, Workspace
 from fabric_cli.errors import ErrorMessages
 from fabric_cli.utils import fab_item_util as item_utils
 from fabric_cli.utils import fab_mem_store as utils_mem_store
-from fabric_cli.utils import fab_ui as utils_ui
+from fabric_cli.utils import fab_output_manager as utils_ui
 from fabric_cli.utils import fab_util as util
 
 

src/fabric_cli/commands/fs/cp/fab_fs_cp_onelake.py

@@ -9,7 +9,7 @@
 from fabric_cli.core.fab_types import OneLakeItemType
 from fabric_cli.core.hiearchy.fab_hiearchy import LocalPath, OneLakeItem
 from fabric_cli.utils import fab_cmd_cp_utils as cp_utils
-from fabric_cli.utils import fab_ui as utils_ui
+from fabric_cli.utils import fab_output_manager as utils_ui
 from fabric_cli.utils import fab_util as utils
 from fabric_cli.utils import fab_item_util as item_utils
 

src/fabric_cli/commands/fs/cp/fab_fs_cp_workspace.py

@@ -9,7 +9,7 @@
 from fabric_cli.core.hiearchy.fab_folder import Folder
 from fabric_cli.core.hiearchy.fab_hiearchy import Workspace
 from fabric_cli.utils import fab_cmd_fs_utils as fs_utils
-from fabric_cli.utils import fab_ui as utils_ui
+from fabric_cli.utils import fab_output_manager as utils_ui
 from fabric_cli.utils import fab_util as util
 from fabric_cli.utils import fab_item_util as item_utils
 

src/fabric_cli/commands/fs/deploy/fab_fs_deploy_config_file.py

@@ -7,10 +7,10 @@
 from fabric_cicd import append_feature_flag, configure_external_file_logging, deploy_with_config, disable_file_logging  # type: ignore
 
 from fabric_cli.core import fab_constant, fab_state_config
-from fabric_cli.core import fab_logger
+from fabric_cli.utils import fab_output_manager as fab_logger
 from fabric_cli.core.fab_exceptions import FabricCLIError
 from fabric_cli.core.fab_msal_bridge import create_fabric_token_credential
-from fabric_cli.utils import fab_ui
+from fabric_cli.utils import fab_output_manager as fab_ui
 from fabric_cli.utils.fab_util import get_dict_from_params
 
 

src/fabric_cli/commands/fs/export/fab_fs_export_item.py

@@ -15,7 +15,8 @@
 from fabric_cli.core.hiearchy.fab_hiearchy import Item, Workspace
 from fabric_cli.errors import ErrorMessages
 from fabric_cli.utils import fab_cmd_export_utils as utils_export
-from fabric_cli.utils import fab_item_util, fab_mem_store, fab_storage, fab_ui
+from fabric_cli.utils import fab_item_util, fab_mem_store, fab_storage
+from fabric_cli.utils import fab_output_manager as fab_ui
 
 
 def export_bulk_items(workspace: Workspace, args: Namespace) -> None:

src/fabric_cli/commands/fs/fab_fs.py

@@ -42,7 +42,7 @@
     VirtualWorkspaceItem,
     Workspace,
 )
-from fabric_cli.utils import fab_ui as utils_ui
+from fabric_cli.utils import fab_output_manager as utils_ui
 
 COMMAND_GROUP = "fs"
 

src/fabric_cli/commands/fs/fab_fs_cd.py

@@ -5,7 +5,7 @@
 
 from fabric_cli.core.fab_context import Context
 from fabric_cli.core.hiearchy.fab_hiearchy import FabricElement, Tenant
-from fabric_cli.utils import fab_ui as utils_ui
+from fabric_cli.utils import fab_output_manager as utils_ui
 
 
 def exec_command(args: Namespace, context: FabricElement) -> None:

src/fabric_cli/commands/fs/fab_fs_deploy.py

@@ -4,7 +4,7 @@
 from argparse import Namespace
 
 from fabric_cli.commands.fs.deploy.fab_fs_deploy_config_file import deploy_with_config_file
-from fabric_cli.utils import fab_ui
+from fabric_cli.utils import fab_output_manager as fab_ui
 
 
 def exec_command(args: Namespace) -> None:

src/fabric_cli/commands/fs/fab_fs_exists.py

@@ -15,7 +15,7 @@
     VirtualWorkspaceItem,
     Workspace,
 )
-from fabric_cli.utils import fab_ui as utils_ui
+from fabric_cli.utils import fab_output_manager as utils_ui
 from fabric_cli.utils import fab_util as utils
 
 

src/fabric_cli/commands/fs/fab_fs_export.py

@@ -5,7 +5,8 @@
 
 from fabric_cli.commands.fs.export import fab_fs_export_item as export_item
 from fabric_cli.core.hiearchy.fab_hiearchy import FabricElement, Item, Workspace
-from fabric_cli.utils import fab_item_util, fab_ui, fab_util
+from fabric_cli.utils import fab_item_util, fab_util
+from fabric_cli.utils import fab_output_manager as fab_ui
 
 
 def exec_command(args: Namespace, context: FabricElement) -> None:

src/fabric_cli/commands/fs/fab_fs_get.py

@@ -36,7 +36,8 @@
     Workspace,
 )
 from fabric_cli.utils import fab_cmd_get_utils as get_utils
-from fabric_cli.utils import fab_item_util, fab_ui, fab_util
+from fabric_cli.utils import fab_item_util, fab_util
+from fabric_cli.utils import fab_output_manager as fab_ui
 
 
 def exec_command(args: Namespace, context: FabricElement) -> None:

src/fabric_cli/commands/fs/fab_fs_ln.py

@@ -12,7 +12,7 @@
 from fabric_cli.core.fab_types import ItemType
 from fabric_cli.core.hiearchy.fab_hiearchy import OneLakeItem
 from fabric_cli.utils import fab_cmd_ln_utils as utils_ln
-from fabric_cli.utils import fab_ui as utils_ui
+from fabric_cli.utils import fab_output_manager as utils_ui
 
 
 def exec_command(args: Namespace, context: OneLakeItem) -> None:

src/fabric_cli/commands/fs/fab_fs_ls.py

@@ -28,7 +28,7 @@
     VirtualWorkspace,
     Workspace,
 )
-from fabric_cli.utils import fab_ui as utils_ui
+from fabric_cli.utils import fab_output_manager as utils_ui
 
 
 def exec_command(args, context: FabricElement):

src/fabric_cli/commands/fs/fab_fs_open.py

@@ -5,13 +5,14 @@
 from argparse import Namespace
 from typing import Optional
 
-from fabric_cli.core import fab_constant, fab_logger, fab_state_config
+from fabric_cli.core import fab_constant, fab_state_config
+from fabric_cli.utils import fab_output_manager as fab_logger
 from fabric_cli.core.fab_auth import FabAuth
 from fabric_cli.core.fab_exceptions import FabricCLIError
 from fabric_cli.core.fab_types import uri_mapping
 from fabric_cli.core.hiearchy.fab_hiearchy import FabricElement, Item, Workspace
 from fabric_cli.errors import ErrorMessages
-from fabric_cli.utils import fab_ui
+from fabric_cli.utils import fab_output_manager as fab_ui
 
 COMMAND = "open"
 

src/fabric_cli/commands/fs/get/fab_fs_get_domain.py

@@ -6,7 +6,8 @@
 from typing import Optional
 
 from fabric_cli.client import fab_api_domain as domain_api
-from fabric_cli.core import fab_constant, fab_logger
+from fabric_cli.core import fab_constant
+from fabric_cli.utils import fab_output_manager as fab_logger
 from fabric_cli.core.hiearchy.fab_hiearchy import VirtualWorkspaceItem
 from fabric_cli.utils import fab_cmd_get_utils as utils_get
 

src/fabric_cli/commands/fs/impor/fab_fs_import_item.py

@@ -6,14 +6,15 @@
 
 from fabric_cli.client import fab_api_item as item_api
 from fabric_cli.client.fab_api_types import ApiResponse
-from fabric_cli.core import fab_constant, fab_logger
+from fabric_cli.core import fab_constant
+from fabric_cli.utils import fab_output_manager as fab_logger
 from fabric_cli.core.fab_exceptions import FabricCLIError
 from fabric_cli.core.fab_types import ItemType, definition_format_mapping
 from fabric_cli.core.hiearchy.fab_hiearchy import Item
 from fabric_cli.utils import fab_cmd_import_utils as utils_import
 from fabric_cli.utils import fab_mem_store as utils_mem_store
 from fabric_cli.utils import fab_storage as utils_storage
-from fabric_cli.utils import fab_ui as utils_ui
+from fabric_cli.utils import fab_output_manager as utils_ui
 
 
 def import_single_item(item: Item, args: Namespace) -> None:

src/fabric_cli/commands/fs/ls/fab_fs_ls_domain.py

@@ -4,7 +4,8 @@
 import json
 
 from fabric_cli.client import fab_api_domain as domain_api
-from fabric_cli.core import fab_constant, fab_logger
+from fabric_cli.core import fab_constant
+from fabric_cli.utils import fab_output_manager as fab_logger
 from fabric_cli.core.hiearchy.fab_hiearchy import VirtualWorkspace
 from fabric_cli.utils import fab_cmd_ls_utils as utils_ls
 from fabric_cli.utils import fab_mem_store as utils_mem_store

src/fabric_cli/commands/fs/ls/fab_fs_ls_folder.py

@@ -6,7 +6,7 @@
 from fabric_cli.core.hiearchy.fab_folder import Folder
 from fabric_cli.core.hiearchy.fab_hiearchy import Item
 from fabric_cli.utils import fab_cmd_fs_utils as utils_fs
-from fabric_cli.utils import fab_ui as utils_ui
+from fabric_cli.utils import fab_output_manager as utils_ui
 
 
 def exec(folder: Folder, args):

src/fabric_cli/commands/fs/mkdir/fab_fs_mkdir_capacity.py

@@ -12,7 +12,7 @@
 from fabric_cli.core.hiearchy.fab_hiearchy import VirtualWorkspaceItem
 from fabric_cli.utils import fab_cmd_mkdir_utils as mkdir_utils
 from fabric_cli.utils import fab_mem_store as utils_mem_store
-from fabric_cli.utils import fab_ui as utils_ui
+from fabric_cli.utils import fab_output_manager as utils_ui
 from fabric_cli.utils import fab_util as utils