gOdoo-cli 0.4.1__tar.gz → 0.4.3__tar.gz

{godoo_cli-0.4.1 → godoo_cli-0.4.3}/PKG-INFO

@@ -1,40 +1,41 @@
 Metadata-Version: 2.1
 Name: godoo-cli
-Version: 0.4.1
+Version: 0.4.3
 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,<3.11
+Requires-Python: >=3.8.1,<3.12
 Classifier: License :: Other/Proprietary License
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
 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.0.3)
+Requires-Dist: godoo-rpc (>=0.1.1,<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.4,<2.0.0)
+Requires-Dist: passlib (>=1.7.3,<2.0.0)
 Requires-Dist: pre-commit (>=2.20.0,<3.0.0) ; extra == "devcontainer"
-Requires-Dist: psycopg2 (>=2.9.5,<3.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: 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: rich (>=12.6.0,<13.0.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[all] (>=0.7.0,<0.8.0)
+Requires-Dist: typer-common-functions (>=0.0.3,<0.0.4)
 Requires-Dist: watchdog (>=2.1.7,<3.0.0) ; extra == "devcontainer"
 Project-URL: Repository, https://github.com/OpenJKSoftware/gOdoo
 Description-Content-Type: text/markdown

{godoo_cli-0.4.1 → godoo_cli-0.4.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "gOdoo-cli"
-version = "0.4.1"
+version = "0.4.3"
 description = "Wrapper around Odoo-Bin with some convinience RPC functions."
 authors = ["Joshua Kreuder <Joshua_Kreuder@outlook.com>"]
 license = "LGPL-3"
@@ -15,16 +15,15 @@ keywords = ["odoo", "godoo","devcontainer"]
 godoo = "godoo_cli:launch_cli"
 
 [tool.poetry.dependencies]
-python = ">=3.8,<3.11"
+python = ">=3.8.1,<3.12"
 python-dotenv = "^0.20.0"
 ruamel-yaml = "^0.17.21"
-typer = {extras = ["all"], version = "^0.7.0"}
 gitpython = "^3.1.27"
-rich = "^12.6.0"
-godoo-rpc = "0.0.3"
+godoo-rpc = "^0.1.1"
 openupgradelib = "^3.3.4"
-psycopg2 = "^2.9.5"
-passlib = "^1.7.4"
+psycopg2 = "^2.8.6" # Mirror Odoo Reqs
+passlib = "^1.7.3" # Mirror Odoo Reqs
+typer-common-functions = "^0.0.3"
 
 pylint-odoo = { version="^8.0.16", optional = true}
 ipdb = { version="^0.13.9", optional = true}
@@ -38,6 +37,8 @@ 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}
 
 [tool.poetry.extras]
 devcontainer = [
@@ -55,12 +56,20 @@ codequality = [
     "black",
     "isort",
     "flake8",
+    "pytest",
+    "pytest-cov"
 ]
 
 [build-system]
 requires = ["poetry-core>=1.0.0"]
 build-backend = "poetry.core.masonry.api"
 
+[tool.pytest.ini_options]
+log_cli = true
+log_cli_level = "INFO"
+log_cli_format = "%(asctime)s [%(levelname)8s] %(message)s (%(filename)s:%(lineno)s)"
+log_cli_date_format = "%Y-%m-%d %H:%M:%S"
+
 [tool.pyright]
 ignore="**/__manifest__.py"
 

{godoo_cli-0.4.1 → godoo_cli-0.4.3}/setup.py

@@ -17,20 +17,21 @@ package_data = \
 
 install_requires = \
 ['gitpython>=3.1.27,<4.0.0',
- 'godoo-rpc==0.0.3',
+ 'godoo-rpc>=0.1.1,<0.2.0',
  'openupgradelib>=3.3.4,<4.0.0',
- 'passlib>=1.7.4,<2.0.0',
- 'psycopg2>=2.9.5,<3.0.0',
+ 'passlib>=1.7.3,<2.0.0',
+ 'psycopg2>=2.8.6,<3.0.0',
  'python-dotenv>=0.20.0,<0.21.0',
- 'rich>=12.6.0,<13.0.0',
  'ruamel-yaml>=0.17.21,<0.18.0',
- 'typer[all]>=0.7.0,<0.8.0']
+ 'typer-common-functions>=0.0.3,<0.0.4']
 
 extras_require = \
 {'codequality': ['pylint-odoo>=8.0.16,<9.0.0',
                  'black>=22.10.0,<23.0.0',
                  'isort>=5.10.1,<6.0.0',
-                 'flake8>=5.0.4,<6.0.0'],
+                 'flake8>=5.0.4,<6.0.0',
+                 'pytest>=7.2.1,<8.0.0',
+                 'pytest-cov>=4.0.0,<5.0.0'],
  'devcontainer': ['ipdb>=0.13.9,<0.14.0',
                   'debugpy>=1.6.0,<2.0.0',
                   'pre-commit>=2.20.0,<3.0.0',
@@ -45,7 +46,7 @@ entry_points = \
 
 setup_kwargs = {
     'name': 'godoo-cli',
-    'version': '0.4.1',
+    'version': '0.4.3',
     'description': 'Wrapper around Odoo-Bin with some convinience RPC functions.',
     'long_description': '# gOdoo Dev Environment\n\n![OdooLogo](https://raw.githubusercontent.com/OpenJKSoftware/gOdoo/main/assets/odoo_logo.png)\n![ComposeLogo](https://raw.githubusercontent.com/docker/compose/v2/logo.png)\n\n[<img src="https://raw.githubusercontent.com/OpenJKSoftware/gOdoo/main/assets/godoo-main-cli.png" width="1000"/>](image.png)\n\n**gOdoo** is short for **go Odoo**. \\\nIt is a [Vscode Devcontainer](https://code.visualstudio.com/docs/remote/containers) Environment for [Odoo](https://odoo.com/)\nwith Python CLI `godoo` convenience wrapper around `odoo-bin`.\n\nThis repository is the base source for the Python package [godoo-cli](https://pypi.org/project/godoo-cli/) and serves as\nan all batteries included development environment.\n\nMade Possible by: [WEMPE Elektronic GmbH](https://wetech.de)\n\n# gOdoo-cli\n\nPython package that provides `godoo` command line interface around `odoo-bin`.\n\nIt\'s build with [Typer](https://github.com/tiangolo/typer) to provide some convenience Wrappers for Odoo development and\nDeployment.\n\nMost flags can be configured by Env variables. \\\nUse `godoo --help` to find out more. HINT: Install tab-completion with `godoo --install-completion`\n\n# Docker\n\nThis workspace also contains Docker and Docker-Compose files. \\\n\nThey are used to provide either easy Odoo instances where the source is pulled according to\n[ODOO_MANIFEST.yml](./ODOO_MANIFEST.yml), or as a all batteries included devcontainer for VScode.\n\n## Requirements\n\n- [Docker Compose](https://github.com/docker/compose)\n- [Traefik](https://doc.traefik.io/traefik/) container running with docker provider and "traefik" named docker network.\n  Example: [Traefik Devproxy](https://github.com/joshkreud/traefik_devproxy)\n- SSH Agent running. (check `echo $SSH_AUTH_SOCK`)\\\n  This gets passed trough in the Buildprocess to clone Thirdparty repos.\n\n## Just wanna have a quick and easy Odoo Instance?\n\n```bash\ngit clone https://github.com/OpenJKSoftware/gOdoo\ncd godoo\n. scripts/container_requirements.sh # Check Requirements\ndocker-compose build\ndocker-compose up\n# wait......\n# wait a bit mode ...\n# just a little bit longer ..\n# There we go.\n# Odoo should be reachable on \'https://godoo.docker.localhost\' assuming you didn\'t change .env TRAEFIK_HOST_RULE or COMPOSE_PROJECT_NAME\n```\n\n# Devcontainer\n\n## Features\n\n- All batteries included [Devcontainer](https://code.visualstudio.com/docs/remote/containers) with postgres service\n  Container and local DNS resolvig managed by [Traefik](https://doc.traefik.io/traefik/).\n- Easy fully working Odoo instance by `docker-compose up` with https access.\n- `godoo` CLI wrapper around Odoo. (Most flags can be configured by Environment Variables and are already preconfigured\n  in the Containers. See [.env.sample](./.env.sample))\n- `odoo-bin` is added to PATH and can thus be invoked from every folder.\n- Odoo will run in Proxy_Mode behind a Traefik reverse proxy for easy access on\n  `https://$COMPOSE_PROJECT_NAME.docker.localhost`\n- [Odoo Pylint plugin](https://github.com/OCA/pylint-odoo) preconfigured in vscode\n- Preinstalled vscode Extensions Highlights:\n  - [SQL Tools](https://marketplace.visualstudio.com/items?itemName=mtxr.sqltools) with preconfigured connection for\n    easy Database access in the Sidebar.\n  - [Docker Extension](https://marketplace.visualstudio.com/items?itemName=ms-azuretools.vscode-docker) controls\n    container host.\n  - [Odoo Snippets](https://marketplace.visualstudio.com/items?itemName=mstuttgart.odoo-snippets)\n  - [Odoo Developments](https://marketplace.visualstudio.com/items?itemName=scapigliato.vsc-odoo-development) can Grab\n    Odoo Model information from a running Server\n  - [Todo Tree](https://marketplace.visualstudio.com/items?itemName=Gruntfuggly.todo-tree)\n\n## Usage\n\n1. For Docker on windows: Clone the repo into the WSL2 Filesystem for better IO performance\n2. Have [Traefik](https://github.com/traefik/traefik) Running on `docker.localhost`\n   [Example](https://github.com/joshkreud/traefik_devproxy) \\\n   There must be a Docker network called `traefik` that can reach traefik.\n3. Open Devcontianer:\n   - If you have the Devcontainer CLI: `devcontainer open .`\n   - If not open the workspace in Local Vscode. In the Command pallete search for `Reopen in container`\n4. From **within the container** start Odoo using one of the following commands:\n   - You can enable godoo tab-completion by `godoo --install-completion`\n   - `make` -> Loads Odoo + Workspace Addons\n   - `make bare` -> Loads Odoo with ony `web` installed.\n   - `make kill` -> Search for `odoo-bin` processes and kill them\n   - `make reset` -> Drops DB, deletes config file and datafolder\n   - The full init script is available via "`godoo`". (See --help for Options)\n5. Open Odoo `https://$COMPOSE_PROJECT_NAME.docker.localhost`\\\n   For example `COMPOSE_PROJECT_NAME=godoo` --> [https://godoo.docker.localhost](https://godoo.docker.localhost)\n6. Login with `admin:admin`\n7. Profit!\n\n### Access to Odoo and Thirdparty addon Source\n\nYou can access the Odoo source by opening the VsCode workspace [full.code-workspace](full.code-workspace) from within\nthe Container. This will open a [Multi-Root Workspace](https://code.visualstudio.com/docs/editor/multi-root-workspaces).\nReally waiting for https://github.com/microsoft/vscode-remote-release/issues/3665 here.\n\n## Reset Devcontainer Data\n\nWhen you screwed up so bad its time to just start Over godoo has you covered:\n\n### Automatic Reset\n\nThere are 3 Options to reset the Dev Env.\n\n1. From **Outside** the Container run `make reset` in the project root to delete docker volumes and restart the\n   container. (Vscode will prompt to reconnect if still open)\n2. From **Outside** the Container run `make reset-hard` in the project root to force rebuild the main Odoo container and\n   then do the same as `make reset`\n3. From **Inside** the Container run `make reset` to drop the DB and delete varlib and the bootstrap flag, which is way\n   quicker than the other options.\n\n### Manual Reset\n\n1. Close vscode\n2. Remove `app` and `db` container from docker.\n3. Remove volumes: `db, odoo_thirdparty, odoo_web, vscode_extensions`\n4. Restart Devcontainer\n\n## Python Debugging\n\n### VsCode Debugging\n\nDebugging doesn\'t reliably work with\n[Odoo Multiprocess](https://www.odoo.com/documentation/14.0/developer/misc/other/cmdline.html#multiprocessing) mode\nenabled. \\\nThe container ships with a Vscode Debug profile, that sets `--workers 0` to allow for Debugging Breakpoints. See [.vscode/launch.json](./.vscode/launch.json)\n\n### Interactive Shell\n\nUse `godoo shell` to enter an interactive shell on the Database.\n\n# Odoo Modules\n\n## Third Party Modules (manifest.yml)\n\nThe `godoo` bootstrap function, will download some modules using git. \\\nWhich Repos to download is specified in `ODOO_MANIFEST.yml` ([Default](./ODOO_MANIFEST.yml)) \\\nNot all of the cloned addons are automatically installed. \\\nInstall them via the Apps Page in Odoo using `godoo rpc modules install` or using `odoo-bin`.\\\nModules downloaded on the Odoo Marketplace can be dropped as a `.zip` archive in [./thirdparty](./thirdparty)\n',
     'author': 'Joshua Kreuder',
@@ -59,7 +60,7 @@ setup_kwargs = {
     'install_requires': install_requires,
     'extras_require': extras_require,
     'entry_points': entry_points,
-    'python_requires': '>=3.8,<3.11',
+    'python_requires': '>=3.8.1,<3.12',
 }
 
 

{godoo_cli-0.4.1 → godoo_cli-0.4.3}/src/godoo_cli/cli_common.py

@@ -3,15 +3,14 @@ from pathlib import Path
 from typing import List, Optional
 
 from typer import Option
-
-from .helpers.cli import get_type_from_default, typer_retuner, typer_unpacker
+from typer_common_functions import get_type_from_default, typer_retuner, typer_unpacker
 
 
 @dataclass
 class OdooLaunchArgs:
     extra_cmd_args: List[str] = Option(None, help="extra agruments to pass to odoo-bin", rich_help_panel="Odoo")
     multithread_worker_count: int = Option(
-        5, help="count of worker threads. will enable proxy_mode if >0", rich_help_panel="Odoo"
+        -1, help="count of worker threads. will enable proxy_mode if >0. (Autodetect with -1)", rich_help_panel="Odoo"
     )
     languages: str = Option("de_DE,en_US", help="languages to load by default", rich_help_panel="Odoo")
     no_install_base: bool = Option(
@@ -170,10 +169,10 @@ class SourceGetArgs:
 
 class CommonCLI:
     def __init__(self) -> None:
-        self.odoo_paths = OdooPathCLIArgs()
-        self.odoo_launch = OdooLaunchArgs()
-        self.database = DatabaseCLIArgs()
-        self.rpc = RpcCLIArgs()
+        self.odoo_paths = OdooPathCLIArgs
+        self.odoo_launch = OdooLaunchArgs
+        self.database = DatabaseCLIArgs
+        self.rpc = RpcCLIArgs
         self.source = SourceGetArgs
         self.returner = typer_retuner
         self.unpacker = typer_unpacker

{godoo_cli-0.4.1 → godoo_cli-0.4.3}/src/godoo_cli/commands/bootstrap.py

@@ -1,7 +1,8 @@
 import logging
+import os
 import re
 from pathlib import Path
-from typing import List
+from typing import Any, List
 
 from ..cli_common import CommonCLI
 from ..helpers.bootstrap import _install_py_reqs_by_odoo_cmd
@@ -13,6 +14,11 @@ CLI = CommonCLI()
 LOGGER = logging.getLogger(__name__)
 
 
+def _add_default_argument(cmd_list: List[str], arg: str, arg_val: Any):
+    if not any([arg in s for s in cmd_list]):
+        cmd_list.append(f'{arg}="{arg_val}"')
+
+
 def _boostrap_command(
     odoo_main_path: Path,
     odoo_conf_path: Path,
@@ -27,7 +33,7 @@ def _boostrap_command(
     extra_cmd_args: List[str] = None,
     install_base: bool = True,
     install_workspace_modules: bool = True,
-    multithread_worker_count: int = 9,
+    multithread_worker_count: int = -1,
     languages: str = "de_DE,en_US",
 ) -> str:
     """
@@ -104,16 +110,18 @@ def _boostrap_command(
         f"--config {str(odoo_conf_path.absolute())}",
         "--save",
         f"--load-language {languages}",
-        "--log-level info",
-        "--limit-time-cpu 360",
-        "--limit-time-real 420",
-        "--data-dir /var/lib/odoo",
         "--stop-after-init",
         f"--addons-path '{addon_paths}'",
     ]
     odoo_cmd = base_cmds + db_command
     if extra_cmd_args:
-        odoo_cmd.append(" ".join(extra_cmd_args))
+        odoo_cmd += extra_cmd_args
+
+    _add_default_argument(cmd_list=odoo_cmd, arg="--data-dir", arg_val="/var/lib/odoo")
+
+    if multithread_worker_count == -1:
+        multithread_worker_count = os.cpu_count() or 0 + 1
+
     if multithread_worker_count > 0:
         odoo_cmd += [
             "--proxy-mode",

{godoo_cli-0.4.1 → godoo_cli-0.4.3}/src/godoo_cli/commands/launch.py

@@ -1,4 +1,5 @@
 import logging
+import re
 import threading
 from pathlib import Path
 from typing import List
@@ -158,10 +159,11 @@ def pre_launch(
             no_install_workspace_modules=not install_workspace_addons,
             multithread_worker_count=multithread_worker_count,
         )
-        install_workspace_addons = True
         bootstraped = ret == 0
         if not bootstraped:
             return ret
+        if install_workspace_addons and bootstraped:
+            install_workspace_addons = False
 
         if launch_or_bootstrap:
             return
@@ -182,7 +184,7 @@ def pre_launch(
         odoo_conf_path=odoo_conf_path,
         extra_cmd_args=extra_odoo_args,
         workspace_addon_path=workspace_addon_path,
-        upgrade_workspace_modules=not install_workspace_addons,
+        upgrade_workspace_modules=install_workspace_addons,
     )
 
 
@@ -300,7 +302,7 @@ def launch_import(
         LOGGER.error("godoo Launch Failed. Bootstrap unsuccessfull. Aborting Launch...")
         return CLI.returner(launch_cmd)
 
-    launch_cmd = launch_cmd.replace(",reload ", " ")  # Remove reload option from CMD String
+    launch_cmd = re.sub(r"(--dev [\w,]+)(,reload)", r"\1", launch_cmd)  # Remove reload option from CMD String
 
     LOGGER.info("Starting Data Importer Thread for: '%s'", ", ".join(map(str, load_data_path)))
     loader_thread = threading.Thread(

{godoo_cli-0.4.1 → godoo_cli-0.4.3}/src/godoo_cli/git/git_repo.py

@@ -131,7 +131,7 @@ def git_ensure_ref(
             if str(remote_commit) != current:
                 pull = str(branch)
 
-            git_pull_checkout_reset(repo=repo, branch=branch, commit=commit, pull=pull)
+        git_pull_checkout_reset(repo=repo, branch=branch, commit=commit, pull=pull)
 
         if current == str(repo.head.commit):
             LOGGER.info("Repo Commit matches. Skipping: '%s' --> '%s'", repo_src, target_folder)
@@ -179,6 +179,9 @@ def git_ensure_repo(
         get passed to git clone
     """
 
+    if isinstance(target_folder, str):
+        target_folder = Path(target_folder)
+
     if target_folder.exists() and any(target_folder.iterdir()) and not target_folder.glob(".git"):
         LOGGER.info("Assuming '%s' got pulled in .Zip mode. Skipping Clone and commit check.", target_folder)
         zip_mode = True

{godoo_cli-0.4.1 → godoo_cli-0.4.3}/src/godoo_cli/helpers/bootstrap.py

@@ -33,7 +33,10 @@ def _install_py_reqs_for_modules(addon_paths: List[Path], module_names: List[str
         installed_packages = [m.get("name") for m in literal_eval(installed_packages)]
         if missing_packages := [p for p in py_reqs if p not in installed_packages]:
             LOGGER.info("Installing Python requirements: '%s'", ", ".join(missing_packages))
-            return run_cmd(f"pip install {' '.join(missing_packages)} --disable-pip-version-check", shell=True)
+            res = run_cmd(f"pip install {' '.join(missing_packages)} --disable-pip-version-check", shell=True)
+            if res.returncode != 0:
+                raise FileNotFoundError("Pip installation error at: %s" % ", ".join(missing_packages))
+            return res
     LOGGER.debug("No py Requirements to be installed")
 
 

godoo_cli-0.4.3/src/godoo_cli/helpers/cli.py

@@ -0,0 +1,15 @@
+import logging
+import os
+
+LOGGER = logging.getLogger(__name__)
+
+
+def check_dangerous_command():
+    isdev = str(os.getenv("WORKSPACE_IS_DEV"))
+    if not isdev.lower() == "true":
+        LOGGER.warning(
+            """This function is dangerous in Production environments.
+Please set 'WORKSPACE_IS_DEV=true' as environment Variable to continue
+            """
+        )
+        exit(1)

godoo_cli-0.4.3/src/godoo_cli/version.py

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

godoo_cli-0.4.1/src/godoo_cli/helpers/cli.py

@@ -1,139 +0,0 @@
-import functools
-import inspect
-import logging
-import os
-import sys
-from typing import Callable
-
-import typer
-from typer.models import ParameterInfo
-
-LOGGER = logging.getLogger(__name__)
-
-
-def check_dangerous_command():
-    isdev = str(os.getenv("WORKSPACE_IS_DEV"))
-    if not isdev.lower() == "true":
-        LOGGER.warning(
-            """This function is dangerous in Production environments.
-Please set 'WORKSPACE_IS_DEV=true' as environment Variable to continue
-            """
-        )
-        exit(1)
-
-
-def get_type_from_default(*args):
-    """Decorator to add type annotations to function by Dataclass default values.
-
-    Used to tell typer CLI about the Argument types if they are applied via a Dataclass.
-
-    Default values are being searched on the dataclasses provided by *args.
-    If they are found, adds type to function annotations so that typer can read them later.
-
-    Parameters
-    ----------
-    *args :
-        one or many dataclasses on which to search for default values
-    """
-    annotation_source = args
-
-    def decorator(fun):
-        def wrapper():
-            fun_params = inspect.signature(fun).parameters
-            missing_annot = []
-            for param_name, param_val in fun_params.items():
-                param_default = param_val.default
-                if hasattr(param_default, "default") and isinstance(param_default.default, type(...)):
-                    # Disable "default" in --help when Arg is required
-                    param_default.show_default = False
-                if param_name not in fun.__annotations__:
-                    missing_annot.append((param_name, param_default))
-
-            for param_name, param_default in missing_annot:
-                for source_class in annotation_source:
-                    if source_param_name := next(
-                        (k for k, v in source_class.__dict__.items() if v == param_default),
-                        None,
-                    ):
-                        if typ := source_class.__annotations__.get(source_param_name):
-                            fun.__annotations__[param_name] = typ
-                            break
-            return fun
-
-        return wrapper()
-
-    return decorator
-
-
-def typer_retuner(ret):
-    """Exit Typer command with return code, if parent of calling function is not the typer_unpacker wrapper.
-        Will just return ret if ret is either not an integer, or the parent function was another python func.
-
-        Ensures, that we exit the CLI with a return code, only if the function is the CLI base command.
-
-    Parameters
-    ----------
-    ret : Any
-        Value to either return or Exit
-
-    Returns
-    -------
-    Any
-        ret
-    """
-    parent_func = sys._getframe(1).f_code.co_name
-    if isinstance(ret, int):
-        parent_name = sys._getframe(2).f_code.co_name
-        if parent_name != "typer_unwrapper":
-            LOGGER.debug("Exiting Typer Command: %s with code %s", parent_func, ret)
-            if ret > 255:
-                LOGGER.debug("Capping exit code to 255")
-                ret = 255
-            raise typer.Exit(code=ret)
-    LOGGER.debug("Returning Typer Command: %s", parent_func)
-    return ret
-
-
-def typer_unpacker(f: Callable):
-    """
-    Apply as decorator to typer command function to make the function callable from python
-    if you used typer.Argument or typer.Option.
-
-    """
-
-    @functools.wraps(f)
-    def typer_unwrapper(*args, **kwargs):
-        # Get the default function argument that aren't passed in kwargs via the
-        # inspect module: https://stackoverflow.com/a/12627202
-        missing_default_values = {
-            k: (v.default, v._annotation)
-            for k, v in inspect.signature(f).parameters.items()
-            if v.default is not inspect.Parameter.empty and k not in kwargs
-        }
-
-        for name, (func_default, target_type) in missing_default_values.items():
-            # If the default value is a typer.Option or typer.Argument, we have to
-            # pull either the .default attribute and pass it in the function
-            # invocation, or call it first.
-            if isinstance(func_default, ParameterInfo):
-                if ev := func_default.envvar:
-                    env_var = os.getenv(ev)
-                    try:
-                        if env_res := target_type(env_var) if target_type else env_var:
-                            kwargs[name] = env_res
-                            continue
-                    except TypeError as e:
-                        raise TypeError(
-                            f"Type mismatch in: '{ev}' Expected: '{target_type}' Got: '{type(env_var)}"
-                        ) from e
-                if callable(func_default.default):
-                    kwargs[name] = func_default.default()
-                else:
-                    if func_default.default is Ellipsis:
-                        raise ValueError(f"Missing required Argument for: {name}")
-                    kwargs[name] = func_default.default
-
-        # Call the wrapped function with the defaults injected if not specified.
-        return f(*args, **kwargs)
-
-    return typer_unwrapper

godoo_cli-0.4.1/src/godoo_cli/version.py

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