Adding a third agent 'ccr', improving reliability of solution, added a web app component for streaming answers

Author: samelhousseini

.deployment

@@ -0,0 +1,3 @@
+[config]
+SCM_DO_BUILD_DURING_DEPLOYMENT=true
+WEBSITE_WEBDEPLOY_USE_SCM=true

.gitignore

@@ -178,3 +178,5 @@ hukoomi_new/
 qna.ipynb
 notebooks/
 demo copy.ipynb
+bing.ipynb
+app/

.vscode/settings.json

@@ -1,6 +1,6 @@
 {
     "azureFunctions.deploySubpath": ".",
-    "azureFunctions.scmDoBuildDuringDeployment": true,
+    "azureFunctions.scmDoBuildDuringDeployment": true, 
     "azureFunctions.pythonVenv": ".venv",
     "azureFunctions.projectLanguage": "Python",
     "azureFunctions.projectRuntime": "~4",
@@ -13,7 +13,17 @@
         "build{,/**}",
         "develop-eggs{,/**}",
         "dist{,/**}",
+        "backup{,/**}",
+        "AzCogSearchDocCrackingFunc{,/**}",
+        "BotQnAHTTPFunc{,/**}",
+        "ServiceBusQueueNewDocument{,/**}",
+        "kb_docs_samples{,/**}",
+        "notebooks{,/**}",
+        "dump{,/**}",
+        ".env copy{,/**}",
+        ".env copy 2{,/**}",
         "downloads{,/**}",
+        ".git{,/**}",
         "eggs{,/**}",
         ".eggs{,/**}",
         "lib{,/**}",
@@ -37,5 +47,5 @@
         ".vscode{,/**}"
     ],
     "appService.defaultWebAppToDeploy": "/subscriptions/2a7eed04-714e-4ba9-96ba-47355c32a8d6/resourceGroups/km-demo/providers/Microsoft.Web/sites/kmaoiwebappdemo0001",
-    "appService.deploySubpath": "app"
+    "appService.deploySubpath": "."
 }

BotQnAHTTPFunc/__init__.py

@@ -29,10 +29,10 @@ def get_param(req, param_name):
 
 
 def check_param(param):
-    if param == 'false':
-        param = False
-    else:
+    if param == 'true':
         param = True
+    else:
+        param = False
 
     return param
 
@@ -52,14 +52,19 @@ def main(req: func.HttpRequest) -> func.HttpResponse:
     evaluate_step = get_param(req, 'evaluate_step')
     check_adequacy = get_param(req, 'check_adequacy')
     check_intent = get_param(req, 'check_intent') 
+    use_calendar = get_param(req, 'use_calendar')
+    use_bing = get_param(req, 'use_bing')
+    
 
     params_dict = {
         'enable_unified_search': check_param(enable_unified_search),
         'enable_redis_search': check_param(enable_redis_search),
         'enable_cognitive_search': check_param(enable_cognitive_search),
         'evaluate_step': check_param(evaluate_step),
         'check_adequacy': check_param(check_adequacy),
-        'check_intent': check_param(check_intent)
+        'check_intent': check_param(check_intent),
+        'use_calendar': check_param(use_calendar),
+        'use_bing': check_param(use_bing)
     }
 
 

WISHLIST.md

@@ -16,8 +16,15 @@ The following features are added to the wishlist to be implemented:
 ### TBD
 1. ARM: Adding Application Insights to the ARM template
 1. Code: Adding a custom skill that processes csv files
-1. GUI for triggering Cognitive Search and Form Recognizer document ingestion - streamlit
 
+1. GUI for triggering Cognitive Search and Form Recognizer document ingestion - 
+    1. Backend: Python control part in Flask - Samer 
+    1. Frontend: React control part for the UI (generate with GPT4) - Yacine
+1. Chat client UI - demo - Yacine (1st Priority)
+1. Streaming capability with Flash SocketIO - Andrey (1st priority)
+1. (maximizing Cosmos use) - Translation Problem (checksum checking in Cosmos) - re-generate translations for all the chunks (cost) - get from Cosmos - Andrey (2nd priority)
+1. Streamlit vs Flask - Andrey (3rd priority)
+1. GPT4 Agent -- Samer 
 
 ### Future
 1. Code: Adding support for fine-tuned models.

app/app.py app.pyapp/app.py renamed to app.py

