gOdoo-cli 0.15.0__tar.gz → 0.15.1__tar.gz

{godoo_cli-0.15.0 → godoo_cli-0.15.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gOdoo-cli
-Version: 0.15.0
+Version: 0.15.1
 Summary: Wrapper around Odoo-Bin with some convinience RPC functions.
 Project-URL: repository, https://github.com/OpenJKSoftware/gOdoo
 Author-email: Joshua Kreuder <Joshua_Kreuder@outlook.com>

{godoo_cli-0.15.0 → godoo_cli-0.15.1}/src/godoo_cli/__about__.py

@@ -2,7 +2,7 @@
 
 from packaging import version
 
-__version__ = "0.15.0"  # Initial version, will be managed by Hatch
+__version__ = "0.15.1"  # Initial version, will be managed by Hatch
 
 
 def get_version_tuple() -> tuple[int, int, int]:

{godoo_cli-0.15.0 → godoo_cli-0.15.1}/src/godoo_cli/commands/db/query.py

@@ -41,6 +41,7 @@ def query_database(
     db_host: Annotated[str, CLI.database.db_host] = "",
     db_port: Annotated[int, CLI.database.db_port] = 0,
     db_password: Annotated[str, CLI.database.db_password] = "",
+    readonly: Annotated[bool, typer.Option(help="Run query in readonly mode", show_default=True)] = True,
 ):
     """Run a Query against the database.
 
@@ -60,6 +61,7 @@ def query_database(
         username=db_user,
         password=db_password,
         db_name=db_name,
+        readonly=readonly,
     )
     with connection.connect() as cursor:
         try:
@@ -114,6 +116,7 @@ def is_bootstrapped(
         username=db_user,
         password=db_password,
         db_name=db_name,
+        readonly=True,
     )
     bootstrap_value = _is_bootstrapped(db_connection=connection)
     LOGGER.info("Odoo Database Status: %s", bootstrap_value.value)
@@ -162,6 +165,7 @@ def get_installed_modules(
         username=db_user,
         password=db_password,
         db_name=db_name,
+        readonly=True,
     )
     installed_modules = _get_installed_modules(db_connection=db_connection, to_install=to_install)
     if isinstance(installed_modules, int):

{godoo_cli-0.15.0 → godoo_cli-0.15.1}/src/godoo_cli/commands/odoo_bin/cli_generate.py

@@ -7,6 +7,7 @@ from pathlib import Path
 from typing import Any, Optional
 
 from ...models import GodooConfig, GodooModules
+from ..db.query import DbBootstrapStatus, _is_bootstrapped
 
 LOGGER = logging.getLogger(__name__)
 
@@ -99,15 +100,23 @@ def _boostrap_command(
     init_modules = []
 
     extra_cmd_args_str = " ".join(extra_cmd_args or [])
-    if not re.search(r"(-i|--init) ", extra_cmd_args_str):
-        if install_workspace_modules:
-            workspace_modules = GodooModules([godoo_config.workspace_addon_path])
-            if workspace_addons := workspace_modules.get_modules():
-                init_modules = [
-                    f.name for f in workspace_addons if f.version.split(".")[0] == godoo_config.odoo_version.major
-                ]
+    if install_workspace_modules and not re.search(r"(-i|--init|-u|--update) ", extra_cmd_args_str):
+        LOGGER.debug("Auto-detecting workspace modules for Bootstrapping")
+        workspace_modules = GodooModules([godoo_config.workspace_addon_path])
+        if workspace_addons := workspace_modules.get_modules():
+            init_modules = [
+                f.name for f in workspace_addons if f.version.split(".")[0] == godoo_config.odoo_version.major
+            ]
         init_modules = init_modules or ["base", "web"]
-    init_cmd = "--init " + ",".join(init_modules) if init_modules else ""
+
+    # if we are in a situation, where we call godoo bootstrap on a database that already has data,
+    # we should not pass --init but --update
+    init_cmd = ""
+    if init_modules:
+        if _is_bootstrapped(godoo_config.db_connection) == DbBootstrapStatus.BOOTSTRAPPED:
+            init_cmd = "--update " + ",".join(init_modules)
+        else:
+            init_cmd = "--init " + ",".join(init_modules)
 
     addon_paths_str_list = [str(p.absolute()) for p in addon_paths if p and p.exists()]
     addon_paths_str = ", ".join(addon_paths_str_list)

{godoo_cli-0.15.0 → godoo_cli-0.15.1}/src/godoo_cli/commands/odoo_bin/shell.py

@@ -20,6 +20,8 @@ from ...models import GodooConfig
 CLI = CommonCLI()
 LOGGER = logging.getLogger(__name__)
 
+SHELL_SCRIPTS_PATH = Path(__file__).parent / "shell_scripts"
+
 
 def odoo_shell_uninstall_modules(
     module_list: Annotated[list[str], typer.Argument(help="List of Modules to uninstall")],
@@ -89,8 +91,7 @@ def complete_script_name():
     Returns:
         List[str]: List of script names without their .py extension.
     """
-    script_folder = Path(__file__).parent / "shell-scripts"
-    return [p.stem for p in script_folder.glob("*.py")]
+    return [p.stem for p in SHELL_SCRIPTS_PATH.glob("*.py")]
 
 
 def odoo_shell_run_script(
@@ -114,10 +115,9 @@ def odoo_shell_run_script(
     Returns:
         int: 0 for success, non-zero for failure.
     """
-    script_folder = Path(__file__).parent / "scripts"
-    script_path = script_folder / f"{script_name}.py"
+    script_path = SHELL_SCRIPTS_PATH / f"{script_name}.py"
     if not script_path.exists():
-        LOGGER.error("Script '%s' not found in %s", script_name, script_folder)
+        LOGGER.error("Script '%s' not found in %s", script_name, SHELL_SCRIPTS_PATH)
         return CLI.returner(1)
 
     shell_cmd = f"{odoo_main_path.absolute()!s}/odoo-bin shell --no-http"

{godoo_cli-0.15.0 → godoo_cli-0.15.1}/src/godoo_cli/models/db_connection.py

@@ -39,6 +39,7 @@ class DBConnection:
     password: str
     db_name: str
     conn_timeout = 10
+    readonly: bool = False
 
     def get_connection(self):
         """Get a database connection."""
@@ -92,8 +93,9 @@ class DBConnection:
         cr = connection.cursor()
         try:
             yield cr
-            LOGGER.debug("Committing DB cursor")
-            connection.commit()
+            if not self.readonly:
+                LOGGER.debug("Committing DB cursor")
+                connection.commit()
         except Exception as e:
             LOGGER.warning("Rolling Back DB cursor. Got Exception: %s", e)
             connection.rollback()

{godoo_cli-0.15.0 → godoo_cli-0.15.1}/src/godoo_cli/models/godoo_modules.py

@@ -90,8 +90,6 @@ class GodooModules:
         if not isinstance(addon_paths, list):
             addon_paths = [addon_paths]
         self.addon_paths = addon_paths
-        LOGGER.debug("Initializing GodooModules")
-        LOGGER.debug("Addon Paths: %s", ", ".join(str(p) for p in self.addon_paths))
         self.godoo_modules: dict[str, GodooModule] = {}
 
     def get_modules(