Skip to content

Commit 6349102

Browse files
committed
Merge branch 'develop' into strands_integration
2 parents 178b660 + 1e4d6af commit 6349102

File tree

113 files changed

+4384
-876
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

113 files changed

+4384
-876
lines changed

.coderabbit.yaml

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -123,56 +123,19 @@ reviews:
123123
instructions: >-
124124
You should only apply this label when the source branch has a name matching the regex pattern `release/\d+\.\d+`
125125
and the target branch is `main`.
126-
- label: breaking
127-
instructions: >-
128-
Apply this label when the PR introduces changes that break backward compatibility, modify existing APIs in
129-
incompatible ways, creates a behavioral change, or require users to update their code when upgrading. If you
130-
apply this label, do not apply the "non-breaking" label. Do not apply this label if the PR already has either
131-
the "breaking" or "non-breaking" label.
132-
- label: bug
133-
instructions: >-
134-
Apply this label when the PR fixes a defect, error, or unexpected behavior in the existing codebase. If you
135-
apply this label do not apply the "doc", "feature request", or "improvement" labels. Do not apply this label if
136-
the PR already has either the "bug", "doc", "feature request", or "improvement" labels.
137126
- label: DO NOT MERGE
138127
instructions: >-
139128
Apply this label to PRs that should not be merged due to critical issues, incomplete work, or other blocking
140129
concerns. Check the PR description for specific details about why it should not be merged. There is no need to
141130
apply this label to draft PRs.
142-
- label: doc
143-
instructions: >-
144-
Apply this label when the PR primarily adds, updates, or improves documentation including README files. If you
145-
apply this label do not apply the "bug", "feature request", or "improvement" labels. Do not apply this label if
146-
the PR already has either the "bug", "doc", "feature request", or "improvement" labels.
147131
- label: duplicate
148132
instructions: >-
149133
Apply this label when the PR addresses the same issue or implements the same feature as another existing
150134
PR or issue.
151-
- label: external
152-
instructions: >-
153-
Apply this label when the PR author is not an organization OWNER or MEMBER (i.e., author_association is
154-
COLLABORATOR, CONTRIBUTOR, FIRST_TIMER, FIRST_TIME_CONTRIBUTOR, or NONE).
155-
- label: feature request
156-
instructions: >-
157-
Apply this label when the PR implements new functionality, adds new features, or introduces new capabilities
158-
to the toolkit. If you apply this label do not apply the "bug", "doc", or "improvement" labels. Do not apply
159-
this label if the PR already has either the "bug", "doc", "feature request", or "improvement" labels.
160-
- label: improvement
161-
instructions: >-
162-
Apply this label when the PR enhances existing functionality without adding completely new features, such as
163-
performance optimizations, code refactoring, or usability enhancements. If you apply this label do not apply
164-
the "bug", "doc", or "feature request" labels. Do not apply this label if the PR already has either the "bug",
165-
"doc", "feature request", or "improvement" labels.
166135
- label: invalid
167136
instructions: >-
168137
Apply this label when the PR contains invalid changes, doesn't follow project guidelines, or has fundamental
169138
issues that make it unsuitable for the project.
170-
- label: non-breaking
171-
instructions: >-
172-
Apply this label when the PR introduces changes that maintain backward compatibility, does not create a
173-
behavioral change, and does not require users to modify their existing code. If you apply this label, do not
174-
apply the "breaking" label. Do not apply this label if the PR already has either the "breaking" or
175-
"non-breaking" label.
176139
177140
tools:
178141
ruff:

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,8 @@ tags
211211
[._]*.un~
212212

213213
# Vector db files
214-
deploy/compose/volumes
214+
**/deploy/compose/volumes
215+
**/deploy/volumes
215216
examples/notebooks/examples/retail_sales_agent/deploy/volumes/
216217

217218
# Mac Metadata

.gitlab-ci.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,15 @@ package:wheel:
149149
# Match the transitional wheels
150150
- .tmp/wheels/nat/*/*/*.whl
151151
expire_in: 1 week
152-
152+
rules:
153+
- if: $CI_CRON_NIGHTLY == "1"
154+
when: always
155+
- if: $CI_PIPELINE_SOURCE == 'merge_request_event'
156+
- if: $CI_COMMIT_TAG
157+
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
158+
- if: $CI_COMMIT_BRANCH == 'develop-test'
159+
- if: $CI_COMMIT_BRANCH == 'main'
160+
- if: $CI_COMMIT_BRANCH =~ /^release\/.*$/
153161

154162
upload:artifactory:
155163
stage: upload

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ repos:
3333
- id: uv-lock
3434

3535
- repo: https://github.com/tcort/markdown-link-check
36-
rev: v3.12.2
36+
rev: v3.14.1
3737
hooks:
3838
- id: markdown-link-check
3939
args: ["-q", "--config", "ci/markdown-link-check-config.json"]

ci/scripts/checks.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
2020
source ${SCRIPT_DIR}/common.sh
2121

2222
set +e
23-
pre-commit run --all-files --show-diff-on-failure
23+
pre-commit run --show-diff-on-failure
2424
PRE_COMMIT_RETVAL=$?
2525

2626
echo "Checking copyright headers"
Lines changed: 3 additions & 0 deletions
Loading

docs/source/_static/mcp_tools.png

Lines changed: 3 additions & 0 deletions
Loading

docs/source/conf.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,7 @@ def _build_api_tree() -> Path:
160160
# Ignore openai.com links, as these always report a 403 when requested by the linkcheck agent
161161
# mysql.com reports a 403 when requested by linkcheck
162162
# api.service.com is a placeholder for a service example
163+
# Ignore example.com/mcp as it is inaccessible when building the docs
163164
# Once v1.2 is merged into main, remove the ignore for the banner.png
164165
linkcheck_ignore = [
165166
r'http://localhost:\d+/',
@@ -170,6 +171,7 @@ def _build_api_tree() -> Path:
170171
r'https://code.visualstudio.com',
171172
r'https://www.mysql.com',
172173
r'https://api.service.com',
174+
r'https?://example\.com/mcp/?',
173175
r'http://custom-server'
174176
]
175177

@@ -316,9 +318,7 @@ def _build_api_tree() -> Path:
316318
# -- Extension configuration -------------------------------------------------
317319

318320
# Example configuration for intersphinx: refer to the Python standard library.
319-
intersphinx_mapping = {
320-
"python": ('https://docs.python.org/', None), "scipy": ('https://docs.scipy.org/doc/scipy/reference', None)
321-
}
321+
intersphinx_mapping = {"python": ('https://docs.python.org/', None)}
322322

323323
# Set the default role for interpreted code (anything surrounded in `single
324324
# backticks`) to be a python object. See

docs/source/extend/memory.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ Then either:
147147
**At runtime**, you typically see code like:
148148

149149
```python
150-
memory_client = builder.get_memory_client(<memory_config_name>)
150+
memory_client = await builder.get_memory_client(<memory_config_name>)
151151
await memory_client.add_items([MemoryItem(...), ...])
152152
```
153153

@@ -164,7 +164,7 @@ from nat.memory.models import MemoryItem
164164
from langchain_core.tools import ToolException
165165

166166
async def add_memory_tool_action(item: MemoryItem, memory_name: str):
167-
memory_client = builder.get_memory_client(memory_name)
167+
memory_client = await builder.get_memory_client(memory_name)
168168
try:
169169
await memory_client.add_items([item])
170170
return "Memory added successfully"

docs/source/index.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,7 @@ Adding a Telemetry Exporter <./extend/telemetry-exporters.md>
129129
130130
./api/index.rst
131131
API Authentication <./reference/api-authentication.md>
132+
Frameworks Overview <./reference/frameworks-overview.md>
132133
Interactive Models <./reference/interactive-models.md>
133134
API Server Endpoints <./reference/api-server-endpoints.md>
134135
WebSockets <./reference/websockets.md>

0 commit comments

Comments
 (0)