Merge pull request #12 from hailangvn/project_dir

feat: add --project-dir option to create command

Author: trisdoan

odoo_venv/cli/main.py

@@ -4,6 +4,11 @@
 from typing import Annotated
 
 import typer
+from odoo_addons_path import (
+    detect_codebase_layout,
+    get_addons_path,
+    get_odoo_version_from_release,
+)
 
 from odoo_venv.exceptions import PresetNotFoundError
 from odoo_venv.launcher import create_launcher
@@ -48,6 +53,20 @@ def preset_callback(ctx: typer.Context, param: typer.CallbackParam, value: str):
     return value
 
 
+def project_dir_callback(ctx: typer.Context, param: typer.CallbackParam, value: str | None):
+    if not value:
+        return None
+
+    # Auto-apply "project" preset if no preset was explicitly set.
+    # --preset is also is_eager and declared before --project-dir, so if the user
+    # passed --preset explicitly, ctx.default_map is already populated here.
+    if not ctx.default_map:
+        preset_callback(ctx, param, "project")
+
+    ctx.ensure_object(dict)["project_dir"] = value
+    return value
+
+
 def version_callback(value: bool):
     if value:
         typer.echo(f"odoo-venv {version('odoo-venv')}")
@@ -70,10 +89,69 @@ def main_callback(
     pass
 
 
+def _detect_project_layout(project_dir_value: str) -> tuple[Path | None, str | None, str | None]:
+    """Detect odoo_dir, odoo_version, and addons_path from a project directory.
+
+    Returns:
+        (odoo_dir_path, odoo_version, addons_path) — any value may be None if not detected.
+    """
+    project_dir_path = Path(project_dir_value).expanduser().resolve()
+    detected_paths = detect_codebase_layout(project_dir_path)
+
+    addons_path = get_addons_path(project_dir_path, detected_paths=detected_paths)
+
+    # Resolve odoo_dir from detected layout
+    odoo_dir_path = None
+    if detected_paths.get("odoo_dir"):
+        odoo_dir_path = detected_paths["odoo_dir"][0].parent
+
+    # Infer version from release.py inside the detected odoo dir
+    odoo_version = None
+    if odoo_dir_path:
+        odoo_version = get_odoo_version_from_release(odoo_dir_path)
+
+    return odoo_dir_path, odoo_version, addons_path
+
+
+def _resolve_odoo_dir_and_version(
+    odoo_dir: str | None,
+    odoo_version: str | None,
+    detected_odoo_dir: Path | None,
+    detected_version: str | None,
+) -> tuple[Path, str]:
+    """Determine odoo_dir and odoo_version from explicit args or detected values.
+
+    Priority: explicit CLI flags > auto-detected from --project-dir > default path.
+    Exits with an error if neither can be resolved.
+    """
+    # Resolve odoo_dir: explicit flag > detected > default path from version
+    if odoo_dir:
+        odoo_dir_path = Path(odoo_dir).expanduser().resolve()
+    elif detected_odoo_dir:
+        odoo_dir_path = detected_odoo_dir
+    elif odoo_version:
+        odoo_dir_path = Path(f"~/code/odoo/odoo/{odoo_version}").expanduser()
+    else:
+        typer.secho("error: ODOO_VERSION is required when --project-dir is not used.", fg=typer.colors.RED)
+        raise typer.Exit(1)
+
+    # Resolve odoo_version: explicit arg > detected from release.py
+    resolved_version = odoo_version or detected_version
+    if not resolved_version:
+        typer.secho(
+            "error: Could not detect Odoo version from source. Provide ODOO_VERSION explicitly.", fg=typer.colors.RED
+        )
+        raise typer.Exit(1)
+
+    return odoo_dir_path, resolved_version
+
+
 @app.command()
 def create(
     ctx: typer.Context,
-    odoo_version: Annotated[str, typer.Argument(help="Odoo version, e.g: 18.0")],
+    odoo_version: Annotated[
+        str | None, typer.Argument(help="Odoo version, e.g: 18.0. Inferred from --project-dir if omitted.")
+    ] = None,
     python_version: Annotated[
         str | None,
         typer.Option("--python-version", "-p", help="Specify Python version."),
@@ -154,12 +232,27 @@ def create(
             help="Generate a launcher script in ~/.local/bin/.",
         ),
     ] = False,
+    project_dir: Annotated[
+        str | None,
+        typer.Option(
+            "--project-dir",
+            callback=project_dir_callback,
+            is_eager=True,
+            help="Path to project directory. Auto-detects --addons-path, --odoo-dir "
+            "via odoo-addons-path and applies --preset=project.",
+        ),
+    ] = None,
 ):
     """Create virtual environment to run Odoo"""
-    if not odoo_dir:
-        odoo_dir_path = Path(f"~/code/odoo/odoo/{odoo_version}").expanduser()
-    else:
-        odoo_dir_path = Path(odoo_dir).expanduser().resolve()
+    # Auto-detect layout from --project-dir if provided
+    project_dir_value = ctx.obj.get("project_dir") if ctx.obj else None
+    detected_odoo_dir, detected_version, detected_addons_path = (
+        _detect_project_layout(project_dir_value) if project_dir_value else (None, None, None)
+    )
+
+    odoo_dir_path, odoo_version = _resolve_odoo_dir_and_version(
+        odoo_dir, odoo_version, detected_odoo_dir, detected_version
+    )
 
     if not python_version:
         python_version = ODOO_PYTHON_VERSIONS.get(odoo_version)
@@ -173,6 +266,9 @@ def create(
         else:
             extra_requirements_list = list(extra_requirement)
 
+    if not addons_path and detected_addons_path:
+        addons_path = detected_addons_path
+
     addons_path_list = (
         [str(Path(p.strip()).expanduser().resolve()) for p in addons_path.split(",")] if addons_path else None
     )

pyproject.toml

@@ -14,6 +14,7 @@ dependencies = [
     "typing_extensions",
     "tomli",
     "packaging>=25.0",
+    "odoo-addons-path>=1.1.0",
 ]
 
 [dependency-groups]