Update app.py
Browse files
app.py
CHANGED
|
@@ -467,6 +467,8 @@ def generate_bild(prompt, chatbot, temperature=0.5, max_new_tokens=4048,top_p=0
|
|
| 467 |
##################################################
|
| 468 |
#zu einem Bild und Text-Prompt eine Analyse generieren
|
| 469 |
def generate_text_zu_bild(file, prompt):
|
|
|
|
|
|
|
| 470 |
headers, payload = process_image(file, prompt)
|
| 471 |
response = requests.post("https://api.openai.com/v1/chat/completions", headers=headers, json=payload)
|
| 472 |
#als json ausgeben
|
|
@@ -510,7 +512,10 @@ def generate_text (prompt, chatbot, history, rag_option, model_option, openai_ap
|
|
| 510 |
print("OpenAI Anfrage.......................")
|
| 511 |
llm = ChatOpenAI(model_name = MODEL_NAME, openai_api_key = openai_api_key, temperature=temperature)#, top_p = top_p)
|
| 512 |
#Prompt an history anhängen und einen Text daraus machen
|
| 513 |
-
|
|
|
|
|
|
|
|
|
|
| 514 |
else:
|
| 515 |
#oder an Hugging Face --------------------------
|
| 516 |
print("HF Anfrage.......................")
|
|
|
|
| 467 |
##################################################
|
| 468 |
#zu einem Bild und Text-Prompt eine Analyse generieren
|
| 469 |
def generate_text_zu_bild(file, prompt):
|
| 470 |
+
global splittet
|
| 471 |
+
#hier noch die Abfrage rein, ob RAG an ist -
|
| 472 |
headers, payload = process_image(file, prompt)
|
| 473 |
response = requests.post("https://api.openai.com/v1/chat/completions", headers=headers, json=payload)
|
| 474 |
#als json ausgeben
|
|
|
|
| 512 |
print("OpenAI Anfrage.......................")
|
| 513 |
llm = ChatOpenAI(model_name = MODEL_NAME, openai_api_key = openai_api_key, temperature=temperature)#, top_p = top_p)
|
| 514 |
#Prompt an history anhängen und einen Text daraus machen
|
| 515 |
+
if (rag_option == "An"):
|
| 516 |
+
history_text_und_prompt = generate_prompt_with_history(prompt, history)
|
| 517 |
+
else:
|
| 518 |
+
history_text_und_prompt = generate_prompt_with_history_openai(prompt, history)
|
| 519 |
else:
|
| 520 |
#oder an Hugging Face --------------------------
|
| 521 |
print("HF Anfrage.......................")
|