unique_toolkit 0.8.4__py3-none-any.whl → 0.8.6__py3-none-any.whl

unique_toolkit/tools/utils/source_handling/tests/test_source_formatting.py

@@ -0,0 +1,215 @@
+import pytest
+from unique_toolkit.content.schemas import ContentChunk
+from unique_toolkit.tools.utils.source_handling.schema import SourceFormatConfig
+from unique_toolkit.tools.utils.source_handling.source_formatting import (
+    _format_page_range,
+    format_chunk,
+)
+
+
+@pytest.fixture
+def default_config():
+    return SourceFormatConfig()
+
+
+@pytest.fixture
+def xml_style_config_without_page_number():
+    return SourceFormatConfig(
+        source_template="<source${index}>${document}${info}${text}</source${index}>",
+        sections={
+            "document": "<|document|>{}<|/document|>\n",
+            "info": "<|info|>{}<|/info|>\n",
+        },
+    )
+
+
+@pytest.fixture
+def xml_style_config_with_page_number():
+    return SourceFormatConfig(
+        source_template="<source${index}>${document}${page}${info}${text}</source${index}>",
+        sections={
+            "document": "<|document|>{}<|/document|>\n",
+            "info": "<|info|>{}<|/info|>\n",
+            "page": "<|page|>{}<|/page|>\n",
+        },
+    )
+
+
+@pytest.fixture
+def xml_style_config_with_metadata():
+    return SourceFormatConfig(
+        source_template="<source${index}>${document}${date}${text}</source${index}>",
+        sections={
+            "document": "<|document|>{}<|/document|>\n",
+            "date": "<|DateFromMetaData|>{}<|/DateFromMetaData|>\n",
+        },
+    )
+
+
+@pytest.fixture
+def json_style_config():
+    return SourceFormatConfig(
+        source_template="{'source_number': ${index}, 'content': '${document}${page}${info}${text}'}",
+        sections={
+            "document": "<|document|>{}<|/document|>\n",
+            "info": "<|info|>{}<|/info|>\n",
+            "page": "<|page|>{}<|/page|>\n",
+        },
+    )
+
+
+def test_format_page_range():
+    # Test same start and end page
+    chunk = ContentChunk(id="1", order=1, text="test", start_page=1, end_page=1)
+    assert _format_page_range(chunk) == "1"
+
+    # Test page range
+    chunk = ContentChunk(id="1", order=1, text="test", start_page=1, end_page=3)
+    assert _format_page_range(chunk) == "1 - 3"
+
+    # Test invalid pages
+    chunk = ContentChunk(id="1", order=1, text="test", start_page=0, end_page=0)
+    assert _format_page_range(chunk) == ""
+
+
+def test_json_style_formatting(json_style_config):
+    chunk = ContentChunk(
+        id="1",
+        order=1,
+        text="<|document|>Doc1<|/document|>\n<|info|>Important<|/info|>\nContent text",
+        start_page=1,
+        end_page=2,
+    )
+
+    formatted = format_chunk(1, chunk, json_style_config)
+    expected = "{'source_number': 1, 'content': '<|document|>Doc1<|/document|>\n<|page|>1 - 2<|/page|>\n<|info|>Important<|/info|>\nContent text'}"
+    assert formatted == expected
+
+
+def test_metadata_handling(xml_style_config_with_metadata):
+    # Test with metadata that matches a section name
+    chunk = ContentChunk(
+        id="1",
+        order=1,
+        text="<|document|>Doc1<|/document|>\nContent text",
+        metadata={
+            "key": "metadata-key",
+            "mimeType": "text/plain",
+            "date": "12.03.2025",
+        },  # type: ignore
+    )
+
+    formatted = format_chunk(1, chunk, xml_style_config_with_metadata)
+    expected = "<source1><|document|>Doc1<|/document|>\n<|DateFromMetaData|>12.03.2025<|/DateFromMetaData|>\nContent text</source1>"
+    assert formatted == expected
+
+    # Test with metadata that doesn't match a section name
+    chunk = ContentChunk(
+        id="1",
+        order=1,
+        text="<|document|>Doc1<|/document|>\nContent text",
+        metadata={
+            "key": "metadata-key",
+            "mimeType": "text/plain",
+            "unrelated_key": "Some value",
+        },  # type: ignore
+    )
+
+    formatted = format_chunk(1, chunk, xml_style_config_with_metadata)
+    expected = "<source1><|document|>Doc1<|/document|>\nContent text</source1>"
+    assert formatted == expected
+
+    # Test with minimal metadata
+    chunk = ContentChunk(
+        id="1",
+        order=1,
+        text="<|document|>Doc1<|/document|>\nContent text",
+        metadata={"key": "metadata-key", "mimeType": "text/plain"},  # type: ignore
+    )
+
+    formatted = format_chunk(1, chunk, xml_style_config_with_metadata)
+    expected = "<source1><|document|>Doc1<|/document|>\nContent text</source1>"
+    assert formatted == expected
+
+
+def test_default_style(
+    default_config,
+):
+    chunk = ContentChunk(
+        id="1",
+        order=1,
+        text="<|document|>Doc1<|/document|>\n<|info|>Important<|/info|>\nContent text",
+        start_page=1,
+        end_page=2,
+    )
+
+    formatted = format_chunk(1, chunk, default_config)
+    expected = "<source1><|document|>Doc1<|/document|>\n<|info|>Important<|/info|>\nContent text</source1>"
+    assert formatted == expected
+
+
+def test_xml_style_without_page_number_formatting(
+    xml_style_config_without_page_number,
+):
+    chunk = ContentChunk(
+        id="1",
+        order=1,
+        text="<|document|>Doc1<|/document|>\n<|info|>Important<|/info|>\nContent text",
+        start_page=1,
+        end_page=2,
+    )
+
+    formatted = format_chunk(1, chunk, xml_style_config_without_page_number)
+    expected = "<source1><|document|>Doc1<|/document|>\n<|info|>Important<|/info|>\nContent text</source1>"
+    assert formatted == expected
+
+
+def test_xml_style_with_page_number_formatting(
+    xml_style_config_with_page_number,
+):
+    chunk = ContentChunk(
+        id="1",
+        order=1,
+        text="<|document|>Doc1<|/document|>\n<|info|>Important<|/info|>\nContent text",
+        start_page=1,
+        end_page=2,
+    )
+
+    formatted = format_chunk(1, chunk, xml_style_config_with_page_number)
+    expected = "<source1><|document|>Doc1<|/document|>\n<|page|>1 - 2<|/page|>\n<|info|>Important<|/info|>\nContent text</source1>"
+    assert formatted == expected
+
+
+def test_special_characters_handling(json_style_config):
+    chunk = ContentChunk(
+        id="1",
+        order=1,
+        text="<|document|>Doc's \"title\"<|/document|>\n<|info|>Info with {brackets}<|/info|>\nContent: with 'quotes'",
+        start_page=1,
+        end_page=1,
+    )
+
+    formatted = format_chunk(1, chunk, json_style_config)
+    expected = "{'source_number': 1, 'content': '<|document|>Doc's \"title\"<|/document|>\n<|page|>1<|/page|>\n<|info|>Info with {brackets}<|/info|>\nContent: with 'quotes''}"
+    assert formatted == expected
+
+
+def test_empty_sections(xml_style_config_without_page_number, json_style_config):
+    chunk = ContentChunk(
+        id="1",
+        order=1,
+        text="Just plain text without any sections",
+        start_page=None,
+        end_page=None,
+    )
+
+    # Test XML style
+    xml_formatted = format_chunk(1, chunk, xml_style_config_without_page_number)
+    assert xml_formatted == "<source1>Just plain text without any sections</source1>"
+
+    # Test JSON style
+    json_formatted = format_chunk(1, chunk, json_style_config)
+    assert (
+        json_formatted
+        == "{'source_number': 1, 'content': 'Just plain text without any sections'}"
+    )

