swarmauri-standard 0.7.2.dev2__tar.gz → 0.7.3.dev2__tar.gz

{swarmauri_standard-0.7.2.dev2 → swarmauri_standard-0.7.3.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: swarmauri-standard
-Version: 0.7.2.dev2
+Version: 0.7.3.dev2
 Summary: This repository includes standard components within the Swarmauri framework.
 License: Apache-2.0
 Author: Jacob Stewart

{swarmauri_standard-0.7.2.dev2 → swarmauri_standard-0.7.3.dev2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "swarmauri-standard"
-version = "0.7.2.dev2"
+version = "0.7.3.dev2"
 description = "This repository includes standard components within the Swarmauri framework."
 authors = [
     { name = "Jacob Stewart", email = "jacob@swarmauri.com" },
@@ -49,6 +49,7 @@ dev = [
 "ipython>=8.28.0",
 "requests>=2.32.3",
 "ruff>=0.9.9",
+"pytest-benchmark>=4.0.0",
 ]
 
 [tool.pytest.ini_options]
@@ -63,7 +64,8 @@ markers = [
     "timeout: mark test to timeout after X seconds",
     "xfail: Expected failures",
     "xpass: Expected passes",
-    "acceptance: Acceptance tests"
+    "acceptance: Acceptance tests",
+    "perf: Performance tests that measure execution time and resource usage"
 ]
 
 

{swarmauri_standard-0.7.2.dev2 → swarmauri_standard-0.7.3.dev2}/swarmauri_standard/agents/ToolAgent.py

@@ -1,6 +1,6 @@
 import logging
 from pydantic import ConfigDict
-from typing import Any, Optional, Union, Dict, Literal
+from typing import Any, Optional, Union, Dict, Literal, List
 
 from swarmauri_standard.messages.HumanMessage import HumanMessage
 from swarmauri_base.agents.AgentBase import AgentBase
@@ -26,6 +26,7 @@ class ToolAgent(AgentToolMixin, AgentConversationMixin, AgentBase):
     def exec(
         self,
         input_data: Optional[Union[str, IMessage]] = "",
+        multiturn: bool = True,
         llm_kwargs: Optional[Dict] = {},
     ) -> Any:
         # Check if the input is a string, then wrap it in a HumanMessage
@@ -41,7 +42,10 @@ class ToolAgent(AgentToolMixin, AgentConversationMixin, AgentBase):
 
         # predict a response
         self.conversation = self.llm.predict(
-            conversation=self.conversation, toolkit=self.toolkit, **llm_kwargs
+            conversation=self.conversation,
+            toolkit=self.toolkit,
+            multiturn=multiturn,
+            **llm_kwargs,
         )
 
         logging.info(self.conversation.get_last().content)
@@ -51,6 +55,7 @@ class ToolAgent(AgentToolMixin, AgentConversationMixin, AgentBase):
     async def aexec(
         self,
         input_data: Optional[Union[str, IMessage]] = "",
+        multiturn: bool = True,
         llm_kwargs: Optional[Dict] = {},
     ) -> Any:
         # Check if the input is a string, then wrap it in a HumanMessage
@@ -65,5 +70,13 @@ class ToolAgent(AgentToolMixin, AgentConversationMixin, AgentBase):
         self.conversation.add_message(human_message)
 
         # Use the LLM in async mode
-        await self.llm.apredict(conversation=self.conversation, **llm_kwargs)
+        await self.llm.apredict(
+            conversation=self.conversation,
+            toolkit=self.toolkit,
+            multiturn=multiturn,
+            **llm_kwargs,
+        )
         return self.conversation.get_last().content
+
+    def get_tool_message_content(self) -> List[str]:
+        return [m.content for m in self.conversation.history if m.role == "tool"]

swarmauri_standard-0.7.3.dev2/swarmauri_standard/logger_formatters/LoggerFormatter.py

@@ -0,0 +1,31 @@
+from swarmauri_base import register_type
+from swarmauri_base.logger_formatters.FormatterBase import FormatterBase
+
+
+@register_type()
+class LoggerFormatter(FormatterBase):
+    """Concrete implementation of FormatterBase"""
+
+    include_timestamp: bool = False
+    include_process: bool = False
+    include_thread: bool = False
+    date_format: str = "%Y-%m-%d %H:%M:%S"
+
+    def model_post_init(self, *args, **kwargs):
+        format_parts = []
+
+        if self.include_timestamp:
+            format_parts.append("%(asctime)s")
+
+        format_parts.append("[%(name)s]")
+        format_parts.append("[%(levelname)s]")
+
+        if self.include_process:
+            format_parts.append("Process:%(process)d")
+
+        if self.include_thread:
+            format_parts.append("Thread:%(thread)d")
+
+        format_parts.append("%(message)s")
+
+        self.format = " ".join(format_parts)

swarmauri_standard-0.7.3.dev2/swarmauri_standard/loggers/Logger.py

@@ -0,0 +1,9 @@
+from swarmauri_base.loggers.LoggerBase import LoggerBase
+from swarmauri_base import register_type
+
+
+@register_type()
+class Logger(LoggerBase):
+    """Concrete implementation of LoggerBase"""
+
+    pass

{swarmauri_standard-0.7.2.dev2 → swarmauri_standard-0.7.3.dev2}/swarmauri_standard/schema_converters/AnthropicSchemaConverter.py

@@ -1,8 +1,8 @@
-from typing import Dict, Any, Literal
+from typing import Any, Dict, Literal
 
-from swarmauri_base.tools.ToolBase import ToolBase
-from swarmauri_base.schema_converters.SchemaConverterBase import SchemaConverterBase
 from swarmauri_base.ComponentBase import ComponentBase, SubclassUnion
+from swarmauri_base.schema_converters.SchemaConverterBase import SchemaConverterBase
+from swarmauri_base.tools.ToolBase import ToolBase
 
 
 @ComponentBase.register_type(SchemaConverterBase, "AnthropicSchemaConverter")