hdsp-jupyter-extension 2.0.26__py3-none-any.whl → 2.0.28__py3-none-any.whl

agent_server/routers/config.py

@@ -1,19 +1,42 @@
 """
 Config Router - Configuration management endpoints
+
+Provides:
+- GET/POST /config - Legacy full config (backward compatible)
+- GET/POST /config/admin - Admin-only configuration
+- GET/POST /config/user - User-only configuration
+- GET /config/is-admin - Check if running in admin mode
+- GET /config/prompts - Default system prompts
 """
 
-from typing import Any, Dict, List, Optional
+from typing import Any, Dict, Optional
 
 from fastapi import APIRouter, HTTPException
 from hdsp_agent_core.managers.config_manager import ConfigManager
 from pydantic import BaseModel
 
+from agent_server.langchain.agent_prompts.athena_query_prompt import (
+    ATHENA_QUERY_SYSTEM_PROMPT,
+)
+
 # Import prompts from centralized location
-from agent_server.langchain.prompts import DEFAULT_SYSTEM_PROMPT
 from agent_server.langchain.agent_prompts.planner_prompt import PLANNER_SYSTEM_PROMPT
-from agent_server.langchain.agent_prompts.python_developer_prompt import PYTHON_DEVELOPER_SYSTEM_PROMPT
-from agent_server.langchain.agent_prompts.researcher_prompt import RESEARCHER_SYSTEM_PROMPT
-from agent_server.langchain.agent_prompts.athena_query_prompt import ATHENA_QUERY_SYSTEM_PROMPT
+from agent_server.langchain.agent_prompts.python_developer_prompt import (
+    PYTHON_DEVELOPER_SYSTEM_PROMPT,
+)
+from agent_server.langchain.agent_prompts.researcher_prompt import (
+    RESEARCHER_SYSTEM_PROMPT,
+)
+
+# Import new schema models
+from agent_server.routers.config_schema import (
+    AdminConfigResponse,
+    AdminConfigUpdateRequest,
+    IsAdminResponse,
+    UserConfigResponse,
+    UserConfigUpdateRequest,
+    is_admin_mode,
+)
 
 router = APIRouter()
 
@@ -107,6 +130,170 @@ def _mask_api_keys(config: Dict[str, Any]) -> Dict[str, Any]:
     return masked
 
 
