From 4a28c2c453f448295f087fc06276ff10c1f550fe Mon Sep 17 00:00:00 2001
From: Till Tomczak <till.tmk@gmail.com>
Date: Sun, 27 Apr 2025 07:49:40 +0200
Subject: [PATCH] Refactor chat_with_assistant function to support messages
 array input: Enhance the chatbot API by allowing an array of messages for
 context, extracting system messages, and updating the response format.
 Maintain backward compatibility with the previous prompt structure while
 improving error handling for empty inputs.

---
 website/__pycache__/app.cpython-311.pyc | Bin 53250 -> 54093 bytes
 website/app.py                          |  53 ++++++++++++++++++------
 2 files changed, 40 insertions(+), 13 deletions(-)

diff --git a/website/__pycache__/app.cpython-311.pyc b/website/__pycache__/app.cpython-311.pyc
index b13252694aec472c5266270b89a09d33ddc906c9..3d9c8e78918dc1d0fb3b3ca18d8e76463b899a9d 100644
GIT binary patch
delta 1857
zcma)6YfKbZ6uvXV&h8HTn0>%LKr*~4V1*(TL5(fS_J<@?3s{XJU3Ugp3k$h32-01b
zwzOHTQOY!dv}$N<03S&;oAj01YAZ>9XtHZIVY7*eP5Mfjrc0_x(?9LGyP#tGqqFCJ
z_uO;8IddNO?i(}A?ODb&XEbsM9&W+d8<@IkTKtImLH)j|fD0j!3Zf$jht(UWTx!#%
zys&Ijw1k^|L|SD0)GUS2B^b-LoNl@eDf*Q)LZW6I1*v8<3#LmC%_2KX!x~2R3DKf9
zNQ=5NbPp9`2*2~0P);yM)Vo$FNYru=O<9mppMT#`w`vQBxsMUS&FZiybh0+^GUVY_
z$2aim?o$PaO``FM5ZIvRUkRH3J3)~R(LomLAY?wset^!>qeg@tB_UdZnoKfuh|#O@
zy$-d$R;U!MK}NKR_RD#*IgmVz<>a+N?cq!l$Xd*Isk=AW+7BC+w^2y9s_c%S?#Zay
zP$^Q}D}02?5MCeBuX>9Xoyr>Z?6_M!J)2kT>ZX14J|wzB`eXXG<$0JIMkCBVG)z?%
zs0*{@>+lS?#4P}$g)NdlAPKErUoZCidKD=k92vm9-he0ts{Ip`N}acb>wx*kHh>mH
zp(zwZoz4&yq(t;sZ>U!@P5;;gcKVTh51OK&OD>UVLzOwH96Zn`rC9l>tVsPh4lY~q
zcECy+FT#{!`sE&(I1&Wh4AWowtvymWAdL*-ZKF^5dc8{5uwUuz^2)MbR=feFdTZZ+
z&)X+&s|I40ca=d%-Uu)M0>3d7E9wNfQhL4ZyZoE`W9<j-cn-uo2d3qj#xuu2c_bMk
z-T`k8%>gtI35Vb#f~3~ZoeSd^;W9v&tuSQ*&uC!q12v_87*J*}#SY?u{y_!j13RVl
z4FnWvL>VpIm9Yw<7k3K*Qf{G7lCU5{52{CVIj$v3+$?0gj#_#KmGyPi8`mpC>Th#e
z)il3Fufvi&I1rE}b=Q1Fp&65li+?20K_HjFD+JD|C+2s)#NnUFVg?{(%9g#WUy@~S
zkCZZa2mLDx8Sf&AwGn71u$M&6dIR#XgmDurWO9-PK~RksO2R%coF{eO3C$Wq4_IWd
zo!mOsoMw^EI?*1}x<HaP$5g{)!}QL1I&NE+u&s;el4eI5F?#!5n>)!nVy;bThAuQM
zA=+-fPv9PJOKWJmJ&kCi{Q-yEMcMX!=7c$3)R`#iOw+V6+_=Or?#=fRK*W?bppvR9
zftb@n#PLGJ0Abh*!H0eimBq-8q}e)AfAY0hQC-YTB*_;p@}+n9()qS4`Iq;@>2TdV
z7%OWBiSr!^z9YtW{0XrT7aX$YPdO)@(-kw@<Ce7vi)U?wO@ggrvSPY%=1|;PnXpzy
zwD-(;|3AC5LH+PTc^E>?FPg8885%*7c?I)q%uoZ8)-X;EGU2Qm{;tjS-j;-|YSC7E
z$5xxPmM8OylMZ*%S&-Hv`-UZ?v2*tcM09BrvbqzN;+f)vr7U52I$?P>!a{p^N79f#
z%|f}I9F&{Sg>v(`X{0t@94h*@qRHIcfNnN$o*HI>F7Z?`3uP41t2CaP=&g$*I_lS`
zC;B!+?N@Jo^1J3OXn#-i`lsiq;s`k!Fi`fwrnvs2U0$DWU?`yA<6!TLj(=WHY2E?#
zX!PqZWSTt)D(+Gnt_hk+P{*R3*UBmWG_k^oLYVx2;_m3=S3gty1hHlg_Pa#e7d?Lc
zIjWMJKKweN{Y@ZDfP|F!ASR!}#4~<VUAj@iML`8Y@|V#y-<-)UXr?GWjR-C=h^|Rc
P)oD6oYo(*{+qLvR3@hn?

delta 936
zcmY*XUr19?7(eIS-Mj1b&fVQPT&p>qgOn_65tv1pVGsQyG|&RWyw_Ax$GHnNHd}uX
zF-7V05M(4&)0T;GA*dw$gKtGH29AN{OZC`-dg!flvJriJ-*<lB@0{=Z-FrCiV%+sf
z&N?MY7C`OSg49lKKew(uf@#t+<R<;2Tgli1g~Ub+U7U(y2!N+FHZ6j}P**}`^6|3A
zs|szX9^?Sk9O1$Ui(yU`!{{EkkFH1nL^yJ-+KD;^QZeVbs^+K`x}Q6N)Vwfc>qVqW
zs&ytmW}*T#{tB4FrcN<isWw*@g3g>Q?ELfLtcvg<bCv}_mBV}oj6ph&#-`N+9|$=?
zMYaZ|09QnW|JqEdJ@iipgavYI%2%wkp;pucR7XS@5bFP~y|5SbaZR8XmKBiqQ+{_^
z2;!cuU<f;@WZK-?(;d?KLiiZfBXZosb&NyeeKIRu$+cLHZEo)KlA5@(B`xUvdPwUk
zLunK4xuoF)?ZF+au_0b<7FxRXUJaAG@$FC|i*X0}6hB&J#$VW}6I2YJWQx|!A?Ld^
zU2nOlrA4gi!Jcki!wu|A4NW?`BGUJ?<Ww`Q9&(iFq96)>3LsAz*&jWUlH{?*;l}ay
zNtBR$Ny!(jOIht>?ZfTk{gWjLt3PS=M~`mg${E1%w)K2xDo<H02#~pF+XT_W+cE-K
zpYdP#thnw}CzbLwrSgMPnX>ygT*cGftF{BwQ?8=vx>Z|%dWPqm){F=W-Kj!%CLcI<
ze+Qz&@`I%zG2;OCElIg}vN$Q1CgmMTdC!pWnMpdv+eq-)pl30^#&<XXmI9XAa&GBB
zNv)q-E`k&<`}x{(!!g?@!c}AR#UKX{5yz`<e3bs}aYKCl5W*W|X5P);q{M0C?fhQI
z4^r4{nBV9~I7=ZuN1_W}ew0GZc)Z|;wqeH7I|G=#QQTsr7r#Q=EykW<#K<3HB$f|C
z*i7UVrGUv{CV|;-%x2*MQngZInWd0A&|ezb%0zBq8MI{pP2V|yb|vA?3}Q?pG`1!x
F(Qjv4`PTpd

diff --git a/website/app.py b/website/app.py
index 1e657f2..6ce0bd3 100755
--- a/website/app.py
+++ b/website/app.py
@@ -932,15 +932,38 @@ def too_many_requests(e):
 def chat_with_assistant():
     """Chatbot-API mit OpenAI Integration."""
     data = request.json
-    prompt = data.get('prompt', '')
-    context = data.get('context', '')
     
-    if not prompt:
-        return jsonify({
-            'error': 'Prompt darf nicht leer sein.'
-        }), 400
-    
-    try:
+    # Prüfen, ob wir ein einzelnes Prompt oder ein messages-Array haben
+    if 'messages' in data:
+        messages = data.get('messages', [])
+        if not messages:
+            return jsonify({
+                'error': 'Keine Nachrichten vorhanden.'
+            }), 400
+            
+        # Extrahiere Systemnachricht falls vorhanden, sonst Standard-Systemnachricht
+        system_message = next((msg['content'] for msg in messages if msg['role'] == 'system'), 
+            "Du bist ein hilfreicher Assistent, der Menschen dabei hilft, "
+            "Wissen zu organisieren und zu verknüpfen. Liefere informative, "
+            "sachliche und gut strukturierte Antworten.")
+        
+        # Formatiere Nachrichten für OpenAI API
+        api_messages = [{"role": "system", "content": system_message}]
+        
+        # Füge Benutzer- und Assistenten-Nachrichten hinzu
+        for msg in messages:
+            if msg['role'] in ['user', 'assistant']:
+                api_messages.append({"role": msg['role'], "content": msg['content']})
+    else:
+        # Alte Implementierung für direktes Prompt
+        prompt = data.get('prompt', '')
+        context = data.get('context', '')
+        
+        if not prompt:
+            return jsonify({
+                'error': 'Prompt darf nicht leer sein.'
+            }), 400
+        
         # Zusammenfassen mehrerer Gedanken oder Analyse anfordern
         system_message = (
             "Du bist ein hilfreicher Assistent, der Menschen dabei hilft, "
@@ -951,20 +974,24 @@ def chat_with_assistant():
         if context:
             system_message += f"\n\nKontext: {context}"
         
+        api_messages = [
+            {"role": "system", "content": system_message},
+            {"role": "user", "content": prompt}
+        ]
+    
+    try:
         response = client.chat.completions.create(
             model="gpt-3.5-turbo-16k",
-            messages=[
-                {"role": "system", "content": system_message},
-                {"role": "user", "content": prompt}
-            ],
+            messages=api_messages,
             max_tokens=300,
             temperature=0.7
         )
         
         answer = response.choices[0].message.content
         
+        # Für das neue Format erwarten wir response statt answer
         return jsonify({
-            'answer': answer
+            'response': answer
         })
         
     except Exception as e: