devgen-cli 0.2.8__tar.gz → 0.2.9__tar.gz

{devgen_cli-0.2.8/devgen_cli.egg-info → devgen_cli-0.2.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: devgen-cli
-Version: 0.2.8
+Version: 0.2.9
 Summary: A collection of developer tools
 Home-page: https://github.com/S4NKALP/devgen
 Author: Sankalp Tharu
@@ -22,7 +22,6 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: anthropic>=0.75.0
 Requires-Dist: google-genai>=0.1.0
-Requires-Dist: jinja2>=3.1.6
 Requires-Dist: openai>=2.11.0
 Requires-Dist: pyyaml>=6.0.3
 Requires-Dist: questionary>=2.1.1

{devgen_cli-0.2.8 → devgen_cli-0.2.9}/devgen/cli/commit.py

@@ -120,7 +120,7 @@ def validate() -> None:
         for f in staged:
             typer.echo(f"- {f}")
     else:
-        typer.secho("[i] No staged files.", fg=typer.colors.RED)
+        typer.secho("[i] No staged files.", fg=typer.colors.YELLOW)
 
 
 @app.command("undo")

{devgen_cli-0.2.8 → devgen_cli-0.2.9}/devgen/cli/config.py

@@ -48,6 +48,12 @@ def edit_config(
 
     if not key:
         choices = list(config.keys())
+        if not choices:
+            typer.secho(
+                "No configuration keys found. Run `devgen setup config` first.",
+                fg=typer.colors.YELLOW,
+            )
+            raise typer.Exit()
         key = questionary.select(
             "Select key to update:", choices=choices, style=style
         ).ask()

{devgen_cli-0.2.8 → devgen_cli-0.2.9}/devgen/cli/setup.py

@@ -86,13 +86,16 @@ def setup_config() -> None:
         ollama_host = ollama_host_input.strip() or ollama_host
 
     # Save Config — merge with existing to preserve extra keys
-    new_config = {**current_config, **{
-        "provider": provider,
-        "model": model,
-        "api_key": api_key,
-        "emoji": emoji,
-        "ollama_host": ollama_host,
-    }}
+    new_config = {
+        **current_config,
+        **{
+            "provider": provider,
+            "model": model,
+            "api_key": api_key,
+            "emoji": emoji,
+            "ollama_host": ollama_host,
+        },
+    }
 
     try:
         with config_path.open("w", encoding="utf-8") as f:

{devgen_cli-0.2.8 → devgen_cli-0.2.9}/devgen/modules/changelog_generator.py

@@ -32,17 +32,21 @@ class ChangelogGenerator:
         else:
             cmd = self._resolve_range(to_ref)
         try:
-            return run_git_command(cmd).split("\n")
+            output = run_git_command(cmd)
+            # Use %x00 as separator to avoid splitting on newlines in commit bodies
+            # Then filter out empty strings
+            return [c for c in output.split("\0") if c.strip()]
         except subprocess.CalledProcessError as e:
             self.logger.error(f"Git command failed: {e}")
             raise RuntimeError(f"Git command failed: {e}") from e
 
     def _log_cmd(self, range_spec: str) -> List[str]:
-        # Format: hash|author|date|subject|body
+        # Format: hash|author|date|subject|body (separated by %x00 to avoid
+        # splitting on newlines within commit bodies)
         return [
             "git",
             "log",
-            "--format=%H|%an|%ad|%s|%b",
+            "--format=%H|%an|%ad|%s|%b%x00",
             "--date=short",
             range_spec,
         ]
@@ -54,7 +58,7 @@ class ChangelogGenerator:
             return self._log_cmd(f"{last_tag}..HEAD")
         except (RuntimeError, subprocess.CalledProcessError):
             self.logger.info("No tags found, generating for all commits.")
-            return ["git", "log", "--format=%H|%an|%ad|%s|%b", "--date=short"]
+            return ["git", "log", "--format=%H|%an|%ad|%s|%b%x00", "--date=short"]
 
     # ----------------------------------------------------------------- parsing
 

{devgen_cli-0.2.8 → devgen_cli-0.2.9}/devgen/modules/commit_generator.py

@@ -33,8 +33,8 @@ from devgen.utils import (
     extract_commit_messages,
     get_commit_dry_run_path,
     is_file_recent,
-    load_template_env,
-    render_custom_template,
+    load_template,
+    render_template,
     sanitize_ai_commit_message,
 )
 
@@ -74,13 +74,13 @@ class CommitMessageBuilder:
 
     def __init__(
         self,
-        template_env,
+        template_str: str,
         config: Dict[str, Any],
         provider: str,
         model: str,
         debug: bool = False,
     ) -> None:
-        self.template_env = template_env
+        self.template_str = template_str
         self.config = config
         self.provider = provider
         self.model = model
@@ -97,25 +97,14 @@ class CommitMessageBuilder:
         use_emoji = self.config.get("emoji", True)
         ollama_host = self.config.get("ollama_host")
 
-        if custom_template:
-            prompt = render_custom_template(
-                custom_template,
-                group_name=group,
-                diff_text=diff,
-                use_emoji=use_emoji,
-                context=manifest_context,
-            )
-        else:
-            prompt = (
-                self.template_env.get_template("commit_message.tpl")
-                .render(
-                    group_name=group,
-                    diff_text=diff,
-                    use_emoji=use_emoji,
-                    context=manifest_context,
-                )
-                .strip()
-            )
+        template = custom_template or self.template_str
+        prompt = render_template(
+            template,
+            group_name=group,
+            diff_text=diff,
+            use_emoji=use_emoji,
+            context=manifest_context,
+        ).strip()
 
         provider = (
             extra_kwargs.get("provider") or self.config.get("provider") or self.provider
@@ -198,10 +187,10 @@ class CommitEngine:
             ),
             logger=self.logger,
         )
-        self.template_env = load_template_env("commit")
+        self.template_str = load_template("commit", "commit_message.tpl")
         self.cache = CacheManager(get_commit_dry_run_path())
         self.message_builder = CommitMessageBuilder(
-            self.template_env,
+            self.template_str,
             self.config,
             provider=self.provider,
             model=self.model,
@@ -388,6 +377,7 @@ def run_commit_engine(**kwargs: Any) -> None:
         sys.exit(0)
     except Exception as e:
         logger.error(f"Commit engine failed: {e}", exc_info=True)
+        sys.exit(1)
 
 
 __all__ = ["CommitEngine", "CommitEngineError", "run_commit_engine"]

{devgen_cli-0.2.8 → devgen_cli-0.2.9}/devgen/modules/diff_builder.py

@@ -14,7 +14,7 @@ from collections import defaultdict
 from pathlib import Path
 from typing import Dict, List, Optional
 
-from devgen.utils import run_git_command
+from devgen.utils import get_git_root, run_git_command
 
 
 # Lock files and other metadata blobs whose full diff would just bloat the
@@ -54,7 +54,7 @@ class DiffBuilder:
         logger=None,
     ) -> None:
         self.max_size = max_size
-        self.cwd = cwd
+        self.cwd = cwd or get_git_root()
         self.logger = logger
 
     def build(self, files: List[str]) -> str:
@@ -129,10 +129,7 @@ class FileGrouper:
             parent_path = str(Path(deepest).parent)
             new_key = "root" if parent_path == "." else parent_path
             files = groups.pop(deepest)
-            if new_key in groups:
-                groups[new_key].extend(files)
-            else:
-                groups["root"].extend(files)
+            groups.setdefault(new_key, []).extend(files)
         return groups
 
 

{devgen_cli-0.2.8 → devgen_cli-0.2.9}/devgen/modules/git_ops.py

@@ -10,7 +10,7 @@ import subprocess
 from pathlib import Path
 from typing import Optional
 
-from devgen.utils import configure_logger, run_git_command
+from devgen.utils import configure_logger, get_git_root, run_git_command
 
 
 class GitError(RuntimeError):
@@ -26,7 +26,7 @@ class GitOperator:
         logger=None,
         quiet_commands: bool = True,
     ) -> None:
