utilities

Running

App Files Files Community

Reggie commited on Oct 17, 2023

Commit

da50bf2

•

1 Parent(s): fb448a7

TIL updates

Browse files

Files changed (2) hide show

app.py +20 -9
templates/index.html +26 -12

app.py CHANGED Viewed

@@ -26,6 +26,9 @@ wmodel = WhisperModel("guillaumekln/faster-whisper-small", device="cpu", compute
 qdrant_api_key = os.environ.get("qdrant_api_key")
 qdrant_url = os.environ.get("qdrant_url")
 client = QdrantClient(url=qdrant_url, port=443, api_key=qdrant_api_key, prefer_grpc=False)
 device = torch.device("cuda" if torch.cuda.is_available() else "cpu")
@@ -54,6 +57,7 @@ def index():
 @app.route("/search", methods=["POST"])
 def search():
     query = request.form["query"]
     topN = 200  # Define your topN value
@@ -77,18 +81,25 @@ def search():
     else: results = client.search(collection_name=collection_name, query_vector=(qvector, sq), with_payload=True, limit=100)
     print('SEARCH TIME: ', time.time() - timh)
-    # print(results[0].payload['text'].split('\n'))
-    try:
-        results = [{"text": x.payload['text'], "date": str(int(x.payload['date'])), "id": x.id} for x in results]  # Implement your Qdrant search here
-        return jsonify(results)
-    except:
-        return jsonify([])
 @app.route("/delete_joke", methods=["POST"])
 def delete_joke():
     joke_id = request.form["id"]
-    print('Deleting joke no', joke_id)
-    client.delete(collection_name="jks", points_selector=models.PointIdsList(points=[int(joke_id)],),)
     return jsonify({"deleted": True})
 @app.route("/whisper_transcribe", methods=["POST"])
@@ -96,7 +107,7 @@ def whisper_transcribe():
     if 'audio' not in request.files: return jsonify({'error': 'No file provided'}), 400
     audio_file = request.files['audio']
-    allowed_extensions = {'mp3', 'wav', 'ogg', 'm4v'}
     if not (audio_file and audio_file.filename.lower().split('.')[-1] in allowed_extensions): return jsonify({'error': 'Invalid file format'}), 400
     print('Transcribing audio')

 qdrant_api_key = os.environ.get("qdrant_api_key")
 qdrant_url = os.environ.get("qdrant_url")
+qdrant_api_key = "WaGH94-bo_CzlxTNHFjBAGPvWRhbsWEKUKbMz6YQtYt4oTD1ZXTvwg"
+qdrant_url = "https://c9bee7c7-2bf3-4e1b-8838-2f6f23372ab5.us-east-1-0.aws.cloud.qdrant.io"
 client = QdrantClient(url=qdrant_url, port=443, api_key=qdrant_api_key, prefer_grpc=False)
 device = torch.device("cuda" if torch.cuda.is_available() else "cpu")
 @app.route("/search", methods=["POST"])
 def search():
     query = request.form["query"]
+    collection_name = request.form["collection"]
     topN = 200  # Define your topN value
     else: results = client.search(collection_name=collection_name, query_vector=(qvector, sq), with_payload=True, limit=100)
     print('SEARCH TIME: ', time.time() - timh)
+    print(results[0])
+    # try:
+    if collection_name == 'jks': results = [{"text": x.payload['text'], "date": str(int(x.payload['date'])), "id": x.id} for x in results]  # Implement your Qdrant search here
+    else:
+        new_results = []
+        for r in results:
+            if 'context' in r.payload and r.payload['context'] != '': new_results.append({"text": r.payload['title'] + '\nContext: ' + r.payload['context'], "url": r.payload['url'], "date": r.payload['date'], "id": r.id})
+            else: new_results.append({"text": r.payload['title'], "url": r.payload['url'], "date": r.payload['date'], "id": r.id})
+        results = new_results
+    return jsonify(results)
+    # except:
+    #    return jsonify([])
 @app.route("/delete_joke", methods=["POST"])
 def delete_joke():
     joke_id = request.form["id"]
+    collection_name = request.form["collection"]
+    print('Deleting no.', joke_id, 'from collection', collection_name)
+    client.delete(collection_name=collection_name, points_selector=models.PointIdsList(points=[int(joke_id)],),)
     return jsonify({"deleted": True})
 @app.route("/whisper_transcribe", methods=["POST"])
     if 'audio' not in request.files: return jsonify({'error': 'No file provided'}), 400
     audio_file = request.files['audio']
+    allowed_extensions = {'mp3', 'wav', 'ogg', 'm4a'}
     if not (audio_file and audio_file.filename.lower().split('.')[-1] in allowed_extensions): return jsonify({'error': 'Invalid file format'}), 400
     print('Transcribing audio')

templates/index.html CHANGED Viewed

@@ -2,14 +2,14 @@
 <html lang="en">
 <head>
     <meta charset="UTF-8">
-    <title>Joke Search</title>
     <script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
     <style>
         body {
             font-family: Arial, sans-serif;
         }
-        h1 {
             text-align: center;
         }
@@ -65,7 +65,7 @@
     </style>
 </head>
 <body>
-    <h1>Joke Search</h1>
     <div id="search-container">
         <input type="text" id="query" placeholder="Search...">
         <button id="search">Search</button>
@@ -79,28 +79,42 @@
     <script>
         $(document).ready(function () {
             function performSearch() {
                 var query = $("#query").val();
-                $.post("/search", { query: query }, function (data) {
                     // Handle search results
                     var results = $("#results");
                     results.empty();
                     data.forEach(function (result) {
-                        var resultElement = $("<div class='result'>" +
-                            "<p>" + result.text + "</p>" +
-                            "<small>Date: " + result.date + "</small>" +
-                            "<button class='delete' data-id='" + result.id + "'>Delete</button>" +
-                            "</div>");
                         results.append(resultElement);
                         resultElement.find(".delete").on("click", function () {
                             var id = $(this).data("id");
                             var resultButton = $(this);
-                            $.post("/delete_joke", { id: id }, function (data) {
                                 // Handle the delete response if needed
                                 if (data.deleted) {
@@ -119,7 +133,7 @@
                 results.empty();
                 results.append("<div class='result'>" + "<p>" + transcription + "</p>" + "</div>");
                 // Hide the "Transcribing..." message
-                $("#drag-drop-container").text("Drag & Drop Audio File (mp3, wav, ogg, m4v) Here");
                 $("#drag-drop-container").css("border-color", "#4c72af");
             }

 <html lang="en">
 <head>
     <meta charset="UTF-8">
+    <title>Utilities</title>
     <script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
     <style>
         body {
             font-family: Arial, sans-serif;
         }
+        h2 {
             text-align: center;
         }
     </style>
 </head>
 <body>
+    <h2>Utilities</h2>
     <div id="search-container">
         <input type="text" id="query" placeholder="Search...">
         <button id="search">Search</button>
     <script>
         $(document).ready(function () {
+            var collection = "jks";
             function performSearch() {
                 var query = $("#query").val();
+                // if query starts with til: or tilc:, set collection to tils, else set to jks
+                if (query.startsWith("til:")) {
+                    collection = "tils";
+                    // query = query.substring(4);
+                } else if (query.startsWith("tilc:")) {
+                    collection = "tils";
+                    // query = query.substring(5);
+                } else {
+                    collection = "jks";
+                }
+                $.post("/search", { query: query, collection:collection }, function (data) {
                     // Handle search results
                     var results = $("#results");
                     results.empty();
                     data.forEach(function (result) {
+                        // if collection is tils, set resultElement to the result.text, hyperlinked by result.url after prepending with https://. The date should have an underscore after the first 8 characters
+                        // else, set resultElement to the result.text
+                        if (collection == "tils") {
+                            var resultElement = $("<div class='result'>" + "<p>" + "<a href='https://" + result.url + "' target='_blank'>" + result.text + "</a>" + "</p>" + "<small>" + result.date + "</small>" + "<button class='delete' data-id='" + result.id + "'>Delete</button>" + "</div>");
+                        } else {
+                            var resultElement = $("<div class='result'>" + "<p>" + result.text + "</p>" + "<small>Date: " + result.date + "</small>" + "<button class='delete' data-id='" + result.id + "'>Delete</button>" + "</div>");
+                        }
                         results.append(resultElement);
                         resultElement.find(".delete").on("click", function () {
                             var id = $(this).data("id");
                             var resultButton = $(this);
+                            $.post("/delete_joke", { id: id, collection:collection }, function (data) {
                                 // Handle the delete response if needed
                                 if (data.deleted) {
                 results.empty();
                 results.append("<div class='result'>" + "<p>" + transcription + "</p>" + "</div>");
                 // Hide the "Transcribing..." message
+                $("#drag-drop-container").text("Drag & Drop Audio File (mp3, wav, ogg, m4a) Here");
                 $("#drag-drop-container").css("border-color", "#4c72af");
             }