gOdoo-cli 0.3.3__tar.gz → 0.3.4__tar.gz

{godoo_cli-0.3.3 → godoo_cli-0.3.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: godoo-cli
-Version: 0.3.3
+Version: 0.3.4
 Summary: Wrapper around Odoo-Bin with some convinience RPC functions.
 Home-page: https://github.com/OpenJKSoftware/gOdoo
 License: LGPL-3

{godoo_cli-0.3.3 → godoo_cli-0.3.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "gOdoo-cli"
-version = "0.3.3"
+version = "0.3.4"
 description = "Wrapper around Odoo-Bin with some convinience RPC functions."
 authors = ["Joshua Kreuder <Joshua_Kreuder@outlook.com>"]
 license = "LGPL-3"

{godoo_cli-0.3.3 → godoo_cli-0.3.4}/setup.py

@@ -40,7 +40,7 @@ entry_points = \
 
 setup_kwargs = {
     'name': 'godoo-cli',
-    'version': '0.3.3',
+    'version': '0.3.4',
     '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',

{godoo_cli-0.3.3 → godoo_cli-0.3.4}/src/godoo_cli/__init__.py

@@ -1,2 +1,2 @@
-__version__ = "0.3.3"
+__version__ = "0.3.4"
 from .cli import launch_cli

{godoo_cli-0.3.3 → godoo_cli-0.3.4}/src/godoo_cli/commands/launch.py

@@ -116,15 +116,14 @@ def launch_odoo(
     rpc_callback(ctx)  # Add RPC Options using Defaults and Envvars
 
     if load_data_path:
-        for p in load_data_path:
-            LOGGER.info("Starting Data Importer Thread for: '%s'", str(p))
-            loader_thread = threading.Thread(
-                target=import_to_odoo,
-                name="DataLoader",
-                args=(ctx,),
-                kwargs={"read_path": p.absolute()},
-            )
-            loader_thread.start()
+        LOGGER.info("Starting Data Importer Thread for: '%s'", ", ".join(map(str, load_data_path)))
+        loader_thread = threading.Thread(
+            target=import_to_odoo,
+            name="DataLoader",
+            args=(ctx,),
+            kwargs={"read_paths": load_data_path},
+        )
+        loader_thread.start()
 
     cmd_string = _launch_command(
         odoo_path=ctx.obj.odoo_main_path,

{godoo_cli-0.3.3 → godoo_cli-0.3.4}/src/godoo_cli/commands/rpc/importer.py

@@ -6,6 +6,7 @@ Places Systemparam to Track if import was already done.
 
 import logging
 from pathlib import Path
+from typing import List
 
 import typer
 from godoo_rpc import import_data
@@ -21,7 +22,7 @@ LOGGER = logging.getLogger(__name__)
 @typer_unpacker
 def import_to_odoo(
     ctx: typer.Context,
-    read_path: Path = typer.Argument(
+    read_paths: List[Path] = typer.Argument(
         ...,
         readable=True,
         exists=True,
@@ -53,18 +54,16 @@ def import_to_odoo(
         odoo_user=ctx.obj.odoo_rpc_user,
         odoo_password=ctx.obj.odoo_rpc_password,
     )
-    if not read_path.exists():
-        raise ValueError("Provided import Path: %s doesn't exist", read_path)
 
-    if read_path.is_file():
-        product_image_regex = ""
-        file_regex = ""
+    if missing_paths := [p for p in read_paths if not p.exists()]:
+        raise ValueError("Provided import Paths: %s doesn't exist", ", ".join(missing_paths))
 
-    import_data(
-        odoo_api=odoo_api,
-        read_path=read_path.absolute(),
-        data_regex=file_regex,
-        product_image_regex=product_image_regex,
-        check_dataset_timestamp=check_data_timestamp,
-        skip_existing_ids=skip_existing_ids,
-    )
+    for path in read_paths:
+        import_data(
+            odoo_api=odoo_api,
+            read_path=path.absolute(),
+            data_regex=file_regex,
+            product_image_regex="" if path.is_file() else product_image_regex,
+            check_dataset_timestamp="" if path.is_file() else check_data_timestamp,
+            skip_existing_ids=skip_existing_ids,
+        )

{godoo_cli-0.3.3 → godoo_cli-0.3.4}/src/godoo_cli/git/git_repo.py

@@ -55,9 +55,12 @@ def git_pull_checkout_reset(
     pull : str, optional
         specific target to pull. Usually used in conjunction with branch.
     reset_hard : bool, optional
-        will call reset --hard after checkout to ensure clean git repo, by default True
+        will call reset --hard before checkout to ensure clean git repo, by default True
     """
 
+    if reset_hard:
+        repo.git.reset("--hard", "HEAD")
+
     if pull:
         LOGGER.debug("Pulling Repo: %s, %s", repo.working_dir, pull)
         try:
@@ -78,8 +81,6 @@ def git_pull_checkout_reset(
     if branch:
         LOGGER.debug("Checking Out repo %s to Branch: %s", repo.git_dir, branch)
         repo.git.checkout(branch)
-    if reset_hard:
-        repo.git.reset("--hard")
 
 
 def git_ensure_ref(
@@ -120,7 +121,10 @@ def git_ensure_ref(
 
         if not pull and branch and not commit:
             remote_name = str(repo.remotes[0].name)
-            remote_commit = repo.git.rev_parse(remote_name + "/" + str(branch))
+            try:
+                remote_commit = repo.git.rev_parse(remote_name + "/" + str(branch))
+            except Exception:
+                remote_commit = "unknown"
             LOGGER.debug(
                 "Repo: %s comparing local head '%s' with remote head '%s'", repo.working_dir, current, remote_commit
             )