Skip to content
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
759ee93
Basic workflow and adapter exception messages
athul-rs Feb 26, 2024
badf00d
Corrected alignment of the OnBoard page to accommodate various screen…
mohamed-siddhiq Feb 27, 2024
e839070
Merge branch 'main' into onboarding-page-alignment-fix
mohamed-siddhiq Feb 28, 2024
910e2c5
Merge branch 'main' into onboarding-page-alignment-fix
mohamed-siddhiq Feb 28, 2024
2064d49
Adapter error messages updated
athul-rs Feb 28, 2024
5d17097
Merge branch 'main' into fix/exception-handling-workflows
athul-rs Feb 28, 2024
60f062b
removed translator, PII redactor and workflow settings
muhammad-ali-e Feb 28, 2024
f9921f8
ocr tool with adapter support
vishnuszipstack Feb 28, 2024
bda3af0
Merge branch 'main' into RemoveWorkflowConfigurations
muhammad-ali-e Feb 29, 2024
f71a405
Merge branch 'main' into feature/OCR-Tool
vishnuszipstack Feb 29, 2024
8b263ed
Changed service name for document in docker compose (#17)
ritwik-g Feb 29, 2024
fc395a1
Conflict fix and additional case for connection error
athul-rs Feb 29, 2024
cd136e6
Merge branch 'main' into feature/OCR-Tool
vishnuszipstack Feb 29, 2024
4f466d6
Merge branch 'main' into fix/exception-handling-workflows
athul-rs Feb 29, 2024
8484bf6
PR comments addressed
vishnuszipstack Feb 29, 2024
b596dd3
Merge pull request #4 from Zipstack/fix/exception-handling-workflows
nehabagdia Feb 29, 2024
157a6a5
Merge branch 'main' into fix/RemoveWorkflowConfigurations
nehabagdia Feb 29, 2024
9101eab
Merge pull request #16 from Zipstack/fix/RemoveWorkflowConfigurations
nehabagdia Feb 29, 2024
77adf4f
Merge branch 'main' into feature/OCR-Tool
nehabagdia Feb 29, 2024
29df7ef
Merge branch 'main' into onboarding-page-alignment-fix
nehabagdia Feb 29, 2024
0071dd8
Merge pull request #15 from Zipstack/feature/OCR-Tool
nehabagdia Feb 29, 2024
42817ab
Merge branch 'main' into onboarding-page-alignment-fix
nehabagdia Feb 29, 2024
9a90409
Merge pull request #6 from Zipstack/onboarding-page-alignment-fix
nehabagdia Feb 29, 2024
af8134f
Merge branch 'main' into feature/App-Deployment-Chat-Engine
ritwik-g Feb 29, 2024
a01ff45
Added docker fixes
ritwik-g Feb 29, 2024
efd53fb
Merge branch 'feature/App-Deployment' into feature/App-Deployment-Doc…
ritwik-g Feb 29, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions backend/workflow_manager/workflow/execution.py
Original file line number Diff line number Diff line change
Expand Up @@ -449,7 +449,4 @@ def convert_tool_instance_model_to_data_class(
def convert_workflow_model_to_data_class(
workflow: Workflow,
) -> WorkflowDto:
return WorkflowDto(
id=workflow.id,
settings=workflow.settings,
)
return WorkflowDto(id=workflow.id)
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# Generated by Django 4.2.1 on 2024-02-28 11:29

from django.db import migrations


class Migration(migrations.Migration):
dependencies = [
("workflow", "0001_initial"),
]

operations = [
migrations.RemoveField(
model_name="workflow",
name="settings",
),
]
1 change: 0 additions & 1 deletion backend/workflow_manager/workflow/models/workflow.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ class ExecutionAction(models.TextChoices):
max_length=DESCRIPTION_FIELD_LENGTH, default=""
)
workflow_name = models.CharField(max_length=WORKFLOW_NAME_SIZE, unique=True)
settings = models.JSONField(null=True, db_comment="Workflow settings")
prompt_text = models.TextField(default="")
is_active = models.BooleanField(default=False)
status = models.CharField(max_length=WORKFLOW_STATUS_LENGTH, default="")
Expand Down
15 changes: 0 additions & 15 deletions backend/workflow_manager/workflow/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,6 @@
{"get": "clear_file_marker"}
)
workflow_schema = WorkflowViewSet.as_view({"get": "get_schema"})
workflow_settings = WorkflowViewSet.as_view(
{"get": "workflow_settings", "put": "workflow_settings"}
)
workflow_settings_schema = WorkflowViewSet.as_view(
{"get": "workflow_settings_schema"}
)

