skyliulu commited on
Commit
45d0ffd
·
1 Parent(s): 9bcd561

update ignore & requirement

Browse files
Files changed (3) hide show
  1. .gitignore +3 -1
  2. app.py +56 -28
  3. requirements.txt +10 -1
.gitignore CHANGED
@@ -1 +1,3 @@
1
- .venv
 
 
 
1
+ .venv
2
+ .env
3
+ __pycache__
app.py CHANGED
@@ -3,32 +3,39 @@ import gradio as gr
3
  import requests
4
  import inspect
5
  import pandas as pd
 
 
6
 
7
  # (Keep Constants as is)
8
  # --- Constants ---
9
  DEFAULT_API_URL = "https://agents-course-unit4-scoring.hf.space"
10
 
 
11
  # --- Basic Agent Definition ---
12
  # ----- THIS IS WERE YOU CAN BUILD WHAT YOU WANT ------
13
  class BasicAgent:
14
  def __init__(self):
15
  print("BasicAgent initialized.")
 
 
16
  def __call__(self, question: str) -> str:
17
  print(f"Agent received question (first 50 chars): {question[:50]}...")
18
- fixed_answer = "This is a default answer."
19
- print(f"Agent returning fixed answer: {fixed_answer}")
 
20
  return fixed_answer
21
 
22
- def run_and_submit_all( profile: gr.OAuthProfile | None):
 
23
  """
24
  Fetches all questions, runs the BasicAgent on them, submits all answers,
25
  and displays the results.
26
  """
27
  # --- Determine HF Space Runtime URL and Repo URL ---
28
- space_id = os.getenv("SPACE_ID") # Get the SPACE_ID for sending link to the code
29
 
30
  if profile:
31
- username= f"{profile.username}"
32
  print(f"User logged in: {username}")
33
  else:
34
  print("User not logged in.")
@@ -55,16 +62,16 @@ def run_and_submit_all( profile: gr.OAuthProfile | None):
55
  response.raise_for_status()
56
  questions_data = response.json()
57
  if not questions_data:
58
- print("Fetched questions list is empty.")
59
- return "Fetched questions list is empty or invalid format.", None
60
  print(f"Fetched {len(questions_data)} questions.")
61
  except requests.exceptions.RequestException as e:
62
  print(f"Error fetching questions: {e}")
63
  return f"Error fetching questions: {e}", None
64
  except requests.exceptions.JSONDecodeError as e:
65
- print(f"Error decoding JSON response from questions endpoint: {e}")
66
- print(f"Response text: {response.text[:500]}")
67
- return f"Error decoding server response for questions: {e}", None
68
  except Exception as e:
69
  print(f"An unexpected error occurred fetching questions: {e}")
70
  return f"An unexpected error occurred fetching questions: {e}", None
@@ -81,18 +88,36 @@ def run_and_submit_all( profile: gr.OAuthProfile | None):
81
  continue
82
  try:
83
  submitted_answer = agent(question_text)
84
- answers_payload.append({"task_id": task_id, "submitted_answer": submitted_answer})
85
- results_log.append({"Task ID": task_id, "Question": question_text, "Submitted Answer": submitted_answer})
 
 
 
 
 
 
 
 
86
  except Exception as e:
87
- print(f"Error running agent on task {task_id}: {e}")
88
- results_log.append({"Task ID": task_id, "Question": question_text, "Submitted Answer": f"AGENT ERROR: {e}"})
 
 
 
 
 
 
89
 
90
  if not answers_payload:
91
  print("Agent did not produce any answers to submit.")
92
  return "Agent did not produce any answers to submit.", pd.DataFrame(results_log)
93
 
94
- # 4. Prepare Submission
95
- submission_data = {"username": username.strip(), "agent_code": agent_code, "answers": answers_payload}
 
 
 
 
96
  status_update = f"Agent finished. Submitting {len(answers_payload)} answers for user '{username}'..."
