remove extra folder

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "crewai"
-version = "0.22.0"
+version = "0.22.5"
 description = "Cutting-edge framework for orchestrating role-playing, autonomous AI agents. By fostering collaborative intelligence, CrewAI empowers agents to work together seamlessly, tackling complex tasks."
 authors = ["Joao Moura <joao@crewai.com>"]
 readme = "README.md"
@@ -26,6 +26,7 @@ instructor = "^0.5.2"
 regex = "^2023.12.25"
 crewai-tools = { version = "^0.0.15", optional = true }
 click = "^8.1.7"
+python-dotenv = "1.0.0"
 
 [tool.poetry.extras]
 tools = ["crewai-tools"]

src/crewai/cli/create_crew.py

@@ -15,9 +15,8 @@ def create_crew(name):
         os.mkdir(folder_name)
         os.mkdir(folder_name + "/tests")
         os.mkdir(folder_name + "/src")
-        os.mkdir(folder_name + f"/src/{folder_name}")
-        os.mkdir(folder_name + f"/src/{folder_name}/tools")
-        os.mkdir(folder_name + f"/src/{folder_name}/config")
+        os.mkdir(folder_name + "/src/tools")
+        os.mkdir(folder_name + "/src/config")
         with open(folder_name + "/.env", "w") as file:
             file.write("OPENAI_API_KEY=YOUR_API_KEY")
     else:
@@ -47,17 +46,17 @@ def create_crew(name):
 
     for file_name in src_template_files:
         src_file = templates_dir / file_name
-        dst_file = Path(folder_name) / "src" / folder_name / file_name
+        dst_file = Path(folder_name) / "src" / file_name
         copy_template(src_file, dst_file, name, class_name, folder_name)
 
     for file_name in tools_template_files:
         src_file = templates_dir / file_name
-        dst_file = Path(folder_name) / "src" / folder_name / file_name
+        dst_file = Path(folder_name) / "src" / file_name
         copy_template(src_file, dst_file, name, class_name, folder_name)
 
     for file_name in config_template_files:
         src_file = templates_dir / file_name
-        dst_file = Path(folder_name) / "src" / folder_name / file_name
+        dst_file = Path(folder_name) / "src" / file_name
         copy_template(src_file, dst_file, name, class_name, folder_name)
 
     click.secho(f"Crew {name} created successfully!", fg="green", bold=True)

src/crewai/cli/templates/crew.py

@@ -1,7 +1,8 @@
 from crewai import Agent, Crew, Process, Task
 from crewai.project import CrewBase, agent, crew, task
 
-from .tools.custom_tool import MyCustomTool
+# Uncomment the following line to use an example of a custom tool
+# from {{folder_name}}.tools.custom_tool import MyCustomTool
 
 # Check our tools documentations for more information on how to use them
 # from crewai_tools import SerperDevTool
@@ -16,7 +17,7 @@ class {{crew_name}}Crew():
 	def researcher(self) -> Agent:
 		return Agent(
 			config=self.agents_config['researcher'],
-			# tools=[MyCustomTool()], # Example of custom tool
+			# tools=[MyCustomTool()], # Example of custom tool, loaded on the beginning of file
 			verbose=True
 		)
 

src/crewai/cli/templates/main.py

@@ -1,8 +1,13 @@
 #!/usr/bin/env python
-from .crew import {{crew_name}}Crew
+from crew import {{crew_name}}Crew
 
 
 def run():
     # Replace with your inputs, it will automatically interpolate any tasks and agents information
-    inputs = {'topic': 'AI LLMs'}
-    {{crew_name}}Crew().crew().kickoff(inputs=inputs)
+    inputs = {
+        'topic': 'AI LLMs'
+    }
+    {{crew_name}}Crew().crew().kickoff(inputs=inputs)
+
+if __name__ == "__main__":
+    run()

src/crewai/cli/templates/pyproject.toml

@@ -6,7 +6,7 @@ authors = ["Your Name <you@example.com>"]
 
 [tool.poetry.dependencies]
 python = ">=3.10,<=3.13"
-crewai = {extras = ["tools"], version = "^0.22.0"}
+crewai = {extras = ["tools"], version = "^0.22.2"}
 
 [tool.poetry.scripts]
 {{folder_name}} = "{{folder_name}}.main:run"

src/crewai/cli/templates/tools/custom_tool.py

@@ -1,6 +1,3 @@
-# For this make sure to install the tools package
-# pip install 'crewai[tools]'
-
 from crewai_tools import BaseTool
 
 

src/crewai/project/annotations.py

@@ -1,5 +1,9 @@
+tasks_order = []
+
+
 def task(func):
     func.is_task = True
+    tasks_order.append(func.__name__)
     return func
 
 
@@ -13,11 +17,11 @@ def crew(func):
         instantiated_tasks = []
         instantiated_agents = []
 
-        # Instantiate tasks and collect their associated agents
         agent_roles = set()
-        for attr_name in dir(self):
-            possible_task = getattr(self, attr_name)
-            if callable(possible_task) and hasattr(possible_task, "is_task"):
+        # Iterate over tasks_order to maintain the defined order
+        for task_name in tasks_order:
+            possible_task = getattr(self, task_name)
+            if callable(possible_task):
                 task_instance = possible_task()
                 instantiated_tasks.append(task_instance)
                 if hasattr(task_instance, "agent"):
@@ -38,7 +42,6 @@ def crew(func):
         self.agents = instantiated_agents
         self.tasks = instantiated_tasks
 
-        # Now call the original crew method
         return func(self, *args, **kwargs)
 
     return wrapper

src/crewai/project/crew_base.py

@@ -3,6 +3,9 @@ import os
 from pathlib import Path
 
 import yaml
+from dotenv import load_dotenv
+
+load_dotenv()
 
 
 def CrewBase(cls):