@@ -3,11 +3,25 @@
 from flask import Flask, redirect, url_for, request, jsonify
 from flask_socketio import SocketIO
 from flask_socketio import send, emit
-
-import sys
-sys.path.insert(0, '../')
+import urllib
 
 from utils import bot_helpers
+from utils import langchain_helpers
+from utils import langchain_agent
+from utils import redis_helpers
+
+
+ 
+global_params_dict = {
+    'enable_unified_search': True,
+    'enable_redis_search': False,
+    'enable_cognitive_search': False,
+    'evaluate_step': False,
+    'check_adequacy': False,
+    'check_intent': False
+}
+
+redis_conn = redis_helpers.get_new_conn()
 
 
 CHOSEN_EMB_MODEL   = os.environ['CHOSEN_EMB_MODEL']
@@ -18,20 +32,57 @@
 NUM_TOP_MATCHES = int(os.environ['NUM_TOP_MATCHES'])
 
 app = Flask(__name__)
-app.config['SECRET_KEY'] = 'secret!'
 socketio = SocketIO(app)
+app.config['SECRET_KEY'] = 'secret!'
+
 
 # source venv/bin/activate
 # flask --app app.py --debug run
 
+agents_sid = {}
+
+
+@app.route("/", defaults={"path": "index.html"})
+@app.route("/<path:path>")
+def static_file(path):
+    print("path", path)
+    return app.send_static_file(path)
+
+
+@socketio.on('connect')
+def on_connect():
+    print(f"connected {request.sid}")
+    connection = {'socketio': socketio, 'connection_id':request.sid}
+    ccr_agent = langchain_agent.KMOAI_Agent(agent_name = 'os', params_dict=global_params_dict, stream = True, connection=connection)
+    agents_sid[request.sid] = ccr_agent
+
 
-@app.route("/")
-def hello():
-    print("hello there 3")
-    return "<html><body><h1>Hello Enterprise Search with OpenAI Solution!</h1></body></html>\n"
+@socketio.on('disconnect')
+def on_disconnect():
+    del agents_sid[request.sid]
 
 
 
+@socketio.on('message')
+def handle_message(q):
+    print(f'received message: {q} from {request.sid}')
+    emit('new_message', "Query: " + q + '\n') 
+    answer, sources, likely_sources, s_id = agents_sid[request.sid].run(q, redis_conn, request.sid)
+    sources_str = ''
+    if len(sources) > 0:
+        for s in sources: 
+            try:
+                linkname = urllib.parse.unquote(os.path.basename(s.split('?')[0]))
+            except:
+                linkname = 'Link'
+            sources_str +=  '[<a href="' + s + f'" target="_blank">{linkname}</a>]' 
+        send('Links:'+ sources_str)
+
+
+
+##### IMPORTANT
+##### INCLUDE IN THE POST HEADER --> Content-Type: application/json
+##### IMPORTANT
 @app.route('/kmoai_request', methods=['POST'])
 def kmoai_request():
     data = request.get_json()
@@ -40,10 +91,10 @@ def kmoai_request():
 
 
 def check_param(param):
-    if param == 'false':
-        param = False
-    else:
+    if param == 'true':
         param = True
+    else:
+        param = False
 
     return param
 
@@ -53,6 +104,10 @@ def get_param(req, param_name):
     return param
 
 
+
+##### IMPORTANT
+##### INCLUDE IN THE POST HEADER --> Content-Type: application/json
+##### IMPORTANT
 def process_kmoai_request(req):
     logging.info('Python HTTP trigger function processed a request.')
 
@@ -67,14 +122,18 @@ def process_kmoai_request(req):
     evaluate_step = get_param(req, 'evaluate_step')
     check_adequacy = get_param(req, 'check_adequacy')
     check_intent = get_param(req, 'check_intent') 
+    use_calendar = get_param(req, 'use_calendar')
+    use_bing = get_param(req, 'use_bing')
 
     params_dict = {
         'enable_unified_search': check_param(enable_unified_search),
         'enable_redis_search': check_param(enable_redis_search),
         'enable_cognitive_search': check_param(enable_cognitive_search),
         'evaluate_step': check_param(evaluate_step),
         'check_adequacy': check_param(check_adequacy),
-        'check_intent': check_param(check_intent)
+        'check_intent': check_param(check_intent),
+        'use_calendar': check_param(use_calendar),
+        'use_bing': check_param(use_bing)
     }
 
     if filter_param is None:
