Merge branch 'main' into dev/integrate-observability

agency_swarm/tools/BaseTool.py

@@ -8,11 +8,20 @@
 from agency_swarm.util.shared_state import SharedState
 
 
+class classproperty:
+    def __init__(self, fget):
+        self.fget = fget
+
+    def __get__(self, instance, owner):
+        return self.fget(owner)
+
+
 class BaseTool(BaseModel, ABC):
     _shared_state: ClassVar[SharedState] = None
     _caller_agent: Any = None
     _event_handler: Any = None
     _tool_call: ToolCall = None
+    openai_schema: ClassVar[dict[str, Any]]
 
     def __init__(self, **kwargs):
         if not self.__class__._shared_state:
@@ -38,14 +47,13 @@ class ToolConfig:
         output_as_result: bool = False
         async_mode: Union[Literal["threading"], None] = None
 
-    @classmethod
-    @property
-    def openai_schema(cls):
+    @classproperty
+    def openai_schema(cls) -> dict[str, Any]:
         """
         Return the schema in the format of OpenAI's schema as jsonschema
 
         Note:
-            Its important to add a docstring to describe how to best use this class, it will be included in the description attribute and be part of the prompt.
+            It's important to add a docstring to describe how to best use this class; it will be included in the description attribute and be part of the prompt.
 
         Returns:
             model_json_schema (dict): A dictionary in the format of OpenAI's schema as jsonschema

setup.py

@@ -23,5 +23,5 @@
     entry_points={
         "console_scripts": ["agency-swarm=agency_swarm.cli:main"],
     },
-    python_requires=">=3.7",
+    python_requires=">=3.10",
 )

tests/demos/demo_gradio.py

@@ -47,7 +47,8 @@ def run(self, **kwargs):
 agency = Agency(
     [
         ceo,
-        [ceo, test_agent, test_agent2],
+        [ceo, test_agent],
+        [test_agent, test_agent2],
     ],
     shared_instructions="",
     settings_path="./test_settings.json",