urlpatterns = format_suffix_patterns(
[
path("", workflow_list, name="workflow-list"),
Expand Down Expand Up @@ -64,13 +57,5 @@
workflow_schema,
name="workflow-schema",
),
path(
"<uuid:pk>/settings/", workflow_settings, name="workflow-settings"
),
path(
"settings/",
workflow_settings_schema,
name="workflow-settings-schema",
),
]
)
36 changes: 2 additions & 34 deletions backend/workflow_manager/workflow/views.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
import logging
from typing import Any, Optional

from backend.constants import RequestKey
from connector.connector_instance_helper import ConnectorInstanceHelper
from django.conf import settings
from django.db.models.query import QuerySet
from django.http import HttpRequest
from permissions.permission import IsOwner
from pipeline.models import Pipeline
from pipeline.pipeline_processor import PipelineProcessor
Expand All @@ -16,7 +14,6 @@
from rest_framework.versioning import URLPathVersioning
from tool_instance.tool_processor import ToolProcessor
from unstract.tool_registry.dto import Tool
from unstract.tool_registry.tool_registry import ToolRegistry
from utils.filtering import FilterHelper
from workflow_manager.endpoint.destination import DestinationConnector
from workflow_manager.endpoint.endpoint_utils import WorkflowEndpointUtils
Expand All @@ -27,7 +24,6 @@
from workflow_manager.workflow.exceptions import (
InvalidRequest,
WorkflowDoesNotExistError,
WorkflowExecutionBadRequestException,
WorkflowExecutionError,
WorkflowGenerationError,
WorkflowRegenerationError,
Expand All @@ -45,6 +41,8 @@
WorkflowSchemaHelper,
)

from backend.constants import RequestKey

logger = logging.getLogger(__name__)


Expand Down Expand Up @@ -351,33 +349,3 @@ def get_schema(
schema_type=schema_type, schema_entity=schema_entity
)
return Response(data=json_schema, status=status.HTTP_200_OK)

@action(detail=True, methods=["GET"])
def workflow_settings_schema(self, request: HttpRequest) -> Response:
tool_registry = ToolRegistry()
schema = tool_registry.get_project_settings_schema()
return Response(schema)

@action(detail=True, methods=["GET", "PUT"])
def workflow_settings(self, request: HttpRequest, pk: str) -> Response:
workflow = self.get_object()
tool_registry = ToolRegistry()
if request.method == "GET":
schema = tool_registry.get_project_settings_schema()
return Response({"schema": schema, "settings": workflow.settings})

elif request.method == "PUT":
schema = tool_registry.get_project_settings_schema()

try:
tool_registry.validate_schema_with_data(request.data, schema)
except Exception as e:
logger.error(f"Invalid input data {str(e)}")
raise WorkflowExecutionBadRequestException("Invalid input")

workflow.settings = request.data
workflow.save()
return Response(
{"message": "Settings updated successfully"},
status=status.HTTP_200_OK,
)
Empty file.

This file was deleted.

10 changes: 0 additions & 10 deletions frontend/src/components/agency/configuration/Configuration.css

This file was deleted.

135 changes: 0 additions & 135 deletions frontend/src/components/agency/configuration/Configuration.jsx

This file was deleted.

20 changes: 1 addition & 19 deletions frontend/src/layouts/menu-layout/MenuLayout.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,17 @@ import { useEffect, useState, useRef } from "react";
import { useLocation, useNavigate } from "react-router-dom";
import PropTypes from "prop-types";
import { Button, Space, Typography } from "antd";
import {
ArrowLeftOutlined,
ToolOutlined,
QuestionCircleOutlined,
} from "@ant-design/icons";
import { ArrowLeftOutlined, QuestionCircleOutlined } from "@ant-design/icons";

import "./MenuLayout.css";
import { useSessionStore } from "../../store/session-store";
import { useWorkflowStore } from "../../store/workflow-store";
import { ConfigurationModal } from "../../components/agency/configuration-modal/ConfigurationModal";

function MenuLayout({ children }) {
const navigate = useNavigate();
const location = useLocation();
const currentMenu = useRef();
const [activeTab, setActiveTab] = useState("");
const [openConfigModal, setOpenConfigModal] = useState(false);
const { sessionDetails } = useSessionStore();
const { projectName } = useWorkflowStore();

Expand Down Expand Up @@ -51,14 +45,6 @@ function MenuLayout({ children }) {
</div>
<div>
<Space>
<Button
onClick={() => setOpenConfigModal((prev) => !prev)}
key="configuration"
icon={<ToolOutlined />}
disabled={false}
>
Configuration
</Button>
<Button
key="help"
icon={<QuestionCircleOutlined />}
Expand All @@ -73,10 +59,6 @@ function MenuLayout({ children }) {
<div className="appBody">
<div className="appBody2">{children}</div>
</div>
<ConfigurationModal
isOpen={openConfigModal}
setOpen={setOpenConfigModal}
/>
</>
);
}
Expand Down
Loading