gOdoo-cli 0.12.0__tar.gz → 0.12.1__tar.gz

{godoo_cli-0.12.0 → godoo_cli-0.12.1}/PKG-INFO

@@ -1,43 +1,44 @@
 Metadata-Version: 2.1
 Name: gOdoo-cli
-Version: 0.12.0
+Version: 0.12.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.9,<3.12
+Requires-Python: >=3.9
 Classifier: License :: Other/Proprietary License
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Provides-Extra: codequality
 Provides-Extra: devcontainer
-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.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"
-Requires-Dist: mock (>=4.0.3,<5.0.0) ; extra == "devcontainer"
-Requires-Dist: openupgradelib (>=3.3.4,<4.0.0)
-Requires-Dist: passlib (>=1.7.3,<2.0.0)
-Requires-Dist: psycopg2 (>=2.8.6,<3.0.0)
-Requires-Dist: py-spy (>=0.3.11,<0.4.0) ; extra == "devcontainer"
-Requires-Dist: pydevd-odoo (>=1.2.1,<2.0.0) ; extra == "devcontainer"
-Requires-Dist: pylint-odoo (>=8.0.16,<9.0.0) ; extra == "codequality"
-Requires-Dist: pytest (>=7.2.1,<8.0.0) ; extra == "codequality"
-Requires-Dist: pytest-cov (>=4.0.0,<5.0.0) ; extra == "codequality"
-Requires-Dist: python-dotenv (>=0.20.0,<0.21.0)
-Requires-Dist: rope (>=0.23.0,<0.24.0) ; extra == "devcontainer"
-Requires-Dist: ruamel-yaml (>=0.17.21,<0.18.0)
-Requires-Dist: typer (>=0.9.0,<0.10.0)
-Requires-Dist: typer-common-functions (>=0.0.10,<0.0.11)
-Requires-Dist: watchdog (>=2.1.7,<3.0.0) ; extra == "devcontainer"
+Requires-Dist: black (>=22.10.0) ; extra == "codequality"
+Requires-Dist: debugpy (>=1.6.0) ; extra == "devcontainer"
+Requires-Dist: flake8 (>=5.0.4) ; extra == "codequality"
+Requires-Dist: gitpython (>=3.1.27)
+Requires-Dist: godoo-rpc (>=0.1.4)
+Requires-Dist: inotify (>=0.2.10) ; extra == "devcontainer"
+Requires-Dist: ipdb (>=0.13.9) ; extra == "devcontainer"
+Requires-Dist: isort (>=5.10.1) ; extra == "codequality"
+Requires-Dist: mock (>=4.0.3) ; extra == "devcontainer"
+Requires-Dist: openupgradelib (>=3.3.4)
+Requires-Dist: passlib (>=1.7.3)
+Requires-Dist: psycopg2 (>=2.8.6)
+Requires-Dist: py-spy (>=0.3.11) ; extra == "devcontainer"
+Requires-Dist: pydevd-odoo (>=1.2.1) ; extra == "devcontainer"
+Requires-Dist: pylint-odoo (>=8.0.16) ; extra == "codequality"
+Requires-Dist: pytest (>=7.2.1) ; extra == "codequality"
+Requires-Dist: pytest-cov (>=4.0.0) ; extra == "codequality"
+Requires-Dist: python-dotenv (>=0.20.0)
+Requires-Dist: rope (>=0.23.0) ; extra == "devcontainer"
+Requires-Dist: ruamel-yaml (>=0.17.21)
+Requires-Dist: typer (>=0.9.0)
+Requires-Dist: typer-common-functions (>=0.0.12)
+Requires-Dist: watchdog (>=2.1.7) ; extra == "devcontainer"
 Project-URL: Repository, https://github.com/OpenJKSoftware/gOdoo
 Description-Content-Type: text/markdown
 