-        self.cwd = cwd
+        self.cwd = cwd or get_git_root()
         self.logger = logger or configure_logger("devgen.git")
         self.quiet_commands = quiet_commands
 

{devgen_cli-0.2.8 → devgen_cli-0.2.9}/devgen/modules/gitignore_generator.py

@@ -1,3 +1,4 @@
+import re
 from pathlib import Path
 from typing import List
 
@@ -5,6 +6,9 @@ import requests
 
 from devgen.utils import configure_logger
 
+# Only allow safe characters in template names to prevent path traversal
+_TEMPLATE_NAME_RE = re.compile(r"^[a-zA-Z0-9._-]+$")
+
 
 class GitignoreGenerator:
     """Fetches and manages .gitignore templates from GitHub."""
@@ -41,6 +45,11 @@ class GitignoreGenerator:
         self, name: str, use_cache: bool = True, offline: bool = False
     ) -> str:
         """Fetches template content from cache or GitHub."""
+        if not _TEMPLATE_NAME_RE.match(name):
+            raise ValueError(
+                f"Invalid template name '{name}'. "
+                "Names must contain only alphanumeric characters, hyphens, dots, or underscores."
+            )
         cache_file = self.cache_dir / f"{name}.gitignore"
 
         if offline:

{devgen_cli-0.2.8 → devgen_cli-0.2.9}/devgen/providers/anthropic.py

