gulp-cli 1.1.11__tar.gz → 2.0.0__tar.gz

{gulp_cli-1.1.11/src/gulp_cli.egg-info → gulp_cli-2.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gulp-cli
-Version: 1.1.11
+Version: 2.0.0
 Summary: Command-line client for gULP
 Author-email: Mentat <info@mentat.is>
 Requires-Python: >=3.12
@@ -10,7 +10,7 @@ License-File: LICENSE.md
 Requires-Dist: typer==0.23.1
 Requires-Dist: rich==15.0.0
 Requires-Dist: click==8.3.3
-Requires-Dist: gulp-sdk<2.0.0
+Requires-Dist: gulp-sdk>=2.0.0
 Provides-Extra: portable
 Requires-Dist: pyinstaller<7,>=6.11; extra == "portable"
 Dynamic: license-file

{gulp_cli-1.1.11 → gulp_cli-2.0.0}/docs/examples.md

@@ -38,6 +38,8 @@
     - [Search by Field Value](#search-by-field-value)
     - [Complex Queries (Range, Boolean)](#complex-queries-range-boolean)
     - [Filter by Source](#filter-by-source)
+    - [Query External Data Source](#query-external-data-source)
+    - [Export Query Results](#export-query-results)
     - [Aggregation, Document Lookup, and History](#aggregation-document-lookup-and-history)
   - [Sigma Rule Queries](#sigma-rule-queries)
     - [Run Single Sigma Rule](#run-single-sigma-rule)
@@ -522,6 +524,7 @@ gulp-cli query gulp incident-001 --flt '{"tags":["suspicious"]}' --preview
 
 # Paginated results via q_options overrides
 gulp-cli query gulp incident-001 --flt '{"tags":["suspicious"]}' --limit 200 --offset 400
+```
 
 ### Query External Data Source
 
@@ -533,8 +536,6 @@ gulp-cli query external incident-001 \
   --preview --limit 100 --offset 0
 ```
 
-```
-
 ### Export Query Results
 
 ```bash

{gulp_cli-1.1.11 → gulp_cli-2.0.0}/pyproject.toml

@@ -14,7 +14,7 @@ authors = [{ name = "Mentat", email = "info@mentat.is" }]
 description = "Command-line client for gULP"
 readme = "README.md"
 requires-python = ">=3.12"
-dependencies = ["typer==0.23.1", "rich==15.0.0", "click==8.3.3", "gulp-sdk<2.0.0"]
+dependencies = ["typer==0.23.1", "rich==15.0.0", "click==8.3.3", "gulp-sdk>=2.0.0"]
 
 [project.optional-dependencies]
 portable = ["pyinstaller>=6.11,<7"]

{gulp_cli-1.1.11 → gulp_cli-2.0.0}/src/gulp_cli/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '1.1.11'
-__version_tuple__ = version_tuple = (1, 1, 11)
+__version__ = version = '2.0.0'
+__version_tuple__ = version_tuple = (2, 0, 0)
 
-__commit_id__ = commit_id = 'g2c347f06e'
+__commit_id__ = commit_id = 'g457370818'

{gulp_cli-1.1.11 → gulp_cli-2.0.0}/src/gulp_cli/commands/collab.py

@@ -119,6 +119,29 @@ async def _bulk_delete(
         print_result(deleted)
 
 
+@app.command("count")
+def object_count(
+    obj_type: str = typer.Argument(..., help="Collab object type, e.g. note"),
+    operation_id: str | None = typer.Option(
+        None, "--operation-id", help="Optional operation ID scope"
+    ),
+    flt: str | None = typer.Option(
+        None, "--flt", help="GulpCollabFilter JSON object"
+    ),
+) -> None:
+    async def _run() -> None:
+        flt_parsed = parse_json_option(flt, field_name="flt") or {}
+        async with get_client() as client:
+            counted = await client.plugins.object_count(
+                obj_type=obj_type,
+                flt=flt_parsed,
+                operation_id=operation_id,
+            )
+            print_result(counted)
+
+    asyncio.run(_run())
+
+
 @note_app.command("create")
 def note_create(
     operation_id: str,

{gulp_cli-1.1.11 → gulp_cli-2.0.0}/src/gulp_cli/commands/ingest.py

@@ -2279,6 +2279,8 @@ def ingest_raw(
                 data=payload_data,
                 params=params,
                 wait=False,
+                timeout=wait_timeout,
+                wait_for_worker=wait,
             )
 
             if hasattr(result, "model_dump"):

{gulp_cli-1.1.11 → gulp_cli-2.0.0}/src/gulp_cli/commands/query.py

@@ -76,14 +76,14 @@ def query_raw_paginate(
 @app.command("raw")
 def query_raw(
     operation_id: str,
-    q: str = typer.Option(..., "--q", help="JSON object or array with OpenSearch DSL query/query list"),
+    q: str = typer.Option(..., "--q", help="JSON object with an OpenSearch DSL query"),
     q_options: str | None = typer.Option(None, "--q-options", help="JSON object for GulpQueryParameters"),
     preview: bool = typer.Option(False, "--preview", help="Enable preview_mode in q_options (synchronous limited result set)"),
     limit: int | None = typer.Option(None, "--limit", min=1, help="Set q_options.limit"),
     wait: bool = typer.Option(False, "--wait"),
 ) -> None:
     async def _run() -> None:
-        q_parsed = parse_json_list_option(q, field_name="q")
+        q_parsed = parse_json_option(q, field_name="q")
         if not q_parsed:
             raise typer.BadParameter("--q is required")
         options = parse_json_option(q_options, field_name="q-options")

{gulp_cli-1.1.11 → gulp_cli-2.0.0}/src/gulp_cli/commands/stats.py

@@ -413,21 +413,19 @@ def _significant_data(
         failed = data.get("records_failed")
         return f"ing={ingested or 0} skip={skipped or 0} fail={failed or 0}"
 
-    # query / ext_query: focus on query group and progress
+    # query / ext_query: focus on progress
     if req_type in {"query", "ext_query"}:
-        group = _first_non_empty(data, ["q_group", "group", "name"])
         num_q = data.get("num_queries")
         done_q = data.get("completed_queries")
         failed_q = data.get("failed_queries")
         hits = data.get("total_hits")
-        prefix = f"group={group}" if group else "query"
         if num_q is not None and done_q is not None:
             return (
-                f"{prefix} ({done_q}/{num_q}, failed={failed_q or 0}) "
+                f"query ({done_q}/{num_q}, failed={failed_q or 0}) "
                 f"hits={hits if hits is not None else '-'}"
             )
         if hits is not None:
-            return f"{prefix} hits={hits}"
+            return f"query hits={hits}"
         return prefix
 
     # rebase / enrich: focus on updated docs counts

{gulp_cli-1.1.11 → gulp_cli-2.0.0/src/gulp_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gulp-cli
-Version: 1.1.11
+Version: 2.0.0
 Summary: Command-line client for gULP
 Author-email: Mentat <info@mentat.is>
 Requires-Python: >=3.12
@@ -10,7 +10,7 @@ License-File: LICENSE.md
 Requires-Dist: typer==0.23.1
 Requires-Dist: rich==15.0.0
 Requires-Dist: click==8.3.3
-Requires-Dist: gulp-sdk<2.0.0
+Requires-Dist: gulp-sdk>=2.0.0
 Provides-Extra: portable
 Requires-Dist: pyinstaller<7,>=6.11; extra == "portable"
 Dynamic: license-file

{gulp_cli-1.1.11 → gulp_cli-2.0.0}/src/gulp_cli.egg-info/SOURCES.txt

@@ -60,8 +60,10 @@ src/gulp_cli/commands/utility.py
 src/gulp_cli/extension/__init__.py
 src/gulp_cli/extension/query_sigma_zip.py
 src/gulp_cli/extension/story.py
+tests/test_collab_count.py
 tests/test_enrich_live.py
 tests/test_ingest_paths_file.py
+tests/test_ingest_raw_wait.py
 tests/test_ingest_wait_log.py
 tests/test_version.py
 tests/test_zip_create.py

{gulp_cli-1.1.11 → gulp_cli-2.0.0}/src/gulp_cli.egg-info/requires.txt

@@ -1,7 +1,7 @@
 typer==0.23.1
 rich==15.0.0
 click==8.3.3
-gulp-sdk<2.0.0
+gulp-sdk>=2.0.0
 
 [portable]
 pyinstaller<7,>=6.11

{gulp_cli-1.1.11 → gulp_cli-2.0.0}/src/gulp_cli.egg-info/scm_file_list.json

@@ -55,7 +55,9 @@
     "tests/test_version.py",
     "tests/test_enrich_live.py",
     "tests/test_zip_create.py",
+    "tests/test_ingest_raw_wait.py",
     "tests/test_ingest_wait_log.py",
+    "tests/test_collab_count.py",
     ".github/workflows/portable-bundles.yml",
     ".github/workflows/python-package.yml"
   ]

{gulp_cli-1.1.11 → gulp_cli-2.0.0}/src/gulp_cli.egg-info/scm_version.json

@@ -1,7 +1,7 @@
 {
-  "tag": "1.1.11",
+  "tag": "2.0.0",
   "distance": 0,
-  "node": "g2c347f06ef44faa1cf9b0321438689d0b10b8008",
+  "node": "g457370818d0eb3a82cab1ee949acac00de5074e6",
   "dirty": false,
   "branch": "HEAD",
   "node_date": "2026-07-14"

gulp_cli-2.0.0/tests/test_collab_count.py

@@ -0,0 +1,34 @@
+from __future__ import annotations
+
+
+def test_collab_count_command_uses_sdk(monkeypatch) -> None:
+    import gulp_cli.commands.collab as collab
+
+    seen: dict[str, object] = {}
+
+    class _FakePlugins:
+        async def object_count(self, **kwargs) -> dict[str, int]:
+            seen.update(kwargs)
+            return {"count": 7}
+
+    class _FakeClient:
+        plugins = _FakePlugins()
+
+    class _FakeGetClient:
+        async def __aenter__(self):
+            return _FakeClient()
+
+        async def __aexit__(self, exc_type, exc, tb):
+            return None
+
+    monkeypatch.setattr(collab, "get_client", lambda: _FakeGetClient())
+    monkeypatch.setattr(collab, "print_result", lambda data: seen.setdefault("data", data))
+
+    collab.object_count("note", operation_id="op-a", flt='{"tags":["auto"]}')
+
+    assert seen == {
+        "obj_type": "note",
+        "flt": {"tags": ["auto"]},
+        "operation_id": "op-a",
+        "data": {"count": 7},
+    }

{gulp_cli-1.1.11 → gulp_cli-2.0.0}/tests/test_enrich_live.py

@@ -48,7 +48,7 @@ async def _setup_sample_docs() -> tuple[str, str]:
 
         preview = await client.queries.query_raw(
             operation_id=operation.id,
-            q=[{"query": {"match_all": {}}}],
+            q={"query": {"match_all": {}}},
             q_options={"preview_mode": True, "limit": 1, "name": "cli_enrich_preview"},
         )
         docs = (preview.get("data") or {}).get("docs") or []
@@ -75,7 +75,7 @@ async def _get_first_doc_id(operation_id: str, config_dir: Path) -> str:
     async with GulpClient(url, token=token) as client:
         preview = await client.queries.query_raw(
             operation_id=operation_id,
-            q=[{"query": {"match_all": {}}}],
+            q={"query": {"match_all": {}}},
             q_options={"preview_mode": True, "limit": 1, "name": "cli_enrich_preview"},
         )
         docs = (preview.get("data") or {}).get("docs") or []

{gulp_cli-1.1.11 → gulp_cli-2.0.0}/tests/test_ingest_paths_file.py

@@ -4,10 +4,12 @@ import inspect
 import bz2
 import asyncio
 from pathlib import Path
+from types import SimpleNamespace
 
 import pytest
 import typer
 
+from gulp_cli.commands import ingest as ingest_module
 from gulp_cli.commands.ingest import (
     _expand_source_patterns,
     _maybe_bz2_compress_file_for_ingestion,
@@ -17,6 +19,75 @@ from gulp_cli.commands.ingest import (
 )
 
 
+def test_ingest_file_assigns_a_distinct_req_id_to_each_file(
+    tmp_path: Path, monkeypatch: pytest.MonkeyPatch
+) -> None:
+    files = [tmp_path / "one.log", tmp_path / "two.log"]
+    for path in files:
+        path.write_text("event", encoding="utf-8")
+
+    req_ids: list[str] = []
+
+    class _Ingest:
+        async def file(self, **kwargs):
+            req_id = kwargs["params"]["req_id"]
+            req_ids.append(req_id)
+            return SimpleNamespace(req_id=req_id, status="pending")
+
+    class _Client:
+        ingest = _Ingest()
+
+        async def ensure_websocket(self) -> None:
+            return None
+
+    class _ClientContext:
+        async def __aenter__(self):
+            return _Client()
+
+        async def __aexit__(self, exc_type, exc, tb):
+            return False
+
+    class _Tracker:
+        @classmethod
+        async def create(cls, *_args, **_kwargs):
+            return cls()
+
+        async def wait_for_confirm(self, _req_id: str, _timeout: float) -> bool:
+            return False
+
+        def close(self) -> None:
+            return None
+
+    async def _operation_exists(*_args, **_kwargs) -> None:
+        return None
+
+    monkeypatch.setattr(ingest_module, "get_client", lambda: _ClientContext())
+    monkeypatch.setattr(ingest_module, "_IngestWsTracker", _Tracker)
+    monkeypatch.setattr(ingest_module, "_ensure_operation_exists", _operation_exists)
+    monkeypatch.setattr(ingest_module, "print_result", lambda _result: None)
+
+    ingest_file(
+        operation_id="op",
+        plugin="raw",
+        file_patterns=[str(path) for path in files],
+        paths_file=None,
+        context_name="ctx",
+        plugin_params=None,
+        flt=None,
+        reset_operation=False,
+        create_operation_if_missing=False,
+        preview=False,
+        wait=False,
+        wait_log=False,
+        wait_timeout=300,
+        show_per_file_progress=False,
+        batch_size=2,
+    )
+
+    assert len(req_ids) == len(files)
+    assert len(set(req_ids)) == len(files)
+
+
 def test_ingest_file_paths_file_option_defaults_to_unset() -> None:
     paths_file_default = inspect.signature(ingest_file).parameters["paths_file"].default
     assert paths_file_default.default is None

gulp_cli-2.0.0/tests/test_ingest_raw_wait.py

@@ -0,0 +1,52 @@
+"""Raw-ingest worker wait coverage."""
+
+from contextlib import asynccontextmanager
+from types import SimpleNamespace
+from unittest.mock import AsyncMock
+
+from gulp_cli.commands import ingest as ingest_module
+
+
+def test_ingest_raw_passes_wait_and_timeout_to_sdk(monkeypatch) -> None:
+    raw = AsyncMock(return_value=SimpleNamespace(req_id="req-1"))
+    client = SimpleNamespace(
+        ingest=SimpleNamespace(raw=raw),
+        ensure_websocket=AsyncMock(),
+    )
+
+    @asynccontextmanager
+    async def _client_context():
+        yield client
+
+    tracker = SimpleNamespace(
+        wait_for_terminal=AsyncMock(return_value={"status": "done"})
+    )
+    monkeypatch.setattr(ingest_module, "get_client", _client_context)
+    monkeypatch.setattr(
+        ingest_module,
+        "_IngestWsTracker",
+        SimpleNamespace(create=AsyncMock(return_value=tracker)),
+    )
+    monkeypatch.setattr(ingest_module, "_ensure_operation_exists", AsyncMock())
+    monkeypatch.setattr(ingest_module, "print_result", lambda _result: None)
+
+    ingest_module.ingest_raw(
+        operation_id="op-1",
+        data="[]",
+        data_file=None,
+        plugin="raw",
+        plugin_params=None,
+        flt=None,
+        req_id=None,
+        last=True,
+        reset_operation=False,
+        create_operation_if_missing=False,
+        wait=True,
+        wait_log=False,
+        wait_timeout=321,
+    )
+
+    kwargs = raw.await_args.kwargs
+    assert kwargs["wait_for_worker"] is True
+    assert kwargs["timeout"] == 321
+    assert kwargs["wait"] is False