Merge pull request #143 from devchat-ai/ignore_exception_without_git

handle git missing error

Author: yangbobo2021

devchat/_cli/run.py

@@ -4,14 +4,17 @@
 import sys
 from typing import List
 import rich_click as click
-from git import Repo, GitCommandError
+try:
+    from git import Repo, GitCommandError
+except Exception:
+    pass
 from devchat._cli.utils import init_dir, handle_errors, valid_git_repo, clone_git_repo
+from devchat._cli.utils import download_and_extract_workflow
 from devchat.engine import Namespace, CommandParser, RecursivePrompter
 from devchat.utils import get_logger
 
 logger = get_logger(__name__)
 
-
 @click.command(
     help="The 'command' argument is the name of the command to run or get information about.")
 @click.argument('command', required=False, default='')
@@ -44,7 +47,11 @@ def run(command: str, list_flag: bool, recursive_flag: bool, update_sys_flag: bo
                 'https://gitee.com/devchat-ai/workflows.git',
                 'https://github.com/devchat-ai/workflows.git'
             ]
-            _clone_or_pull_git_repo(sys_dir, git_urls)
+            zip_urls = [
+                'https://gitlab.com/devchat-ai/workflows/-/archive/main/workflows-main.zip',
+                'https://codeload.github.com/devchat-ai/workflows/zip/refs/heads/main'
+            ]
+            _clone_or_pull_git_repo(sys_dir, git_urls, zip_urls)
             return
 
         if list_flag:
@@ -72,13 +79,23 @@ def run(command: str, list_flag: bool, recursive_flag: bool, update_sys_flag: bo
             return
 
 
-def _clone_or_pull_git_repo(target_dir: str, repo_urls: List[str]):
+def _clone_or_pull_git_repo(target_dir: str, repo_urls: List[str], zip_urls: List[str]):
     """
     Clone a Git repository to a specified location, or pull it if it already exists.
 
     :param target_dir: The path where the repository should be cloned.
     :param repo_urls: A list of possible Git repository URLs.
     """
+    if shutil.which('git') is None:
+        # If Git is not installed, download and extract the workflow
+        for url in zip_urls:
+            try:
+                download_and_extract_workflow(url, target_dir)
+                break
+            except Exception as err:
+                logger.exception("Failed to download and extract workflow: %s", err)
+        return
+
     if os.path.exists(target_dir):
         if valid_git_repo(target_dir, repo_urls):
             try:

devchat/_cli/utils.py

@@ -2,8 +2,14 @@
 import os
 import sys
 import json
+import shutil
 from typing import Tuple, List, Optional, Any
-from git import Repo, InvalidGitRepositoryError, GitCommandError
+import zipfile
+import requests
+try:
+    from git import Repo, InvalidGitRepositoryError, GitCommandError
+except Exception:
+    pass
 import rich_click as click
 from devchat.config import ConfigManager, OpenAIModelConfig
 from devchat.utils import find_root_dir, add_gitignore, setup_logger, get_logger
@@ -12,6 +18,31 @@
 logger = get_logger(__name__)
 
 
+def download_and_extract_workflow(workflow_url, target_dir):
+    # Download the workflow zip file
+    response = requests.get(workflow_url, stream=True, timeout=10)
+    # Downaload file to temp dir
+    os.makedirs(target_dir, exist_ok=True)
+    zip_path = os.path.join(target_dir, 'workflow.zip')
+    with open(zip_path, 'wb') as file_handle:
+        for chunk in response.iter_content(chunk_size=8192):
+            if chunk:
+                file_handle.write(chunk)
+
+    # Extract the zip file
+    parent_dir = os.path.dirname(target_dir)
+    with zipfile.ZipFile(zip_path, 'r') as zip_ref:
+        zip_ref.extractall(parent_dir)
+
+    # Delete target directory if exists
+    if os.path.exists(target_dir):
+        shutil.rmtree(target_dir)
+
+    # Rename extracted directory to target directory
+    extracted_dir = os.path.join(parent_dir, 'workflows-main')
+    os.rename(extracted_dir, target_dir)
+
+
 @contextmanager
 def handle_errors():
     """Handle errors in the CLI."""

devchat/utils.py

@@ -119,7 +119,11 @@ def get_user_info() -> Tuple[str, str]:
         cmd = ['git', 'config', 'user.name']
         user_name = subprocess.check_output(cmd, encoding='utf-8').strip()
     except Exception:
-        user_name = getpass.getuser()
+        try:
+            user_name = getpass.getuser()
+        except Exception:
+            user_dir = os.path.expanduser("~")
+            user_name = user_dir.split(os.sep)[-1]
 
     try:
         cmd = ['git', 'config', 'user.email']