scrapebadger-cli 0.24.2__tar.gz → 0.25.0__tar.gz

{scrapebadger_cli-0.24.2 → scrapebadger_cli-0.25.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: scrapebadger-cli
-Version: 0.24.2
+Version: 0.25.0
 Summary: ScrapeBadger CLI — Twitter, Vinted, Google, and Web Scraping from the command line
 Author: ScrapeBadger Team
 License: MIT

{scrapebadger_cli-0.24.2 → scrapebadger_cli-0.25.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "scrapebadger-cli"
-version = "0.24.2"
+version = "0.25.0"
 description = "ScrapeBadger CLI — Twitter, Vinted, Google, and Web Scraping from the command line"
 requires-python = ">=3.10"
 license = {text = "MIT"}

{scrapebadger_cli-0.24.2 → scrapebadger_cli-0.25.0}/src/scrapebadger_cli/commands/facebook.py

@@ -112,6 +112,37 @@ def locations(
     render(data, fmt, fields)
 
 
+@app.command(name="resolve-location")
+def resolve_location(
+    query: str | None = typer.Argument(
+        None, help="Town, city, postcode or address (e.g. 'Durham', 'DH1 3LE')"
+    ),
+    latitude: float | None = typer.Option(None, "--lat", help="Resolve this point instead"),
+    longitude: float | None = typer.Option(None, "--lng"),
+    country: str | None = typer.Option(
+        None, "--country", help="ISO country hint for an ambiguous name (e.g. gb)"
+    ),
+    fmt: str = FMT,
+    fields: str | None = FIELDS,
+) -> None:
+    """Resolve a town/postcode/coordinates to a Marketplace location id (free).
+
+    Pass the returned place_id as --location on marketplace-search/category.
+    """
+    params = {
+        k: v
+        for k, v in {
+            "query": query,
+            "latitude": latitude,
+            "longitude": longitude,
+            "country": country,
+        }.items()
+        if v is not None
+    }
+    data = api_get("/v1/facebook/marketplace/locations/resolve", params)
+    render(data, fmt, fields)
+
+
 @app.command()
 def categories(
     fmt: str = FMT,

{scrapebadger_cli-0.24.2 → scrapebadger_cli-0.25.0}/src/scrapebadger_cli/commands/perplexity.py

@@ -10,20 +10,38 @@ app = typer.Typer(no_args_is_help=True)
 FMT = typer.Option("json", "--output", "-o", help="Output format: json, csv, table, markdown")
 FIELDS = typer.Option(None, "--fields", "-f", help="Comma-separated fields to include")
 COUNTRY = typer.Option("US", "--country", "-c", help="ISO-3166 alpha-2 egress country")
+ASK_COUNTRY = typer.Option(
+    "US",
+    "--country",
+    "-c",
+    help="ISO-3166 alpha-2 market. Best-effort: another market may answer "
+    "(the response `country` says which) unless --strict-country is set",
+)
+STRICT = typer.Option(
+    False,
+    "--strict-country",
+    help="Answer only from an exit in --country; fails with 503 country_unavailable "
+    "(not billed) when none answers in time",
+)
+
+
+def _strict(params: dict, strict_country: bool) -> dict:
+    return {**params, "strict_country": True} if strict_country else params
 
 
 @app.command()
 def ask(
     prompt: str = typer.Argument(..., help="Prompt to send to perplexity.ai (max 4096 chars)"),
-    country: str = COUNTRY,
+    country: str = ASK_COUNTRY,
     focus: str = typer.Option("web", "--focus", help="Retrieval focus: web, scholar or social"),
+    strict_country: bool = STRICT,
     fmt: str = FMT,
     fields: str | None = FIELDS,
 ) -> None:
     """Ask the real perplexity.ai and get the grounded answer with its cited sources."""
     data = api_get(
         "/v1/perplexity/ask",
-        {"prompt": prompt, "country": country, "focus": focus},
+        _strict({"prompt": prompt, "country": country, "focus": focus}, strict_country),
     )
     render(data, fmt, fields)
 
@@ -39,21 +57,25 @@ def brand_visibility(
     competitors: str | None = typer.Option(
         None, "--competitors", help="Comma-separated competitor names"
     ),
-    country: str = COUNTRY,
+    country: str = ASK_COUNTRY,
+    strict_country: bool = STRICT,
     fmt: str = FMT,
     fields: str | None = FIELDS,
 ) -> None:
     """Score how a brand appears in a real Perplexity answer (AEO/GEO)."""
     data = api_get(
         "/v1/perplexity/brand-visibility",
-        {
-            "prompt": prompt,
-            "brand": brand,
-            "domain": domain,
-            "aliases": aliases,
-            "competitors": competitors,
-            "country": country,
-        },
+        _strict(
+            {
+                "prompt": prompt,
+                "brand": brand,
+                "domain": domain,
+                "aliases": aliases,
+                "competitors": competitors,
+                "country": country,
+            },
+            strict_country,
+        ),
     )
     render(data, fmt, fields)
 

scrapebadger_cli-0.25.0/tests/test_perplexity_strict_country.py

@@ -0,0 +1,36 @@
+from unittest.mock import Mock
+
+import pytest
+
+CliRunner = pytest.importorskip("typer.testing").CliRunner
+perplexity = pytest.importorskip(
+    "scrapebadger_cli.commands.perplexity", reason="CLI is tested with its own installed package"
+)
+
+
+def _invoke(monkeypatch, args):
+    call = Mock(return_value={})
+    monkeypatch.setattr(perplexity, "api_get", call)
+    monkeypatch.setattr(perplexity, "render", Mock())
+    result = CliRunner().invoke(perplexity.app, args)
+    assert result.exit_code == 0, result.output
+    return call.call_args.args
+
+
+def test_ask_omits_strict_country_by_default(monkeypatch):
+    path, params = _invoke(monkeypatch, ["ask", "q", "--country", "DE"])
+    assert path == "/v1/perplexity/ask"
+    assert params["country"] == "DE" and "strict_country" not in params
+
+
+def test_ask_strict_country(monkeypatch):
+    _, params = _invoke(monkeypatch, ["ask", "q", "--country", "DE", "--strict-country"])
+    assert params["strict_country"] is True
+
+
+def test_brand_strict_country(monkeypatch):
+    path, params = _invoke(
+        monkeypatch, ["brand", "q", "--brand", "Nike", "-c", "JP", "--strict-country"]
+    )
+    assert path == "/v1/perplexity/brand-visibility"
+    assert params["strict_country"] is True and params["country"] == "JP"

{scrapebadger_cli-0.24.2 → scrapebadger_cli-0.25.0}/uv.lock

@@ -228,7 +228,7 @@ wheels = [
 
 [[package]]
 name = "scrapebadger-cli"
-version = "0.24.2"
+version = "0.25.0"
 source = { editable = "." }
 dependencies = [
     { name = "httpx" },