Merge pull request #1263 from escapade-mckv/ui-polishing

UI polishing

Author: escapade-mckv

backend/composio_integration/api.py

@@ -1,5 +1,5 @@
 from fastapi import APIRouter, HTTPException, Depends, Query
-from typing import Dict, Any, Optional, List
+from typing import Dict, Any, Optional
 from pydantic import BaseModel
 from uuid import uuid4
 from utils.auth_utils import get_current_user_id_from_jwt
@@ -9,10 +9,8 @@
 
 from .composio_service import (
     get_integration_service,
-    ComposioIntegrationService,
-    ComposioIntegrationResult
 )
-from .toolkit_service import ToolkitInfo, ToolkitService, CategoryInfo, DetailedToolkitInfo
+from .toolkit_service import ToolkitService
 from .composio_profile_service import ComposioProfileService, ComposioProfile
 
 router = APIRouter(prefix="/composio", tags=["composio"])
@@ -58,7 +56,7 @@ class ProfileResponse(BaseModel):
     display_name: str
     toolkit_slug: str
     toolkit_name: str
-    mcp_url: str  # The complete MCP URL
+    mcp_url: str
     redirect_url: Optional[str] = None
     is_connected: bool
     is_default: bool
@@ -72,7 +70,7 @@ def from_composio_profile(cls, profile: ComposioProfile) -> "ProfileResponse":
             display_name=profile.display_name,
             toolkit_slug=profile.toolkit_slug,
             toolkit_name=profile.toolkit_name,
-            mcp_url=profile.mcp_url,  # Include the complete MCP URL
+            mcp_url=profile.mcp_url,
             redirect_url=profile.redirect_url,
             is_connected=profile.is_connected,
             is_default=profile.is_default,

backend/composio_integration/composio_profile_service.py

@@ -22,7 +22,7 @@ class ComposioProfile:
     config_hash: str
     toolkit_slug: str
     toolkit_name: str
-    mcp_url: str  # The complete MCP URL
+    mcp_url: str
     redirect_url: Optional[str] = None
     is_active: bool = True
     is_default: bool = False
@@ -57,36 +57,33 @@ def _build_config(
         self,
         toolkit_slug: str,
         toolkit_name: str,
-        mcp_url: str,  # The complete MCP URL
+        mcp_url: str,
         redirect_url: Optional[str] = None,
         user_id: str = "default"
     ) -> Dict[str, Any]:
         return {
             "type": "composio",
             "toolkit_slug": toolkit_slug,
             "toolkit_name": toolkit_name,
-            "mcp_url": mcp_url,  # Store the complete URL
+            "mcp_url": mcp_url,
             "redirect_url": redirect_url,
             "user_id": user_id,
             "created_at": datetime.now(timezone.utc).isoformat()
         }
 
     async def _generate_unique_profile_name(self, base_name: str, account_id: str, mcp_qualified_name: str, client) -> str:
-        """Generate a unique profile name by appending a number if needed"""
         original_name = base_name
         counter = 1
         current_name = base_name
 
         while True:
-            # Check if this name exists
             existing = await client.table('user_mcp_credential_profiles').select('profile_id').eq(
                 'account_id', account_id
             ).eq('mcp_qualified_name', mcp_qualified_name).eq('profile_name', current_name).execute()
 
             if not existing.data:
                 return current_name
 
-            # Generate next name
             counter += 1
             current_name = f"{original_name} ({counter})"
 
