Update crew.py

crew.py

@@ -11,7 +11,7 @@ from google import genai
 from google.genai import types
 from openinference.instrumentation.crewai import CrewAIInstrumentor
 from phoenix.otel import register
-from util import read_file, read_docx, read_pptx, is_ext
+from util import read_file_json, read_docx_text, read_pptx_text, is_ext
 
 ## LLMs
 
@@ -199,14 +199,19 @@ def run_crew(question, file_path):
             contents = []
             
             if is_ext(file_path, ".docx"):
-                file_data = read_docx(file_path)
-                contents = [f"{question}\n{file_data}"]
+                file_data = read_docx_text(file_path)
+                final_question = f"{question}\n{file_data}"
+                contents = [final_question]
             elif is_ext(file_path, ".pptx"):
-                file_data = read_pptx(file_path)
-                contents = [f"{question}\n{file_data}"]
+                file_data = read_pptx_text(file_path)
+                final_question = f"{question}\n{file_data}"
+                contents = [final_question]
             else:
                 file = client.files.upload(file=file_path)
                 contents = [file, question]
+
+            print(f"### Initial question: {question}")
+            print(f"### Final question: {final_question}")
             
             response = client.models.generate_content(
                 model=DOCUMENT_ANALYSIS_MODEL,
@@ -233,11 +238,16 @@ def run_crew(question, file_path):
         try:
             client = genai.Client(api_key=os.environ["GEMINI_API_KEY"])
 
-            file_data = read_file(file_path)
+            file_data = read_file_json(file_path)
+
+            final_question = f"{question}\n{file_data}"
+            
+            print(f"### Initial question: {question}")
+            print(f"### Final question: {final_question}")
             
             response = client.models.generate_content(
                 model=CODE_GENERATION_MODEL,
-                contents=[f"{question}\n{file_data}"],
+                contents=[final_question],
                 config=types.GenerateContentConfig(
                     tools=[types.Tool(code_execution=types.ToolCodeExecution)]
                 ),
@@ -419,8 +429,6 @@ def run_crew(question, file_path):
     if file_path:
         question = f"{question} File path: {file_path}."
 
-    print(f"### Question: {question}")
-    
     initial_answer = crew.kickoff(inputs={"question": question})
     final_answer = get_final_answer(FINAL_ANSWER_MODEL, question, str(initial_answer))