agent-framework-devui 1.0.0b251007__py3-none-any.whl → 1.0.0b251016__py3-none-any.whl

agent_framework_devui/_discovery.py

@@ -4,7 +4,6 @@
 
 from __future__ import annotations
 
-import hashlib
 import importlib
 import importlib.util
 import logging
@@ -13,7 +12,6 @@ import uuid
 from pathlib import Path
 from typing import Any
 
-import httpx
 from dotenv import load_dotenv
 
 from .models._discovery_models import EntityInfo
@@ -33,7 +31,6 @@ class EntityDiscovery:
         self.entities_dir = entities_dir
         self._entities: dict[str, EntityInfo] = {}
         self._loaded_objects: dict[str, Any] = {}
-        self._remote_cache_dir = Path.home() / ".agent_framework_devui" / "remote_cache"
 
     async def discover_entities(self) -> list[EntityInfo]:
         """Scan for Agent Framework entities.
@@ -73,6 +70,115 @@ class EntityDiscovery:
         """
         return self._loaded_objects.get(entity_id)
 
+    async def load_entity(self, entity_id: str) -> Any:
+        """Load entity on-demand (lazy loading).
+
+        This method implements lazy loading by importing the entity module only when needed.
+        In-memory entities are returned from cache immediately.
+
+        Args:
+            entity_id: Entity identifier
+
+        Returns:
+            Loaded entity object
+
+        Raises:
+            ValueError: If entity not found or cannot be loaded
+        """
+        # Check if already loaded (includes in-memory entities)
+        if entity_id in self._loaded_objects:
+            logger.debug(f"Entity {entity_id} already loaded (cache hit)")
+            return self._loaded_objects[entity_id]
+
+        # Get entity metadata
+        entity_info = self._entities.get(entity_id)
+        if not entity_info:
+            raise ValueError(f"Entity {entity_id} not found in registry")
+
+        # In-memory entities should never reach here (they're pre-loaded)
+        if entity_info.source == "in_memory":
+            raise ValueError(f"In-memory entity {entity_id} missing from loaded objects cache")
+
+        logger.info(f"Lazy loading entity: {entity_id} (source: {entity_info.source})")
+
+        # Load based on source - only directory and in-memory are supported
+        if entity_info.source == "directory":
+            entity_obj = await self._load_directory_entity(entity_id, entity_info)
+        else:
+            raise ValueError(
+                f"Unsupported entity source: {entity_info.source}. "
+                f"Only 'directory' and 'in_memory' sources are supported."
+            )
+
+        # Enrich metadata with actual entity data
+        # Don't pass entity_type if it's "unknown" - let inference determine the real type
+        enriched_info = await self.create_entity_info_from_object(
+            entity_obj,
+            entity_type=entity_info.type if entity_info.type != "unknown" else None,
+            source=entity_info.source,
+        )
+        # IMPORTANT: Preserve the original entity_id (enrichment generates a new one)
+        enriched_info.id = entity_id
+        # Preserve the original path from sparse metadata
+        if "path" in entity_info.metadata:
+            enriched_info.metadata["path"] = entity_info.metadata["path"]
+        enriched_info.metadata["lazy_loaded"] = True
+        self._entities[entity_id] = enriched_info
+
+        # Cache the loaded object
+        self._loaded_objects[entity_id] = entity_obj
+        logger.info(f"✅ Successfully loaded entity: {entity_id} (type: {enriched_info.type})")
+
+        return entity_obj
+
+    async def _load_directory_entity(self, entity_id: str, entity_info: EntityInfo) -> Any:
+        """Load entity from directory (imports module).
+
+        Args:
+            entity_id: Entity identifier
+            entity_info: Entity metadata
+
+        Returns:
+            Loaded entity object
+        """
+        # Get directory path from metadata
+        dir_path = Path(entity_info.metadata.get("path", ""))
+        if not dir_path.exists():  # noqa: ASYNC240
+            raise ValueError(f"Entity directory not found: {dir_path}")
+
+        # Load .env if it exists
+        if dir_path.is_dir():  # noqa: ASYNC240
+            self._load_env_for_entity(dir_path)
+        else:
+            self._load_env_for_entity(dir_path.parent)
+
+        # Import the module
+        if dir_path.is_dir():  # noqa: ASYNC240
+            # Directory-based entity - try different import patterns
+            import_patterns = [
+                entity_id,
+                f"{entity_id}.agent",
+                f"{entity_id}.workflow",
+            ]
+
+            for pattern in import_patterns:
+                module = self._load_module_from_pattern(pattern)
+                if module:
+                    # Find entity in module - pass entity_id so registration uses correct ID
+                    entity_obj = await self._find_entity_in_module(module, entity_id, str(dir_path))
+                    if entity_obj:
+                        return entity_obj
+
+            raise ValueError(f"No valid entity found in {dir_path}")
+        # File-based entity
+        module = self._load_module_from_file(dir_path, entity_id)
+        if module:
+            entity_obj = await self._find_entity_in_module(module, entity_id, str(dir_path))
+            if entity_obj:
+                return entity_obj
+
+        raise ValueError(f"No valid entity found in {dir_path}")
+
     def list_entities(self) -> list[EntityInfo]:
         """List all discovered entities.
 
@@ -81,6 +187,48 @@ class EntityDiscovery:
         """
         return list(self._entities.values())
 
+    def invalidate_entity(self, entity_id: str) -> None:
+        """Invalidate (clear cache for) an entity to enable hot reload.
+
+        This removes the entity from the loaded objects cache and clears its module
+        from Python's sys.modules cache. The entity metadata remains, so it will be
+        reimported on next access.
+
+        Args:
+            entity_id: Entity identifier to invalidate
+        """
+        # Remove from loaded objects cache
+        if entity_id in self._loaded_objects:
+            del self._loaded_objects[entity_id]
+            logger.info(f"Cleared loaded object cache for: {entity_id}")
+
+        # Clear from Python's module cache (including submodules)
+        keys_to_delete = [
+            module_name
+            for module_name in sys.modules
+            if module_name == entity_id or module_name.startswith(f"{entity_id}.")
+        ]
+        for key in keys_to_delete:
+            del sys.modules[key]
+            logger.debug(f"Cleared module cache: {key}")
+
+        # Reset lazy_loaded flag in metadata
+        entity_info = self._entities.get(entity_id)
+        if entity_info and "lazy_loaded" in entity_info.metadata:
+            entity_info.metadata["lazy_loaded"] = False
+
+        logger.info(f"♻️  Entity invalidated: {entity_id} (will reload on next access)")
+
+    def invalidate_all(self) -> None:
+        """Invalidate all cached entities.
+
+        Useful for forcing a complete reload of all entities.
+        """
+        entity_ids = list(self._loaded_objects.keys())
+        for entity_id in entity_ids:
+            self.invalidate_entity(entity_id)
+        logger.info(f"Invalidated {len(entity_ids)} entities")
+
     def register_entity(self, entity_id: str, entity_info: EntityInfo, entity_object: Any) -> None:
         """Register an entity with both metadata and object.
 
@@ -116,16 +264,9 @@ class EntityDiscovery:
         # Extract metadata with improved fallback naming
         name = getattr(entity_object, "name", None)
         if not name:
-            # In-memory entities: use ID with entity type prefix since no directory name available
-            entity_id_raw = getattr(entity_object, "id", None)
-            if entity_id_raw:
-                # Truncate UUID to first 8 characters for readability
-                short_id = str(entity_id_raw)[:8] if len(str(entity_id_raw)) > 8 else str(entity_id_raw)
-                name = f"{entity_type.title()} {short_id}"
-            else:
-                # Fallback to class name with entity type
-                class_name = entity_object.__class__.__name__
-                name = f"{entity_type.title()} {class_name}"
+            # In-memory entities: use class name as it's more readable than UUID
+            class_name = entity_object.__class__.__name__
+            name = f"{entity_type.title()} {class_name}"
         description = getattr(entity_object, "description", "")
 
         # Generate entity ID using Agent Framework specific naming
@@ -142,43 +283,27 @@ class EntityDiscovery:
         middleware_list = None
 
         if entity_type == "agent":
-            # Try to get instructions
-            if hasattr(entity_object, "chat_options") and hasattr(entity_object.chat_options, "instructions"):
-                instructions = entity_object.chat_options.instructions
-
-            # Try to get model - check both chat_options and chat_client
-            if (
-                hasattr(entity_object, "chat_options")
-                and hasattr(entity_object.chat_options, "model_id")
-                and entity_object.chat_options.model_id
-            ):
-                model = entity_object.chat_options.model_id
-            elif hasattr(entity_object, "chat_client") and hasattr(entity_object.chat_client, "model_id"):
-                model = entity_object.chat_client.model_id
-
-            # Try to get chat client type
-            if hasattr(entity_object, "chat_client"):
-                chat_client_type = entity_object.chat_client.__class__.__name__
-
-            # Try to get context providers
-            if (
-                hasattr(entity_object, "context_provider")
-                and entity_object.context_provider
-                and hasattr(entity_object.context_provider, "__class__")
-            ):
-                context_providers_list = [entity_object.context_provider.__class__.__name__]
-
-            # Try to get middleware
-            if hasattr(entity_object, "middleware") and entity_object.middleware:
-                middleware_list = []
-                for m in entity_object.middleware:
-                    # Try multiple ways to get a good name for middleware
-                    if hasattr(m, "__name__"):  # Function or callable
-                        middleware_list.append(m.__name__)
-                    elif hasattr(m, "__class__"):  # Class instance
-                        middleware_list.append(m.__class__.__name__)
-                    else:
-                        middleware_list.append(str(m))
+            from ._utils import extract_agent_metadata
+
+            agent_meta = extract_agent_metadata(entity_object)
+            instructions = agent_meta["instructions"]
+            model = agent_meta["model"]
+            chat_client_type = agent_meta["chat_client_type"]
+            context_providers_list = agent_meta["context_providers"]
+            middleware_list = agent_meta["middleware"]
+
+        # Log helpful info about agent capabilities (before creating EntityInfo)
+        if entity_type == "agent":
+            has_run_stream = hasattr(entity_object, "run_stream")
+            has_run = hasattr(entity_object, "run")
+
+            if not has_run_stream and has_run:
+                logger.info(
+                    f"Agent '{entity_id}' only has run() (non-streaming). "
+                    "DevUI will automatically convert to streaming."
+                )
+            elif not has_run_stream and not has_run:
+                logger.warning(f"Agent '{entity_id}' lacks both run() and run_stream() methods. May not work.")
 
         # Create EntityInfo with Agent Framework specifics
         return EntityInfo(
@@ -206,7 +331,10 @@ class EntityDiscovery:
         )
 
     async def _scan_entities_directory(self, entities_dir: Path) -> None:
-        """Scan the entities directory for Agent Framework entities.
+        """Scan the entities directory for Agent Framework entities (lazy loading).
+
+        This method scans the filesystem WITHOUT importing modules, creating sparse
+        metadata that will be enriched on-demand when entities are accessed.
 
         Args:
             entities_dir: Directory to scan for entities
@@ -215,78 +343,120 @@ class EntityDiscovery:
             logger.warning(f"Entities directory not found: {entities_dir}")
             return
 
-        logger.info(f"Scanning {entities_dir} for Agent Framework entities...")
+        logger.info(f"Scanning {entities_dir} for Agent Framework entities (lazy mode)...")
 
         # Add entities directory to Python path if not already there
         entities_dir_str = str(entities_dir)
         if entities_dir_str not in sys.path:
             sys.path.insert(0, entities_dir_str)
 
-        # Scan for directories and Python files
+        # Scan for directories and Python files WITHOUT importing
         for item in entities_dir.iterdir():  # noqa: ASYNC240
             if item.name.startswith(".") or item.name == "__pycache__":
                 continue
 
-            if item.is_dir():
-                # Directory-based entity
-                await self._discover_entities_in_directory(item)
+            if item.is_dir() and self._looks_like_entity(item):
+                # Directory-based entity - create sparse metadata
+                self._register_sparse_entity(item)
             elif item.is_file() and item.suffix == ".py" and not item.name.startswith("_"):
-                # Single file entity
-                await self._discover_entities_in_file(item)
+                # Single file entity - create sparse metadata
+                self._register_sparse_file_entity(item)
 
-    async def _discover_entities_in_directory(self, dir_path: Path) -> None:
-        """Discover entities in a directory using module import.
+    def _looks_like_entity(self, dir_path: Path) -> bool:
+        """Check if directory contains an entity (without importing).
 
         Args:
-            dir_path: Directory containing entity
-        """
-        entity_id = dir_path.name
-        logger.debug(f"Scanning directory: {entity_id}")
+            dir_path: Directory to check
 
