hdsp-jupyter-extension 2.0.3__py3-none-any.whl → 2.0.5__py3-none-any.whl

agent_server/langchain/agent.py

@@ -20,6 +20,43 @@ from agent_server.langchain.tools import (
 
 logger = logging.getLogger(__name__)
 
+DEFAULT_SYSTEM_PROMPT = """You are an expert Python data scientist and Jupyter notebook assistant.
+Your role is to help users with data analysis, visualization, and Python coding tasks in Jupyter notebooks.
+
+## ⚠️ CRITICAL RULE: NEVER produce an empty response
+
+You MUST ALWAYS call a tool in every response. After any tool result, you MUST:
+1. Check your todo list - are there pending or in_progress items?
+2. If YES → call the next appropriate tool (jupyter_cell_tool, markdown_tool, etc.)
+3. If ALL todos are completed → call final_answer_tool with a summary
+
+NEVER end your turn without calling a tool. NEVER produce an empty response.
+
+## Available Tools
+1. **jupyter_cell_tool**: Execute Python code in a new notebook cell
+2. **markdown_tool**: Add a markdown explanation cell
+3. **final_answer_tool**: Complete the task with a summary - REQUIRED when done
+4. **read_file_tool**: Read file contents
+5. **write_file_tool**: Write file contents
+6. **list_files_tool**: List directory contents
+7. **search_workspace_tool**: Search for patterns in workspace files
+8. **search_notebook_cells_tool**: Search for patterns in notebook cells
+9. **write_todos**: Create and update task list for complex multi-step tasks
+
+## Mandatory Workflow
+1. After EVERY tool result, immediately call the next tool
+2. Continue until ALL todos show status: "completed"
+3. ONLY THEN call final_answer_tool to summarize
+4. If `!pip install` fails, use `!pip3 install` instead
+5. For plots and charts, use English text only
+
+## ❌ FORBIDDEN (will break the workflow)
+- Producing an empty response (no tool call, no content)
+- Stopping after any tool without calling the next tool
+- Ending without calling final_answer_tool
+- Leaving todos in "in_progress" or "pending" state without continuing
+"""
+
 
 def _create_llm(llm_config: Dict[str, Any]):
     """Create LangChain LLM from config"""
@@ -107,6 +144,7 @@ def create_simple_chat_agent(
     enable_hitl: bool = True,
     enable_todo_list: bool = True,
     checkpointer: Optional[object] = None,
+    system_prompt_override: Optional[str] = None,
 ):
     """
     Create a simple chat agent using LangChain's create_agent with Human-in-the-Loop.
@@ -642,43 +680,12 @@ NEVER end your response after calling write_todos - always continue with the nex
     middleware.append(list_files_limit)
     logger.info("Added ToolCallLimitMiddleware for write_todos and list_files_tool")
 
-    # System prompt for the agent
-    system_prompt = """You are an expert Python data scientist and Jupyter notebook assistant.
-Your role is to help users with data analysis, visualization, and Python coding tasks in Jupyter notebooks.
-
-## ⚠️ CRITICAL RULE: NEVER produce an empty response
-
-You MUST ALWAYS call a tool in every response. After any tool result, you MUST:
-1. Check your todo list - are there pending or in_progress items?
-2. If YES → call the next appropriate tool (jupyter_cell_tool, markdown_tool, etc.)
-3. If ALL todos are completed → call final_answer_tool with a summary
-
-NEVER end your turn without calling a tool. NEVER produce an empty response.
-
-## Available Tools
-1. **jupyter_cell_tool**: Execute Python code in a new notebook cell
-2. **markdown_tool**: Add a markdown explanation cell
-3. **final_answer_tool**: Complete the task with a summary - REQUIRED when done
-4. **read_file_tool**: Read file contents
-5. **write_file_tool**: Write file contents
-6. **list_files_tool**: List directory contents
-7. **search_workspace_tool**: Search for patterns in workspace files
-8. **search_notebook_cells_tool**: Search for patterns in notebook cells
-9. **write_todos**: Create and update task list for complex multi-step tasks
-
-## Mandatory Workflow
-1. After EVERY tool result, immediately call the next tool
-2. Continue until ALL todos show status: "completed"
-3. ONLY THEN call final_answer_tool to summarize
-4. If `!pip install` fails, use `!pip3 install` instead
-5. For plots and charts, use English text only
-
-## ❌ FORBIDDEN (will break the workflow)
-- Producing an empty response (no tool call, no content)
-- Stopping after any tool without calling the next tool
-- Ending without calling final_answer_tool
-- Leaving todos in "in_progress" or "pending" state without continuing
-"""
+    # System prompt for the agent (override applies only to LangChain agent)
+    if system_prompt_override and system_prompt_override.strip():
+        system_prompt = system_prompt_override.strip()
+        logger.info("SimpleChatAgent using custom system prompt override")
+    else:
+        system_prompt = DEFAULT_SYSTEM_PROMPT
 
     logger.info("SimpleChatAgent system_prompt: %s", system_prompt)
 

agent_server/routers/langchain_agent.py

@@ -33,10 +33,17 @@ router = APIRouter(prefix="/langchain", tags=["langchain-agent"])
 class LLMConfig(BaseModel):
     """LLM configuration"""
 
+    model_config = ConfigDict(populate_by_name=True)
+
     provider: str = Field(default="gemini", description="LLM provider")
     gemini: Optional[Dict[str, Any]] = Field(default=None)
     openai: Optional[Dict[str, Any]] = Field(default=None)
     vllm: Optional[Dict[str, Any]] = Field(default=None)
+    system_prompt: Optional[str] = Field(
+        default=None,
+        alias="systemPrompt",
+        description="Override system prompt for LangChain agent",
+    )
 
 
 class NotebookContext(BaseModel):
@@ -364,6 +371,9 @@ async def stream_agent(request: AgentRequest):
                     config_dict["openai"] = request.llmConfig.openai
                 if request.llmConfig.vllm:
                     config_dict["vllm"] = request.llmConfig.vllm
+            system_prompt_override = (
+                request.llmConfig.system_prompt if request.llmConfig else None
+            )
 
             agent = create_simple_chat_agent(
                 llm_config=config_dict,
@@ -372,6 +382,7 @@ async def stream_agent(request: AgentRequest):
                 checkpointer=_simple_agent_checkpointers.setdefault(
                     thread_id, InMemorySaver()
                 ),
+                system_prompt_override=system_prompt_override,
             )
 
             # Prepare config with thread_id
@@ -392,7 +403,7 @@ async def stream_agent(request: AgentRequest):
             # Initial status: waiting for LLM
             yield {
                 "event": "debug",
-                "data": json.dumps({"status": "🤔 LLM 응답 대기 중..."}),
+                "data": json.dumps({"status": "🤔 LLM 응답 대기 중"}),
             }
 
             for step in agent.stream(agent_input, config, stream_mode="values"):
@@ -406,7 +417,7 @@ async def stream_agent(request: AgentRequest):
 
                     yield {
                         "event": "debug",
-                        "data": json.dumps({"status": "⏸️ 사용자 승인 대기 중..."}),
+                        "data": json.dumps({"status": "⏸️ 사용자 승인 대기 중"}),
                     }
 
                     # Process interrupts
@@ -427,7 +438,8 @@ async def stream_agent(request: AgentRequest):
                                 normalized_actions
                             )
 
-                        for action in normalized_actions:
+                        total_actions = len(normalized_actions)
+                        for idx, action in enumerate(normalized_actions):
                             yield {
                                 "event": "interrupt",
                                 "data": json.dumps(
@@ -436,6 +448,8 @@ async def stream_agent(request: AgentRequest):
                                         "action": action.get("name", "unknown"),
                                         "args": action.get("arguments", {}),
                                         "description": action.get("description", ""),
+                                        "action_index": idx,
+                                        "total_actions": total_actions,
                                     }
                                 ),
                             }
@@ -873,7 +887,7 @@ async def stream_agent(request: AgentRequest):
                             yield {
                                 "event": "debug",
                                 "data": json.dumps(
-                                    {"status": "🔄 Jupyter Cell로 변환 중..."}
+                                    {"status": "🔄 Jupyter Cell로 변환 중"}
                                 ),
                             }
                             yield {
@@ -973,6 +987,9 @@ async def resume_agent(request: ResumeRequest):
                     config_dict["openai"] = request.llmConfig.openai
                 if request.llmConfig.vllm:
                     config_dict["vllm"] = request.llmConfig.vllm
+            system_prompt_override = (
+                request.llmConfig.system_prompt if request.llmConfig else None
+            )
 
             # Create agent (will use same checkpointer)
             agent = create_simple_chat_agent(
@@ -982,16 +999,36 @@ async def resume_agent(request: ResumeRequest):
                 checkpointer=_simple_agent_checkpointers.setdefault(
                     request.threadId, InMemorySaver()
                 ),
+                system_prompt_override=system_prompt_override,
             )
 
             # Prepare config with thread_id
             config = {"configurable": {"thread_id": request.threadId}}
 
             pending_actions = _simple_agent_pending_actions.get(request.threadId, [])
+            num_pending = len(pending_actions)
+            num_decisions = len(request.decisions)
+
+            # If user provides fewer decisions than pending actions,
+            # reject remaining actions to avoid multiple state updates per step
+            # This prevents "Can receive only one value per step" errors for todos
+            decisions_to_process = list(request.decisions)
+            if num_decisions < num_pending and num_decisions > 0:
+                logger.info(
+                    f"Have {num_decisions} decision(s) but {num_pending} pending action(s). "
+                    f"Auto-rejecting remaining {num_pending - num_decisions} action(s)."
+                )
+                # Create reject decisions for remaining actions
+                for i in range(num_pending - num_decisions):
+                    reject_decision = ResumeDecision(
+                        type="reject",
+                        feedback="Auto-rejected: only one action can be processed at a time"
+                    )
+                    decisions_to_process.append(reject_decision)
 
             # Convert decisions to LangChain format
             langgraph_decisions = []
-            for index, decision in enumerate(request.decisions):
+            for index, decision in enumerate(decisions_to_process):
                 if decision.type == "approve":
                     langgraph_decisions.append({"type": "approve"})
                 elif decision.type == "edit":
@@ -1020,7 +1057,7 @@ async def resume_agent(request: ResumeRequest):
             # Resume execution
             yield {
                 "event": "debug",
-                "data": json.dumps({"status": "▶️ 실행 재개 중..."}),
+                "data": json.dumps({"status": "▶️ 실행 재개 중"}),
             }
 
             _simple_agent_pending_actions.pop(request.threadId, None)
@@ -1035,7 +1072,7 @@ async def resume_agent(request: ResumeRequest):
             # Status: waiting for LLM response
             yield {
                 "event": "debug",
-                "data": json.dumps({"status": "🤔 LLM 응답 대기 중..."}),
+                "data": json.dumps({"status": "🤔 LLM 응답 대기 중"}),
             }
 
             step_count = 0
@@ -1059,7 +1096,7 @@ async def resume_agent(request: ResumeRequest):
 
                     yield {
                         "event": "debug",
-                        "data": json.dumps({"status": "⏸️ 사용자 승인 대기 중..."}),
+                        "data": json.dumps({"status": "⏸️ 사용자 승인 대기 중"}),
                     }
 
                     for interrupt in interrupts:
@@ -1077,7 +1114,8 @@ async def resume_agent(request: ResumeRequest):
                                 normalized_actions
                             )
 
-                        for action in normalized_actions:
+                        total_actions = len(normalized_actions)
+                        for idx, action in enumerate(normalized_actions):
                             yield {
                                 "event": "interrupt",
                                 "data": json.dumps(
@@ -1086,6 +1124,8 @@ async def resume_agent(request: ResumeRequest):
                                         "action": action.get("name", "unknown"),
                                         "args": action.get("arguments", {}),
                                         "description": action.get("description", ""),
+                                        "action_index": idx,
+                                        "total_actions": total_actions,
                                     }
                                 ),
                             }

hdsp_agent_core/models/common.py

@@ -6,7 +6,7 @@ Shared data models used across all agent services.
 
 from typing import Any, Dict, List, Optional
 
-from pydantic import BaseModel, Field
+from pydantic import BaseModel, ConfigDict, Field
 
 
 class ToolCall(BaseModel):
@@ -87,9 +87,16 @@ class LLMConfig(BaseModel):
     API keys are managed client-side and passed with each request.
     """
 
+    model_config = ConfigDict(populate_by_name=True)
+
     provider: str = Field(
         default="gemini", description="LLM provider (gemini, openai, vllm)"
     )
     gemini: Optional[GeminiConfig] = Field(default=None, description="Gemini config")
     openai: Optional[OpenAIConfig] = Field(default=None, description="OpenAI config")
     vllm: Optional[VLLMConfig] = Field(default=None, description="vLLM config")
+    system_prompt: Optional[str] = Field(
+        default=None,
+        alias="systemPrompt",
+        description="LangChain system prompt override",
+    )

{hdsp_jupyter_extension-2.0.3.data → hdsp_jupyter_extension-2.0.5.data}/data/share/jupyter/labextensions/hdsp-agent/build_log.json

@@ -722,7 +722,7 @@
             "@mui/material": {},
             "react-markdown": {},
             "hdsp-agent": {
-              "version": "2.0.3",
+              "version": "2.0.5",
               "singleton": true,
               "import": "/Users/a421721/Desktop/hdsp/hdsp_agent/extensions/jupyter/lib/index.js"
             }

{hdsp_jupyter_extension-2.0.3.data → hdsp_jupyter_extension-2.0.5.data}/data/share/jupyter/labextensions/hdsp-agent/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hdsp-agent",
-  "version": "2.0.3",
+  "version": "2.0.5",
   "description": "HDSP Agent JupyterLab Extension - Thin client for Agent Server",
   "keywords": [
     "jupyter",
@@ -126,7 +126,7 @@
       }
     },
     "_build": {
-      "load": "static/remoteEntry.b6d91b150c0800bddfa4.js",
+      "load": "static/remoteEntry.37299706f55c6d46099d.js",
       "extension": "./extension",
       "style": "./style"
     }