From 477c72ca3a28cd4ce684ecc2432e7bea0743773a Mon Sep 17 00:00:00 2001
From: Hetavi Shah <hetavi.shah@bluexkye.com>
Date: Mon, 1 Dec 2025 12:39:27 +0530
Subject: [PATCH] [OND211-2329]: Fixed import issues and ruff checks.

---
 api/apps/canvas_app.py | 14 ++++----------
 api/apps/kb_app.py     |  6 +++---
 api/apps/tenant_app.py | 10 ++--------
 3 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/api/apps/canvas_app.py b/api/apps/canvas_app.py
index 56314d026..18e237685 100644
--- a/api/apps/canvas_app.py
+++ b/api/apps/canvas_app.py
@@ -52,19 +52,13 @@ from api.db.services.user_canvas_version import UserCanvasVersionService
 from api.utils.api_utils import (
     get_data_error_result,
     get_json_result,
-    request_json,
+    get_request_json,
     server_error_response,
     validate_request,
 )
 from common import settings
 from common.constants import RetCode, StatusEnum
 from common.misc_utils import get_uuid
-from api.utils.api_utils import get_json_result, server_error_response, validate_request, get_data_error_result, \
-    get_request_json
-from agent.canvas import Canvas
-from peewee import MySQLDatabase, PostgresqlDatabase
-from api.db.db_models import APIToken, Task
-import time
 
 from rag.flow.pipeline import Pipeline
 from rag.nlp import search
@@ -97,7 +91,7 @@ async def rm():
 @validate_request("dsl", "title")
 @login_required
 async def save() -> Any:
-    req: Dict[str, Any] = await request_json()
+    req: Dict[str, Any] = await get_request_json()
     if not isinstance(req["dsl"], str):
         req["dsl"] = json.dumps(req["dsl"], ensure_ascii=False)
     req["dsl"] = json.loads(req["dsl"])
@@ -292,7 +286,7 @@ def cancel(task_id):
 @validate_request("id")
 @login_required
 async def reset():
-    req = await request_json()
+    req = await get_request_json()
     # Check update permission (to reset the canvas)
     if not UserCanvasService.accessible(req["id"], current_user.id, required_permission="update"):
         return get_json_result(
@@ -354,7 +348,7 @@ def input_form():
 @validate_request("id", "component_id", "params")
 @login_required
 async def debug():
-    req = await request_json()
+    req = await get_request_json()
     # Check read permission (to debug the canvas)
     if not UserCanvasService.accessible(req["id"], current_user.id, required_permission="read"):
         return get_json_result(
diff --git a/api/apps/kb_app.py b/api/apps/kb_app.py
index 5b323881f..ca8021bbf 100644
--- a/api/apps/kb_app.py
+++ b/api/apps/kb_app.py
@@ -30,7 +30,7 @@ from api.db.services.file_service import FileService
 from api.db.services.pipeline_operation_log_service import PipelineOperationLogService
 from api.db.services.task_service import TaskService, GRAPH_RAPTOR_FAKE_DOC_ID
 from api.db.services.user_service import TenantService, UserTenantService
-from api.utils.api_utils import get_error_data_result, server_error_response, get_data_error_result, validate_request, not_allowed_parameters, request_json
+from api.utils.api_utils import get_error_data_result, server_error_response, get_data_error_result, validate_request, not_allowed_parameters, get_request_json
 from api.db import VALID_FILE_TYPES, UserTenantRole
 from api.db.services.knowledgebase_service import KnowledgebaseService
 from api.db.db_models import File
@@ -49,7 +49,7 @@ from api.apps import login_required, current_user
 @login_required
 @validate_request("name")
 async def create() -> Any:
-    req: Dict[str, Any] = await request_json()
+    req: Dict[str, Any] = await get_request_json()
     
     # Validate shared_tenant_id if provided
     shared_tenant_id: Optional[str] = req.get("shared_tenant_id")
@@ -308,7 +308,7 @@ async def list_kbs():
 @login_required
 @validate_request("kb_id")
 async def rm():
-    req = await request_json()
+    req = await get_request_json()
     # Check if user has delete permission
     if not KnowledgebaseService.accessible4deletion(req["kb_id"], current_user.id):
         return get_json_result(
diff --git a/api/apps/tenant_app.py b/api/apps/tenant_app.py
index 8111f0e8a..aa9b02a06 100644
--- a/api/apps/tenant_app.py
+++ b/api/apps/tenant_app.py
@@ -31,15 +31,12 @@ from api.common.permission_utils import (
     get_user_permissions as get_member_permissions,
     update_user_permissions as update_member_permissions,
 )
-from api.db import FileType, UserTenantRole
-from api.db.db_models import UserTenant
+from api.db import FileType
 from api.db.services.file_service import FileService
 from api.db.services.llm_service import get_init_tenant_llm
 from api.db.services.tenant_llm_service import TenantLLMService
 from api.db.services.user_service import (
     TenantService,
-    UserService,
-    UserTenantService,
 )
 from api.utils.api_utils import (
     get_data_error_result,
@@ -52,10 +49,7 @@ from common import settings
 from common.constants import RetCode, StatusEnum
 from common.misc_utils import get_uuid
 from common.time_utils import delta_seconds
-from api.utils.api_utils import get_data_error_result, get_json_result, get_request_json, server_error_response, validate_request
-from api.utils.web_utils import send_invite_email
-from common import settings
-from api.apps import smtp_mail_server, login_required, current_user
+from api.utils.api_utils import get_request_json
 
 # manager = Blueprint("tenant", __name__)
 def is_team_admin_or_owner(tenant_id: str, user_id: str) -> bool: