MVPilgrim commited on
Commit
ad4287a
·
1 Parent(s): 17e8343
Files changed (1) hide show
  1. app.py +17 -8
app.py CHANGED
@@ -504,16 +504,18 @@ try:
504
  userPrompt = "<prompt>" \
505
  + "Answer the following question or carry out the following instruction and also supplement " \
506
  + "the LLM processing of the question or instruction using the retrieved information from the knowledge base. " \
507
- + "Question or Instruction: " + pprompt + "\n" \
 
508
  + "Retrieve the relevant information from the knowledge base: " \
509
  + "<knowledge_base>" \
510
- + ragPrompt \
511
  + "</knowledge_base>" \
512
- + "</prompt>"
513
 
514
  else:
515
  #userPrompt = st.session_state.sysTA + " " + pprompt
516
  userPrompt = pprompt
 
517
  fullPrompt = [
518
  {"role": "system", "content": st.session_state.sysTA},
519
  {
@@ -521,11 +523,19 @@ try:
521
  "content": userPrompt
522
  }
523
  ]
524
- fullPrompt = userPrompt
525
  logger.info(f"### userPrompt: {userPrompt}")
526
  logger.info("setPrompt exited.")
527
  return fullPrompt
528
 
 
 
 
 
 
 
 
 
529
 
530
  def on_runLLMButton_Clicked():
531
  logger = st.session_state.logger
@@ -535,12 +545,12 @@ try:
535
 
536
  #st.session_state.userpTAtext = st.session_state.userpTA
537
  wrkList = setPrompt(st.session_state.userpTA,st.selectRag)
538
- st.session_state.userpTA = str(wrkList)
539
  logger.info(f"userpTAtext: {st.session_state.userpTA}")
540
 
541
  #st.session_state.rspTAtext = runLLM(st.session_state.userpTAtext)
542
  rsp = runLLM(wrkList)
543
- st.session_state.rspTA = rsp
544
  logger.info(f"rspTAtext: {st.session_state.rspTA}")
545
 
546
  logger.info("### on_runLLMButton_Clicked exited.")
@@ -548,8 +558,7 @@ try:
548
  def on_getAllRagDataButton_Clicked():
549
  logger = st.session_state.logger
550
  logger.info("### on_getAllRagButton_Clicked entered.")
551
- st.session_state.ragpTA = getAllRagData()
552
-
553
  logger.info("### on_getAllRagButton_Clicked exited.")
554
 
555
  with st.sidebar:
 
504
  userPrompt = "<prompt>" \
505
  + "Answer the following question or carry out the following instruction and also supplement " \
506
  + "the LLM processing of the question or instruction using the retrieved information from the knowledge base. " \
507
+ + "Question or Instruction: " \
508
+ + pprompt + "\n" \
509
  + "Retrieve the relevant information from the knowledge base: " \
510
  + "<knowledge_base>" \
511
+ + ragPrompt \
512
  + "</knowledge_base>" \
513
+ + "</prompt>"
514
 
515
  else:
516
  #userPrompt = st.session_state.sysTA + " " + pprompt
517
  userPrompt = pprompt
518
+
519
  fullPrompt = [
520
  {"role": "system", "content": st.session_state.sysTA},
521
  {
 
523
  "content": userPrompt
524
  }
525
  ]
526
+ #fullPrompt = userPrompt
527
  logger.info(f"### userPrompt: {userPrompt}")
528
  logger.info("setPrompt exited.")
529
  return fullPrompt
530
 
531
+ def formatJson(jsonText):
532
+ try:
533
+ jsonData = json.loads(jsonText)
534
+ formattedJson = json.dumps(jsonData, indent=2)
535
+ return formattedJson
536
+ except json.JSONDecodeError as e:
537
+ logger.error(f"Invalid JSON text - {str(e)}")
538
+ return None
539
 
540
  def on_runLLMButton_Clicked():
541
  logger = st.session_state.logger
 
545
 
546
  #st.session_state.userpTAtext = st.session_state.userpTA
547
  wrkList = setPrompt(st.session_state.userpTA,st.selectRag)
548
+ st.session_state.userpTA = formatJson(wrkList)
549
  logger.info(f"userpTAtext: {st.session_state.userpTA}")
550
 
551
  #st.session_state.rspTAtext = runLLM(st.session_state.userpTAtext)
552
  rsp = runLLM(wrkList)
553
+ st.session_state.rspTA = formatJson(rsp)
554
  logger.info(f"rspTAtext: {st.session_state.rspTA}")
555
 
556
  logger.info("### on_runLLMButton_Clicked exited.")
 
558
  def on_getAllRagDataButton_Clicked():
559
  logger = st.session_state.logger
560
  logger.info("### on_getAllRagButton_Clicked entered.")
561
+ st.session_state.ragpTA = formatJson(getAllRagData())
 
562
  logger.info("### on_getAllRagButton_Clicked exited.")
563
 
564
  with st.sidebar: