Fix Azure/GitHub template selection - v0.10.9

- Fixed 'unsupported operand type(s) for /: PosixPath and NoneType' error
- Refactored template selection to return metadata without cloning
- Updated setup methods to clone repositories with pre-selected templates
- Improved error handling and user feedback

Author: alejandro.velez

src/thothctl/commands/init/commands/project.py

@@ -1,4 +1,7 @@
 import getpass
+import os
+import shutil
+import tempfile
 from pathlib import Path
 from typing import Optional, List, Any
 
@@ -170,7 +173,14 @@ def _select_azure_template(self, space: str, **kwargs) -> Optional[dict]:
         """Select template from Azure Repos"""
         try:
             from ....utils.crypto import get_credentials_with_password, save_credentials
-            from ....core.integrations.azure_devops.get_azure_devops import get_pattern_from_azure
+            from ....core.integrations.azure_devops.get_azure_devops import (
+                create_connection,
+                get_repos_patterns,
+                allowed_pattern_prefixes,
+                allowed_pattern_suffixes
+            )
+            import inquirer
+            from colorama import Fore
 
             pat = None
             org_name = None
@@ -225,16 +235,66 @@ def _select_azure_template(self, space: str, **kwargs) -> Optional[dict]:
 
             org_url = f"https://dev.azure.com/{org_name}/"
 
-            # Try to list templates
+            # Get connection and list projects
             self.ui.print_info("🔍 Fetching available templates...")