@@ -83,3 +142,9 @@ def process_kmoai_request(req):
         os.environ['redis_filter_param'] = filter_param
 
     return bot_helpers.openai_interrogate_text(query, session_id=session_id, filter_param=filter_param, agent_name=search_method, params_dict=params_dict)
+
+
+
+if __name__ == '__main__':
+    app.run()
+    socketio.run(app, allow_unsafe_werkzeug=True)   

app/.deployment

@@ -24,4 +24,4 @@ lxml
 azure-ai-textanalytics
 langchain
 flask
-flask-socketio
+flask-socketio

requirements.txt

@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>AI Chat App</title>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/4.0.1/socket.io.js" integrity="sha512-q/dWJ3kcmjBLU4Qc47E4A9kTB4m3wuTY7vkFJDTZKjTs8jhyGQnaUrxa0Ytd0ssMZhbNua9hE+E7Qv1j+DyZwA==" crossorigin="anonymous"></script>
+    <link rel="stylesheet" href="styles.css">
+    <script type="text/javascript" src="script.js" defer></script>
+</head>
+<body>
+
+    <div id="mySidebar" class="sidebar">
+        <a href="javascript:void(0)" class="closebtn" onclick="closeNav()">&times;</a>
+        <h3>Search Methods</h3>
+        <ul>
+            <li>
+                <input type="radio" name="search-method" id="method-1" value="method-1">
+                <label for="method-1">Method 1</label>
+            </li>
+            <li>
+                <input type="radio" name="search-method" id="method-2" value="method-2">
+                <label for="method-2">Method 2</label>
+            </li>
+            <li>
+                <input type="radio" name="search-method" id="method-3" value="method-3">
+                <label for="method-3">Method 3</label>
+            </li>
+        </ul>
+      </div>
+      
+      <div id="main">
+        <button class="openbtn" onclick="openNav()">&#9776; Options</button>
+      </div>
+
+    <div id="chat-container">
+        <!-- Chat messages will be appended here -->
+    </div>
+
+    <div id="input-container">
+        <input type="text" id="input-message" placeholder="Type your message...">
+        <button id="send-button">Send</button>
+    </div>
+  
+</body>
+</html>

static/index.html

@@ -0,0 +1,50 @@
+<html>
+    <body>
+        <h1>Chat App</h1>
+        <form id="message-form">
+          <input type="text" id="message-input" placeholder="Type your message">
+          <button type="submit">Send</button>
+        </form>
+        <div id="messages"></div>
+    </body>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/4.0.1/socket.io.js" integrity="sha512-q/dWJ3kcmjBLU4Qc47E4A9kTB4m3wuTY7vkFJDTZKjTs8jhyGQnaUrxa0Ytd0ssMZhbNua9hE+E7Qv1j+DyZwA==" crossorigin="anonymous"></script>
+<script type="text/javascript" charset="utf-8">
+    var socket = io();
+    const messages = document.querySelector('#messages');
+    const messageForm = document.querySelector('#message-form');
+    const messageInput = document.querySelector('#message-input');
+    var latest_div = document.getElementById("messages").lastChild;
+    
+    console.log("starting")
+
+    messageForm.addEventListener('submit', (event) => {
+        event.preventDefault();
+        const message = messageInput.value;
+        socket.emit('message', message);
+        messageInput.value = '';
+    });
+
+    socket.on('message', (message) => {
+        // const messageElement = document.createElement('div');
+        console.log(message)
+        console.log(document.getElementById("messages").lastChild.innerHTML )
+        document.getElementById("messages").lastChild.innerHTML   = document.getElementById("messages").lastChild.innerHTML  + '<br/>' + message + '<br/><br/>';
+        // messages.appendChild(messageElement);
+    });
+
+    socket.on('new_message', (message) => {
+        const messageElement = document.createElement('div');
+        messageElement.textContent  = message 
+        messageElement.innerHTML = messageElement.innerHTML + '<br/>';
+        messages.appendChild(messageElement);
+    });
+
+    socket.on('token', (message) => {
+        document.getElementById("messages").lastChild.textContent  = document.getElementById("messages").lastChild.textContent + message;
+    });
+
+    socket.on('connect', function() {
+        socket.emit('connect_message', {data: 'Im connected!'});
+    });
+</script>
+</html>