Merge branch 'main' of github.com:crewAIInc/crewAI into brandon/cre-130-pipeline-project-structure

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,35 @@
+---
+name: Bug report
+about: Create a report to help us improve CrewAI
+title: "[BUG]"
+labels: bug
+assignees: ''
+
+---
+
+**Description**
+Provide a clear and concise description of what the bug is.
+
+**Steps to Reproduce**
+Provide a step-by-step process to reproduce the behavior:
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots/Code snippets**
+If applicable, add screenshots or code snippets to help explain your problem.
+
+**Environment Details:**
+- **Operating System**: [e.g., Ubuntu 20.04, macOS Catalina, Windows 10]
+- **Python Version**: [e.g., 3.8, 3.9, 3.10]
+- **crewAI Version**: [e.g., 0.30.11]
+- **crewAI Tools Version**: [e.g., 0.2.6]
+
+**Logs**
+Include relevant logs or error messages if applicable.
+
+**Possible Solution**
+Have a solution in mind? Please suggest it here, or write "None".
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,21 @@
+---
+name: Feature request
+about: Suggest a Feature to improve CrewAI
+title: "[FEAT]"
+labels: feature-request, improvement
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+If possible attach the Issue related to it
+
+**Describe the solution you'd like / Use-case**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

src/crewai/utilities/token_counter_callback.py

@@ -10,24 +10,24 @@ from crewai.agents.agent_builder.utilities.base_token_process import TokenProces
 class TokenCalcHandler(BaseCallbackHandler):
     model_name: str = ""
     token_cost_process: TokenProcess
+    encoding: tiktoken.Encoding
 
     def __init__(self, model_name, token_cost_process):
         self.model_name = model_name
         self.token_cost_process = token_cost_process
+        try:
+            self.encoding = tiktoken.encoding_for_model(self.model_name)
+        except KeyError:
+            self.encoding = tiktoken.get_encoding("cl100k_base")
 
     def on_llm_start(
         self, serialized: Dict[str, Any], prompts: List[str], **kwargs: Any
     ) -> None:
-        try:
-            encoding = tiktoken.encoding_for_model(self.model_name)
-        except KeyError:
-            encoding = tiktoken.get_encoding("cl100k_base")
-
         if self.token_cost_process is None:
             return
 
         for prompt in prompts:
-            self.token_cost_process.sum_prompt_tokens(len(encoding.encode(prompt)))
+            self.token_cost_process.sum_prompt_tokens(len(self.encoding.encode(prompt)))
 
     async def on_llm_new_token(self, token: str, **kwargs) -> None:
         self.token_cost_process.sum_completion_tokens(1)