Merge branch 'main' of https://huggingface.co/spaces/EntrepreneurFirst/FitnessEquation

Modules/PoseEstimation/pose_agent.py

@@ -77,7 +77,7 @@ def check_knee_angle(json_path: str) -> bool:
     return False
 
 @tool
-def check_squat(video_path: str) -> bool:
+def check_squat(file_name: str) -> str:
     """
     Checks if the squat is correct.
     This function uses the check_knee_angle tool to check if the squat is correct. If the minimum knee angle is smaller than 90 degrees, the squat is considered correct, because it means the user is going deep enough.
@@ -89,8 +89,17 @@ def check_squat(video_path: str) -> bool:
     Returns:
         is_correct (bool): True if the squat is correct, False otherwise
     """
-    json_path = get_keypoints_from_keypoints(video_path)
-    return check_knee_angle(json_path)
+
+    video_path = os.path.join('uploaded', file_name)
+    if os.path.exists(video_path):
+        json_path = get_keypoints_from_keypoints(video_path)
+        is_correct = check_knee_angle(json_path)
+        if is_correct:
+            return "The squat is correct because your knee angle is smaller than 90 degrees."
+        else:
+            return "The squat is incorrect because your knee angle is greater than 90 degrees."
+    else:
+        return "The video file does not exist."
 
 tools = [check_squat]
 