{unique_toolkit-0.8.4.dist-info → unique_toolkit-0.8.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: unique_toolkit
-Version: 0.8.4
+Version: 0.8.6
 Summary: 
 License: Proprietary
 Author: Martin Fadler
@@ -113,6 +113,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), 
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.8.6] - 2025-08-11
+- Add GPT-5, GPT-5_MINI, GPT-5_NANO, GPT-5_CHAT to supported models list
+
+## [0.8.5] - 2025-08-06
+- Refactored tools to be in the tool-kit
+
 ## [0.8.4] - 2025-08-06
 - Make unique settings compatible with legacy environment variables
 

{unique_toolkit-0.8.4.dist-info → unique_toolkit-0.8.6.dist-info}/RECORD

@@ -10,7 +10,7 @@ unique_toolkit/app/init_logging.py,sha256=Sh26SRxOj8i8dzobKhYha2lLrkrMTHfB1V4jR3
 unique_toolkit/app/init_sdk.py,sha256=5_oDoETr6akwYyBCb0ivTdMNu3SVgPSkrXcDS6ELyY8,2269
 unique_toolkit/app/performance/async_tasks.py,sha256=H0l3OAcosLwNHZ8d2pd-Di4wHIXfclEvagi5kfqLFPA,1941
 unique_toolkit/app/performance/async_wrapper.py,sha256=yVVcRDkcdyfjsxro-N29SBvi-7773wnfDplef6-y8xw,1077
