Spaces:
Sleeping
Sleeping
Update app.py
Browse files
app.py
CHANGED
|
@@ -71,27 +71,27 @@ query_tool = FunctionTool.from_defaults(fn=query_generator)
|
|
| 71 |
llm = OpenAI(model="gpt-3.5-turbo", temperature=0)
|
| 72 |
agent = ReActAgent.from_tools([query_tool,rag_tool], llm=llm, verbose=True)
|
| 73 |
|
| 74 |
-
|
| 75 |
-
|
| 76 |
-
|
| 77 |
|
| 78 |
-
|
| 79 |
-
|
| 80 |
-
|
| 81 |
-
|
| 82 |
-
|
| 83 |
|
| 84 |
-
|
| 85 |
|
| 86 |
|
| 87 |
-
#
|
| 88 |
-
#
|
| 89 |
-
#
|
| 90 |
-
#
|
| 91 |
-
#
|
| 92 |
-
#
|
| 93 |
-
#
|
| 94 |
-
#
|
| 95 |
|
| 96 |
|
| 97 |
st.subheader('OpenSearch Assistant')
|
|
@@ -110,9 +110,9 @@ if st.button("Submit"):
|
|
| 110 |
st.write('Used Tool: ',source.tool_name)
|
| 111 |
if source.tool_name =='query_generator':
|
| 112 |
st.write(source.raw_output.content)
|
| 113 |
-
|
| 114 |
-
|
| 115 |
-
|
| 116 |
else:
|
| 117 |
st.write(source.raw_output[0][0][1])
|
| 118 |
except Exception as e:
|
|
|
|
| 71 |
llm = OpenAI(model="gpt-3.5-turbo", temperature=0)
|
| 72 |
agent = ReActAgent.from_tools([query_tool,rag_tool], llm=llm, verbose=True)
|
| 73 |
|
| 74 |
+
def implement_query(generated_query):
|
| 75 |
+
try:
|
| 76 |
+
st.write("Raw Query:", generated_query)
|
| 77 |
|
| 78 |
+
if isinstance(generated_query, str):
|
| 79 |
+
generated_query = generated_query.replace("'", '"')
|
| 80 |
+
query = json.loads(generated_query)
|
| 81 |
+
else:
|
| 82 |
+
query = generated_query
|
| 83 |
|
| 84 |
+
st.write("Validated Query:", query)
|
| 85 |
|
| 86 |
|
| 87 |
+
# response = os_client.search(body=query)
|
| 88 |
+
# return response
|
| 89 |
+
# except json.JSONDecodeError as e:
|
| 90 |
+
# st.error("Error: The generated query is not valid JSON.")
|
| 91 |
+
# st.write(f"JSONDecodeError Details: {e}")
|
| 92 |
+
# except Exception as e:
|
| 93 |
+
# st.error(f"Error executing OpenSearch query: {e}")
|
| 94 |
+
# st.write(f"Exception Details: {e}")
|
| 95 |
|
| 96 |
|
| 97 |
st.subheader('OpenSearch Assistant')
|
|
|
|
| 110 |
st.write('Used Tool: ',source.tool_name)
|
| 111 |
if source.tool_name =='query_generator':
|
| 112 |
st.write(source.raw_output.content)
|
| 113 |
+
os_response = implement_query(source.raw_output.content)
|
| 114 |
+
st.subheader('OS Response')
|
| 115 |
+
st.write(os_response)
|
| 116 |
else:
|
| 117 |
st.write(source.raw_output[0][0][1])
|
| 118 |
except Exception as e:
|