Skip to content

Commit 66e2826

Browse files
authored
Merge branch 'main' into ap/DATAGO-102867/add_hybrid_search
2 parents 22be987 + 74bb986 commit 66e2826

File tree

75 files changed

+6222
-781
lines changed

Some content is hidden

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

75 files changed

+6222
-781
lines changed

.github/pr_labeler.yaml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
sam-geo-information:
2+
- changed-files:
3+
- any-glob-to-any-file: sam-geo-information/**
4+
sam-mcp-server:
5+
- changed-files:
6+
- any-glob-to-any-file: sam-mcp-server/**
7+
sam-mermaid:
8+
- changed-files:
9+
- any-glob-to-any-file: sam-mermaid/**
10+
sam-mongodb:
11+
- changed-files:
12+
- any-glob-to-any-file: sam-mongodb/**
13+
sam-sql-database:
14+
- changed-files:
15+
- any-glob-to-any-file: sam-sql-database/**
16+
solace-event-mesh:
17+
- changed-files:
18+
- any-glob-to-any-file: solace-event-mesh/**
Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
name: Build Plugin
2+
3+
on:
4+
workflow_call:
5+
inputs:
6+
plugin_directory:
7+
description: "Directory of the plugin"
8+
required: true
9+
type: string
10+
secrets:
11+
COMMIT_KEY:
12+
required: true
13+
workflow_dispatch:
14+
inputs:
15+
plugin_directory:
16+
description: "Directory of the plugin"
17+
required: true
18+
type: choice
19+
options:
20+
- solace-event-mesh
21+
- sam-geo-information
22+
- sam-mcp-server
23+
- sam-mermaid
24+
- sam-mongodb
25+
- sam-sql-database
26+
27+
permissions:
28+
contents: write
29+
pull-requests: write
30+
actions: write
31+
statuses: write
32+
checks: write
33+
repository-projects: read
34+
35+
jobs:
36+
build-plugin:
37+
runs-on: ubuntu-latest
38+
steps:
39+
- name: Checkout
40+
uses: actions/checkout@v4.2.2
41+
with:
42+
fetch-depth: 0
43+
sparse-checkout: ${{ inputs.plugin_directory }}
44+
- name: Set up Python
45+
uses: actions/setup-python@v5.5.0
46+
with:
47+
python-version: "3.12"
48+
- name: Cache pip
49+
uses: actions/cache@v3
50+
with:
51+
path: ~/.cache/pip
52+
key: ${{ runner.os }}-pip-${{ hashFiles('**/pyproject.toml') }}
53+
restore-keys: |
54+
${{ runner.os }}-pip-${{ hashFiles('**/pyproject.toml') }}
55+
- name: Install Hatch
56+
shell: bash
57+
run: |
58+
python -m pip install --upgrade pip -q
59+
pip install hatch -q
60+
pip install virtualenv pipdeptree -q
61+
62+
- name: Test Plugin
63+
shell: bash
64+
run: |
65+
cd ${{ inputs.plugin_directory }}/
66+
ls -la
67+
dir=$(pwd)
68+
echo "Directory: $dir"
69+
hatch run pip install solace-agent-mesh twine -q
70+
hatch run solace-agent-mesh plugin add ${{ inputs.plugin_directory }} -u $dir
71+
hatch test
72+
73+
- name: Install dependencies
74+
shell: bash
75+
run: |
76+
cd ${{ inputs.plugin_directory }}
77+
hatch build
78+
ls dist/*.tar.gz | xargs -n1 hatch run python -m twine check
79+
ls dist/*.whl | xargs -n1 hatch run python -m twine check

.github/workflows/ci.yaml

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
name: CI
2+
3+
on:
4+
pull_request:
5+
types: [opened, synchronize, reopened]
6+
paths-ignore:
7+
- ".github/**"
8+
9+
concurrency:
10+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
11+
cancel-in-progress: false
12+
13+
jobs:
14+
label-pr:
15+
runs-on: ubuntu-24.04
16+
outputs:
17+
all_plugins: ${{ steps.format-labels.outputs.all-plugins }}
18+
steps:
19+
- name: Checkout code
20+
uses: actions/checkout@v4.2.2
21+
with:
22+
fetch-depth: 0
23+
24+
- name: Lable PR based on changes
25+
id: label-pr
26+
if: ${{ github.event_name == 'pull_request' }}
27+
uses: actions/labeler@v5
28+
with:
29+
repo-token: ${{ secrets.GITHUB_TOKEN }}
30+
sync-labels: true
31+
configuration-path: .github/pr_labeler.yaml
32+
33+
- name: Format labels for matrix
34+
id: format-labels
35+
run: |
36+
# Debug output
37+
echo "Raw labels: ${{ steps.label-pr.outputs.all-labels }}"
38+
39+
# Convert comma-separated list to JSON array of objects using pure bash
40+
LABELS="${{ steps.label-pr.outputs.all-labels }}"
41+
JSON="["
42+
FIRST=true
43+
IFS=',' read -ra LABEL_ARRAY <<< "$LABELS"
44+
for label in "${LABEL_ARRAY[@]}"; do
45+
if [ "$FIRST" = true ] ; then
46+
FIRST=false
47+
else
48+
JSON="$JSON,"
49+
fi
50+
JSON="$JSON{\"plugin_directory\":\"$label\"}"
51+
done
52+
JSON="$JSON]"
53+
54+
echo "Generated JSON: $JSON"
55+
echo "all-plugins=$JSON" >> $GITHUB_OUTPUT
56+
57+
builds:
58+
needs: label-pr
59+
if: ${{ needs.label-pr.outputs.all_plugins != '[]' }}
60+
strategy:
61+
fail-fast: false
62+
matrix:
63+
include: ${{ fromJSON(needs.label-pr.outputs.all_plugins) }}
64+
name: Build Plugin - ${{matrix.plugin_directory}}
65+
uses: ./.github/workflows/build-plugin.yaml
66+
with:
67+
plugin_directory: ${{matrix.plugin_directory}}
68+
secrets:
69+
COMMIT_KEY: ${{ secrets.COMMIT_KEY }}

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ sam-sql-database-old/*
77

88
# C extensions
99
*.so
10-
10+
**/solace-agent-mesh.yaml
1111
# Distribution / packaging
1212
.Python
1313
build/

