golf-mcp 0.2.14__tar.gz → 0.2.15__tar.gz

{golf_mcp-0.2.14/src/golf_mcp.egg-info → golf_mcp-0.2.15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: golf-mcp
-Version: 0.2.14
+Version: 0.2.15
 Summary: Framework for building MCP servers
 Author-email: Antoni Gmitruk <antoni@golf.dev>
 License-Expression: Apache-2.0

{golf_mcp-0.2.14 → golf_mcp-0.2.15}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "golf-mcp"
-version = "0.2.14"
+version = "0.2.15"
 description = "Framework for building MCP servers"
 authors = [
     {name = "Antoni Gmitruk", email = "antoni@golf.dev"}

golf_mcp-0.2.15/src/golf/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.2.15"

{golf_mcp-0.2.14 → golf_mcp-0.2.15}/src/golf/core/builder.py

@@ -341,6 +341,13 @@ class CodeGenerator:
         self.manifest = {}
         self.shared_files = {}
         self.import_map = {}
+        self._root_files_cache = None  # Cache for discovered root files
+
+    def _get_cached_root_files(self) -> dict[str, Path]:
+        """Get cached root files, discovering them only once."""
+        if self._root_files_cache is None:
+            self._root_files_cache = discover_root_files(self.project_path)
+        return self._root_files_cache
 
     def generate(self) -> None:
         """Generate the FastMCP application code."""
@@ -386,7 +393,7 @@ class CodeGenerator:
     def _generate_root_file_imports(self) -> list[str]:
         """Generate import statements for automatically discovered root files."""
         root_file_imports = []
-        discovered_files = discover_root_files(self.project_path)
+        discovered_files = self._get_cached_root_files()
 
         if discovered_files:
             root_file_imports.append("# Import root-level Python files")
@@ -401,7 +408,7 @@ class CodeGenerator:
 
     def _get_root_file_modules(self) -> set[str]:
         """Get set of root file module names for import transformation."""
-        discovered_files = discover_root_files(self.project_path)
+        discovered_files = self._get_cached_root_files()
         return {Path(filename).stem for filename in discovered_files.keys()}
 
     def _create_directory_structure(self) -> None:
@@ -1612,8 +1619,8 @@ def build_project(
         shutil.copy2(health_path, output_dir)
         console.print(get_status_text("success", "Health script copied to build directory"))
 
-    # Copy any additional Python files from project root
-    discovered_root_files = discover_root_files(project_path)
+    # Copy any additional Python files from project root (reuse cached discovery from generator)
+    discovered_root_files = generator._get_cached_root_files()
 
     for filename, file_path in discovered_root_files.items():
         dest_path = output_dir / filename

{golf_mcp-0.2.14 → golf_mcp-0.2.15}/src/golf/core/transformer.py

@@ -37,26 +37,53 @@ class ImportTransformer(ast.NodeTransformer):
         self.project_root = project_root
         self.root_file_modules = root_file_modules or set()
 
+    def _calculate_import_depth(self) -> int:
+        """Calculate the relative import depth needed to reach build root from component location."""
+        try:
+            # Get component path relative to project root
+            relative_path = self.target_path.relative_to(self.project_root)
+
+            # Count directory levels: components/tools/weather.py = 2 levels, needs level=2
+            # components/tools/api/handler.py = 3 levels, needs level=3
+            # Build root contains the root files, so depth = number of path parts
+            return len(relative_path.parts) - 1  # Subtract 1 for the filename itself
+
+        except ValueError:
+            # Fallback to level=3 if path calculation fails
+            return 3
+
     def visit_Import(self, node: ast.Import) -> Any:
         """Transform import statements."""
-        # Check if any of the imported names are root file modules
         new_names = []
+
         for alias in node.names:
             module_name = alias.name
 
-            # If this is a root file module, we need to adjust the import path
             if module_name in self.root_file_modules:
-                # Components are in components/tools/, components/resources/, etc.
-                # Root files are in the build root, so we need to go up directories
-                # to reach them: ../../module_name
-                new_names.append(ast.alias(name=f"...{module_name}", asname=alias.asname))
+                # Calculate dynamic depth based on component location
+                depth = self._calculate_import_depth()
+
+                # Convert to from-import: import config -> from ...config import config
+                # Or if there's an asname: import config as cfg -> from ...config import config as cfg
+                if alias.asname:
+                    # import config as cfg -> from ...config import config as cfg
+                    import_name = module_name
+                    asname = alias.asname
+                else:
+                    # import config -> from ...config import config
+                    import_name = module_name
+                    asname = None
+
+                # Return a from-import instead of continuing with import
+                return ast.ImportFrom(
+                    module=module_name, names=[ast.alias(name=import_name, asname=asname)], level=depth
+                )
             else:
                 new_names.append(alias)
 
-        # If we made any changes, return a new node
-        if any(alias.name != orig_alias.name for alias, orig_alias in zip(new_names, node.names, strict=False)):
+        # If no root modules, return original or modified import
+        if new_names != list(node.names):
             return ast.Import(names=new_names)
-
         return node
 
     def visit_ImportFrom(self, node: ast.ImportFrom) -> Any:
@@ -66,8 +93,9 @@ class ImportTransformer(ast.NodeTransformer):
 
         # Check if this is importing from a root file module
         if node.level == 0 and node.module in self.root_file_modules:
-            # Convert to relative import: from env import API_KEY -> from ...env import API_KEY
-            return ast.ImportFrom(module=node.module, names=node.names, level=3)
+            # Calculate dynamic depth instead of using hardcoded level=3
+            depth = self._calculate_import_depth()
+            return ast.ImportFrom(module=node.module, names=node.names, level=depth)
 
         # Handle relative imports
         if node.level > 0:
@@ -175,13 +203,10 @@ def transform_component(
         if isinstance(node, ast.Import | ast.ImportFrom):
             imports.append(node)
 
-    # Generate the transformed code
-    transformed_imports = ast.unparse(ast.Module(body=imports, type_ignores=[]))
-
-    # Build full transformed code
-    transformed_code = transformed_imports + "\n\n"
+    # Build full transformed code - start with docstring first (Python convention)
+    transformed_code = ""
 
-    # Add docstring if present, using proper triple quotes for multi-line docstrings
+    # Add docstring first if present, using proper triple quotes for multi-line docstrings
     if docstring:
         # Check if docstring contains newlines
         if "\n" in docstring:
@@ -191,6 +216,11 @@ def transform_component(
             # Use single quotes for single-line docstrings
             transformed_code += f'"{docstring}"\n\n'
 
+    # Add transformed imports after docstring
+    if imports:
+        transformed_imports = ast.unparse(ast.Module(body=imports, type_ignores=[]))
+        transformed_code += transformed_imports + "\n\n"
+
     # Add the rest of the code except imports and the original docstring
     remaining_nodes = []
     for node in tree.body:

{golf_mcp-0.2.14 → golf_mcp-0.2.15/src/golf_mcp.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: golf-mcp
-Version: 0.2.14
+Version: 0.2.15
 Summary: Framework for building MCP servers
 Author-email: Antoni Gmitruk <antoni@golf.dev>
 License-Expression: Apache-2.0

golf_mcp-0.2.14/src/golf/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.2.14"