@@ -16,4 +16,6 @@ class AnthropicProvider(BaseProvider):
             max_tokens=1024,
             messages=[{"role": "user", "content": prompt}],
         )
+        if not message.content:
+            raise RuntimeError(f"Anthropic returned no content for model {model!r}.")
         return message.content[0].text or ""

{devgen_cli-0.2.8 → devgen_cli-0.2.9}/devgen/providers/huggingface.py

@@ -20,7 +20,9 @@ class HuggingfaceProvider(BaseProvider):
         }
 
         try:
-            response = requests.post(api_url, headers=headers, json=payload)
+            response = requests.post(
+                api_url, headers=headers, json=payload, timeout=120
+            )
             response.raise_for_status()
             result = response.json()
         except requests.HTTPError as e:

{devgen_cli-0.2.8 → devgen_cli-0.2.9}/devgen/providers/ollama.py

@@ -18,18 +18,22 @@ class OllamaProvider(BaseProvider):
     DEFAULT_HOST = "http://localhost:11434"
     DEFAULT_MODEL = "llama3.2"
 
+    # Keys consumed by devgen itself — never forwarded to the SDK.
+    _DEVGEN_KEYS = frozenset({"debug", "ollama_host", "max_retries", "retry_delay"})
+
     def _generate(self, prompt, api_key, model, **kwargs):
         host = kwargs.get("ollama_host") or self.DEFAULT_HOST
         base_url = f"{host.rstrip('/')}/v1"
