cli-dolibarr 3.7.2__tar.gz → 3.7.4__tar.gz

{cli_dolibarr-3.7.2 → cli_dolibarr-3.7.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cli-dolibarr
-Version: 3.7.2
+Version: 3.7.4
 Summary: CLI tool for Dolibarr ERP/CRM REST API management
 Author: CLI Anything
 License-Expression: MIT

cli_dolibarr-3.7.4/cli_dolibarr/dolibarr/__init__.py

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

{cli_dolibarr-3.7.2 → cli_dolibarr-3.7.4}/cli_dolibarr/dolibarr/commands/config.py

@@ -138,13 +138,41 @@ def _mask_api_key(key: str) -> str:
 
 
 def _install_hermes_plugin(url: str, api_key: str):
-    plugin_dir = Path.home() / '.hermes' / 'plugins' / 'dolibarr'
+    hermes_dir = Path.home() / '.hermes'
+    plugin_dir = hermes_dir / 'plugins' / 'dolibarr'
     source_dir = Path(__file__).resolve().parent.parent / 'hermes_plugin'
 
     if not source_dir.is_dir():
         click.echo("Hermes plugin source not found, skipping.")
         return
 
+    # Ensure cli_dolibarr is importable from Hermes venv
+    for venv_name in ('venv', '.venv'):
+        venv_dir = hermes_dir / 'hermes-agent' / venv_name
+        venv_python = venv_dir / 'bin' / 'python3'
+        if venv_python.exists():
+            try:
+                import subprocess
+                result = subprocess.run(
+                    [str(venv_python), '-c', 'import cli_dolibarr'],
+                    capture_output=True, timeout=10,
+                )
+                if result.returncode != 0:
+                    click.echo("  Installing cli-dolibarr into Hermes venv...")
+                    pip_result = subprocess.run(
+                        [str(venv_python), '-m', 'pip', 'install', 'cli-dolibarr'],
+                        capture_output=True, timeout=120,
+                    )
+                    if pip_result.returncode == 0:
+                        click.echo(f"  ✅ Installed into {venv_dir}")
+                    else:
+                        click.echo(f"  ⚠️  Failed. Run: {venv_dir}/bin/pip install cli-dolibarr")
+                else:
+                    click.echo("  cli-dolibarr already in Hermes venv (ok)")
+            except Exception as e:
+                click.echo(f"  ⚠️  Could not check Hermes venv: {e}")
+            break
+
     click.echo("")
     click.echo("Installing Hermes plugin...")
 
@@ -154,7 +182,6 @@ def _install_hermes_plugin(url: str, api_key: str):
         if src.exists():
             shutil.copy2(src, plugin_dir / f)
 
-    hermes_dir = Path.home() / '.hermes'
     env_file = hermes_dir / '.env'
 
     env_lines = []
@@ -185,7 +212,7 @@ def _install_hermes_plugin(url: str, api_key: str):
 
 
 def _configure_hermes_toolsets(hermes_dir: Path):
-    """Add dolibarr to delegation.default_toolsets in Hermes config.yaml."""
+    """Add dolibarr to toolsets and delegation.default_toolsets in Hermes config.yaml."""
     config_yaml = hermes_dir / 'config.yaml'
     if not config_yaml.exists():
         click.echo("  No Hermes config.yaml found, skipping toolset config.")
@@ -193,66 +220,138 @@ def _configure_hermes_toolsets(hermes_dir: Path):
 
     lines = config_yaml.read_text().splitlines()
 
-    # Case A: find default_toolsets: line (indented >= 2 spaces)
-    dt_idx = None
-    dt_indent = None
+    # --- 1. Top-level toolsets (controls main agent toolset loading) ---
+    ts_added = _add_to_yaml_list_block(lines, 'toolsets:', 0, 'dolibarr')
+
+    # --- 2. delegation.default_toolsets (controls sub-agent toolsets) ---
+    dt_added = _add_to_yaml_nested_list(
+        lines, 'delegation:', 'default_toolsets:', 'dolibarr',
+        fallback_items=['- terminal', '- file', '- web', '- dolibarr'],
+    )
+
+    if ts_added or dt_added:
+        config_yaml.write_text('\n'.join(lines) + '\n')
+    else:
+        click.echo("  dolibarr already in toolsets (ok)")
+
+
+def _add_to_yaml_list_block(lines: list, block_key: str, min_indent: int,
+                             item: str) -> bool:
+    """Add '- item' to a top-level YAML list block like 'toolsets:'.
+
+    Returns True if modified, False if already present or not found.
+    """
+    block_idx = None
+    block_indent = None
+    for i, line in enumerate(lines):
+        s = line.rstrip('\n')
+        indent = len(s) - len(s.lstrip())
+        if s.strip() == block_key and indent >= min_indent:
+            block_idx = i
+            block_indent = indent
+            break
+
+    if block_idx is None:
+        return False
+
+    target = f'- {item}'
+
+    # Scan block for existing item
+    for i in range(block_idx + 1, len(lines)):
+        s = lines[i].rstrip('\n')
+        lead = len(s) - len(s.lstrip())
+        if lead <= block_indent and s.strip():
+            break
+        if s.strip() == target:
+            return False  # already present
+
+    # Find last list item in block
+    last_item = block_idx
+    for i in range(block_idx + 1, len(lines)):
+        s = lines[i].rstrip('\n')
+        lead = len(s) - len(s.lstrip())
+        if lead <= block_indent and s.strip():
+            break
+        if s.strip().startswith('- '):
+            last_item = i
+
+    new_line = (' ' * (block_indent + 2)) + target
+    lines.insert(last_item + 1, new_line)
+    click.echo(f"  ✅ Added {item} to {block_key}")
+    return True
+
+
+def _add_to_yaml_nested_list(lines: list, parent_key: str, child_key: str,
+                              item: str, fallback_items: list = None) -> bool:
+    """Add '- item' to a nested YAML list like delegation.default_toolsets.
+
+    If child block doesn't exist but parent does, insert the full block
+    using fallback_items. Returns True if modified.
+    """
+    target = f'- {item}'
+
+    # Find parent (e.g. 'delegation:')
+    parent_idx = None
     for i, line in enumerate(lines):
         s = line.rstrip('\n')
-        if s.strip() == 'default_toolsets:' and (len(s) - len(s.lstrip())) >= 2:
-            dt_idx = i
-            dt_indent = len(s) - len(s.lstrip())
+        if s.strip() == parent_key:
+            parent_idx = i
+            break
+
+    if parent_idx is None:
+        click.echo(f"  ⚠️  No {parent_key} section in config.yaml.")
+        return False
+
+    parent_indent = len(lines[parent_idx].rstrip('\n')) - len(lines[parent_idx].rstrip('\n').lstrip())
+
+    # Find child (e.g. 'default_toolsets:') inside parent
+    child_idx = None
+    child_indent = None
+    for i in range(parent_idx + 1, len(lines)):
+        s = lines[i].rstrip('\n')
+        indent = len(s) - len(s.lstrip())
+        if indent <= parent_indent and s.strip():
+            break  # exited parent block
+        if s.strip() == child_key and indent >= parent_indent + 2:
+            child_idx = i
+            child_indent = indent
             break
 
-    if dt_idx is not None:
-        # Check if dolibarr already in this block
-        for i in range(dt_idx + 1, len(lines)):
+    if child_idx is not None:
+        # Check if already present
+        for i in range(child_idx + 1, len(lines)):
             s = lines[i].rstrip('\n')
             lead = len(s) - len(s.lstrip())
-            if lead <= dt_indent:
+            if lead <= child_indent and s.strip():
                 break
-            if s.strip() == '- dolibarr':
-                click.echo("  dolibarr already in default_toolsets (ok)")
-                return
+            if s.strip() == target:
+                return False  # already present
 
-        # Not found — find last list item in block and insert after it
-        new_line = (' ' * (dt_indent + 2)) + '- dolibarr'
-        last_item = dt_idx
-        for i in range(dt_idx + 1, len(lines)):
+        # Find last list item and append
+        last_item = child_idx
+        for i in range(child_idx + 1, len(lines)):
             s = lines[i].rstrip('\n')
             lead = len(s) - len(s.lstrip())
-            if lead <= dt_indent:
+            if lead <= child_indent and s.strip():
                 break
             if s.strip().startswith('- '):
                 last_item = i
 
+        new_line = (' ' * (child_indent + 2)) + target
         lines.insert(last_item + 1, new_line)
-        config_yaml.write_text('\n'.join(lines) + '\n')
-        click.echo("  ✅ Added dolibarr to delegation.default_toolsets")
-        return
+        click.echo(f"  ✅ Added {item} to {parent_key}.{child_key}")
+        return True
 
-    # Case B: delegation: exists but no default_toolsets
-    delegation_idx = None
-    for i, line in enumerate(lines):
-        if line.rstrip('\n').strip() == 'delegation:':
-            delegation_idx = i
-            break
-
-    if delegation_idx is not None:
-        d = lines[delegation_idx].rstrip('\n')
-        d_indent = len(d) - len(d.lstrip())
-        block_lines = [
-            (' ' * (d_indent + 2)) + 'default_toolsets:',
-            (' ' * (d_indent + 4)) + '- terminal',
-            (' ' * (d_indent + 4)) + '- file',
-            (' ' * (d_indent + 4)) + '- web',
-            (' ' * (d_indent + 4)) + '- dolibarr',
+    # Child doesn't exist — insert full block under parent
+    if fallback_items:
+        insert_lines = [
+            (' ' * (parent_indent + 2)) + child_key,
         ]
-        for offset, block_line in enumerate(block_lines):
-            lines.insert(delegation_idx + 1 + offset, block_line)
-        config_yaml.write_text('\n'.join(lines) + '\n')
-        click.echo("  ✅ Added delegation.default_toolsets with dolibarr")
-        return
-
-    # Case C: no delegation section at all
-    click.echo("  ⚠️  No delegation section in config.yaml.")
-    click.echo("     Add 'dolibarr' to delegation.default_toolsets manually.")
+        for fb in fallback_items:
+            insert_lines.append((' ' * (parent_indent + 4)) + fb)
+        for offset, il in enumerate(insert_lines):
+            lines.insert(parent_idx + 1 + offset, il)
+        click.echo(f"  ✅ Added {parent_key}.{child_key} with {item}")
+        return True
+
+    return False

{cli_dolibarr-3.7.2 → cli_dolibarr-3.7.4}/cli_dolibarr.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cli-dolibarr
-Version: 3.7.2
+Version: 3.7.4
 Summary: CLI tool for Dolibarr ERP/CRM REST API management
 Author: CLI Anything
 License-Expression: MIT

cli_dolibarr-3.7.2/cli_dolibarr/dolibarr/__init__.py

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