-unique_toolkit/app/schemas.py,sha256=JdC2rNVPRrr6QhGMZweE0ID760onbRY2oq9m1LVFego,7429
+unique_toolkit/app/schemas.py,sha256=J584RzwzIVSsdZyq0uVLI6efxIpWiMPKNz_IjIoOrxo,7432
 unique_toolkit/app/unique_settings.py,sha256=Gn8qxy_hNraVTTlP4wfZJzgxPU8cU6s84Uw6FK6ixGg,5946
 unique_toolkit/app/verification.py,sha256=GxFFwcJMy25fCA_Xe89wKW7bgqOu8PAs5y8QpHF0GSc,3861
 unique_toolkit/chat/__init__.py,sha256=LRs2G-JTVuci4lbtHTkVUiNcZcSR6uqqfnAyo7af6nY,619
@@ -55,13 +55,14 @@ unique_toolkit/language_model/__init__.py,sha256=lRQyLlbwHbNFf4-0foBU13UGb09lwEe
 unique_toolkit/language_model/builder.py,sha256=69WCcmkm2rMP2-YEH_EjHiEp6OzwjwCs8VbhjVJaCe0,3168
 unique_toolkit/language_model/constants.py,sha256=B-topqW0r83dkC_25DeQfnPk3n53qzIHUCBS7YJ0-1U,119
 unique_toolkit/language_model/functions.py,sha256=WhgHbJgz4Z2aZt9TLdOpI0PGyYWA5R90tdwkwdDeT8c,11987
-unique_toolkit/language_model/infos.py,sha256=Abxcw-l7UXkBohxZsigpNz0OUUCtDf404LLr7R-ys4E,33757
+unique_toolkit/language_model/infos.py,sha256=mnUnbjDQNOIuPS2VE1SsgyKOxdRulo-9Z5k7_S1Q8Cw,37631
 unique_toolkit/language_model/prompt.py,sha256=JSawaLjQg3VR-E2fK8engFyJnNdk21zaO8pPIodzN4Q,3991
 unique_toolkit/language_model/reference.py,sha256=nkX2VFz-IrUz8yqyc3G5jUMNwrNpxITBrMEKkbqqYoI,8583
