updated smolagents dept : adapted to tools structure changes

.vscode/launch.json

@@ -0,0 +1,17 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+        
+        {
+            "name": "Python Debugger: Current File",
+            "type": "debugpy",
+            "request": "launch",
+            "program": "${file}",
+            "console": "integratedTerminal",
+            "pythonPath": "/usr/bin/python3" ,
+            "env": {
+                "PYTHONPATH": "/home/bruno/.local/lib/python3.12/site-packages"
+            }
+        }
+    ]
+}

HFHub.py

@@ -2,6 +2,7 @@
 
 #utility file
 
+from typing import List, Set
 from smolagents.default_tools import __all__ as dft_tools
 from huggingface_hub import login, InferenceClient
 import logging
@@ -11,33 +12,30 @@ from smolagents import ToolCollection
 from smolagents import HfApiModel, CodeAgent, Tool
 
 publishtoken = None;
-
 tool_Collections: dict[str, ToolCollection] = {}
+loaded_tools: Set[Tool] = set()  
 
-
-def all_tools() -> list[Tool]:
+#kueep separate list, maybe should only refer to agent tools merged list ? 
+def all_tools_names2() -> list[Tool]:
     all_tools = []
     for collection in tool_Collections.values():
       if isinstance(collection, ToolCollection):
         for tool in collection.tools:
-            all_tools.append(tool)
+            all_tools.append(tool.name) #new we return key, not the tool
       else:
-        for tool in collection:
+        for tool in collection: # base tools : only keys str
             all_tools.append(tool)
 
     return all_tools
 
 def filter_tools(tools):
     base_tools_names = ['web search']
-# dft_tools
-    # logging.warning(f"Filtering tools, excluding: {exclude_tool}")  # Log the exclusion
-    filtered_tools = [tool for tool in tools if tool.name not in  base_tools_names]
-    logging.warning(f"Number of tools after filtering: {len(filtered_tools)}") # Log the result
+    filtered_tools = [tool for tool in tools if tool not in base_tools_names]
+    logging.warning(f"Number of tools after filtering: {len(filtered_tools)}")  # Log the result
     return filtered_tools
 
 additional_authorized_imports=["smolagents","subprocess","typing","os", "inspect","open", "requests"]
 
-
 litellm_api_keys = {
     'xai': '',
     'HF': '',
@@ -54,58 +52,56 @@ def login_for_publication() :
     login(publishtoken)
 
 
-def load_collection_from_space(agent : CodeAgent, collection_slug: str = "Mightypeacock/agent-tools-6777c9699c231b7a1e87fa31" ) -> ToolCollection:
+def load_collection_from_space(agent :CodeAgent, collection_slug: str = "Mightypeacock/agent-tools-6777c9699c231b7a1e87fa31" ) -> ToolCollection:
 
-    if collection_slug not in tool_Collections:
+    if collection_slug not in tool_Collections: #or overwite ?
         tool_collection = ToolCollection(
             collection_slug=collection_slug,
             # token=publishtoken,
             trust_remote_code=True
         )
-        tool_Collections[collection_slug] = tool_collection
+
+        # tool_Collections[collection_slug] = tool_collection
+
+        #replace this by slug > tools names:
+        tool_Collections[collection_slug] = [tool.name for tool in tool_collection.tools]
 
         for tool in tool_collection.tools:
-            if agent.toolbox.tools.get(tool.name) is None:
-              agent.toolbox.add_tool(tool)
+            if agent.tools.get(tool.name) is None: #or overwrite ?
+
+                agent.tools[tool.name]=tool
+                loaded_tools.add(tool)
+
             else:
-              agent.toolbox.update_tool(tool)
+                agent.tools[tool.name]=tool
 
-    return all_tools()
 
 
-def createAgent():
+    return all_tools_names2()
 
-    agent = CodeAgent(
-        tools=filter_tools(all_tools()),
-        # all_tools(),#[tool for col in tool_Collections.values() for tool in col.tools],  # need to flatmap those probably
-        # tools=[],
-        # model=HfApiModel("microsoft/phi-4"),
-        # model=HfApiModel("Leonuraht/Phi-4"), #space
-
-        # model = LiteLLMModel(model_id=
-        #             # "gpt-4o"
-        #             "anthropic/claude-3-5-sonnet-20240620"
-        #             # xai/<any-model-on-xai> : grok-beta
-        # ),
+def all_tools() -> List[Tool]:
+    return list(loaded_tools)
 
+def createAgent():
+    agent = CodeAgent(
+        tools=filter_tools(all_tools()),  
         model=HfApiModel(
-        #     # "lmstudio-community/phi-4-GGUF" #working
-            ),
-
+            # Model configuration can be added here
+        ),
         additional_authorized_imports=additional_authorized_imports,
         add_base_tools=True,
         planning_interval=None,
-        # use_e2b_executor=True,
-        verbose=True
-
-        )
+    )
 
-    for tool in agent.toolbox.tools.values():
+    # Update the base tools collection
+    for tool in agent.tools:  # Changed from agent.toolbox.tools.values() to agent.tools
         if tool not in all_tools():
             if "base tools" not in tool_Collections:
                 tool_Collections["base tools"] = []
 
             tool_Collections["base tools"].append(tool)
+            logging.debug(f"Base tool added: {tool}")  # Debug line
+
 
     return agent
 

README.md

@@ -11,4 +11,18 @@ license: apache-2.0
 short_description: testing smolagent tools creation
 ---
 