+# =============================================================================
+# Admin Mode Detection API
+# =============================================================================
+
+
+@router.get("/is-admin", response_model=IsAdminResponse)
+async def check_admin_mode() -> IsAdminResponse:
+    """
+    Check if the current environment is in admin mode.
+
+    Admin mode is determined by environment variables:
+    - Neither SAGEMAKER_SPACE_NAME nor HDSP_PRJ_ID is set (development env)
+    - OR SAGEMAKER_SPACE_NAME contains 'pl2wadmprj'
+    - OR HDSP_PRJ_ID equals 'pl2wadmprj'
+    """
+    is_admin, reason = is_admin_mode()
+    return IsAdminResponse(isAdmin=is_admin, reason=reason)
+
+
+# =============================================================================
+# Admin Config API
+# =============================================================================
+
+
+@router.get("/admin", response_model=AdminConfigResponse)
+async def get_admin_config() -> AdminConfigResponse:
+    """
+    Get admin configuration (LLM settings, prompts, server URLs).
+
+    API keys are masked for security.
+    """
+    try:
+        config_manager = ConfigManager.get_instance()
+        config = config_manager.get_admin_config()
+
+        # Mask API keys
+        masked_config = _mask_api_keys(config)
+
+        # Also mask embedding API key if present
+        if "embedding" in masked_config and isinstance(
+            masked_config["embedding"], dict
+        ):
+            embedding_config = masked_config["embedding"].copy()
+            if "apiKey" in embedding_config and embedding_config["apiKey"]:
+                key = embedding_config["apiKey"]
+                if len(key) > 8:
+                    embedding_config["apiKey"] = f"{key[:4]}...{key[-4:]}"
+                else:
+                    embedding_config["apiKey"] = "***"
+            masked_config["embedding"] = embedding_config
+
+        return AdminConfigResponse(
+            provider=masked_config.get("provider", "gemini"),
+            gemini=masked_config.get("gemini", {}),
+            openai=masked_config.get("openai", {}),
+            vllm=masked_config.get("vllm", {}),
+            summarization=masked_config.get("summarization", {}),
+            embedding=masked_config.get("embedding", {}),
+            rag=masked_config.get("rag", {}),
+            agentServerUrl=masked_config.get("agentServerUrl", "http://localhost:8000"),
+            agentServerTimeout=masked_config.get("agentServerTimeout", 120.0),
+            prompts=masked_config.get("prompts", {}),
+            useResponsesApi=masked_config.get("useResponsesApi", False),
+            idleTimeout=masked_config.get("idleTimeout", 300),
+        )
+    except Exception as e:
+        raise HTTPException(status_code=500, detail=str(e))
+
+
+@router.post("/admin")
+async def update_admin_config(request: AdminConfigUpdateRequest) -> Dict[str, Any]:
+    """
+    Update admin configuration.
+
+    Only updates provided fields.
+    """
+    try:
+        config_manager = ConfigManager.get_instance()
+
+        # Build update dict from request
+        updates = {}
+        if request.provider is not None:
+            updates["provider"] = request.provider
+        if request.gemini is not None:
+            updates["gemini"] = request.gemini
+        if request.openai is not None:
+            updates["openai"] = request.openai
+        if request.vllm is not None:
+            updates["vllm"] = request.vllm
+        if request.summarization is not None:
+            updates["summarization"] = request.summarization
+        if request.embedding is not None:
+            updates["embedding"] = request.embedding
+        if request.rag is not None:
+            updates["rag"] = request.rag
+        if request.agentServerUrl is not None:
+            updates["agentServerUrl"] = request.agentServerUrl
+        if request.agentServerTimeout is not None:
+            updates["agentServerTimeout"] = request.agentServerTimeout
+        if request.prompts is not None:
+            updates["prompts"] = request.prompts
+        if request.useResponsesApi is not None:
+            updates["useResponsesApi"] = request.useResponsesApi
+        if request.idleTimeout is not None:
+            updates["idleTimeout"] = request.idleTimeout
+
+        if updates:
+            config_manager.update_admin_config(updates)
+
+        return {"status": "success", "message": "Admin configuration updated"}
+    except Exception as e:
+        raise HTTPException(status_code=500, detail=str(e))
+
+
+# =============================================================================
+# User Config API
+# =============================================================================
+
+
+@router.get("/user", response_model=UserConfigResponse)
+async def get_user_config() -> UserConfigResponse:
+    """
+    Get user configuration (preferences).
+    """
+    try:
+        config_manager = ConfigManager.get_instance()
+        config = config_manager.get_user_config()
+
+        return UserConfigResponse(
+            workspaceRoot=config.get("workspaceRoot", ""),
+            temperature=config.get("temperature", 0.7),
+            autoApprove=config.get("autoApprove", False),
+        )
+    except Exception as e:
+        raise HTTPException(status_code=500, detail=str(e))
+
+
+@router.post("/user")
+async def update_user_config(request: UserConfigUpdateRequest) -> Dict[str, Any]:
+    """
+    Update user configuration.
+
+    Only updates provided fields.
+    """
+    try:
+        config_manager = ConfigManager.get_instance()
+
+        # Build update dict from request
+        updates = {}
+        if request.workspaceRoot is not None:
+            updates["workspaceRoot"] = request.workspaceRoot
+        if request.temperature is not None:
+            updates["temperature"] = request.temperature
+        if request.autoApprove is not None:
+            updates["autoApprove"] = request.autoApprove
+
+        if updates:
+            config_manager.update_user_config(updates)
+
+        return {"status": "success", "message": "User configuration updated"}
+    except Exception as e:
+        raise HTTPException(status_code=500, detail=str(e))
+
+
 # =============================================================================
 # Default Prompts API
 # =============================================================================
