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

{godoo_cli-0.14.10 → godoo_cli-0.15.1}/.github/workflows/quality.yml

@@ -25,10 +25,10 @@ jobs:
       matrix:
         python-version: ["3.9", "3.11", "3.12"]
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - name: Install UV
-        uses: astral-sh/setup-uv@v2
+        uses: astral-sh/setup-uv@v7
         with:
           enable-cache: true
           cache-dependency-glob: "pyproject.toml"
@@ -66,20 +66,13 @@ jobs:
       packages: write
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           fetch-depth: 1 # Shallow clone sufficient for build
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
-      - name: Cache Docker layers
-        uses: actions/cache@v4
-        with:
-          path: /tmp/.buildx-cache
-          key: ${{ runner.os }}-buildx-${{ github.sha }}
-          restore-keys: |
-            ${{ runner.os }}-buildx-
 
       - name: Login to Container registry
         uses: docker/login-action@v3
@@ -103,10 +96,6 @@ jobs:
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-          cache-from: type=local,src=/tmp/.buildx-cache
-          cache-to: type=local,dest=/tmp/.buildx-cache-new
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
 
-      - name: Move cache
-        run: |
-          rm -rf /tmp/.buildx-cache
-          mv /tmp/.buildx-cache-new /tmp/.buildx-cache

{godoo_cli-0.14.10 → godoo_cli-0.15.1}/.gitignore

@@ -60,6 +60,7 @@ coverage.xml
 .hypothesis/
 .pytest_cache/
 cover/
+junit/
 
 # Translations
 *.mo

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gOdoo-cli
-Version: 0.14.10
+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.14.10 → godoo_cli-0.15.1}/addons/godoo_test_succ_mod/tests/data.py

@@ -4,7 +4,6 @@ from odoo import api
 
 
 # pylint: disable=unused-argument
-# ruff: noqa: ARG001
 def generate_test_data(env: api.Environment):
     """Generate Test Data for the ven Environment."""
     # Add your Test Data Generation code here

{godoo_cli-0.14.10 → godoo_cli-0.15.1}/docker/Dockerfile

@@ -40,8 +40,10 @@ ARG SOURCE_CLONE_ARCHIVE
 ENV SOURCE_CLONE_ARCHIVE=${SOURCE_CLONE_ARCHIVE}
 
 # Install Dependencies using depends_build.sh
-RUN --mount=type=bind,source=docker/depends_build.sh,target=/tmp/depends_build.sh \
-    set -ex; sudo bash /tmp/depends_build.sh
+COPY docker/depends_build.sh docker/psql.gpg /tmp/
+RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
+    --mount=type=cache,target=/var/lib/apt/lists,sharing=locked set -ex; \
+    sudo bash /tmp/depends_build.sh
 
 # ------------------------------------------------------------------------------------------------------
 # Install godoo from this workspace. (see pip install below)
@@ -159,48 +161,60 @@ FROM dev_odoo AS devcontainer
 # Instal godoo autocomplete. Env var to disable shellingham, as docker doesnt run in a shell
 RUN set -ex; _TYPER_COMPLETE_TEST_DISABLE_SHELL_DETECTION=true godoo --install-completion zsh
 
-ARG USERNAME
 ARG NVM_VERSION
 ARG NODE_VERSION
 ENV NVM_DIR=/usr/local/nvm \
     NODE_VERSION=${NODE_VERSION}
+
+# Setup NVM directory with proper permissions
 RUN set -ex; sudo install -d -m 0755 -o ${USERNAME} -g ${USERNAME} $NVM_DIR
 
+# Install NVM, Node.js and npm as non-root user
 RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh | bash
-# install node and npm
-RUN set -ex; \
+# Install node and npm
+RUN set -e; \
     . $NVM_DIR/nvm.sh \
     && nvm install $NODE_VERSION \
     && nvm alias default $NODE_VERSION \
     && npm config -g set cafile /etc/ssl/certs/ca-certificates.crt \
     && nvm use default
