golf-mcp 0.2.14__py3-none-any.whl → 0.2.15__py3-none-any.whl

golf/__init__.py

@@ -1 +1 @@
-__version__ = "0.2.14"
+__version__ = "0.2.15"

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/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.dist-info → golf_mcp-0.2.15.dist-info}/METADATA

@@ -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.dist-info → golf_mcp-0.2.15.dist-info}/RECORD

@@ -1,4 +1,4 @@
-golf/__init__.py,sha256=3fSLgeJpZq4cUgzAH_CdFzXwJEO3NH_VVDv2pQnmwN0,23
+golf/__init__.py,sha256=ogr0x4sazo5ruMrKOQDYO_YrTwtaXZTE8fKnwCajH7I,23
 golf/auth/__init__.py,sha256=sYWjWXGR70Ae87znseeBK2YWl8S1-qn_hndKf2xMULk,8173
 golf/auth/api_key.py,sha256=OonqTlG6USJxqK8TlPviJTv7sgYmTVfCxG_JsEjnEM4,2320
 golf/auth/factory.py,sha256=3-il1GbjjZlQfvWUZs-09r61Y_-b5cYEegWF7sY_cUs,13128
@@ -13,14 +13,14 @@ golf/commands/build.py,sha256=sLq9lSW4naq2vIlBreKI5SGnviQrhBWw13zfOZOKhuM,2293
 golf/commands/init.py,sha256=KkAg_3-KxBDFOcZqUHqcPAkDipykFVaLWpQ2tydnVPk,9617
 golf/commands/run.py,sha256=2fdjqTfzQL-dFOqptkl-K2jel8VWpevAx0somcjNsPI,4576
 golf/core/__init__.py,sha256=4bKeskJ2fPaZqkz2xQScSa3phRLLrmrczwSL632jv-o,52
-golf/core/builder.py,sha256=gbPOPgwUCtwDLok6czcwfPR3Ph8OEOXr2k7W-dk-vfc,80841
+golf/core/builder.py,sha256=A-QESun8Bp5tI3cimSkunudphSFzrvWWdlEAZOjMx60,81217
 golf/core/builder_auth.py,sha256=f0w9TmxvNjxglcWY8NGULZJ8mwLqtUFFb2QHzgC0xAk,8219
 golf/core/builder_metrics.py,sha256=wrXdE4_XWx7fUXnp61WU7rCBO-aG-4YzCMV6yO0z9Dg,8594
 golf/core/builder_telemetry.py,sha256=86bp7UlMUN6JyQRrZ5EizovP6AJ_q65OANJTeJXDIKc,3421
 golf/core/config.py,sha256=kL440b8i1dF8jdKeYwZZ04HdotX5CAlTyxR1ZyML-Iw,6850
 golf/core/parser.py,sha256=f9WqmLWlFuXQCObl2Qmna9bp_Bo0p0eIlukzwFaBSzo,43373
 golf/core/telemetry.py,sha256=dXoWrgrQpj_HGrl_8TBZmRnuLxFKEn0GSDWQ9qq3ZQM,15686
-golf/core/transformer.py,sha256=rcl1X4zo7FGFIcIrcialC57Rs_HzPvf9JApLLuN8xjY,8441
+golf/core/transformer.py,sha256=V5tC2eV6uCBZsiwi_CC1GjCnZ1Lrra-vVEHj09h5A6Q,9739
 golf/examples/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 golf/examples/basic/.env.example,sha256=Ktdc2Qta05smPItYHnEHhVxYPkq5JJ7i2aI5pOyyQx4,162
 golf/examples/basic/README.md,sha256=p8KMyaNXGZtrbgckW-Thu_5RKXViGiyZ5hHEiJ6Zc-U,3283
@@ -44,9 +44,9 @@ golf/utilities/__init__.py,sha256=X9iY9yi3agz1GVcn8-qWeOCt8CSSsruHxqPNtiF63TY,53
 golf/utilities/context.py,sha256=DGGvhVe---QMhy0wtdWhNp-_WVk1NvAcOFn0uBKBpYo,1579
 golf/utilities/elicitation.py,sha256=MParZZZsY45s70-KXduHa6IvpWXnLW2FCPfrGijMaHs,5223
 golf/utilities/sampling.py,sha256=88nDv-trBE4gZQbcnMjXl3LW6TiIhv5zR_cuEIGjaIM,7233
-golf_mcp-0.2.14.dist-info/licenses/LICENSE,sha256=5_j2f6fTJmvfmUewzElhkpAaXg2grVoxKouOA8ihV6E,11348
-golf_mcp-0.2.14.dist-info/METADATA,sha256=Tz_qKVbNxMorhTH5GIq_G6i2QNuVlDMiN28O1g01VZI,9414
-golf_mcp-0.2.14.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-golf_mcp-0.2.14.dist-info/entry_points.txt,sha256=5y7rHYM8jGpU-nfwdknCm5XsApLulqsnA37MO6BUTYg,43
-golf_mcp-0.2.14.dist-info/top_level.txt,sha256=BQToHcBUufdyhp9ONGMIvPE40jMEtmI20lYaKb4hxOg,5
-golf_mcp-0.2.14.dist-info/RECORD,,
+golf_mcp-0.2.15.dist-info/licenses/LICENSE,sha256=5_j2f6fTJmvfmUewzElhkpAaXg2grVoxKouOA8ihV6E,11348
+golf_mcp-0.2.15.dist-info/METADATA,sha256=9kX1_b5goRhyDLqdd0QI_S8oiXO42fz_44_WkXhdsVw,9414
+golf_mcp-0.2.15.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+golf_mcp-0.2.15.dist-info/entry_points.txt,sha256=5y7rHYM8jGpU-nfwdknCm5XsApLulqsnA37MO6BUTYg,43
+golf_mcp-0.2.15.dist-info/top_level.txt,sha256=BQToHcBUufdyhp9ONGMIvPE40jMEtmI20lYaKb4hxOg,5
+golf_mcp-0.2.15.dist-info/RECORD,,