-            template_info = get_pattern_from_azure(
-                pat=pat,
-                org_url=org_url,
-                directory="temp",  # Dummy directory for listing
-                action="list",
+            conn = create_connection(personal_access_token=pat, organization_url=org_url)
+            core_client = conn.clients.get_core_client()
+            get_projects_response = core_client.get_projects()
+            
+            projects = [project.name for project in get_projects_response]
+            
+            if not projects:
+                self.ui.print_error("No projects found in Azure DevOps organization")
+                return None
+            
+            # Ask user to select project
+            questions = [
+                inquirer.List(
+                    "project",
+                    message=f"{Fore.GREEN} What is the templates project?",
+                    choices=projects,
+                ),
+            ]
+            tmp_project = inquirer.prompt(questions)
+            project_name = tmp_project["project"]
+            self.ui.print_success(f"✅ {project_name} was selected.")
+            
+            # Get repositories from selected project
+            git_client = conn.clients.get_git_client()
+            repositories = get_repos_patterns(
+                project_name=project_name,
+                git_client=git_client,
+                allowed_pattern_names=allowed_pattern_prefixes,
+                allowed_pattern_names_end=allowed_pattern_suffixes,
             )
 
-            return template_info
+            if not repositories:
+                self.ui.print_error("No template repositories found")
+                return None
+            
+            # Ask user to select repository
+            repository_names = [r["Name"] for r in repositories]
+            questions = [
+                inquirer.List(
+                    "repository",
+                    message=f"{Fore.GREEN} Select a pattern to reuse: {Fore.RESET} 🔍 ",
+                    choices=repository_names,
+                ),
+            ]
+            tmp_repo = inquirer.prompt(questions)
+            repository_name = tmp_repo["repository"]
+            repository = [r for r in repositories if r["Name"] == repository_name][0]
+            
+            self.ui.print_success(f"✅ Selected template: {repository_name}")
+            
+            # Return repository metadata for later cloning
+            return {
+                "repo_name": repository["Name"],
+                "repo_url": repository["RemoteUrl"],
+                "pat": pat,
+                "org_url": org_url,
+                "project_name": project_name,
+            }
 
         except Exception as e:
             self.ui.print_error(f"Failed to select Azure template: {e}")
@@ -299,16 +359,57 @@ def _select_github_template(self, space: str, **kwargs) -> Optional[dict]:
                 self.ui.print_error("GitHub username is required")
                 return None
 
-            # Try to list templates
+            # Get list of template repositories
             self.ui.print_info("🔍 Fetching available templates...")
-            template_info = get_pattern_from_github(
-                token=token,  # Can be None for public repos
+            
+            from ....core.integrations.github.get_github import (
+                get_repos_patterns,
+                allowed_pattern_prefixes,
+                allowed_pattern_suffixes
+            )
+            import inquirer
+            from colorama import Fore
+            import requests
+            
+            # Create session for GitHub API
+            session = requests.Session()
+            if token:
+                session.headers.update({"Authorization": f"token {token}"})
+            
+            # Get repositories matching patterns
+            repositories = get_repos_patterns(
+                session=session,
                 username=username,
-                directory="temp",  # Dummy directory for listing
-                action="list",
+                allowed_pattern_prefixes=allowed_pattern_prefixes,
+                allowed_pattern_suffixes=allowed_pattern_suffixes,
             )
 
-            return template_info
+            if not repositories:
+                self.ui.print_error("No template repositories found")
+                return None
+            
+            # Ask user to select repository
+            repository_names = [r["Name"] for r in repositories]
+            questions = [
+                inquirer.List(
+                    "repository",
+                    message=f"{Fore.GREEN} Select a pattern to reuse: {Fore.RESET} 🔍 ",
+                    choices=repository_names,
+                ),
+            ]
+            tmp_repo = inquirer.prompt(questions)
+            repository_name = tmp_repo["repository"]
+            repository = [r for r in repositories if r["Name"] == repository_name][0]
+            
+            self.ui.print_success(f"✅ Selected template: {repository_name}")
+            
+            # Return repository metadata for later cloning
+            return {
+                "repo_name": repository["Name"],
+                "repo_url": repository["RemoteUrl"],
+                "token": token,
+                "username": username,
+            }
 
         except Exception as e:
             self.ui.print_error(f"Failed to select GitHub template: {e}")

src/thothctl/services/init/project/project.py

@@ -163,14 +163,47 @@ def setup_azure_repos(
 
         # Use selected template if provided, otherwise get template
         if selected_template:
-            repo_meta = selected_template
+            # Clone the pre-selected template to project directory
+            import git
+            from ....core.integrations.azure_devops.get_azure_devops import get_latest_tag_info
+            
+            self.ui.print_info(f"📥 Cloning template: {selected_template['repo_name']}")
+            
+            repo = git.Repo.clone_from(
+                url=selected_template["repo_url"],
+                to_path=str(project_path)
+            )
+            
+            # Get tag and commit info
+            tag, sha = get_latest_tag_info(repo)
+            
+            if tag:
+                self.ui.print_success(f"✨ Latest tag: {tag}")
+            else:
+                self.ui.print_info("No tags found. Using main branch.")
+            
+            # Clean up git metadata
+            self.ui.print_info("🧹 Cleaning up metadata...")
+            g_path = project_path / ".git"
+            if g_path.exists():
+                import shutil
+                shutil.rmtree(g_path)
+            git.Repo.init(path=str(project_path), mkdir=False)
+            
+            # Create repo metadata
+            repo_meta = {
+                "repo_name": selected_template["repo_name"],
+                "repo_url": selected_template["repo_url"],
+                "commit": f"{sha}".replace('"', "'"),
+                "tag": tag,
+            }
         else:
             # Fallback to original behavior if no template was pre-selected
             org_url = f"{self.AZURE_DEVOPS_URL}/{az_org_name}/"
             repo_meta = get_pattern_from_azure(
                 pat=pat,
                 org_url=org_url,
-                directory=project_name,
+                directory=str(project_path),
                 action="reuse",
             )
 
@@ -285,13 +318,46 @@ def setup_github(
 
         # Use selected template if provided, otherwise get template
         if selected_template:
-            repo_meta = selected_template
+            # Clone the pre-selected template to project directory
+            import git
+            from ....core.integrations.github.get_github import get_latest_tag_info
+            
+            self.ui.print_info(f"📥 Cloning template: {selected_template['repo_name']}")
+            
+            repo = git.Repo.clone_from(
+                url=selected_template["repo_url"],
+                to_path=str(project_path)
+            )
+            
+            # Get tag and commit info
+            tag, sha = get_latest_tag_info(repo)
+            
+            if tag:
+                self.ui.print_success(f"✨ Latest tag: {tag}")
+            else:
+                self.ui.print_info("No tags found. Using main branch.")
+            
+            # Clean up git metadata
+            self.ui.print_info("🧹 Cleaning up metadata...")
+            g_path = project_path / ".git"
+            if g_path.exists():
+                import shutil
+                shutil.rmtree(g_path)
+            git.Repo.init(path=str(project_path), mkdir=False)
+            
+            # Create repo metadata
+            repo_meta = {
+                "repo_name": selected_template["repo_name"],
+                "repo_url": selected_template["repo_url"],
+                "commit": f"{sha}".replace('"', "'"),
+                "tag": tag,
+            }
         else:
             # Fallback to original behavior if no template was pre-selected
             repo_meta = get_pattern_from_github(
                 token=token,
                 username=github_username,
-                directory=project_name,
+                directory=str(project_path),
                 action="reuse",
             )
 

src/thothctl/version.py

@@ -1,2 +1,2 @@
 """Version module."""
-__version__ = "0.10.7"
+__version__ = "0.10.9"