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

golf/__init__.py

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

golf/core/builder.py

@@ -399,6 +399,11 @@ class CodeGenerator:
 
         return root_file_imports
 
+    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)
+        return {Path(filename).stem for filename in discovered_files.keys()}
+
     def _create_directory_structure(self) -> None:
         """Create the output directory structure"""
         # Create main directories
@@ -444,12 +449,14 @@ class CodeGenerator:
             target_file = target_dir / shared_file.name
 
             # Use transformer to process the file
+            root_file_modules = self._get_root_file_modules()
             transform_component(
                 component=None,
                 output_file=target_file,
                 project_path=self.project_path,
                 import_map=self.import_map,
                 source_file=shared_file,
+                root_file_modules=root_file_modules,
             )
 
     def _generate_tools(self) -> None:
@@ -474,7 +481,10 @@ class CodeGenerator:
 
             # Create the tool file
             output_file = tool_dir / rel_path.name
-            transform_component(tool, output_file, self.project_path, self.import_map)
+            root_file_modules = self._get_root_file_modules()
+            transform_component(
+                tool, output_file, self.project_path, self.import_map, root_file_modules=root_file_modules
+            )
 
     def _generate_resources(self) -> None:
         """Generate code for all resources."""
@@ -498,7 +508,10 @@ class CodeGenerator:
 
             # Create the resource file
             output_file = resource_dir / rel_path.name
-            transform_component(resource, output_file, self.project_path, self.import_map)
+            root_file_modules = self._get_root_file_modules()
+            transform_component(
+                resource, output_file, self.project_path, self.import_map, root_file_modules=root_file_modules
+            )
 
     def _generate_prompts(self) -> None:
         """Generate code for all prompts."""
@@ -522,7 +535,10 @@ class CodeGenerator:
 
             # Create the prompt file
             output_file = prompt_dir / rel_path.name
-            transform_component(prompt, output_file, self.project_path, self.import_map)
+            root_file_modules = self._get_root_file_modules()
+            transform_component(
+                prompt, output_file, self.project_path, self.import_map, root_file_modules=root_file_modules
+            )
 
     def _get_transport_config(self, transport_type: str) -> dict:
         """Get transport-specific configuration (primarily for endpoint path display).
@@ -1720,8 +1736,6 @@ def discover_root_files(project_path: Path) -> dict[str, Path]:
     Returns:
         Dictionary mapping filenames to their full paths
     """
-    import ast
-
     discovered_files = {}
 
     # Files that are handled specially by Golf and should not be auto-copied
@@ -1757,19 +1771,11 @@ def discover_root_files(project_path: Path) -> dict[str, Path]:
             if filename.startswith(".") or filename.startswith("_") or filename.endswith("~"):
                 continue
 
-            # Validate it's a readable Python file
+            # Just verify it's a readable file
             try:
                 with open(file_path, encoding="utf-8") as f:
-                    # Read first 200 chars to validate it's a proper Python file
-                    content = f.read(200)
-
-                # Basic Python syntax validation
-                try:
-                    ast.parse(content + "\n# truncated for validation")
-                except SyntaxError:
-                    # Still include files with syntax errors, but warn
-                    console.print(f"[yellow]Warning: {filename} has syntax issues but will be included[/yellow]")
-
+                    # Just check if file is readable - don't validate syntax
+                    f.read(1)  # Read one character to verify readability
             except (OSError, UnicodeDecodeError) as e:
                 console.print(f"[yellow]Warning: Cannot read {filename}, skipping: {e}[/yellow]")
                 continue

golf/core/transformer.py

@@ -20,6 +20,7 @@ class ImportTransformer(ast.NodeTransformer):
         target_path: Path,
         import_map: dict[str, str],
         project_root: Path,
+        root_file_modules: set[str] | None = None,
     ) -> None:
         """Initialize the import transformer.
 
@@ -28,14 +29,34 @@ class ImportTransformer(ast.NodeTransformer):
             target_path: Path to the target file
             import_map: Mapping of original module paths to generated paths
             project_root: Root path of the project
+            root_file_modules: Set of root file module names (without .py extension)
         """
         self.original_path = original_path
         self.target_path = target_path
         self.import_map = import_map
         self.project_root = project_root
+        self.root_file_modules = root_file_modules or set()
 
     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))
+            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)):
+            return ast.Import(names=new_names)
+
         return node
 
     def visit_ImportFrom(self, node: ast.ImportFrom) -> Any:
@@ -43,6 +64,11 @@ class ImportTransformer(ast.NodeTransformer):
         if node.module is None:
             return node
 
+        # 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)
+
         # Handle relative imports
         if node.level > 0:
             # Calculate the source module path
@@ -98,6 +124,7 @@ def transform_component(
     project_path: Path,
     import_map: dict[str, str],
     source_file: Path | None = None,
+    root_file_modules: set[str] | None = None,
 ) -> str:
     """Transform a GolfMCP component into a standalone FastMCP component.
 
@@ -107,6 +134,7 @@ def transform_component(
         project_path: Path to the project root
         import_map: Mapping of original module paths to generated paths
         source_file: Optional path to source file (for shared files)
+        root_file_modules: Set of root file module names (without .py extension)
 
     Returns:
         Generated component code
@@ -126,7 +154,7 @@ def transform_component(
     tree = ast.parse(source_code)
 
     # Transform imports
-    transformer = ImportTransformer(file_path, output_file, import_map, project_path)
+    transformer = ImportTransformer(file_path, output_file, import_map, project_path, root_file_modules)
     tree = transformer.visit(tree)
 
     # Get all imports and docstring

{golf_mcp-0.2.13.dist-info → golf_mcp-0.2.14.dist-info}/METADATA

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

{golf_mcp-0.2.13.dist-info → golf_mcp-0.2.14.dist-info}/RECORD

@@ -1,4 +1,4 @@
-golf/__init__.py,sha256=C0atO05M0rfDTTHt02NxNa4jt0eSqXM4AxShEhb2epA,23
+golf/__init__.py,sha256=3fSLgeJpZq4cUgzAH_CdFzXwJEO3NH_VVDv2pQnmwN0,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=7NuRoIGpmqT0vg2ZF5vMA-T6kBfcJOEi1oPwVUKJBes,80427
+golf/core/builder.py,sha256=gbPOPgwUCtwDLok6czcwfPR3Ph8OEOXr2k7W-dk-vfc,80841
 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=iTDNFqdVeOjzl-acdjp8ZaTXss8Eptqu5cs4qLWt9SU,6914
+golf/core/transformer.py,sha256=rcl1X4zo7FGFIcIrcialC57Rs_HzPvf9JApLLuN8xjY,8441
 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.13.dist-info/licenses/LICENSE,sha256=5_j2f6fTJmvfmUewzElhkpAaXg2grVoxKouOA8ihV6E,11348
-golf_mcp-0.2.13.dist-info/METADATA,sha256=P-2vXyg5M1YIAvvgMr7NBeViHlPSTs7wGpc0RUyUQys,9414
-golf_mcp-0.2.13.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-golf_mcp-0.2.13.dist-info/entry_points.txt,sha256=5y7rHYM8jGpU-nfwdknCm5XsApLulqsnA37MO6BUTYg,43
-golf_mcp-0.2.13.dist-info/top_level.txt,sha256=BQToHcBUufdyhp9ONGMIvPE40jMEtmI20lYaKb4hxOg,5
-golf_mcp-0.2.13.dist-info/RECORD,,
+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,,