gOdoo-cli 0.9.5__tar.gz → 0.10.1__tar.gz

{godoo_cli-0.9.5 → godoo_cli-0.10.1}/PKG-INFO

@@ -1,13 +1,13 @@
 Metadata-Version: 2.1
 Name: gOdoo-cli
-Version: 0.9.5
+Version: 0.10.1
 Summary: Wrapper around Odoo-Bin with some convinience RPC functions.
 Home-page: https://github.com/OpenJKSoftware/gOdoo
 License: LGPL-3
 Keywords: odoo,godoo,devcontainer
 Author: Joshua Kreuder
 Author-email: Joshua_Kreuder@outlook.com
-Requires-Python: >=3.8.1,<3.12
+Requires-Python: >=3.9,<3.12
 Classifier: License :: Other/Proprietary License
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.9
@@ -19,7 +19,7 @@ Requires-Dist: black (>=22.10.0,<23.0.0) ; extra == "codequality"
 Requires-Dist: debugpy (>=1.6.0,<2.0.0) ; extra == "devcontainer"
 Requires-Dist: flake8 (>=5.0.4,<6.0.0) ; extra == "codequality"
 Requires-Dist: gitpython (>=3.1.27,<4.0.0)
-Requires-Dist: godoo-rpc (>=0.1.1,<0.2.0)
+Requires-Dist: godoo-rpc (>=0.1.2,<0.2.0)
 Requires-Dist: inotify (>=0.2.10,<0.3.0) ; extra == "devcontainer"
 Requires-Dist: ipdb (>=0.13.9,<0.14.0) ; extra == "devcontainer"
 Requires-Dist: isort (>=5.10.1,<6.0.0) ; extra == "codequality"

{godoo_cli-0.9.5 → godoo_cli-0.10.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "gOdoo-cli"
-version = "0.9.5"
+version = "0.10.1"
 description = "Wrapper around Odoo-Bin with some convinience RPC functions."
 authors = ["Joshua Kreuder <Joshua_Kreuder@outlook.com>"]
 license = "LGPL-3"
@@ -18,11 +18,11 @@ pre-commit = "^3.4.0"
 godoo = "godoo_cli:launch_cli"
 
 [tool.poetry.dependencies]
-python = ">=3.8.1,<3.12"
+python = ">=3.9,<3.12"
 python-dotenv = "^0.20.0"
 ruamel-yaml = "^0.17.21"
 gitpython = "^3.1.27"
-godoo-rpc = "^0.1.1"
+godoo-rpc = "^0.1.2"
 openupgradelib = "^3.3.4"
 psycopg2 = "^2.8.6" # Mirror Odoo Reqs
 passlib = "^1.7.3" # Mirror Odoo Reqs

{godoo_cli-0.9.5 → godoo_cli-0.10.1}/src/godoo_cli/commands/bootstrap.py

@@ -87,12 +87,6 @@ def _boostrap_command(
         if install_workspace_modules:
             if workspace_addons := get_odoo_module_paths(workspace_addon_path):
                 init_modules += [f.name for f in workspace_addons]
-        elif re.search(r"(-u|--update) ", extra_cmd_args_str):
-            # if -u is present, do not install any modules
-            pass
-        else:
-            # if no -i or -u is present, install base and web modules
-            init_modules = ["base", "web"]
     init_cmd = "--init " + ",".join(init_modules) if init_modules else ""
 
     addon_paths = [str(p.absolute()) for p in addon_paths]

{godoo_cli-0.9.5 → godoo_cli-0.10.1}/src/godoo_cli/commands/db/query.py

@@ -21,14 +21,21 @@ CLI = CommonCLI()
 
 @CLI.arg_annotator
 def query_database(
-    query: str = typer.Argument(..., help="SQL Query"),
+    query: str = typer.Argument(..., help="SQL Query. Use '-' to read from stdin."),
     db_host=CLI.database.db_host,
     db_port=CLI.database.db_port,
     db_name=CLI.database.db_name,
     db_user=CLI.database.db_user,
     db_password=CLI.database.db_password,
 ):
-    """Run a Query against the database."""
+    """Run a Query against the database.
+    Queries, with return values will be printed to stdout between "START QUERY_OUTPUT" and "END QUERY_OUTPUT".
+    """
+
+    # read stdin if query is not provided
+    if query == "-":
+        stdin = typer.get_text_stream("stdin")
+        query = stdin.read()
 
     check_dangerous_command()
     # regex to check if SQL query contains writing command
@@ -42,14 +49,20 @@ def query_database(
     )
     with connection.connect() as cursor:
         try:
-            LOGGER.info("Running Query: %s", query)
+            LOGGER.info("Running Query against Odoo DB: %s", query)
             cursor.execute(query)
             LOGGER.info("Affected Rows: %s", cursor.rowcount)
             try:
                 rows = cursor.fetchall()
+                # Use Print here to write to Stdout.
+                # START and END query are there to help parsing the actual output
+                print("START QUERY_OUTPUT")  # pylint: disable=print-used
                 for row in rows:
-                    print("\t".join(row))  # pylint: disable=print-used
+                    print_line = "\t".join(map(str, row)) if isinstance(row, tuple) else str(row)
+                    print(print_line)  # pylint: disable=print-used
+                print("END QUERY_OUTPUT")  # pylint: disable=print-used
             except ProgrammingError:
+                # When there is nothing to fetch, fetchall() raises a ProgrammingError
                 pass
         except Exception as e:
             LOGGER.exception(e)
@@ -80,7 +93,6 @@ def is_bootstrapped(
     db_password=CLI.database.db_password,
 ):
     """Check if the database is empty. Return code  = 1 if database does not exist, 2 if database is empty, 0 if database is not empty."""
-    check_dangerous_command()
     connection = DBConnection(
         hostname=db_host,
         port=db_port,

{godoo_cli-0.9.5 → godoo_cli-0.10.1}/src/godoo_cli/commands/test/cli.py

@@ -1,7 +1,7 @@
 import typer
 
 from .test_load_data import odoo_load_test_data
-from .test_run import odoo_run_tests
+from .test_run import odoo_get_changed_modules, odoo_run_tests
 
 
 def test_cli_app():
@@ -11,5 +11,6 @@ def test_cli_app():
     )
     app.command(name="run")(odoo_run_tests)
     app.command(name="load-data")(odoo_load_test_data)
+    app.command(name="get-changed-modules")(odoo_get_changed_modules)
 
     return app

{godoo_cli-0.9.5 → godoo_cli-0.10.1}/src/godoo_cli/commands/test/test_run.py

@@ -7,7 +7,7 @@ import typer
 from typing_extensions import Annotated
 
 from ...cli_common import CommonCLI
-from ...helpers.odoo_files import get_changed_modules, get_depends_of_module, get_odoo_module_paths
+from ...helpers.odoo_files import get_changed_modules_and_depends, get_odoo_module_paths
 from ...helpers.system import run_cmd
 from ..db.connection import DBConnection
 from ..launch import pre_launch
@@ -19,28 +19,33 @@ LOGGER = logging.getLogger(__name__)
 
 def _test_modules_special_cases(in_modules: List[str], workspace_addon_path: Path):
     if len(in_modules) == 1:
-        command = in_modules[0]
         out_modules = []
+        command = in_modules[0]
         if command == "all":
             out_modules = get_odoo_module_paths(workspace_addon_path)
-
-        if re_match := re.match(r"changes\:(.*)", command):
+        elif re_match := re.match(r"changes\:(.*)", command):
             compare_branch = re_match.group(1)
-            changed_modules = get_changed_modules(addon_path=workspace_addon_path, diff_branch=compare_branch)
-            if not changed_modules:
-                return []
-            change_modules_depends = []
-            for module in changed_modules:
-                change_modules_depends += get_depends_of_module(
-                    out_modules, module, already_done_modules=change_modules_depends
-                )
-            out_modules = changed_modules + change_modules_depends
-        if out_modules:
-            out_modules_with_tests = [p for p in out_modules if any(p.rglob("tests/__init__.py"))]
-            return [p.stem for p in out_modules_with_tests]
+            changed_modules = get_changed_modules_and_depends(
+                diff_ref=compare_branch,
+                addon_path=workspace_addon_path,
+            )
+            out_modules = changed_modules
+            return [p.stem for p in out_modules]
     return in_modules
 
 
+@CLI.arg_annotator
+def odoo_get_changed_modules(
+    diff_ref: str = typer.Argument(..., help="Git Ref/Branch to compare against"),
+    workspace_addon_path=CLI.odoo_paths.workspace_addon_path,
+):
+    """Get Modules that have changed compared to diff_ref"""
+    changed_modules = get_changed_modules_and_depends(diff_ref=diff_ref, addon_path=workspace_addon_path)
+    if not changed_modules:
+        return
+    print("\n".join(sorted([p.stem for p in changed_modules])))  # pylint: disable=print-used
+
+
 @CLI.arg_annotator
 def odoo_run_tests(
     test_modules: List[str] = typer.Argument(

{godoo_cli-0.9.5 → godoo_cli-0.10.1}/src/godoo_cli/helpers/cli.py

@@ -12,4 +12,4 @@ def check_dangerous_command():
 Please set 'WORKSPACE_IS_DEV=true' as environment Variable to continue
             """
         )
-        exit(1)
+        exit(420)

{godoo_cli-0.9.5 → godoo_cli-0.10.1}/src/godoo_cli/helpers/odoo_files.py

@@ -98,8 +98,9 @@ def get_odoo_module_paths(
             raise FileNotFoundError(f"Could not find odoo addon folder: '{folder}'")
         for folder in folder.iterdir():
             if folder_is_odoo_module(folder):
-                module_paths.append(folder)
+                module_paths.append(folder.absolute())
     if module_names:
+        module_names = [m for m in module_names if m != "base"]
         filtered_module_paths = [p for p in module_paths if p.stem in module_names]
         if unavailable_modules := set(module_names).difference([p.stem for p in filtered_module_paths]):
             LOGGER.warning("Could not find Module folder for: %s", unavailable_modules)
@@ -109,7 +110,7 @@ def get_odoo_module_paths(
 
 def get_changed_modules(
     addon_path: Path,
-    diff_branch: str,
+    diff_ref: str,
 ) -> List[Path]:
     """Get Paths of changed modules since git diff.
 
@@ -117,7 +118,7 @@ def get_changed_modules(
     ----------
     addon_path : Path
         Folder in git repo where to look for changes
-    diff_branch : str
+    diff_ref : str
         Branch or diffable ref for git
 
     Returns
@@ -126,10 +127,11 @@ def get_changed_modules(
         List of Paths where something has changed since git diff
     """
     addon_path = addon_path.absolute()
+    odoo_module_paths = get_odoo_module_paths(addon_path)
     repo = Repo(addon_path, search_parent_directories=True)
     git_root = Path(repo.git.rev_parse("--show-toplevel"))
     changed_module_files = []
-    for change in repo.git.diff("--name-status", diff_branch).split("\n"):
+    for change in repo.git.diff("--name-status", diff_ref).split("\n"):
         path = git_root / change.split("\t")[1]
         if addon_path in path.parents:
             changed_module_files.append(path)
@@ -137,14 +139,15 @@ def get_changed_modules(
     changed_module_folders = []
     for f in changed_module_files:
         for pf in f.parents:
-            if pf.absolute() == addon_path.absolute():
-                break
-            if pf.absolute() not in changed_module_folders and folder_is_odoo_module(pf):
+            if pf.absolute() in odoo_module_paths:
                 changed_module_folders.append(pf.absolute())
+                break
+            if pf.absolute() == addon_path:
+                break
     if changed_module_folders:
         LOGGER.debug(
             "Found Modules changed to branch '%s':\n %s",
-            diff_branch,
+            diff_ref,
             changed_module_folders,
         )
     return changed_module_folders
@@ -197,6 +200,25 @@ def get_depends_of_module(
     return list(set(sub_depends))
 
 
+def get_changed_modules_and_depends(diff_ref: str, addon_path: Path):
+    """Get Modules that have changed compared to diff_ref and all their dependencies downstream"""
+    all_modules = get_odoo_module_paths(addon_path)
+    changed_modules = get_changed_modules(addon_path=addon_path, diff_ref=diff_ref)
+    if not changed_modules:
+        return []
+    change_modules_depends = []
+    changed_module_names = [p.stem for p in changed_modules]
+    for module in all_modules:
+        # Check if there are other modules in addon path, that depend on a changed module
+        module_manifest = module / "__manifest__.py"
+        manifest = literal_eval(module_manifest.read_text())
+        depends = manifest.get("depends", [])
+        for depend in depends:
+            if depend in changed_module_names:
+                change_modules_depends.append(module)
+    return list(set(changed_modules + change_modules_depends))
+
+
 def get_addon_paths(
     odoo_main_repo: Path,
     workspace_addon_path: Path,

godoo_cli-0.10.1/src/godoo_cli/version.py

@@ -0,0 +1 @@
+__version__ = "0.10.1"

godoo_cli-0.9.5/src/godoo_cli/version.py

@@ -1 +0,0 @@
-__version__ = "0.9.5"