MVPilgrim commited on
Commit
9a28b96
·
1 Parent(s): 5f226ca
Files changed (1) hide show
  1. app.py +8 -7
app.py CHANGED
@@ -465,6 +465,7 @@ try:
465
  logger.info(f"\n### setPrompt() entered. ragFlag: {ragFlag}")
466
  if ragFlag:
467
  ragPrompt = getRagData(pprompt)
 
468
  userPrompt = pprompt + "\n" + ragPrompt
469
  prompt = userPrompt
470
  userPrompt = "Using this information: " + ragPrompt \
@@ -474,16 +475,16 @@ try:
474
  #userPrompt = st.session_state.sysTA + " " + pprompt
475
  userPrompt = pprompt
476
  #prompt = f""" <s> [INST] <<SYS>> {systemTextArea.value} </SYS>> Q: {userPrompt} A: [/INST]"""
477
- messages = [
478
  {"role": "system", "content": st.session_state.sysTA},
479
  {
480
  "role": "user",
481
  "content": userPrompt
482
  }
483
- ]
484
- logger.info("setPrompt exited.")
485
  logger.info(f"### userPrompt: {userPrompt}")
486
- return userPrompt
 
487
 
488
 
489
  def on_submitButton_clicked():
@@ -493,9 +494,9 @@ try:
493
  logger.info(f"sysTAtext: {st.session_state.sysTAtext}")
494
 
495
  #st.session_state.userpTAtext = st.session_state.userpTA
496
- st.session_state.userpTAtext = setPrompt(st.session_state.userpTA,st.selectRag)
497
- st.session_state.userpTA = st.session_state.userpTAtext
498
- logger.info(f"userpTAtext: {st.session_state.userpTAtext}")
499
 
500
  st.session_state.rspTAtext = runLLM(st.session_state.userpTAtext)
501
  st.session_state.rspTA = st.session_state.rspTAtext
 
465
  logger.info(f"\n### setPrompt() entered. ragFlag: {ragFlag}")
466
  if ragFlag:
467
  ragPrompt = getRagData(pprompt)
468
+ st.session_state.ragpTA = ragPrompt
469
  userPrompt = pprompt + "\n" + ragPrompt
470
  prompt = userPrompt
471
  userPrompt = "Using this information: " + ragPrompt \
 
475
  #userPrompt = st.session_state.sysTA + " " + pprompt
476
  userPrompt = pprompt
477
  #prompt = f""" <s> [INST] <<SYS>> {systemTextArea.value} </SYS>> Q: {userPrompt} A: [/INST]"""
478
+ fullPrompt = [
479
  {"role": "system", "content": st.session_state.sysTA},
480
  {
481
  "role": "user",
482
  "content": userPrompt
483
  }
484
+ ]
 
485
  logger.info(f"### userPrompt: {userPrompt}")
486
+ logger.info("setPrompt exited.")
487
+ return fullPrompt
488
 
489
 
490
  def on_submitButton_clicked():
 
494
  logger.info(f"sysTAtext: {st.session_state.sysTAtext}")
495
 
496
  #st.session_state.userpTAtext = st.session_state.userpTA
497
+ wrkList = setPrompt(st.session_state.userpTA,st.selectRag)
498
+ st.session_state.userpTA = ''.join(wrkList)
499
+ logger.info(f"userpTAtext: {st.session_state.userpTA}")
500
 
501
  st.session_state.rspTAtext = runLLM(st.session_state.userpTAtext)
502
  st.session_state.rspTA = st.session_state.rspTAtext