fix: fix AgentFileInfo model and agent variable detection logic

- Rename AgentFileInfo fields to be more descriptive (path→file_path, etc.)
- Add new fields: imports, has_runner, has_entrypoint, detected_tools
- Update AgentFileInfo docstring to clarify its purpose in project initialization
- Simplify agent variable detection to only match direct Agent(...) instantiation
- Relax agent variable validation to accept any assignment when user specifies --agent-var
- Remove SSE "data: " prefix from wrapper

(cherry picked from commit 0acbbbf4a722f6a0e12c7ec07eac655e8b4dcdda)

Author: innsd

agentkit/toolkit/models.py

@@ -448,24 +448,37 @@ def __str__(self) -> str:
 
 @dataclass
 class AgentFileInfo:
-    """Information about a file generated by Agent.
+    """Parsed information about a user's Agent definition file.
     
-    Used to record details about generated files.
+    Used during project initialization to understand the structure
+    of the user's Agent file and generate appropriate wrappers.
     """
-    path: str
-    """File path"""
+    file_path: str
+    """Absolute path to the Agent definition file"""
 
-    content: Optional[str] = None
-    """File content"""
+    agent_var_name: str
+    """Name of the Agent variable in the file (e.g., 'agent', 'my_agent')"""
 
-    file_type: Optional[str] = None
-    """File type"""
+    module_name: str
+    """Python module name derived from filename (without .py extension)"""
 
-    created: bool = False
-    """Whether this is a newly created file"""
+    file_name: str
+    """Filename with extension (e.g., 'websearch_agent.py')"""
+    
+    imports: Optional[List[str]] = None
+    """List of import statements found in the file"""
+    
+    has_runner: bool = False
+    """Whether the file already contains a Runner definition"""
+    
+    has_entrypoint: bool = False
+    """Whether the file already has an entrypoint decorator"""
+    
+    detected_tools: Optional[List[str]] = None
+    """List of detected tool names used in the Agent"""
 
     def __str__(self) -> str:
-        return f"AgentFileInfo(path={self.path}, created={self.created})"
+        return f"AgentFileInfo(file={self.file_name}, var={self.agent_var_name})"
 
 
 @dataclass

agentkit/toolkit/resources/wrappers/wrapper_stream.py.jinja2

@@ -86,12 +86,12 @@ async def run(payload: dict, headers: dict):
             # Format as SSE data
             sse_event = event.model_dump_json(exclude_none=True, by_alias=True)
             logger.debug("Generated event in agent run streaming: %s", sse_event)
-            yield f"data: {sse_event}\n\n"
+            yield sse_event
     except Exception as e:
         logger.exception("Error in event_generator: %s", e)
         # Yield error event
         error_data = json.dumps({"error": str(e)})
-        yield f'data: {error_data}\n\n'
+        yield error_data
 
 
 @app.ping

agentkit/toolkit/utils/agent_parser.py

@@ -130,15 +130,13 @@ def _detect_agent_variable(self, content: str) -> Optional[str]:
         """
         Detect Agent variable name using pattern matching.
         
-        Patterns to match:
-        1. variable_name = Agent(...)
-        2. variable_name = Agent(
+        Only matches direct instantiation: variable_name = Agent(...)
+        For other patterns (e.g., agent = generate_agent_from_config()),
+        user should specify --agent-var explicitly.
         """
-        # Pattern 1: Single line assignment
         # Match: agent = Agent(...) or my_agent = Agent(...)
-        pattern1 = r'(\w+)\s*=\s*Agent\s*\('
-        
-        matches = re.findall(pattern1, content, re.MULTILINE)
+        pattern = r'(\w+)\s*=\s*Agent\s*\('
+        matches = re.findall(pattern, content, re.MULTILINE)
 
         if matches:
             # If multiple matches, prefer common names or last one
@@ -156,10 +154,17 @@ def _detect_agent_variable(self, content: str) -> Optional[str]:
 
     def _validate_agent_var(self, content: str, var_name: str) -> bool:
         """
-        Validate that the specified variable is an Agent instance.
+        Validate that the specified variable exists and is assigned a value.
+        
+        When user explicitly specifies --agent-var, we trust them and only check
+        that the variable is assigned something. This handles cases like:
+        - agent = Agent(...)
+        - agent = generate_agent_from_config(config_path)
+        - agent = create_custom_agent()
         """
-        pattern = rf'\b{re.escape(var_name)}\s*=\s*Agent\s*\('
-        return bool(re.search(pattern, content))
+        # Check if variable is assigned to anything: var_name = ...
+        pattern = rf'^\s*{re.escape(var_name)}\s*=\s*\S'
+        return bool(re.search(pattern, content, re.MULTILINE))
 
     def _extract_imports(self, content: str) -> List[str]:
         """

agentkit/version.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-VERSION = "0.1.7"
+VERSION = "0.1.9"

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "agentkit-sdk-python"
-version = "0.1.7"
+version = "0.1.9"
 description = "Python SDK for transforming any AI agent into a production-ready application. Framework-agnostic primitives for runtime, memory, authentication, and tools with volcengine-managed infrastructure."
 readme = "README.md"
 requires-python = ">=3.10"