fix: bundle .yml config files in the build

Author: remi-td

MANIFEST.in

@@ -0,0 +1,3 @@
+include README.md
+include LICENSE
+recursive-include src/teradata_mcp_server *.py *.yml

docs/server_guide/QUICK_START.md

@@ -31,8 +31,7 @@ uvx teradata-mcp-server --help
 If that works, test with your database:
 
 ```bash
-export DATABASE_URI="teradata://username:password@host:1025/database"
-uvx teradata-mcp-server --profile all
+uvx teradata-mcp-server --database_uri "teradata://username:password@host:1025/database"
 ```
 
 You should see "Created tool: [tool_name]" messages. Press `Ctrl+C` to stop.

pyproject.toml

@@ -23,7 +23,7 @@ classifiers = [
 ]
 dependencies = [
     "pydantic>=2.8.0,<3.0.0",
-    "fastmcp==2.11.3",
+    "fastmcp>=2.12.0,<3.0.0",
     "mcp[cli]>=1.0.0,<2.0.0",
     "teradatasqlalchemy>=20.0.0.0",
     "python-dotenv>=1.0.0",

src/teradata_mcp_server/tools/module_loader.py

@@ -151,26 +151,31 @@ def get_all_functions(self) -> dict[str, Any]:
 
         return all_functions
 
-    def get_required_yaml_paths(self) -> list[str]:
+    def get_required_yaml_paths(self) -> list:
         """
         Get the paths to YAML files for only the required modules.
         
         Returns:
-            List of file paths for YAML files that should be loaded
+            List of file paths/resources for YAML files that should be loaded
         """
-        import glob
-        import os
+        from importlib.resources import files as pkg_files
 
         yaml_paths = []
-        base_path = os.path.dirname(__file__)
-
-        for module_name in self._required_modules:
-            if module_name in self.MODULE_MAP:
-                # Get YAML files for this specific module
-                module_dir = os.path.join(base_path, module_name)
-                if os.path.exists(module_dir):
-                    pattern = os.path.join(module_dir, "*.yml")
-                    yaml_paths.extend(glob.glob(pattern))
+        
+        try:
+            tools_pkg_root = pkg_files("teradata_mcp_server").joinpath("tools")
+            if tools_pkg_root.is_dir():
+                for module_name in self._required_modules:
+                    if module_name in self.MODULE_MAP:
+                        module_dir = tools_pkg_root.joinpath(module_name)
+                        if module_dir.is_dir():
+                            for entry in module_dir.iterdir():
+                                if entry.is_file() and entry.name.endswith('.yml'):
+                                    yaml_paths.append(entry)
+        except Exception as e:
+            import logging
+            logger = logging.getLogger("teradata_mcp_server")
+            logger.error(f"Failed to load packaged YAML files: {e}")
 
         return yaml_paths
 

src/teradata_mcp_server/utils.py

@@ -161,22 +161,46 @@ def load_profiles(working_dir: Optional[Path] = None) -> Dict[str, Any]:
 
     # Load packaged profiles.yml
     try:
-        config_files = pkg_files("teradata_mcp_server.config")
-        profiles_file = config_files / "profiles.yml"
-        if profiles_file.is_file():
-            profiles.update(yaml.safe_load(profiles_file.read_text(encoding='utf-8')) or {})
+        import importlib.resources
+        try:
+            # Try the new importlib.resources API (Python 3.9+)
+            config_files = importlib.resources.files("teradata_mcp_server.config")
+            profiles_file = config_files / "profiles.yml"
+            logger.debug(f"Looking for packaged profiles at: {profiles_file}")
+            if profiles_file.is_file():
+                packaged_profiles = yaml.safe_load(profiles_file.read_text(encoding='utf-8')) or {}
+                profiles.update(packaged_profiles)
+                logger.info(f"Loaded {len(packaged_profiles)} packaged profiles: {list(packaged_profiles.keys())}")
+            else:
+                logger.warning(f"Packaged profiles.yml not found at: {profiles_file}")
+        except AttributeError:
+            # Fallback for older Python versions
+            import importlib.resources as resources
+            with resources.path("teradata_mcp_server.config", "profiles.yml") as profiles_path:
+                logger.debug(f"Looking for packaged profiles at: {profiles_path}")
+                if profiles_path.exists():
+                    packaged_profiles = yaml.safe_load(profiles_path.read_text(encoding='utf-8')) or {}
+                    profiles.update(packaged_profiles)
+                    logger.info(f"Loaded {len(packaged_profiles)} packaged profiles: {list(packaged_profiles.keys())}")
+                else:
+                    logger.warning(f"Packaged profiles.yml not found at: {profiles_path}")
     except Exception as e:
-        logger.error(f"Failed to load packaged profiles: {e}")
+        logger.error(f"Failed to load packaged profiles: {e}", exc_info=True)
 
     # Load working directory profiles.yml (overrides packaged)
     profiles_path = working_dir / "profiles.yml"
     if profiles_path.exists():
         try:
             with open(profiles_path, encoding='utf-8') as f:
-                profiles.update(yaml.safe_load(f) or {})
+                working_dir_profiles = yaml.safe_load(f) or {}
+                profiles.update(working_dir_profiles)
+                logger.info(f"Loaded {len(working_dir_profiles)} working directory profiles: {list(working_dir_profiles.keys())}")
         except Exception as e:
             logger.error(f"Failed to load external profiles: {e}")
+    else:
+        logger.debug(f"No working directory profiles.yml found at: {profiles_path}")
 
+    logger.info(f"Total profiles loaded: {list(profiles.keys())}")
     return profiles