Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
6 changes: 5 additions & 1 deletion wren-ai-service/src/pipelines/indexing/instructions.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ def run(self, instructions: list[Instruction], project_id: Optional[str] = ""):

addition = {"project_id": project_id} if project_id else {}

print(f"instructions: {instructions}")

return {
"documents": [
Document(
Expand All @@ -43,7 +45,9 @@ def run(self, instructions: list[Instruction], project_id: Optional[str] = ""):
"is_default": instruction.is_default,
**addition,
},
content=instruction.question,
content="this is a global instruction, so no question is provided"
if instruction.is_default
else instruction.question,
)
for instruction in instructions
]
Expand Down
31 changes: 21 additions & 10 deletions wren-ai-service/src/web/v1/services/instructions.py
Original file line number Diff line number Diff line change
Expand Up @@ -74,16 +74,27 @@ async def index(
trace_id = kwargs.get("trace_id")

try:
instructions = [
Instruction(
id=instruction.id,
instruction=instruction.instruction,
question=question,
is_default=instruction.is_default,
)
for instruction in request.instructions
for question in instruction.questions
]
instructions = []
for instruction in request.instructions:
if instruction.is_default:
instructions.append(
Instruction(
id=instruction.id,
instruction=instruction.instruction,
question="",
is_default=True,
)
)
else:
for question in instruction.questions:
instructions.append(
Instruction(
id=instruction.id,
instruction=instruction.instruction,
question=question,
is_default=False,
)
)

await self._pipelines["instructions_indexing"].run(
project_id=request.project_id,
Expand Down