Skip to content

[CDF-27845] diff_table: intra-line character-level highlighting #2971

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.

Sign up for GitHub

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

Closed
ronpal wants to merge 17 commits into from
Closed

[CDF-27845] diff_table: intra-line character-level highlighting #2971

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
e5053ef
[CDF-27845] Apply ToolkitPanel to deploy command output
ronpal Apr 30, 2026
c1a6202
[CDF-27845] Remove expand=False and adopt AuraColor in deploy output
ronpal Apr 30, 2026
bcda933
[CDF-27845] Combine setup panels, drop operation_noun, use AuraColor
ronpal Apr 30, 2026
eb13252
[CDF-27845] Make ToolkitPanel title always bold via title_style
ronpal Apr 30, 2026
1b57b9d
[CDF-27845] Add vertical space between startup and build-dir sections
ronpal Apr 30, 2026
a9b1d49
[CDF-27845] Replace detail tables with hanging_indent nested lists
ronpal Apr 30, 2026
0a15332
[CDF-27845] Drop redundant warn() calls after setup panel
ronpal Apr 30, 2026
0548b09
[CDF-27845] Add consequence to verbose detail section titles
ronpal Apr 30, 2026
b1eeccc
[CDF-27845] Show 'Finished dry-run' in progress bar for dry runs
ronpal Apr 30, 2026
fc38f25
[CDF-27845] Use Text.from_markup so title markup renders correctly
ronpal Apr 30, 2026
5a3ac76
[CDF-27845] Rename 'Can deploy' column to 'Able to deploy'
ronpal Apr 30, 2026
7666b06
[CDF-27845] Replace unified diff with side-by-side diff_table component
ronpal Apr 30, 2026
e5bbbdd
[CDF-27845] Fix diff_table: disable highlight, label columns with colors
ronpal Apr 30, 2026
8dab222
[CDF-27845] Fix replace blocks in diff_table: stack deletions then in…
ronpal Apr 30, 2026
ca7c81b
[CDF-27845] Put local config left in diff_table, preserve key order
ronpal Apr 30, 2026
c3cae04
[CDF-27845] Match replace lines by YAML key in diff_table
ronpal May 1, 2026
f22ab01
[CDF-27845] Add intra-line character-level highlighting to diff_table
ronpal May 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions cognite_toolkit/_cdf_tk/commands/build_v2/build_v2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,9 +371,7 @@ def _display_module_sources(
summary_sections.append(ToolkitPanelSection(title="Issue details", content=issue_details_section_content))

border_style = {0: AuraColor.GREEN.rich, 1: AuraColor.AMBER.rich, 2: AuraColor.RED.rich}[border_color]
console.print(
ToolkitPanel(Group(*summary_sections), title="[bold]Loading modules[/]", border_style=border_style)
)
console.print(ToolkitPanel(Group(*summary_sections), title="Loading modules", border_style=border_style))

if errors:
console.print("\n")
Expand Down Expand Up @@ -797,7 +795,7 @@ def _display_validation_plan(self, plan: list[ValidationStep], console: Console)
console.print(
ToolkitPanel(
Group(*validation_sections),
title="[bold]Planning validation[/]",
title="Planning validation",
border_style=border_style,
)
)
Expand Down Expand Up @@ -971,7 +969,7 @@ def _display_build_summary(
console.print(
ToolkitPanel(
"\n".join(summary_lines),
title=f"[bold]Built to directory {build_dir_display}[/]",
title=f"Built to directory {build_dir_display}",
border_style=border_color,
)
)
Expand Down
29 changes: 11 additions & 18 deletions cognite_toolkit/_cdf_tk/commands/deploy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
from cognite.client.exceptions import CogniteAPIError, CogniteDuplicatedError
from rich import print
from rich.markup import escape
from rich.panel import Panel

from cognite_toolkit._cdf_tk.client import ToolkitClient
from cognite_toolkit._cdf_tk.client._resource_base import T_Identifier, T_RequestResource, T_ResponseResource
Expand Down Expand Up @@ -56,6 +55,7 @@
LowSeverityWarning,
ToolkitDependenciesIncludedWarning,
)
from cognite_toolkit._cdf_tk.ui import AuraColor, ToolkitPanel
from cognite_toolkit._cdf_tk.utils import humanize_collection, read_yaml_file
from cognite_toolkit._cdf_tk.utils.auth import EnvironmentVariables

Expand Down Expand Up @@ -168,16 +168,11 @@ def _order_loaders(

@staticmethod
def _start_message(build_dir: Path, dry_run: bool, env_vars: EnvironmentVariables) -> None:
environment_vars = ""
if not _RUNNING_IN_BROWSER:
environment_vars = f"\n\nConnected to {env_vars.as_string()}"
verb = "Checking" if dry_run else "Deploying"
print(
Panel(
f"[bold]{verb}[/]resource files from {build_dir} directory.{environment_vars}",
expand=False,
)
)
content = f"[bold]{verb}[/] resource files from {build_dir} directory."
if not _RUNNING_IN_BROWSER:
content += f"\n\nConnected to {env_vars.as_string()}"
print(ToolkitPanel(content, title="Deploy"))

def clean_all_resources(
self,
Expand All @@ -193,14 +188,12 @@ def clean_all_resources(
verbose: bool,
) -> None:
# Drop has to be done in the reverse order of deploy.
if drop and drop_data:
print(Panel("[bold] Cleaning resources as --drop and --drop-data are passed[/]"))
elif drop:
print(Panel("[bold] Cleaning resources as --drop is passed[/]"))
elif drop_data:
print(Panel("[bold] Cleaning resources as --drop-data is passed[/]"))
else:
if not (drop or drop_data):
return None
flags = "--drop and --drop-data" if (drop and drop_data) else ("--drop" if drop else "--drop-data")
print(
ToolkitPanel(f"Cleaning resources as {flags} is passed", title="Clean", border_style=AuraColor.AMBER.rich)
)

for loader_cls in reversed(ordered_loaders):
if not issubclass(loader_cls, ResourceIO):
Expand Down Expand Up @@ -289,7 +282,7 @@ def deploy_all_resources(

"""
if verbose:
print(Panel("[bold]DEPLOYING resources...[/]"))
print(ToolkitPanel("[bold]Deploying resources...[/]", title="Deploy"))

if ordered_loaders is None:
selected_loaders = self._clean_command.get_selected_loaders(build_dir, set(), None)
Expand Down
Loading
Loading