Merge branch 'main' of https://github.com/utin-francis-peter/DocsGPT into fix/issue#1023

Author: utin-francis-peter

application/api/user/routes.py

@@ -6,8 +6,9 @@
 import requests
 from pymongo import MongoClient
 from bson.objectid import ObjectId
+from bson.binary import Binary, UuidRepresentation
 from werkzeug.utils import secure_filename
-
+from bson.dbref import DBRef
 from application.api.user.tasks import ingest, ingest_remote
 
 from application.core.settings import settings
@@ -20,6 +21,8 @@
 prompts_collection = db["prompts"]
 feedback_collection = db["feedback"]
 api_key_collection = db["api_keys"]
+shared_conversations_collections = db["shared_conversations"]
+
 user = Blueprint("user", __name__)
 
 current_dir = os.path.dirname(
@@ -491,3 +494,73 @@ def delete_api_key():
         }
     )
     return {"status": "ok"}
+
+
+#route to share conversation
+##isPromptable should be passed through queries
+@user.route("/api/share",methods=["POST"])
+def share_conversation():
+    try:
+        data = request.get_json()
+        user = "local"
+        if(hasattr(data,"user")):
+            user = data["user"]
+        conversation_id = data["conversation_id"]
+        isPromptable = request.args.get("isPromptable").lower() == "true"
+        conversation = conversations_collection.find_one({"_id": ObjectId(conversation_id)})
+        current_n_queries = len(conversation["queries"])
+        pre_existing = shared_conversations_collections.find_one({
+            "conversation_id":DBRef("conversations",ObjectId(conversation_id)),
+            "isPromptable":isPromptable,
+            "first_n_queries":current_n_queries
+        })
+        print("pre_existing",pre_existing)
+        if(pre_existing is not None):
+            explicit_binary = pre_existing["uuid"]
+            return jsonify({"success":True, "identifier":str(explicit_binary.as_uuid())}),200
+        else:
+           explicit_binary = Binary.from_uuid(uuid.uuid4(), UuidRepresentation.STANDARD)       
+           shared_conversations_collections.insert_one({
+           "uuid":explicit_binary,
+           "conversation_id": {
+                  "$ref":"conversations",
+                  "$id":ObjectId(conversation_id)
+                  } ,
+                    "isPromptable":isPromptable,
+                    "first_n_queries":current_n_queries,
+                    "user":user
+           })
+            ## Identifier as route parameter in frontend
+           return jsonify({"success":True, "identifier":str(explicit_binary.as_uuid())}),201
+    except Exception as err:
+        return jsonify({"success":False,"error":str(err)}),400
+
+#route to get publicly shared conversations
+@user.route("/api/shared_conversation/<string:identifier>",methods=["GET"])
+def get_publicly_shared_conversations(identifier : str):
+    try:
+        query_uuid = Binary.from_uuid(uuid.UUID(identifier), UuidRepresentation.STANDARD)
+        shared = shared_conversations_collections.find_one({"uuid":query_uuid})
+        conversation_queries=[]
+        if shared and 'conversation_id' in shared and isinstance(shared['conversation_id'], DBRef):
+        # Resolve the DBRef
+            conversation_ref = shared['conversation_id']
+            conversation = db.dereference(conversation_ref)
+            if(conversation is None):
+                return jsonify({"sucess":False,"error":"might have broken url or the conversation does not exist"}),404
+            conversation_queries = conversation['queries'][:(shared["first_n_queries"])]
+            for query in conversation_queries:
+                query.pop("sources") ## avoid exposing sources
+        else:
+            return jsonify({"sucess":False,"error":"might have broken url or the conversation does not exist"}),404
+        date = conversation["_id"].generation_time.isoformat()
+        return jsonify({
+            "success":True,
+            "queries":conversation_queries,
+            "title":conversation["name"],
+            "timestamp":date
+            }), 200
+    except Exception as err:
+        print (err)
+        return jsonify({"success":False,"error":str(err)}),400
+    

application/vectorstore/base.py

@@ -14,7 +14,9 @@ class EmbeddingsSingleton:
     @staticmethod
     def get_instance(embeddings_name, *args, **kwargs):
         if embeddings_name not in EmbeddingsSingleton._instances:
-            EmbeddingsSingleton._instances[embeddings_name] = EmbeddingsSingleton._create_instance(embeddings_name, *args, **kwargs)
+            EmbeddingsSingleton._instances[embeddings_name] = EmbeddingsSingleton._create_instance(
+                embeddings_name, *args, **kwargs
+            )
         return EmbeddingsSingleton._instances[embeddings_name]
 
     @staticmethod

docs/package-lock.json

