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

golf/__init__.py

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

golf/core/builder.py

@@ -383,6 +383,27 @@ class CodeGenerator:
         console.print()
         console.print(get_status_text("success", f"Build completed successfully in {output_dir_display}"))
 
+    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)
+
+        if discovered_files:
+            root_file_imports.append("# Import root-level Python files")
+
+            for filename in sorted(discovered_files.keys()):
+                module_name = Path(filename).stem  # env.py -> env
+                root_file_imports.append(f"import {module_name}")
+
+            root_file_imports.append("")  # Blank line
+
+        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
@@ -428,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:
@@ -458,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."""
@@ -482,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."""
@@ -506,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).
@@ -810,6 +842,11 @@ class CodeGenerator:
             "",
         ]
 
+        # Add imports for root files
+        root_file_imports = self._generate_root_file_imports()
+        if root_file_imports:
+            imports.extend(root_file_imports)
+
         # Add auth imports if auth is configured
         if auth_components.get("has_auth"):
             imports.extend(auth_components["imports"])
@@ -1575,6 +1612,17 @@ 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)
+
+    for filename, file_path in discovered_root_files.items():
+        dest_path = output_dir / filename
+        try:
+            shutil.copy2(file_path, dest_path)
+            console.print(get_status_text("success", f"Root file {filename} copied to build directory"))
+        except (OSError, shutil.Error) as e:
+            console.print(f"[red]Error copying {filename}: {e}[/red]")
+
     # Create a simple README
     readme_content = f"""# {settings.name}
 
@@ -1674,6 +1722,76 @@ from golf.auth.providers import RemoteAuthConfig, JWTAuthConfig, StaticTokenConf
                 )
 
 
+def discover_root_files(project_path: Path) -> dict[str, Path]:
+    """Automatically discover all Python files in the project root directory.
+
+    This function finds all .py files in the project root, excluding:
+    - Special Golf files (startup.py, health.py, readiness.py, auth.py, server.py)
+    - Component directories (tools/, resources/, prompts/)
+    - Hidden files and common exclusions (__pycache__, .git, etc.)
+
+    Args:
+        project_path: Path to the project root directory
+
+    Returns:
+        Dictionary mapping filenames to their full paths
+    """
+    discovered_files = {}
+
+    # Files that are handled specially by Golf and should not be auto-copied
+    reserved_files = {
+        "startup.py",
+        "health.py",
+        "readiness.py",
+        "auth.py",
+        "server.py",
+        "pre_build.py",  # Legacy auth file
+        "golf.json",
+        "golf.toml",  # Config files
+        "__init__.py",  # Package files
+    }
+
+    # Find all .py files in the project root (not in subdirectories)
+    try:
+        for file_path in project_path.iterdir():
+            if not file_path.is_file():
+                continue
+
+            filename = file_path.name
+
+            # Skip non-Python files
+            if not filename.endswith(".py"):
+                continue
+
+            # Skip reserved/special files
+            if filename in reserved_files:
+                continue
+
+            # Skip hidden files and temporary files
+            if filename.startswith(".") or filename.startswith("_") or filename.endswith("~"):
+                continue
+
+            # Just verify it's a readable file
+            try:
+                with open(file_path, encoding="utf-8") as f:
+                    # 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
+
+            discovered_files[filename] = file_path
+
+    except OSError as e:
+        console.print(f"[yellow]Warning: Error scanning project directory: {e}[/yellow]")
+
+    if discovered_files:
+        file_list = ", ".join(sorted(discovered_files.keys()))
+        console.print(f"[dim]Found root Python files: {file_list}[/dim]")
+
+    return discovered_files
+
+
 # Legacy function removed - replaced by parse_shared_files in parser module
 
 

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: golf-mcp
-Version: 0.2.12
+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.12.dist-info → golf_mcp-0.2.14.dist-info}/RECORD

@@ -1,4 +1,4 @@
-golf/__init__.py,sha256=X4KG3FscE5AhbGbcdDDgdDC550CVpxNMwdNLcx6EQ7M,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=ynmzTF1IsF5OTZl0dr-1Mzd8iEVNB-Oxa6RBWBu3DRs,76372
+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.12.dist-info/licenses/LICENSE,sha256=5_j2f6fTJmvfmUewzElhkpAaXg2grVoxKouOA8ihV6E,11348
-golf_mcp-0.2.12.dist-info/METADATA,sha256=RksLyay82K3poGEAup26_dMaRw06Z9ZnOwC3iFWHel8,9414
-golf_mcp-0.2.12.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-golf_mcp-0.2.12.dist-info/entry_points.txt,sha256=5y7rHYM8jGpU-nfwdknCm5XsApLulqsnA37MO6BUTYg,43
-golf_mcp-0.2.12.dist-info/top_level.txt,sha256=BQToHcBUufdyhp9ONGMIvPE40jMEtmI20lYaKb4hxOg,5
-golf_mcp-0.2.12.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,,