Skip to content

Conversation

@are-ces
Copy link
Contributor

@are-ces are-ces commented Jan 22, 2026

What does this PR do?

Resolves merge conflicts in the backport of file_search attributes fix to release-0.3.x.

Test Plan

uv run pytest tests/unit/providers/agents/meta_reference/test_openai_responses.py -v

All 23 tests pass.

@meta-cla meta-cla bot added the CLA Signed This label is managed by the Meta Open Source bot. label Jan 22, 2026
@are-ces
Copy link
Contributor Author

are-ces commented Jan 22, 2026

I removed the tests which came along with the backport (which were not supposed to be in 0.3.x)

@are-ces are-ces force-pushed the fix-conflicts-mergify-4680 branch from e733ff5 to f36b52f Compare January 22, 2026 10:14
Copy link
Collaborator

@leseb leseb left a comment

Choose a reason for hiding this comment

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

why not target the release branch directly instead of the merfigy branch?

@are-ces
Copy link
Contributor Author

are-ces commented Jan 22, 2026

Not sure how that works, how do you bring those changes to this pr?

@are-ces
Copy link
Contributor Author

are-ces commented Jan 22, 2026

Btw I don't think the pre-commit issues depend on this pr:

Distribution Template Codegen................................................Failed
- hook id: distro-codegen
- exit code: 1

warning: `VIRTUAL_ENV=/Users/cpompeia/.cache/pre-commit/repo2cmpd0mc/py_env-python3.12` does not match the project environment path `.venv` and will be ignored; use `--active` to target the active environment instead
⠋ Processing distribution templates...
Traceback (most recent call last):
  File "/Users/cpompeia/Documents/Dev/llama-stack-latest/llama-stack/./scripts/distro_codegen.py", line 128, in <module>
    main()
  File "/Users/cpompeia/Documents/Dev/llama-stack-latest/llama-stack/./scripts/distro_codegen.py", line 106, in main
    pre_import_distros(distro_dirs)
  File "/Users/cpompeia/Documents/Dev/llama-stack-latest/llama-stack/./scripts/distro_codegen.py", line 92, in pre_import_distros
    importlib.import_module(module_name)
  File "/Users/cpompeia/.local/share/uv/python/cpython-3.12.11-macos-aarch64-none/lib/python3.12/importlib/__init__.py", line 90, in import_module
    return _bootstrap._gcd_import(name[level:], package, level)
           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "<frozen importlib._bootstrap>", line 1387, in _gcd_import
  File "<frozen importlib._bootstrap>", line 1360, in _find_and_load
  File "<frozen importlib._bootstrap>", line 1324, in _find_and_load_unlocked
ModuleNotFoundError: No module named 'llama_stack.distributions.postgres-demo'

Provider Codegen.............................................................Failed
- hook id: provider-codegen
- exit code: 1

warning: `VIRTUAL_ENV=/Users/cpompeia/.cache/pre-commit/repo2cmpd0mc/py_env-python3.12` does not match the project environment path `.venv` and will be ignored; use `--active` to target the active environment instead
Traceback (most recent call last):
  File "/Users/cpompeia/Documents/Dev/llama-stack-latest/llama-stack/./scripts/provider_codegen.py", line 16, in <module>
    from llama_stack.core.distribution import get_provider_registry
ModuleNotFoundError: No module named 'llama_stack.core.distribution'

API Spec Codegen.............................................................Passed
Check GitHub Actions use SHA-pinned actions..................................Passed
Check for missing __init__.py files..........................................Failed
- hook id: check-init-py
- exit code: 1

This script requires Bash 4.0 or higher for mapfile support.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

CLA Signed This label is managed by the Meta Open Source bot.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants