remove everything related to ChatMessage and Tool

deepset-ai · Jan 17, 2025 · de4ab29 · de4ab29
1 parent 41903c1
commit de4ab29
Show file tree

Hide file tree

Showing 35 changed files with 49 additions and 13,917 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -30,13 +30,7 @@ env:
   HATCH_VERSION: "1.13.0"
   PYTHONUNBUFFERED: "1"
   FORCE_COLOR: "1"
-  ANTHROPIC_API_KEY: ${{ secrets.ANTHROPIC_API_KEY }}
   OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
-  COHERE_API_KEY: ${{ secrets.COHERE_API_KEY }}
-  FIRECRAWL_API_KEY: ${{ secrets.FIRECRAWL_API_KEY }}
-  SERPERDEV_API_KEY: ${{ secrets.SERPERDEV_API_KEY }}
-  HF_API_TOKEN: ${{ secrets.HF_API_TOKEN }}
-  OLLAMA_LLM_FOR_TESTS: "llama3.2:3b"
 
 jobs:
   linting:
@@ -119,26 +113,5 @@ jobs:
       - name: Install Hatch
         run: pip install hatch==${{ env.HATCH_VERSION }}
 
-      - name: Install Ollama and pull the required models
-        if: matrix.os == 'ubuntu-latest'
-        run: |
-          curl -fsSL https://ollama.com/install.sh | sh
-          ollama serve &
-
-          # Check if the service is up and running with a timeout of 60 seconds
-          timeout=60
-          while [ $timeout -gt 0 ] && ! curl -sSf http://localhost:11434/ > /dev/null; do
-            echo "Waiting for Ollama service to start..."
-            sleep 5
-            ((timeout-=5))
-          done
-
-          if [ $timeout -eq 0 ]; then
-            echo "Timed out waiting for Ollama service to start."
-            exit 1
-          fi
-
-          ollama pull ${{ env.OLLAMA_LLM_FOR_TESTS }}
-
       - name: Run
         run: hatch run test:integration
diff --git a/README.md b/README.md
@@ -39,7 +39,6 @@ that includes it. Once it reaches the end of its lifespan, the experiment will b
 | Name                                                                                                                                                                                                                                                                                         | Type                                     | Expected End Date | Dependencies | Cookbook                                                                                                                                                                                                                                             | Discussion                                                                     |
 | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------- | ----------------- | ------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------ |
 | [`EvaluationHarness`][1]                                                                                                                                                                                                                                                                     | Evaluation orchestrator                  | October 2024      | None         | <a href="https://colab.research.google.com/github/deepset-ai/haystack-cookbook/blob/main/notebooks/rag_eval_harness.ipynb" target="_parent"><img src="https://colab.research.google.com/assets/colab-badge.svg" alt="Open In Colab"/></a>            | [Discuss](https://github.com/deepset-ai/haystack-experimental/discussions/74)  |
-| Support for Tools: [refactored `ChatMessage` dataclass][10], [`Tool` dataclass][4], [refactored `OpenAIChatGenerator`][11], [refactored `OllamaChatGenerator`][14], [refactored `HuggingFaceAPIChatGenerator`][15], [refactored `AnthropicChatGenerator`][16], [`ToolInvoker` component][12] | Tool Calling support                     | November 2024     | jsonschema   | <a href="https://colab.research.google.com/github/deepset-ai/haystack-cookbook/blob/main/notebooks/tools_support.ipynb" target="_parent"><img src="https://colab.research.google.com/assets/colab-badge.svg" alt="Open In Colab"/>                   | [Discuss](https://github.com/deepset-ai/haystack-experimental/discussions/98)  |
 | [`ChatMessageWriter`][5]                                                                                                                                                                                                                                                                     | Memory Component                         | December 2024     | None         | <a href="https://colab.research.google.com/github/deepset-ai/haystack-cookbook/blob/main/notebooks/conversational_rag_using_memory.ipynb" target="_parent"><img src="https://colab.research.google.com/assets/colab-badge.svg" alt="Open In Colab"/> | [Discuss](https://github.com/deepset-ai/haystack-experimental/discussions/75)  |
 | [`ChatMessageRetriever`][6]                                                                                                                                                                                                                                                                  | Memory Component                         | December 2024     | None         | <a href="https://colab.research.google.com/github/deepset-ai/haystack-cookbook/blob/main/notebooks/conversational_rag_using_memory.ipynb" target="_parent"><img src="https://colab.research.google.com/assets/colab-badge.svg" alt="Open In Colab"/> | [Discuss](https://github.com/deepset-ai/haystack-experimental/discussions/75)  |
 | [`InMemoryChatMessageStore`][7]                                                                                                                                                                                                                                                              | Memory Store                             | December 2024     | None         | <a href="https://colab.research.google.com/github/deepset-ai/haystack-cookbook/blob/main/notebooks/conversational_rag_using_memory.ipynb" target="_parent"><img src="https://colab.research.google.com/assets/colab-badge.svg" alt="Open In Colab"/> | [Discuss](https://github.com/deepset-ai/haystack-experimental/discussions/75)  |
@@ -50,21 +49,19 @@ that includes it. Once it reaches the end of its lifespan, the experiment will b
 [1]: https://github.com/deepset-ai/haystack-experimental/tree/main/haystack_experimental/evaluation/harness
 [2]: https://github.com/deepset-ai/haystack-experimental/tree/fe20b69b31243f8a3976e4661d9aa8c88a2847d2/haystack_experimental/components/tools/openai
 [3]: https://github.com/deepset-ai/haystack-experimental/tree/fe20b69b31243f8a3976e4661d9aa8c88a2847d2/haystack_experimental/components/tools/openapi
-[4]: https://github.com/deepset-ai/haystack-experimental/tree/main/haystack_experimental/dataclasses/tool.py
 [5]: https://github.com/deepset-ai/haystack-experimental/blob/main/haystack_experimental/components/writers/chat_message_writer.py
 [6]: https://github.com/deepset-ai/haystack-experimental/blob/main/haystack_experimental/components/retrievers/chat_message_retriever.py
 [7]: https://github.com/deepset-ai/haystack-experimental/blob/main/haystack_experimental/chat_message_stores/in_memory.py
 [8]: https://github.com/deepset-ai/haystack-experimental/blob/main/haystack_experimental/components/retrievers/auto_merging_retriever.py
 [9]: https://github.com/deepset-ai/haystack-experimental/blob/main/haystack_experimental/components/splitters/hierarchical_doc_splitter.py
-[10]: https://github.com/deepset-ai/haystack-experimental/blob/main/haystack_experimental/dataclasses/chat_message.py
-[11]: https://github.com/deepset-ai/haystack-experimental/blob/main/haystack_experimental/components/generators/chat/openai.py
-[12]: https://github.com/deepset-ai/haystack-experimental/blob/main/haystack_experimental/components/tools/tool_invoker.py
 [13]: https://github.com/deepset-ai/haystack-experimental/blob/main/haystack_experimental/components/extractors/llm_metadata_extractor.py
-[14]: https://github.com/deepset-ai/haystack-experimental/blob/main/haystack_experimental/components/generators/ollama/chat/chat_generator.py
-[15]: https://github.com/deepset-ai/haystack-experimental/blob/main/haystack_experimental/components/generators/chat/hugging_face_api.py
-[16]: https://github.com/deepset-ai/haystack-experimental/blob/main/haystack_experimental/components/generators/anthropic/chat/chat_generator.py
 [17]: https://github.com/deepset-ai/haystack-experimental/blob/main/haystack_experimental/core/pipeline/async_pipeline.py
 
+### Adopted experiments
+| Name                        | Type                       | Final release | Cookbook                                                                                                                                 |
+| --------------------------- | -------------------------- | ------------- | ---------------------------------------------------------------------------------------------------------------------------------------- |
+| `ChatMessage` refactoring; `Tool` class; tool support in ChatGenerators; `ToolInvoker` | Tool Calling support | 0.4.0         | |
+
 ### Discontinued experiments
 
 | Name                        | Type                       | Final release | Cookbook                                                                                                                                 |

diff --git a/docs/pydoc/config/builders_api.yml b/docs/pydoc/config/builders_api.yml
diff --git a/docs/pydoc/config/data_classes_api.yml b/docs/pydoc/config/data_classes_api.yml
diff --git a/docs/pydoc/config/generators_api.yml b/docs/pydoc/config/generators_api.yml
@@ -1,10 +1,7 @@
 loaders:
   - type: haystack_pydoc_tools.loaders.CustomPythonLoader
     search_path: [../../../]
-    modules: ["haystack_experimental.components.generators.chat.openai",
-              "haystack_experimental.components.generators.chat.hugging_face_api",
-              "haystack_experimental.components.generators.anthropic.chat.chat_generator",
-              "haystack_experimental.components.generators.ollama.chat.chat_generator"]
+    modules: ["haystack_experimental.components.generators.chat.openai"]
     ignore_when_discovered: ["__init__"]
 processors:
   - type: filter

diff --git a/docs/pydoc/config/tools_api.yml b/docs/pydoc/config/tools_api.yml
diff --git a/examples/async_pipeline.ipynb b/examples/async_pipeline.ipynb
@@ -196,9 +196,9 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from haystack_experimental.components.builders import ChatPromptBuilder\n",
+    "from haystack.components.builders import ChatPromptBuilder\n",
     "from haystack_experimental.components.generators.chat import OpenAIChatGenerator\n",
-    "from haystack_experimental.dataclasses import ChatMessage\n",
+    "from haystack.dataclasses import ChatMessage\n",
     "\n",
     "template = \"\"\"\n",
     "Given the following information, answer the question.\n",