-unique_toolkit/language_model/schemas.py,sha256=AeuDRJFblGzEYcEMyrlxpOPk12Di3J45I9rT2xZrhEU,14332
+unique_toolkit/language_model/schemas.py,sha256=r6c_lJ9Gl9wvY-N0FlmyFZjv5vPSc6CurFhpyST1Z5Y,14762
 unique_toolkit/language_model/service.py,sha256=zlvC_t9T1wixwcGDPRxl6yYniaKl2725NxWrbW51jUs,11290
 unique_toolkit/language_model/utils.py,sha256=bPQ4l6_YO71w-zaIPanUUmtbXC1_hCvLK0tAFc3VCRc,1902
 unique_toolkit/protocols/support.py,sha256=V15WEIFKVMyF1QCnR8vIi4GrJy4dfTCB6d6JlqPZ58o,2341
+unique_toolkit/reference_manager/reference_manager.py,sha256=FNCW4CQSsimS8UG7OTdu4-JNQXUMhPrOfRuKAbK9vvE,2305
 unique_toolkit/short_term_memory/__init__.py,sha256=2mI3AUrffgH7Yt-xS57EGqnHf7jnn6xquoKEhJqk3Wg,185
 unique_toolkit/short_term_memory/constants.py,sha256=698CL6-wjup2MvU19RxSmQk3gX7aqW_OOpZB7sbz_Xg,34
 unique_toolkit/short_term_memory/functions.py,sha256=3WiK-xatY5nh4Dr5zlDUye1k3E6kr41RiscwtTplw5k,4484
@@ -69,11 +70,19 @@ unique_toolkit/short_term_memory/schemas.py,sha256=OhfcXyF6ACdwIXW45sKzjtZX_gkcJ
 unique_toolkit/short_term_memory/service.py,sha256=5PeVBu1ZCAfyDb2HLVvlmqSbyzBBuE9sI2o9Aajqjxg,8884
 unique_toolkit/smart_rules/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 unique_toolkit/smart_rules/compile.py,sha256=cxWjb2dxEI2HGsakKdVCkSNi7VK9mr08w5sDcFCQyWI,9553
-unique_toolkit/tools/tool_definitions.py,sha256=YYu53vXMJBeJtuSU1L_FJBsiN52LSA5LIDt9O-1HBgE,4500
-unique_toolkit/tools/tool_definitionsV2.py,sha256=yjLmP85pFGd1QtIVMC3oLQPSQ2NckBj9hIihjIr2FZg,5728
-unique_toolkit/tools/tool_factory.py,sha256=ux11jd7Oobb-6eBeS51T-tviH14k6HKqsKmljA7h6qA,879
-unique_toolkit/tools/tool_progress_reporter.py,sha256=AyPdgxpd48qotJyPB8qJ7h7ghiv2w2EK8nlyqQVFRt4,8048
-unique_toolkit-0.8.4.dist-info/LICENSE,sha256=GlN8wHNdh53xwOPg44URnwag6TEolCjoq3YD_KrWgss,193
-unique_toolkit-0.8.4.dist-info/METADATA,sha256=l-59S348l-GsL9MWnt8MbhSalpI1wTmv61Tp7EUmchk,26179
-unique_toolkit-0.8.4.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-unique_toolkit-0.8.4.dist-info/RECORD,,
+unique_toolkit/tools/agent_chunks_handler.py,sha256=ORjC22ulfHTfPxUHmU7QU0H53j3AdLmt1a0opeI91V8,1809
+unique_toolkit/tools/config.py,sha256=9bYxdDuUPmAxhYyIdLbmXLzX1X2AUw--_WISQxQ4G2U,3003
+unique_toolkit/tools/factory.py,sha256=vxxchbPTrk2lVjSMdpcFN-6FRcMLiy-NgHHS3w0wYCA,1271
+unique_toolkit/tools/schemas.py,sha256=C9caE0EZNS6iGBPz2fsW5_Bao4GGGbAOda5D-XjnAQ0,4743
+unique_toolkit/tools/test/test_tool_progress_reporter.py,sha256=YCR7uJ4_sn-z3CJskzSNWNDYYcThr9m2Q6gRBxbLVfg,6298
+unique_toolkit/tools/tool.py,sha256=Zx9E5YSkzZ_ZUhxLgSLP_iDI8aYGq5wgOahMrnhfNV0,5751
+unique_toolkit/tools/tool_manager.py,sha256=m1yt45rJ0OtC7wLVG5oqf_HvZygC7wV8g9OJWwr4ups,8490
+unique_toolkit/tools/tool_progress_reporter.py,sha256=j6iVTpoLU_PjLwoK6fpIy9vmX_MLWF_-_v-nTDUcwas,7954
+unique_toolkit/tools/utils/execution/execution.py,sha256=vjG2Y6awsGNtlvyQAGCTthQ5thWHYnn-vzZXaYLb3QE,7922
+unique_toolkit/tools/utils/source_handling/schema.py,sha256=pvNhtL2daDLpCVIQpfdn6R35GvKmITVLXjZNLAwpgUE,871
+unique_toolkit/tools/utils/source_handling/source_formatting.py,sha256=C7uayNbdkNVJdEARA5CENnHtNY1SU6etlaqbgHNyxaQ,9152
+unique_toolkit/tools/utils/source_handling/tests/test_source_formatting.py,sha256=zu3AJnYH9CMqZPrxKEH3IgI-fM3nlvIBuspJG6W6B18,6978
+unique_toolkit-0.8.6.dist-info/LICENSE,sha256=GlN8wHNdh53xwOPg44URnwag6TEolCjoq3YD_KrWgss,193
+unique_toolkit-0.8.6.dist-info/METADATA,sha256=KtED18vX71U_F50SqM0mqkrj4ZQqNF1P7FBp8G5p-z4,26343
+unique_toolkit-0.8.6.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+unique_toolkit-0.8.6.dist-info/RECORD,,

