Commit 6a70455

committed

fix: merge upstream/main and resolve conflict in test_model_openai.py

1 parent 409b437 commit 6a70455Copy full SHA for 6a70455

162 files changed

.github
- actions
  - README.md
  - strands-agent-runner
    - action.yml
  - strands-write-executor
    - action.yml
- agent-sops
- scripts
- workflows
AGENTS.md
README.md
docs
- STYLE_GUIDE.md
- design
  - openai_responses_phase2.md
pyproject.toml
src/strands
- __init__.py
- agent
  - __init__.py
  - a2a_agent.py
  - agent.py
  - agent_result.py
  - conversation_manager
    - summarizing_conversation_manager.py
- event_loop
- experimental
  - bidi
    - agent
      - agent.py
    - models
      - nova_sonic.py
  - hooks/multiagent
    - __init__.py
    - events.py
  - steering
    - context_providers
      - ledger_provider.py
    - core
      - handler.py
    - handlers/llm
      - llm_handler.py
      - mappers.py
  - tools
    - __init__.py
- handlers
  - callback_handler.py
- hooks
  - __init__.py
  - events.py
- models
- multiagent
- session
  - session_manager.py
- telemetry
  - tracer.py
- tools
  - __init__.py
  - decorator.py
  - executors
    - _executor.py
  - mcp
  - registry.py
  - structured_output
    - __init__.py
    - _structured_output_context.py
  - tool_provider.py
- types
tests_integ
- a2a
- bidi
  - test_bidirectional_agent.py
- conftest.py
- hooks/multiagent
  - test_cancel.py
  - test_events.py
- interrupts/multiagent
- mcp
- models
  - test_model_gemini.py
  - test_model_openai.py
- resources
- steering
  - test_model_steering.py
  - test_tool_steering.py
- test_a2a_executor.py
- test_bedrock_guardrails.py
- test_bedrock_s3_location.py
- test_multiagent_swarm.py
- test_tool_retry_hook.py
tests
- fixtures
  - mock_multiagent_hook_provider.py
- strands
  - agent
  - event_loop
  - experimental
    - bidi/models
      - test_nova_sonic.py
    - hooks
      - test_hook_aliases.py
    - steering
      - context_providers
        test_ledger_provider.py
      - core
        test_handler.py
    - tools
      - test_tool_provider_alias.py
  - handlers
    - test_callback_handler.py
  - hooks
    - test_events.py
    - test_multi_agent_hooks.py
  - models
  - multiagent
  - telemetry
    - test_tracer.py
  - tools
    - executors
      - test_executor.py
    - mcp
    - structured_output
      - test_structured_output_context.py
    - test_decorator.py
    - test_loader.py
    - test_registry.py
    - test_registry_tool_provider.py
  - types
    - test_media.py

`‎.github/actions/README.md‎`

This file was deleted.

Comments

(0)