vrr/SurfSense
2
0
Fork 0
mirror of https://github.com/MODSetter/SurfSense.git synced 2026-05-05 23:42:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fix: resolve graphql complexity, json extraction, kb sync, and ui prefill for linear HIL

Browse source
This commit is contained in:
CREDO23 2026-02-19 18:30:20 +02:00
parent d4e2ebb99f
commit c8413ee2bf
12 changed files with 269 additions and 213 deletions
Download patch file Download diff file Expand all files Collapse all files

13
surfsense_backend/app/agents/new_chat/tools/linear/create_issue.py
View file

@ -5,7 +5,7 @@ from langchain_core.tools import tool
from langgraph.types import interrupt
from sqlalchemy.ext.asyncio import AsyncSession
from app.connectors.linear_connector import LinearConnector
from app.connectors.linear_connector import LinearAPIError, LinearConnector
from app.services.linear import LinearToolMetadataService
logger = logging.getLogger(__name__)
@ -230,11 +230,10 @@ def create_create_linear_issue_tool(
raise
logger.error(f"Error creating Linear issue: {e}", exc_info=True)
return {
"status": "error",
"message": str(e)
if isinstance(e, ValueError)
else f"Unexpected error: {e!s}",
}
if isinstance(e, (ValueError, LinearAPIError)):
message = str(e)
else:
message = "Something went wrong while creating the issue. Please try again."
return {"status": "error", "message": message}
return create_linear_issue

13
surfsense_backend/app/agents/new_chat/tools/linear/delete_issue.py
View file

@ -5,7 +5,7 @@ from langchain_core.tools import tool
from langgraph.types import interrupt
from sqlalchemy.ext.asyncio import AsyncSession
from app.connectors.linear_connector import LinearConnector
from app.connectors.linear_connector import LinearAPIError, LinearConnector
from app.services.linear import LinearToolMetadataService
logger = logging.getLogger(__name__)
@ -253,11 +253,10 @@ def create_delete_linear_issue_tool(
raise
logger.error(f"Error deleting Linear issue: {e}", exc_info=True)
return {
"status": "error",
"message": str(e)
if isinstance(e, ValueError)
else f"Unexpected error: {e!s}",
}
if isinstance(e, (ValueError, LinearAPIError)):
message = str(e)
else:
message = "Something went wrong while deleting the issue. Please try again."
return {"status": "error", "message": message}
return delete_linear_issue

13
surfsense_backend/app/agents/new_chat/tools/linear/update_issue.py
View file

@ -5,7 +5,7 @@ from langchain_core.tools import tool
from langgraph.types import interrupt
from sqlalchemy.ext.asyncio import AsyncSession
from app.connectors.linear_connector import LinearConnector
from app.connectors.linear_connector import LinearAPIError, LinearConnector
from app.services.linear import LinearKBSyncService, LinearToolMetadataService
logger = logging.getLogger(__name__)
@ -290,12 +290,11 @@ def create_update_linear_issue_tool(
raise
logger.error(f"Error updating Linear issue: {e}", exc_info=True)
return {
"status": "error",
"message": str(e)
if isinstance(e, ValueError)
else f"Unexpected error: {e!s}",
}
if isinstance(e, (ValueError, LinearAPIError)):
message = str(e)
else:
message = "Something went wrong while updating the issue. Please try again."
return {"status": "error", "message": message}
return update_linear_issue

13
surfsense_backend/app/agents/new_chat/tools/notion/create_page.py
View file

@ -5,7 +5,7 @@ from langchain_core.tools import tool
from langgraph.types import interrupt
from sqlalchemy.ext.asyncio import AsyncSession
from app.connectors.notion_history import NotionHistoryConnector
from app.connectors.notion_history import NotionAPIError, NotionHistoryConnector
from app.services.notion import NotionToolMetadataService
logger = logging.getLogger(__name__)
@ -224,11 +224,10 @@ def create_create_notion_page_tool(
raise
logger.error(f"Error creating Notion page: {e}", exc_info=True)
return {
"status": "error",
"message": str(e)
if isinstance(e, ValueError)
else f"Unexpected error: {e!s}",
}
if isinstance(e, (ValueError, NotionAPIError)):
message = str(e)
else:
message = "Something went wrong while creating the page. Please try again."
return {"status": "error", "message": message}
return create_notion_page

13
surfsense_backend/app/agents/new_chat/tools/notion/delete_page.py
View file

@ -5,7 +5,7 @@ from langchain_core.tools import tool
from langgraph.types import interrupt
from sqlalchemy.ext.asyncio import AsyncSession
from app.connectors.notion_history import NotionHistoryConnector
from app.connectors.notion_history import NotionAPIError, NotionHistoryConnector
from app.services.notion.tool_metadata_service import NotionToolMetadataService
logger = logging.getLogger(__name__)
@ -262,11 +262,10 @@ def create_delete_notion_page_tool(
raise
logger.error(f"Error deleting Notion page: {e}", exc_info=True)
return {
"status": "error",
"message": str(e)
if isinstance(e, ValueError)
else f"Unexpected error: {e!s}",
}
if isinstance(e, (ValueError, NotionAPIError)):
message = str(e)
else:
message = "Something went wrong while deleting the page. Please try again."
return {"status": "error", "message": message}
return delete_notion_page

13
surfsense_backend/app/agents/new_chat/tools/notion/update_page.py
View file

@ -5,7 +5,7 @@ from langchain_core.tools import tool
from langgraph.types import interrupt
from sqlalchemy.ext.asyncio import AsyncSession
from app.connectors.notion_history import NotionHistoryConnector
from app.connectors.notion_history import NotionAPIError, NotionHistoryConnector
from app.services.notion import NotionToolMetadataService
logger = logging.getLogger(__name__)
@ -261,11 +261,10 @@ def create_update_notion_page_tool(
raise
logger.error(f"Error updating Notion page: {e}", exc_info=True)
return {
"status": "error",
"message": str(e)
if isinstance(e, ValueError)
else f"Unexpected error: {e!s}",
}
if isinstance(e, (ValueError, NotionAPIError)):
message = str(e)
else:
message = "Something went wrong while updating the page. Please try again."
return {"status": "error", "message": message}
return update_notion_page

43
surfsense_backend/app/connectors/linear_connector.py
View file

@ -22,6 +22,14 @@ logger = logging.getLogger(__name__)
LINEAR_GRAPHQL_URL = "https://api.linear.app/graphql"
class LinearAPIError(Exception):
"""Raised when the Linear API returns a non-200 response.
The message is always user-presentable; callers should surface it directly
without any additional prefix or wrapping.
"""
ORGANIZATION_QUERY = """
query {
organization {
@ -243,6 +251,37 @@ class LinearConnector:
"Authorization": f"Bearer {self._credentials.access_token}",
}
@staticmethod
def _raise_api_error(status_code: int, body: str) -> None:
"""Parse a non-200 Linear API response and raise a clean exception.
Translates known Linear error codes into user-readable messages so that
raw GraphQL payloads never reach the end user.
"""
import json as _json
friendly = None
try:
payload = _json.loads(body)
errors = payload.get("errors", [])
if errors:
ext = errors[0].get("extensions", {})
code = ext.get("code", "")
if code == "INPUT_ERROR" and "too complex" in errors[0].get("message", "").lower():
friendly = (
"Linear rejected the request because the workspace is too large "
"to fetch in one query. Please try again — if the problem persists, "
"contact support."
)
elif ext.get("userPresentableMessage"):
friendly = ext["userPresentableMessage"]
elif errors[0].get("message"):
friendly = errors[0]["message"]
except Exception:
pass
raise LinearAPIError(friendly or f"Linear API error (HTTP {status_code})")
async def execute_graphql_query(
self, query: str, variables: dict[str, Any] | None = None
) -> dict[str, Any]:
@ -281,9 +320,7 @@ class LinearConnector:
if response.status_code == 200:
return response.json()
else:
raise Exception(
f"Query failed with status code {response.status_code}: {response.text}"
)
self._raise_api_error(response.status_code, response.text)
async def get_all_issues(
self, include_comments: bool = True

14
surfsense_backend/app/connectors/notion_history.py
View file

@ -17,6 +17,15 @@ from app.utils.oauth_security import TokenEncryption
logger = logging.getLogger(__name__)
class NotionAPIError(Exception):
"""Raised when the Notion API returns a non-200 response.
The message is always user-presentable; callers should surface it directly
without any additional prefix or wrapping.
"""
# Type variable for generic return type
T = TypeVar("T")
@ -250,8 +259,9 @@ class NotionHistoryConnector:
logger.error(
f"Failed to refresh Notion token for connector {self._connector_id}: {e!s}"
)
raise Exception(
f"Failed to refresh Notion OAuth credentials: {e!s}"
raise NotionAPIError(
"Failed to refresh your Notion connection. "
"Please try again or reconnect your Notion account."
) from e
return self._credentials.access_token

10
surfsense_backend/app/services/linear/kb_sync_service.py
View file

@ -78,7 +78,7 @@ class LinearKBSyncService:
issue_identifier = formatted_issue.get("identifier", "")
issue_title = formatted_issue.get("title", "")
state = formatted_issue.get("state", "Unknown")
priority = issue_raw.get("priority", 0)
priority = issue_raw.get("priorityLabel", "Unknown")
comment_count = len(formatted_issue.get("comments", []))
description = formatted_issue.get("description", "")
@ -125,16 +125,20 @@ class LinearKBSyncService:
issue_content, search_space_id
)
document.embedding = summary_embedding
from sqlalchemy.orm.attributes import flag_modified
document.document_metadata = {
**document.document_metadata,
**(document.document_metadata or {}),
"issue_id": issue_id,
"issue_identifier": issue_identifier,
"issue_title": issue_title,
"state": state,
"priority": priority,
"comment_count": comment_count,
"indexed_at": datetime.now().strftime("%Y-%m-%d %H:%M:%S"),
"connector_id": connector_id,
}
flag_modified(document, "document_metadata")
safe_set_chunks(document, chunks)
document.updated_at = get_current_timestamp()
@ -159,7 +163,7 @@ class LinearKBSyncService:
query = """
query LinearIssueSync($id: String!) {
issue(id: $id) {
id identifier title description priority
id identifier title description priority priorityLabel
createdAt updatedAt url
state { id name type color }
creator { id name email }

24
surfsense_backend/app/services/linear/tool_metadata_service.py
View file

@ -237,7 +237,7 @@ class LinearToolMetadataService:
"""Fetch all teams with their states, members, and labels."""
query = """
query {
teams {
teams(first: 25) {
nodes {
id name key
states { nodes { id name type color position } }
@ -248,7 +248,19 @@ class LinearToolMetadataService:
}
"""
result = await client.execute_graphql_query(query)
return result.get("data", {}).get("teams", {}).get("nodes", [])
raw_teams = result.get("data", {}).get("teams", {}).get("nodes", [])
return [
{
"id": t.get("id"),
"name": t.get("name"),
"key": t.get("key"),
"states": (t.get("states") or {}).get("nodes", []),
"members": (t.get("members") or {}).get("nodes", []),
"labels": (t.get("labels") or {}).get("nodes", []),
}
for t in raw_teams
]
@staticmethod
async def _fetch_issue_context(
@ -296,11 +308,15 @@ class LinearToolMetadataService:
SearchSourceConnector.user_id == user_id,
or_(
func.lower(
Document.document_metadata["issue_title"].astext
Document.document_metadata.op("->>")(
"issue_title"
)
)
== ref_lower,
func.lower(
Document.document_metadata["issue_identifier"].astext
Document.document_metadata.op("->>")(
"issue_identifier"
)
)
== ref_lower,
func.lower(Document.title) == ref_lower,

2
surfsense_web/components/tool-ui/linear/create-linear-issue.tsx
View file

@ -227,7 +227,7 @@ function ApprovalCard({
<SelectContent>
{workspaces.map((w) => (
<SelectItem key={w.id} value={String(w.id)}>
{w.organization_name}
{w.name}
</SelectItem>
))}
</SelectContent>

311
surfsense_web/components/tool-ui/linear/update-linear-issue.tsx
View file

@ -150,28 +150,31 @@ function ApprovalCard({
const priorities = context?.priorities ?? [];
const issue = context?.issue;
const initialEditState = {
title: actionArgs.new_title ? String(actionArgs.new_title) : (issue?.title ?? ""),
description: actionArgs.new_description
? String(actionArgs.new_description)
: (issue?.description ?? ""),
stateId: actionArgs.new_state_id
? String(actionArgs.new_state_id)
: (issue?.current_state?.id ?? "__none__"),
assigneeId: actionArgs.new_assignee_id
? String(actionArgs.new_assignee_id)
: (issue?.current_assignee?.id ?? "__none__"),
priority:
actionArgs.new_priority != null
? String(actionArgs.new_priority)
: String(issue?.priority ?? 0),
labelIds: Array.isArray(actionArgs.new_label_ids)
? (actionArgs.new_label_ids as string[])
: (issue?.current_labels?.map((l) => l.id) ?? []),
};
const [decided, setDecided] = useState<"approve" | "reject" | "edit" | null>(
interruptData.__decided__ ?? null
);
const [isEditing, setIsEditing] = useState(false);
const [editedTitle, setEditedTitle] = useState(
actionArgs.new_title ? String(actionArgs.new_title) : ""
);
const [editedDescription, setEditedDescription] = useState(
actionArgs.new_description ? String(actionArgs.new_description) : ""
);
const [selectedStateId, setSelectedStateId] = useState(
actionArgs.new_state_id ? String(actionArgs.new_state_id) : "__none__"
);
const [selectedAssigneeId, setSelectedAssigneeId] = useState(
actionArgs.new_assignee_id ? String(actionArgs.new_assignee_id) : "__none__"
);
const [selectedPriority, setSelectedPriority] = useState(
actionArgs.new_priority != null ? String(actionArgs.new_priority) : "__none__"
);
const [selectedLabelIds, setSelectedLabelIds] = useState<string[]>(
Array.isArray(actionArgs.new_label_ids) ? (actionArgs.new_label_ids as string[]) : []
);
const [editedArgs, setEditedArgs] = useState(initialEditState);
const reviewConfig = interruptData.review_configs[0];
const allowedDecisions = reviewConfig?.allowed_decisions ?? ["approve", "reject"];
@ -203,12 +206,13 @@ function ApprovalCard({
issue_id: issue?.id,
document_id: issue?.document_id,
connector_id: context?.workspace?.id,
new_title: editedTitle || null,
new_description: editedDescription || null,
new_state_id: selectedStateId === "__none__" ? null : selectedStateId,
new_assignee_id: selectedAssigneeId === "__none__" ? null : selectedAssigneeId,
new_priority: selectedPriority === "__none__" ? null : Number(selectedPriority),
new_label_ids: labelsWereProposed || selectedLabelIds.length > 0 ? selectedLabelIds : null,
new_title: editedArgs.title || null,
new_description: editedArgs.description || null,
new_state_id: editedArgs.stateId === "__none__" ? null : editedArgs.stateId,
new_assignee_id: editedArgs.assigneeId === "__none__" ? null : editedArgs.assigneeId,
new_priority: Number(editedArgs.priority),
new_label_ids:
labelsWereProposed || editedArgs.labelIds.length > 0 ? editedArgs.labelIds : null,
};
}
@ -411,126 +415,134 @@ function ApprovalCard({
>
New Title
</label>
<Input
id="linear-update-title"
value={editedTitle}
onChange={(e) => setEditedTitle(e.target.value)}
placeholder="Leave empty to keep current title"
/>
</div>
<Input
id="linear-update-title"
value={editedArgs.title}
onChange={(e) => setEditedArgs({ ...editedArgs, title: e.target.value })}
placeholder="Issue title"
/>
</div>
<div>
<label
htmlFor="linear-update-description"
className="text-xs font-medium text-muted-foreground mb-1.5 block"
>
New Description
</label>
<Textarea
id="linear-update-description"
value={editedDescription}
onChange={(e) => setEditedDescription(e.target.value)}
placeholder="Leave empty to keep current description"
rows={5}
className="resize-none"
/>
</div>
<div>
<label
htmlFor="linear-update-description"
className="text-xs font-medium text-muted-foreground mb-1.5 block"
>
Description
</label>
<Textarea
id="linear-update-description"
value={editedArgs.description}
onChange={(e) => setEditedArgs({ ...editedArgs, description: e.target.value })}
placeholder="Issue description"
rows={5}
className="resize-none"
/>
</div>
{team && (
<>
<div className="space-y-1.5">
<div className="text-xs font-medium text-muted-foreground">State</div>
<Select value={selectedStateId} onValueChange={setSelectedStateId}>
<SelectTrigger className="w-full">
<SelectValue placeholder="Unchanged" />
</SelectTrigger>
<SelectContent>
<SelectItem value="__none__">Unchanged</SelectItem>
{team.states.map((s) => (
<SelectItem key={s.id} value={s.id}>
{s.name}
{team && (
<>
<div className="space-y-1.5">
<div className="text-xs font-medium text-muted-foreground">State</div>
<Select
value={editedArgs.stateId}
onValueChange={(v) => setEditedArgs({ ...editedArgs, stateId: v })}
>
<SelectTrigger className="w-full">
<SelectValue placeholder="Select state" />
</SelectTrigger>
<SelectContent>
{team.states.map((s) => (
<SelectItem key={s.id} value={s.id}>
{s.name}
</SelectItem>
))}
</SelectContent>
</Select>
</div>
<div className="space-y-1.5">
<div className="text-xs font-medium text-muted-foreground">Assignee</div>
<Select
value={editedArgs.assigneeId}
onValueChange={(v) => setEditedArgs({ ...editedArgs, assigneeId: v })}
>
<SelectTrigger className="w-full">
<SelectValue placeholder="Select assignee" />
</SelectTrigger>
<SelectContent>
<SelectItem value="__none__">Unassigned</SelectItem>
{team.members
.filter((m) => m.active)
.map((m) => (
<SelectItem key={m.id} value={m.id}>
{m.name} ({m.email})
</SelectItem>
))}
</SelectContent>
</Select>
</div>
</SelectContent>
</Select>
</div>
<div className="space-y-1.5">
<div className="text-xs font-medium text-muted-foreground">Priority</div>
<Select
value={editedArgs.priority}
onValueChange={(v) => setEditedArgs({ ...editedArgs, priority: v })}
>
<SelectTrigger className="w-full">
<SelectValue placeholder="Select priority" />
</SelectTrigger>
<SelectContent>
{priorities.map((p) => (
<SelectItem key={p.priority} value={String(p.priority)}>
{p.label}
</SelectItem>
))}
</SelectContent>
</Select>
</div>
{team.labels.length > 0 && (
<div className="space-y-1.5">
<div className="text-xs font-medium text-muted-foreground">Assignee</div>
<Select value={selectedAssigneeId} onValueChange={setSelectedAssigneeId}>
<SelectTrigger className="w-full">
<SelectValue placeholder="Unchanged" />
</SelectTrigger>
<SelectContent>
<SelectItem value="__none__">Unchanged</SelectItem>
{team.members
.filter((m) => m.active)
.map((m) => (
<SelectItem key={m.id} value={m.id}>
{m.name} ({m.email})
</SelectItem>
))}
</SelectContent>
</Select>
</div>
<div className="space-y-1.5">
<div className="text-xs font-medium text-muted-foreground">Priority</div>
<Select value={selectedPriority} onValueChange={setSelectedPriority}>
<SelectTrigger className="w-full">
<SelectValue placeholder="Unchanged" />
</SelectTrigger>
<SelectContent>
<SelectItem value="__none__">Unchanged</SelectItem>
{priorities.map((p) => (
<SelectItem key={p.priority} value={String(p.priority)}>
{p.label}
</SelectItem>
))}
</SelectContent>
</Select>
</div>
{team.labels.length > 0 && (
<div className="space-y-1.5">
<div className="text-xs font-medium text-muted-foreground">Labels</div>
<div className="flex flex-wrap gap-1.5">
{team.labels.map((label) => {
const isSelected = selectedLabelIds.includes(label.id);
return (
<button
key={label.id}
type="button"
onClick={() =>
setSelectedLabelIds((prev) =>
isSelected
? prev.filter((id) => id !== label.id)
: [...prev, label.id]
)
}
className={`inline-flex items-center gap-1 rounded-full px-2.5 py-0.5 text-xs font-medium transition-opacity ${
isSelected
? "opacity-100 ring-2 ring-foreground/30"
: "opacity-50 hover:opacity-80"
}`}
style={{
backgroundColor: `${label.color}33`,
color: label.color,
}}
>
<span
className="size-1.5 rounded-full"
style={{ backgroundColor: label.color }}
/>
{label.name}
</button>
);
})}
</div>
<div className="text-xs font-medium text-muted-foreground">Labels</div>
<div className="flex flex-wrap gap-1.5">
{team.labels.map((label) => {
const isSelected = editedArgs.labelIds.includes(label.id);
return (
<button
key={label.id}
type="button"
onClick={() =>
setEditedArgs({
...editedArgs,
labelIds: isSelected
? editedArgs.labelIds.filter((id) => id !== label.id)
: [...editedArgs.labelIds, label.id],
})
}
className={`inline-flex items-center gap-1 rounded-full px-2.5 py-0.5 text-xs font-medium transition-opacity ${
isSelected
? "opacity-100 ring-2 ring-foreground/30"
: "opacity-50 hover:opacity-80"
}`}
style={{
backgroundColor: `${label.color}33`,
color: label.color,
}}
>
<span
className="size-1.5 rounded-full"
style={{ backgroundColor: label.color }}
/>
{label.name}
</button>
);
})}
</div>
)}
</>
)}
</div>
)}
</>
)}
</div>
)}
@ -576,27 +588,10 @@ function ApprovalCard({
<Button
size="sm"
variant="outline"
onClick={() => {
setIsEditing(false);
setEditedTitle(actionArgs.new_title ? String(actionArgs.new_title) : "");
setEditedDescription(
actionArgs.new_description ? String(actionArgs.new_description) : ""
);
setSelectedStateId(
actionArgs.new_state_id ? String(actionArgs.new_state_id) : "__none__"
);
setSelectedAssigneeId(
actionArgs.new_assignee_id ? String(actionArgs.new_assignee_id) : "__none__"
);
setSelectedPriority(
actionArgs.new_priority != null ? String(actionArgs.new_priority) : "__none__"
);
setSelectedLabelIds(
Array.isArray(actionArgs.new_label_ids)
? (actionArgs.new_label_ids as string[])
: []
);
}}
onClick={() => {
setIsEditing(false);
setEditedArgs(initialEditState); // Reset to original args
}}
>
Cancel
</Button>