walla-cli 0.1.11__tar.gz → 0.1.12__tar.gz

{walla_cli-0.1.11 → walla_cli-0.1.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: walla-cli
-Version: 0.1.11
+Version: 0.1.12
 Summary: Wallapop.es CLI - look · offer · talk · sell for humans and agents
 Project-URL: Homepage, https://github.com/berendgort/wallapop-cli
 Project-URL: Repository, https://github.com/berendgort/wallapop-cli

{walla_cli-0.1.11 → walla_cli-0.1.12}/docs/WIRE.md

@@ -36,7 +36,8 @@ optional.
 
 After `current_step=photo`, the steps `draft` may include `category_leaf_id`
 (title+photo hint). `GET /api/v3/suggested-item-data/{upload_id}` often returns
-empty HTTP 200; still poll before `loading`. CLI: `walla sell … --title … --suggest`.
+empty HTTP 200; still poll before `loading`. CLI: `walla sell … --title …
+--suggest` (explicit only; draft without `--suggest` does not upload).
 `walla desk --watch` polls the inbox until `stack.best` converges.
 
 ## Auth

{walla_cli-0.1.11 → walla_cli-0.1.12}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "walla-cli"
-version = "0.1.11"
+version = "0.1.12"
 description = "Wallapop.es CLI - look · offer · talk · sell for humans and agents"
 authors = [{ name = "Dr. Berend Gort", email = "berend.gort@gmail.com" }]
 readme = "README.md"

{walla_cli-0.1.11 → walla_cli-0.1.12}/skills/walla-sell/SKILL.md

@@ -17,8 +17,9 @@ walla categories --find escritorio --json
 walla sell ./shot1.jpg ./shot2.jpg --title "Escritorio madera" --suggest --json
 ```
 
-`--suggest` (or draft with `--title` and no `--category`) asks Wallapop to prefill
-`category_leaf_id` from title+photos. Ask remaining `data.questions`, then:
+`--suggest` uploads photos and asks Wallapop to prefill `category_leaf_id`.
+Draft without `--suggest` stays local (no upload). Ask remaining
+`data.questions`, then:
 
 ```bash
 walla sell ./shot1.jpg ./shot2.jpg \

{walla_cli-0.1.11 → walla_cli-0.1.12}/tests/test_sell.py

@@ -70,6 +70,63 @@ def test_missing_sell_fields() -> None:
     assert CONDITIONS[0] == "as_good_as_new"
 
 
+def test_sell_draft_with_title_does_not_suggest(tmp_path: Path) -> None:
+    from typer.testing import CliRunner
+
+    from walla.cli.main import app
+
+    photo = tmp_path / "a.jpg"
+    photo.write_bytes(b"\xff\xd8\xff\xd9")
+    runner = CliRunner()
+    with (
+        patch("walla.cli.cmd_sell.load_profile") as lp,
+        patch("walla.cli.cmd_sell.suggest_from_photos") as sug,
+    ):
+        profile = MagicMock()
+        profile.lat = 41.39
+        profile.lon = 2.17
+        profile.label = "BCN"
+        lp.return_value = profile
+        result = runner.invoke(
+            app, ["sell", str(photo), "--title", "Escritorio", "--json"]
+        )
+    assert result.exit_code == 0, result.output
+    sug.assert_not_called()
+    payload = json.loads(result.output)
+    assert payload["data"]["status"] == "draft"
+    assert "suggested" not in payload["data"]
+
+
+def test_publish_prepared_reuses_upload(tmp_path: Path) -> None:
+    from walla.account.sell import publish_prepared
+
+    photo = tmp_path / "a.jpg"
+    photo.write_bytes(b"\xff\xd8\xff\xd9")
+    listing = MagicMock()
+    listing.url = "https://es.wallapop.com/item/x"
+    listing.web_slug = "x"
+    with (
+        patch(
+            "walla.account.sell.create_listing",
+            return_value={"id": "abc", "flags": {}},
+        ) as create,
+        patch("walla.account.sell.get_item", return_value=listing),
+    ):
+        out = publish_prepared(
+            [photo],
+            upload_id="upload-1",
+            title="T",
+            description="D",
+            price_eur=10,
+            category_leaf_id="24208",
+            lat=41.0,
+            lon=2.0,
+        )
+    assert out["reused_suggest"] is True
+    assert out["upload_id"] == "upload-1"
+    create.assert_called_once()
+
+
 def test_sell_cmd_draft_without_yes(tmp_path: Path) -> None:
     from typer.testing import CliRunner
 

{walla_cli-0.1.11 → walla_cli-0.1.12}/walla/__init__.py

@@ -4,4 +4,4 @@ from __future__ import annotations
 
 __all__ = ("__version__",)
 
-__version__ = "0.1.11"
+__version__ = "0.1.12"

{walla_cli-0.1.11 → walla_cli-0.1.12}/walla/account/sell.py

@@ -16,6 +16,7 @@ from walla.account.sell_steps import (
     poll_suggested,
     post_step,
 )
+from walla.account.sell_upload import IMAGE_TYPES, upload_pictures
 from walla.account.sell_wire import build_item_body
 from walla.core.exceptions import (
     WallaHTTPError,
@@ -33,45 +34,11 @@ __all__ = (
     "create_listing",
     "delete_listing",
     "publish_listing",
+    "publish_prepared",
     "upload_pictures",
 )
 
 _UPLOAD_ACCEPT = "application/vnd.upload-v2+json"
-_IMAGE_TYPES = {
-    ".jpg": "image/jpeg",
-    ".jpeg": "image/jpeg",
-    ".png": "image/png",
-    ".webp": "image/webp",
-}
-
-
-def upload_pictures(upload_id: str, photos: list[Path]) -> int:
-    """POST each photo to /api/v3/upload/{id}/pictures (HTTP 204)."""
-    if not photos:
-        raise ValueError("at least one photo required")
-    headers = {k: v for k, v in auth_headers().items() if k.lower() != "content-type"}
-    session: Any = requests.Session()
-    for path in photos:
-        data = path.read_bytes()
-        ctype = _IMAGE_TYPES.get(path.suffix.lower(), "image/jpeg")
-        wait_turn()
-        mp = CurlMime()
-        mp.addpart(name="file", content_type=ctype, filename=path.name, data=data)
-        resp: Any = session.request(
-            "POST",
-            f"{API_BASE}/api/v3/upload/{upload_id}/pictures",
-            headers=headers,
-            multipart=mp,
-            impersonate="chrome",
-            timeout=60,
-        )
-        mp.close()
-        if resp.status_code not in (200, 201, 204):
-            raise WallaHTTPError(
-                f"picture upload HTTP {resp.status_code}: {(resp.text or '')[:200]}",
-                status_code=resp.status_code,
-            )
-    return len(photos)
 
 
 def create_listing(item: dict[str, Any], first_photo: Path) -> dict[str, Any]:
@@ -79,7 +46,7 @@ def create_listing(item: dict[str, Any], first_photo: Path) -> dict[str, Any]:
     headers = {k: v for k, v in auth_headers().items() if k.lower() != "content-type"}
     headers["Accept"] = _UPLOAD_ACCEPT
     data = first_photo.read_bytes()
-    ctype = _IMAGE_TYPES.get(first_photo.suffix.lower(), "image/jpeg")
+    ctype = IMAGE_TYPES.get(first_photo.suffix.lower(), "image/jpeg")
     wait_turn()
     mp = CurlMime()
     mp.addpart(name="image", content_type=ctype, filename=first_photo.name, data=data)
@@ -110,6 +77,54 @@ def delete_listing(item_id: str, *, client: HttpClient | None = None) -> dict[st
     return {"id": item_id, "deleted": True}
 
 
+def publish_prepared(
+    photos: list[Path],
+    *,
+    upload_id: str,
+    title: str,
+    description: str,
+    price_eur: float,
+    category_leaf_id: str,
+    lat: float,
+    lon: float,
+    condition: str = "good",
+    shipping: bool = False,
+    weight_kg: float | None = None,
+    wire_draft: dict[str, str] | None = None,
+) -> dict[str, Any]:
+    """Create item from an upload_id already walked through loading."""
+    paths = [Path(p) for p in photos]
+    for p in paths:
+        if not p.is_file():
+            raise ValueError(f"photo not found: {p}")
+    if not upload_id.strip():
+        raise ValueError("upload_id required")
+    item = build_item_body(
+        upload_id=upload_id,
+        title=title,
+        description=description,
+        price_eur=price_eur,
+        category_leaf_id=category_leaf_id,
+        lat=lat,
+        lon=lon,
+        condition=condition,
+        shipping=shipping,
+        max_weight_kg=weight_kg,
+    )
+    created = create_listing(item, paths[0])
+    if len(paths) > 1:
+        _upload_extra_pictures(created["id"], paths[1:])
+    return {
+        **created,
+        "upload_id": upload_id,
+        "title": title.strip()[:50],
+        "url": _public_item_url(str(created["id"])),
+        "photos": len(paths),
+        "wire_draft": wire_draft or {},
+        "reused_suggest": True,
+    }
+
+
 def publish_listing(
     photos: list[Path],
     *,
@@ -143,7 +158,8 @@ def publish_listing(
     post_step(http, upload_id, current="category", draft=draft)
     poll_suggested(http, upload_id)
     post_step(http, upload_id, current="loading", draft=draft)
-    item = build_item_body(
+    out = publish_prepared(
+        paths,
         upload_id=upload_id,
         title=title,
         description=description,
@@ -153,19 +169,11 @@ def publish_listing(
         lon=lon,
         condition=condition,
         shipping=shipping,
-        max_weight_kg=weight_kg,
+        weight_kg=weight_kg,
+        wire_draft=wire,
     )
-    created = create_listing(item, paths[0])
-    if len(paths) > 1:
-        _upload_extra_pictures(created["id"], paths[1:])
-    return {
-        **created,
-        "upload_id": upload_id,
-        "title": title.strip()[:50],
-        "url": _public_item_url(str(created["id"])),
-        "photos": len(paths),
-        "wire_draft": wire,
-    }
+    out["reused_suggest"] = False
+    return out
 
 
 def _public_item_url(item_id: str) -> str:
@@ -194,7 +202,7 @@ def _upload_extra_pictures(item_id: str, photos: list[Path]) -> None:
     session: Any = requests.Session()
     for idx, path in enumerate(photos, start=1):
         data = path.read_bytes()
-        ctype = _IMAGE_TYPES.get(path.suffix.lower(), "image/jpeg")
+        ctype = IMAGE_TYPES.get(path.suffix.lower(), "image/jpeg")
         wait_turn()
         mp = CurlMime()
         mp.addpart(name="image", content_type=ctype, filename=path.name, data=data)

{walla_cli-0.1.11 → walla_cli-0.1.12}/walla/account/sell_suggest.py

@@ -6,13 +6,13 @@ import uuid
 from pathlib import Path
 from typing import Any
 
-from walla.account.sell import upload_pictures
 from walla.account.sell_steps import (
     auth_client,
     parse_steps_draft,
     poll_suggested,
     post_step,
 )
+from walla.account.sell_upload import upload_pictures
 from walla.search.api import get_categories
 from walla.search.category_find import flatten_categories, resolve_root_id
 

walla_cli-0.1.12/walla/account/sell_upload.py

@@ -0,0 +1,51 @@
+"""Multipart picture upload for Vender (/api/v3/upload/{id}/pictures)."""
+
+from __future__ import annotations
+
+from pathlib import Path
+from typing import Any
+
+from curl_cffi import CurlMime, requests
+
+from walla.account.sell_steps import auth_headers
+from walla.core.exceptions import WallaHTTPError
+from walla.http.headers import API_BASE
+from walla.http.polite import wait_turn
+
+__all__ = ("IMAGE_TYPES", "upload_pictures")
+
+IMAGE_TYPES = {
+    ".jpg": "image/jpeg",
+    ".jpeg": "image/jpeg",
+    ".png": "image/png",
+    ".webp": "image/webp",
+}
+
+
+def upload_pictures(upload_id: str, photos: list[Path]) -> int:
+    """POST each photo to /api/v3/upload/{id}/pictures (HTTP 204)."""
+    if not photos:
+        raise ValueError("at least one photo required")
+    headers = {k: v for k, v in auth_headers().items() if k.lower() != "content-type"}
+    session: Any = requests.Session()
+    for path in photos:
+        data = path.read_bytes()
+        ctype = IMAGE_TYPES.get(path.suffix.lower(), "image/jpeg")
+        wait_turn()
+        mp = CurlMime()
+        mp.addpart(name="file", content_type=ctype, filename=path.name, data=data)
+        resp: Any = session.request(
+            "POST",
+            f"{API_BASE}/api/v3/upload/{upload_id}/pictures",
+            headers=headers,
+            multipart=mp,
+            impersonate="chrome",
+            timeout=60,
+        )
+        mp.close()
+        if resp.status_code not in (200, 201, 204):
+            raise WallaHTTPError(
+                f"picture upload HTTP {resp.status_code}: {(resp.text or '')[:200]}",
+                status_code=resp.status_code,
+            )
+    return len(photos)

{walla_cli-0.1.11 → walla_cli-0.1.12}/walla/cli/cmd_sell.py

@@ -7,7 +7,7 @@ from typing import Any
 
 import typer
 
-from walla.account.sell import delete_listing, publish_listing
+from walla.account.sell import delete_listing, publish_listing, publish_prepared
 from walla.account.sell_suggest import suggest_from_photos
 from walla.account.sell_wire import CONDITIONS, SELL_QUESTIONS, missing_sell_fields
 from walla.cli.catch import run_cmd
@@ -41,7 +41,7 @@ def register(app: typer.Typer) -> None:
         suggest: bool = typer.Option(
             False,
             "--suggest",
-            help="Prefill category via Wallapop steps (needs --title)",
+            help="Prefill category via Wallapop steps (needs --title; uploads photos)",
         ),
         yes: bool = typer.Option(False, "--yes", help="Publish for real"),
         json: bool = typer.Option(False, "--json"),
@@ -58,8 +58,7 @@ def register(app: typer.Typer) -> None:
             root_id = root
             picked = None
             suggested = None
-            auto = bool(title) and not category and not yes
-            if suggest or auto:
+            if suggest:
                 if not title:
                     raise ValueError("--suggest needs --title")
                 suggested = suggest_from_photos(
@@ -106,7 +105,7 @@ def register(app: typer.Typer) -> None:
                 },
                 "hint": (
                     "Fill missing fields, then walla sell <photos> … --yes. "
-                    "walla sell … --title … --suggest prefills category from Wallapop."
+                    "Only --suggest uploads photos to prefill category."
                 ),
             }
             if picked is not None:
@@ -126,21 +125,57 @@ def register(app: typer.Typer) -> None:
                 )
             if profile.lat is None or profile.lon is None:
                 raise ValueError("Set location first: walla setup --lat … --lon …")
-            assert title_use and description and eur is not None and leaf and root_id
+            if not title_use or not description or eur is None or not leaf or not root_id:
+                raise ValueError(
+                    "Cannot publish; need title, description, eur, category leaf, and root"
+                )
             lowest = min(floor, eur) if floor is not None else eur
-            created = publish_listing(
-                paths,
-                title=title_use,
-                description=description,
-                price_eur=eur,
-                category_leaf_id=str(leaf),
-                root_category_id=str(root_id),
-                lat=profile.lat,
-                lon=profile.lon,
-                condition=condition,
-                shipping=ship,
-                weight_kg=weight_kg,
+            sug_leaf = (
+                str(suggested.get("category_leaf_id") or "") if suggested else ""
+            )
+            reuse_id = (
+                str(suggested["upload_id"])
+                if (
+                    suggested
+                    and suggested.get("upload_id")
+                    and sug_leaf
+                    and sug_leaf == str(leaf)
+                )
+                else ""
             )
+            if reuse_id:
+                created = publish_prepared(
+                    paths,
+                    upload_id=reuse_id,
+                    title=title_use,
+                    description=description,
+                    price_eur=eur,
+                    category_leaf_id=str(leaf),
+                    lat=profile.lat,
+                    lon=profile.lon,
+                    condition=condition,
+                    shipping=ship,
+                    weight_kg=weight_kg,
+                    wire_draft={
+                        "title": title_use,
+                        "category_leaf_id": str(leaf),
+                        "root_category_id": str(root_id),
+                    },
+                )
+            else:
+                created = publish_listing(
+                    paths,
+                    title=title_use,
+                    description=description,
+                    price_eur=eur,
+                    category_leaf_id=str(leaf),
+                    root_category_id=str(root_id),
+                    lat=profile.lat,
+                    lon=profile.lon,
+                    condition=condition,
+                    shipping=ship,
+                    weight_kg=weight_kg,
+                )
             remember(
                 Pursuit(
                     item_id=str(created["id"]),

{walla_cli-0.1.11 → walla_cli-0.1.12}/walla/core/instruct.py

@@ -147,7 +147,7 @@ def instruct_recipe() -> dict[str, Any]:
             "desk --watch polls until stack.best converges; still never pay.",
             "Bare say, offer, and sell still need --yes. Never pay or accept in walla.",
             "Sell: drop photos, ask data.questions, then publish with --yes only.",
-            "Sell --suggest prefills category from Wallapop steps when title is set.",
+            "Sell --suggest uploads photos once to prefill category; draft without it is local.",
             "If only asked to look, do not send.",
             "Ambiguous match or multiple GRABs: ask once with candidates.",
             "Default search is all of Spain. Shipping is enough; do not fence on profile.km.",

{walla_cli-0.1.11 → walla_cli-0.1.12}/walla/search/category_find.py

@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from dataclasses import dataclass
+from pydantic import BaseModel, ConfigDict
 
 from walla.models.profile import Category
 
@@ -14,8 +14,9 @@ __all__ = (
 )
 
 
-@dataclass(frozen=True)
-class CategoryHit:
+class CategoryHit(BaseModel):
+    model_config = ConfigDict(frozen=True)
+
     leaf_id: str
     root_id: str
     path: str
@@ -70,7 +71,6 @@ def find_categories(roots: list[Category], query: str) -> list[CategoryHit]:
         elif name_l.startswith(tokens[-1]) or tokens[-1].startswith(_stem(name_l)):
             score += 25
         score += sum(6 for tok in tokens if tok in name_l)
-        # Prefer the named leaf over a shallow cousin that only contains the token.
         if any(_stem(part) == _stem(tokens[-1]) for part in blob.split(" / ")):
             score += 15
         scored.append((score, hit))