-        try:
-            # Load environment variables for this entity first
-            self._load_env_for_entity(dir_path)
+        Returns:
+            True if directory appears to contain an entity
+        """
+        return (
+            (dir_path / "agent.py").exists()
+            or (dir_path / "workflow.py").exists()
+            or (dir_path / "__init__.py").exists()
+        )
 
-            # Try different import patterns
-            import_patterns = [
-                entity_id,  # Direct module import
-                f"{entity_id}.agent",  # agent.py submodule
-                f"{entity_id}.workflow",  # workflow.py submodule
-            ]
+    def _detect_entity_type(self, dir_path: Path) -> str:
+        """Detect entity type from directory structure (without importing).
 
-            for pattern in import_patterns:
-                module = self._load_module_from_pattern(pattern)
-                if module:
-                    entities_found = await self._find_entities_in_module(module, entity_id, str(dir_path))
-                    if entities_found:
-                        logger.debug(f"Found {len(entities_found)} entities in {pattern}")
-                        break
+        Uses filename conventions to determine entity type:
+        - workflow.py → "workflow"
+        - agent.py → "agent"
+        - both or neither → "unknown"
 
-        except Exception as e:
-            logger.warning(f"Error scanning directory {entity_id}: {e}")
+        Args:
+            dir_path: Directory to analyze
 
-    async def _discover_entities_in_file(self, file_path: Path) -> None:
-        """Discover entities in a single Python file.
+        Returns:
+            Entity type: "workflow", "agent", or "unknown"
+        """
+        has_agent = (dir_path / "agent.py").exists()
+        has_workflow = (dir_path / "workflow.py").exists()
+
+        if has_agent and has_workflow:
+            # Both files exist - ambiguous, mark as unknown
+            return "unknown"
+        if has_workflow:
+            return "workflow"
+        if has_agent:
+            return "agent"
+        # Has __init__.py but no specific file
+        return "unknown"
+
+    def _register_sparse_entity(self, dir_path: Path) -> None:
+        """Register entity with sparse metadata (no import).
 
         Args:
-            file_path: Python file to scan
+            dir_path: Entity directory
         """
-        try:
-            # Load environment variables for this entity's directory first
-            self._load_env_for_entity(file_path.parent)
+        entity_id = dir_path.name
+        entity_type = self._detect_entity_type(dir_path)
 
-            # Create module name from file path
-            base_name = file_path.stem
+        entity_info = EntityInfo(
+            id=entity_id,
+            name=entity_id.replace("_", " ").title(),
+            type=entity_type,
+            framework="agent_framework",
+            tools=[],  # Sparse - will be populated on load
+            description="",  # Sparse - will be populated on load
+            source="directory",
+            metadata={
+                "path": str(dir_path),
+                "discovered": True,
+                "lazy_loaded": False,
+            },
+        )
 
-            # Load the module directly from file
-            module = self._load_module_from_file(file_path, base_name)
-            if module:
-                entities_found = await self._find_entities_in_module(module, base_name, str(file_path))
-                if entities_found:
-                    logger.debug(f"Found {len(entities_found)} entities in {file_path.name}")
+        self._entities[entity_id] = entity_info
+        logger.debug(f"Registered sparse entity: {entity_id} (type: {entity_type})")
 
-        except Exception as e:
-            logger.warning(f"Error scanning file {file_path}: {e}")
+    def _register_sparse_file_entity(self, file_path: Path) -> None:
+        """Register file-based entity with sparse metadata (no import).
+
+        Args:
+            file_path: Entity Python file
+        """
+        entity_id = file_path.stem
+
+        # File-based entities are typically agents, but we can't know for sure without importing
+        entity_info = EntityInfo(
+            id=entity_id,
+            name=entity_id.replace("_", " ").title(),
+            type="unknown",  # Will be determined on load
+            framework="agent_framework",
+            tools=[],
+            description="",
+            source="directory",
+            metadata={
+                "path": str(file_path),
+                "discovered": True,
+                "lazy_loaded": False,
+            },
+        )
+
+        self._entities[entity_id] = entity_info
+        logger.debug(f"Registered sparse file entity: {entity_id}")
 
     def _load_env_for_entity(self, entity_path: Path) -> bool:
         """Load .env file for an entity.
@@ -378,19 +548,17 @@ class EntityDiscovery:
             logger.warning(f"Error loading module from {file_path}: {e}")
             return None
 
-    async def _find_entities_in_module(self, module: Any, base_id: str, module_path: str) -> list[str]:
-        """Find agent and workflow entities in a loaded module.
+    async def _find_entity_in_module(self, module: Any, entity_id: str, module_path: str) -> Any:
+        """Find agent or workflow entity in a loaded module.
 
         Args:
             module: Loaded Python module
-            base_id: Base identifier for entities
+            entity_id: Expected entity identifier to register with
             module_path: Path to module for metadata
 
         Returns:
-            List of entity IDs that were found and registered
+            Loaded entity object, or None if not found
         """