@@ -115,7 +302,6 @@ def _mask_api_keys(config: Dict[str, Any]) -> Dict[str, Any]:
 class DefaultPromptsResponse(BaseModel):
     """Default prompts response model"""
 
-    single: str  # Single-agent mode system prompt
     planner: str  # Multi-agent: Planner/Coordinator prompt
     python_developer: str  # Multi-agent: Python Developer prompt
     researcher: str  # Multi-agent: Researcher prompt
@@ -125,13 +311,12 @@ class DefaultPromptsResponse(BaseModel):
 @router.get("/prompts", response_model=DefaultPromptsResponse)
 async def get_default_prompts() -> DefaultPromptsResponse:
     """
-    Get default system prompts for all agent modes.
+    Get default system prompts for multi-agent mode.
 
     Returns centralized prompts that frontend can use as defaults.
     This ensures prompts are managed in one place (backend).
     """
     return DefaultPromptsResponse(
-        single=DEFAULT_SYSTEM_PROMPT,
         planner=PLANNER_SYSTEM_PROMPT,
         python_developer=PYTHON_DEVELOPER_SYSTEM_PROMPT,
         researcher=RESEARCHER_SYSTEM_PROMPT,

agent_server/routers/config_schema.py

@@ -0,0 +1,254 @@
+"""
+Config Schema - Pydantic models for Admin/User configuration
+
+Admin Config: LLM settings, prompts, server URLs (managed by administrators)
+User Config: Workspace settings, temperature, auto-approve (user preferences)
+"""
+
+import os
+from enum import Enum
+from typing import Any, Dict, Optional
+
+from pydantic import BaseModel, Field
+
+# =============================================================================
+# Enums
+# =============================================================================
+
+
+class LLMProvider(str, Enum):
+    """Supported LLM providers"""
+
+    GEMINI = "gemini"
+    OPENAI = "openai"
+    VLLM = "vllm"
+
+
+# =============================================================================
+# Admin Config Models
+# =============================================================================
+
+
+class GeminiConfig(BaseModel):
+    """Gemini provider configuration"""
+
+    apiKey: str = ""
+    model: str = "gemini-2.5-pro"
+
+
+class OpenAIConfig(BaseModel):
+    """OpenAI provider configuration"""
+
+    apiKey: str = ""
+    model: str = "gpt-4o"
+
+
+class VLLMConfig(BaseModel):
+    """vLLM/OpenRouter provider configuration"""
+
+    endpoint: str = "http://localhost:8000"
+    apiKey: str = ""
+    model: str = "meta-llama/Llama-2-7b-chat-hf"
+
+
+class SummarizationConfig(BaseModel):
+    """Summarization LLM configuration (optional separate LLM)"""
+
+    enabled: bool = False
+    provider: LLMProvider = LLMProvider.GEMINI
+    model: Optional[str] = None  # If None, use provider's default
+
+
+class EmbeddingConfig(BaseModel):
+    """Embedding model configuration for RAG"""
+
+    provider: str = "openai"
+    model: str = "text-embedding-3-small"
+    apiKey: Optional[str] = None  # If None, use main provider's key
+
+
+class RAGConfig(BaseModel):
+    """RAG/Qdrant configuration"""
+
+    qdrantUrl: str = "http://localhost:6333"
+    collectionName: str = "hdsp_docs"
+
+
+class AgentPromptsConfig(BaseModel):
+    """Custom system prompts for agents"""
+
+    planner: Optional[str] = None
+    python_developer: Optional[str] = None
+    researcher: Optional[str] = None
+    athena_query: Optional[str] = None
+
+
+class AdminConfig(BaseModel):
+    """
+    Administrator-managed configuration.
+
+    Includes:
+    - LLM provider settings (API keys, models)
+    - Summarization LLM settings
+    - Embedding configuration
+    - RAG/Qdrant settings
+    - Agent server URL
+    - Agent prompts
+    - Idle timeout
+    - Use Responses API toggle
+    """
+
+    # LLM Provider Settings
+    provider: LLMProvider = LLMProvider.GEMINI
+    gemini: GeminiConfig = Field(default_factory=GeminiConfig)
+    openai: OpenAIConfig = Field(default_factory=OpenAIConfig)
+    vllm: VLLMConfig = Field(default_factory=VLLMConfig)
+
+    # Summarization LLM (optional separate LLM for context compression)
+    summarization: SummarizationConfig = Field(default_factory=SummarizationConfig)
+
+    # Embedding Configuration
+    embedding: EmbeddingConfig = Field(default_factory=EmbeddingConfig)
+
+    # RAG Configuration
+    rag: RAGConfig = Field(default_factory=RAGConfig)
+
+    # Agent Server Configuration
+    agentServerUrl: str = "http://localhost:8000"
+    agentServerTimeout: float = 120.0
+
+    # Agent Prompts (custom overrides)
+    prompts: AgentPromptsConfig = Field(default_factory=AgentPromptsConfig)
+
+    # Feature Toggles
+    useResponsesApi: bool = False
+    idleTimeout: int = 300  # seconds
+
+
+# =============================================================================
+# User Config Models
+# =============================================================================
+
+
+class UserConfig(BaseModel):
+    """
+    User-managed configuration (preferences).
+
+    Includes:
+    - Workspace root path
+    - Temperature setting
+    - Auto-approve toggle
+    """
+
+    workspaceRoot: str = ""
+    temperature: float = Field(default=0.7, ge=0.0, le=2.0)
+    autoApprove: bool = False
+
+
+# =============================================================================
+# Combined Config
+# =============================================================================
+
+
+class FullConfig(BaseModel):
+    """Full configuration combining admin and user settings"""
+
+    admin: AdminConfig = Field(default_factory=AdminConfig)
+    user: UserConfig = Field(default_factory=UserConfig)
+
+
+# =============================================================================
+# Admin Mode Detection
+# =============================================================================
+
+
+def is_admin_mode() -> tuple[bool, str | None]:
+    """
+    Detect if running in admin mode based on environment variables.
+
+    Admin mode conditions:
+    1. NEITHER SAGEMAKER_SPACE_NAME NOR HDSP_PRJ_ID is set (development environment)
+    2. OR SAGEMAKER_SPACE_NAME contains 'pl2wadmprj' as substring
+    3. OR HDSP_PRJ_ID equals 'pl2wadmprj'
+
+    Returns:
+        tuple[bool, str | None]: (is_admin, reason)
+    """
+    sagemaker_space = os.environ.get("SAGEMAKER_SPACE_NAME")
+    hdsp_prj_id = os.environ.get("HDSP_PRJ_ID")
+
+    # Development environment: neither env var is set
+    if sagemaker_space is None and hdsp_prj_id is None:
+        return True, "development_environment"
+
+    # Check SAGEMAKER_SPACE_NAME contains admin project ID
+    if sagemaker_space and "pl2wadmprj" in sagemaker_space:
+        return True, "sagemaker_admin_space"
+
+    # Check HDSP_PRJ_ID equals admin project ID
+    if hdsp_prj_id == "pl2wadmprj":
+        return True, "hdsp_admin_project"
+
+    return False, None
+
+
+# =============================================================================
+# API Request/Response Models
+# =============================================================================
+
+
+class AdminConfigResponse(BaseModel):
+    """Admin config response (with masked API keys)"""
+
+    provider: str
+    gemini: Dict[str, Any]
+    openai: Dict[str, Any]
+    vllm: Dict[str, Any]
+    summarization: Dict[str, Any]
+    embedding: Dict[str, Any]
+    rag: Dict[str, Any]
+    agentServerUrl: str
+    agentServerTimeout: float
+    prompts: Dict[str, Any]
+    useResponsesApi: bool
+    idleTimeout: int
+
+
+class AdminConfigUpdateRequest(BaseModel):
+    """Admin config update request"""
+
+    provider: Optional[str] = None
+    gemini: Optional[Dict[str, Any]] = None
+    openai: Optional[Dict[str, Any]] = None
+    vllm: Optional[Dict[str, Any]] = None
+    summarization: Optional[Dict[str, Any]] = None
+    embedding: Optional[Dict[str, Any]] = None
+    rag: Optional[Dict[str, Any]] = None
+    agentServerUrl: Optional[str] = None
+    agentServerTimeout: Optional[float] = None
+    prompts: Optional[Dict[str, Any]] = None
+    useResponsesApi: Optional[bool] = None
+    idleTimeout: Optional[int] = None
+
+
+class UserConfigResponse(BaseModel):
+    """User config response"""
+
+    workspaceRoot: str
+    temperature: float
+    autoApprove: bool
+
+
+class UserConfigUpdateRequest(BaseModel):
+    """User config update request"""
+
+    workspaceRoot: Optional[str] = None
+    temperature: Optional[float] = None
+    autoApprove: Optional[bool] = None
+
+
+class IsAdminResponse(BaseModel):
+    """Response for admin mode check"""
+
+    isAdmin: bool
+    reason: Optional[str] = None

agent_server/routers/context.py

@@ -12,7 +12,12 @@ from typing import Optional
 from fastapi import APIRouter, Query
 from pydantic import BaseModel
 
-from agent_server.context_providers import FileContextProvider, ResetContextProvider
+from agent_server.context_providers import (
+    CompactContextProvider,
+    FileContextProvider,
+    HelpContextProvider,
+    ResetContextProvider,
+)
 from agent_server.context_providers.base import ListOptionsResponse
 
 router = APIRouter()
@@ -24,7 +29,9 @@ def _get_all_providers(base_dir: str):
     """Get all available context/action providers."""
     return {
         "@file": FileContextProvider(base_dir=base_dir),
-        "@reset": ResetContextProvider(base_dir=base_dir),
+        "/reset": ResetContextProvider(base_dir=base_dir),
+        "/compact": CompactContextProvider(base_dir=base_dir),
+        "/help": HelpContextProvider(base_dir=base_dir),
     }
 
 
@@ -93,7 +100,7 @@ async def get_autocomplete_options(
             options = provider.get_arg_options(arg_prefix)
             return ListOptionsResponse(options=options)
         else:
-            # For commands without args (like @reset), return the command itself
+            # For commands without args (like /reset), return the command itself
             return ListOptionsResponse(options=[provider.get_provider_option()])
 
     # No matching provider
@@ -145,7 +152,7 @@ async def list_context_providers():
     providers = [
         {
             "id": "@file",
-            "description": "Include file contents in the prompt",
+            "description": "파일 내용을 프롬프트에 포함",
             "requires_arg": True,
             "is_action": False,
             "usage": "@file:path/to/file.py",
@@ -156,12 +163,28 @@ async def list_context_providers():
             ],
         },
         {
-            "id": "@reset",
-            "description": "Clear session and reset agent",
+            "id": "/reset",
+            "description": "세션 초기화 및 에이전트 리셋",
             "requires_arg": False,
             "is_action": True,
-            "usage": "@reset",
-            "examples": ["@reset"],
+            "usage": "/reset",
+            "examples": ["/reset"],
+        },
+        {
+            "id": "/compact",
+            "description": "대화 기록 압축 및 요약",
+            "requires_arg": False,
+            "is_action": True,
+            "usage": "/compact",
+            "examples": ["/compact"],
+        },
+        {
+            "id": "/help",
+            "description": "도움말 및 사용 가이드",
+            "requires_arg": False,
+            "is_action": True,
+            "usage": "/help",
+            "examples": ["/help"],
         },
     ]