@@ -22,6 +22,8 @@
     "@reduxjs/toolkit": "^1.9.2",
     "@vercel/analytics": "^0.1.10",
     "i18next": "^23.11.5",
+    "i18next-browser-languagedetector": "^8.0.0",
+    "prop-types": "^15.8.1",
     "react": "^18.2.0",
     "react-copy-to-clipboard": "^5.1.0",
     "react-dom": "^18.2.0",

extensions/web-widget/package-lock.json

@@ -1,4 +1,5 @@
 import { Routes, Route } from 'react-router-dom';
+import { useEffect } from 'react';
 import Navigation from './Navigation';
 import Conversation from './conversation/Conversation';
 import About from './About';
@@ -8,29 +9,53 @@ import { useMediaQuery } from './hooks';
 import { useState } from 'react';
 import Setting from './settings';
 import './locale/i18n';
-
+import { Outlet } from 'react-router-dom';
+import SharedConversation from './conversation/SharedConversation';
+import { useDarkTheme } from './hooks';
 inject();
 
-export default function App() {
+function MainLayout() {
   const { isMobile } = useMediaQuery();
   const [navOpen, setNavOpen] = useState(!isMobile);
   return (
-    <div className="min-h-full min-w-full dark:bg-raisin-black">
+    <div className="dark:bg-raisin-black">
       <Navigation navOpen={navOpen} setNavOpen={setNavOpen} />
       <div
-        className={`transition-all duration-200 ${
+        className={`min-h-screen ${
           !isMobile
             ? `ml-0 ${!navOpen ? 'md:mx-auto lg:mx-auto' : 'md:ml-72'}`
             : 'ml-0 md:ml-16'
         }`}
       >
-        <Routes>
-          <Route path="/" element={<Conversation />} />
-          <Route path="/about" element={<About />} />
-          <Route path="*" element={<PageNotFound />} />
-          <Route path="/settings" element={<Setting />} />
-        </Routes>
+        <Outlet />
       </div>
     </div>
   );
 }
+
+export default function App() {
+  const [isDarkTheme] = useDarkTheme();
+  useEffect(() => {
+    localStorage.setItem('selectedTheme', isDarkTheme ? 'Dark' : 'Light');
+    if (isDarkTheme) {
+      document
+        .getElementById('root')
+        ?.classList.add('dark', 'dark:bg-raisin-black');
+    } else {
+      document.getElementById('root')?.classList.remove('dark');
+    }
+  }, [isDarkTheme]);
+  return (
+    <>
+      <Routes>
+        <Route element={<MainLayout />}>
+          <Route index element={<Conversation />} />
+          <Route path="/about" element={<About />} />
+          <Route path="/settings" element={<Setting />} />
+        </Route>
+        <Route path="/share/:identifier" element={<SharedConversation />} />
+        <Route path="/*" element={<PageNotFound />} />
+      </Routes>
+    </>
+  );
+}

frontend/package-lock.json

@@ -19,7 +19,7 @@ export default function Hero({
   }>;
   return (
     <div
-      className={`mt-14 mb-4 flex w-full flex-col justify-end text-black-1000 dark:text-bright-gray sm:w-full lg:mt-6`}
+      className={`mt-16 mb-4 flex w-full flex-col justify-end text-black-1000 dark:text-bright-gray sm:w-full lg:mt-6`}
     >
       <div className="flex h-full w-full flex-col items-center justify-center">
         <div className="flex items-center">

frontend/package.json

@@ -2,11 +2,11 @@ import { Link } from 'react-router-dom';
 
 export default function PageNotFound() {
   return (
-    <div className="mx-5 grid min-h-screen md:mx-36">
-      <p className="mx-auto my-auto mt-20 flex w-full max-w-6xl flex-col place-items-center gap-6 rounded-3xl bg-gray-100 p-6 text-jet lg:p-10 xl:p-16">
+    <div className="grid min-h-screen dark:bg-raisin-black">
+      <p className="mx-auto my-auto mt-20 flex w-full max-w-6xl flex-col place-items-center gap-6 rounded-3xl bg-gray-100 p-6 text-jet dark:bg-outer-space dark:text-gray-100 lg:p-10 xl:p-16">
         <h1>404</h1>
         <p>The page you are looking for does not exist.</p>
-        <button className="pointer-cursor mr-4 flex cursor-pointer items-center justify-center rounded-full bg-blue-1000 py-2 px-4 text-white hover:bg-blue-3000">
+        <button className="pointer-cursor mr-4 flex cursor-pointer items-center justify-center rounded-full bg-blue-1000 py-2 px-4 text-white transition-colors duration-100 hover:bg-blue-3000">
           <Link to="/">Go Back Home</Link>
         </button>
       </p>