From 0213df4ac474bede78cd279920d234638ea528f5 Mon Sep 17 00:00:00 2001
From: 35C4n0r <jaykumar20march@gmail.com>
Date: Fri, 27 Sep 2024 17:40:29 +0530
Subject: [PATCH 1/6] feat: workflow fix

Signed-off-by: 35C4n0r <jaykumar20march@gmail.com>
---
 keep-ui/app/workflows/models.tsx              |  1 +
 keep-ui/app/workflows/workflow-tile.tsx       | 14 +++-
 .../utils/hooks/useWorkflowInitialization.ts  |  2 +-
 keep/api/core/db.py                           | 14 +++-
 .../versions/2024-09-26-19-43_b4caf6779ec1.py | 44 +++++++++++
 keep/api/models/db/workflow.py                |  1 +
 keep/api/models/workflow.py                   |  3 +-
 keep/api/routes/workflows.py                  | 77 +++++++++++++++----
 keep/workflowmanager/workflowstore.py         | 18 ++++-
 9 files changed, 147 insertions(+), 27 deletions(-)
 create mode 100644 keep/api/models/db/migrations/versions/2024-09-26-19-43_b4caf6779ec1.py

diff --git a/keep-ui/app/workflows/models.tsx b/keep-ui/app/workflows/models.tsx
index 5e77ddcfa..72722aca2 100644
--- a/keep-ui/app/workflows/models.tsx
+++ b/keep-ui/app/workflows/models.tsx
@@ -34,6 +34,7 @@ export type Workflow = {
   providers: Provider[];
   triggers: Trigger[];
   disabled:boolean,
+  is_valid: boolean,
   last_execution_time: string;
   last_execution_status: string;
   last_updated: string;
diff --git a/keep-ui/app/workflows/workflow-tile.tsx b/keep-ui/app/workflows/workflow-tile.tsx
index 7e3da37ba..0b91497d1 100644
--- a/keep-ui/app/workflows/workflow-tile.tsx
+++ b/keep-ui/app/workflows/workflow-tile.tsx
@@ -27,7 +27,7 @@ import SlidingPanel from "react-sliding-side-panel";
 import { useFetchProviders } from "app/providers/page.client";
 import { Provider as FullProvider } from "app/providers/providers";
 import "./workflow-tile.css";
-import { CheckCircleIcon, XCircleIcon } from "@heroicons/react/24/outline";
+import { CheckCircleIcon, XCircleIcon, InformationCircleIcon } from "@heroicons/react/24/outline";
 import AlertTriggerModal from "./workflow-run-with-alert-modal";
 import { formatDistanceToNowStrict } from "date-fns";
 import TimeAgo, { Formatter, Suffix, Unit } from "react-timeago";
@@ -551,7 +551,7 @@ function WorkflowTile({ workflow }: { workflow: Workflow }) {
         </div>
       )}
       <Card
