From 630a7826b8bfbcc4b0b899cb4904f29d20a48844 Mon Sep 17 00:00:00 2001 From: Kye Gomez Date: Sat, 1 Feb 2025 19:44:48 -0500 Subject: [PATCH] [cleanup][un-used tool files] --- .../agent_showcase_example.py | 0 .../agent_with_fluidapi.py | 0 .../async_agent.py | 0 .../async_agents.py | 0 .../async_executor.py | 0 .../async_workflow_example.py | 0 .../auto_agent.py | 0 .../auto_swarm_router.py | 0 .../concurrent_examples/concurrent_mix.py | 0 .../crypto/swarms_coin_agent.py | 0 .../crypto/swarms_coin_multimarket.py | 0 .../csvagent_example.py | 0 .../dao_swarm.py | 0 .../dict_to_table.py | 0 .../ethchain_agent.py | 0 .../example_async_vs_multithread.py | 0 .../fund_manager_forest.py | 0 .../medical_forest_swarm.py | 0 .../forest_swarm_examples/tree_swarm_test.py | 0 .../full_agent_rag_example.py | 0 .../gemini_model.py | 0 .../graph_swarm_example.py | 0 .../groupchat_examples/crypto_tax.py | 0 .../groupchat_examples/crypto_tax_swarm 2.py | 0 .../groupchat_examples/crypto_tax_swarm.py | 0 .../groupchat_examples/group_chat_example.py | 0 .../hs_examples/hierarchical_swarm_example.py | 0 .../hs_examples/hs_stock_team.py | 0 .../insurance_agent.py | 0 .../insurance_swarm.py | 0 .../litellm_tool_example.py | 0 .../lumo_example.py | 0 {new_features_examples => examples}/main.py | 0 .../markdown_agent.py | 0 .../materials_science_agents.py | 0 .../health_privacy_swarm 2.py | 0 .../medical_analysis/health_privacy_swarm.py | 0 .../health_privacy_swarm_two 2.py | 0 .../health_privacy_swarm_two.py | 0 .../medical_analysis_agent_rearrange.md | 0 .../medical_analysis/medical_coder_agent.py | 0 .../medical_analysis/medical_coding_report.md | 0 .../medical_diagnosis_report.md | 0 .../medical_analysis/new_medical_rearrange.py | 0 .../medical_analysis_agent_rearrange.md | 0 .../reports/vc_document_analysis.md | 0 .../term_sheet_swarm.py | 0 .../meme_agents/bob_the_agent.py | 0 .../meme_agents/meme_agent_generator.py | 0 .../microstructure.py | 0 .../multi_agent_router_example.py | 0 .../multi_tool_usage_agent.py | 0 .../crypto_tax_spreadsheet.py | 0 .../crypto_tax_swarm_spreadsheet.csv | 0 .../financial_analysis/swarm.csv | 0 .../financial_analysis/swarm_csv.py | 0 .../ollama_demo.py | 0 .../onboard/agents.yaml | 0 .../onboard/onboard-basic.py | 0 .../openai_assistant_wrapper.py | 0 .../persistent_legal_agent.py | 0 .../privacy_building.py | 0 .../qdrant_agent.py | 0 .../real_estate_agent.py | 0 .../sequential_worflow_test 2.py | 0 .../sequential_worflow_test.py | 0 .../sequential_workflow 2.py | 0 .../sequential_workflow.py | 0 .../solana_agent.py | 0 .../solana_tool/solana_tool.py | 0 .../solana_tool/solana_tool_test.py | 0 .../spike/agent_rearrange_test.py | 0 .../spike/function_caller_example.py | 0 .../spike/memory.py | 0 .../spike/spike.zip | Bin .../spike/test.py | 0 .../swarm_router_example.py | 0 .../swarmarrange/rearrange_test.py | 0 .../swarmarrange/swarm_arange_demo 2.py | 0 .../swarmarrange/swarm_arange_demo.py | 0 .../swarms_claude_example.py | 0 .../tools_examples/dex_screener.py | 0 .../tools_examples/financial_news_agent.py | 0 .../swarms_tool_example_simple.py | 0 .../tools_examples/swarms_tools_example.py | 0 .../unique_swarms_examples.py | 0 {new_features_examples => examples}/voice.py | 0 swarms/telemetry/bootup.py | 2 +- swarms/tools/prebuilt/__init__.py | 5 - swarms/tools/prebuilt/bing_api.py | 82 ------- swarms/tools/prebuilt/code_executor.py | 231 ----------------- swarms/tools/prebuilt/code_interpreter.py | 232 ------------------ swarms/tools/prebuilt/math_eval.py | 61 ----- swarms/utils/__init__.py | 2 - 94 files changed, 1 insertion(+), 614 deletions(-) rename {new_features_examples => examples}/agent_showcase_example.py (100%) rename {new_features_examples => examples}/agent_with_fluidapi.py (100%) rename {new_features_examples => examples}/async_agent.py (100%) rename {new_features_examples => examples}/async_agents.py (100%) rename {new_features_examples => examples}/async_executor.py (100%) rename {new_features_examples => examples}/async_workflow_example.py (100%) rename {new_features_examples => examples}/auto_agent.py (100%) rename {new_features_examples => examples}/auto_swarm_router.py (100%) rename {new_features_examples => examples}/concurrent_examples/concurrent_mix.py (100%) rename {new_features_examples => examples}/crypto/swarms_coin_agent.py (100%) rename {new_features_examples => examples}/crypto/swarms_coin_multimarket.py (100%) rename {new_features_examples => examples}/csvagent_example.py (100%) rename {new_features_examples => examples}/dao_swarm.py (100%) rename {new_features_examples => examples}/dict_to_table.py (100%) rename {new_features_examples => examples}/ethchain_agent.py (100%) rename {new_features_examples => examples}/example_async_vs_multithread.py (100%) rename {new_features_examples => examples}/forest_swarm_examples/fund_manager_forest.py (100%) rename {new_features_examples => examples}/forest_swarm_examples/medical_forest_swarm.py (100%) rename {new_features_examples => examples}/forest_swarm_examples/tree_swarm_test.py (100%) rename {new_features_examples => examples}/full_agent_rag_example.py (100%) rename {new_features_examples => examples}/gemini_model.py (100%) rename {new_features_examples => examples}/graph_swarm_example.py (100%) rename {new_features_examples => examples}/groupchat_examples/crypto_tax.py (100%) rename {new_features_examples => examples}/groupchat_examples/crypto_tax_swarm 2.py (100%) rename {new_features_examples => examples}/groupchat_examples/crypto_tax_swarm.py (100%) rename {new_features_examples => examples}/groupchat_examples/group_chat_example.py (100%) rename {new_features_examples => examples}/hs_examples/hierarchical_swarm_example.py (100%) rename {new_features_examples => examples}/hs_examples/hs_stock_team.py (100%) rename {new_features_examples => examples}/insurance_agent.py (100%) rename {new_features_examples => examples}/insurance_swarm.py (100%) rename {new_features_examples => examples}/litellm_tool_example.py (100%) rename {new_features_examples => examples}/lumo_example.py (100%) rename {new_features_examples => examples}/main.py (100%) rename {new_features_examples => examples}/markdown_agent.py (100%) rename {new_features_examples => examples}/materials_science_agents.py (100%) rename {new_features_examples => examples}/medical_analysis/health_privacy_swarm 2.py (100%) rename {new_features_examples => examples}/medical_analysis/health_privacy_swarm.py (100%) rename {new_features_examples => examples}/medical_analysis/health_privacy_swarm_two 2.py (100%) rename {new_features_examples => examples}/medical_analysis/health_privacy_swarm_two.py (100%) rename {new_features_examples => examples}/medical_analysis/medical_analysis_agent_rearrange.md (100%) rename {new_features_examples => examples}/medical_analysis/medical_coder_agent.py (100%) rename {new_features_examples => examples}/medical_analysis/medical_coding_report.md (100%) rename {new_features_examples => examples}/medical_analysis/medical_diagnosis_report.md (100%) rename {new_features_examples => examples}/medical_analysis/new_medical_rearrange.py (100%) rename {new_features_examples => examples}/medical_analysis/rearrange_video_examples/reports/medical_analysis_agent_rearrange.md (100%) rename {new_features_examples => examples}/medical_analysis/rearrange_video_examples/reports/vc_document_analysis.md (100%) rename {new_features_examples => examples}/medical_analysis/rearrange_video_examples/term_sheet_swarm.py (100%) rename {new_features_examples => examples}/meme_agents/bob_the_agent.py (100%) rename {new_features_examples => examples}/meme_agents/meme_agent_generator.py (100%) rename {new_features_examples => examples}/microstructure.py (100%) rename {new_features_examples => examples}/multi_agent_router_example.py (100%) rename {new_features_examples => examples}/multi_tool_usage_agent.py (100%) rename {new_features_examples => examples}/new_spreadsheet_swarm_examples/crypto_tax_swarm/crypto_tax_spreadsheet.py (100%) rename {new_features_examples => examples}/new_spreadsheet_swarm_examples/crypto_tax_swarm/crypto_tax_swarm_spreadsheet.csv (100%) rename {new_features_examples => examples}/new_spreadsheet_swarm_examples/financial_analysis/swarm.csv (100%) rename {new_features_examples => examples}/new_spreadsheet_swarm_examples/financial_analysis/swarm_csv.py (100%) rename {new_features_examples => examples}/ollama_demo.py (100%) rename {new_features_examples => examples}/onboard/agents.yaml (100%) rename {new_features_examples => examples}/onboard/onboard-basic.py (100%) rename {new_features_examples => examples}/openai_assistant_wrapper.py (100%) rename {new_features_examples => examples}/persistent_legal_agent.py (100%) rename {new_features_examples => examples}/privacy_building.py (100%) rename {new_features_examples => examples}/qdrant_agent.py (100%) rename {new_features_examples => examples}/real_estate_agent.py (100%) rename {new_features_examples => examples}/sequential_workflow/sequential_worflow_test 2.py (100%) rename {new_features_examples => examples}/sequential_workflow/sequential_worflow_test.py (100%) rename {new_features_examples => examples}/sequential_workflow/sequential_workflow 2.py (100%) rename {new_features_examples => examples}/sequential_workflow/sequential_workflow.py (100%) rename {new_features_examples => examples}/solana_agent.py (100%) rename {new_features_examples => examples}/solana_tool/solana_tool.py (100%) rename {new_features_examples => examples}/solana_tool/solana_tool_test.py (100%) rename {new_features_examples => examples}/spike/agent_rearrange_test.py (100%) rename {new_features_examples => examples}/spike/function_caller_example.py (100%) rename {new_features_examples => examples}/spike/memory.py (100%) rename {new_features_examples => examples}/spike/spike.zip (100%) rename {new_features_examples => examples}/spike/test.py (100%) rename {new_features_examples => examples}/swarm_router_example.py (100%) rename {new_features_examples => examples}/swarmarrange/rearrange_test.py (100%) rename {new_features_examples => examples}/swarmarrange/swarm_arange_demo 2.py (100%) rename {new_features_examples => examples}/swarmarrange/swarm_arange_demo.py (100%) rename {new_features_examples => examples}/swarms_claude_example.py (100%) rename {new_features_examples => examples}/tools_examples/dex_screener.py (100%) rename {new_features_examples => examples}/tools_examples/financial_news_agent.py (100%) rename {new_features_examples => examples}/tools_examples/swarms_tool_example_simple.py (100%) rename {new_features_examples => examples}/tools_examples/swarms_tools_example.py (100%) rename {new_features_examples => examples}/unique_swarms_examples.py (100%) rename {new_features_examples => examples}/voice.py (100%) delete mode 100644 swarms/tools/prebuilt/__init__.py delete mode 100644 swarms/tools/prebuilt/bing_api.py delete mode 100644 swarms/tools/prebuilt/code_executor.py delete mode 100644 swarms/tools/prebuilt/code_interpreter.py delete mode 100644 swarms/tools/prebuilt/math_eval.py diff --git a/new_features_examples/agent_showcase_example.py b/examples/agent_showcase_example.py similarity index 100% rename from new_features_examples/agent_showcase_example.py rename to examples/agent_showcase_example.py diff --git a/new_features_examples/agent_with_fluidapi.py b/examples/agent_with_fluidapi.py similarity index 100% rename from new_features_examples/agent_with_fluidapi.py rename to examples/agent_with_fluidapi.py diff --git a/new_features_examples/async_agent.py b/examples/async_agent.py similarity index 100% rename from new_features_examples/async_agent.py rename to examples/async_agent.py diff --git a/new_features_examples/async_agents.py b/examples/async_agents.py similarity index 100% rename from new_features_examples/async_agents.py rename to examples/async_agents.py diff --git a/new_features_examples/async_executor.py b/examples/async_executor.py similarity index 100% rename from new_features_examples/async_executor.py rename to examples/async_executor.py diff --git a/new_features_examples/async_workflow_example.py b/examples/async_workflow_example.py similarity index 100% rename from new_features_examples/async_workflow_example.py rename to examples/async_workflow_example.py diff --git a/new_features_examples/auto_agent.py b/examples/auto_agent.py similarity index 100% rename from new_features_examples/auto_agent.py rename to examples/auto_agent.py diff --git a/new_features_examples/auto_swarm_router.py b/examples/auto_swarm_router.py similarity index 100% rename from new_features_examples/auto_swarm_router.py rename to examples/auto_swarm_router.py diff --git a/new_features_examples/concurrent_examples/concurrent_mix.py b/examples/concurrent_examples/concurrent_mix.py similarity index 100% rename from new_features_examples/concurrent_examples/concurrent_mix.py rename to examples/concurrent_examples/concurrent_mix.py diff --git a/new_features_examples/crypto/swarms_coin_agent.py b/examples/crypto/swarms_coin_agent.py similarity index 100% rename from new_features_examples/crypto/swarms_coin_agent.py rename to examples/crypto/swarms_coin_agent.py diff --git a/new_features_examples/crypto/swarms_coin_multimarket.py b/examples/crypto/swarms_coin_multimarket.py similarity index 100% rename from new_features_examples/crypto/swarms_coin_multimarket.py rename to examples/crypto/swarms_coin_multimarket.py diff --git a/new_features_examples/csvagent_example.py b/examples/csvagent_example.py similarity index 100% rename from new_features_examples/csvagent_example.py rename to examples/csvagent_example.py diff --git a/new_features_examples/dao_swarm.py b/examples/dao_swarm.py similarity index 100% rename from new_features_examples/dao_swarm.py rename to examples/dao_swarm.py diff --git a/new_features_examples/dict_to_table.py b/examples/dict_to_table.py similarity index 100% rename from new_features_examples/dict_to_table.py rename to examples/dict_to_table.py diff --git a/new_features_examples/ethchain_agent.py b/examples/ethchain_agent.py similarity index 100% rename from new_features_examples/ethchain_agent.py rename to examples/ethchain_agent.py diff --git a/new_features_examples/example_async_vs_multithread.py b/examples/example_async_vs_multithread.py similarity index 100% rename from new_features_examples/example_async_vs_multithread.py rename to examples/example_async_vs_multithread.py diff --git a/new_features_examples/forest_swarm_examples/fund_manager_forest.py b/examples/forest_swarm_examples/fund_manager_forest.py similarity index 100% rename from new_features_examples/forest_swarm_examples/fund_manager_forest.py rename to examples/forest_swarm_examples/fund_manager_forest.py diff --git a/new_features_examples/forest_swarm_examples/medical_forest_swarm.py b/examples/forest_swarm_examples/medical_forest_swarm.py similarity index 100% rename from new_features_examples/forest_swarm_examples/medical_forest_swarm.py rename to examples/forest_swarm_examples/medical_forest_swarm.py diff --git a/new_features_examples/forest_swarm_examples/tree_swarm_test.py b/examples/forest_swarm_examples/tree_swarm_test.py similarity index 100% rename from new_features_examples/forest_swarm_examples/tree_swarm_test.py rename to examples/forest_swarm_examples/tree_swarm_test.py diff --git a/new_features_examples/full_agent_rag_example.py b/examples/full_agent_rag_example.py similarity index 100% rename from new_features_examples/full_agent_rag_example.py rename to examples/full_agent_rag_example.py diff --git a/new_features_examples/gemini_model.py b/examples/gemini_model.py similarity index 100% rename from new_features_examples/gemini_model.py rename to examples/gemini_model.py diff --git a/new_features_examples/graph_swarm_example.py b/examples/graph_swarm_example.py similarity index 100% rename from new_features_examples/graph_swarm_example.py rename to examples/graph_swarm_example.py diff --git a/new_features_examples/groupchat_examples/crypto_tax.py b/examples/groupchat_examples/crypto_tax.py similarity index 100% rename from new_features_examples/groupchat_examples/crypto_tax.py rename to examples/groupchat_examples/crypto_tax.py diff --git a/new_features_examples/groupchat_examples/crypto_tax_swarm 2.py b/examples/groupchat_examples/crypto_tax_swarm 2.py similarity index 100% rename from new_features_examples/groupchat_examples/crypto_tax_swarm 2.py rename to examples/groupchat_examples/crypto_tax_swarm 2.py diff --git a/new_features_examples/groupchat_examples/crypto_tax_swarm.py b/examples/groupchat_examples/crypto_tax_swarm.py similarity index 100% rename from new_features_examples/groupchat_examples/crypto_tax_swarm.py rename to examples/groupchat_examples/crypto_tax_swarm.py diff --git a/new_features_examples/groupchat_examples/group_chat_example.py b/examples/groupchat_examples/group_chat_example.py similarity index 100% rename from new_features_examples/groupchat_examples/group_chat_example.py rename to examples/groupchat_examples/group_chat_example.py diff --git a/new_features_examples/hs_examples/hierarchical_swarm_example.py b/examples/hs_examples/hierarchical_swarm_example.py similarity index 100% rename from new_features_examples/hs_examples/hierarchical_swarm_example.py rename to examples/hs_examples/hierarchical_swarm_example.py diff --git a/new_features_examples/hs_examples/hs_stock_team.py b/examples/hs_examples/hs_stock_team.py similarity index 100% rename from new_features_examples/hs_examples/hs_stock_team.py rename to examples/hs_examples/hs_stock_team.py diff --git a/new_features_examples/insurance_agent.py b/examples/insurance_agent.py similarity index 100% rename from new_features_examples/insurance_agent.py rename to examples/insurance_agent.py diff --git a/new_features_examples/insurance_swarm.py b/examples/insurance_swarm.py similarity index 100% rename from new_features_examples/insurance_swarm.py rename to examples/insurance_swarm.py diff --git a/new_features_examples/litellm_tool_example.py b/examples/litellm_tool_example.py similarity index 100% rename from new_features_examples/litellm_tool_example.py rename to examples/litellm_tool_example.py diff --git a/new_features_examples/lumo_example.py b/examples/lumo_example.py similarity index 100% rename from new_features_examples/lumo_example.py rename to examples/lumo_example.py diff --git a/new_features_examples/main.py b/examples/main.py similarity index 100% rename from new_features_examples/main.py rename to examples/main.py diff --git a/new_features_examples/markdown_agent.py b/examples/markdown_agent.py similarity index 100% rename from new_features_examples/markdown_agent.py rename to examples/markdown_agent.py diff --git a/new_features_examples/materials_science_agents.py b/examples/materials_science_agents.py similarity index 100% rename from new_features_examples/materials_science_agents.py rename to examples/materials_science_agents.py diff --git a/new_features_examples/medical_analysis/health_privacy_swarm 2.py b/examples/medical_analysis/health_privacy_swarm 2.py similarity index 100% rename from new_features_examples/medical_analysis/health_privacy_swarm 2.py rename to examples/medical_analysis/health_privacy_swarm 2.py diff --git a/new_features_examples/medical_analysis/health_privacy_swarm.py b/examples/medical_analysis/health_privacy_swarm.py similarity index 100% rename from new_features_examples/medical_analysis/health_privacy_swarm.py rename to examples/medical_analysis/health_privacy_swarm.py diff --git a/new_features_examples/medical_analysis/health_privacy_swarm_two 2.py b/examples/medical_analysis/health_privacy_swarm_two 2.py similarity index 100% rename from new_features_examples/medical_analysis/health_privacy_swarm_two 2.py rename to examples/medical_analysis/health_privacy_swarm_two 2.py diff --git a/new_features_examples/medical_analysis/health_privacy_swarm_two.py b/examples/medical_analysis/health_privacy_swarm_two.py similarity index 100% rename from new_features_examples/medical_analysis/health_privacy_swarm_two.py rename to examples/medical_analysis/health_privacy_swarm_two.py diff --git a/new_features_examples/medical_analysis/medical_analysis_agent_rearrange.md b/examples/medical_analysis/medical_analysis_agent_rearrange.md similarity index 100% rename from new_features_examples/medical_analysis/medical_analysis_agent_rearrange.md rename to examples/medical_analysis/medical_analysis_agent_rearrange.md diff --git a/new_features_examples/medical_analysis/medical_coder_agent.py b/examples/medical_analysis/medical_coder_agent.py similarity index 100% rename from new_features_examples/medical_analysis/medical_coder_agent.py rename to examples/medical_analysis/medical_coder_agent.py diff --git a/new_features_examples/medical_analysis/medical_coding_report.md b/examples/medical_analysis/medical_coding_report.md similarity index 100% rename from new_features_examples/medical_analysis/medical_coding_report.md rename to examples/medical_analysis/medical_coding_report.md diff --git a/new_features_examples/medical_analysis/medical_diagnosis_report.md b/examples/medical_analysis/medical_diagnosis_report.md similarity index 100% rename from new_features_examples/medical_analysis/medical_diagnosis_report.md rename to examples/medical_analysis/medical_diagnosis_report.md diff --git a/new_features_examples/medical_analysis/new_medical_rearrange.py b/examples/medical_analysis/new_medical_rearrange.py similarity index 100% rename from new_features_examples/medical_analysis/new_medical_rearrange.py rename to examples/medical_analysis/new_medical_rearrange.py diff --git a/new_features_examples/medical_analysis/rearrange_video_examples/reports/medical_analysis_agent_rearrange.md b/examples/medical_analysis/rearrange_video_examples/reports/medical_analysis_agent_rearrange.md similarity index 100% rename from new_features_examples/medical_analysis/rearrange_video_examples/reports/medical_analysis_agent_rearrange.md rename to examples/medical_analysis/rearrange_video_examples/reports/medical_analysis_agent_rearrange.md diff --git a/new_features_examples/medical_analysis/rearrange_video_examples/reports/vc_document_analysis.md b/examples/medical_analysis/rearrange_video_examples/reports/vc_document_analysis.md similarity index 100% rename from new_features_examples/medical_analysis/rearrange_video_examples/reports/vc_document_analysis.md rename to examples/medical_analysis/rearrange_video_examples/reports/vc_document_analysis.md diff --git a/new_features_examples/medical_analysis/rearrange_video_examples/term_sheet_swarm.py b/examples/medical_analysis/rearrange_video_examples/term_sheet_swarm.py similarity index 100% rename from new_features_examples/medical_analysis/rearrange_video_examples/term_sheet_swarm.py rename to examples/medical_analysis/rearrange_video_examples/term_sheet_swarm.py diff --git a/new_features_examples/meme_agents/bob_the_agent.py b/examples/meme_agents/bob_the_agent.py similarity index 100% rename from new_features_examples/meme_agents/bob_the_agent.py rename to examples/meme_agents/bob_the_agent.py diff --git a/new_features_examples/meme_agents/meme_agent_generator.py b/examples/meme_agents/meme_agent_generator.py similarity index 100% rename from new_features_examples/meme_agents/meme_agent_generator.py rename to examples/meme_agents/meme_agent_generator.py diff --git a/new_features_examples/microstructure.py b/examples/microstructure.py similarity index 100% rename from new_features_examples/microstructure.py rename to examples/microstructure.py diff --git a/new_features_examples/multi_agent_router_example.py b/examples/multi_agent_router_example.py similarity index 100% rename from new_features_examples/multi_agent_router_example.py rename to examples/multi_agent_router_example.py diff --git a/new_features_examples/multi_tool_usage_agent.py b/examples/multi_tool_usage_agent.py similarity index 100% rename from new_features_examples/multi_tool_usage_agent.py rename to examples/multi_tool_usage_agent.py diff --git a/new_features_examples/new_spreadsheet_swarm_examples/crypto_tax_swarm/crypto_tax_spreadsheet.py b/examples/new_spreadsheet_swarm_examples/crypto_tax_swarm/crypto_tax_spreadsheet.py similarity index 100% rename from new_features_examples/new_spreadsheet_swarm_examples/crypto_tax_swarm/crypto_tax_spreadsheet.py rename to examples/new_spreadsheet_swarm_examples/crypto_tax_swarm/crypto_tax_spreadsheet.py diff --git a/new_features_examples/new_spreadsheet_swarm_examples/crypto_tax_swarm/crypto_tax_swarm_spreadsheet.csv b/examples/new_spreadsheet_swarm_examples/crypto_tax_swarm/crypto_tax_swarm_spreadsheet.csv similarity index 100% rename from new_features_examples/new_spreadsheet_swarm_examples/crypto_tax_swarm/crypto_tax_swarm_spreadsheet.csv rename to examples/new_spreadsheet_swarm_examples/crypto_tax_swarm/crypto_tax_swarm_spreadsheet.csv diff --git a/new_features_examples/new_spreadsheet_swarm_examples/financial_analysis/swarm.csv b/examples/new_spreadsheet_swarm_examples/financial_analysis/swarm.csv similarity index 100% rename from new_features_examples/new_spreadsheet_swarm_examples/financial_analysis/swarm.csv rename to examples/new_spreadsheet_swarm_examples/financial_analysis/swarm.csv diff --git a/new_features_examples/new_spreadsheet_swarm_examples/financial_analysis/swarm_csv.py b/examples/new_spreadsheet_swarm_examples/financial_analysis/swarm_csv.py similarity index 100% rename from new_features_examples/new_spreadsheet_swarm_examples/financial_analysis/swarm_csv.py rename to examples/new_spreadsheet_swarm_examples/financial_analysis/swarm_csv.py diff --git a/new_features_examples/ollama_demo.py b/examples/ollama_demo.py similarity index 100% rename from new_features_examples/ollama_demo.py rename to examples/ollama_demo.py diff --git a/new_features_examples/onboard/agents.yaml b/examples/onboard/agents.yaml similarity index 100% rename from new_features_examples/onboard/agents.yaml rename to examples/onboard/agents.yaml diff --git a/new_features_examples/onboard/onboard-basic.py b/examples/onboard/onboard-basic.py similarity index 100% rename from new_features_examples/onboard/onboard-basic.py rename to examples/onboard/onboard-basic.py diff --git a/new_features_examples/openai_assistant_wrapper.py b/examples/openai_assistant_wrapper.py similarity index 100% rename from new_features_examples/openai_assistant_wrapper.py rename to examples/openai_assistant_wrapper.py diff --git a/new_features_examples/persistent_legal_agent.py b/examples/persistent_legal_agent.py similarity index 100% rename from new_features_examples/persistent_legal_agent.py rename to examples/persistent_legal_agent.py diff --git a/new_features_examples/privacy_building.py b/examples/privacy_building.py similarity index 100% rename from new_features_examples/privacy_building.py rename to examples/privacy_building.py diff --git a/new_features_examples/qdrant_agent.py b/examples/qdrant_agent.py similarity index 100% rename from new_features_examples/qdrant_agent.py rename to examples/qdrant_agent.py diff --git a/new_features_examples/real_estate_agent.py b/examples/real_estate_agent.py similarity index 100% rename from new_features_examples/real_estate_agent.py rename to examples/real_estate_agent.py diff --git a/new_features_examples/sequential_workflow/sequential_worflow_test 2.py b/examples/sequential_workflow/sequential_worflow_test 2.py similarity index 100% rename from new_features_examples/sequential_workflow/sequential_worflow_test 2.py rename to examples/sequential_workflow/sequential_worflow_test 2.py diff --git a/new_features_examples/sequential_workflow/sequential_worflow_test.py b/examples/sequential_workflow/sequential_worflow_test.py similarity index 100% rename from new_features_examples/sequential_workflow/sequential_worflow_test.py rename to examples/sequential_workflow/sequential_worflow_test.py diff --git a/new_features_examples/sequential_workflow/sequential_workflow 2.py b/examples/sequential_workflow/sequential_workflow 2.py similarity index 100% rename from new_features_examples/sequential_workflow/sequential_workflow 2.py rename to examples/sequential_workflow/sequential_workflow 2.py diff --git a/new_features_examples/sequential_workflow/sequential_workflow.py b/examples/sequential_workflow/sequential_workflow.py similarity index 100% rename from new_features_examples/sequential_workflow/sequential_workflow.py rename to examples/sequential_workflow/sequential_workflow.py diff --git a/new_features_examples/solana_agent.py b/examples/solana_agent.py similarity index 100% rename from new_features_examples/solana_agent.py rename to examples/solana_agent.py diff --git a/new_features_examples/solana_tool/solana_tool.py b/examples/solana_tool/solana_tool.py similarity index 100% rename from new_features_examples/solana_tool/solana_tool.py rename to examples/solana_tool/solana_tool.py diff --git a/new_features_examples/solana_tool/solana_tool_test.py b/examples/solana_tool/solana_tool_test.py similarity index 100% rename from new_features_examples/solana_tool/solana_tool_test.py rename to examples/solana_tool/solana_tool_test.py diff --git a/new_features_examples/spike/agent_rearrange_test.py b/examples/spike/agent_rearrange_test.py similarity index 100% rename from new_features_examples/spike/agent_rearrange_test.py rename to examples/spike/agent_rearrange_test.py diff --git a/new_features_examples/spike/function_caller_example.py b/examples/spike/function_caller_example.py similarity index 100% rename from new_features_examples/spike/function_caller_example.py rename to examples/spike/function_caller_example.py diff --git a/new_features_examples/spike/memory.py b/examples/spike/memory.py similarity index 100% rename from new_features_examples/spike/memory.py rename to examples/spike/memory.py diff --git a/new_features_examples/spike/spike.zip b/examples/spike/spike.zip similarity index 100% rename from new_features_examples/spike/spike.zip rename to examples/spike/spike.zip diff --git a/new_features_examples/spike/test.py b/examples/spike/test.py similarity index 100% rename from new_features_examples/spike/test.py rename to examples/spike/test.py diff --git a/new_features_examples/swarm_router_example.py b/examples/swarm_router_example.py similarity index 100% rename from new_features_examples/swarm_router_example.py rename to examples/swarm_router_example.py diff --git a/new_features_examples/swarmarrange/rearrange_test.py b/examples/swarmarrange/rearrange_test.py similarity index 100% rename from new_features_examples/swarmarrange/rearrange_test.py rename to examples/swarmarrange/rearrange_test.py diff --git a/new_features_examples/swarmarrange/swarm_arange_demo 2.py b/examples/swarmarrange/swarm_arange_demo 2.py similarity index 100% rename from new_features_examples/swarmarrange/swarm_arange_demo 2.py rename to examples/swarmarrange/swarm_arange_demo 2.py diff --git a/new_features_examples/swarmarrange/swarm_arange_demo.py b/examples/swarmarrange/swarm_arange_demo.py similarity index 100% rename from new_features_examples/swarmarrange/swarm_arange_demo.py rename to examples/swarmarrange/swarm_arange_demo.py diff --git a/new_features_examples/swarms_claude_example.py b/examples/swarms_claude_example.py similarity index 100% rename from new_features_examples/swarms_claude_example.py rename to examples/swarms_claude_example.py diff --git a/new_features_examples/tools_examples/dex_screener.py b/examples/tools_examples/dex_screener.py similarity index 100% rename from new_features_examples/tools_examples/dex_screener.py rename to examples/tools_examples/dex_screener.py diff --git a/new_features_examples/tools_examples/financial_news_agent.py b/examples/tools_examples/financial_news_agent.py similarity index 100% rename from new_features_examples/tools_examples/financial_news_agent.py rename to examples/tools_examples/financial_news_agent.py diff --git a/new_features_examples/tools_examples/swarms_tool_example_simple.py b/examples/tools_examples/swarms_tool_example_simple.py similarity index 100% rename from new_features_examples/tools_examples/swarms_tool_example_simple.py rename to examples/tools_examples/swarms_tool_example_simple.py diff --git a/new_features_examples/tools_examples/swarms_tools_example.py b/examples/tools_examples/swarms_tools_example.py similarity index 100% rename from new_features_examples/tools_examples/swarms_tools_example.py rename to examples/tools_examples/swarms_tools_example.py diff --git a/new_features_examples/unique_swarms_examples.py b/examples/unique_swarms_examples.py similarity index 100% rename from new_features_examples/unique_swarms_examples.py rename to examples/unique_swarms_examples.py diff --git a/new_features_examples/voice.py b/examples/voice.py similarity index 100% rename from new_features_examples/voice.py rename to examples/voice.py diff --git a/swarms/telemetry/bootup.py b/swarms/telemetry/bootup.py index 16ea203e..fec281dc 100644 --- a/swarms/telemetry/bootup.py +++ b/swarms/telemetry/bootup.py @@ -24,7 +24,7 @@ def bootup(): ): logger.disable("") logging.disable(logging.CRITICAL) - + else: logger.enable("") diff --git a/swarms/tools/prebuilt/__init__.py b/swarms/tools/prebuilt/__init__.py deleted file mode 100644 index 0704743c..00000000 --- a/swarms/tools/prebuilt/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -from swarms.tools.prebuilt.math_eval import math_eval - -__all__ = [ - "math_eval", -] diff --git a/swarms/tools/prebuilt/bing_api.py b/swarms/tools/prebuilt/bing_api.py deleted file mode 100644 index 2d865c98..00000000 --- a/swarms/tools/prebuilt/bing_api.py +++ /dev/null @@ -1,82 +0,0 @@ -import os -import requests -from typing import List, Dict - - -def check_bing_api_key(): - try: - return os.getenv("BING_API_KEY") - except Exception as error: - print(f"Error {error}") - raise None - - -def parse_and_merge_logs(logs: List[Dict[str, str]]) -> str: - """ - Parses logs and merges them into a single string for input to an LLM. - - Parameters: - logs (List[Dict[str, str]]): A list of dictionaries where each dictionary represents a log entry. - - Returns: - str: A single string containing all log entries concatenated. - """ - - merged_logs = "" - for log in logs: - log_entries = [ - f"{key}: {value}" for key, value in log.items() - ] - log_string = "\n".join(log_entries) - merged_logs += log_string + "\n\n" - - return merged_logs.strip() - - -def fetch_web_articles_bing_api( - query: str = None, -) -> List[Dict[str, str]]: - """ - Fetches four articles from Bing Web Search API based on the given query. - - Parameters: - query (str): The search query to retrieve articles. - subscription_key (str): The Bing Search API subscription key. - - Returns: - List[Dict[str, str]]: A list of dictionaries containing article details. - """ - subscription_key = check_bing_api_key() - - url = "https://api.bing.microsoft.com/v7.0/search" - headers = {"Ocp-Apim-Subscription-Key": subscription_key} - params = {"q": query, "count": 4, "mkt": "en-US"} - - response = requests.get(url, headers=headers, params=params) - response.raise_for_status() - search_results = response.json() - - articles = [] - for i, result in enumerate( - search_results.get("webPages", {}).get("value", []) - ): - article_info = { - "query": query, - "url": result.get("url"), - "title": result.get("name"), - "publishedDate": result.get("dateLastCrawled"), - "author": ( - result.get("provider")[0]["name"] - if result.get("provider") - else "Unknown" - ), - "id": str(i + 1), # Generating a simple unique ID - } - articles.append(article_info) - - articles = parse_and_merge_logs(articles) - return articles - - -# out = fetch_web_articles_bing_api("swarms ai github") -# print(out) diff --git a/swarms/tools/prebuilt/code_executor.py b/swarms/tools/prebuilt/code_executor.py deleted file mode 100644 index 089d0379..00000000 --- a/swarms/tools/prebuilt/code_executor.py +++ /dev/null @@ -1,231 +0,0 @@ -import os -import subprocess -from loguru import logger - -try: - import tiktoken -except ImportError: - print("tiktoken not found, installing...") - subprocess.run(["pip", "install", "tiktoken"]) - import tiktoken - -import concurrent.futures -from typing import List - - -class TikTokenizer: - def __init__( - self, - model_name: str = "o200k_base", - ): - """ - Initializes a TikTokenizer object. - - Args: - model_name (str, optional): The name of the model to use for tokenization. Defaults to "gpt-4o". - """ - try: - self.model_name = model_name - self.encoding = tiktoken.get_encoding(model_name) - except Exception as e: - raise ValueError( - f"Failed to initialize tokenizer with model '{model_name}': {str(e)}" - ) - - def encode(self, string: str) -> str: - """ - Tokenizes a text string. - - Args: - string (str): The input text string. - - Returns: - str: The tokenized text string. - """ - return self.encoding.encode(string) - - def decode(self, tokens: List[int]) -> str: - """ - Detokenizes a text string. - - Args: - string (str): The input tokenized text string. - - Returns: - str: The detokenized text string. - """ - return self.encoding.decode(tokens) - - def count_tokens(self, string: str) -> int: - """ - Returns the number of tokens in a text string. - - Args: - string (str): The input text string. - - Returns: - int: The number of tokens in the text string. - """ - num_tokens = 0 - - def count_tokens_in_chunk(chunk): - nonlocal num_tokens - num_tokens += len(self.encoding.encode(chunk)) - - # Split the string into chunks for parallel processing - chunks = [ - string[i : i + 1000] for i in range(0, len(string), 1000) - ] - - # Create a ThreadPoolExecutor with maximum threads - with concurrent.futures.ThreadPoolExecutor( - max_workers=10 - ) as executor: - # Submit each chunk for processing - futures = [ - executor.submit(count_tokens_in_chunk, chunk) - for chunk in chunks - ] - - # Wait for all futures to complete - concurrent.futures.wait(futures) - - return num_tokens - - -class CodeExecutor: - """ - A class to execute Python code and return the output as a string. - - The class also logs the input and output using loguru and stores the outputs - in a folder called 'artifacts'. - - Methods: - execute(code: str) -> str: - Executes the given Python code and returns the output. - """ - - def __init__( - self, - max_output_length: int = 1000, - artifacts_directory: str = "artifacts", - language: str = "python3", - ) -> None: - """ - Initializes the CodeExecutor class and sets up the logging. - """ - self.max_output_length = max_output_length - self.artifacts_dir = artifacts_directory - self.language = language - - os.makedirs(self.artifacts_dir, exist_ok=True) - self.setup_logging() - self.tokenizer = TikTokenizer() - - def setup_logging(self) -> None: - """ - Sets up the loguru logger with colorful output. - """ - logger.add( - os.path.join(self.artifacts_dir, "code_execution.log"), - format="{time} {level} {message}", - level="DEBUG", - ) - logger.info( - "Logger initialized and artifacts directory set up." - ) - - def format_code(self, code: str) -> str: - """ - Formats the given Python code using black. - - Args: - code (str): The Python code to format. - - Returns: - str: The formatted Python code. - - Raises: - ValueError: If the code cannot be formatted. - """ - try: - import black - - formatted_code = black.format_str( - code, mode=black.FileMode() - ) - return formatted_code - except Exception as e: - logger.error(f"Error formatting code: {e}") - raise ValueError(f"Error formatting code: {e}") from e - - def execute(self, code: str) -> str: - """ - Executes the given Python code and returns the output. - - Args: - code (str): The Python code to execute. - - Returns: - str: The output of the executed code. - - Raises: - RuntimeError: If there is an error during the execution of the code. - """ - try: - formatted_code = self.format_code(code) - logger.info(f"Executing code:\n{formatted_code}") - completed_process = subprocess.run( - [self.language, "-c", formatted_code], - capture_output=True, - text=True, - check=True, - ) - output = completed_process.stdout - logger.info(f"Code output:\n{output}") - token_count = self.tokenizer.count_tokens(output) - print(token_count) - - if ( - self.max_output_length - and token_count > self.max_output_length - ): - logger.warning( - f"Output length exceeds {self.max_output_length} characters. Truncating output." - ) - output = output[: self.max_output_length] + "..." - - return output - except subprocess.CalledProcessError as e: - logger.error(f"Error executing code: {e.stderr}") - raise RuntimeError( - f"Error executing code: {e.stderr}" - ) from e - - -# # Example usage: -# if __name__ == "__main__": -# executor = CodeExecutor(max_output_length=300) -# code = """ -# import requests -# from typing import Any - -# def fetch_financial_news(api_key: str, query: str, num_articles: int) -> Any: -# try: -# url = f"https://newsapi.org/v2/everything?q={query}&apiKey={api_key}" -# response = requests.get(url) -# response.raise_for_status() -# return response.json() -# except requests.RequestException as e: -# print(f"Request Error: {e}") -# raise -# except ValueError as e: -# print(f"Value Error: {e}") -# raise - -# api_key = "" -# result = fetch_financial_news(api_key, query="Nvidia news", num_articles=5) -# print(result) -# """ -# result = executor.execute(code) -# print(result) diff --git a/swarms/tools/prebuilt/code_interpreter.py b/swarms/tools/prebuilt/code_interpreter.py deleted file mode 100644 index d26b555e..00000000 --- a/swarms/tools/prebuilt/code_interpreter.py +++ /dev/null @@ -1,232 +0,0 @@ -import queue -import subprocess -import threading -import time -import traceback -from swarms.utils.loguru_logger import logger - - -class SubprocessCodeInterpreter: - """ - SubprocessCodeinterpreter is a base class for code interpreters that run code in a subprocess. - - - Attributes: - start_cmd (str): The command to start the subprocess. Should be a string that can be split by spaces. - process (subprocess.Popen): The subprocess that is running the code. - debug_mode (bool): Whether to print debug statements. - output_queue (queue.Queue): A queue that is filled with output from the subprocess. - done (threading.Event): An event that is set when the subprocess is done running code. - - Example: - """ - - def __init__( - self, - start_cmd: str = "python3", - debug_mode: bool = False, - max_retries: int = 3, - verbose: bool = False, - retry_count: int = 0, - *args, - **kwargs, - ): - self.process = None - self.start_cmd = start_cmd - self.debug_mode = debug_mode - self.max_retries = max_retries - self.verbose = verbose - self.retry_count = retry_count - self.output_queue = queue.Queue() - self.done = threading.Event() - - def detect_active_line(self, line): - """Detect if the line is an active line - - Args: - line (_type_): _description_ - - Returns: - _type_: _description_ - """ - return None - - def detect_end_of_execution(self, line): - """detect if the line is an end of execution line - - Args: - line (_type_): _description_ - - Returns: - _type_: _description_ - """ - return None - - def line_postprocessor(self, line): - """Line postprocessor - - Args: - line (_type_): _description_ - - Returns: - _type_: _description_ - """ - return line - - def preprocess_code(self, code): - """ - This needs to insert an end_of_execution marker of some kind, - which can be detected by detect_end_of_execution. - - Optionally, add active line markers for detect_active_line. - """ - return code - - def terminate(self): - """terminate the subprocess""" - self.process.terminate() - - def start_process(self): - """start the subprocess""" - if self.process: - self.terminate() - - logger.info( - f"Starting subprocess with command: {self.start_cmd}" - ) - self.process = subprocess.Popen( - self.start_cmd.split(), - stdin=subprocess.PIPE, - stdout=subprocess.PIPE, - stderr=subprocess.PIPE, - text=True, - bufsize=0, - universal_newlines=True, - ) - threading.Thread( - target=self.handle_stream_output, - args=(self.process.stdout, False), - daemon=True, - ).start() - threading.Thread( - target=self.handle_stream_output, - args=(self.process.stderr, True), - daemon=True, - ).start() - - return self.process - - def run(self, code: str): - """Run the code in the subprocess - - Args: - code (str): _description_ - - Yields: - _type_: _description_ - """ - - # Setup - logger.info("Running code in subprocess") - try: - code = self.preprocess_code(code) - if not self.process: - self.start_process() - except BaseException: - yield {"output": traceback.format_exc()} - return - - while self.retry_count <= self.max_retries: - if self.debug_mode: - print(f"Running code:\n{code}\n---") - - self.done.clear() - - try: - self.process.stdin.write(code + "\n") - self.process.stdin.flush() - break - except BaseException: - if self.retry_count != 0: - # For UX, I like to hide this if it happens once. Obviously feels better to not see errors - # Most of the time it doesn't matter, but we should figure out why it happens frequently with: - # applescript - yield {"output": traceback.format_exc()} - yield { - "output": ( - "Retrying..." - f" ({self.retry_count}/{self.max_retries})" - ) - } - yield {"output": "Restarting process."} - - self.start_process() - - self.retry_count += 1 - if self.retry_count > self.max_retries: - yield { - "output": ( - "Maximum retries reached. Could not" - " execute code." - ) - } - return - - while True: - if not self.output_queue.empty(): - yield self.output_queue.get() - else: - time.sleep(0.1) - try: - output = self.output_queue.get( - timeout=0.3 - ) # Waits for 0.3 seconds - yield output - except queue.Empty: - if self.done.is_set(): - # Try to yank 3 more times from it... maybe there's something in there... - # (I don't know if this actually helps. Maybe we just need to yank 1 more time) - for _ in range(3): - if not self.output_queue.empty(): - yield self.output_queue.get() - time.sleep(0.2) - break - - def handle_stream_output(self, stream, is_error_stream): - """Handle the output from the subprocess - - Args: - stream (_type_): _description_ - is_error_stream (bool): _description_ - """ - for line in iter(stream.readline, ""): - if self.debug_mode: - print(f"Received output line:\n{line}\n---") - - line = self.line_postprocessor(line) - - if line is None: - continue # `line = None` is the postprocessor's signal to discard completely - - if self.detect_active_line(line): - active_line = self.detect_active_line(line) - self.output_queue.put({"active_line": active_line}) - elif self.detect_end_of_execution(line): - self.output_queue.put({"active_line": None}) - time.sleep(0.1) - self.done.set() - elif is_error_stream and "KeyboardInterrupt" in line: - self.output_queue.put({"output": "KeyboardInterrupt"}) - time.sleep(0.1) - self.done.set() - else: - self.output_queue.put({"output": line}) - - -# interpreter = SubprocessCodeInterpreter() -# interpreter.start_cmd = "python3" -# out = interpreter.run(""" -# print("hello") -# print("world") -# """) -# print(out) diff --git a/swarms/tools/prebuilt/math_eval.py b/swarms/tools/prebuilt/math_eval.py deleted file mode 100644 index 6dbff2b5..00000000 --- a/swarms/tools/prebuilt/math_eval.py +++ /dev/null @@ -1,61 +0,0 @@ -import functools -import logging - - -def math_eval(func1, func2): - """Math evaluation decorator. - - Args: - func1 (_type_): _description_ - func2 (_type_): _description_ - - Example: - >>> @math_eval(ground_truth, generated_func) - >>> def test_func(x): - >>> return x - >>> result1, result2 = test_func(5) - >>> print(f"Result from ground_truth: {result1}") - >>> print(f"Result from generated_func: {result2}") - - """ - - def decorator(func): - @functools.wraps(func) - def wrapper(*args, **kwargs): - try: - result1 = func1(*args, **kwargs) - except Exception as e: - logging.error(f"Error in func1: {e}") - result1 = None - - try: - result2 = func2(*args, **kwargs) - except Exception as e: - logging.error(f"Error in func2: {e}") - result2 = None - - if result1 != result2: - logging.warning( - f"Outputs do not match: {result1} != {result2}" - ) - - return result1, result2 - - return wrapper - - return decorator - - -# def ground_truth(x): -# return x * 2 - -# def generated_func(x): -# return x - 10 - -# @math_eval(ground_truth, generated_func) -# def test_func(x): -# return x - -# result1, result2 = test_func(5) -# print(f"Result from ground_truth: {result1}") -# print(f"Result from generated_func: {result2}") diff --git a/swarms/utils/__init__.py b/swarms/utils/__init__.py index 0a825caf..49cd47fd 100644 --- a/swarms/utils/__init__.py +++ b/swarms/utils/__init__.py @@ -13,7 +13,6 @@ from swarms.utils.file_processing import ( zip_folders, ) from swarms.utils.markdown_message import display_markdown_message -from swarms.tools.prebuilt.math_eval import math_eval from swarms.utils.parse_code import extract_code_from_markdown from swarms.utils.pdf_to_text import pdf_to_text from swarms.utils.try_except_wrapper import try_except_wrapper @@ -32,7 +31,6 @@ __all__ = [ "create_file_in_folder", "zip_folders", "display_markdown_message", - "math_eval", "extract_code_from_markdown", "pdf_to_text", "try_except_wrapper",