Merge pull request #2968 from bluewave-labs/develop-saas

Merge develop-saas into master-saas

Author: HarshP4585

Clients/nginx.conf

@@ -17,7 +17,7 @@ server {
 
     # Proxy API requests to backend
     location /api {
-        proxy_pass http://localhost:3000;  # no trailing slash - keeps /api prefix
+        proxy_pass http://localhost:3000; # no trailing slash - keeps /api prefix
         proxy_http_version 1.1;
         proxy_set_header Host $host;
         proxy_set_header X-Real-IP $remote_addr;

Clients/src/infrastructure/api/deepEvalDatasetsService.ts

@@ -59,11 +59,34 @@ export function isMultiTurnConversation(record: DatasetPromptRecord): record is
 }
 
 class DeepEvalDatasetsService {
-  async uploadDataset(file: File, datasetType: DatasetType = "chatbot", turnType: TurnType = "single-turn"): Promise<UploadDatasetResponse> {
+  async uploadDataset(file: File, datasetType: DatasetType = "chatbot", turnType: TurnType = "single-turn", orgId?: string): Promise<UploadDatasetResponse> {
+    // org_id is required by the backend - fetch current org if not provided
+    let finalOrgId = orgId;
+    if (!finalOrgId) {
+      // Dynamically import to avoid circular dependency
+      const { deepEvalOrgsService } = await import("./deepEvalOrgsService");
+      const { org } = await deepEvalOrgsService.getCurrentOrg();
+      if (org) {
+        finalOrgId = org.id;
+      } else {
+        // Try to get first org
+        const { orgs } = await deepEvalOrgsService.getAllOrgs();
+        if (orgs && orgs.length > 0) {
+          finalOrgId = orgs[0].id;
+          await deepEvalOrgsService.setCurrentOrg(finalOrgId);
+        }
+      }
+    }
+    
+    if (!finalOrgId) {
+      throw new Error("No organization available. Please create an organization first.");
+    }
+    
     const form = new FormData();
     form.append("dataset", file);
     form.append("dataset_type", datasetType);
     form.append("turn_type", turnType);
+    form.append("org_id", finalOrgId);
     const res = await CustomAxios.post("/deepeval/datasets/upload", form, {
       headers: { "Content-Type": "multipart/form-data" },
     });

Clients/src/infrastructure/api/deepEvalScorersService.ts

@@ -4,7 +4,7 @@ export type ScorerType = "llm" | "builtin" | "custom";
 
 export interface DeepEvalScorer {
   id: string;
-  projectId?: string | null;
+  orgId?: string | null;
   name: string;
   description?: string | null;
   type: ScorerType;
@@ -24,13 +24,35 @@ export interface ListScorersResponse {
 }
 
 class DeepEvalScorersService {
-  async list(params?: { project_id?: string }): Promise<ListScorersResponse> {
+  async list(params?: { org_id?: string }): Promise<ListScorersResponse> {
     const res = await CustomAxios.get("/deepeval/scorers", { params });
     return res.data as ListScorersResponse;
   }
 
   async create(payload: Partial<DeepEvalScorer> & { name: string; metricKey: string }): Promise<DeepEvalScorer> {
-    const res = await CustomAxios.post("/deepeval/scorers", payload);
+    // org_id is required by the backend - fetch current org if not provided
+    let finalOrgId = payload.orgId;
+    if (!finalOrgId) {
+      // Dynamically import to avoid circular dependency
+      const { deepEvalOrgsService } = await import("./deepEvalOrgsService");
+      const { org } = await deepEvalOrgsService.getCurrentOrg();
+      if (org) {
+        finalOrgId = org.id;
+      } else {
+        // Try to get first org
+        const { orgs } = await deepEvalOrgsService.getAllOrgs();
+        if (orgs && orgs.length > 0) {
+          finalOrgId = orgs[0].id;
+          await deepEvalOrgsService.setCurrentOrg(finalOrgId);
+        }
+      }
+    }
+    
+    if (!finalOrgId) {
+      throw new Error("No organization available. Please create an organization first.");
+    }
+    
+    const res = await CustomAxios.post("/deepeval/scorers", { ...payload, orgId: finalOrgId });
     return res.data as DeepEvalScorer;
   }
 

Clients/src/presentation/components/ContextSidebar/index.tsx

@@ -34,8 +34,17 @@ const ContextSidebar: FC<ContextSidebarProps> = ({
   const activeTab = location.hash.replace("#", "") || "overview";
 
   // Handle tab change by navigating to the new hash
+  // If we have a selected project but aren't on a project-specific URL, navigate to the project
   const handleTabChange = (newTab: string) => {
-    navigate(`${location.pathname}#${newTab}`, { replace: true });
+    const pathParts = location.pathname.split("/");
+    const hasProjectInUrl = pathParts.length > 2 && pathParts[2]; // /evals/:projectId
+    
+    // If there's no project in URL but we have a selected project, navigate to that project
+    if (!hasProjectInUrl && evalsSidebarContext?.currentProject) {
+      navigate(`/evals/${evalsSidebarContext.currentProject.id}#${newTab}`, { replace: true });
+    } else {
+      navigate(`${location.pathname}#${newTab}`, { replace: true });
+    }
   };
 
   switch (activeModule) {

Clients/src/presentation/pages/EvalsDashboard/BuiltInDatasetsPage.tsx

@@ -2,6 +2,7 @@ import { useEffect, useMemo, useRef, useState } from "react";
 import { Box, Stack, Typography, Chip, Paper, Divider, Button, CircularProgress, IconButton, Select, MenuItem, useTheme } from "@mui/material";
 import { useNavigate, useParams, useSearchParams } from "react-router-dom";
 import { deepEvalDatasetsService, DatasetPromptRecord, isSingleTurnPrompt, SingleTurnPrompt } from "../../../infrastructure/api/deepEvalDatasetsService";
+import { deepEvalOrgsService } from "../../../infrastructure/api/deepEvalOrgsService";
 import { experimentsService } from "../../../infrastructure/api/evaluationLogsService";
 import Alert from "../../components/Alert";
 import { ArrowLeft, X, Settings, ChevronDown, Upload } from "lucide-react";
@@ -151,6 +152,19 @@ export default function BuiltInDatasetsPage(_props: BuiltInEmbedProps) {
   const [uploading, setUploading] = useState(false);
   const fileInputRef = useRef<HTMLInputElement | null>(null);
   const [activeSection, setActiveSection] = useState<"datasets" | "benchmarks">("datasets");
+  const [orgId, setOrgId] = useState<string | null>(null);
+
+  // Fetch current org on mount
+  useEffect(() => {
+    (async () => {
+      try {
+        const { org } = await deepEvalOrgsService.getCurrentOrg();
+        if (org) setOrgId(org.id);
+      } catch {
+        // Ignore - org might not be set
+      }
+    })();
+  }, []);
 
   useEffect(() => {
     (async () => {
@@ -233,7 +247,7 @@ export default function BuiltInDatasetsPage(_props: BuiltInEmbedProps) {
 
     try {
       setUploading(true);
-      const resp = await deepEvalDatasetsService.uploadDataset(file);
+      const resp = await deepEvalDatasetsService.uploadDataset(file, "chatbot", "single-turn", orgId || undefined);
       setAlert({ variant: "success", body: `Uploaded ${resp.filename}` });
       setTimeout(() => setAlert(null), 4000);
       // Reload groups so any new datasets that are exposed via list() appear
@@ -680,43 +694,43 @@ export default function BuiltInDatasetsPage(_props: BuiltInEmbedProps) {
                         const stp = p as SingleTurnPrompt;
                         return (
                           <Paper key={stp.id} variant="outlined" sx={{ p: 1.25 }}>
-                            <Stack direction="row" alignItems="center" justifyContent="space-between" sx={{ mb: 0.5 }}>
-                              <Typography sx={{ fontWeight: 700, fontSize: "12px" }}>{`Prompt ${idx + 1}`}</Typography>
-                              <Chip
+                        <Stack direction="row" alignItems="center" justifyContent="space-between" sx={{ mb: 0.5 }}>
+                          <Typography sx={{ fontWeight: 700, fontSize: "12px" }}>{`Prompt ${idx + 1}`}</Typography>
+                          <Chip
                                 label={stp.category}
-                                size="small"
-                                sx={{
-                                  height: 18,
-                                  fontSize: "10px",
+                            size="small"
+                            sx={{
+                              height: 18,
+                              fontSize: "10px",
                                   bgcolor: stp.category?.toLowerCase().includes("coding")
-                                    ? "#E6F4EF"
+                                ? "#E6F4EF"
                                     : stp.category?.toLowerCase().includes("math")
-                                    ? "#E6F1FF"
+                                ? "#E6F1FF"
                                     : stp.category?.toLowerCase().includes("reason")
-                                    ? "#FFF4E6"
-                                    : "#F3F4F6",
-                                }}
-                              />
-                            </Stack>
-                            <Typography sx={{ fontSize: "12px", color: "#111827", whiteSpace: "pre-wrap" }}>
+                                ? "#FFF4E6"
+                                : "#F3F4F6",
+                            }}
+                          />
+                        </Stack>
+                        <Typography sx={{ fontSize: "12px", color: "#111827", whiteSpace: "pre-wrap" }}>
                               {stp.prompt}
-                            </Typography>
+                        </Typography>
                             {stp.expected_output && (
-                              <Typography sx={{ mt: 0.75, fontSize: "12px", color: "#4B5563" }}>
+                          <Typography sx={{ mt: 0.75, fontSize: "12px", color: "#4B5563" }}>
                                 <b>Expected:</b> {stp.expected_output}
-                              </Typography>
-                            )}
+                          </Typography>
+                        )}
                             {Array.isArray(stp.expected_keywords) && stp.expected_keywords.length > 0 && (
-                              <Typography sx={{ mt: 0.5, fontSize: "12px", color: "#4B5563" }}>
+                          <Typography sx={{ mt: 0.5, fontSize: "12px", color: "#4B5563" }}>
                                 <b>Keywords:</b> {stp.expected_keywords.join(", ")}
-                              </Typography>
-                            )}
+                          </Typography>
+                        )}
                             {Array.isArray(stp.retrieval_context) && stp.retrieval_context.length > 0 && (
-                              <Typography sx={{ mt: 0.5, fontSize: "12px", color: "#4B5563", whiteSpace: "pre-wrap" }}>
+                          <Typography sx={{ mt: 0.5, fontSize: "12px", color: "#4B5563", whiteSpace: "pre-wrap" }}>
                                 <b>Context:</b> {stp.retrieval_context.join("\n")}
-                              </Typography>
-                            )}
-                          </Paper>
+                          </Typography>
+                        )}
+                      </Paper>
                         );
                       } else {
                         // Multi-turn conversation

Clients/src/presentation/pages/EvalsDashboard/CreateScorerModal.tsx

@@ -166,6 +166,9 @@ export default function CreateScorerModal({
 
   // Update config when initialConfig changes (for editing)
   useEffect(() => {
+    // Always reset popover state when modal opens or scorer changes
+    setParamsPopoverOpen(false);
+    
     if (initialConfig) {
       setConfig({
         name: initialConfig.name || "",
@@ -408,11 +411,11 @@ export default function CreateScorerModal({
                 </Typography>
                 <CustomizableButton
                   variant="text"
-                  text="Add API key in Configuration"
+                  text="Add API key in Settings"
                   icon={<Settings size={14} />}
                   onClick={() => {
                     onClose();
-                    navigate(`/evals/${projectId}#configuration`)
+                    navigate(`/evals/${projectId}#settings`)
                   }}
                   sx={{
                     color: "#92400E",

Clients/src/presentation/pages/EvalsDashboard/DatasetEditorPage.tsx

@@ -15,6 +15,7 @@ import {
 } from "@mui/material";
 import { useNavigate, useParams, useSearchParams } from "react-router-dom";
 import { deepEvalDatasetsService, DatasetPromptRecord, SingleTurnPrompt, isSingleTurnPrompt } from "../../../infrastructure/api/deepEvalDatasetsService";
+import { deepEvalOrgsService } from "../../../infrastructure/api/deepEvalOrgsService";
 import Alert from "../../components/Alert";
 import { ArrowLeft, ChevronDown, Save as SaveIcon, Plus, Trash2, Download, Copy, Check } from "lucide-react";
 import PageBreadcrumbs from "../../components/Breadcrumbs/PageBreadcrumbs";
@@ -30,6 +31,19 @@ export default function DatasetEditorPage() {
   const [saving, setSaving] = useState<boolean>(false);
   const [copied, setCopied] = useState<boolean>(false);
   const [alert, setAlert] = useState<{ variant: "success" | "error"; body: string } | null>(null);
+  const [orgId, setOrgId] = useState<string | null>(null);
+
+  // Fetch current org on mount
+  useEffect(() => {
+    (async () => {
+      try {
+        const { org } = await deepEvalOrgsService.getCurrentOrg();
+        if (org) setOrgId(org.id);
+      } catch {
+        // Ignore - org might not be set
+      }
+    })();
+  }, []);
 
   useEffect(() => {
     (async () => {
@@ -63,7 +77,7 @@ export default function DatasetEditorPage() {
       const slug = datasetName.toLowerCase().replace(/[^a-z0-9]+/g, "_").replace(/^_+|_+$/g, "");
       const finalName = slug ? `${slug}.json` : "dataset.json";
       const file = new File([blob], finalName, { type: "application/json" });
-      await deepEvalDatasetsService.uploadDataset(file);
+      await deepEvalDatasetsService.uploadDataset(file, "chatbot", "single-turn", orgId || undefined);
       setAlert({ variant: "success", body: `Dataset "${datasetName}" saved successfully!` });
       setTimeout(() => {
         setAlert(null);
@@ -193,7 +207,7 @@ export default function DatasetEditorPage() {
             startIcon={<SaveIcon size={16} />}
             onClick={handleSave}
           >
-            {saving ? "Saving..." : "Save copy"}
+            {saving ? "Saving..." : "Save"}
           </Button>
         </Stack>
       </Stack>
@@ -209,7 +223,7 @@ export default function DatasetEditorPage() {
           placeholder="Enter a descriptive name for this dataset"
         />
         <Typography variant="body2" sx={{ color: "#6B7280", fontSize: "13px" }}>
-          Edit the prompts below, then click Save to add a copy to your datasets.
+          Edit the prompts below, then click Save to create your dataset.
         </Typography>
       </Stack>