Skip to content

feat: auto-detect Console width #3327

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

Merged
merged 2 commits into from
Oct 3, 2025
Merged

feat: auto-detect Console width #3327

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
93e9dfd
fix: auto-detect Console width
rhdedgar Sep 4, 2025
3ac2677
set wide columns to avoid line breaks in the log
mattf Sep 17, 2025
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
2 changes: 2 additions & 0 deletions .github/workflows/integration-auth-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,8 @@ jobs:
yq eval '.server.auth.provider_config.jwks.token = "${{ env.TOKEN }}"' -i $run_dir/run.yaml
cat $run_dir/run.yaml

# avoid line breaks in the server log, especially because we grep it below.
export COLUMNS=1984
Copy link
Contributor

Choose a reason for hiding this comment

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

thanks, that does fix the current test, but I wonder whether it wouldn't make more sense to make the test assertions more robust to don't make exact string matches but match only on the parts that are important, to avoid breaking on formatting or rewording changes ? Messages aren't stable APIs.

Copy link
Collaborator

Choose a reason for hiding this comment

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

While I agree with the approach in general, I'm not sure how we could relax that grep line to do a contains versus a strict match:

grep -q "Enabling authentication with provider: ${{ matrix.auth-provider }}" server.log

nohup uv run llama stack run $run_dir/run.yaml --image-type venv > server.log 2>&1 &

- name: Wait for Llama Stack server to be ready
Expand Down
2 changes: 1 addition & 1 deletion llama_stack/log.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ def strip_rich_markup(text):

class CustomRichHandler(RichHandler):
def __init__(self, *args, **kwargs):
kwargs["console"] = Console(width=150)
kwargs["console"] = Console()
super().__init__(*args, **kwargs)

def emit(self, record):
Expand Down
Loading