@@ -98,7 +107,7 @@ prompt = ChatPromptTemplate.from_messages(
     [
         (
             "system",
-            "You are a helpful assistant. Make sure to use the check_knee_angle tool if the user wants to check his movement. Also explain your response",
+            "You are a helpful assistant. Make sure to use the check_squat tool if the user wants to check his movement. Also explain your response",
         ),
         ("placeholder", "{chat_history}"),
         ("human", "{input}"),
@@ -109,6 +118,4 @@ prompt = ChatPromptTemplate.from_messages(
 # Construct the Tools agent
 agent = create_tool_calling_agent(llm, tools, prompt)
 
-agent_executor = AgentExecutor(agent=agent, tools=tools, verbose=True)
-response = agent_executor.invoke({"input": f"Is my squat correct ? The video file is in data/pose/squat.mp4."})
-print(response["output"])
+agent_executor = AgentExecutor(agent=agent, tools=tools, verbose=True)

Modules/rag.py

@@ -23,7 +23,7 @@ from langchain.retrievers import (
 from huggingface_hub import login
 login(token=os.getenv("HUGGING_FACE_TOKEN"))
 
-def load_chunk_persist_pdf() -> Chroma:
+def load_chunk_persist_pdf(task) -> Chroma:
     
     pdf_folder_path = os.path.join(os.getcwd(),Path(f"data/pdf/{task}"))
     documents = []
@@ -37,12 +37,13 @@ def load_chunk_persist_pdf() -> Chroma:
     os.makedirs("data/chroma_store/", exist_ok=True)
     vectorstore = Chroma.from_documents(
         documents=chunked_documents,
-        embedding=MistralAIEmbeddings(api_key=mistral_api_key),
+        embedding=MistralAIEmbeddings(),
         persist_directory= os.path.join(os.getcwd(),Path("data/chroma_store/"))
     )
     vectorstore.persist()
     return vectorstore
 
+personal_info_vectorstore = load_chunk_persist_pdf("personal_info")
 zero2hero_vectorstore = load_chunk_persist_pdf("zero2hero")
 bodyweight_vectorstore = load_chunk_persist_pdf("bodyweight")
 nutrition_vectorstore = load_chunk_persist_pdf("nutrition")
@@ -51,13 +52,14 @@ zero2hero_retriever = zero2hero_vectorstore.as_retriever()
 nutrition_retriever = nutrition_vectorstore.as_retriever()
 bodyweight_retriever = bodyweight_vectorstore.as_retriever()
 workout_retriever = workout_vectorstore.as_retriever()
+personal_info_retriever = personal_info_vectorstore.as_retriever()
 
 llm = ChatMistralAI(model="mistral-large-latest", mistral_api_key=mistral_api_key, temperature=0)
 
 prompt = ChatPromptTemplate.from_template(
     """
     You are a professional AI coach specialized in fitness, bodybuilding and nutrition.
-    You must adapt to the user : if he is a beginner, use simple words. You are gentle and motivative.
+    You must adapt to the user according to personal informations in the context. A You are gentle and motivative.
     Use the following pieces of retrieved context to answer the question.
     If you don't know the answer, use your common knowledge.
     Use three sentences maximum and keep the answer concise.
@@ -73,7 +75,7 @@ prompt = ChatPromptTemplate.from_template(
 def format_docs(docs):
         return "\n\n".join(doc.page_content for doc in docs)
     
-retriever = MergerRetriever(retrievers=[zero2hero_retriever, bodyweight_retriever, nutrition_retriever, workout_retriever])
+retriever = MergerRetriever(retrievers=[zero2hero_retriever, bodyweight_retriever, nutrition_retriever, workout_retriever, personal_info_retriever])
 
 rag_chain = (
         {"context": retriever | format_docs, "question": RunnablePassthrough()}
@@ -84,6 +86,6 @@ rag_chain = (
 
 
 
-print(rag_chain.invoke("What supplement could i buy to improve my sleep?"))
+print(rag_chain.invoke("WHi I'm Susan. Can you make a fitness program for me please?"))
 
 # print(rag_chain.invoke("I am a 45 years old woman and I have to loose weight for the summer. Provide me with a fitness program, and a nutrition program"))

app.py

@@ -7,10 +7,10 @@ from langchain_core.prompts import ChatPromptTemplate
 from dotenv import load_dotenv
 load_dotenv() # load .env api keys 
 import os
-
+import shutil
 from Modules.rag import rag_chain
 from Modules.router import router_chain
-# from Modules.PoseEstimation.pose_agent import agent_executor
+from Modules.PoseEstimation.pose_agent import agent_executor
 
 mistral_api_key = os.getenv("MISTRAL_API_KEY")
 from Modules.PoseEstimation import pose_estimator
@@ -39,6 +39,9 @@ with col1:
 
     if "messages" not in st.session_state:
         st.session_state.messages = []
+    
+    if "file_name" not in st.session_state:
+        st.session_state.file_name = None
 
     for message in st.session_state.messages:
         with st.chat_message(message["role"]):
@@ -52,45 +55,53 @@ with col1:
         with st.chat_message("assistant"):
             # Build answer from LLM
             direction = router_chain.invoke({"question":prompt})
+
             if direction=='fitness_advices':
-                response = rag_chain.invoke(
-                            prompt
-                            )
+                with st.spinner("Thinking..."):
+                    response = rag_chain.invoke(
+                                prompt
+                                )
             elif direction=='smalltalk':
-                response = base_chain.invoke(
-                    {"question":prompt}
-                ).content
-            # elif direction =='movement_analysis':
-            #     response = agent_executor.invoke(
-            #         {"input" : instruction}
-            #     )["output"]
-            print(type(response))
+                with st.spinner("Thinking..."):
+                    response = base_chain.invoke(
+                        {"question":prompt}
+                    ).content
+            elif direction =='movement_analysis':
+                if st.session_state.file_name is not None:
+                    prompt += "the file name is " + st.session_state.file_name
+                with st.spinner("Analyzing movement..."):
+                    response = agent_executor.invoke(
+                        {"input" : prompt}
+                    )["output"]
             st.session_state.messages.append({"role": "assistant", "content": response})
             st.markdown(response)
 
-    st.subheader("Movement Analysis")
-        # TO DO 
 # Second column containers
 with col2:
-    st.subheader("Sports Agenda")
+    # st.subheader("Sports Agenda")
         # TO DO
     st.subheader("Video Analysis")
-    ask_video = st.empty()
-    if video_uploaded is None:
-        video_uploaded = ask_video.file_uploader("Choose a video file", type=["mp4", "ogg", "webm"])
+
+    video_uploaded = st.file_uploader("Choose a video file", type=["mp4", "ogg", "webm", "MOV"])
     if video_uploaded:
         video_uploaded = save_uploaded_file(video_uploaded)
-        ask_video.empty()
+        if video_uploaded.split("/")[-1] != st.session_state.file_name:
+            shutil.rmtree('fig', ignore_errors=True)
+            shutil.rmtree('runs', ignore_errors=True)
+            st.session_state.file_name = None
+        st.session_state.file_name = video_uploaded.split("/")[-1]
         _left, mid, _right = st.columns(3)
         with mid:
             if os.path.exists('runs'):
-                st.video(os.path.join('runs', 'pose', 'predict', 'squat.mp4'), loop=True)
+                predict_list = os.listdir(os.path.join('runs', 'pose'))
+                predict_list.sort()
+                predict_dir = predict_list[-1]
+                st.video(os.path.join('runs', 'pose', predict_dir, 'squat.mp4'), loop=True)
             else :
                 st.video(video_uploaded)
             
-
-    st.subheader("Graph Displayer")
     if os.path.exists('fig'):
+        st.subheader("Graph Displayer")
         file_list = os.listdir('fig')
         for file in file_list:
             st.image(os.path.join('fig', file))

data/Zero To Hero - Bienvenue dans ta nouvelle vie.pdf

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1e59511fd335776dcb8b0e98e9e9afe6d22483df94c83755163d5d5d4a7f3809
-size 60211845

data/{RaptorBodyweight.pdf → pdf/personal_info/Susan_Thompson.pdf}

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cbc90aebadbad36b8f47cd9ba45a958d278e38e7481037acb9ecee5e3805d771
-size 26474997
+oid sha256:25e4eaa98480003224e09c48011e82678f9947382fc37c16011b75fab80f93a2
+size 55515