Merge branch 'master' of github.com:khoj-ai/khoj into features/advanced-reasoning

src/interface/web/app/components/navMenu/navMenu.tsx

@@ -26,6 +26,17 @@ import { Moon, Sun, UserCircle, Question, GearFine, ArrowRight } from "@phosphor
 import { KhojAgentLogo, KhojAutomationLogo, KhojSearchLogo } from "../logo/khojLogo";
 import { useIsMobileWidth } from "@/app/common/utils";
 
+function SubscriptionBadge({ is_active }: { is_active: boolean }) {
+    return (
+        <div className="flex flex-row items-center">
+            <div
+                className={`w-3 h-3 rounded-full ${is_active ? "bg-yellow-500" : "bg-muted"} mr-1`}
+            ></div>
+            <p className="text-xs">{is_active ? "Futurist" : "Free"}</p>
+        </div>
+    );
+}
+
 export default function NavMenu() {
     const userData = useAuthenticatedData();
     const [darkMode, setDarkMode] = useState(false);
@@ -85,8 +96,9 @@ export default function NavMenu() {
                     </DropdownMenuTrigger>
                     <DropdownMenuContent className="gap-2">
                         <DropdownMenuItem className="w-full">
-                            <div className="flex flex-rows">
+                            <div className="flex flex-col">
                                 <p className="font-semibold">{userData?.email}</p>
+                                <SubscriptionBadge is_active={userData?.is_active ?? false} />
                             </div>
                         </DropdownMenuItem>
                         <DropdownMenuSeparator />
@@ -192,8 +204,9 @@ export default function NavMenu() {
                         </MenubarTrigger>
                         <MenubarContent align="end" className="rounded-xl gap-2">
                             <MenubarItem className="w-full">
-                                <div className="flex flex-rows">
+                                <div className="flex flex-col">
                                     <p className="font-semibold">{userData?.email}</p>
+                                    <SubscriptionBadge is_active={userData?.is_active ?? false} />
                                 </div>
                             </MenubarItem>
                             <MenubarSeparator className="dark:bg-white height-[2px] bg-black" />

src/khoj/processor/conversation/prompts.py

@@ -193,7 +193,6 @@ you need to convert the user's query to a description format that the novice art
 - ellipse
 - line
 - arrow
-- frame
 
 use these primitives to describe what sort of diagram the drawer should create. the artist must recreate the diagram every time, so include all relevant prior information in your description.
 
@@ -284,21 +283,6 @@ For text, you must use the `text` property to specify the text to be rendered. Y
     text: string,
 }}
 
-For frames, use the `children` property to specify the elements that are inside the frame by their ids.
-
-{{
-    type: "frame",
-    id: string,
-    x: number,
-    y: number,
-    width: number,
-    height: number,
-    name: string,
-    children: [
-        string
-    ]
-}}
-
 Here's an example of a valid diagram:
 
 Design Description: Create a diagram describing a circular development process with 3 stages: design, implementation and feedback. The design stage is connected to the implementation stage and the implementation stage is connected to the feedback stage and the feedback stage is connected to the design stage. Each stage should be labeled with the stage name.