unique_toolkit/tools/tool_definitions.py

@@ -1,145 +0,0 @@
-from abc import ABC, abstractmethod
-from enum import StrEnum
-from typing import Any, Generic, List, Self, TypeVar
-from unique_toolkit.language_model import LanguageModelToolDescription
-from typing_extensions import deprecated
-# import baseModel from pedantic
-from unique_toolkit.language_model import LanguageModelFunction
-from pydantic import BaseModel, Field, model_validator, root_validator
-
-from unique_toolkit.unique_toolkit.app.schemas import ChatEvent
-from unique_toolkit.unique_toolkit.tools.tool_progress_reporter import ToolProgressReporter
-
-class ToolSelectionPolicy(StrEnum):
-    """Determine the usage policy of tools."""
-
-    FORCED_BY_DEFAULT = "ForcedByDefault"
-    ON_BY_DEFAULT = "OnByDefault"
-    BY_USER = "ByUser"
-
-class UqToolName(StrEnum):
-    WEB_SEARCH = "WebSearch"
-    INTERNAL_SEARCH = "InternalSearch"
-    DOCUMENT_SUMMARIZER = "DocumentSummarizer"
-    CHART_GENERATOR = "ChartGenerator"
-    DOCUMENT_GENERATOR = "DocumentGenerator"
-    DOCUMENT_PARSER = "DocumentParser"
-    IMAGE_CONTENT = "ImageContent"
-    TABLE_SEARCH = "TableSearch"
-    BAR_CHART = "BarChart"
-    LINE_CHART = "LineChart"
-    PIE_CHART = "PieChart"
-    BASE_TOOL = "BaseTool"
-
-
-class BaseToolConfig(BaseModel):
-    pass
-    
-
-ConfigType = TypeVar("ConfigType", bound=BaseToolConfig)
-
-
-class ToolSettings(Generic[ConfigType]):
-    configuration: ConfigType
-    display_name: str
-    icon: str
-    selection_policy: ToolSelectionPolicy = Field(
-        default=ToolSelectionPolicy.BY_USER,
-    )
-    is_exclusive: bool = Field(default=False)
-    is_enabled: bool = Field(default=True)
-
-    @classmethod
-    def from_service_dict(cls, service_dict: dict[str, Any]) -> Self | None:
-        try:
-            return cls(**service_dict)
-        except (ValueError, TypeError) as e:
-            print(e)
-            return None
-
-
-class ToolCallResponse(BaseModel):
-    id: str
-    name: str
-    debug_info: dict = {}
-
-
-class ToolPromptInstructions(BaseModel):
-    system_prompt: str = Field(
-        default="",
-        description=("Helps the LLM understand how to use the tool. "
-                     "This is injected into the system prompt."
-                     "This might not be needed for every tool but some of the work better with user prompt "
-                     "instructions while others work better with system prompt instructions."),
-    )
-
-    user_prompt: str = Field(
-        default="",
-        description=("Helps the LLM understand how to use the tool. "
-                     "This is injected into the user prompt. " 
-                     "This might not be needed for every tool but some of the work better with user prompt "
-                     "instructions while others work better with system prompt instructions.")
-    )
-
-    system_prompt_tool_chosen: str = Field(
-        default="",
-        description=("Once the tool is chosen, this is injected into the system prompt"
-                     " to help the LLM understand how work with the tools results."),
-    )
-
-    user_prompt_tool_chosen: str = Field(
-        default="",
-        description=("Once the tool is chosen, this is injected into the user prompt " 
-                     "to help the LLM understand how to work with the tools results."),
-    )
-
-
-class Tool(ABC, Generic[ConfigType]):
-    name: str
-
-    def tool_description(self) -> LanguageModelToolDescription:
-        raise NotImplementedError
-    
-    
-    def get_prompt_instructions(self) -> ToolPromptInstructions:
-        return ToolPromptInstructions(
-            system_prompt="",
-            user_prompt="",
-            system_prompt_tool_chosen="",
-            user_prompt_tool_chosen="",
-        )
-
-
-    def is_exclusive(self) -> bool:
-        return self.settings.is_exclusive
-    
-    def is_enabled(self) -> bool:
-        return self.settings.is_enabled
-    
-    def display_name(self) -> str:
-        return self.settings.display_name
-    
-    def icon(self) -> str:
-        return self.settings.icon
-    
-    def tool_selection_policy(self) -> ToolSelectionPolicy:
-        return self.settings.selection_policy
-
-
-    @abstractmethod
-    async def run(self, tool_call: LanguageModelFunction) -> ToolCallResponse:
-        raise NotImplementedError
-
-   
-  
-    def __init__(
-        self,
-        settings: ToolSettings[ConfigType],
-        event: ChatEvent,
-        tool_progress_reporter: ToolProgressReporter
-    ):
-        self.settings = settings
-        self.tool_progress_reporter = tool_progress_reporter
-        self.event = event
-
-