-        entities_found = []
-
         # Look for explicit variable names first
         candidates = [
             ("agent", getattr(module, "agent", None)),
@@ -402,11 +570,12 @@ class EntityDiscovery:
                 continue
 
             if self._is_valid_entity(obj, obj_type):
-                # Pass source as "directory" for directory-discovered entities
-                await self._register_entity_from_object(obj, obj_type, module_path, source="directory")
-                entities_found.append(obj_type)
+                # Register with the correct entity_id (from directory name)
+                # Store the object directly in _loaded_objects so we can return it
+                self._loaded_objects[entity_id] = obj
+                return obj
 
-        return entities_found
+        return None
 
     def _is_valid_entity(self, obj: Any, expected_type: str) -> bool:
         """Check if object is a valid agent or workflow using duck typing.
@@ -444,7 +613,9 @@ class EntityDiscovery:
                 pass
 
             # Fallback to duck typing for agent protocol
-            if hasattr(obj, "run_stream") and hasattr(obj, "id") and hasattr(obj, "name"):
+            # Agent must have either run_stream() or run() method, plus id and name
+            has_execution_method = hasattr(obj, "run_stream") or hasattr(obj, "run")
+            if has_execution_method and hasattr(obj, "id") and hasattr(obj, "name"):
                 return True
 
         except (TypeError, AttributeError):
@@ -482,13 +653,9 @@ class EntityDiscovery:
             # Extract metadata from the live object with improved fallback naming
             name = getattr(obj, "name", None)
             if not name:
-                entity_id_raw = getattr(obj, "id", None)
-                if entity_id_raw:
-                    # Truncate UUID to first 8 characters for readability
-                    short_id = str(entity_id_raw)[:8] if len(str(entity_id_raw)) > 8 else str(entity_id_raw)
-                    name = f"{obj_type.title()} {short_id}"
-                else:
-                    name = f"{obj_type.title()} {obj.__class__.__name__}"
+                # Use class name as it's more readable than UUID
+                class_name = obj.__class__.__name__
+                name = f"{obj_type.title()} {class_name}"
             description = getattr(obj, "description", None)
             tools = await self._extract_tools_from_object(obj, obj_type)
 
@@ -505,39 +672,14 @@ class EntityDiscovery:
             middleware_list = None
 
             if obj_type == "agent":
-                # Try to get instructions
-                if hasattr(obj, "chat_options") and hasattr(obj.chat_options, "instructions"):
-                    instructions = obj.chat_options.instructions
-
-                # Try to get model - check both chat_options and chat_client
-                if hasattr(obj, "chat_options") and hasattr(obj.chat_options, "model_id") and obj.chat_options.model_id:
-                    model = obj.chat_options.model_id
-                elif hasattr(obj, "chat_client") and hasattr(obj.chat_client, "model_id"):
-                    model = obj.chat_client.model_id
-
-                # Try to get chat client type
-                if hasattr(obj, "chat_client"):
-                    chat_client_type = obj.chat_client.__class__.__name__
-
-                # Try to get context providers
-                if (
-                    hasattr(obj, "context_provider")
-                    and obj.context_provider
-                    and hasattr(obj.context_provider, "__class__")
-                ):
-                    context_providers_list = [obj.context_provider.__class__.__name__]
-
-                # Try to get middleware
-                if hasattr(obj, "middleware") and obj.middleware:
-                    middleware_list = []
-                    for m in obj.middleware:
-                        # Try multiple ways to get a good name for middleware
-                        if hasattr(m, "__name__"):  # Function or callable
-                            middleware_list.append(m.__name__)
-                        elif hasattr(m, "__class__"):  # Class instance
-                            middleware_list.append(m.__class__.__name__)
-                        else:
-                            middleware_list.append(str(m))
+                from ._utils import extract_agent_metadata
+
+                agent_meta = extract_agent_metadata(obj)
+                instructions = agent_meta["instructions"]
+                model = agent_meta["model"]
+                chat_client_type = agent_meta["chat_client_type"]
+                context_providers_list = agent_meta["context_providers"]
+                middleware_list = agent_meta["middleware"]
 
             entity_info = EntityInfo(
                 id=entity_id,
@@ -628,7 +770,7 @@ class EntityDiscovery:
             source: Source of entity (directory, in_memory, remote)
 
         Returns:
-            Unique entity ID with format: {type}_{source}_{name}_{uuid8}
+            Unique entity ID with format: {type}_{source}_{name}_{uuid}
         """
         import re
 
@@ -644,179 +786,7 @@ class EntityDiscovery:
         else:
             base_name = "entity"
 
-        # Generate short UUID (8 chars = 4 billion combinations)
-        short_uuid = uuid.uuid4().hex[:8]
-
-        return f"{entity_type}_{source}_{base_name}_{short_uuid}"
-
-    async def fetch_remote_entity(
-        self, url: str, metadata: dict[str, Any] | None = None
-    ) -> tuple[EntityInfo | None, str | None]:
-        """Fetch and register entity from URL.
-
-        Args:
-            url: URL to Python file containing entity
-            metadata: Additional metadata (source, sampleId, etc.)
-
-        Returns:
-            Tuple of (EntityInfo if successful, error_message if failed)
-        """
-        try:
-            normalized_url = self._normalize_url(url)
-            logger.info(f"Normalized URL: {normalized_url}")
-
-            content = await self._fetch_url_content(normalized_url)
-            if not content:
-                error_msg = "Failed to fetch content from URL. The file may not exist or is not accessible."
-                logger.warning(error_msg)
-                return None, error_msg
-
-            if not self._validate_python_syntax(content):
-                error_msg = "Invalid Python syntax in the file. Please check the file contains valid Python code."
-                logger.warning(error_msg)
-                return None, error_msg
-
-            entity_object = await self._load_entity_from_content(content, url)
-            if not entity_object:
-                error_msg = (
-                    "No valid agent or workflow found in the file. "
-                    "Make sure the file contains an 'agent' or 'workflow' variable."
-                )
-                logger.warning(error_msg)
-                return None, error_msg
-
-            entity_info = await self.create_entity_info_from_object(
-                entity_object,
-                entity_type=None,  # Auto-detect
-                source="remote",
-            )
-
-            entity_info.source = metadata.get("source", "remote_gallery") if metadata else "remote_gallery"
-            entity_info.original_url = url
-            if metadata:
-                entity_info.metadata.update(metadata)
-
-            self.register_entity(entity_info.id, entity_info, entity_object)
+        # Generate full UUID for guaranteed uniqueness
+        full_uuid = uuid.uuid4().hex
 
-            logger.info(f"Successfully added remote entity: {entity_info.id}")
-            return entity_info, None
-
-        except Exception as e:
-            error_msg = f"Unexpected error: {e!s}"
-            logger.error(f"Error fetching remote entity from {url}: {e}", exc_info=True)
-            return None, error_msg
-
-    def _normalize_url(self, url: str) -> str:
-        """Convert various Git hosting URLs to raw content URLs."""
-        # GitHub: blob -> raw
-        if "github.com" in url and "/blob/" in url:
-            return url.replace("github.com", "raw.githubusercontent.com").replace("/blob/", "/")
-
-        # GitLab: blob -> raw
-        if "gitlab.com" in url and "/-/blob/" in url:
-            return url.replace("/-/blob/", "/-/raw/")
-
-        # Bitbucket: src -> raw
-        if "bitbucket.org" in url and "/src/" in url:
-            return url.replace("/src/", "/raw/")
-
-        return url
-
-    async def _fetch_url_content(self, url: str, max_size_mb: int = 10) -> str | None:
-        """Fetch content from URL with size and timeout limits."""
-        try:
-            timeout = 30.0  # 30 second timeout
-
-            async with httpx.AsyncClient(timeout=timeout) as client:
-                response = await client.get(url)
-
-                if response.status_code != 200:
-                    logger.warning(f"HTTP {response.status_code} for {url}")
-                    return None
-
-                # Check content length
-                content_length = response.headers.get("content-length")
-                if content_length and int(content_length) > max_size_mb * 1024 * 1024:
-                    logger.warning(f"File too large: {content_length} bytes")
-                    return None
-
-                # Read with size limit
-                content = response.text
-                if len(content.encode("utf-8")) > max_size_mb * 1024 * 1024:
-                    logger.warning("Content too large after reading")
-                    return None
-
-                return content
-
-        except Exception as e:
-            logger.error(f"Error fetching {url}: {e}")
-            return None
-
-    def _validate_python_syntax(self, content: str) -> bool:
-        """Validate that content is valid Python code."""
-        try:
-            compile(content, "<remote>", "exec")
-            return True
-        except SyntaxError as e:
-            logger.warning(f"Python syntax error: {e}")
-            return False
-
-    async def _load_entity_from_content(self, content: str, source_url: str) -> Any | None:
-        """Load entity object from Python content string using disk-based import.
-
-        This method caches remote entities to disk and uses importlib for loading,
-        making it consistent with local entity discovery and avoiding exec() security warnings.
-        """
-        try:
-            # Create cache directory if it doesn't exist
-            self._remote_cache_dir.mkdir(parents=True, exist_ok=True)
-
-            # Generate a unique filename based on URL hash
-            url_hash = hashlib.sha256(source_url.encode()).hexdigest()[:16]
-            module_name = f"remote_entity_{url_hash}"
-            cached_file = self._remote_cache_dir / f"{module_name}.py"
-
-            # Write content to cache file
-            cached_file.write_text(content, encoding="utf-8")
-            logger.debug(f"Cached remote entity to {cached_file}")
-
-            # Load module from cached file using importlib (same as local scanning)
-            module = self._load_module_from_file(cached_file, module_name)
-            if not module:
-                logger.warning(f"Failed to load module from cached file: {cached_file}")
-                return None
-
-            # Look for agent or workflow objects in the loaded module
-            for name in dir(module):
-                if name.startswith("_"):
-                    continue
-
-                obj = getattr(module, name)
-
-                # Check for explicitly named entities first
-                if name in ["agent", "workflow"] and self._is_valid_entity(obj, name):
-                    return obj
-
-                # Also check if any object looks like an agent/workflow
-                if self._is_valid_agent(obj) or self._is_valid_workflow(obj):
-                    return obj
-
-            return None
-
-        except Exception as e:
-            logger.error(f"Error loading entity from content: {e}")
-            return None
-
-    def remove_remote_entity(self, entity_id: str) -> bool:
-        """Remove a remote entity by ID."""
-        if entity_id in self._entities:
-            entity_info = self._entities[entity_id]
-            if entity_info.source in ["remote_gallery", "remote"]:
-                del self._entities[entity_id]
-                if entity_id in self._loaded_objects:
-                    del self._loaded_objects[entity_id]
-                logger.info(f"Removed remote entity: {entity_id}")
-                return True
-            logger.warning(f"Cannot remove local entity: {entity_id}")
-            return False
-        return False
+        return f"{entity_type}_{source}_{base_name}_{full_uuid}"