97
  print(status_update)
98
 
@@ -162,20 +187,19 @@ with gr.Blocks() as demo:
162
 
163
  run_button = gr.Button("Run Evaluation & Submit All Answers")
164
 
165
- status_output = gr.Textbox(label="Run Status / Submission Result", lines=5, interactive=False)
 
 
166
  # Removed max_rows=10 from DataFrame constructor
167
  results_table = gr.DataFrame(label="Questions and Agent Answers", wrap=True)
168
 
169
- run_button.click(
170
- fn=run_and_submit_all,
171
- outputs=[status_output, results_table]
172
- )
173
 
174
  if __name__ == "__main__":
175
- print("\n" + "-"*30 + " App Starting " + "-"*30)
176
  # Check for SPACE_HOST and SPACE_ID at startup for information
177
  space_host_startup = os.getenv("SPACE_HOST")
178
- space_id_startup = os.getenv("SPACE_ID") # Get SPACE_ID at startup
179
 
180
  if space_host_startup:
181
  print(f"✅ SPACE_HOST found: {space_host_startup}")
@@ -183,14 +207,18 @@ if __name__ == "__main__":
183
  else:
184
  print("ℹ️ SPACE_HOST environment variable not found (running locally?).")
185
 
186
- if space_id_startup: # Print repo URLs if SPACE_ID is found
187
  print(f"✅ SPACE_ID found: {space_id_startup}")
188
  print(f" Repo URL: https://huggingface.co/spaces/{space_id_startup}")
189
- print(f" Repo Tree URL: https://huggingface.co/spaces/{space_id_startup}/tree/main")
 
 
190
  else:
191
- print("ℹ️ SPACE_ID environment variable not found (running locally?). Repo URL cannot be determined.")
 
 
192
 
193
- print("-"*(60 + len(" App Starting ")) + "\n")
194
 
195
  print("Launching Gradio Interface for Basic Agent Evaluation...")
196
- demo.launch(debug=True, share=False)
 
3
  import requests
4
  import inspect
5
  import pandas as pd
6
+ from langchain_core.messages import HumanMessage
7
+ from agent import buildAgent
8
 
9
  # (Keep Constants as is)
10
  # --- Constants ---
11
  DEFAULT_API_URL = "https://agents-course-unit4-scoring.hf.space"
12
 
13
+
14
  # --- Basic Agent Definition ---
15
  # ----- THIS IS WERE YOU CAN BUILD WHAT YOU WANT ------
16
  class BasicAgent:
17
  def __init__(self):
18
  print("BasicAgent initialized.")
19
+ self.agent = buildAgent()
20
+
21
  def __call__(self, question: str) -> str:
22
  print(f"Agent received question (first 50 chars): {question[:50]}...")
23
+ messages = [HumanMessage(content=question)]
24
+ messages = self.agent.invoke({"messages": messages})
25
+ fixed_answer = messages["messages"][-1].content
26
  return fixed_answer
27
 
28
+
29
+ def run_and_submit_all(profile: gr.OAuthProfile | None):
30
  """
31
  Fetches all questions, runs the BasicAgent on them, submits all answers,
32
  and displays the results.
33
  """
34
  # --- Determine HF Space Runtime URL and Repo URL ---
35
+ space_id = os.getenv("SPACE_ID") # Get the SPACE_ID for sending link to the code
36
 
37
  if profile:
38
+ username = f"{profile.username}"
39
  print(f"User logged in: {username}")
40
  else:
41
  print("User not logged in.")
 
62
  response.raise_for_status()
63
  questions_data = response.json()
64
  if not questions_data:
65
+ print("Fetched questions list is empty.")
66
+ return "Fetched questions list is empty or invalid format.", None
67
  print(f"Fetched {len(questions_data)} questions.")
68
  except requests.exceptions.RequestException as e:
69
  print(f"Error fetching questions: {e}")
70
  return f"Error fetching questions: {e}", None
