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

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

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

@@ -1,6 +1,6 @@
 {
     "name": "godoo Test Succ Module",
-    "version": "16.0.1.0.0",
+    "version": "19.0.1.0.0",
     "author": "Joshua Kreuder",
     "license": "AGPL-3",
     "depends": ["base"],

godoo_cli-0.17.0/config/nginx-proxy_headers.conf

@@ -0,0 +1,13 @@
+proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+proxy_set_header X-Forwarded-Proto $scheme;
+proxy_set_header X-Real-IP $remote_addr;
+proxy_set_header Upgrade $http_upgrade;
+proxy_set_header Connection $connection_upgrade;
+proxy_set_header X-Forwarded-Host $host;
+
+# Enable HTTP/1.1 keepalive to upstream
+proxy_http_version 1.1;
+proxy_set_header Connection "";
+
+add_header Strict-Transport-Security "max-age=31536000; includeSubDomains";
+proxy_cookie_flags session_id samesite=lax secure;  # requires nginx 1.19.8

godoo_cli-0.17.0/config/nginx.conf

@@ -0,0 +1,116 @@
+worker_processes  4;
+# user www-data;
+pid /var/log/nginx/nginx.pid;
+error_log /var/log/nginx/error.log info;
+
+events {
+    use           epoll;
+    worker_connections  1000;
+    multi_accept on;  # Accept multiple connections at once
+}
+
+http {
+    include /etc/nginx/mime.types;
+    server_tokens off;
+
+    # Performance: Buffering and keepalive
+    sendfile on;
+    tcp_nopush on;
+    tcp_nodelay on;
+    keepalive_timeout 65;
+    keepalive_requests 1000;
+
+    # Performance: Buffer sizes for Odoo's large responses
+    proxy_buffer_size 128k;
+    proxy_buffers 4 256k;
+    proxy_busy_buffers_size 256k;
+
+    # Gzip compression (moved here for all responses)
+    gzip on;
+    gzip_vary on;
+    gzip_proxied any;
+    gzip_comp_level 6;
+    gzip_min_length 1000;
+    gzip_types text/css text/scss text/plain text/xml application/xml application/json application/javascript application/x-javascript text/javascript image/svg+xml;
+
+    #odoo server
+    upstream odoo {
+        server 127.0.0.1:8069;
+        keepalive 32;  # Keep connections to Odoo open
+    }
+    upstream odoochat {
+        server 127.0.0.1:8072;
+        keepalive 8;
+    }
+    map $http_upgrade $connection_upgrade {
+        default upgrade;
+        ''      close;
+    }
+
+    map $sent_http_content_type $content_type_csp {
+        default "";
+        ~image/ "default-src 'none'";
+    }
+
+    set_real_ip_from 10.1.0.0/16;
+    set_real_ip_from 172.20.0.0/24;
+    real_ip_header X-Forwarded-For;
+    real_ip_recursive on;
+
+    server {
+        listen 80;
+
+        proxy_read_timeout 720s;
+        proxy_connect_timeout 720s;
+        proxy_send_timeout 720s;
+        client_max_body_size 4G; # Set the maximum upload size to 4 gigabytes
+
+        add_header 'Content-Security-Policy' 'upgrade-insecure-requests';
+
+        # Redirect websocket requests to odoo gevent port
+        location /websocket {
+            proxy_pass http://odoochat;
+            include /etc/nginx/proxy_headers.conf;
+        }
+
+        # Redirect requests to odoo backend server
+        location / {
+            proxy_pass http://odoo;
+            proxy_redirect off;
+            include /etc/nginx/proxy_headers.conf;
+        }
+        location @odoo {
+            proxy_pass http://odoo;
+            proxy_redirect off;
+            include /etc/nginx/proxy_headers.conf;
+        }
+
+        location ~ ^/[^/]+/static/.+$ {
+            root /odoo;
+            # We could figure out a way to automagically adapt this try_files to also include thirdparty addons
+            try_files /godoo_workspace/addons$uri /odoo/addons$uri /odoo/odoo/addons$uri /thirdparty/OE_odoo-enterprise$uri /thirdparty/custom/single_mods$uri $uri @odoo;
+            expires 7d;
+            access_log off;
+            include  /etc/nginx/mime.types;
+            add_header Content-Security-Policy $content_type_csp;
+            add_header Cache-Control "public";
+        }
+
+        location /web/filestore {
+            internal;
+            alias /var/lib/odoo/filestore;
+        }
+
+        # Cache web assets (JS/CSS bundles) - Odoo uses cache-busting URLs
+        location ~* /web/assets/ {
+            proxy_pass http://odoo;
+            proxy_redirect off;
+            include /etc/nginx/proxy_headers.conf;
+            expires 7d;
+            access_log off;
+            add_header Cache-Control "public";
+        }
+
+    }
+
+}

godoo_cli-0.17.0/config/postgresql.conf

@@ -0,0 +1,75 @@
+# PostgreSQL 17 - Odoo 16 Staging
+# 4-core HyperV VM, 23GB RAM shared with prod+plausible
+# Staging is rarely used - minimal resource allocation
+
+# CONNECTION
+# Few concurrent users expected
+max_connections = 40
+superuser_reserved_connections = 2
+max_files_per_process = 100
+
+# MEMORY (Minimal: ~500MB allocation)
+# Staging should be lean - just enough to function
+shared_buffers = 256MB
+effective_cache_size = 512MB
+maintenance_work_mem = 64MB
+work_mem = 8MB
+hash_mem_multiplier = 2.0
+
+# WAL & CHECKPOINT
+wal_buffers = 8MB
+min_wal_size = 256MB
+max_wal_size = 1GB
+checkpoint_timeout = 15min
+checkpoint_completion_target = 0.9
+
+# PARALLELISM (Minimal - don't compete with prod)
+max_worker_processes = 2
+max_parallel_workers_per_gather = 0
+max_parallel_workers = 1
+max_parallel_maintenance_workers = 1
+
+# I/O (NVMe)
+random_page_cost = 1.1
+effective_io_concurrency = 50
+maintenance_io_concurrency = 25
+
+# PLANNER
+default_statistics_target = 50
+jit = off
+
+# BGWRITER
+bgwriter_delay = 500ms
+bgwriter_lru_maxpages = 50
+bgwriter_lru_multiplier = 2.0
+
+# AUTOVACUUM (Less aggressive for staging)
+autovacuum = on
+autovacuum_max_workers = 1
+autovacuum_naptime = 60s
+autovacuum_vacuum_scale_factor = 0.1
+autovacuum_analyze_scale_factor = 0.05
+autovacuum_vacuum_cost_delay = 10ms
+autovacuum_vacuum_cost_limit = 200
+
+# TRANSACTION
+max_prepared_transactions = 0
+
+# LOGGING
+log_line_prefix = '%m [%p-%l] %u@%d app=%a '
+log_lock_waits = on
+log_temp_files = 0
+log_autovacuum_min_duration = 0
+# More verbose for debugging staging issues
+log_min_duration_statement = 1000
+track_io_timing = on
+
+# PERFORMANCE
+shared_preload_libraries = 'pg_stat_statements'
+pg_stat_statements.track = all
+pg_stat_statements.max = 1000
+
+# ODOO TUNING
+statement_timeout = 0
+lock_timeout = 30000
+idle_in_transaction_session_timeout = 600000

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

@@ -51,10 +51,11 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
 # Remove whats between the ----- and replace with: RUN pip install godoo
 # Install only dependencies, so they only reinstall when lock or toml where changed
 COPY pyproject.toml uv.lock README.md ./
-RUN --mount=type=cache,target=$UV_CACHE_DIR,uid=1000,gid=1000 uv sync --no-install-project --compile-bytecode
+COPY ./src/godoo_cli/__about__.py ./src/godoo_cli/__about__.py
+RUN --mount=type=cache,target=$UV_CACHE_DIR,uid=1000,gid=1000 uv sync --no-install-project --compile-bytecode --frozen
 
 COPY --chown=$USERNAME:$USERNAME ./src ./src
-RUN --mount=type=cache,target=$UV_CACHE_DIR,uid=1000,gid=1000 uv sync --all-extras --compile-bytecode
+RUN --mount=type=cache,target=$UV_CACHE_DIR,uid=1000,gid=1000 uv sync --all-extras --compile-bytecode --frozen
 # In the Devcontainer stage we remove everything in $WORKSPACE and replace it with a Bind-Mount
 # ------------------------------------------------------------------------------------------------------
 # Godoo Pypi Install via pip
@@ -116,6 +117,7 @@ COPY --from=oodo_addon_source $ODOO_THIRDPARTY_LOCATION $ODOO_THIRDPARTY_LOCATIO
 COPY --from=odoo_requirements $VIRTUAL_ENV $VIRTUAL_ENV
 
 COPY ../config/nginx.conf /etc/nginx/nginx.conf
+COPY ../config/nginx-proxy_headers.conf /etc/nginx/proxy_headers.conf
 COPY ../config/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
 COPY ../scripts/launchodoo.sh launchodoo.sh
 COPY ../scripts/migrations migrations

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

@@ -23,6 +23,7 @@ apt-get install -y -q --no-install-recommends \
     curl \
     unzip \
     postgresql-client-17 \
+    libpq-dev \
     libldap2-dev \
     libssl-dev \
     libsasl2-dev \

{godoo_cli-0.15.1 → godoo_cli-0.17.0}/odoo_manifest.yml

@@ -11,10 +11,16 @@
 odoo:
   # The Odoo section describes where to Clone the odoo source code form. (the one with odoo-bin)
   url: https://github.com/odoo/odoo/
-  branch: 16.0 # Branch is mandatory on Odoo Repo but not on OCA Repos
+  branch: 19.0 # Branch is mandatory on Odoo Repo but not on OCA Repos
 thirdparty:
   # In the thirdparty section we can add more Repos to download.
   # This can also be an ssh style Url for Odoo Enterprise for example.
   OCA: # This repo folder will be called "OCA_server-tools" when downloading.
-    - url: https://github.com/OCA/server-tools
-      branch: 16.0
+    - url:
+        https://github.com/OCA/server-tools
+        # branch: 19.0 # Branch is optional here. If not specified, the default branch of the Repo will be used.
+        # commit: abcdef1234567890abcdef1234567890abcdef12 # Commit is also optional. If not specified, the branch will be used and pulled on every `godoo source get`.
+    - url: https://github.com/OCA/product-attribute.git
+      # merge_from: # We can also Create local merge commits on top of the downloaded Repo.
+      #   - url: https://github.com/fd-oerp/product-attribute.git
+      #     branch: 19.0-mig-product_sequence

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

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

{godoo_cli-0.15.1 → godoo_cli-0.17.0}/src/godoo_cli/cli.py

@@ -38,14 +38,28 @@ def main_callback(
             help="Verbose Logging with Error stacktraces",
         ),
     ] = False,
+    log_filter: Annotated[
+        Optional[str],
+        typer.Option(
+            "--log-filter",
+            "-lf",
+            envvar="GODOO_LOG_FILTER",
+            help="Regex pattern to filter log output by logger name (e.g. 'odoo.test.suite')",
+        ),
+    ] = None,
 ):
-    """Configure the CLI's logging level.
+    """Configure the CLI's logging level and optional log filter.
 
     Args:
         verbose: If True, enables verbose logging with error stacktraces.
             Can be set via --verbose flag or GODOO_VERBOSE environment variable.
+        log_filter: Optional regex pattern to filter log records by logger name.
+            Can be set via --log-filter flag or GODOO_LOG_FILTER environment variable.
     """
-    set_logging(verbose=bool(verbose) if verbose is not None else False)
+    set_logging(
+        verbose=bool(verbose) if verbose is not None else False,
+        log_filter=log_filter,
+    )
 
 
 def main_cli():

{godoo_cli-0.15.1 → godoo_cli-0.17.0}/src/godoo_cli/commands/odoo_bin/bootstrap.py

@@ -14,7 +14,7 @@ from typing import Annotated, Optional, Union
 import typer
 
 from ...cli_common import CommonCLI
-from ...helpers.modules_py import _install_py_reqs_by_odoo_cmd
+from ...helpers.modules_py import install_base_python_reqs, install_py_reqs_by_odoo_cmd
 from ...helpers.system import run_cmd
 from ...models import GodooConfig
 from ..db.query import DbBootstrapStatus, _is_bootstrapped
@@ -188,7 +188,8 @@ def bootstrap_odoo(
         cmd_string = re.sub(r"--init base,web", "", cmd_string)
 
     # Always update Pip reqs regardless of --no-update-source
-    _install_py_reqs_by_odoo_cmd(addon_paths=addon_paths, odoo_bin_cmd=cmd_string)
+    install_base_python_reqs(odoo_install_folder=odoo_main_path)
+    install_py_reqs_by_odoo_cmd(addon_paths=addon_paths, odoo_bin_cmd=cmd_string)
 
     LOGGER.info("Launching Bootstrap Commandline")
     ret = run_cmd(cmd_string).returncode

{godoo_cli-0.15.1 → godoo_cli-0.17.0}/src/godoo_cli/commands/odoo_bin/godoo_test/test_run.py

@@ -131,7 +131,8 @@ def odoo_run_tests(  # noqa: C901
     module_list = ",".join(module_names)
 
     LOGGER.info("Testing Odoo Modules:\n%s", sorted(module_names))
-    if "account" in [p.name for p in depends]:
+    if "account" in [p.name for p in depends] and godoo_conf.odoo_version.major <= 16:
+        # l10n_generic_coa got removed in Odoo 16
         bootstrap_args = [f"--init {module_list},l10n_generic_coa"]
     else:
         bootstrap_args = [f"--init {module_list}"]

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

@@ -6,6 +6,7 @@ Odoo environment. It supports both interactive and script-based operations.
 """
 
 import logging
+import subprocess
 import sys
 from pathlib import Path
 from typing import Annotated, Optional
@@ -103,6 +104,10 @@ def odoo_shell_run_script(
     odoo_conf_path: Annotated[Path, CLI.odoo_paths.conf_path],
     db_name: Annotated[str, CLI.database.db_name],
     db_user: Annotated[str, CLI.database.db_user],
+    script_args: Annotated[
+        Optional[list[str]],
+        typer.Argument(help="Arguments to pass to the script"),
+    ] = None,
     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] = "",
@@ -111,6 +116,7 @@ def odoo_shell_run_script(
 
     This function executes a Python script in the Odoo shell environment,
     supporting both configuration file and direct database connection parameters.
+    Additional arguments after the script name are passed to the script as script_args list.
 
     Returns:
         int: 0 for success, non-zero for failure.
@@ -121,7 +127,7 @@ def odoo_shell_run_script(
         return CLI.returner(1)
 
     shell_cmd = f"{odoo_main_path.absolute()!s}/odoo-bin shell --no-http"
-    if odoo_conf_path.exists():
+    if odoo_conf_path and odoo_conf_path.exists():
         shell_cmd += f" -c {odoo_conf_path.absolute()!s}"
     else:
         LOGGER.warning("No Odoo Config File found at %s", odoo_conf_path)
@@ -130,8 +136,28 @@ def odoo_shell_run_script(
             return CLI.returner(1)
         shell_cmd += f" --db_host={db_host} --db_port={db_port} --database={db_name} --db_user={db_user} --db_password={db_password}"
 
-    LOGGER.info("Running Script: %s", script_path)
-    run_cmd(shell_cmd, stdin=script_path.open("r"))
+    # Prepare script with arguments
+    script_content = script_path.read_text()
+
+    # If script_args provided, prepend them as a list variable
+    if script_args:
+        args_str = repr(list(script_args))  # Safely convert to Python list literal
+        script_with_args = f"script_args = {args_str}\n\n{script_content}"
+        LOGGER.info("Running Script: %s with args: %s", script_path, script_args)
+    else:
+        script_with_args = f"script_args = []\n\n{script_content}"
+        LOGGER.info("Running Script: %s", script_path)
+
+    proc = subprocess.Popen(
+        shell_cmd,
+        shell=True,
+        stdin=subprocess.PIPE,
+        stdout=sys.stdout,
+        stderr=sys.stderr,
+        text=True,
+    )
+    proc.communicate(input=script_with_args)
+    return CLI.returner(proc.returncode)
 
 
 def odoo_pregenerate_assets(godoo_conf: GodooConfig):
@@ -144,15 +170,10 @@ def odoo_pregenerate_assets(godoo_conf: GodooConfig):
         NotImplementedError: If the Odoo version is not supported.
     """
     odoo_version = odoo_bin_get_version(odoo_main_repo_path=godoo_conf.odoo_install_folder)
-    if odoo_version.major == 16:
-        pregen_command = "env['ir.qweb']._pregenerate_assets_bundles();env.cr.commit()"
-    else:
-        msg = f"Odoo Version {odoo_version.raw} not supported in gOdoo for pregenerate_assets"
-        LOGGER.error(msg)
-        raise NotImplementedError(msg)
     LOGGER.info("Pregenerating Assets for Odoo version %s", odoo_version.raw)
-    odoo_shell(
-        pipe_in_command=pregen_command,
+    # Use the pregenerate_assets script which attempts multiple internal APIs.
+    odoo_shell_run_script(
+        script_name="pregenerate_assets",
         odoo_main_path=godoo_conf.odoo_install_folder,
         odoo_conf_path=godoo_conf.odoo_conf_path,
         db_name=godoo_conf.db_name,

godoo_cli-0.17.0/src/godoo_cli/commands/odoo_bin/shell_scripts/pregenerate_assets.py

@@ -0,0 +1,34 @@
+"""Script used by gOdoo to pregenerate asset bundles in the Odoo filestore.
+
+The script tries several internal APIs to be tolerant across multiple
+Odoo versions (16+). It prints which method succeeded or prints
+diagnostic information if all attempts fail.
+"""
+
+import contextlib
+
+from odoo import api
+
+env: api.Environment = env  # Just to silence pyright # pyright: ignore # NOQA
+
+try:
+    env["ir.qweb"]._pregenerate_assets_bundles()
+    print("pregenerated: ir.qweb._pregenerate_assets_bundles")
+except Exception:
+    try:
+        env["ir.qweb"]._pregenerate_assets()
+        print("pregenerated: ir.qweb._pregenerate_assets")
+    except Exception:
+        try:
+            env["ir.asset"]._pregenerate_bundles()
+            print("pregenerated: ir.asset._pregenerate_bundles")
+        except Exception:
+            print("pregenerate failed; exceptions:")
+            import traceback
+
+            with contextlib.suppress(Exception):
+                traceback.print_exc()
+
+# Commit any DB changes
+with contextlib.suppress(Exception):
+    env.cr.commit()

godoo_cli-0.17.0/src/godoo_cli/commands/odoo_bin/shell_scripts/render_report.py

@@ -0,0 +1,122 @@
+"""Render an Odoo report to HTML and print to stdout.
+
+This script renders a QWeb report for given record IDs and outputs the HTML.
+It is executed in the Odoo shell environment via:
+
+    godoo shell-script render_report <report_name> <record_id> [<record_id> ...]
+
+Example:
+    godoo shell-script render_report sale.report_saleorder 1
+    godoo shell-script render_report sale.report_saleorder 1 2 3
+
+Flags:
+    --keep-base64  Keep base64 content instead of replacing with placeholder
+
+"""
+
+import logging
+import re
+import sys
+from xml.dom import minidom
+
+from odoo import api
+
+LOGGER = logging.getLogger(__name__)
+
+env: api.Environment = env  # Just to silence pyright # pyright: ignore # NOQA
+
+# script_args is injected by godoo shell-script command
+script_args: list[str] = script_args  #  pyright: ignore # NOQA
+
+
+def replace_base64_with_placeholder(html_string: str) -> str:
+    """Replace base64 content with a placeholder.
+
+    Replaces long base64 strings (data URIs, embedded images, etc.) with
+    a placeholder to make output more readable.
+
+    Parameters
+    ----------
+    html_string : str
+        HTML string potentially containing base64 content
+
+    Returns:
+    -------
+    str
+        HTML string with base64 content replaced by placeholder
+    """
+    # Match data URIs with base64 content and replace with placeholder
+    # Matches patterns like: data:image/png;base64,... or similar
+    pattern = r"data:[^/]+/[^;]+;base64,[A-Za-z0-9+/]+={0,2}"
+    replacement = "data:[MIME];base64,[BASE64_CONTENT_PLACEHOLDER]"
+    return re.sub(pattern, replacement, html_string)
+
+
+def render_report(report_name: str, record_ids: list[int], replace_base64: bool = True):
+    """Render an Odoo report to HTML.
+
+    Parameters
+    ----------
+    report_name : str
+        Name of the report to render (e.g., 'sale.report_saleorder')
+    record_ids : list[int]
+        List of record IDs to render
+    replace_base64 : bool, optional
+        Replace base64 content with placeholder (True by default)
+    """
+    try:
+        report_model = env["ir.actions.report"]
+        html_content, _ = report_model._render_qweb_html(report_name, record_ids)
+
+        if html_content:
+            # Decode bytes to string
+            html_string = html_content.decode("utf-8") if isinstance(html_content, bytes) else html_content
+
+            # Replace base64 content with placeholder if enabled
+            if replace_base64:
+                html_string = replace_base64_with_placeholder(html_string)
+
+            # Try to pretty print the HTML
+            try:
+                dom = minidom.parseString(html_string)
+                pretty_html = dom.toprettyxml(indent="  ")
+                # Remove extra blank lines that minidom adds
+                print("\n".join([line for line in pretty_html.split("\n") if line.strip()]))
+            except Exception:
+                # If pretty printing fails, just print the raw HTML
+                print(html_string)
+        else:
+            LOGGER.error("Failed to render report: %s", report_name)
+            sys.exit(1)
+
+    except ValueError:
+        LOGGER.exception("Report not found")
+        sys.exit(1)
+    except Exception:
+        LOGGER.exception("Error rendering report %s", report_name)
+        sys.exit(1)
+
+
+# Main execution: Parse script_args and call render_report
+if not script_args:
+    LOGGER.error("Usage: godoo shell-script render_report <report_name> <record_id> [<record_id> ...] [--keep-base64]")
+    sys.exit(1)
+
+if len(script_args) < 2:
+    LOGGER.error("Missing arguments. Need at least report_name and one record_id")
+    sys.exit(1)
+
+# Check for --keep-base64 flag
+keep_base64_flag = "--keep-base64" in script_args
+filtered_args = [arg for arg in script_args if arg != "--keep-base64"]
+
+# Now extract report_name and record_ids from filtered args
+if len(filtered_args) < 2:
+    LOGGER.error("Missing arguments. Need at least report_name and one record_id")
+    sys.exit(1)
+
+report_name = filtered_args[0]
+record_ids = [int(rid) for rid in filtered_args[1:]]
+
+# render_report with replace_base64 being False if --keep-base64 was passed
+render_report(report_name, record_ids, replace_base64=not keep_base64_flag)