-# add node and npm to path so the commands are available
+# Add node and npm to path so the commands are available
 ENV NODE_PATH=$NVM_DIR/v$NODE_VERSION/lib/node_modules \
     PATH=$NVM_DIR/versions/node/v$NODE_VERSION/bin:$PATH\
     NODE_EXTRA_CA_CERTS=/etc/ssl/certs/ca-certificates.crt
 
-# Install PostgreSQL client and other development tools
-RUN --mount=type=bind,source=docker/depends_build.sh,target=/tmp/depends_build.sh \
-    set -ex; \
-    sudo bash /tmp/depends_build.sh \
-    && sudo bash -c 'mkdir -p /home/$USERNAME/{.vscode-server/extensions,.cache/pre-commit} \
-    && chown -R $USERNAME:$USERNAME /home/$USERNAME/{.vscode-server,.cache} \
-    && mkdir -p /etc/cups \
+# Configure system settings that require root
+USER root
+RUN set -ex; \
+    mkdir -p /etc/cups \
     && echo "ServerName cups:631" > /etc/cups/client.conf \
-    && printf "Host upgrade.odoo.com\n\tStrictHostKeyChecking accept-new" > /etc/ssh/ssh_config.d/odoo_upgrade.conf'
+    && printf "Host upgrade.odoo.com\n\tStrictHostKeyChecking accept-new" > /etc/ssh/ssh_config.d/odoo_upgrade.conf
 
 ARG WORKSPACE
 ENV ODOO_PRINT_PDF_LOCATION=$WORKSPACE
 
+# Setup nginx and fix permissions
 RUN set -ex; \