-An example chatbot using [Gradio](https://gradio.app), [`huggingface_hub`](https://huggingface.co/docs/huggingface_hub/v0.22.2/en/index), and the [Hugging Face Inference API](https://huggingface.co/docs/api-inference/index).
+An example chatbot using [Gradio](https://gradio.app), [`huggingface_hub`](https://huggingface.co/docs/huggingface_hub/v0.22.2/en/index), and the [Hugging Face Inference API](https://huggingface.co/docs/api-inference/index).
+
+
+accelerate required for base tools (pipeline tool) 
+
+#pip install -r requirements.txt --ignore-installed torchaudio
+#pip install  -r requirements.txt --no-deps 
+
+#without torchaudio:
+pip install  -e ../smolagents/
+
+
+
+#launch in dev (hotreload )
+gradio app.py

app.py

@@ -12,10 +12,8 @@ from typing import Dict
 import os
 import logging
 
-
-def dropdown_update_choices(elt, choices):
-    print(f"updating dropdown: {elt} with {choices}")
-    return gr.update(elt, choices=choices, value=None)
+def dropdown_update_choices(choices):
+    return gr.update(choices=choices, value=None)
 
 # Configure logging
 logging.basicConfig(level=logging.INFO) # not working (prints warnings tho)
@@ -25,6 +23,12 @@ logging.basicConfig(level=logging.INFO) # not working (prints warnings tho)
 
 logging.warning('start')
 
+agent = createAgent()
+
+def update_agent(collection_slug: str):
+    load_collection_from_space(agent, collection_slug=collection_slug)
+    return refresh_ui_elements()  # Update the UI elements after loading the collection
+
 
 def process_logs(agent):
     logs = ""
@@ -37,7 +41,7 @@ def process_logs(agent):
         return "The agent object does not have a valid 'logs' attribute or the attribute is not a list."
 
 def get_tools():
-    return [{"name": tool.name, "description": tool.description} for tool in agent.toolbox.tools.values()]
+    return [{"name": tool.name, "description": tool.description} for tool in agent.tools.values()]
 
 def get_functions():
     return agent.python_executor.custom_tools
@@ -60,37 +64,37 @@ def get_tool_description(selected_tool_name, tools):
             return tool["description"]
     return "No description available."
 
-
-def refresh_ui_elements():
+def get_tools_name():
+    return [tool["name"] for tool in get_tools()]
+    
     
-    updated_tools = get_tools()
+def refresh_ui_elements():
+    updated_tools = get_tools()  # Get the updated tools after loading the collection
     updated_functions = get_functions()
 
     tool_names = [tool["name"] for tool in updated_tools]
     function_names = list(updated_functions.keys())
 
-    print(function_names)
-    
+    print(f"function_names: {function_names}")
+
     current_tool = tool_names[0] if tool_names else None
     current_function = function_names[0] if function_names else None
 
     tool_description = get_tool_description(current_tool, updated_tools)
-
     function_code = get_function_code(current_function) if current_function else ""
 
-    dropdown_update_choices(function_dropdown,function_names)
-    dropdown_update_choices(tool_dropdown,tool_names)
-
+    # Update dropdown choices
+    tool_dropdown_update = dropdown_update_choices(tool_names)
+    function_dropdown_update = dropdown_update_choices(function_names)
     return (
-        tool_dropdown,
-        function_dropdown,
+        tool_dropdown_update,
+        function_dropdown_update,
         tool_description,
         function_code
     )
 
-
 def load_collection_andUploadUI(collection_slug: str ):
-    load_collection_from_space(agent,collection_slug)
+    # load_collection_from_space(agent,collection_slug)
     refresh_ui_elements()
 
 with gr.Blocks() as demo:
@@ -101,8 +105,7 @@ with gr.Blocks() as demo:
                 chatbot = gr.Chatbot(type="messages")
                 msg = gr.Textbox()
 
-                send_button = gr.Button("Send")  # Send button
-
+                # send_button = gr.Button("Send")  # Send button
                 # send_button.click(respond, [msg, chatbot], [msg, chatbot])
 
                 clear = gr.ClearButton([msg, chatbot])
@@ -167,10 +170,7 @@ with gr.Blocks() as demo:
 
             slug = gr.Textbox(label="collection slug",value="Mightypeacock/agent-tools-6777c9699c231b7a1e87fa31")
             greet_btn = gr.Button("Load")
-            greet_btn.click(fn=load_collection_from_space, inputs=slug,
-                            # outputs=tool_dropdown,
-                            outputs=None,
-                            api_name="load_HF_Collection")
+            
 
 
             gr.Markdown("<center><h2>Functions</h2></center>")
@@ -196,6 +196,13 @@ with gr.Blocks() as demo:
                 outputs=code,
             )
 
+            greet_btn.click(fn=update_agent, inputs=slug,
+                      
+                         outputs=[tool_dropdown, function_dropdown, description_textbox, code],
+    #   outputs=tool_dropdown,
+                            # outputs=None,
+                            api_name="load_HF_Collection")
+
     def respond(message, console_output, chat_history):
         try:
             print(f"Received message: {message}")
@@ -230,5 +237,4 @@ with gr.Blocks() as demo:
     )
 
 if __name__ == "__main__":
-    agent = createAgent()
     demo.launch(show_error=True, debug=True)

requirements.txt

@@ -1,5 +1,14 @@
-huggingface_hub==0.25.2
+#huggingface_hub==0.25.2
+#huggingface_hub==0.27.1 # = new current V on HF
 git+https://github.com/Brunwo/smolagents
+git+https://github.com/huggingface/transformers
+
 huggingface_hub
+litellm
+
+#for specific (base) tools
+accelerate 
 
-litellm
+# for e2b
+e2b-code-interpreter
+python-dotenv