OpenAI API compatibility and Giskard upgrade

Update API Server to accept/response in OpenAI API like signature.
Giskard has been updated to the latest release too.

Author: corradodebari

app/requirements.txt

@@ -14,7 +14,7 @@
 bokeh==3.6.1
 evaluate==0.4.3
 faiss-cpu==1.9.0
-giskard==2.15.2
+giskard==2.15.5
 IPython==8.29.0
 langchain-cohere==0.3.1
 langchain-community==0.3.7

app/src/content/api_server.py

@@ -45,8 +45,11 @@ def display_logs():
                     st.chat_message("human").write(msg["message"])
                 else:
                     if state.rag_params["enable"]:
-                        st.chat_message("ai").write(msg["answer"])
-                        st_common.show_rag_refs(msg["context"])
+                        logger.info("msg[\"answer\"]")
+                        logger.info(msg)
+                        st.chat_message("ai").write(msg)
+                        if "context" in msg and msg["context"]:
+                            st_common.show_rag_refs(msg["context"])
                     else:
                         st.chat_message("ai").write(msg.content)
             except api_server.queue.Empty:

app/src/modules/api_server.py

@@ -103,9 +103,14 @@ def do_POST(self):  # pylint: disable=invalid-name
                 try:
                     # Parse the POST data as JSON
                     post_json = json.loads(post_data)
+                    messages = post_json.get("messages")
+                   
+                    # Extract the content of 'user'
+                    message = next(item['content'] for item in messages if item['role'] == 'user')
+
+                    logger.info(messages)
+                    logger.info(message)
 
-                    # Extract the 'message' field from the JSON
-                    message = post_json.get("message")
                     response = None
                     if message:
                         # Log the incoming message
@@ -123,6 +128,8 @@ def do_POST(self):  # pylint: disable=invalid-name
                             stream=False,
                         )
                         self.send_response(200)
+                        logger.info("RESPONSE:")
+                        logger.info(response)
                         # Process response to JSON
                     else:
                         json_response = {"error": "No 'message' field found in request."}
@@ -163,9 +170,9 @@ def do_POST(self):  # pylint: disable=invalid-name
                 for i in range(max_items):
                     chunk = full_context[i]
                     sources.add(os.path.basename(chunk.metadata["source"]))
-                json_response = {"answer": response["answer"], "sources": list(sources)}
+                json_response = {"choices": [{"text":response["answer"],"index":0}], "sources": list(sources)}
         else:
-            json_response = {"answer": response.content}
+            json_response = {"choices": [{"text":response["answer"],"index":0}]}
 
         self.wfile.write(json.dumps(json_response).encode("utf-8"))
 

widget/app.js

@@ -48,10 +48,17 @@ document.addEventListener('DOMContentLoaded', () => {
     async function getBotResponse(userMessage) {
         const apiUrl = chatBotUrl;
         const messagePayload = {
-            message: userMessage
+            model: "",
+            messages: [
+                {
+                    role: "user",
+                    content: userMessage
+                }
+            ]
         };
 
 
+
         try {
             const response = await fetch(apiUrl, {
                 method: 'POST',
@@ -63,8 +70,8 @@ document.addEventListener('DOMContentLoaded', () => {
             });
 
             const data = await response.json();
-            return data.answer;
-            //return data.choices[0].message.content;
+            //return data.answer;
+            return data.choices[0].text+"\n Source: "+data.sources[0];
         } catch (error) {
             console.error('Error fetching API:', error);
             return "Sorry, I couldn't connect to the server.";