-
Notifications
You must be signed in to change notification settings - Fork 199
feat: add CometAPI integration with CometAPIChatGenerator class and configuration #2345
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
garybadwal
wants to merge
78
commits into
deepset-ai:main
Choose a base branch
from
garybadwal:cometapi
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+1,743
−0
Open
Changes from 64 commits
Commits
Show all changes
78 commits
Select commit
Hold shift + click to select a range
85a7ef2
feat: Add GoogleAITextEmbedder and GoogleAIDocumentEmbedder components
garybadwal b9f94c7
fix: Improve error messages for input type validation in GoogleAIText…
garybadwal 15fd085
Merge branch 'deepset-ai:main' into main
garybadwal 682a4e2
feat: add Google GenAI embedder components for document and text embe…
garybadwal 778f702
feat: add unit tests for GoogleAIDocumentEmbedder and GoogleAITextEmb…
garybadwal 3de6d1e
refactor: clean up imports and improve list handling in GoogleAIDocum…
garybadwal 7fcfb14
Merge branch 'main' into main
garybadwal c85dadb
Merge branch 'main' into main
garybadwal 9c6cb1a
refactor: Rename classes and update imports for Google GenAI components
garybadwal 89bb3be
feat: Add additional modules for Google GenAI embedders in config
garybadwal ea0c0c9
Merge branch 'main' into main
garybadwal 814f53c
Merge branch 'main' into main
garybadwal f2d2a0c
chore: add 'more-itertools' to lint environment dependencies
garybadwal 171ab37
refactor: update GoogleGenAIDocumentEmbedder and GoogleGenAITextEmbed…
garybadwal f20bdff
refactor: update _prepare_texts_to_embed to return a list instead of …
garybadwal 38525c0
refactor: format code for better readability and consistency in docum…
garybadwal f8e5f8a
refactor: improve code formatting for consistency and readability in …
garybadwal 666d0d5
refactor: update _prepare_texts_to_embed to return a list instead of …
garybadwal 0b8d687
feat: add new author to project metadata in pyproject.toml
garybadwal c323a34
Merge branch 'main' into main
garybadwal 94b31ae
Merge branch 'main' into main
garybadwal 706de87
feat: add asynchronous embedding methods for GoogleGenAIDocumentEmbed…
garybadwal e9a3a4b
Merge branch 'main' of https://github.com/garybadwal/haystack-core-in…
garybadwal ef9dd82
Merge branch 'main' into google-genai-embedders-async-runs
garybadwal 5271ff4
Merge pull request #1 from garybadwal/google-genai-embedders-async-runs
garybadwal 818e40d
fix: ensure consistent formatting for pylint
garybadwal 4909c01
fix: update return type annotation for run_async method in GoogleGenA…
garybadwal 8f6f9f1
fix: update return type annotation for run_async method in GoogleGenA…
garybadwal 37c5c12
Merge branch 'main' into main
davidsbatista 60a4506
fix: update return type annotation and handle None values in _embed_b…
garybadwal 21940c2
Merge branch 'main' of https://github.com/garybadwal/haystack-core-in…
garybadwal 8734e26
fix: remove unnecessary blank line in _embed_batch_async method
garybadwal 15078ea
feat: add CometAPI integration with CometAPIChatGenerator class and c…
garybadwal 8016a5a
Merge branch 'main' into cometapi
garybadwal 0a41455
Merge branch 'main' into cometapi
garybadwal 6c8c641
feat: add CometAPI integration with chat generator and tests
garybadwal 07fd84f
Merge branch 'cometapi' of https://github.com/garybadwal/haystack-cor…
garybadwal 951d6de
Merge branch 'main' into cometapi
garybadwal 6f0d695
feat: add CometAPI integration with workflow and labeler configuration
garybadwal c122e2e
feat: add CometAPI integration to the inventory in README
garybadwal e8fea27
feat: refactor CometAPIChatGenerator initialization and update test f…
garybadwal e16da5f
feat: add pytz dependency to test environment
garybadwal 052bac7
feat: clean up CometAPIChatGenerator constructor formatting and add b…
garybadwal 9191c7e
feat: update type hints for streaming_callback and tools in CometAPIC…
garybadwal 585afa2
feat: update streaming_callback type hint to use StreamingCallbackT f…
garybadwal a455c8c
feat: remove unused Awaitable and Callable imports in chat_generator.py
garybadwal 63cadfa
feat: add initial Changelog file for CometAPI integration
garybadwal e4e50fa
feat: add pytz dependency to test environment and update mypy configu…
garybadwal 47c4766
feat: remove unused mock_async_chat_completion fixture from test_run_…
garybadwal 1cd84d0
feat: update mypy configuration to ignore missing imports for jsonref…
garybadwal 44fbcc3
feat: add type hints for api_key and model parameters in CometAPIChat…
garybadwal 470abc7
style: format parameter definitions in CometAPIChatGenerator constructor
garybadwal 35453f4
docs: add CometAPI resources section to README
garybadwal f7084af
Merge branch 'main' into cometapi
garybadwal c0ae33b
docs: enhance usage description in README for CometAPI integration
garybadwal 47fdda1
Refactor CometAPIChatGenerator tests: consolidate async tests into a …
garybadwal 7fcf5ba
refactor: simplify type declarations in TestCometAPIChatGenerator tests
garybadwal d81d5ab
fix: correct function reference in TestCometAPIChatGenerator
garybadwal e9fabf5
refactor: remove redundant YAML serialization/deserialization in Test…
garybadwal 089ffb8
Merge branch 'main' into cometapi
garybadwal e1cb79f
Merge branch 'main' into cometapi
garybadwal fbe7bf7
Merge branch 'main' into cometapi
garybadwal da25aad
Merge branch 'main' into cometapi
garybadwal 9b0ee8d
Merge branch 'main' into cometapi
garybadwal a85ca39
Fixed the type issue
garybadwal 96c7c2a
Merge branch 'main' into cometapi
mpangrazzi 5d104d0
Merge branch 'main' into cometapi
garybadwal f08628d
Fixes for:
garybadwal 73d6e03
Fixed the test-cases
garybadwal 8619650
Fixed the linting issue
garybadwal e19897c
Fix test-cases
garybadwal 1219022
Fix test cases
garybadwal 6b093c6
Fixed formating
garybadwal bab67b4
Fixed test case
garybadwal a8db95b
Merge branch 'main' into cometapi
garybadwal aa086d5
Merge branch 'main' into cometapi
garybadwal 9b915ae
Merge branch 'main' into cometapi
garybadwal 9f6ec57
Merge branch 'main' into cometapi
garybadwal File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,83 @@ | ||
| # This workflow comes from https://github.com/ofek/hatch-mypyc | ||
| # https://github.com/ofek/hatch-mypyc/blob/5a198c0ba8660494d02716cfc9d79ce4adfb1442/.github/workflows/test.yml | ||
| name: Test / cometapi | ||
|
|
||
| on: | ||
| schedule: | ||
| - cron: "0 0 * * *" | ||
| pull_request: | ||
| paths: | ||
| - "integrations/cometapi/**" | ||
| - "!integrations/cometapi/*.md" | ||
| - ".github/workflows/cometapi.yml" | ||
|
|
||
| defaults: | ||
| run: | ||
| working-directory: integrations/cometapi | ||
|
|
||
| concurrency: | ||
| group: cometapi-${{ github.head_ref }} | ||
| cancel-in-progress: true | ||
|
|
||
| env: | ||
| PYTHONUNBUFFERED: "1" | ||
| FORCE_COLOR: "1" | ||
| COMET_API_KEY: "${{ secrets.COMET_API_KEY }}" | ||
|
|
||
| jobs: | ||
| run: | ||
| name: Python ${{ matrix.python-version }} on ${{ startsWith(matrix.os, 'macos-') && 'macOS' || startsWith(matrix.os, 'windows-') && 'Windows' || 'Linux' }} | ||
| runs-on: ${{ matrix.os }} | ||
| strategy: | ||
| fail-fast: false | ||
| matrix: | ||
| os: [ubuntu-latest, windows-latest, macos-latest] | ||
| python-version: ["3.9", "3.13"] | ||
| max-parallel: 2 # to avoid "429 Resource has been exhausted" | ||
|
|
||
| steps: | ||
| - name: Support longpaths | ||
| if: matrix.os == 'windows-latest' | ||
| working-directory: . | ||
| run: git config --system core.longpaths true | ||
|
|
||
| - uses: actions/checkout@v5 | ||
|
|
||
| - name: Set up Python ${{ matrix.python-version }} | ||
| uses: actions/setup-python@v6 | ||
| with: | ||
| python-version: ${{ matrix.python-version }} | ||
|
|
||
| - name: Install Hatch | ||
| run: pip install --upgrade hatch | ||
| - name: Lint | ||
| if: matrix.python-version == '3.9' && runner.os == 'Linux' | ||
| run: hatch run fmt-check && hatch run test:types | ||
|
|
||
| - name: Generate docs | ||
| if: matrix.python-version == '3.9' && runner.os == 'Linux' | ||
| run: hatch run docs | ||
|
|
||
| - name: Run tests | ||
| run: hatch run test:cov-retry | ||
|
|
||
| - name: Run unit tests with lowest direct dependencies | ||
| run: | | ||
| hatch run uv pip compile pyproject.toml --resolution lowest-direct --output-file requirements_lowest_direct.txt | ||
| hatch run uv pip install -r requirements_lowest_direct.txt | ||
| hatch run test:unit | ||
|
|
||
| - name: Nightly - run unit tests with Haystack main branch | ||
| if: github.event_name == 'schedule' | ||
| run: | | ||
| hatch env prune | ||
| hatch run uv pip install git+https://github.com/deepset-ai/haystack.git@main | ||
| hatch run test:unit | ||
|
|
||
| - name: Send event to Datadog for nightly failures | ||
| if: failure() && github.event_name == 'schedule' | ||
| uses: ./.github/actions/send_failure | ||
| with: | ||
| title: | | ||
| Core integrations nightly tests failure: ${{ github.workflow }} | ||
| api-key: ${{ secrets.CORE_DATADOG_API_KEY }} | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| # Changelog |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,192 @@ | ||
| 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 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 | ||
| (which shall not include communications that are marked or | ||
| designated in writing by the copyright owner as "Not a Contribution"). | ||
|
|
||
| "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 use, reproduce, modify, distribute, and 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, trademark, patent, | ||
| attribution and other 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 notice 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 Support. You may choose to offer, and to | ||
| charge a fee for, warranty, support, 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 support. | ||
|
|
||
| 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 page as the copyright notice for easier identification within | ||
| third-party archives. | ||
|
|
||
| Copyright 2023-present deepset GmbH | ||
|
|
||
| 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. |
garybadwal marked this conversation as resolved.
Show resolved
Hide resolved
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| # Comet API Haystack Integration | ||
|
|
||
| [](https://pypi.org/project/cometapi-haystack) | ||
| [](https://pypi.org/project/cometapi-haystack) | ||
|
|
||
| ----- | ||
|
|
||
| **CometAPI Resources** | ||
| - [Website](https://www.cometapi.com/?utm_source=haystack&utm_campaign=integration&utm_medium=integration&utm_content=integration) | ||
| - [Documentation](https://api.cometapi.com/doc) | ||
| - [Get an API Key](https://api.cometapi.com/console/token) | ||
| - [Pricing](https://api.cometapi.com/pricing) | ||
|
|
||
| **Table of Contents** | ||
|
|
||
| - [Installation](#installation) | ||
| - [Usage](#usage) | ||
| - [License](#license) | ||
|
|
||
| ## Installation | ||
|
|
||
| ```console | ||
| pip install cometapi-haystack | ||
| ``` | ||
|
|
||
| ## Usage | ||
|
|
||
| This integration offers a set of pre-built components that allow developers to interact seamlessly with AI models using the new Comet APIs. | ||
|
|
||
| ### Chat Generator | ||
|
|
||
| ```python | ||
| from haystack.dataclasses.chat_message import ChatMessage | ||
| from haystack_integrations.components.generators.cometapi import CometAPIChatGenerator | ||
|
|
||
| # Initialize the chat generator | ||
| chat_generator = CometAPIChatGenerator(model="grok-3-mini") | ||
|
|
||
| # Generate a response | ||
| messages = [ChatMessage.from_user("Tell me about the future of AI")] | ||
| response = chat_generator.run(messages=messages) | ||
| print(response["replies"][0].text) | ||
| ``` | ||
|
|
||
|
|
||
| ## License | ||
|
|
||
| `cometapi-haystack` is distributed under the terms of the [Apache-2.0](https://spdx.org/licenses/Apache-2.0.html) license. |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.