{godoo_cli-0.12.0 → godoo_cli-0.12.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "gOdoo-cli"
-version = "0.12.0"
+version = "0.12.1"
 description = "Wrapper around Odoo-Bin with some convinience RPC functions."
 authors = ["Joshua Kreuder <Joshua_Kreuder@outlook.com>"]
 license = "LGPL-3"
@@ -10,7 +10,7 @@ repository = "https://github.com/OpenJKSoftware/gOdoo"
 keywords = ["odoo", "godoo","devcontainer"]
 
 [tool.poetry.group.dev.dependencies]
-pre-commit = "^3.4.0"
+pre-commit = ">=3.4.0"
 
 [tool.poetry_bumpversion.file."src/godoo_cli/version.py"]
 
@@ -18,31 +18,31 @@ pre-commit = "^3.4.0"
 godoo = "godoo_cli:launch_cli"
 
 [tool.poetry.dependencies]
-python = ">=3.9,<3.12"
-python-dotenv = "^0.20.0"
-ruamel-yaml = "^0.17.21"
-gitpython = "^3.1.27"
-godoo-rpc = "^0.1.2"
-openupgradelib = "^3.3.4"
-psycopg2 = "^2.8.6" # Mirror Odoo Reqs
-passlib = "^1.7.3" # Mirror Odoo Reqs
-typer-common-functions = "^0.0.10"
-typer = "^0.9.0"
-
-pylint-odoo = { version="^8.0.16", optional = true}
-ipdb = { version="^0.13.9", optional = true}
-debugpy = { version="^1.6.0", optional = true}
-black = { version="^22.10.0", optional = true}
-isort = { version="^5.10.1", optional = true}
-watchdog = { version="^2.1.7", optional = true}
-py-spy = { version="^0.3.11", optional = true}
-rope = { version="^0.23.0", optional = true}
-flake8 = { version="^5.0.4", optional = true}
-inotify = { version="^0.2.10",optional = true}
-mock = { version="^4.0.3", optional= true}
-pytest = { version="^7.2.1", optional= true}
-pytest-cov = {version="^4.0.0",optional=true}
-pydevd-odoo = { version="^1.2.1",optional=true}
+python = ">=3.9"
+python-dotenv = ">=0.20.0"
+ruamel-yaml = ">=0.17.21"
+gitpython = ">=3.1.27"
+godoo-rpc = ">=0.1.4"
+openupgradelib = ">=3.3.4"
+psycopg2 = ">=2.8.6" # Mirror Odoo Reqs
+passlib = ">=1.7.3" # Mirror Odoo Reqs
+typer-common-functions = ">=0.0.12"
+typer = ">=0.9.0"
+
+pylint-odoo = { version=">=8.0.16", optional = true}
+ipdb = { version=">=0.13.9", optional = true}
+debugpy = { version=">=1.6.0", optional = true}
+black = { version=">=22.10.0", optional = true}
+isort = { version=">=5.10.1", optional = true}
+watchdog = { version=">=2.1.7", optional = true}
+py-spy = { version=">=0.3.11", optional = true}
+rope = { version=">=0.23.0", optional = true}
+flake8 = { version=">=5.0.4", optional = true}
+inotify = { version=">=0.2.10",optional = true}
+mock = { version=">=4.0.3", optional= true}
+pytest = { version=">=7.2.1", optional= true}
+pytest-cov = {version=">=4.0.0",optional=true}
+pydevd-odoo = { version=">=1.2.1",optional=true}
 
 [tool.poetry.extras]
 devcontainer = [
@@ -75,7 +75,7 @@ log_cli_format = "%(asctime)s [%(levelname)8s] %(message)s (%(filename)s:%(linen
 log_cli_date_format = "%Y-%m-%d %H:%M:%S"
 
 [tool.pyright]
-ignore="**/__manifest__.py"
+ignore=["**/__manifest__.py"]
 
 [tool.black]
 line-length = 120

godoo_cli-0.12.1/src/godoo_cli/commands/backup/upgrade.py

@@ -0,0 +1,79 @@
+import logging
+import shutil
+import subprocess
+import zipfile
+from pathlib import Path
+from typing import Literal
+
+import typer
+from typing_extensions import Annotated
+
+from ...cli_common import CommonCLI
+from ...helpers.system import typer_ask_overwrite_path
+
+LOGGER = logging.getLogger(__name__)
+CLI = CommonCLI()
+
+
+@CLI.arg_annotator
+def run_upgrade(
+    dump_path: Annotated[
+        Path, typer.Argument(..., help="Path to SQL Dump", file_okay=True, dir_okay=False, exists=True)
+    ],
+    enterprise_subcode: Annotated[
+        str, typer.Option(help="Odoo.com Enterprise Subcode", envvar="ODOO_ENTERPRISE_SUBCODE")
+    ],
+    target_version: Annotated[str, typer.Option(help="Target Odoo Version", envvar="ODOO_UPGRADE_TARGET_VERSION")],
+    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,
+    upgrade_mode: Annotated[Literal["test", "prod"], typer.Option("test", help="Odoo.com Upgrade Mode")] = "test",
+):
+    """Send SQL Dump to upgrade.odoo.com"""
+    upgrade_zip_path = dump_path.parent / "upgrade.zip"
+
+    if typer_ask_overwrite_path(upgrade_zip_path):
+        backup_caches(upgrade_zip_path)
+        run_upgrade_online(
+            sql_dump_path=dump_path,
+            enterprise_subcode=enterprise_subcode,
+            target_version=target_version,
+            upgrade_mode=upgrade_mode,
+        )
+
+    if not upgrade_zip_path.exists():
+        LOGGER.error("Upgrade Failed: No upgrade.zip found")
+        raise typer.Exit(1)
+
+    LOGGER.info("Restoring Upgrade. Change Date: %s", upgrade_zip_path.stat().st_mtime)
+
+    LOGGER.info("Extracting Upgrade Zip")
+    ex_cache_path = upgrade_zip_path.parent / "upgrade_extract"
+    with zipfile.ZipFile(upgrade_zip_path, "r") as zip_ref:
+        zip_ref.extractall(ex_cache_path)
+
+    LOGGER.info("Ensuring DB Dump is pg_custom format for rapid loading")
+
+
+def run_upgrade_online(sql_dump_path: Path, enterprise_subcode: str, target_version: str, upgrade_mode: str):
+    """Runs sql dump against upgrade.odoo.com"""
+    command = f"python <(curl -s https://upgrade.odoo.com/upgrade) {upgrade_mode} -i {sql_dump_path.absolute()} -t {target_version} -x -c {enterprise_subcode}"
+    LOGGER.info("Running Upgrade Command: %s", command)
+    ret = subprocess.run(command, shell=True)
+    if ret.returncode != 0:
+        LOGGER.error("Upgrade Failed: %s", ret)
+        raise typer.Exit(ret.returncode)
+
+
+def backup_caches(upgrade_zip_path):
+    if upgrade_zip_path.exists():
+        LOGGER.info("Found existing upgrade.zip, backing up and Deleting")
+        shutil.move(upgrade_zip_path, upgrade_zip_path.with_suffix(".old.zip"))
+    log_path = upgrade_zip_path.parent / "upgrade.log"
+    if log_path.exists():
+        shutil.move(log_path, log_path.with_suffix(".old.log"))
+    report_path = upgrade_zip_path.parent / "upgrade-report.html"
+    if report_path.exists():
+        shutil.move(report_path, report_path.with_suffix(".old.html"))

{godoo_cli-0.12.0 → godoo_cli-0.12.1}/src/godoo_cli/commands/shell/shell.py

@@ -92,17 +92,19 @@ def odoo_shell_run_script(
     if not script_path.exists():
         LOGGER.error("Script '%s' not found in %s", script_name, script_folder)
         return CLI.returner(1)
+
+    shell_cmd = f"{str(odoo_main_path.absolute())}/odoo-bin shell --no-http"
+    if odoo_conf_path.exists():
+        shell_cmd += f" -c {str(odoo_conf_path.absolute())}"
+    else:
+        LOGGER.warning("No Odoo Config File found at %s", odoo_conf_path)
+        if not all([db_host, db_port, db_name, db_user, db_password]):
+            LOGGER.error("Missing database options and Config File. Aborting.")
+            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)
-    odoo_shell(
-        pipe_in_command=script_path.read_text(),
-        odoo_main_path=odoo_main_path,
-        odoo_conf_path=odoo_conf_path,
-        db_host=db_host,
-        db_port=db_port,
-        db_name=db_name,
-        db_user=db_user,
-        db_password=db_password,
-    )
+    run_cmd(shell_cmd, stdin=script_path.open("r"))
 
 
 def odoo_pregenerate_assets(odoo_main_path: Path):

godoo_cli-0.12.1/src/godoo_cli/version.py

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

godoo_cli-0.12.0/src/godoo_cli/version.py

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