-        className="relative flex flex-col justify-between bg-white rounded shadow p-2 h-full hover:border-orange-400 hover:border-2 overflow-hidden"
+        className={`relative flex flex-col justify-between bg-white rounded shadow p-2 h-full ${workflow.is_valid ? 'hover:border-orange-400' : 'hover:border-red-400'} hover:border-2 overflow-hidden`}
         onClick={(e) => {
           e.stopPropagation();
           e.preventDefault();
@@ -581,14 +581,20 @@ function WorkflowTile({ workflow }: { workflow: Workflow }) {
         <div className="m-2 flex flex-col justify-around item-start flex-wrap">
           <WorkflowGraph workflow={workflow} />
           <div className="container flex flex-col space-between">
-            <div className="h-24 cursor-default">
+            <div className="h-20 cursor-default">
               <h2 className="truncate leading-6 font-bold text-base md:text-lg lg:text-xl">
-                {workflow?.name || "Unkown"}
+                {workflow?.name || "Unknown"}
               </h2>
               <p className="text-gray-500 line-clamp-2">
                 {workflow?.description || "no description"}
               </p>
+
             </div>
+            {!workflow.is_valid ?
+                <div className={"text-red-900 flex items-center -ml-1 h-9"}>
+                  <Icon icon={InformationCircleIcon} color={"red"} size={"sm"}/> Invalid workflow Configuration
+                </div> : <div className={"h-9"}></div>
+              }
             <div className="flex flex-row justify-between items-center gap-1 flex-wrap text-sm">
               {!!workflow?.interval && (
                 <Button
diff --git a/keep-ui/utils/hooks/useWorkflowInitialization.ts b/keep-ui/utils/hooks/useWorkflowInitialization.ts
index 17d33cd4f..42a6c8a3a 100644
--- a/keep-ui/utils/hooks/useWorkflowInitialization.ts
+++ b/keep-ui/utils/hooks/useWorkflowInitialization.ts
@@ -175,7 +175,7 @@ const useWorkflowInitialization = (
     const initializeWorkflow = async () => {
       setIsLoading(true);
       let parsedWorkflow = definition?.value;
-      const name = parsedWorkflow?.properties?.name || parsedWorkflow?.properties?.id;
+      const name = parsedWorkflow?.properties?.name || '';
 
       const sequences = [
         {
diff --git a/keep/api/core/db.py b/keep/api/core/db.py
index c523de1b0..94337c7d1 100644
--- a/keep/api/core/db.py
+++ b/keep/api/core/db.py
@@ -192,6 +192,7 @@ def get_workflows_that_should_run():
             .filter(Workflow.is_deleted == False)
             .filter(Workflow.is_disabled == False)
             .filter(Workflow.interval != None)
+            .filter(Workflow.is_valid == True)
             .filter(Workflow.interval > 0)
             .all()
         )
@@ -312,15 +313,16 @@ def add_or_update_workflow(
     interval,
     workflow_raw,
     is_disabled,
+    is_valid,
     provisioned=False,
     provisioned_file=None,
     updated_by=None,
 ) -> Workflow:
     with Session(engine, expire_on_commit=False) as session:
         # TODO: we need to better understanad if that's the right behavior we want
-        existing_workflow = (
+        existing_workflow: Workflow = (
             session.query(Workflow)
-            .filter_by(name=name)
+            .filter_by(id=id)
             .filter_by(tenant_id=tenant_id)
             .first()
         )
@@ -328,6 +330,7 @@ def add_or_update_workflow(
         if existing_workflow:
             # tb: no need to override the id field here because it has foreign key constraints.
             existing_workflow.tenant_id = tenant_id
+            existing_workflow.name = name
             existing_workflow.description = description
             existing_workflow.updated_by = (
                 updated_by or existing_workflow.updated_by
@@ -337,6 +340,7 @@ def add_or_update_workflow(
             existing_workflow.revision += 1  # Increment the revision
             existing_workflow.last_updated = datetime.now()  # Update last_updated
             existing_workflow.is_deleted = False
+            existing_workflow.is_valid = is_valid
             existing_workflow.is_disabled = is_disabled
             existing_workflow.provisioned = provisioned
             existing_workflow.provisioned_file = provisioned_file
@@ -352,6 +356,7 @@ def add_or_update_workflow(
                 updated_by=updated_by,  # Set updated_by to the provided value
                 interval=interval,
                 is_disabled=is_disabled,
+                is_valid=is_valid,
                 workflow_raw=workflow_raw,
                 provisioned=provisioned,
                 provisioned_file=provisioned_file,
@@ -2805,7 +2810,9 @@ def get_incident_unique_fingerprint_count(tenant_id: str, incident_id: str) -> i
         ).scalar()
 
 
-def get_last_alerts_for_incidents(incident_ids: List[str | UUID]) -> Dict[str, List[Alert]]:
+def get_last_alerts_for_incidents(
+    incident_ids: List[str | UUID],
+) -> Dict[str, List[Alert]]:
     with Session(engine) as session:
         query = (
             session.query(
@@ -2827,6 +2834,7 @@ def get_last_alerts_for_incidents(incident_ids: List[str | UUID]) -> Dict[str, L
 
     return incidents_alerts
 
+
 def remove_alerts_to_incident_by_incident_id(
     tenant_id: str, incident_id: str | UUID, alert_ids: List[UUID]
 ) -> Optional[int]:
diff --git a/keep/api/models/db/migrations/versions/2024-09-26-19-43_b4caf6779ec1.py b/keep/api/models/db/migrations/versions/2024-09-26-19-43_b4caf6779ec1.py
new file mode 100644
index 000000000..29d9809ba
--- /dev/null
+++ b/keep/api/models/db/migrations/versions/2024-09-26-19-43_b4caf6779ec1.py
@@ -0,0 +1,44 @@
+"""is_valid flag to workflow
+
+Revision ID: b4caf6779ec1
+Revises: 493f217af6b6
+Create Date: 2024-09-26 19:43:45.169045
+
+"""
+
+import sqlalchemy as sa
+import sqlalchemy_utils
+import sqlmodel
+from alembic import op
+from sqlalchemy.dialects import postgresql
+
+# revision identifiers, used by Alembic.
+revision = "b4caf6779ec1"
+down_revision = "493f217af6b6"
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+
+    with op.batch_alter_table("workflow", schema=None) as batch_op:
+        # Add the column with default=True for new records
+        batch_op.add_column(
+            sa.Column(
+                "is_valid", sa.Boolean(), nullable=False, server_default=sa.true()
+            )
+        )
+
+    # Update existing rows to set 'is_valid' to True
+    op.execute("UPDATE workflow SET is_valid = TRUE")
+
+    # Remove the server_default as it's not needed after the column is populated for old records
+    with op.batch_alter_table("workflow", schema=None) as batch_op:
+        batch_op.alter_column("is_valid", server_default=None)
+
+
+def downgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table("workflow", schema=None) as batch_op:
+        batch_op.drop_column("is_valid")
diff --git a/keep/api/models/db/workflow.py b/keep/api/models/db/workflow.py
index f243b51f0..b578ea05f 100644
--- a/keep/api/models/db/workflow.py
+++ b/keep/api/models/db/workflow.py
@@ -17,6 +17,7 @@ class Workflow(SQLModel, table=True):
     workflow_raw: str = Field(sa_column=Column(TEXT))
     is_deleted: bool = Field(default=False)
     is_disabled: bool = Field(default=False)
+    is_valid: bool = Field(default=True)
     revision: int = Field(default=1, nullable=False)
     last_updated: datetime = Field(default_factory=datetime.utcnow)
     provisioned: bool = Field(default=False)
diff --git a/keep/api/models/workflow.py b/keep/api/models/workflow.py
index 68965a2fc..c02d51b8b 100644
--- a/keep/api/models/workflow.py
+++ b/keep/api/models/workflow.py
@@ -36,7 +36,7 @@ class WorkflowDTO(BaseModel):
     workflow_raw: str
     revision: int = 1
     last_updated: datetime = None
-    invalid: bool = False  # whether the workflow is invalid or not (for UI purposes)
+    is_valid: bool
     last_executions: List[dict] = None
     last_execution_started: datetime = None
     provisioned: bool = False
@@ -118,4 +118,5 @@ class WorkflowExecutionDTO(BaseModel):
 class WorkflowCreateOrUpdateDTO(BaseModel):
     workflow_id: str
     status: Literal["created", "updated"]
+    is_valid: bool
     revision: int = 1
diff --git a/keep/api/routes/workflows.py b/keep/api/routes/workflows.py
index 7ed8dfc2b..902432cc8 100644
--- a/keep/api/routes/workflows.py
+++ b/keep/api/routes/workflows.py
@@ -1,7 +1,7 @@
 import datetime
 import logging
 import os
-from typing import Any, Dict, List, Optional
+from typing import Any, Dict, List, Optional, Tuple
 
 import validators
 import yaml
@@ -129,6 +129,7 @@ def get_workflows(
                 interval=workflow.interval,
                 providers=providers_dto,
                 triggers=triggers,
+                is_valid=workflow.is_valid,
                 workflow_raw=workflow.workflow_raw,
                 revision=workflow.revision,
                 last_updated=workflow.last_updated,
@@ -237,7 +238,9 @@ async def run_workflow_from_definition(
 ) -> dict:
     tenant_id = authenticated_entity.tenant_id
     created_by = authenticated_entity.email
-    workflow = await __get_workflow_raw_data(request, file)
+    workflow, is_valid = await __get_workflow_raw_data(
+        request, file, tenant_id=tenant_id
+    )
     workflowstore = WorkflowStore()
     workflowmanager = WorkflowManager.get_instance()
     try:
@@ -273,7 +276,9 @@ async def run_workflow_from_definition(
     return workflow_execution
 
 
-async def __get_workflow_raw_data(request: Request, file: UploadFile) -> dict:
+async def __get_workflow_raw_data(
+    request: Request, file: UploadFile, tenant_id
+) -> Tuple[dict, bool]:
     try:
         # we support both File upload (from frontend) or raw yaml (e.g. curl)
         if file:
@@ -291,7 +296,19 @@ async def __get_workflow_raw_data(request: Request, file: UploadFile) -> dict:
     except yaml.YAMLError:
         logger.exception("Invalid YAML format")
         raise HTTPException(status_code=400, detail="Invalid YAML format")
-    return workflow_data
+
+    try:
+        parser = Parser()
+        parsed_workflow = parser.parse(
+            tenant_id=tenant_id, parsed_workflow_yaml=workflow_data
+        )
+        workflow_data["id"] = parser._get_workflow_id(tenant_id, workflow_data)
+        is_valid = True
+    except Exception as e:
+        is_valid = False
+        logger.error(str(e))
+
+    return workflow_data, is_valid
 
 
 @router.post(
@@ -305,12 +322,19 @@ async def create_workflow(
 ) -> WorkflowCreateOrUpdateDTO:
     tenant_id = authenticated_entity.tenant_id
     created_by = authenticated_entity.email
-    workflow = await __get_workflow_raw_data(request=None, file=file)
+    workflow, is_valid = await __get_workflow_raw_data(
+        request=None, file=file, tenant_id=tenant_id
+    )
+
     workflowstore = WorkflowStore()
+
     # Create the workflow
     try:
         workflow = workflowstore.create_workflow(
-            tenant_id=tenant_id, created_by=created_by, workflow=workflow
+            tenant_id=tenant_id,
+            created_by=created_by,
+            workflow=workflow,
+            is_valid=is_valid,
         )
     except Exception:
         logger.exception(
@@ -323,11 +347,17 @@ async def create_workflow(
         )
     if workflow.revision == 1:
         return WorkflowCreateOrUpdateDTO(
-            workflow_id=workflow.id, status="created", revision=workflow.revision
+            workflow_id=workflow.id,
+            status="created",
+            revision=workflow.revision,
+            is_valid=is_valid,
         )
     else:
         return WorkflowCreateOrUpdateDTO(
-            workflow_id=workflow.id, status="updated", revision=workflow.revision
+            workflow_id=workflow.id,
+            status="updated",
+            revision=workflow.revision,
+            is_valid=is_valid,
         )
 
 
@@ -344,12 +374,19 @@ async def create_workflow_from_body(
 ) -> WorkflowCreateOrUpdateDTO:
     tenant_id = authenticated_entity.tenant_id
     created_by = authenticated_entity.email
-    workflow = await __get_workflow_raw_data(request, None)
+    workflow, is_valid = await __get_workflow_raw_data(
+        request, None, tenant_id=tenant_id
+    )
+    print("I AM HERE: ", workflow)
     workflowstore = WorkflowStore()
+
     # Create the workflow
     try:
         workflow = workflowstore.create_workflow(
-            tenant_id=tenant_id, created_by=created_by, workflow=workflow
+            tenant_id=tenant_id,
+            created_by=created_by,
+            workflow=workflow,
+            is_valid=is_valid,
         )
     except Exception:
         logger.exception(
@@ -362,11 +399,17 @@ async def create_workflow_from_body(
         )
     if workflow.revision == 1:
         return WorkflowCreateOrUpdateDTO(
-            workflow_id=workflow.id, status="created", revision=workflow.revision
+            workflow_id=workflow.id,
+            status="created",
+            revision=workflow.revision,
+            is_valid=is_valid,
         )
     else:
         return WorkflowCreateOrUpdateDTO(
-            workflow_id=workflow.id, status="updated", revision=workflow.revision
+            workflow_id=workflow.id,
+            status="updated",
+            revision=workflow.revision,
+            is_valid=is_valid,
         )
 
 
@@ -448,7 +491,9 @@ async def update_workflow_by_id(
     if workflow_from_db.provisioned:
         raise HTTPException(403, detail="Cannot update a provisioned workflow")
 
-    workflow = await __get_workflow_raw_data(request, None)
+    workflow, is_valid = await __get_workflow_raw_data(
+        request, None, tenant_id=tenant_id
+    )
     parser = Parser()
     workflow_interval = parser.parse_interval(workflow)
     # In case the workflow name changed to empty string, keep the old name
@@ -459,12 +504,15 @@ async def update_workflow_by_id(
     workflow_from_db.description = workflow.get("description")
     workflow_from_db.interval = workflow_interval
     workflow_from_db.workflow_raw = yaml.dump(workflow)
+    workflow_from_db.is_valid = is_valid
     workflow_from_db.last_updated = datetime.datetime.now()
     session.add(workflow_from_db)
     session.commit()
     session.refresh(workflow_from_db)
     logger.info(f"Updated workflow {workflow_id}", extra={"tenant_id": tenant_id})
-    return WorkflowCreateOrUpdateDTO(workflow_id=workflow_id, status="updated")
+    return WorkflowCreateOrUpdateDTO(
+        workflow_id=workflow_id, status="updated", is_valid=is_valid
+    )
 
 
 @router.get("/{workflow_id}/raw", description="Get workflow executions by ID")
@@ -589,6 +637,7 @@ def get_workflow_by_id(
         workflow_raw=workflow.workflow_raw,
         last_updated=workflow.last_updated,
         disabled=workflow.is_disabled,
+        is_valid=workflow.is_valid,
     )
     return WorkflowExecutionsPaginatedResultsDto(
         limit=limit,
diff --git a/keep/workflowmanager/workflowstore.py b/keep/workflowmanager/workflowstore.py
index af1ae746b..c1fcc7f9c 100644
--- a/keep/workflowmanager/workflowstore.py
+++ b/keep/workflowmanager/workflowstore.py
@@ -38,21 +38,25 @@ def get_workflow_execution(self, tenant_id: str, workflow_execution_id: str):
         workflow_execution = get_workflow_execution(tenant_id, workflow_execution_id)
         return workflow_execution
 
-    def create_workflow(self, tenant_id: str, created_by, workflow: dict):
-        workflow_id = workflow.get("id")
+    def create_workflow(
+        self, tenant_id: str, created_by, workflow: dict, is_valid: bool
+    ):
+        workflow_id = workflow.get("id", str(uuid.uuid4()))
+        workflow["id"] = workflow_id
         self.logger.info(f"Creating workflow {workflow_id}")
         interval = self.parser.parse_interval(workflow)
         if not workflow.get("name"):  # workflow name is None or empty string
-            workflow_name = workflow_id
+            workflow_name = "Workflow-" + workflow_id
             workflow["name"] = workflow_name
         else:
             workflow_name = workflow.get("name")
 
         workflow = add_or_update_workflow(
-            id=str(uuid.uuid4()),
+            id=workflow_id,
             name=workflow_name,
             tenant_id=tenant_id,
             description=workflow.get("description"),
+            is_valid=is_valid,
             created_by=created_by,
             interval=interval,
             is_disabled=Parser.parse_disabled(workflow),
@@ -112,7 +116,10 @@ def get_workflow(self, tenant_id: str, workflow_id: str) -> Workflow:
                 detail=f"Workflow {workflow_id} not found",
             )
         workflow_yaml = yaml.safe_load(workflow)
+
+        # This is validating the workflow
         workflow = self.parser.parse(tenant_id, workflow_yaml)
+
         if len(workflow) > 1:
             raise HTTPException(
                 status_code=500,
@@ -524,3 +531,6 @@ def get_workflow_meta_data(
         triggers = self.parser.get_triggers_from_workflow(workflow_yaml)
 
         return providers_dto, triggers
+
+    def validate(self, tenant_id, workflow):
+        return self.parser.parse(tenant_id=tenant_id, parsed_workflow_yaml=workflow)

From 0e85cbe624231c445c5781ab4f36705be3764f16 Mon Sep 17 00:00:00 2001
From: 35C4n0r <jaykumar20march@gmail.com>
Date: Fri, 27 Sep 2024 17:51:58 +0530
Subject: [PATCH 2/6] chore: CI fix

Signed-off-by: 35C4n0r <jaykumar20march@gmail.com>
---
 .../db/migrations/versions/2024-09-26-19-43_b4caf6779ec1.py   | 3 ---
 keep/api/routes/workflows.py                                  | 4 +---
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/keep/api/models/db/migrations/versions/2024-09-26-19-43_b4caf6779ec1.py b/keep/api/models/db/migrations/versions/2024-09-26-19-43_b4caf6779ec1.py
index 29d9809ba..fd853900b 100644
--- a/keep/api/models/db/migrations/versions/2024-09-26-19-43_b4caf6779ec1.py
+++ b/keep/api/models/db/migrations/versions/2024-09-26-19-43_b4caf6779ec1.py
@@ -7,10 +7,7 @@
 """
 
 import sqlalchemy as sa
-import sqlalchemy_utils
-import sqlmodel
 from alembic import op
-from sqlalchemy.dialects import postgresql
 
 # revision identifiers, used by Alembic.
 revision = "b4caf6779ec1"
diff --git a/keep/api/routes/workflows.py b/keep/api/routes/workflows.py
index 902432cc8..acc827198 100644
--- a/keep/api/routes/workflows.py
+++ b/keep/api/routes/workflows.py
@@ -299,9 +299,7 @@ async def __get_workflow_raw_data(
 
     try:
         parser = Parser()
-        parsed_workflow = parser.parse(
-            tenant_id=tenant_id, parsed_workflow_yaml=workflow_data
-        )
+        parser.parse(tenant_id=tenant_id, parsed_workflow_yaml=workflow_data)
         workflow_data["id"] = parser._get_workflow_id(tenant_id, workflow_data)
         is_valid = True
     except Exception as e:

From 85f11b4ef2a47967b1cb130e4248a05faa9d7fbc Mon Sep 17 00:00:00 2001
From: 35C4n0r <jaykumar20march@gmail.com>
Date: Fri, 27 Sep 2024 18:32:43 +0530
Subject: [PATCH 3/6] fix: tests fix

Signed-off-by: 35C4n0r <jaykumar20march@gmail.com>
---
 keep/workflowmanager/workflowstore.py | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/keep/workflowmanager/workflowstore.py b/keep/workflowmanager/workflowstore.py
index c1fcc7f9c..b9b8e107b 100644
--- a/keep/workflowmanager/workflowstore.py
+++ b/keep/workflowmanager/workflowstore.py
@@ -307,15 +307,25 @@ def provision_workflows_from_directory(
                         elif "alert" in workflow_yaml:
                             workflow_yaml = workflow_yaml["alert"]
 
-                    workflow_name = workflow_yaml.get("name") or workflow_yaml.get("id")
+                    workflow_id = workflow_yaml.get("id", str(uuid.uuid4()))
+                    workflow_yaml["id"] = workflow_id
+                    workflow_name = workflow_yaml.get(
+                        "name", "Workflow-" + workflow_yaml.get("id")
+                    )
                     if not workflow_name:
                         logger.error(f"Workflow from {file} does not have a name or id")
                         continue
-                    workflow_id = str(uuid.uuid4())
                     workflow_description = workflow_yaml.get("description")
                     workflow_interval = parser.parse_interval(workflow_yaml)
                     workflow_disabled = parser.parse_disabled(workflow_yaml)
-
+                    is_valid = True
+                    try:
+                        parser = Parser()
+                        parser.parse(
+                            tenant_id=tenant_id, parsed_workflow_yaml=workflow_yaml
+                        )
+                    except Exception as e:
+                        is_valid = False
                     add_or_update_workflow(
                         id=workflow_id,
                         name=workflow_name,
@@ -324,6 +334,7 @@ def provision_workflows_from_directory(
                         created_by="system",
                         interval=workflow_interval,
                         is_disabled=workflow_disabled,
+                        is_valid=is_valid,
                         workflow_raw=yaml.dump(workflow_yaml),
                         provisioned=True,
                         provisioned_file=workflow_path,

From d5dbd79040ba3d2ae298a2442de9edbdf300ae87 Mon Sep 17 00:00:00 2001
From: 35C4n0r <jaykumar20march@gmail.com>
Date: Fri, 27 Sep 2024 18:37:37 +0530
Subject: [PATCH 4/6] fix: CI fix

Signed-off-by: 35C4n0r <jaykumar20march@gmail.com>
---
 keep/api/routes/workflows.py          | 4 ++--
 keep/workflowmanager/workflowstore.py | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/keep/api/routes/workflows.py b/keep/api/routes/workflows.py
index acc827198..a18650ac9 100644
--- a/keep/api/routes/workflows.py
+++ b/keep/api/routes/workflows.py
@@ -277,7 +277,7 @@ async def run_workflow_from_definition(
 
 
 async def __get_workflow_raw_data(
-    request: Request, file: UploadFile, tenant_id
+    request: Request | None, file: UploadFile, tenant_id
 ) -> Tuple[dict, bool]:
     try:
         # we support both File upload (from frontend) or raw yaml (e.g. curl)
@@ -304,7 +304,7 @@ async def __get_workflow_raw_data(
         is_valid = True
     except Exception as e:
         is_valid = False
-        logger.error(str(e))
+        logger.error(f"Error while validating workflow yaml {workflow_data['id']}", extra={"exception": e})
 
     return workflow_data, is_valid
 
diff --git a/keep/workflowmanager/workflowstore.py b/keep/workflowmanager/workflowstore.py
index b9b8e107b..15cdc180a 100644
--- a/keep/workflowmanager/workflowstore.py
+++ b/keep/workflowmanager/workflowstore.py
@@ -325,6 +325,7 @@ def provision_workflows_from_directory(
                             tenant_id=tenant_id, parsed_workflow_yaml=workflow_yaml
                         )
                     except Exception as e:
+                        logger.error(f"Error while validating workflow yaml {workflow_id}", extra={"exception": e})
                         is_valid = False
                     add_or_update_workflow(
                         id=workflow_id,

From 52cb6cd024283ce7f7b4588a729bfacc4de531af Mon Sep 17 00:00:00 2001
From: 35C4n0r <jaykumar20march@gmail.com>
Date: Fri, 27 Sep 2024 19:10:15 +0530
Subject: [PATCH 5/6] fix: remove name comparison

Signed-off-by: 35C4n0r <jaykumar20march@gmail.com>
---
 keep/api/core/db.py                   | 2 +-
 keep/api/routes/workflows.py          | 5 ++++-
 keep/workflowmanager/workflowstore.py | 5 ++++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/keep/api/core/db.py b/keep/api/core/db.py
index 27321ec4c..7e50624e1 100644
--- a/keep/api/core/db.py
+++ b/keep/api/core/db.py
@@ -551,7 +551,7 @@ def get_workflow(tenant_id: str, workflow_id: str) -> Workflow:
             workflow = session.exec(
                 select(Workflow)
                 .where(Workflow.tenant_id == tenant_id)
-                .where(Workflow.name == workflow_id)
+                .where(Workflow.id == workflow_id)
                 .where(Workflow.is_deleted == False)
             ).first()
     if not workflow:
diff --git a/keep/api/routes/workflows.py b/keep/api/routes/workflows.py
index a18650ac9..952fa7fe2 100644
--- a/keep/api/routes/workflows.py
+++ b/keep/api/routes/workflows.py
@@ -304,7 +304,10 @@ async def __get_workflow_raw_data(
         is_valid = True
     except Exception as e:
         is_valid = False
-        logger.error(f"Error while validating workflow yaml {workflow_data['id']}", extra={"exception": e})
+        logger.error(
+            f"Error while validating workflow yaml {workflow_data['id']}",
+            extra={"exception": e},
+        )
 
     return workflow_data, is_valid
 
diff --git a/keep/workflowmanager/workflowstore.py b/keep/workflowmanager/workflowstore.py
index 15cdc180a..1a8bbcec1 100644
--- a/keep/workflowmanager/workflowstore.py
+++ b/keep/workflowmanager/workflowstore.py
@@ -325,7 +325,10 @@ def provision_workflows_from_directory(
                             tenant_id=tenant_id, parsed_workflow_yaml=workflow_yaml
                         )
                     except Exception as e:
-                        logger.error(f"Error while validating workflow yaml {workflow_id}", extra={"exception": e})
+                        logger.error(
+                            f"Error while validating workflow yaml {workflow_id}",
+                            extra={"exception": e},
+                        )
                         is_valid = False
                     add_or_update_workflow(
                         id=workflow_id,

From 7b5f25b4789eb35ddba3a8f8d06ce0a0c6781ee4 Mon Sep 17 00:00:00 2001
From: 35C4n0r <jaykumar20march@gmail.com>
Date: Tue, 1 Oct 2024 13:14:28 +0530
Subject: [PATCH 6/6] fix: alembic heads

Signed-off-by: 35C4n0r <jaykumar20march@gmail.com>
---
 .../db/migrations/versions/2024-09-26-19-43_b4caf6779ec1.py     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keep/api/models/db/migrations/versions/2024-09-26-19-43_b4caf6779ec1.py b/keep/api/models/db/migrations/versions/2024-09-26-19-43_b4caf6779ec1.py
index fd853900b..448660ba4 100644
--- a/keep/api/models/db/migrations/versions/2024-09-26-19-43_b4caf6779ec1.py
+++ b/keep/api/models/db/migrations/versions/2024-09-26-19-43_b4caf6779ec1.py
@@ -11,7 +11,7 @@
 
 # revision identifiers, used by Alembic.
 revision = "b4caf6779ec1"
-down_revision = "493f217af6b6"
+down_revision = "01ebe17218c0"
 branch_labels = None
 depends_on = None