Merge pull request #30 from PySpur-Dev/runView

Run view
PySpur-Dev · Dec 3, 2024 · f6a3619 · f6a3619
2 parents 2069a7d + af55ead
commit f6a3619
Show file tree

Hide file tree

Showing 12 changed files with 1,249 additions and 25 deletions.
diff --git a/backend/app/api/run_management.py b/backend/app/api/run_management.py
@@ -30,6 +30,14 @@ def list_runs(
     return runs
 
 
+@router.get("/{run_id}/", response_model=RunResponseSchema)
+def get_run(run_id: str, db: Session = Depends(get_db)):
+    run = db.query(RunModel).filter(RunModel.id == run_id).first()
+    if not run:
+        raise HTTPException(status_code=404, detail="Run not found")
+    return run
+
+
 @router.get("/{run_id}/status/", response_model=RunResponseSchema)
 def get_run_status(run_id: str, db: Session = Depends(get_db)):
     run = db.query(RunModel).filter(RunModel.id == run_id).first()

diff --git a/frontend/src/components/Header.jsx b/frontend/src/components/Header.jsx
@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import React, { useEffect, useState } from 'react';
 import { useSelector, useDispatch } from 'react-redux';
 import {
   Input,
@@ -9,14 +9,26 @@ import {
   Link,
   Button,
   Spinner,
-
+  Modal,
+  ModalContent,
+  ModalHeader,
+  ModalBody,
+  ModalFooter,
+  Code,
+  Tooltip,
+  Dropdown,
+  DropdownTrigger,
+  DropdownMenu,
+  DropdownItem,
 } from "@nextui-org/react";
 import { Icon } from "@iconify/react";
 import SettingsCard from './modals/SettingsModal';
 import { setProjectName, updateNodeData, resetRun } from '../store/flowSlice'; // Ensure updateNodeData is imported
 import RunModal from './modals/RunModal';
 import { getRunStatus, startRun, getWorkflow } from '../utils/api';
 import { Toaster, toast } from 'sonner'
+import { getWorkflowRuns } from '../utils/api';
+import { useRouter } from 'next/router';
 import DeployModal from './modals/DeployModal';
 
 const Header = ({ activePage }) => {
@@ -26,9 +38,32 @@ const Header = ({ activePage }) => {
   const [isRunning, setIsRunning] = useState(false);
   const [isDebugModalOpen, setIsDebugModalOpen] = useState(false);
   const [isDeployModalOpen, setIsDeployModalOpen] = useState(false);
+  const [workflowRuns, setWorkflowRuns] = useState([]);
+  const [isHistoryOpen, setIsHistoryOpen] = useState(false);
+  const workflowId = useSelector((state) => state.flow.workflowID);
+
+  const router = useRouter();
+  const { id } = router.query;
+  const isRun = id && id[0] == 'R';
 
   let currentStatusInterval = null;
 
+  const fetchWorkflowRuns = async () => {
+    try {
+      const response = await getWorkflowRuns(workflowId);
+      setWorkflowRuns(response);
+    }
+    catch (error) {
+      console.error('Error fetching workflow runs:', error);
+    }
+  };
+
+  useEffect(() => {
+    if (workflowId) {
+      fetchWorkflowRuns();
+    }
+  }, [workflowId]);
+
   const updateWorkflowStatus = async (runID) => {
     let pollCount = 0;
     if (currentStatusInterval) {
@@ -70,14 +105,14 @@ const Header = ({ activePage }) => {
     }, 1000);
   };
 
-  // get the workflow ID from the URL
-  const workflowID = typeof window !== 'undefined' ? window.location.pathname.split('/').pop() : null;
 
   const executeWorkflow = async (inputValues) => {
     try {
       toast('Starting workflow run...');
-      const result = await startRun(workflowID, inputValues, null, 'interactive');
+      const result = await startRun(workflowId, inputValues, null, 'interactive');
+      console.log('Workflow run started:', result);
       setIsRunning(true);
+      fetchWorkflowRuns();
       dispatch(resetRun());
       updateWorkflowStatus(result.id);
     } catch (error) {
@@ -105,7 +140,7 @@ const Header = ({ activePage }) => {
   const handleDownloadWorkflow = async () => {
     try {
       // Get the current workflow using the workflowID from Redux state
-      const workflow = await getWorkflow(workflowID);
+      const workflow = await getWorkflow(workflowId);
 
       const workflowDetails = {
         name: workflow.name,
@@ -146,7 +181,7 @@ const Header = ({ activePage }) => {
       return ''; // Return empty string during server-side rendering
     }
     const baseUrl = window.location.origin;
-    return `${baseUrl}/api/wf/${workflowID}/start_run/?run_type=non_blocking`;
+    return `${baseUrl}/api/wf/${workflowId}/start_run/?run_type=non_blocking`;
   };
 
   const workflowInputVariables = useSelector((state) => state.flow.workflowInputVariables);
@@ -230,24 +265,48 @@ const Header = ({ activePage }) => {
             justify="end"
             id="workflow-actions-buttons"
           >
-            {isRunning ? (
+            {!isRun && (
               <>
-                <NavbarItem className="hidden sm:flex">
-                  <Spinner size="sm" />
-                </NavbarItem>
-                <NavbarItem className="hidden sm:flex">
-                  <Button isIconOnly radius="full" variant="light" onClick={handleStopWorkflow}>
-                    <Icon className="text-default-500" icon="solar:stop-linear" width={22} />
-                  </Button>
-                </NavbarItem>
+                {isRunning ? (
+                  <>
+                    <NavbarItem className="hidden sm:flex">
+                      <Spinner size="sm" />
+                    </NavbarItem>
+                    <NavbarItem className="hidden sm:flex">
+                      <Button isIconOnly radius="full" variant="light" onClick={handleStopWorkflow}>
+                        <Icon className="text-default-500" icon="solar:stop-linear" width={22} />
+                      </Button>
+                    </NavbarItem>
+                  </>
+                ) : (
+                  <NavbarItem className="hidden sm:flex">
+                    <Button isIconOnly radius="full" variant="light" onClick={handleRunWorkflow}>
+                      <Icon className="text-default-500" icon="solar:play-linear" width={22} />
+                    </Button>
+                  </NavbarItem>
+                )}
               </>
-            ) : (
-              <NavbarItem className="hidden sm:flex">
-                <Button isIconOnly radius="full" variant="light" onClick={handleRunWorkflow}>
-                  <Icon className="text-default-500" icon="solar:play-linear" width={22} />
-                </Button>
-              </NavbarItem>
             )}
+            <NavbarItem className="hidden sm:flex">
+              <Dropdown isOpen={isHistoryOpen} onOpenChange={setIsHistoryOpen}>
+                <DropdownTrigger>
+                  <Button isIconOnly radius="full" variant="light">
+                    <Icon className="text-default-500" icon="solar:history-linear" width={22} />
+                  </Button>
+                </DropdownTrigger>
+                <DropdownMenu>
+                  {workflowRuns.map((run, index) => (
+                    <DropdownItem
+                      key={index}
+                      onClick={() => window.open(`/trace/${run.id}`, '_blank')}
+                      textValue={`Version ${index + 1}`}
+                    >
+                      Run {workflowRuns.length - index}
+                    </DropdownItem>
+                  ))}
+                </DropdownMenu>
+              </Dropdown>
+            </NavbarItem>
             <NavbarItem className="hidden sm:flex">
               <Button
                 isIconOnly

diff --git a/frontend/src/components/canvas/FlowCanvas.jsx b/frontend/src/components/canvas/FlowCanvas.jsx
@@ -610,4 +610,4 @@ const FlowCanvas = ({ workflowData, workflowID }) => {
   );
 };
 
-export default FlowCanvas;
+export default FlowCanvas;
-Original file line number
+Diff line change
@@ Expand Up / @@ -610,4 +610,4 @@ const FlowCanvas = ({ workflowData, workflowID }) => { @@
       );
     };
-    export default FlowCanvas;
+    export default FlowCanvas;