LICENSE

Lines changed: 201 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,201 @@
1+
Apache License
2+
Version 2.0, January 2004
3+
http://www.apache.org/licenses/
4+
5+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
6+
7+
1. Definitions.
8+
9+
"License" shall mean the terms and conditions for use, reproduction,
10+
and distribution as defined by Sections 1 through 9 of this document.
11+
12+
"Licensor" shall mean the copyright owner or entity authorized by
13+
the copyright owner that is granting the License.
14+
15+
"Legal Entity" shall mean the union of the acting entity and all
16+
other entities that control, are controlled by, or are under common
17+
control with that entity. For the purposes of this definition,
18+
"control" means (i) the power, direct or indirect, to cause the
19+
direction or management of such entity, whether by contract or
20+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
21+
outstanding shares, or (iii) beneficial ownership of such entity.
22+
23+
"You" (or "Your") shall mean an individual or Legal Entity
24+
exercising permissions granted by this License.
25+
26+
"Source" form shall mean the preferred form for making modifications,
27+
including but not limited to software source code, documentation
28+
source, and configuration files.
29+
30+
"Object" form shall mean any form resulting from mechanical
31+
transformation or translation of a Source form, including but
32+
not limited to compiled object code, generated documentation,
33+
and conversions to other media types.
34+
35+
"Work" shall mean the work of authorship, whether in Source or
36+
Object form, made available under the License, as indicated by a
37+
copyright notice that is included in or attached to the work
38+
(an example is provided in the Appendix below).
39+
40+
"Derivative Works" shall mean any work, whether in Source or Object
41+
form, that is based on (or derived from) the Work and for which the
42+
editorial revisions, annotations, elaborations, or other modifications
43+
represent, as a whole, an original work of authorship. For the purposes
44+
of this License, Derivative Works shall not include works that remain
45+
separable from, or merely link (or bind by name) to the interfaces of,
46+
the Work and Derivative Works thereof.
47+
48+
"Contribution" shall mean any work of authorship, including
49+
the original version of the Work and any modifications or additions
50+
to that Work or Derivative Works thereof, that is intentionally
51+
submitted to Licensor for inclusion in the Work by the copyright owner
52+
or by an individual or Legal Entity authorized to submit on behalf of
53+
the copyright owner. For the purposes of this definition, "submitted"
54+
means any form of electronic, verbal, or written communication sent
55+
to the Licensor or its representatives, including but not limited to
56+
communication on electronic mailing lists, source code control systems,
57+
and issue tracking systems that are managed by, or on behalf of, the
58+
Licensor for the purpose of discussing and improving the Work, but
59+
excluding communication that is conspicuously marked or otherwise
60+
designated in writing by the copyright owner as "Not a Contribution."
61+
62+
"Contributor" shall mean Licensor and any individual or Legal Entity
63+
on behalf of whom a Contribution has been received by Licensor and
64+
subsequently incorporated within the Work.
65+
66+
2. Grant of Copyright License. Subject to the terms and conditions of
67+
this License, each Contributor hereby grants to You a perpetual,
68+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
69+
copyright license to reproduce, prepare Derivative Works of,
70+
publicly display, publicly perform, sublicense, and distribute the
71+
Work and such Derivative Works in Source or Object form.
72+
73+
3. Grant of Patent License. Subject to the terms and conditions of
74+
this License, each Contributor hereby grants to You a perpetual,
75+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
76+
(except as stated in this section) patent license to make, have made,
77+
use, offer to sell, sell, import, and otherwise transfer the Work,
78+
where such license applies only to those patent claims licensable
79+
by such Contributor that are necessarily infringed by their
80+
Contribution(s) alone or by combination of their Contribution(s)
81+
with the Work to which such Contribution(s) was submitted. If You
82+
institute patent litigation against any entity (including a
83+
cross-claim or counterclaim in a lawsuit) alleging that the Work
84+
or a Contribution incorporated within the Work constitutes direct
85+
or contributory patent infringement, then any patent licenses
86+
granted to You under this License for that Work shall terminate
87+
as of the date such litigation is filed.
88+
89+
4. Redistribution. You may reproduce and distribute copies of the
90+
Work or Derivative Works thereof in any medium, with or without
91+
modifications, and in Source or Object form, provided that You
92+
meet the following conditions:
93+
94+
(a) You must give any other recipients of the Work or
95+
Derivative Works a copy of this License; and
96+
97+
(b) You must cause any modified files to carry prominent notices
98+
stating that You changed the files; and
99+
100+
(c) You must retain, in the Source form of any Derivative Works
101+
that You distribute, all copyright, patent, trademark, and
102+
attribution notices from the Source form of the Work,
103+
excluding those notices that do not pertain to any part of
104+
the Derivative Works; and
105+
106+
(d) If the Work includes a "NOTICE" text file as part of its
107+
distribution, then any Derivative Works that You distribute must
108+
include a readable copy of the attribution notices contained
109+
within such NOTICE file, excluding those notices that do not
110+
pertain to any part of the Derivative Works, in at least one
111+
of the following places: within a NOTICE text file distributed
112+
as part of the Derivative Works; within the Source form or
113+
documentation, if provided along with the Derivative Works; or,
114+
within a display generated by the Derivative Works, if and
115+
wherever such third-party notices normally appear. The contents
116+
of the NOTICE file are for informational purposes only and
117+
do not modify the License. You may add Your own attribution
118+
notices within Derivative Works that You distribute, alongside
119+
or as an addendum to the NOTICE text from the Work, provided
120+
that such additional attribution notices cannot be construed
121+
as modifying the License.
122+
123+
You may add Your own copyright statement to Your modifications and
124+
may provide additional or different license terms and conditions
125+
for use, reproduction, or distribution of Your modifications, or
126+
for any such Derivative Works as a whole, provided Your use,
127+
reproduction, and distribution of the Work otherwise complies with
128+
the conditions stated in this License.
129+
130+
5. Submission of Contributions. Unless You explicitly state otherwise,
131+
any Contribution intentionally submitted for inclusion in the Work
132+
by You to the Licensor shall be under the terms and conditions of
133+
this License, without any additional terms or conditions.
134+
Notwithstanding the above, nothing herein shall supersede or modify
135+
the terms of any separate license agreement you may have executed
136+
with Licensor regarding such Contributions.
137+
138+
6. Trademarks. This License does not grant permission to use the trade
139+
names, trademarks, service marks, or product names of the Licensor,
140+
except as required for reasonable and customary use in describing the
141+
origin of the Work and reproducing the content of the NOTICE file.
142+
143+
7. Disclaimer of Warranty. Unless required by applicable law or
144+
agreed to in writing, Licensor provides the Work (and each
145+
Contributor provides its Contributions) on an "AS IS" BASIS,
146+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
147+
implied, including, without limitation, any warranties or conditions
148+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
149+
PARTICULAR PURPOSE. You are solely responsible for determining the
150+
appropriateness of using or redistributing the Work and assume any
151+
risks associated with Your exercise of permissions under this License.
152+
153+
8. Limitation of Liability. In no event and under no legal theory,
154+
whether in tort (including negligence), contract, or otherwise,
155+
unless required by applicable law (such as deliberate and grossly
156+
negligent acts) or agreed to in writing, shall any Contributor be
157+
liable to You for damages, including any direct, indirect, special,
158+
incidental, or consequential damages of any character arising as a
159+
result of this License or out of the use or inability to use the
160+
Work (including but not limited to damages for loss of goodwill,
161+
work stoppage, computer failure or malfunction, or any and all
162+
other commercial damages or losses), even if such Contributor
163+
has been advised of the possibility of such damages.
164+
165+
9. Accepting Warranty or Additional Liability. While redistributing
166+
the Work or Derivative Works thereof, You may choose to offer,
167+
and charge a fee for, acceptance of support, warranty, indemnity,
168+
or other liability obligations and/or rights consistent with this
169+
License. However, in accepting such obligations, You may act only
170+
on Your own behalf and on Your sole responsibility, not on behalf
171+
of any other Contributor, and only if You agree to indemnify,
172+
defend, and hold each Contributor harmless for any liability
173+
incurred by, or claims asserted against, such Contributor by reason
174+
of your accepting any such warranty or additional liability.
175+
176+
END OF TERMS AND CONDITIONS
177+
178+
APPENDIX: How to apply the Apache License to your work.
179+
180+
To apply the Apache License to your work, attach the following
181+
boilerplate notice, with the fields enclosed by brackets "[]"
182+
replaced with your own identifying information. (Don't include
183+
the brackets!) The text should be enclosed in the appropriate
184+
comment syntax for the file format. We also recommend that a
185+
file or class name and description of purpose be included on the
186+
same "printed page" as the copyright notice for easier
187+
identification within third-party archives.
188+
189+
Copyright [yyyy] [name of copyright owner]
190+
191+
Licensed under the Apache License, Version 2.0 (the "License");
192+
you may not use this file except in compliance with the License.
193+
You may obtain a copy of the License at
194+
195+
http://www.apache.org/licenses/LICENSE-2.0
196+
197+
Unless required by applicable law or agreed to in writing, software
198+
distributed under the License is distributed on an "AS IS" BASIS,
199+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
200+
See the License for the specific language governing permissions and
201+
limitations under the License.

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# solace-agent-mesh-core-plugins
2-
Solace [Solace-Agent-Mesh](https://github.com/SolaceDev/solace-agent-mesh) official core plugins
2+
Solace [Solace-Agent-Mesh](https://github.com/SolaceLabs/solace-agent-mesh) official core plugins
33

44
## Install a plugin
55
To install one of the official core plugins into your solace-agent-mesh project, use the following command.

0 commit comments

Comments
 (0)