-        kwargs.pop("debug", None)
-        kwargs.pop("ollama_host", None)
-
-        client = OpenAI(base_url=base_url, api_key=api_key or "ollama")
-        response = client.chat.completions.create(
-            model=model,
-            messages=[{"role": "user", "content": prompt}],
-            **kwargs,
-        )
+
+        # Only forward known OpenAI-compatible parameters
+        safe_kwargs = {k: v for k, v in kwargs.items() if k not in self._DEVGEN_KEYS}
+
+        with OpenAI(base_url=base_url, api_key=api_key or "ollama") as client:
+            response = client.chat.completions.create(
+                model=model,
+                messages=[{"role": "user", "content": prompt}],
+                **safe_kwargs,
+            )
 
         if not response.choices:
             raise RuntimeError(

devgen_cli-0.2.9/devgen/providers/openai.py

@@ -0,0 +1,25 @@
+from openai import OpenAI
+
+from devgen.providers.base import BaseProvider
+
+
+class OpenaiProvider(BaseProvider):
+    """Generates content using OpenAI's Chat Completions API."""
+
+    DISPLAY_NAME = "OpenAI"
+    DEFAULT_MODEL = "gpt-4o"
+
+    # Keys consumed by devgen itself — never forwarded to the SDK.
+    _DEVGEN_KEYS = frozenset({"debug", "ollama_host", "max_retries", "retry_delay"})
+
+    def _generate(self, prompt, api_key, model, **kwargs):
+        safe_kwargs = {k: v for k, v in kwargs.items() if k not in self._DEVGEN_KEYS}
+        with OpenAI(api_key=api_key) as client:
+            response = client.chat.completions.create(
+                model=model,
+                messages=[{"role": "user", "content": prompt}],
+                **safe_kwargs,
+            )
+        if not response.choices:
+            raise RuntimeError(f"OpenAI returned no choices for model {model!r}.")
+        return response.choices[0].message.content or ""

devgen_cli-0.2.9/devgen/providers/openrouter.py

@@ -0,0 +1,30 @@
+from openai import OpenAI
+
+from devgen.providers.base import BaseProvider
+
+
+class OpenrouterProvider(BaseProvider):
+    """Generates content using OpenRouter (OpenAI-compatible API)."""
+
+    DISPLAY_NAME = "OpenRouter"
+    BASE_URL = "https://openrouter.ai/api/v1"
+    DEFAULT_MODEL = "openai/gpt-3.5-turbo"
+
+    # Keys consumed by devgen itself — never forwarded to the SDK.
+    _DEVGEN_KEYS = frozenset({"debug", "ollama_host", "max_retries", "retry_delay"})
+
+    def _generate(self, prompt, api_key, model, **kwargs):
+        safe_kwargs = {k: v for k, v in kwargs.items() if k not in self._DEVGEN_KEYS}
+        with OpenAI(base_url=self.BASE_URL, api_key=api_key) as client:
+            response = client.chat.completions.create(
+                model=model,
+                messages=[{"role": "user", "content": prompt}],
+                extra_headers={
+                    "HTTP-Referer": "https://github.com/S4NKALP/devgen",
+                    "X-Title": "devgen CLI",
+                },
+                **safe_kwargs,
+            )
+        if not response.choices:
+            raise RuntimeError(f"OpenRouter returned no choices for model {model!r}.")
+        return response.choices[0].message.content or ""

{devgen_cli-0.2.8 → devgen_cli-0.2.9}/devgen/utils.py

@@ -6,7 +6,6 @@ from pathlib import Path
 from typing import Any, Dict, Optional
 
 import yaml
-from jinja2 import Environment, FileSystemLoader
 
 
 def ensure_log_directory() -> Path:
@@ -24,10 +23,10 @@ def get_commit_dry_run_path() -> Path:
 
 
 def is_file_recent(file_path: Path | str, max_age_minutes: int = 120) -> bool:
-    path = Path(file_path)
-    if not path.exists():
+    try:
+        return (time.time() - Path(file_path).stat().st_mtime) <= max_age_minutes * 60
+    except FileNotFoundError:
         return False
-    return (time.time() - path.stat().st_mtime) <= max_age_minutes * 60
 
 
 def sanitize_ai_commit_message(raw_text: str) -> str:
@@ -142,6 +141,15 @@ def configure_logger(
     return logger
 
 
+def get_git_root(cwd: Optional[Path] = None) -> Optional[Path]:
+    """Return the root directory of the current git repository, or None."""
+    try:
+        output = run_git_command(["git", "rev-parse", "--show-toplevel"], cwd=cwd)
+        return Path(output) if output else None
+    except (subprocess.CalledProcessError, FileNotFoundError):
+        return None
+
+
 def run_git_command(
     args: list[str],
     check: bool = True,
@@ -193,35 +201,74 @@ def get_git_staged_files() -> list[str]:
 
 
 def read_file_content(filepath: Path | str) -> Optional[str]:
-    path = Path(filepath)
-    if path.exists():
-        return path.read_text(encoding="utf-8")
-    return None
+    try:
+        return Path(filepath).read_text(encoding="utf-8")
+    except FileNotFoundError:
+        return None
 
 
 def delete_file(filepath: Path | str) -> bool:
-    path = Path(filepath)
-    if path.exists():
-        path.unlink()
+    try:
+        Path(filepath).unlink()
         return True
-    return False
+    except FileNotFoundError:
+        return False
 
 
-def load_template_env(sub_dir: str) -> Environment:
+def load_template(sub_dir: str, name: str) -> str:
+    """Load a template file from the templates directory."""
     template_dir = Path(__file__).parent / "templates" / sub_dir
-    if not template_dir.is_dir():
+    template_path = template_dir / name
+    if not template_path.is_file():
         raise RuntimeError(
-            f"Template directory not found: {template_dir}. "
-            "The installation may be corrupted."
+            f"Template not found: {template_path}. The installation may be corrupted."
         )
-    return Environment(loader=FileSystemLoader(template_dir))
+    return template_path.read_text(encoding="utf-8")
+
+
+def render_template(template_str: str, **context) -> str:
+    """Render a simple template with variable substitution and conditionals.
+
+    Supports:
+    - {{ variable }} - variable substitution
+    - {% if condition %}...{% endif %} - conditional blocks
+    - {% if condition %}...{% else %}...{% endif %} - conditional with else
+    """
+    result = template_str
+
+    # Process conditional blocks: {% if var %}...{% endif %}
+    # and {% if var %}...{% else %}...{% endif %}
+    if_pattern = re.compile(
+        r"\{%\s*if\s+(\w+)\s*%\}(.*?)\{%\s*endif\s*%\}",
+        re.DOTALL,
+    )
+
+    def replace_if(match):
+        var_name = match.group(1)
+        content = match.group(2)
+        value = context.get(var_name)
+        if value:
+            # Check for else block
+            else_pattern = re.compile(r"\{%\s*else\s*%\}", re.DOTALL)
+            parts = else_pattern.split(content, 1)
+            return parts[0]
+        else:
+            else_pattern = re.compile(r"\{%\s*else\s*%\}", re.DOTALL)
+            parts = else_pattern.split(content, 1)
+            return parts[1] if len(parts) > 1 else ""
+
+    result = if_pattern.sub(replace_if, result)
+
+    # Process variable substitutions: {{ variable }}
+    var_pattern = re.compile(r"\{\{\s*(\w+)\s*\}\}")
+
+    def replace_var(match):
+        var_name = match.group(1)
+        return str(context.get(var_name, ""))
 
+    result = var_pattern.sub(replace_var, result)
 
-def render_custom_template(template_str: str, **context) -> str:
-    """Renders a Jinja2 template from a string."""
-    env = Environment()
-    template = env.from_string(template_str)
-    return template.render(**context)
+    return result
 
 
 def load_config() -> Dict[str, Any]:
@@ -246,7 +293,13 @@ def load_config() -> Dict[str, Any]:
 
     try:
         with config_path.open("r", encoding="utf-8") as f:
-            return yaml.safe_load(f) or {}
+            data = yaml.safe_load(f)
+            if not isinstance(data, dict):
+                print(
+                    f"Warning: Config at {config_path} is not a dict, using defaults."
+                )
+                return {}
+            return data
     except Exception as e:
         print(f"Warning: Failed to load config from {config_path}: {e}")
         return {}
@@ -323,7 +376,8 @@ __all__ = [
     "get_git_staged_files",
     "read_file_content",
     "delete_file",
-    "load_template_env",
+    "load_template",
+    "render_template",
     "load_config",
     "get_questionary_style",
     "is_token_limit_error",

{devgen_cli-0.2.8 → devgen_cli-0.2.9/devgen_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: devgen-cli
-Version: 0.2.8
+Version: 0.2.9
 Summary: A collection of developer tools
 Home-page: https://github.com/S4NKALP/devgen
 Author: Sankalp Tharu
@@ -22,7 +22,6 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: anthropic>=0.75.0
 Requires-Dist: google-genai>=0.1.0
-Requires-Dist: jinja2>=3.1.6
 Requires-Dist: openai>=2.11.0
 Requires-Dist: pyyaml>=6.0.3
 Requires-Dist: questionary>=2.1.1

{devgen_cli-0.2.8 → devgen_cli-0.2.9}/devgen_cli.egg-info/requires.txt

@@ -1,6 +1,5 @@
 anthropic>=0.75.0
 google-genai>=0.1.0
-jinja2>=3.1.6
 openai>=2.11.0
 pyyaml>=6.0.3
 questionary>=2.1.1

{devgen_cli-0.2.8 → devgen_cli-0.2.9}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "devgen-cli"
-version = "0.2.8"
+version = "0.2.9"
 description = "A collection of developer tools"
 readme = "README.md"
 requires-python = ">=3.10"
@@ -27,7 +27,6 @@ classifiers = [
 dependencies = [
     "anthropic>=0.75.0",
     "google-genai>=0.1.0",
-    "jinja2>=3.1.6",
     "openai>=2.11.0",
     "pyyaml>=6.0.3",
     "questionary>=2.1.1",

{devgen_cli-0.2.8 → devgen_cli-0.2.9}/setup.py

@@ -6,7 +6,7 @@ from setuptools import find_packages, setup
 
 setup(
     name="devgen-cli",
-    version="0.2.8",
+    version="0.2.9",
     packages=find_packages(),
     include_package_data=True,
     install_requires=[

devgen_cli-0.2.8/devgen/providers/openai.py

@@ -1,20 +0,0 @@
-from openai import OpenAI
-
-from devgen.providers.base import BaseProvider
-
-
-class OpenaiProvider(BaseProvider):
-    """Generates content using OpenAI's Chat Completions API."""
-
-    DISPLAY_NAME = "OpenAI"
-    DEFAULT_MODEL = "gpt-4o"
-
-    def _generate(self, prompt, api_key, model, **kwargs):
-        kwargs.pop("debug", None)
-        client = OpenAI(api_key=api_key)
-        response = client.chat.completions.create(
-            model=model,
-            messages=[{"role": "user", "content": prompt}],
-            **kwargs,
-        )
-        return response.choices[0].message.content or ""

devgen_cli-0.2.8/devgen/providers/openrouter.py

@@ -1,25 +0,0 @@
-from openai import OpenAI
-
-from devgen.providers.base import BaseProvider
-
-
-class OpenrouterProvider(BaseProvider):
-    """Generates content using OpenRouter (OpenAI-compatible API)."""
-
-    DISPLAY_NAME = "OpenRouter"
-    BASE_URL = "https://openrouter.ai/api/v1"
-    DEFAULT_MODEL = "openai/gpt-3.5-turbo"
-
-    def _generate(self, prompt, api_key, model, **kwargs):
-        kwargs.pop("debug", None)
-        client = OpenAI(base_url=self.BASE_URL, api_key=api_key)
-        response = client.chat.completions.create(
-            model=model,
-            messages=[{"role": "user", "content": prompt}],
-            extra_headers={
-                "HTTP-Referer": "https://github.com/S4NKALP/devgen",
-                "X-Title": "devgen CLI",
-            },
-            **kwargs,
-        )
-        return response.choices[0].message.content