@@ -96,7 +93,7 @@ async def create_profile(
         profile_name: str,
         toolkit_slug: str,
         toolkit_name: str,
-        mcp_url: str,  # The complete MCP URL from Composio
+        mcp_url: str,
         redirect_url: Optional[str] = None,
         user_id: str = "default",
         is_default: bool = False
@@ -118,21 +115,18 @@ async def create_profile(
 
             client = await self.db.client
 
-            # Generate unique profile name if needed
             unique_profile_name = await self._generate_unique_profile_name(
                 profile_name, account_id, mcp_qualified_name, client
             )
 
             if unique_profile_name != profile_name:
                 logger.info(f"Generated unique profile name: {unique_profile_name} (original: {profile_name})")
 
-            # Set other profiles as non-default if this is default
             if is_default:
                 await client.table('user_mcp_credential_profiles').update({
                     'is_default': False
                 }).eq('account_id', account_id).eq('mcp_qualified_name', mcp_qualified_name).execute()
 
-            # Insert new profile
             result = await client.table('user_mcp_credential_profiles').insert({
                 'profile_id': profile_id,
                 'account_id': account_id,
@@ -220,7 +214,6 @@ async def get_mcp_url_for_runtime(self, profile_id: str) -> str:
 
             profile_data = result.data[0]
 
-            # Decrypt the config to get the MCP URL
             config = self._decrypt_config(profile_data['encrypted_config'])
 
             if config.get('type') != 'composio':
@@ -238,7 +231,6 @@ async def get_mcp_url_for_runtime(self, profile_id: str) -> str:
             raise
 
     async def get_profile_config(self, profile_id: str) -> Dict[str, Any]:
-        """Get decrypted config for a profile"""
         try:
             client = await self.db.client
 
@@ -270,7 +262,6 @@ async def get_profiles(self, account_id: str, toolkit_slug: Optional[str] = None
 
             profiles = []
             for row in result.data:
-                # Decrypt and parse config
                 config = self._decrypt_config(row['encrypted_config'])
 
                 profile = ComposioProfile(

backend/composio_integration/mcp_server_service.py

@@ -36,29 +36,21 @@ def __init__(self, api_key: Optional[str] = None):
         self.client = ComposioClient.get_client(api_key)
 
     def _generate_cuid(self, length: int = 8) -> str:
-        """Generate a random CUID with letters and numbers only"""
         return ''.join(secrets.choice(string.ascii_lowercase + string.digits) for _ in range(length))
 
     def _generate_server_name(self, toolkit_name: str) -> str:
-        """Generate a valid server name: appname-cuid (4-30 chars, letters/numbers/spaces/hyphens only)"""
-        # Clean the toolkit name: remove invalid chars, convert to lowercase
         clean_name = ''.join(c.lower() if c.isalnum() else '-' for c in toolkit_name)
-        clean_name = clean_name.strip('-')  # Remove leading/trailing hyphens
+        clean_name = clean_name.strip('-')
 
-        # Generate CUID
         cuid = self._generate_cuid(8)
-        
-        # Create server name
+
         server_name = f"{clean_name}-{cuid}"
 
-        # Ensure it's within 4-30 characters
         if len(server_name) > 30:
-            # Truncate the app name to fit
-            max_app_name_length = 30 - len(cuid) - 1  # -1 for the hyphen
+            max_app_name_length = 30 - len(cuid) - 1
             clean_name = clean_name[:max_app_name_length]
             server_name = f"{clean_name}-{cuid}"
 
-        # Ensure minimum length
         if len(server_name) < 4:
             server_name = f"app-{cuid}"
 
@@ -82,22 +74,19 @@ async def create_mcp_server(
 
             logger.info(f"Using MCP server name: {name}")
 
-            # Try different possible API paths
             try:
                 response = self.client.mcp.create(
                     auth_config_ids=auth_config_ids,
                     name=name,
                     allowed_tools=allowed_tools
                 )
             except AttributeError:
-                # Fallback: try direct method call
                 response = self.client.create_mcp_server(
                     auth_config_ids=auth_config_ids,
                     name=name,
                     allowed_tools=allowed_tools
                 )
-            
-            # Access Pydantic model attributes directly
+
             commands_obj = getattr(response, 'commands', None)
 
             commands = MCPCommands(

backend/composio_integration/toolkit_service.py

@@ -163,7 +163,6 @@ async def list_toolkits(self, limit: int = 500, cursor: Optional[str] = None, ca
                 )
                 toolkits.append(toolkit)
 
-            # Return pagination response structure
             result = {
                 "items": toolkits,
                 "total_items": response_data.get("total_items", len(toolkits)),
@@ -209,9 +208,9 @@ async def search_toolkits(self, query: str, category: Optional[str] = None, limi
             result = {
                 "items": limited_results,
                 "total_items": len(filtered_toolkits),
-                "total_pages": 1,  # For search, we'll keep it simple with one page
+                "total_pages": 1,
                 "current_page": 1,
-                "next_cursor": None  # For search, we don't use cursor pagination
+                "next_cursor": None
             }
 
             logger.info(f"Found {len(filtered_toolkits)} toolkits with OAUTH2 in both auth schemes matching query: {query}" + (f" in category {category}" if category else ""))
@@ -262,7 +261,6 @@ async def get_detailed_toolkit_info(self, toolkit_slug: str) -> Optional[Detaile
 
             logger.info(f"Raw toolkit response for {toolkit_slug}: {toolkit_response}")
 
-            # Parse the response
             meta = toolkit_dict.get('meta', {})
             if hasattr(meta, '__dict__'):
                 meta = meta.__dict__
@@ -272,13 +270,12 @@ async def get_detailed_toolkit_info(self, toolkit_slug: str) -> Optional[Detaile
                 name=toolkit_dict.get('name', ''),
                 description=meta.get('description', '') if isinstance(meta, dict) else getattr(meta, 'description', ''),
                 logo=meta.get('logo') if isinstance(meta, dict) else getattr(meta, 'logo', None),
-                tags=[],  # Will populate from meta if available
+                tags=[],
                 auth_schemes=toolkit_dict.get('composio_managed_auth_schemes', []),
                 categories=[],
                 base_url=toolkit_dict.get('base_url')
             )
 
-            # Parse categories properly
             categories_data = meta.get('categories', []) if isinstance(meta, dict) else getattr(meta, 'categories', [])
             detailed_toolkit.categories = [
                 cat.get('name', '') if isinstance(cat, dict) else getattr(cat, 'name', '') 
@@ -287,18 +284,15 @@ async def get_detailed_toolkit_info(self, toolkit_slug: str) -> Optional[Detaile
 
             logger.info(f"Parsed basic toolkit info: {detailed_toolkit}")
 
-            # Parse auth_config_details
             auth_config_details = []
             raw_auth_configs = toolkit_dict.get('auth_config_details', [])
 
             for config in raw_auth_configs:
-                # Handle both dict and object formats
                 if hasattr(config, '__dict__'):
                     config_dict = config.__dict__
                 else:
                     config_dict = config
 
-                # Extract fields - this could be a nested object
                 fields_obj = config_dict.get('fields')
                 if hasattr(fields_obj, '__dict__'):
                     fields_dict = fields_obj.__dict__
@@ -307,7 +301,6 @@ async def get_detailed_toolkit_info(self, toolkit_slug: str) -> Optional[Detaile
 
                 auth_fields = {}
 
-                # Parse each field type (auth_config_creation, connected_account_initiation, etc.)
                 for field_type, field_type_obj in fields_dict.items():
                     auth_fields[field_type] = {}
 
@@ -316,7 +309,6 @@ async def get_detailed_toolkit_info(self, toolkit_slug: str) -> Optional[Detaile
                     else:
                         field_type_dict = field_type_obj or {}
 
-                    # Parse required and optional fields
                     for requirement_level in ['required', 'optional']:
                         field_list = field_type_dict.get(requirement_level, [])
 
@@ -329,7 +321,7 @@ async def get_detailed_toolkit_info(self, toolkit_slug: str) -> Optional[Detaile
 
                             auth_config_fields.append(AuthConfigField(
                                 name=field_dict.get('name', ''),
-                                displayName=field_dict.get('display_name', ''),  # Note: display_name not displayName
+                                displayName=field_dict.get('display_name', ''),
                                 type=field_dict.get('type', 'string'),
                                 description=field_dict.get('description'),
                                 required=field_dict.get('required', False),
@@ -346,10 +338,8 @@ async def get_detailed_toolkit_info(self, toolkit_slug: str) -> Optional[Detaile
 
             detailed_toolkit.auth_config_details = auth_config_details
 
-            # Extract connected_account_initiation fields specifically
             connected_account_initiation = None
             for config in raw_auth_configs:
-                # Handle both dict and object formats
                 if hasattr(config, '__dict__'):
                     config_dict = config.__dict__
                 else:
@@ -398,4 +388,4 @@ async def get_detailed_toolkit_info(self, toolkit_slug: str) -> Optional[Detaile
 
         except Exception as e:
             logger.error(f"Failed to get detailed toolkit info for {toolkit_slug}: {e}", exc_info=True)
-            return None 
+            return None 

frontend/.env.example

@@ -4,6 +4,8 @@ NEXT_PUBLIC_SUPABASE_ANON_KEY=""
 NEXT_PUBLIC_BACKEND_URL="http://localhost:8000/api"
 NEXT_PUBLIC_URL="http://localhost:3000"
 NEXT_PUBLIC_GOOGLE_CLIENT_ID=""
+NEXT_PUBLIC_POSTHOG_KEY=""
+
 OPENAI_API_KEY=""
 KORTIX_ADMIN_API_KEY=""
 

frontend/package.json

@@ -19,7 +19,7 @@
     "@hookform/resolvers": "^5.0.1",
     "@next/third-parties": "^15.3.1",
     "@number-flow/react": "^0.5.7",
-    "@pipedream/sdk": "^1.7.0",
+
     "@radix-ui/react-accordion": "^1.2.11",
     "@radix-ui/react-alert-dialog": "^1.1.11",
     "@radix-ui/react-avatar": "^1.1.4",

frontend/src/app/(dashboard)/agents/page.tsx

@@ -358,7 +358,7 @@ export default function AgentsPage() {
       }
 
       const customRequirements = item.mcp_requirements?.filter(req => 
-        req.custom_type && req.custom_type !== 'pipedream'
+        req.custom_type
       ) || [];
       const missingCustomConfigs = customRequirements.filter(req => 
         !customMcpConfigs || !customMcpConfigs[req.qualified_name] || 
@@ -371,20 +371,6 @@ export default function AgentsPage() {
         return;
       }
 
-      const pipedreamRequirements = item.mcp_requirements?.filter(req => 
-        req.custom_type === 'pipedream'
-      ) || [];
-      const missingPipedreamConfigs = pipedreamRequirements.filter(req => 
-        !customMcpConfigs || !customMcpConfigs[req.qualified_name] || 
-        !customMcpConfigs[req.qualified_name].profile_id
-      );
-      
-      if (missingPipedreamConfigs.length > 0) {
-        const missingNames = missingPipedreamConfigs.map(req => req.display_name).join(', ');
-        toast.error(`Please select Pipedream profiles for: ${missingNames}`);
-        return;
-      }
-
       const result = await installTemplateMutation.mutateAsync({
         template_id: item.template_id,
         instance_name: instanceName,
@@ -566,7 +552,6 @@ export default function AgentsPage() {
         </div>
       </div>
       <div className="container mx-auto max-w-7xl px-4 py-2">
-        {/* Fixed height container to prevent layout shifts on tab change */}
         <div className="w-full min-h-[calc(100vh-300px)]">
           {activeTab === "my-agents" && (
             <MyAgentsTab