71
  except requests.exceptions.JSONDecodeError as e:
72
+ print(f"Error decoding JSON response from questions endpoint: {e}")
73
+ print(f"Response text: {response.text[:500]}")
74
+ return f"Error decoding server response for questions: {e}", None
75
  except Exception as e:
76
  print(f"An unexpected error occurred fetching questions: {e}")
77
  return f"An unexpected error occurred fetching questions: {e}", None
 
88
  continue
89
  try:
90
  submitted_answer = agent(question_text)
91
+ answers_payload.append(
92
+ {"task_id": task_id, "submitted_answer": submitted_answer}
93
+ )
94
+ results_log.append(
95
+ {
96
+ "Task ID": task_id,
97
+ "Question": question_text,
98
+ "Submitted Answer": submitted_answer,
99
+ }
100
+ )
101
  except Exception as e:
102
+ print(f"Error running agent on task {task_id}: {e}")
103
+ results_log.append(
104
+ {
105
+ "Task ID": task_id,
106
+ "Question": question_text,
107
+ "Submitted Answer": f"AGENT ERROR: {e}",
108
+ }
109
+ )
110
 
111
  if not answers_payload:
112
  print("Agent did not produce any answers to submit.")
113
  return "Agent did not produce any answers to submit.", pd.DataFrame(results_log)
114
 
115
+ # 4. Prepare Submission
116
+ submission_data = {
117
+ "username": username.strip(),
118
+ "agent_code": agent_code,
119
+ "answers": answers_payload,
120
+ }
121
  status_update = f"Agent finished. Submitting {len(answers_payload)} answers for user '{username}'..."
122
  print(status_update)
123
 
 
187
 
188
  run_button = gr.Button("Run Evaluation & Submit All Answers")
189
 
190
+ status_output = gr.Textbox(
191
+ label="Run Status / Submission Result", lines=5, interactive=False
192
+ )
193
  # Removed max_rows=10 from DataFrame constructor
194
  results_table = gr.DataFrame(label="Questions and Agent Answers", wrap=True)
195
 
196
+ run_button.click(fn=run_and_submit_all, outputs=[status_output, results_table])
 
 
 
197
 
198
  if __name__ == "__main__":
199
+ print("\n" + "-" * 30 + " App Starting " + "-" * 30)
200
  # Check for SPACE_HOST and SPACE_ID at startup for information
201
  space_host_startup = os.getenv("SPACE_HOST")
202
+ space_id_startup = os.getenv("SPACE_ID") # Get SPACE_ID at startup
203
 
204
  if space_host_startup:
205
  print(f"✅ SPACE_HOST found: {space_host_startup}")
 
207
  else:
208
  print("ℹ️ SPACE_HOST environment variable not found (running locally?).")
209
 
210
+ if space_id_startup: # Print repo URLs if SPACE_ID is found
211
  print(f"✅ SPACE_ID found: {space_id_startup}")
212
  print(f" Repo URL: https://huggingface.co/spaces/{space_id_startup}")
213
+ print(
214
+ f" Repo Tree URL: https://huggingface.co/spaces/{space_id_startup}/tree/main"
215
+ )
216
  else:
217
+ print(
218
+ "ℹ️ SPACE_ID environment variable not found (running locally?). Repo URL cannot be determined."
219
+ )
220
 
221
+ print("-" * (60 + len(" App Starting ")) + "\n")
222
 
223
  print("Launching Gradio Interface for Basic Agent Evaluation...")
224
+ demo.launch(debug=True, share=False)
requirements.txt CHANGED
@@ -1,2 +1,11 @@
1
  gradio
2
- requests
 
 
 
 
 
 
 
 
 
 
1
  gradio
2
+ requests
3
+ langchain
4
+ langgraph
5
+ dotenv
6
+ langchain_huggingface
7
+ langchain_community
8
+ langchain_google_genai
9
+ langchain_groq
10
+ langchain_openai
11
+ wikipedia