remove some testing loggers

tigergraph · Jul 17, 2024 · cc0a9ba · cc0a9ba
1 parent a636417
commit cc0a9ba
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 14 deletions.
diff --git a/copilot/app/agent/agent.py b/copilot/app/agent/agent.py
@@ -52,7 +52,7 @@ def __init__(
         db_connection: TigerGraphConnectionProxy,
         embedding_model: EmbeddingModel,
         embedding_store: EmbeddingStore,
-        # use_cypher: bool = False,
+        use_cypher: bool = False,
         ws=None,
         supportai_retriever="hnsw_overlap"
     ):
@@ -74,9 +74,9 @@ def __init__(
             embedding_store,
         )
 
-        # self.cypher_tool = None
-        # if use_cypher:
-        #     self.cypher_tool = GenerateCypher(self.conn, self.llm)
+        self.cypher_tool = None
+        if use_cypher:
+            self.cypher_tool = GenerateCypher(self.conn, self.llm)
 
         self.q = None
         if ws is not None:
@@ -91,7 +91,7 @@ def __init__(
             self.embedding_store,
             self.mq2s,
             self.gen_func,
-            # cypher_gen_tool=self.cypher_tool,
+            cypher_gen_tool=self.cypher_tool,
             q=self.q,
             supportai_retriever=supportai_retriever
         ).create_graph()
@@ -120,7 +120,6 @@ def question_for_agent(
 
             input_data = {}
             input_data["input"] = question
-            # logger.info(f"conversation: {conversation}")
 
             if conversation is not None:
                 input_data["conversation"] = [
@@ -131,7 +130,6 @@ def question_for_agent(
             else:
                 # Handle the case where conversation is None or empty
                 input_data["conversation"] = []
-            # logger.info(f"input_data: {input_data}")
 
             # Validate and convert input_data to JSON string
             try:
@@ -140,7 +138,6 @@ def question_for_agent(
                 logger.error(f"Failed to serialize input_data to JSON: {e}")
                 raise ValueError("Invalid input data format. Unable to convert to JSON.")
 
-            # for output in self.agent.stream({"question": input_data_str}):
             for output in self.agent.stream({"question": input_data["input"], "conversation": input_data["conversation"]}):
 
                 for key, value in output.items():
@@ -205,7 +202,7 @@ def make_agent(graphname, conn, use_cypher, ws: WebSocket = None, supportai_retr
         conn,
         embedding_service,
         embedding_store,
-        # use_cypher=use_cypher,
+        use_cypher=use_cypher,
         ws=ws,
         supportai_retriever=supportai_retriever
     )

diff --git a/copilot/app/agent/agent_graph.py b/copilot/app/agent/agent_graph.py
@@ -308,9 +308,7 @@ def generate_answer(self, state):
                 logger.error(f"Failed to serialize context to JSON: {e}")
                 raise ValueError("Invalid context data format. Unable to convert to JSON.")
 
-            # answer = step.generate_answer(state["question"], state["context"]["result"])
             answer = step.generate_answer(state["question"], context_data_str)
-            # answer = step.generate_answer(question, context_data_str)
 
         elif state["lookup_source"] == "cypher":
             answer = step.generate_answer(state["question"], state["context"]["answer"])
@@ -348,11 +346,11 @@ def rewrite_question(self, state):
         """
         self.emit_progress("Rephrasing the question")
         step = TigerGraphAgentRewriter(self.llm_provider)
-        # logger.info(f"question for rewrite: {state['question']}")
         question_str = state["question"]
         state["question"] = step.rewrite_question(question_str)
         return state
 
+    # remove halucinaton check, always return grounded
     def check_answer_for_hallucinations(self, state):
         """
         Run the agent hallucination check.
@@ -380,6 +378,7 @@ def check_answer_for_hallucinations(self, state):
         #     return "hallucination"
         return "grounded"
 
+    # remove usefulness check, always return useful
     def check_answer_for_usefulness(self, state):
         """
         Run the agent usefulness check.
@@ -404,12 +403,10 @@ def check_answer_for_usefulness_and_hallucinations(self, state):
         Run the agent usefulness and hallucination check.
         """
         hallucinated = self.check_answer_for_hallucinations(state)
-        logger.info(f"hallucinated: {hallucinated}")
         if hallucinated == "hallucination":
             return "hallucination"
         else:
             useful = self.check_answer_for_usefulness(state)
-            logger.info(f"useful: {useful}")
             if useful == "useful":
                 self.emit_progress(DONE)
                 return "grounded"
@@ -462,6 +459,7 @@ def create_graph(self):
                 self.check_state_for_generation_error,
                 {"error": "apologize", "success": "generate_answer"},
             )
+            # remove hallucination and usefulness check
             # if self.supportai_enabled:
             #     self.workflow.add_conditional_edges(
             #         "generate_answer",
@@ -495,6 +493,7 @@ def create_graph(self):
         if self.supportai_enabled:
             self.workflow.add_conditional_edges(
                 "generate_answer", 
+                # alwasy return grounded
                 self.check_answer_for_usefulness_and_hallucinations,
                 {
                     "hallucination": "rewrite_question",
@@ -507,6 +506,7 @@ def create_graph(self):
         else:
             self.workflow.add_conditional_edges(
                 "generate_answer", 
+                # always return grounded
                 self.check_answer_for_usefulness_and_hallucinations,
                 {
                     "hallucination": "rewrite_question",