streamwright 0.1.7__tar.gz → 0.1.8__tar.gz

{streamwright-0.1.7/src/streamwright.egg-info → streamwright-0.1.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: streamwright
-Version: 0.1.7
+Version: 0.1.8
 Summary: Declarative data connectors — pull from APIs, files and databases with YAML, shape with SQL, write anywhere.
 Author-email: Karthick Jaganathan <kjaganathan.sde@gmail.com>
 License: Apache-2.0

{streamwright-0.1.7 → streamwright-0.1.8}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "streamwright"
-version = "0.1.7"
+version = "0.1.8"
 description = "Declarative data connectors — pull from APIs, files and databases with YAML, shape with SQL, write anywhere."
 readme = "README.md"
 license = {text = "Apache-2.0"}

{streamwright-0.1.7 → streamwright-0.1.8}/src/streamwright/core/cli.py

@@ -241,12 +241,18 @@ def _parser():
     _add_log_options(run)
 
     conn = commands.add_parser("connectors",
-                               help="list, search or install connectors (bare: the installed connectors and their "
+                               help="list, find or install connectors (bare: the installed connectors and their "
                                     "SDK loggers)")
-    conn.add_argument("action", nargs="?", choices=["list", "search", "install"],
-                      help="list (catalog + installed), search TEXT, or install KEY [KEY ...]")
+    conn.add_argument("-ls", "--list", action="store_true", dest="flag_list",
+                      help="list catalog and installed connectors")
+    conn.add_argument("-i", "--install", nargs="+", dest="flag_install", metavar="KEY",
+                      help="install one or more connector keys")
+    conn.add_argument("-s", "-f", "--search", "--find", nargs="+", dest="flag_search", metavar="TEXT",
+                      help="find/search connectors in the catalog by keyword")
+    conn.add_argument("action", nargs="?", metavar="{ls,i,find}",
+                      help="ls (catalog + installed), -i KEY (install), or find TEXT (search catalog)")
     conn.add_argument("query", nargs="*", metavar="KEY|TEXT",
-                      help="connector keys (install: one or more) or words (search)")
+                      help="connector keys (install: one or more) or search words")
     conn.add_argument("--yes", action="store_true", help="skip the confirmation prompt when installing")
     conn.add_argument("--hub-url", metavar="URL",
                       help="the connector hub (default: $STREAMWRIGHT_HUB_URL, else the live StreamWright hub; when it is "
@@ -562,19 +568,42 @@ def _connector_lines():
 
 
 def _connectors_command(args):
-    """`streamwright connectors`: bare = installed list; list/search/install use the catalog (the hub)."""
-    action = getattr(args, "action", None)
+    """`streamwright connectors`: bare = installed list; ls/i/find use the catalog (the hub)."""
+    if getattr(args, "flag_list", False):
+        action = "ls"
+        query = []
+    elif getattr(args, "flag_install", None):
+        action = "install"
+        query = args.flag_install
+    elif getattr(args, "flag_search", None):
+        action = "find"
+        query = args.flag_search
+    else:
+        action = getattr(args, "action", None)
+        query = getattr(args, "query", [])
+
     if action is None:
         lines = _connector_lines()
-        print("\n".join(lines) if lines else "no connectors installed (e.g. streamwright connectors install postgres)")
+        print("\n".join(lines) if lines else "no connectors installed (e.g. streamwright connectors -i postgres)")
         return 0
-    from streamwright.core import catalog
-    if action == "list":
+
+    norm_action = action.lower()
+    if norm_action in ("ls", "list", "-ls", "--list"):
+        from streamwright.core import catalog
         lines = catalog.listing(args.hub_url)
         print("\n".join(lines) if lines else "the catalog is empty")
         return 0
-    if action == "search":
-        text = " ".join(args.query)
+
+    if norm_action in ("i", "install", "-i", "--install"):
+        from streamwright.core import catalog
+        if not query:
+            sys.stderr.write("streamwright: 'connectors -i' needs at least one connector KEY\n")
+            return 2
+        return catalog.install_many(query, assume_yes=args.yes, hub_url=args.hub_url)
+
+    if norm_action in ("find", "search", "s", "-s", "-f", "--find", "--search"):
+        from streamwright.core import catalog
+        text = " ".join(query)
         hits = catalog.search(text, args.hub_url)
         if not hits:
             print("no connectors match %r" % text)
@@ -582,12 +611,17 @@ def _connectors_command(args):
         for key, entry in sorted(hits.items()):
             print("  %-16s %-10s %s" % (key, entry.get("trust", "community"), entry.get("summary", "")))
         return 0
-    if action == "install":
-        if not args.query:
-            sys.stderr.write("streamwright: 'connectors install' needs at least one connector KEY\n")
-            return 2
-        return catalog.install_many(args.query, assume_yes=args.yes, hub_url=args.hub_url)
-    return 2
+
+    # If action was not a reserved verb, treat it as a direct search query (e.g. `sw connectors ads`)
+    from streamwright.core import catalog
+    text = " ".join([action] + query)
+    hits = catalog.search(text, args.hub_url)
+    if not hits:
+        print("no connectors match %r" % text)
+        return 0
+    for key, entry in sorted(hits.items()):
+        print("  %-16s %-10s %s" % (key, entry.get("trust", "community"), entry.get("summary", "")))
+    return 0
 
 
 def main(argv=None):

{streamwright-0.1.7 → streamwright-0.1.8/src/streamwright.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: streamwright
-Version: 0.1.7
+Version: 0.1.8
 Summary: Declarative data connectors — pull from APIs, files and databases with YAML, shape with SQL, write anywhere.
 Author-email: Karthick Jaganathan <kjaganathan.sde@gmail.com>
 License: Apache-2.0

streamwright-0.1.8/tests/test_cli_subcommands.py

@@ -0,0 +1,72 @@
+import subprocess
+import sys
+from unittest.mock import patch
+
+from streamwright.core import cli
+
+
+def test_cli_help():
+    result = subprocess.run([sys.executable, "-m", "streamwright.core.cli", "--help"],
+                            stdout=subprocess.PIPE, stderr=subprocess.PIPE,
+                            universal_newlines=True)
+    assert result.returncode == 0
+    assert "mcp" in result.stdout
+
+
+def test_cli_mcp_delegation():
+    from unittest.mock import MagicMock
+    mock_mcp = MagicMock(return_value=0)
+    mock_mod = MagicMock(main=mock_mcp)
+    with patch.dict(sys.modules, {"streamwright_mcp": MagicMock(), "streamwright_mcp.cli": mock_mod}):
+        code = cli.main(["mcp", "--help"])
+        assert code == 0
+        mock_mcp.assert_called_once_with(["--help"])
+
+
+def test_cli_mcp_not_installed(capsys):
+    with patch.dict(sys.modules, {"streamwright_mcp.cli": None}):
+        with patch("builtins.__import__", side_effect=ImportError("No module named 'streamwright_mcp'")):
+            code = cli.main(["mcp"])
+            assert code == 1
+            captured = capsys.readouterr()
+            assert "'streamwright-mcp' is not installed" in captured.err
+
+
+def test_cli_connectors_help():
+    result = subprocess.run([sys.executable, "-m", "streamwright.core.cli", "connectors", "--help"],
+                            stdout=subprocess.PIPE, stderr=subprocess.PIPE,
+                            universal_newlines=True)
+    assert result.returncode == 0
+    assert "-ls" in result.stdout
+    assert "-i" in result.stdout
+    assert "-s" in result.stdout or "find" in result.stdout
+
+
+def test_cli_connectors_variants(monkeypatch, capsys):
+    from streamwright.core import catalog
+    fake_catalog = {
+        "postgres": {"title": "Postgres", "summary": "Postgres DB", "trust": "official"}
+    }
+    monkeypatch.setattr(catalog, "connectors", lambda hub_url=None: fake_catalog)
+    monkeypatch.setattr(catalog, "listing", lambda hub_url=None: ["catalog-listing-item"])
+
+    # Test ls subcommand
+    code = cli.main(["connectors", "ls"])
+    assert code == 0
+    assert "catalog-listing-item" in capsys.readouterr().out
+
+    # Test -ls flag
+    code = cli.main(["connectors", "-ls"])
+    assert code == 0
+    assert "catalog-listing-item" in capsys.readouterr().out
+
+    # Test find subcommand
+    code = cli.main(["connectors", "find", "postgres"])
+    assert code == 0
+    assert "postgres" in capsys.readouterr().out
+
+    # Test -s flag
+    code = cli.main(["connectors", "-s", "postgres"])
+    assert code == 0
+    assert "postgres" in capsys.readouterr().out
+

streamwright-0.1.7/tests/test_cli_subcommands.py

@@ -1,32 +0,0 @@
-import subprocess
-import sys
-from unittest.mock import patch
-
-from streamwright.core import cli
-
-
-def test_cli_help():
-    result = subprocess.run([sys.executable, "-m", "streamwright.core.cli", "--help"],
-                            stdout=subprocess.PIPE, stderr=subprocess.PIPE,
-                            universal_newlines=True)
-    assert result.returncode == 0
-    assert "mcp" in result.stdout
-
-
-def test_cli_mcp_delegation():
-    from unittest.mock import MagicMock
-    mock_mcp = MagicMock(return_value=0)
-    mock_mod = MagicMock(main=mock_mcp)
-    with patch.dict(sys.modules, {"streamwright_mcp": MagicMock(), "streamwright_mcp.cli": mock_mod}):
-        code = cli.main(["mcp", "--help"])
-        assert code == 0
-        mock_mcp.assert_called_once_with(["--help"])
-
-
-def test_cli_mcp_not_installed(capsys):
-    with patch.dict(sys.modules, {"streamwright_mcp.cli": None}):
-        with patch("builtins.__import__", side_effect=ImportError("No module named 'streamwright_mcp'")):
-            code = cli.main(["mcp"])
-            assert code == 1
-            captured = capsys.readouterr()
-            assert "'streamwright-mcp' is not installed" in captured.err