unique_toolkit/tools/tool_definitionsV2.py

@@ -1,137 +0,0 @@
-from abc import ABC, abstractmethod
-from enum import StrEnum
-from typing import Any, Generic, List, Self, TypeVar
-from unique_toolkit.language_model import LanguageModelToolDescription
-from typing_extensions import deprecated
-# import baseModel from pedantic
-from unique_toolkit.language_model import LanguageModelFunction
-from pydantic import BaseModel, Field, model_validator, root_validator
-
-from unique_toolkit.unique_toolkit.app.schemas import ChatEvent
-from unique_toolkit.unique_toolkit.tools.tool_definitions import BaseToolConfig, Tool, ToolCallResponse, ToolPromptInstructions, ToolSettings
-from unique_toolkit.unique_toolkit.tools.tool_progress_reporter import ToolProgressReporter
-
-
-class BaseToolConfigV2(BaseToolConfig):
-    class ToolCallConfig(BaseModel):
-        description: str = Field(
-            default="Base",  
-            description="The tool description must be set by subclasses",
-        )
-
-        parameters: type[BaseModel] = Field(
-            default=BaseModel,
-            description="The tool parameters configuration must be set by subclasses",
-        )
-
-    class PromptInstructionsConfig(BaseModel):
-        system_prompt: str = Field(
-        default="",
-        description=("Helps the LLM understand how to use the tool. "
-                     "This is injected into the system prompt."
-                     "This might not be needed for every tool but some of the work better with user prompt "
-                     "instructions while others work better with system prompt instructions."),
-        )
-
-        user_prompt: str = Field(
-            default="",
-            description=("Helps the LLM understand how to use the tool. "
-                        "This is injected into the user prompt. " 
-                        "This might not be needed for every tool but some of the work better with user prompt "
-                        "instructions while others work better with system prompt instructions.")
-        )
-
-        system_prompt_tool_chosen: str = Field(
-            default="",
-            description=("Once the tool is chosen, this is injected into the system prompt"
-                        " to help the LLM understand how work with the tools results."),
-        )
-
-        user_prompt_tool_chosen: str = Field(
-            default="",
-            description=("Once the tool is chosen, this is injected into the user prompt " 
-                        "to help the LLM understand how to work with the tools results."),
-        )
-
-    tool_call: ToolCallConfig = Field(
-        default_factory=ToolCallConfig,
-        description="Configuration for the tool, including description and parameters",
-    )
-
-    prompts: PromptInstructionsConfig = Field(
-        default_factory=PromptInstructionsConfig,
-        description="Configuration for prompts related to the tool",
-    )
-
-    # This makes sure that the settings are all present in all subclasses and that they define a default value. 
-    @model_validator(mode="after")
-    def validate_tool_description(cls):
-        if cls.__class__ is BaseToolConfig:
-            return cls  # Skip validation for the base class
-        if cls.tool_call.description == "Base":
-            raise ValueError(
-                f"Subclass {cls.__class__.__name__} must define a default value for 'tool_description'."
-            )
-        if cls.tool_call.parameters == BaseModel:
-            raise ValueError(
-                f"Subclass {cls.__class__.__name__} must define a default value for 'tool_parameters_config'."
-            )
-        if cls.prompts.system_prompt == "":
-            raise ValueError(
-                f"Subclass {cls.__class__.__name__} must define a default value for 'system_prompt_base_instructions'."
-            )
-        if cls.prompts.user_prompt == "":
-            raise ValueError(
-                f"Subclass {cls.__class__.__name__} must define a default value for 'user_prompt_base_instructions'."
-            )
-        if cls.prompts.system_prompt_tool_chosen == "":
-            raise ValueError(
-                f"Subclass {cls.__class__.__name__} must define a default value for 'system_prompt_tool_chosen_instructions'."
-            )
-        if cls.prompts.user_prompt_tool_chosen == "":
-            raise ValueError(
-                f"Subclass {cls.__class__.__name__} must define a default value for 'user_prompt_tool_chosen_instructions'."
-            )
-        return cls
-    
-
-ConfigTypeV2 = TypeVar("ConfigTypeV2", bound=BaseToolConfigV2)
-
-
-
-class ToolV2(Tool[ConfigTypeV2]):
-    name: str
-
-    def tool_description(self) -> LanguageModelToolDescription:
-         return LanguageModelToolDescription(
-            name=self.name,
-            description=self.settings.configuration.tool_call.description,
-            parameters=self.settings.configuration.tool_call.parameters,
-        )
-
-    def get_prompt_instructions(self) -> ToolPromptInstructions:
-        return ToolPromptInstructions(
-            system_prompt=self.settings.configuration.prompts.system_prompt,
-            user_prompt=self.settings.configuration.prompts.user_prompt,
-            system_prompt_tool_chosen=self.settings.configuration.prompts.system_prompt_tool_chosen,
-            user_prompt_tool_chosen=self.settings.configuration.prompts.user_prompt_tool_chosen
-        )
-
-
-    @abstractmethod
-    async def run(self, tool_call: LanguageModelFunction) -> ToolCallResponse:
-        raise NotImplementedError
-
-   
-  
-    def __init__(
-        self,
-        settings: ToolSettings[ConfigTypeV2],
-        event: ChatEvent,
-        tool_progress_reporter: ToolProgressReporter
-    ):
-        self.settings = settings
-        self.tool_progress_reporter = tool_progress_reporter
-        self.event = event
-
-