-    sudo rm -rf /tmp/* \
-    && sudo usermod -a -G www-data ${USERNAME} \
-    && bash -c 'sudo chown -R ${USERNAME} {/var/lib/nginx,/var/log/nginx}'
-
-RUN --mount=type=cache,target=/var/cache/apt \
-    --mount=type=cache,target=$UV_CACHE_DIR,uid=1000,gid=1000 \
-    set -ex; \
+    rm -rf /tmp/* \
+    && rm -f /etc/nginx/nginx.conf \
+    && ln -s /odoo/config/nginx.conf /etc/nginx/nginx.conf \
+    && rm -f /etc/nginx/proxy_headers.conf \
+    && ln -s /odoo/config/nginx-proxy_headers.conf /etc/nginx/proxy_headers.conf \
+    && usermod -a -G www-data ${USERNAME} \
+    && chown -R ${USERNAME} /var/lib/nginx /var/log/nginx
+
+# Install system packages that require root
+RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
+    --mount=type=cache,target=/var/lib/apt/lists,sharing=locked set -ex; \
+    apt-get update \
+    && apt-get install default-jre -y
+
+# Switch back to non-root user for npm and pip installations
+USER ${USERNAME}
+RUN --mount=type=cache,target=$UV_CACHE_DIR,uid=1000,gid=1000 \
+    --mount=type=cache,target=/root/.npm,uid=1000,gid=1000 set -ex; \
     npm install -g prettier eslint \
-    && git config --global --add safe.directory ${WORKSPACE}
+    && uv pip install pydevd-odoo pre-commit jingtrang
+
 ENV EDITOR=code
-ENTRYPOINT  [ "/bin/sh", "-c", "sudo nginx -c /odoo/config/nginx.conf; sleep infinity"]
+ENTRYPOINT  [ "/bin/sh", "-c", "service nginx start; sleep infinity"]

{godoo_cli-0.14.10 → godoo_cli-0.15.1}/docker/depends_build.sh

@@ -7,14 +7,10 @@ rm -f /etc/apt/apt.conf.d/docker-clean
 apt-get update
 apt-get install -y --no-install-recommends \
     lsb-release \
-    gpg \
-    wget \
-    curl
+    gpg
 
-# Add PostgreSQL repository and key
 echo "deb http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list
-# Download the PostgreSQL key directly instead of using a local file
-wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add -
+mv $DIR/psql.gpg /etc/apt/trusted.gpg.d/
 apt-get update --fix-missing
 
 # ######################### Install gOdoo dependencies #########################
@@ -22,12 +18,14 @@ apt-get install -y -q --no-install-recommends \
     git \
     apt-utils \
     openssh-client \
+    wget \
     rsync \
+    curl \
     unzip \
     postgresql-client-17 \
     libldap2-dev \
     libssl-dev \
     libsasl2-dev \
-    libcups2-dev \
     build-essential \
-    pkg-config
+    pkg-config \
+    libcups2-dev

{godoo_cli-0.14.10 → godoo_cli-0.15.1}/docker/docker-compose.base.yml

@@ -23,7 +23,7 @@ services:
       - "postgres_socket:/var/run/postgresql"
 
   db:
-    image: postgres:16-alpine
+    image: postgres:17-alpine
     environment:
       - TZ=${TZ:-Europe/Berlin}
       - POSTGRES_DB=postgres

{godoo_cli-0.14.10 → godoo_cli-0.15.1}/docker/docker-compose.devcontainer.yml

@@ -2,16 +2,11 @@ services:
   app:
     build:
       target: devcontainer
-      args:
-        SOURCE_CLONE_ARCHIVE: False
     command: ""
     volumes:
-      - vscode_server:/home/ContainerUser/.vscode-server
-      - devcontainer_cache:/home/ContainerUser/.cache
       - commandhistory:/home/ContainerUser/.commandhistory
       - ../:/odoo/godoo_workspace # Mount vscode Workspace
       - ../config:/odoo/config # Mount config folder
-      - venv:/odoo/venv
     cap_add:
       - SYS_PTRACE
 
@@ -20,7 +15,4 @@ services:
       context: cups
 
 volumes:
-  venv:
-  vscode_server:
   commandhistory:
-  devcontainer_cache:

{godoo_cli-0.14.10 → godoo_cli-0.15.1}/makefile

@@ -28,3 +28,6 @@ reset-hard: # To be called from Outside the Devcontainer
 
 rebuild:
 	cd docker && docker compose -f docker-compose.base.yml -f docker-compose.devcontainer.yml build
+
+lint:
+	hatch run dev:lint

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

@@ -2,7 +2,7 @@
 
 from packaging import version
 
-__version__ = "0.14.10"  # 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.14.10 → godoo_cli-0.15.1}/src/godoo_cli/cli.py

@@ -13,22 +13,8 @@ from dotenv import load_dotenv
 from rich import print as rich_print
 
 from . import __about__
+from . import commands as cmd
 from .cli_common import CommonCLI
-from .commands import (
-    backup_cli_app,
-    bootstrap_odoo,
-    db_cli_app,
-    launch_import,
-    launch_odoo,
-    odoo_run_tests,
-    odoo_shell,
-    odoo_shell_run_script,
-    rpc_cli_app,
-    set_odoo_config,
-    source_cli_app,
-    test_cli_app,
-    uninstall_modules,
-)
 from .helpers.odoo_files import odoo_bin_get_version
 from .helpers.system import set_logging
 
@@ -83,30 +69,30 @@ def main_cli():
 
     # Nested Subcommands
     app.add_typer(
-        typer_instance=rpc_cli_app(),
+        typer_instance=cmd.rpc_cli_app(),
         name="rpc",
     )
     app.add_typer(
-        typer_instance=db_cli_app(),
+        typer_instance=cmd.db_cli_app(),
         name="db",
     )
     app.add_typer(
-        typer_instance=source_cli_app(),
+        typer_instance=cmd.source_cli_app(),
         name="source",
     )
-    app.add_typer(typer_instance=backup_cli_app(), name="backup")
-    app.add_typer(typer_instance=test_cli_app(), name="test")
+    app.add_typer(typer_instance=cmd.backup_cli_app(), name="backup")
+    app.add_typer(typer_instance=cmd.test_cli_app(), name="test")
 
     # Normal Subcommands
     app.command("version")(print_versions)
-    app.command("bootstrap")(bootstrap_odoo)
-    app.command("launch")(launch_odoo)
-    app.command("launch-import")(launch_import)
-    app.command("test")(odoo_run_tests)
-    app.command("config")(set_odoo_config)
-    app.command("shell")(odoo_shell)
-    app.command("shell-script")(odoo_shell_run_script)
-    app.command("uninstall")(uninstall_modules)
+    app.command("bootstrap")(cmd.bootstrap_odoo)
+    app.command("launch")(cmd.launch_odoo)
+    app.command("launch-import")(cmd.launch_import)
+    app.command("test")(cmd.odoo_run_tests)
+    app.command("config")(cmd.set_odoo_config)
+    app.command("shell")(cmd.odoo_shell)
+    app.command("shell-script")(cmd.odoo_shell_run_script)
+    app.command("uninstall")(cmd.odoo_shell_uninstall_modules)
     return app
 
 

{godoo_cli-0.14.10 → godoo_cli-0.15.1}/src/godoo_cli/cli_common.py

@@ -163,6 +163,7 @@ class SourceGetArgs:
         "--source-download-archive",
         envvar="SOURCE_CLONE_ARCHIVE",
         help="When using a HTTPs Repo Url for Github we can download a snapshop without the Repo history",
+        is_flag=True,
     )
 
 

{godoo_cli-0.14.10 → godoo_cli-0.15.1}/src/godoo_cli/commands/__init__.py

@@ -11,12 +11,18 @@ of the gOdoo CLI, including:
 """
 
 from .backup import backup_cli_app
-from .bootstrap import bootstrap_odoo
 from .config import set_odoo_config
 from .db import db_cli_app
-from .launch import launch_import, launch_odoo
+from .odoo_bin import (
+    bootstrap_odoo,
+    launch_import,
+    launch_odoo,
+    odoo_load_test_data,
+    odoo_run_tests,
+    odoo_shell,
+    odoo_shell_run_script,
+    odoo_shell_uninstall_modules,
+    test_cli_app,
+)
 from .rpc import rpc_cli_app
-from .shell.shell import odoo_shell, odoo_shell_run_script, uninstall_modules
 from .source_get import source_cli_app
-from .test import test_cli_app
-from .test.test_run import odoo_run_tests

{godoo_cli-0.14.10 → godoo_cli-0.15.1}/src/godoo_cli/commands/backup/dump.py

@@ -14,7 +14,8 @@ import typer
 
 from ...cli_common import CommonCLI
 from ...helpers.odoo_files import odoo_bin_get_version
-from ..db.connection import DBConnection
+from ...helpers.system import sizeof_fmt
+from ...models import DBConnection
 from .util import call_rsync
 
 LOGGER = logging.getLogger(__name__)
@@ -70,12 +71,18 @@ def dump_instance(
     LOGGER.info("Dumping Filestore -> %s", filestore_target)
     call_rsync(source_folder=data_dir, target_folder=filestore_target)
 
+    def get_folder_size(path: Path) -> int:
+        return sum(f.stat().st_size for f in path.rglob("*") if f.is_file())
+
+    filestore_size_human = sizeof_fmt(get_folder_size(filestore_target))
+    LOGGER.info("Filestore Dump Completed with size -> %s", filestore_size_human)
+
     # Dump DB using pg_dump
     db_dump_target = dump_path / "odoo.dump"
     LOGGER.info("Dumping DB -> %s", db_dump_target)
     db_dump_target.unlink(missing_ok=True)
     db_connection.run_psql_shell_command(f"pg_dump --format c {{}} > {db_dump_target}")
-    LOGGER.info("SQL Dump Completed with size -> %.2f MB", db_dump_target.stat().st_size / (1024 * 1024))
+    LOGGER.info("SQL Dump Completed with size -> %s", sizeof_fmt(db_dump_target.stat().st_size))
 
     readme_path = dump_path / "README.md"
     readme_path.unlink(missing_ok=True)
@@ -95,4 +102,11 @@ SQL Dump and Filestore of gOdoo Instance.
 
 """
     readme_path.write_text(readme_content)
-    LOGGER.info("Odoo Dump Completed -> %s", dump_path)
+    total_dump_size_human = sizeof_fmt(
+        get_folder_size(filestore_target) + db_dump_target.stat().st_size + readme_path.stat().st_size
+    )
+    LOGGER.info(
+        "Odoo Dump with total size %s Completed -> %s",
+        total_dump_size_human,
+        dump_path,
+    )

{godoo_cli-0.14.10 → godoo_cli-0.15.1}/src/godoo_cli/commands/backup/load.py

@@ -11,7 +11,7 @@ from typing import Annotated, Optional
 import typer
 
 from ...cli_common import CommonCLI
-from ..db.connection import DBConnection
+from ...models import DBConnection
 from .util import call_rsync, create_db, drop_db
 
 LOGGER = logging.getLogger(__name__)

{godoo_cli-0.14.10 → godoo_cli-0.15.1}/src/godoo_cli/commands/backup/util.py

@@ -8,7 +8,7 @@ import logging
 import subprocess
 from pathlib import Path
 
-from ..db.connection import DBConnection
+from ...models import DBConnection
 
 LOGGER = logging.getLogger(__name__)
 

godoo_cli-0.15.1/src/godoo_cli/commands/db/cli.py

@@ -0,0 +1,64 @@
+"""Database management CLI module.
+
+This module provides the command-line interface for database management operations,
+including password management, database queries, and bootstrap status checks.
+"""
+
+import subprocess
+from typing import Annotated
+
+import typer
+
+from ...cli_common import CommonCLI
+from .passwords import set_passwords
+from .query import get_installed_modules, is_bootstrapped, query_database
+
+CLI = CommonCLI()
+
+
+def login_db(
+    db_name: Annotated[str, CLI.database.db_name],
+    db_user: Annotated[str, CLI.database.db_user],
+    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] = "",
+):
+    """Launch an interactive psql CLI session with the provided credentials.
+
+    This function starts an interactive PostgreSQL command-line session using
+    the provided database connection parameters.
+
+    Args:
+        db_host: Database host address.
+        db_port: Database port number.
+        db_name: Name of the database to connect to.
+        db_user: Database username.
+        db_password: Database password.
+    """
+    command = ["psql", f"-h{db_host}", f"-U{db_user}", f"-d{db_name}"]
+    if db_port != 0:
+        command.append(f"-p{db_port}")
+    subprocess.run(command, env={"PGPASSWORD": db_password})
+
+
+def db_cli_app():
+    """Create and configure the database CLI application.
+
+    This function sets up the command-line interface for database operations,
+    including commands for password management, database queries, and status checks.
+
+    Returns:
+        typer.Typer: The configured CLI application instance.
+    """
+    app = typer.Typer(
+        no_args_is_help=True,
+        help="Functions that directly act on the Postgres DB",
+    )
+
+    app.command()(set_passwords)
+    app.command("login")(login_db)
+    app.command("query")(query_database)
+    app.command("odoo-bootstrapped")(is_bootstrapped)
+    app.command("installed-modules")(get_installed_modules)
+
+    return app

{godoo_cli-0.14.10 → godoo_cli-0.15.1}/src/godoo_cli/commands/db/passwords.py

@@ -12,7 +12,7 @@ from passlib.context import CryptContext
 
 from ...cli_common import CommonCLI
 from ...helpers.cli import check_dangerous_command
-from .connection import DBConnection
+from ...models import DBConnection
 
 LOGGER = logging.getLogger(__name__)
 CLI = CommonCLI()

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

@@ -13,7 +13,7 @@ from psycopg2 import OperationalError, ProgrammingError
 
 from ...cli_common import CommonCLI
 from ...helpers.cli import check_dangerous_command
-from .connection import DBConnection
+from ...models import DBConnection
 
 
 class DbBootstrapStatus(enum.Enum):
@@ -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.1/src/godoo_cli/commands/odoo_bin/__init__.py

@@ -0,0 +1,6 @@
+"""CLI command to Bootstrap or launch Odoo using odoo-bin."""
+
+from .bootstrap import bootstrap_odoo
+from .godoo_test import *
+from .launch import launch_import, launch_odoo
+from .shell import odoo_shell, odoo_shell_run_script, odoo_shell_uninstall_modules