diff --git a/a/agentstack/Dockerfiles/v0.4.3/Dockerfile b/a/agentstack/Dockerfiles/v0.4.3/Dockerfile new file mode 100644 index 0000000000..ff1d12d6f0 --- /dev/null +++ b/a/agentstack/Dockerfiles/v0.4.3/Dockerfile @@ -0,0 +1,131 @@ +############################################################ +# STAGE 1 - Builder +############################################################ + +ARG BASE_UBI_IMAGE_TAG=9.8 + +FROM registry.access.redhat.com/ubi9/ubi-minimal:${BASE_UBI_IMAGE_TAG} AS builder + +ARG AGENTSTACK_VERSION=v0.4.3 +ARG RELEASE_VERSION=main + +ENV PATH="/root/.local/bin:${PATH}" \ + UV_HTTP_TIMEOUT=300 \ + UV_HTTP_RETRIES=5 + +############################################################ +# Build dependencies +############################################################ + +RUN microdnf update -y && \ + microdnf install -y \ + git \ + tar \ + wget \ + gcc \ + gcc-c++ \ + make \ + python3.12 \ + python3.12-devel \ + openssl-devel \ + libffi-devel \ + rust \ + cargo \ + findutils && \ + microdnf clean all + +############################################################ +# Install uv +############################################################ + +RUN curl -LsSf https://astral.sh/uv/install.sh | sh + +############################################################ +# Clone AgentStack +############################################################ + +WORKDIR /app + +RUN git clone https://github.com/i-am-bee/agentstack.git . + +RUN git fetch --all --tags && \ + git checkout ${AGENTSTACK_VERSION} + +############################################################ +# Apply your patch +############################################################ + +RUN wget -O /tmp/agentstack.patch https://raw.githubusercontent.com/Simran-Sirsat/build-scripts/agentstack-form/a/agentstack/agentstack_v0.4.3.patch && \ + git apply /tmp/agentstack.patch + + +############################################################ +# Build Form Agent +############################################################ + +WORKDIR /app/agents/form + +RUN UV_COMPILE_BYTECODE=1 \ + HOME=/tmp \ + uv sync + +############################################################ +# Cleanup builder +############################################################ + +RUN rm -rf \ + /root/.cache \ + /root/.cargo/registry \ + /root/.cargo/git \ + /root/agentstack/.git \ + /tmp/* + +############################################################ +# STAGE 2 - Runtime +############################################################ + +FROM registry.access.redhat.com/ubi9/ubi-minimal:${BASE_UBI_IMAGE_TAG} + +ARG RELEASE_VERSION=main + +ENV PRODUCTION_MODE=True \ + RELEASE_VERSION=${RELEASE_VERSION} + +############################################################ +# Runtime dependencies +############################################################ + +RUN microdnf update -y && \ + microdnf install -y \ + python3.12 \ + ca-certificates && \ + microdnf clean all + +############################################################ +# Copy application +############################################################ + +COPY --from=builder \ + /app/apps/agentstack-sdk-py /app/apps/agentstack-sdk-py \ + /app/apps/agentstack-sdk-py + +COPY --from=builder \ + /app/agents/form \ + /app/agents/form + +############################################################ +# Remove non-runtime files +############################################################ + +RUN rm -rf \ + /app/apps/agentstack-sdk-py/tests \ + /app/apps/agentstack-sdk-py/examples \ + /tmp/* + +############################################################ +# Runtime +############################################################ + +WORKDIR /app/agents/form + +CMD ["/app/agents/form/.venv/bin/server"] diff --git a/a/agentstack/LICENSE b/a/agentstack/LICENSE new file mode 100644 index 0000000000..980a15ac24 --- /dev/null +++ b/a/agentstack/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "{}" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright {yyyy} {name of copyright owner} + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/a/agentstack/agentstack_v0.4.3.patch b/a/agentstack/agentstack_v0.4.3.patch new file mode 100644 index 0000000000..ea7abd12ac --- /dev/null +++ b/a/agentstack/agentstack_v0.4.3.patch @@ -0,0 +1,177 @@ +diff --git a/agents/chat/pyproject.toml b/agents/chat/pyproject.toml +index 83cfeaf2..3f0c5761 100644 +--- a/agents/chat/pyproject.toml ++++ b/agents/chat/pyproject.toml +@@ -5,7 +5,7 @@ description = "AI-powered conversational system with memory and tools." + authors = [ + { name = "IBM Corp." }, + ] +-requires-python = ">=3.13,<3.14" ++requires-python = ">=3.12,<3.14" + dependencies = [ + "beeai-framework[duckduckgo,wikipedia,a2a]>=0.1.70", + "tiktoken>=0.12.0", # constraint for beeai-framework dependency (first version with musl arm64 wheel) +@@ -15,13 +15,26 @@ dependencies = [ + "openinference-instrumentation-beeai>=0.1.12", + "pydantic-settings>=2.9.0", + "uvicorn>=0.35.0", ++ "grpcio==1.80.0", ++ "grpcio-tools==1.80.0", + ] + + [tool.ruff] + line-length = 120 + ++[[tool.uv.index]] ++name = "pypi" ++url = "https://pypi.org/simple" ++ ++[[tool.uv.index]] ++name = "ibm" ++url = "https://wheels.developerfirst.ibm.com/ppc64le/linux" ++ + [tool.uv.sources] + agentstack-sdk = { path = "../../apps/agentstack-sdk-py", editable = true } ++primp = { index = "ibm" } ++grpcio = { index = "ibm" } ++grpcio-tools = { index = "ibm" } + + [project.scripts] + server = "chat.agent:serve" +diff --git a/agents/form/pyproject.toml b/agents/form/pyproject.toml +index b97e2d8a..efa4dc75 100644 +--- a/agents/form/pyproject.toml ++++ b/agents/form/pyproject.toml +@@ -5,7 +5,7 @@ description = "Agent with structured input." + authors = [ + { name = "IBM Corp." }, + ] +-requires-python = ">=3.13,<3.14" ++requires-python = ">=3.12,<3.14" + dependencies = [ + "agentstack-sdk", + "openinference-instrumentation-beeai>=0.1.13", +diff --git a/agents/rag/pyproject.toml b/agents/rag/pyproject.toml +index 8b8c3867..f4cfbb5f 100644 +--- a/agents/rag/pyproject.toml ++++ b/agents/rag/pyproject.toml +@@ -5,7 +5,7 @@ description = "TBD" + authors = [ + { name = "IBM Corp." }, + ] +-requires-python = ">=3.13,<3.14" ++requires-python = ">=3.12,<3.14" + dependencies = [ + "beeai-framework[duckduckgo,wikipedia,a2a]>=0.1.70", + "tiktoken>=0.12.0", # constraint for beeai-framework dependency (first version with musl arm64 wheel) +@@ -17,13 +17,26 @@ dependencies = [ + "tenacity>=9.1.2", + "langchain-text-splitters>=0.3.0", + "uvicorn>=0.35.0", ++ "grpcio==1.80.0", ++ "grpcio-tools==1.80.0", + ] + + [tool.ruff] + line-length = 120 + ++[[tool.uv.index]] ++name = "pypi" ++url = "https://pypi.org/simple" ++ ++[[tool.uv.index]] ++name = "ibm" ++url = "https://wheels.developerfirst.ibm.com/ppc64le/linux" ++ + [tool.uv.sources] + agentstack-sdk = { path = "../../apps/agentstack-sdk-py", editable = true } ++primp = { index = "ibm" } ++grpcio = { index = "ibm" } ++grpcio-tools = { index = "ibm" } + + [project.scripts] + server = "rag.agent:serve" +diff --git a/apps/agentstack-cli/pyproject.toml b/apps/agentstack-cli/pyproject.toml +index 3d152a7c..4053b86d 100644 +--- a/apps/agentstack-cli/pyproject.toml ++++ b/apps/agentstack-cli/pyproject.toml +@@ -4,7 +4,7 @@ version = "0.4.3" + description = "Agent Stack CLI" + readme = "README.md" + authors = [{ name = "IBM Corp." }] +-requires-python = ">=3.13,<3.14" ++requires-python = ">=3.12,<3.14" + dependencies = [ + "anyio~=4.10.0", + "pydantic~=2.11.7", +@@ -33,8 +33,17 @@ dev = [ + "wheel>=0.45.1", + ] + ++[[tool.uv.index]] ++name = "pypi" ++url = "https://pypi.org/simple" ++ ++[[tool.uv.index]] ++name = "ibm" ++url = "https://wheels.developerfirst.ibm.com/ppc64le/linux" ++ + [tool.uv.sources] + agentstack-sdk = { path = "../agentstack-sdk-py", editable = true } ++primp = { index = "ibm" } + + [project.scripts] + agentstack = "agentstack_cli:app" +diff --git a/apps/agentstack-sdk-py/pyproject.toml b/apps/agentstack-sdk-py/pyproject.toml +index 36544359..68cd62cd 100644 +--- a/apps/agentstack-sdk-py/pyproject.toml ++++ b/apps/agentstack-sdk-py/pyproject.toml +@@ -38,6 +38,17 @@ dev = [ + requires = ["uv_build>=0.9.0,<0.10.0"] + build-backend = "uv_build" + ++[[tool.uv.index]] ++name = "pypi" ++url = "https://pypi.org/simple" ++ ++[[tool.uv.index]] ++name = "ibm" ++url = "https://wheels.developerfirst.ibm.com/ppc64le/linux" ++ ++[tool.uv.sources] ++primp = { index = "ibm" } ++ + [tool.ruff] + line-length = 120 + target-version = "py311" +diff --git a/apps/agentstack-server/pyproject.toml b/apps/agentstack-server/pyproject.toml +index 4e294d97..5d613ac2 100644 +--- a/apps/agentstack-server/pyproject.toml ++++ b/apps/agentstack-server/pyproject.toml +@@ -4,7 +4,7 @@ version = "0.4.3" + description = "Agent Stack server" + readme = "README.md" + authors = [{ name = "IBM Corp." }] +-requires-python = "==3.13.*" ++requires-python = "==3.12.*" + dependencies = [ + "a2a-sdk~=0.3.9", + "aiohttp>=3.11.11", +@@ -62,8 +62,17 @@ dev = [ + "agentstack-sdk", + ] + ++[[tool.uv.index]] ++name = "pypi" ++url = "https://pypi.org/simple" ++ ++[[tool.uv.index]] ++name = "ibm" ++url = "https://wheels.developerfirst.ibm.com/ppc64le/linux" ++ + [tool.uv.sources] + agentstack-sdk = { path = "../agentstack-sdk-py", editable = true } ++primp = { index = "ibm" } + + [project.scripts] + agentstack-server = "agentstack_server:serve" diff --git a/a/agentstack/build_info.json b/a/agentstack/build_info.json new file mode 100644 index 0000000000..ace26ccfe1 --- /dev/null +++ b/a/agentstack/build_info.json @@ -0,0 +1,24 @@ +{ + "maintainer": "Simran.Sirsat@ibm.com", + "package_name": "agentstack", + "github_url": "https://github.com/i-am-bee/agentstack", + "version": "v0.4.3", + "required_versions":{"Releases": ["*"], "Tags": ["*"]}, + "default_branch": "master", + "build_script": "agentstack_v0.4.3_ubi9.7.sh", + "package_dir": "a/agentstack", + "use_non_root_user": false, + "validate_build_script":false, + "docker_build": true, + "docker_cmd": "docker build -f ${dir}/Dockerfile -t ${package_name}-ppc64le:${PACKAGE_VERSION} .", + "wheel_build" : false, + "v0.4.3": { + "build_script": "agentstack_v0.4.3_ubi9.7.sh", + "dir": "v0.4.3", + "base_docker_image": "ubi-minimal", + "base_docker_variant": "9.8" + }, + "*": { + "build_script": "agentstack_v0.4.3_ubi9.7.sh" + } +}