motia 0.5.10-beta.118 → 0.5.11-beta.120-742949

package/dist/cjs/cli.js

@@ -32,6 +32,7 @@ commander_1.program
     .option('-c, --cursor', 'Copy .cursor folder from template')
     .option('-i, --interactive', 'Use interactive prompts to create project')
     .option('-y, --skip-confirmation', 'Skip confirmation prompt')
+    .option('-d, --skip-tutorial', 'Skip the motia tutorial', false)
     .action((0, config_utils_1.handler)(async (arg, context) => {
     if (arg.name || arg.template || arg.cursor) {
         const { create } = require('./create');
@@ -39,7 +40,8 @@ commander_1.program
             type: 'confirm',
             name: 'disableTutorial',
             message: 'Do you wish to disable the motia tutorial?',
-            default: false,
+            default: arg.skipTutorial,
+            when: () => arg.skipTutorial === false,
         });
         await create({
             projectName: arg.name ?? '.',

package/dist/cjs/cloud/build/builders/python/index.js

@@ -23,12 +23,21 @@ class PythonBuilder {
         const normalizedEntrypointPath = entrypointPath.replace(/[.]step.py$/, '_step.py');
         const sitePackagesDir = `${process.env.PYTHON_SITE_PACKAGES}-lambda`;
         // Get Python builder response
-        const { packages } = await this.getPythonBuilderData(step);
+        const { packages, local_files } = await this.getPythonBuilderData(step);
         // Add main file to archive
         if (!fs_1.default.existsSync(step.filePath)) {
             throw new Error(`Source file not found: ${step.filePath}`);
         }
         archive.append(fs_1.default.createReadStream(step.filePath), path_1.default.relative(this.builder.projectDir, normalizedEntrypointPath));
+        // Add local Python files to archive
+        if (local_files && local_files.length > 0) {
+            local_files.forEach((localFile) => {
+                const fullPath = path_1.default.join(this.builder.projectDir, localFile);
+                if (fs_1.default.existsSync(fullPath)) {
+                    archive.append(fs_1.default.createReadStream(fullPath), localFile);
+                }
+            });
+        }
         await Promise.all(packages.map(async (packageName) => (0, add_package_to_archive_1.addPackageToArchive)(archive, sitePackagesDir, packageName)));
         return normalizedEntrypointPath;
     }
@@ -42,7 +51,7 @@ class PythonBuilder {
             fs_1.default.mkdirSync(path_1.default.dirname(outfile), { recursive: true });
             this.listener.onBuildStart(step);
             // Get Python builder response
-            const { packages } = await this.getPythonBuilderData(step);
+            const { packages, local_files } = await this.getPythonBuilderData(step);
             const stepArchiver = new archiver_1.Archiver(outfile);
             const stepPath = await this.buildStep(step, stepArchiver);
             // Add main file to archive
@@ -53,6 +62,16 @@ class PythonBuilder {
             // Add all imported files to archive
             this.listener.onBuildProgress(step, 'Adding imported files to archive...');
             const sitePackagesDir = `${process.env.PYTHON_SITE_PACKAGES}-lambda`;
+            // Add local Python files to archive
+            if (local_files && local_files.length > 0) {
+                local_files.forEach((localFile) => {
+                    const fullPath = path_1.default.join(this.builder.projectDir, localFile);
+                    if (fs_1.default.existsSync(fullPath)) {
+                        stepArchiver.append(fs_1.default.createReadStream(fullPath), localFile);
+                    }
+                });
+                this.listener.onBuildProgress(step, `Added ${local_files.length} local Python files to archive`);
+            }
             (0, include_static_files_1.includeStaticFiles)([step], this.builder, stepArchiver);
             if (packages.length > 0) {
                 await Promise.all(packages.map(async (packageName) => (0, add_package_to_archive_1.addPackageToArchive)(stepArchiver, sitePackagesDir, packageName)));

package/dist/cjs/cloud/build/builders/python/python-builder.py

@@ -82,6 +82,23 @@ def is_builtin_module(module_name: str) -> bool:
     """Check if a module is a Python built-in module."""
     if module_name in _builtin_modules_cache:
         return True
+    
+    # First check if it's a known built-in module name
+    builtin_modules = {
+        'os', 'sys', 'json', 'math', 'random', 'datetime', 'time', 'urllib', 'http', 
+        'pathlib', 're', 'collections', 'itertools', 'functools', 'operator', 'typing',
+        'io', 'csv', 'xml', 'html', 'email', 'base64', 'hashlib', 'hmac', 'uuid',
+        'pickle', 'sqlite3', 'logging', 'unittest', 'argparse', 'configparser',
+        'tempfile', 'shutil', 'glob', 'fnmatch', 'subprocess', 'threading', 'queue',
+        'multiprocessing', 'concurrent', 'asyncio', 'socket', 'ssl', 'gzip', 'zipfile',
+        'tarfile', 'zlib', 'bz2', 'lzma', 'struct', 'array', 'ctypes', 'mmap',
+        'weakref', 'gc', 'inspect', 'dis', 'ast', 'token', 'tokenize', 'keyword',
+        'builtins', '__main__', 'site', 'sysconfig', 'platform', 'warnings'
+    }
+    
+    if module_name in builtin_modules:
+        _builtin_modules_cache.add(module_name)
+        return True
         
     try:
         module = importlib.import_module(module_name)
@@ -100,6 +117,8 @@ def is_builtin_module(module_name: str) -> bool:
             _builtin_modules_cache.add(module_name)
         return is_builtin
     except ImportError:
+        # If we can't import it, assume it's not a built-in module
+        # This handles local modules that aren't in the current Python path
         return False
 
 def get_direct_imports(file_path: str) -> Set[str]:
@@ -127,6 +146,101 @@ def get_direct_imports(file_path: str) -> Set[str]:
     
     return direct_imports
 
+def get_all_python_files(project_root: str) -> List[str]:
+    """Get all Python files in the project."""
+    python_files = []
+    for root, dirs, files in os.walk(project_root):
+        # Skip common directories
+        dirs[:] = [d for d in dirs if not d.startswith('.') and d not in 
+                  {'__pycache__', 'node_modules', 'dist', 'build', 'venv'}]
+        
+        for file in files:
+            if file.endswith('.py') and not file.startswith('.'):
+                full_path = os.path.join(root, file)
+                relative_path = os.path.relpath(full_path, project_root)
+                python_files.append(relative_path)
+    
+    return python_files
+
+def get_imports_from_file(file_path: str) -> Set[str]:
+    """Get all import module names from a Python file."""
+    imports = set()
+    
+    try:
+        with open(file_path, 'r') as f:
+            content = f.read()
+        
+        tree = ast.parse(content)
+        for node in ast.walk(tree):
+            if isinstance(node, ast.Import):
+                for name in node.names:
+                    imports.add(name.name)
+            elif isinstance(node, ast.ImportFrom):
+                if node.module:
+                    imports.add(node.module)
+    except Exception as e:
+        print(f"Warning: Could not parse imports from {file_path}: {str(e)}")
+    
+    return imports
+
+def get_local_files_for_entry(entry_file: str) -> List[str]:
+    """Get local Python files that are imported by the entry file."""
+    # Find project root
+    project_root = os.path.dirname(entry_file)
+    while project_root != os.path.dirname(project_root):
+        if any(os.path.exists(os.path.join(project_root, f)) 
+               for f in ['package.json', 'requirements.txt']):
+            break
+        project_root = os.path.dirname(project_root)
+    
+    # Get all Python files in the project
+    all_python_files = get_all_python_files(project_root)
+    
+    # Get imports from the entry file
+    imports = get_imports_from_file(entry_file)
+    
+    # Check which imports match local Python files
+    local_files = []
+    for import_name in imports:
+        for py_file in all_python_files:
+            # Convert file path to module name (e.g., 'utils/example.py' -> 'utils.example')
+            module_name = py_file.replace(os.sep, '.').replace('.py', '')
+            if import_name == module_name:
+                local_files.append(py_file)
+    
+    return sorted(local_files)
+
+def trace_imports(entry_file: str) -> List[str]:
+    """Find all imported Python packages from entry file and its local imports."""
+    entry_file = os.path.abspath(entry_file)
+    
+    # Get local files that are imported
+    local_files = get_local_files_for_entry(entry_file)
+    
+    # Get project root
+    project_root = os.path.dirname(entry_file)
+    while project_root != os.path.dirname(project_root):
+        if any(os.path.exists(os.path.join(project_root, f)) 
+               for f in ['package.json', 'requirements.txt']):
+            break
+        project_root = os.path.dirname(project_root)
+    
+    # Get imports from entry file and local files
+    all_packages = set()
+    processed_packages = set()
+    files_to_process = [entry_file] + [os.path.join(project_root, f) for f in local_files]
+    
+    for python_file in files_to_process:
+        if os.path.exists(python_file):
+            direct_imports = get_direct_imports(python_file)
+            for package_name in direct_imports:
+                if is_valid_package_name(package_name) and not is_builtin_module(package_name):
+                    all_packages.add(package_name)
+                    # Get all dependencies including sub-dependencies
+                    all_packages.update(get_package_dependencies(package_name, processed_packages))
+    
+    return sorted(list(all_packages))
+
 @lru_cache(maxsize=1024)
 def is_optional_dependency(req: str) -> bool:
     """Check if a dependency is an optional dependency."""
@@ -175,33 +289,6 @@ def get_package_dependencies(package_name: str, processed: Set[str] = None) -> S
     
     return all_dependencies
 
-def trace_imports(entry_file: str) -> List[str]:
-    """Find all imported Python packages and files starting from an entry file."""
-    entry_file = os.path.abspath(entry_file)
-    module_dir = os.path.dirname(entry_file)
-    
-    if module_dir not in sys.path:
-        sys.path.insert(0, module_dir)
-    
-    # Get direct imports from the entry file
-    direct_imports = get_direct_imports(entry_file)
-    
-    # Initialize sets to track packages
-    all_packages = set()
-    processed_packages = set()
-    
-    # Process each direct import and its dependencies
-    for package_name in direct_imports:
-        if is_valid_package_name(package_name):
-            all_packages.add(package_name)
-            # Get all dependencies including sub-dependencies
-            all_packages.update(get_package_dependencies(package_name, processed_packages))
-    
-    # Filter out built-in packages
-    non_builtin_packages = {pkg for pkg in all_packages if not is_builtin_module(pkg)}
-    
-    return sorted(list(non_builtin_packages))
-
 def main() -> None:
     """Main entry point for the script."""
     if len(sys.argv) != 2:
@@ -211,8 +298,13 @@ def main() -> None:
     entry_file = sys.argv[1]
     try:
         packages = trace_imports(entry_file)
+        local_files = get_local_files_for_entry(entry_file)
+        
+
+        
         output = {
-            'packages': packages
+            'packages': packages,
+            'local_files': local_files
         }
         bytes_message = (json.dumps(output) + '\n').encode('utf-8')
         os.write(NODEIPCFD, bytes_message)

package/dist/cjs/create/templates/basic-tutorial/01-api.step.ts.txt

@@ -5,18 +5,11 @@ import { petStoreService } from './services/pet-store'
 export const config: ApiRouteConfig = {
   type: 'api',
   name: 'ApiTrigger',
-  description:
-    'basic-tutorial api trigger, it uses the petstore public api to create a new pet and emits a topic to proces an order if an item is included.',
-  /**
-   * The flows this step belongs to, will be available in Workbench
-   */
+  description: 'basic-tutorial api trigger',
   flows: ['basic-tutorial'],
 
   method: 'POST',
   path: '/basic-tutorial',
-  /**
-   * Expected request body for type checking and documentation
-   */
   bodySchema: z.object({
     pet: z.object({
       name: z.string(),
@@ -29,44 +22,22 @@ export const config: ApiRouteConfig = {
       })
       .optional(),
   }),
-
-  /**
-   * Expected response body for type checking and documentation
-   */
   responseSchema: {
     200: z.object({
       message: z.string(),
       traceId: z.string(),
     }),
   },
-
-  /**
-   * This API Step emits events to topic `process-food-order`
-   */
   emits: ['process-food-order'],
-
-  /**
-   * We're using virtual subscribes to virtually connect noop step
-   * to this step.
-   *
-   * Noop step is defined in noop.step.ts
-   */
-  virtualSubscribes: ['/basic-tutorial'],
 }
 
 export const handler: Handlers['ApiTrigger'] = async (req, { logger, emit, traceId }) => {
-  /**
-   * Avoid usage of console.log, use logger instead
-   */
   logger.info('Step 01 – Processing API Step', { body: req.body })
 
   const { pet, foodOrder } = req.body
 
   const newPetRecord = await petStoreService.createPet(pet)
 
-  /**
-   * Emit events to the topics to process asynchronously
-   */
   if (foodOrder) {
     await emit({
       topic: 'process-food-order',
@@ -77,9 +48,6 @@ export const handler: Handlers['ApiTrigger'] = async (req, { logger, emit, trace
     })
   }
 
-  /**
-   * Return data back to the client
-   */
   return {
     status: 200,
     body: {

package/dist/cjs/create/templates/basic-tutorial/02-process-food-order.step.ts.txt

@@ -5,48 +5,24 @@ import { petStoreService } from './services/pet-store'
 export const config: EventConfig = {
   type: 'event',
   name: 'ProcessFoodOrder',
-  description:
-    'basic-tutorial event step, this example shows how to consume an event from a topic and persist data in state',
-  /**
-   * The flows this step belongs to, will be available in Workbench
-   */
+  description: 'basic-tutorial event step, demonstrates how to consume an event from a topic and persist data in state',
   flows: ['basic-tutorial'],
-
-  /**
-   * This step subscribes to the event `process-food-order` to
-   * be processed asynchronously.
-   */
   subscribes: ['process-food-order'],
-
-  /**
-   * It ultimately emits an event to `new-order-notification` topic.
-   */
   emits: ['new-order-notification'],
-
-  /**
-   * Definition of the expected input
-   */
-  input: z.object({ id: z.string(), quantity: z.number(), petId: z.number() }),
+  input: z.object({
+    id: z.string(),
+    quantity: z.number(),
+    petId: z.number(),
+  }),
 }
 
 export const handler: Handlers['ProcessFoodOrder'] = async (input, { traceId, logger, state, emit }) => {
-  /**
-   * Avoid usage of console.log, use logger instead
-   */
   logger.info('Step 02 – Process food order', { input, traceId })
 
   const order = await petStoreService.createOrder(input)
 
-  /**
-   * Persist content on state to be used by other steps
-   * or in other workflows later
-   */
   await state.set<string>('orders', order.id, order)
 
-  /**
-   * Emit events to the topics to process separately
-   * on another step
-   */
   await emit({
     topic: 'new-order-notification',
     data: { order_id: order.id },

package/dist/cjs/create/templates/basic-tutorial/04_new_order_notifications.step.py.txt

@@ -1,3 +1,8 @@
+from pydantic import BaseModel, Field
+
+class NewOrderNotificationInput(BaseModel):
+    order_id: str = Field(description="pet store order id")
+
 config = {
     "type": "event",
     "name": "NewOrderNotifications",
@@ -5,7 +10,7 @@ config = {
     "subscribes": ["new-order-notification"],
     "emits": [],
     "flows": ["basic-tutorial"],
-    "input": None,  # Replace with Pydantic model for validation
+    "input": NewOrderNotificationInput.model_json_schema(),
 }
 
 async def handler(input, ctx):

package/dist/cjs/create/templates/basic-tutorial/motia-workbench.json

@@ -3,24 +3,25 @@
     "id": "basic-tutorial",
     "config": {
       "steps/basic-tutorial/04_new_order_notifications.step.py": {
-        "x": 524,
-        "y": 532
+        "x": 668,
+        "y": 266,
+        "targetHandlePosition": "left"
       },
       "steps/basic-tutorial/03-state-audit-cron.step.ts": {
-        "x": -834,
-        "y": 195
+        "x": 224,
+        "y": 520
       },
       "steps/basic-tutorial/02-process-food-order.step.ts": {
-        "x": 69,
-        "y": 512
+        "x": 220,
+        "y": 242,
+        "sourceHandlePosition": "right",
+        "targetHandlePosition": "left"
       },
       "steps/basic-tutorial/01-api.step.ts": {
-        "x": -375,
-        "y": 452
-      },
-      "steps/basic-tutorial/00-noop.step.ts": {
-        "x": -833,
-        "y": 492
+        "x": -243,
+        "y": 199,
+        "sourceHandlePosition": "right",
+        "targetHandlePosition": "left"
       }
     }
   }

package/dist/cjs/create/templates/generate.js

@@ -55,7 +55,9 @@ const generateTemplateSteps = (templateFolder) => {
                 }
                 const sanitizedFileName = fileName.replace('.txt', '');
                 const isWorkbenchConfig = fileName.match('motia-workbench.json');
-                const generateFilePath = path.join(...(isWorkbenchConfig ? [rootDir, sanitizedFileName] : [rootDir, templateFolder, sanitizedFileName]));
+                const generateFilePath = path.join(...(isWorkbenchConfig
+                    ? [rootDir.match(/steps/) ? path.join(rootDir, '..') : rootDir, sanitizedFileName]
+                    : [rootDir, templateFolder, sanitizedFileName]));
                 let content = await fs_1.promises.readFile(filePath, 'utf8');
                 // Make sure statSync doesn't break the execution if the file doesn't exist
                 try {

package/dist/cjs/create/templates/generate.ts

@@ -28,7 +28,9 @@ export const generateTemplateSteps = (templateFolder: string): Generator => {
         const sanitizedFileName = fileName.replace('.txt', '')
         const isWorkbenchConfig = fileName.match('motia-workbench.json')
         const generateFilePath = path.join(
-          ...(isWorkbenchConfig ? [rootDir, sanitizedFileName] : [rootDir, templateFolder, sanitizedFileName]),
+          ...(isWorkbenchConfig
+            ? [rootDir.match(/steps/) ? path.join(rootDir, '..') : rootDir, sanitizedFileName]
+            : [rootDir, templateFolder, sanitizedFileName]),
         )
         let content = await fs.readFile(filePath, 'utf8')
 

package/dist/esm/cli.js

@@ -27,6 +27,7 @@ program
     .option('-c, --cursor', 'Copy .cursor folder from template')
     .option('-i, --interactive', 'Use interactive prompts to create project')
     .option('-y, --skip-confirmation', 'Skip confirmation prompt')
+    .option('-d, --skip-tutorial', 'Skip the motia tutorial', false)
     .action(handler(async (arg, context) => {
     if (arg.name || arg.template || arg.cursor) {
         const { create } = require('./create');
@@ -34,7 +35,8 @@ program
             type: 'confirm',
             name: 'disableTutorial',
             message: 'Do you wish to disable the motia tutorial?',
-            default: false,
+            default: arg.skipTutorial,
+            when: () => arg.skipTutorial === false,
         });
         await create({
             projectName: arg.name ?? '.',

package/dist/esm/cloud/build/builders/python/index.js

@@ -17,12 +17,21 @@ export class PythonBuilder {
         const normalizedEntrypointPath = entrypointPath.replace(/[.]step.py$/, '_step.py');
         const sitePackagesDir = `${process.env.PYTHON_SITE_PACKAGES}-lambda`;
         // Get Python builder response
-        const { packages } = await this.getPythonBuilderData(step);
+        const { packages, local_files } = await this.getPythonBuilderData(step);
         // Add main file to archive
         if (!fs.existsSync(step.filePath)) {
             throw new Error(`Source file not found: ${step.filePath}`);
         }
         archive.append(fs.createReadStream(step.filePath), path.relative(this.builder.projectDir, normalizedEntrypointPath));
+        // Add local Python files to archive
+        if (local_files && local_files.length > 0) {
+            local_files.forEach((localFile) => {
+                const fullPath = path.join(this.builder.projectDir, localFile);
+                if (fs.existsSync(fullPath)) {
+                    archive.append(fs.createReadStream(fullPath), localFile);
+                }
+            });
+        }
         await Promise.all(packages.map(async (packageName) => addPackageToArchive(archive, sitePackagesDir, packageName)));
         return normalizedEntrypointPath;
     }
@@ -36,7 +45,7 @@ export class PythonBuilder {
             fs.mkdirSync(path.dirname(outfile), { recursive: true });
             this.listener.onBuildStart(step);
             // Get Python builder response
-            const { packages } = await this.getPythonBuilderData(step);
+            const { packages, local_files } = await this.getPythonBuilderData(step);
             const stepArchiver = new Archiver(outfile);
             const stepPath = await this.buildStep(step, stepArchiver);
             // Add main file to archive
@@ -47,6 +56,16 @@ export class PythonBuilder {
             // Add all imported files to archive
             this.listener.onBuildProgress(step, 'Adding imported files to archive...');
             const sitePackagesDir = `${process.env.PYTHON_SITE_PACKAGES}-lambda`;
+            // Add local Python files to archive
+            if (local_files && local_files.length > 0) {
+                local_files.forEach((localFile) => {
+                    const fullPath = path.join(this.builder.projectDir, localFile);
+                    if (fs.existsSync(fullPath)) {
+                        stepArchiver.append(fs.createReadStream(fullPath), localFile);
+                    }
+                });
+                this.listener.onBuildProgress(step, `Added ${local_files.length} local Python files to archive`);
+            }
             includeStaticFiles([step], this.builder, stepArchiver);
             if (packages.length > 0) {
                 await Promise.all(packages.map(async (packageName) => addPackageToArchive(stepArchiver, sitePackagesDir, packageName)));

package/dist/esm/cloud/build/builders/python/python-builder.py

@@ -82,6 +82,23 @@ def is_builtin_module(module_name: str) -> bool:
     """Check if a module is a Python built-in module."""
     if module_name in _builtin_modules_cache:
         return True
+    
+    # First check if it's a known built-in module name
+    builtin_modules = {
+        'os', 'sys', 'json', 'math', 'random', 'datetime', 'time', 'urllib', 'http', 
+        'pathlib', 're', 'collections', 'itertools', 'functools', 'operator', 'typing',
+        'io', 'csv', 'xml', 'html', 'email', 'base64', 'hashlib', 'hmac', 'uuid',
+        'pickle', 'sqlite3', 'logging', 'unittest', 'argparse', 'configparser',
+        'tempfile', 'shutil', 'glob', 'fnmatch', 'subprocess', 'threading', 'queue',
+        'multiprocessing', 'concurrent', 'asyncio', 'socket', 'ssl', 'gzip', 'zipfile',
+        'tarfile', 'zlib', 'bz2', 'lzma', 'struct', 'array', 'ctypes', 'mmap',
+        'weakref', 'gc', 'inspect', 'dis', 'ast', 'token', 'tokenize', 'keyword',
+        'builtins', '__main__', 'site', 'sysconfig', 'platform', 'warnings'
+    }
+    
+    if module_name in builtin_modules:
+        _builtin_modules_cache.add(module_name)
+        return True
         
     try:
         module = importlib.import_module(module_name)
@@ -100,6 +117,8 @@ def is_builtin_module(module_name: str) -> bool:
             _builtin_modules_cache.add(module_name)
         return is_builtin
     except ImportError:
+        # If we can't import it, assume it's not a built-in module
+        # This handles local modules that aren't in the current Python path
         return False
 
 def get_direct_imports(file_path: str) -> Set[str]:
@@ -127,6 +146,101 @@ def get_direct_imports(file_path: str) -> Set[str]:
     
     return direct_imports
 
+def get_all_python_files(project_root: str) -> List[str]:
+    """Get all Python files in the project."""
+    python_files = []
+    for root, dirs, files in os.walk(project_root):
+        # Skip common directories
+        dirs[:] = [d for d in dirs if not d.startswith('.') and d not in 
+                  {'__pycache__', 'node_modules', 'dist', 'build', 'venv'}]
+        
+        for file in files:
+            if file.endswith('.py') and not file.startswith('.'):
+                full_path = os.path.join(root, file)
+                relative_path = os.path.relpath(full_path, project_root)
+                python_files.append(relative_path)
+    
+    return python_files
+
+def get_imports_from_file(file_path: str) -> Set[str]:
+    """Get all import module names from a Python file."""
+    imports = set()
+    
+    try:
+        with open(file_path, 'r') as f:
+            content = f.read()
+        
+        tree = ast.parse(content)
+        for node in ast.walk(tree):
+            if isinstance(node, ast.Import):
+                for name in node.names:
+                    imports.add(name.name)
+            elif isinstance(node, ast.ImportFrom):
+                if node.module:
+                    imports.add(node.module)
+    except Exception as e:
+        print(f"Warning: Could not parse imports from {file_path}: {str(e)}")
+    
+    return imports
+
+def get_local_files_for_entry(entry_file: str) -> List[str]:
+    """Get local Python files that are imported by the entry file."""
+    # Find project root
+    project_root = os.path.dirname(entry_file)
+    while project_root != os.path.dirname(project_root):
+        if any(os.path.exists(os.path.join(project_root, f)) 
+               for f in ['package.json', 'requirements.txt']):
+            break
+        project_root = os.path.dirname(project_root)
+    
+    # Get all Python files in the project
+    all_python_files = get_all_python_files(project_root)
+    
+    # Get imports from the entry file
+    imports = get_imports_from_file(entry_file)
+    
+    # Check which imports match local Python files
+    local_files = []
+    for import_name in imports:
+        for py_file in all_python_files:
+            # Convert file path to module name (e.g., 'utils/example.py' -> 'utils.example')
+            module_name = py_file.replace(os.sep, '.').replace('.py', '')
+            if import_name == module_name:
+                local_files.append(py_file)
+    
+    return sorted(local_files)
+
+def trace_imports(entry_file: str) -> List[str]:
+    """Find all imported Python packages from entry file and its local imports."""
+    entry_file = os.path.abspath(entry_file)
+    
+    # Get local files that are imported
+    local_files = get_local_files_for_entry(entry_file)
+    
+    # Get project root
+    project_root = os.path.dirname(entry_file)
+    while project_root != os.path.dirname(project_root):
+        if any(os.path.exists(os.path.join(project_root, f)) 
+               for f in ['package.json', 'requirements.txt']):
+            break
+        project_root = os.path.dirname(project_root)
+    
+    # Get imports from entry file and local files
+    all_packages = set()
+    processed_packages = set()
+    files_to_process = [entry_file] + [os.path.join(project_root, f) for f in local_files]
+    
+    for python_file in files_to_process:
+        if os.path.exists(python_file):
+            direct_imports = get_direct_imports(python_file)
+            for package_name in direct_imports:
+                if is_valid_package_name(package_name) and not is_builtin_module(package_name):
+                    all_packages.add(package_name)
+                    # Get all dependencies including sub-dependencies
+                    all_packages.update(get_package_dependencies(package_name, processed_packages))
+    
+    return sorted(list(all_packages))
+
 @lru_cache(maxsize=1024)
 def is_optional_dependency(req: str) -> bool:
     """Check if a dependency is an optional dependency."""
@@ -175,33 +289,6 @@ def get_package_dependencies(package_name: str, processed: Set[str] = None) -> S
     
     return all_dependencies
 
-def trace_imports(entry_file: str) -> List[str]:
-    """Find all imported Python packages and files starting from an entry file."""
-    entry_file = os.path.abspath(entry_file)
-    module_dir = os.path.dirname(entry_file)
-    
-    if module_dir not in sys.path:
-        sys.path.insert(0, module_dir)
-    
-    # Get direct imports from the entry file
-    direct_imports = get_direct_imports(entry_file)
-    
-    # Initialize sets to track packages
-    all_packages = set()
-    processed_packages = set()
-    
-    # Process each direct import and its dependencies
-    for package_name in direct_imports:
-        if is_valid_package_name(package_name):
-            all_packages.add(package_name)
-            # Get all dependencies including sub-dependencies
-            all_packages.update(get_package_dependencies(package_name, processed_packages))
-    
-    # Filter out built-in packages
-    non_builtin_packages = {pkg for pkg in all_packages if not is_builtin_module(pkg)}
-    
-    return sorted(list(non_builtin_packages))
-
 def main() -> None:
     """Main entry point for the script."""
     if len(sys.argv) != 2:
@@ -211,8 +298,13 @@ def main() -> None:
     entry_file = sys.argv[1]
     try:
         packages = trace_imports(entry_file)
+        local_files = get_local_files_for_entry(entry_file)
+        
+
+        
         output = {
-            'packages': packages
+            'packages': packages,
+            'local_files': local_files
         }
         bytes_message = (json.dumps(output) + '\n').encode('utf-8')
         os.write(NODEIPCFD, bytes_message)

package/dist/esm/create/templates/basic-tutorial/01-api.step.ts.txt

@@ -5,18 +5,11 @@ import { petStoreService } from './services/pet-store'
 export const config: ApiRouteConfig = {
   type: 'api',
   name: 'ApiTrigger',
-  description:
-    'basic-tutorial api trigger, it uses the petstore public api to create a new pet and emits a topic to proces an order if an item is included.',
-  /**
-   * The flows this step belongs to, will be available in Workbench
-   */
+  description: 'basic-tutorial api trigger',
   flows: ['basic-tutorial'],
 
   method: 'POST',
   path: '/basic-tutorial',
-  /**
-   * Expected request body for type checking and documentation
-   */
   bodySchema: z.object({
     pet: z.object({
       name: z.string(),
@@ -29,44 +22,22 @@ export const config: ApiRouteConfig = {
       })
       .optional(),
   }),
-
-  /**
-   * Expected response body for type checking and documentation
-   */
   responseSchema: {
     200: z.object({
       message: z.string(),
       traceId: z.string(),
     }),
   },
-
-  /**
-   * This API Step emits events to topic `process-food-order`
-   */
   emits: ['process-food-order'],
-
-  /**
-   * We're using virtual subscribes to virtually connect noop step
-   * to this step.
-   *
-   * Noop step is defined in noop.step.ts
-   */
-  virtualSubscribes: ['/basic-tutorial'],
 }
 
 export const handler: Handlers['ApiTrigger'] = async (req, { logger, emit, traceId }) => {
-  /**
-   * Avoid usage of console.log, use logger instead
-   */
   logger.info('Step 01 – Processing API Step', { body: req.body })
 
   const { pet, foodOrder } = req.body
 
   const newPetRecord = await petStoreService.createPet(pet)
 
-  /**
-   * Emit events to the topics to process asynchronously
-   */
   if (foodOrder) {
     await emit({
       topic: 'process-food-order',
@@ -77,9 +48,6 @@ export const handler: Handlers['ApiTrigger'] = async (req, { logger, emit, trace
     })
   }
 
-  /**
-   * Return data back to the client
-   */
   return {
     status: 200,
     body: {

package/dist/esm/create/templates/basic-tutorial/02-process-food-order.step.ts.txt

@@ -5,48 +5,24 @@ import { petStoreService } from './services/pet-store'
 export const config: EventConfig = {
   type: 'event',
   name: 'ProcessFoodOrder',
-  description:
-    'basic-tutorial event step, this example shows how to consume an event from a topic and persist data in state',
-  /**
-   * The flows this step belongs to, will be available in Workbench
-   */
+  description: 'basic-tutorial event step, demonstrates how to consume an event from a topic and persist data in state',
   flows: ['basic-tutorial'],
-
-  /**
-   * This step subscribes to the event `process-food-order` to
-   * be processed asynchronously.
-   */
   subscribes: ['process-food-order'],
-
-  /**
-   * It ultimately emits an event to `new-order-notification` topic.
-   */
   emits: ['new-order-notification'],
-
-  /**
-   * Definition of the expected input
-   */
-  input: z.object({ id: z.string(), quantity: z.number(), petId: z.number() }),
+  input: z.object({
+    id: z.string(),
+    quantity: z.number(),
+    petId: z.number(),
+  }),
 }
 
 export const handler: Handlers['ProcessFoodOrder'] = async (input, { traceId, logger, state, emit }) => {
-  /**
-   * Avoid usage of console.log, use logger instead
-   */
   logger.info('Step 02 – Process food order', { input, traceId })
 
   const order = await petStoreService.createOrder(input)
 
-  /**
-   * Persist content on state to be used by other steps
-   * or in other workflows later
-   */
   await state.set<string>('orders', order.id, order)
 
-  /**
-   * Emit events to the topics to process separately
-   * on another step
-   */
   await emit({
     topic: 'new-order-notification',
     data: { order_id: order.id },

package/dist/esm/create/templates/basic-tutorial/04_new_order_notifications.step.py.txt

@@ -1,3 +1,8 @@
+from pydantic import BaseModel, Field
+
+class NewOrderNotificationInput(BaseModel):
+    order_id: str = Field(description="pet store order id")
+
 config = {
     "type": "event",
     "name": "NewOrderNotifications",
@@ -5,7 +10,7 @@ config = {
     "subscribes": ["new-order-notification"],
     "emits": [],
     "flows": ["basic-tutorial"],
-    "input": None,  # Replace with Pydantic model for validation
+    "input": NewOrderNotificationInput.model_json_schema(),
 }
 
 async def handler(input, ctx):

package/dist/esm/create/templates/basic-tutorial/motia-workbench.json

@@ -3,24 +3,25 @@
     "id": "basic-tutorial",
     "config": {
       "steps/basic-tutorial/04_new_order_notifications.step.py": {
-        "x": 524,
-        "y": 532
+        "x": 668,
+        "y": 266,
+        "targetHandlePosition": "left"
       },
       "steps/basic-tutorial/03-state-audit-cron.step.ts": {
-        "x": -834,
-        "y": 195
+        "x": 224,
+        "y": 520
       },
       "steps/basic-tutorial/02-process-food-order.step.ts": {
-        "x": 69,
-        "y": 512
+        "x": 220,
+        "y": 242,
+        "sourceHandlePosition": "right",
+        "targetHandlePosition": "left"
       },
       "steps/basic-tutorial/01-api.step.ts": {
-        "x": -375,
-        "y": 452
-      },
-      "steps/basic-tutorial/00-noop.step.ts": {
-        "x": -833,
-        "y": 492
+        "x": -243,
+        "y": 199,
+        "sourceHandlePosition": "right",
+        "targetHandlePosition": "left"
       }
     }
   }

package/dist/esm/create/templates/generate.js

@@ -19,7 +19,9 @@ export const generateTemplateSteps = (templateFolder) => {
                 }
                 const sanitizedFileName = fileName.replace('.txt', '');
                 const isWorkbenchConfig = fileName.match('motia-workbench.json');
-                const generateFilePath = path.join(...(isWorkbenchConfig ? [rootDir, sanitizedFileName] : [rootDir, templateFolder, sanitizedFileName]));
+                const generateFilePath = path.join(...(isWorkbenchConfig
+                    ? [rootDir.match(/steps/) ? path.join(rootDir, '..') : rootDir, sanitizedFileName]
+                    : [rootDir, templateFolder, sanitizedFileName]));
                 let content = await fs.readFile(filePath, 'utf8');
                 // Make sure statSync doesn't break the execution if the file doesn't exist
                 try {

package/dist/esm/create/templates/generate.ts

@@ -28,7 +28,9 @@ export const generateTemplateSteps = (templateFolder: string): Generator => {
         const sanitizedFileName = fileName.replace('.txt', '')
         const isWorkbenchConfig = fileName.match('motia-workbench.json')
         const generateFilePath = path.join(
-          ...(isWorkbenchConfig ? [rootDir, sanitizedFileName] : [rootDir, templateFolder, sanitizedFileName]),
+          ...(isWorkbenchConfig
+            ? [rootDir.match(/steps/) ? path.join(rootDir, '..') : rootDir, sanitizedFileName]
+            : [rootDir, templateFolder, sanitizedFileName]),
         )
         let content = await fs.readFile(filePath, 'utf8')
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "motia",
   "description": "A Modern Unified Backend Framework for APIs, Events and Agents",
-  "version": "0.5.10-beta.118",
+  "version": "0.5.11-beta.120-742949",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -43,9 +43,9 @@
     "inquirer": "^8.2.5",
     "table": "^6.9.0",
     "ts-node": "^10.9.2",
-    "@motiadev/core": "0.5.10-beta.118",
-    "@motiadev/stream-client-node": "0.5.10-beta.118",
-    "@motiadev/workbench": "0.5.10-beta.118"
+    "@motiadev/stream-client-node": "0.5.11-beta.120-742949",
+    "@motiadev/workbench": "0.5.11-beta.120-742949",
+    "@motiadev/core": "0.5.11-beta.120-742949"
   },
   "devDependencies": {
     "@amplitude/analytics-types": "^2.9.2",

package/dist/cjs/create/templates/basic-tutorial/00-noop.step.ts.txt

@@ -1,30 +0,0 @@
-import { NoopConfig } from 'motia'
-
-/**
- * NOOP Steps don't hold any logic in code, it's a
- * way to connect nodes in workflow to make it comprehensive
- * like representing a man in the loop or a manual operation that can
- * happen between one step and another.
- *
- * For more information, refer to the documentation: https://www.motia.dev/docs/workbench/noop-steps
- */
-export const config: NoopConfig = {
-  type: 'noop',
-  name: 'ExternalRequest',
-  description: 'basic-tutorial noop step example, representing an external http request',
-
-  /**
-   * Used mostly to connect nodes that emit to this
-   */
-  virtualSubscribes: [],
-
-  /**
-   * Used mostly to connect nodes that subscribes to this
-   */
-  virtualEmits: ['/basic-tutorial'],
-
-  /**
-   * The flows this step belongs to, will be available in Workbench
-   */
-  flows: ['basic-tutorial'],
-}

package/dist/esm/create/templates/basic-tutorial/00-noop.step.ts.txt

@@ -1,30 +0,0 @@
-import { NoopConfig } from 'motia'
-
-/**
- * NOOP Steps don't hold any logic in code, it's a
- * way to connect nodes in workflow to make it comprehensive
- * like representing a man in the loop or a manual operation that can
- * happen between one step and another.
- *
- * For more information, refer to the documentation: https://www.motia.dev/docs/workbench/noop-steps
- */
-export const config: NoopConfig = {
-  type: 'noop',
-  name: 'ExternalRequest',
-  description: 'basic-tutorial noop step example, representing an external http request',
-
-  /**
-   * Used mostly to connect nodes that emit to this
-   */
-  virtualSubscribes: [],
-
-  /**
-   * Used mostly to connect nodes that subscribes to this
-   */
-  virtualEmits: ['/basic-tutorial'],
-
-  /**
-   * The flows this step belongs to, will be available in Workbench
-   */
-  flows: ['basic-tutorial'],
-}