amazon-sp-cli 0.2.0__tar.gz → 0.2.1__tar.gz

{amazon_sp_cli-0.2.0/amazon_sp_cli.egg-info → amazon_sp_cli-0.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: amazon-sp-cli
-Version: 0.2.0
+Version: 0.2.1
 Summary: CLI tool for Amazon Selling Partner API (SP-API) operations
 Home-page: https://github.com/stellaraether/amazon-sp-cli
 Author: Lunan Li

{amazon_sp_cli-0.2.0 → amazon_sp_cli-0.2.1}/README.md

@@ -40,40 +40,23 @@ default:
 
 ```bash
 # Get current price
-amz-sp pricing get PAW2603190101-BLU
+amz-sp get-price PAW2603190101-BLU
 
 # Set new price
-amz-sp pricing set PAW2603190101-BLU 11.99
+amz-sp set-price PAW2603190101-BLU 11.99
 
-# Create discount feed
-amz-sp pricing discount PAW2603190101-BLU 23
-```
-
-### Listings
-
-```bash
-# Get listing details
-amz-sp listings get PAW2603190101-BLU
+# Create sale price feed JSON
+amz-sp sale-price PAW2603190101-BLU 23
 
-# Update listing
-amz-sp listings update PAW2603190101-BLU --data '{...}'
+# Create discount feed JSON (legacy)
+amz-sp create-discount PAW2603190101-BLU 23
 ```
 
 ### Catalog
 
 ```bash
 # Check competitor
-amz-sp catalog get B0GW72JGWK
-```
-
-### Inventory
-
-```bash
-# Get FBA inventory
-amz-sp inventory list
-
-# Get specific SKU
-amz-sp inventory get PAW2603190101-BLU
+amz-sp check-competitors B0GW72JGWK
 ```
 
 ### A+ Content
@@ -119,13 +102,31 @@ amz-sp a-plus asin remove my-content B123456789
 git clone https://github.com/stellaraether/amazon-sp-cli.git
 cd amazon-sp-cli
 
-# Install in editable mode
-pip install -e .
+# One-shot setup (creates venv, installs deps, sets up pre-commit)
+./setup.sh
+source .venv/bin/activate
+
+# Or manually
+python3 -m venv .venv
+source .venv/bin/activate
+pip install -r requirements-dev.txt
+pre-commit install
 
 # Run locally
-python3 -m amazon_sp_cli.main pricing get PAW2603190101-BLU
+python3 -m amazon_sp_cli get-price PAW2603190101-BLU
 ```
 
+## Releasing
+
+This repository uses automated releases. To publish a new version:
+
+1. Open a **standalone PR** that only bumps `version` in `setup.py`.
+2. The PR must not include code, test, or documentation changes — a CI check enforces this.
+3. Once the PR is merged to `main`, the `Auto Release` workflow detects the new version, creates a tag (e.g. `v0.2.1`), and pushes it.
+4. The tag push triggers the `Publish to PyPI` workflow, which runs the full test suite and publishes the package.
+
+Do not create tags manually.
+
 ## Requirements
 
 - Python 3.8+

{amazon_sp_cli-0.2.0 → amazon_sp_cli-0.2.1}/amazon_sp_cli/client.py

@@ -38,7 +38,7 @@ class SPAPIClient:
 
         # Create the request
         url = f"https://{self.HOST}{path}"
-        body = json.dumps(data) if data else ""
+        body = json.dumps(data) if data is not None else ""
 
         # Create AWS request for signing
         request = AWSRequest(method=method, url=url, headers=headers, data=body)
@@ -104,58 +104,68 @@ class SPAPIClient:
 
     # --- A+ Content API ---
 
+    def _add_marketplace_param(self, path: str) -> str:
+        """Append marketplaceId query param to A+ Content paths."""
+        separator = "&" if "?" in path else "?"
+        return f"{path}{separator}marketplaceId={self.marketplace_id}"
+
     def create_a_plus_content(self, content_data: dict) -> dict:
         """Create A+ Content document."""
-        path = "/aplus/2020-11-01/contentDocuments"
+        path = self._add_marketplace_param("/aplus/2020-11-01/contentDocuments")
         data = {"contentDocument": content_data}
         return self.request("POST", path, data)
 
     def validate_a_plus_content(self, content_data: dict) -> dict:
         """Validate A+ Content without creating."""
         path = "/aplus/2020-11-01/contentDocuments"
-        params = {"mode": "VALIDATION_PREVIEW"}
+        params = {"mode": "VALIDATION_PREVIEW", "marketplaceId": self.marketplace_id}
         path += "?" + urlencode(params)
         data = {"contentDocument": content_data}
         return self.request("POST", path, data)
 
     def update_a_plus_content(self, content_name: str, content_data: dict) -> dict:
         """Update existing A+ Content document."""
-        path = f"/aplus/2020-11-01/contentDocuments/{content_name}"
+        path = self._add_marketplace_param(f"/aplus/2020-11-01/contentDocuments/{content_name}")
         data = {"contentDocument": content_data}
         return self.request("POST", path, data)
 
     def get_a_plus_content(self, content_name: str) -> dict:
         """Get A+ Content document by name."""
         path = f"/aplus/2020-11-01/contentDocuments/{content_name}"
+        params = {"marketplaceId": self.marketplace_id, "includedDataSet": "CONTENTS"}
+        path += "?" + urlencode(params)
         return self.request("GET", path)
 
     def list_a_plus_content(self, **filters) -> dict:
         """List A+ Content documents."""
         path = "/aplus/2020-11-01/contentDocuments"
-        if filters:
-            path += "?" + urlencode(filters)
+        params = {"marketplaceId": self.marketplace_id}
+        params.update(filters)
+        path += "?" + urlencode(params)
         return self.request("GET", path)
 
-    def delete_a_plus_content(self, content_name: str) -> dict:
-        """Delete A+ Content document."""
-        path = f"/aplus/2020-11-01/contentDocuments/{content_name}"
-        return self.request("DELETE", path)
+    def suspend_a_plus_content(self, content_reference_key: str) -> dict:
+        """Suspend A+ Content document (API does not support delete)."""
+        path = f"/aplus/2020-11-01/contentDocuments/{content_reference_key}/suspendSubmissions"
+        params = {"marketplaceId": self.marketplace_id}
+        path += "?" + urlencode(params)
+        return self.request("POST", path)
 
     def get_a_plus_content_asin_relations(self, content_name: str) -> dict:
         """Get ASIN relations for a content document."""
-        path = f"/aplus/2020-11-01/contentDocuments/{content_name}/asins"
+        path = self._add_marketplace_param(f"/aplus/2020-11-01/contentDocuments/{content_name}/asins")
         return self.request("GET", path)
 
     def post_a_plus_content_asin_relations(self, content_name: str, asin_set: list) -> dict:
         """Associate ASINs with A+ Content document."""
-        path = "/aplus/2020-11-01/contentAsinRelations"
+        path = self._add_marketplace_param("/aplus/2020-11-01/contentAsinRelations")
         data = {"contentDocumentName": content_name, "asinSet": asin_set}
         return self.request("POST", path, data)
 
     def delete_a_plus_content_asin_relations(self, content_name: str, asin_set: list) -> dict:
         """Remove ASIN associations from A+ Content document."""
         path = "/aplus/2020-11-01/contentAsinRelations"
-        params = {"contentDocumentName": content_name}
+        params = {"contentDocumentName": content_name, "marketplaceId": self.marketplace_id}
         path += "?" + urlencode(params)
         data = {"asinSet": asin_set}
         return self.request("DELETE", path, data)
@@ -169,14 +179,13 @@ class SPAPIClient:
         resource: str = None,
     ) -> dict:
         """Create an upload destination for a file."""
-        path = f"/uploads/2020-11-01/uploadDestinations/{marketplace_id}"
+        path = f"/uploads/2020-11-01/uploadDestinations/{resource}"
         params = {
+            "marketplaceIds": marketplace_id,
             "contentMD5": content_md5,
             "contentType": content_type,
         }
         if file_name:
             params["fileName"] = file_name
-        if resource:
-            params["resource"] = resource
         path += "?" + urlencode(params)
         return self.request("POST", path)

{amazon_sp_cli-0.2.0 → amazon_sp_cli-0.2.1}/amazon_sp_cli/commands/a_plus.py

@@ -4,6 +4,7 @@ import base64
 import hashlib
 import json
 import os
+import urllib.parse
 
 import click
 import requests
@@ -80,13 +81,13 @@ def register_a_plus_commands(cli_group, ensure_auth_client):
             click.echo(json.dumps(response, indent=2))
 
     @a_plus.command("get")
-    @click.argument("content-name")
+    @click.argument("content-reference-key")
     @click.pass_context
     @handle_errors
-    def get_content(ctx, content_name):
-        """Get A+ Content document."""
+    def get_content(ctx, content_reference_key):
+        """Get A+ Content document by contentReferenceKey."""
         _, client = ensure_auth_client(ctx)
-        response = client.get_a_plus_content(content_name)
+        response = client.get_a_plus_content(content_reference_key)
         click.echo(json.dumps(response, indent=2))
 
     @a_plus.command("list")
@@ -133,21 +134,23 @@ def register_a_plus_commands(cli_group, ensure_auth_client):
         if response:
             click.echo(json.dumps(response, indent=2))
 
-    @a_plus.command("delete")
-    @click.argument("content-name")
-    @click.confirmation_option(prompt="Delete this A+ Content?")
+    @a_plus.command("suspend")
+    @click.argument("content-reference-key")
+    @click.confirmation_option(prompt="Suspend this A+ Content?")
     @click.pass_context
     @handle_errors
-    def delete_content(ctx, content_name):
-        """Delete A+ Content document."""
+    def suspend_content(ctx, content_reference_key):
+        """Suspend A+ Content document (API does not support delete)."""
         _, client = ensure_auth_client(ctx)
-        client.delete_a_plus_content(content_name)
-        click.echo(f"A+ Content deleted: {content_name}")
+        client.suspend_a_plus_content(content_reference_key)
+        click.echo(f"A+ Content suspended: {content_reference_key}")
 
     @a_plus.command("upload-image")
     @click.argument("file-path", type=click.Path(exists=True))
     @click.option("--content-type", default="image/jpeg", help="MIME type of the image")
-    @click.option("--resource", default="aplus", help="Resource type for upload destination")
+    @click.option(
+        "--resource", default="aplus/2020-11-01/contentDocuments", help="Resource type for upload destination"
+    )
     @click.pass_context
     @handle_errors
     def upload_image(ctx, file_path, content_type, resource):
@@ -172,18 +175,21 @@ def register_a_plus_commands(cli_group, ensure_auth_client):
         payload = response.get("payload", response)
         upload_destination_id = payload.get("uploadDestinationId")
         upload_url = payload.get("url")
-        headers = payload.get("headers", [])
 
         if not upload_url:
             click.echo("Error: No upload URL returned", err=True)
             raise click.Abort()
 
-        upload_headers = {h["name"]: h["value"] for h in headers}
-        upload_headers.setdefault("Content-Type", content_type)
-        upload_headers.setdefault("Content-MD5", content_md5)
+        parsed = urllib.parse.urlparse(upload_url)
+        base_url = f"{parsed.scheme}://{parsed.netloc}{parsed.path}"
+        form_fields = {k: v[0] for k, v in urllib.parse.parse_qs(parsed.query).items()}
 
-        put_response = requests.put(upload_url, data=file_data, headers=upload_headers)
-        put_response.raise_for_status()
+        post_response = requests.post(
+            base_url,
+            data=form_fields,
+            files={"File": (file_name, file_data, content_type)},
+        )
+        post_response.raise_for_status()
 
         click.echo(f"Upload successful: {file_name}")
         click.echo(f"uploadDestinationId: {upload_destination_id}")

{amazon_sp_cli-0.2.0 → amazon_sp_cli-0.2.1}/amazon_sp_cli/models/a_plus.py

@@ -4,12 +4,15 @@
 class TextComponent:
     """Text component for A+ Content modules."""
 
-    def __init__(self, value: str, decoration: str = "NONE"):
+    def __init__(self, value: str, decorator_set: list = None):
         self.value = value
-        self.decoration = decoration
+        self.decorator_set = decorator_set or []
 
     def to_dict(self) -> dict:
-        return {"value": self.value, "decoration": self.decoration}
+        result = {"value": self.value}
+        if self.decorator_set:
+            result["decoratorSet"] = self.decorator_set
+        return result
 
 
 class ImageComponent:
@@ -109,6 +112,16 @@ class StandardComparisonTableModule:
         return result
 
 
+class ParagraphComponent:
+    """Paragraph component containing a list of text."""
+
+    def __init__(self, text_list: list = None):
+        self.text_list = text_list or []
+
+    def to_dict(self) -> dict:
+        return {"textList": [t.to_dict() for t in self.text_list]}
+
+
 class StandardTextModule:
     """Standard Text-only module."""
 
@@ -178,7 +191,7 @@ class ContentModule:
         self.standard_image_text_overlay = standard_image_text_overlay
 
     def to_dict(self) -> dict:
-        result = {"moduleType": self.module_type}
+        result = {"contentModuleType": self.module_type}
         field_name = self.MODULE_TYPES.get(self.module_type)
 
         if field_name == "standardImageText" and self.standard_image_text:
@@ -203,11 +216,11 @@ class ContentModule:
         issues = []
 
         if not self.module_type:
-            issues.append(f"Module {index + 1}: moduleType is required")
+            issues.append(f"Module {index + 1}: contentModuleType is required")
             return issues
 
         if self.module_type not in self.MODULE_TYPES:
-            issues.append(f"Module {index + 1}: invalid moduleType '{self.module_type}'")
+            issues.append(f"Module {index + 1}: invalid contentModuleType '{self.module_type}'")
             return issues
 
         data = self.to_dict()
@@ -224,7 +237,7 @@ class APlusContentDocument:
         self,
         name: str,
         content_type: str = "EBC",
-        locale: str = "en_US",
+        locale: str = "en-US",
         content_module_list: list = None,
     ):
         self.name = name
@@ -262,7 +275,7 @@ def build_content_from_json(name: str, data: dict) -> APlusContentDocument:
     """Build APlusContentDocument from JSON dict."""
     content = APlusContentDocument(
         name=name,
-        locale=data.get("locale", "en_US"),
+        locale=data.get("locale", "en-US"),
     )
 
     for mod_data in data.get("modules", []):
@@ -318,11 +331,14 @@ def build_module_from_json(data: dict) -> ContentModule:
             ),
         )
     elif module_type == "STANDARD_TEXT":
+        body = None
+        if data.get("body"):
+            body = ParagraphComponent(text_list=[TextComponent(data["body"])])
         return ContentModule(
             module_type=module_type,
             standard_text=StandardTextModule(
                 headline=TextComponent(data["headline"]) if data.get("headline") else None,
-                body=TextComponent(data["body"]) if data.get("body") else None,
+                body=body,
             ),
         )
     elif module_type == "STANDARD_IMAGE_TEXT_OVERLAY":

{amazon_sp_cli-0.2.0 → amazon_sp_cli-0.2.1/amazon_sp_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: amazon-sp-cli
-Version: 0.2.0
+Version: 0.2.1
 Summary: CLI tool for Amazon Selling Partner API (SP-API) operations
 Home-page: https://github.com/stellaraether/amazon-sp-cli
 Author: Lunan Li

{amazon_sp_cli-0.2.0 → amazon_sp_cli-0.2.1}/setup.py

@@ -2,7 +2,7 @@ from setuptools import find_packages, setup
 
 setup(
     name="amazon-sp-cli",
-    version="0.2.0",
+    version="0.2.1",
     description="CLI tool for Amazon Selling Partner API (SP-API) operations",
     author="Lunan Li",
     author_email="lunan@stellaraether.com",

{amazon_sp_cli-0.2.0 → amazon_sp_cli-0.2.1}/tests/test_a_plus.py

@@ -19,17 +19,19 @@ from amazon_sp_cli.models.a_plus import (
 
 class TestDataModels:
     def test_text_component_to_dict(self):
-        tc = TextComponent("Hello", "BOLD")
-        assert tc.to_dict() == {"value": "Hello", "decoration": "BOLD"}
+        tc = TextComponent("Hello", [{"type": "BOLD"}])
+        assert tc.to_dict() == {"value": "Hello", "decoratorSet": [{"type": "BOLD"}]}
 
     def test_standard_text_module_to_dict(self):
+        from amazon_sp_cli.models.a_plus import ParagraphComponent
+
         mod = StandardTextModule(
             headline=TextComponent("Headline"),
-            body=TextComponent("Body text"),
+            body=ParagraphComponent(text_list=[TextComponent("Body text")]),
         )
         result = mod.to_dict()
         assert result["headline"]["value"] == "Headline"
-        assert result["body"]["value"] == "Body text"
+        assert result["body"]["textList"][0]["value"] == "Body text"
 
     def test_content_module_wrapper(self):
         mod = ContentModule(
@@ -39,7 +41,7 @@ class TestDataModels:
             ),
         )
         result = mod.to_dict()
-        assert result["moduleType"] == "STANDARD_TEXT"
+        assert result["contentModuleType"] == "STANDARD_TEXT"
         assert result["standardText"]["headline"]["value"] == "H"
 
     def test_document_validation_passes(self):
@@ -64,7 +66,7 @@ class TestDataModels:
     def test_document_validation_invalid_type(self):
         doc = APlusContentDocument(name="test")
         doc.content_module_list = [ContentModule("INVALID_TYPE")]
-        assert "invalid moduleType" in doc.validate()[0]
+        assert "invalid contentModuleType" in doc.validate()[0]
 
     def test_document_validation_empty_module(self):
         doc = APlusContentDocument(name="test")
@@ -88,12 +90,12 @@ class TestDataModels:
 class TestBuildFromJson:
     def test_build_content_from_json(self):
         data = {
-            "locale": "en_US",
+            "locale": "en-US",
             "modules": [{"moduleType": "STANDARD_TEXT", "headline": "Hello", "body": "World"}],
         }
         doc = build_content_from_json("my-doc", data)
         assert doc.name == "my-doc"
-        assert doc.locale == "en_US"
+        assert doc.locale == "en-US"
         assert len(doc.content_module_list) == 1
         assert doc.content_module_list[0].module_type == "STANDARD_TEXT"
 
@@ -231,17 +233,17 @@ class TestAPlusCLI:
     @patch("amazon_sp_cli.cli.SPAPIClient")
     def test_get(self, mock_client_class, mock_auth_class, runner):
         mock_client = Mock()
-        mock_client.get_a_plus_content.return_value = {"name": "test-doc"}
+        mock_client.get_a_plus_content.return_value = {"contentRecord": {"contentDocument": {"name": "test-doc"}}}
         mock_client_class.return_value = mock_client
 
         mock_auth = Mock()
         mock_auth_class.return_value = mock_auth
 
-        result = runner.invoke(cli, ["a-plus", "get", "test-doc"])
+        result = runner.invoke(cli, ["a-plus", "get", "abc123"])
 
         assert result.exit_code == 0
         assert "test-doc" in result.output
-        mock_client.get_a_plus_content.assert_called_once_with("test-doc")
+        mock_client.get_a_plus_content.assert_called_once_with("abc123")
 
     @patch("amazon_sp_cli.cli.SPAPIAuth")
     @patch("amazon_sp_cli.cli.SPAPIClient")
@@ -290,17 +292,17 @@ class TestAPlusCLI:
 
     @patch("amazon_sp_cli.cli.SPAPIAuth")
     @patch("amazon_sp_cli.cli.SPAPIClient")
-    def test_delete(self, mock_client_class, mock_auth_class, runner):
+    def test_suspend(self, mock_client_class, mock_auth_class, runner):
         mock_client = Mock()
         mock_client_class.return_value = mock_client
 
         mock_auth = Mock()
         mock_auth_class.return_value = mock_auth
 
-        result = runner.invoke(cli, ["a-plus", "delete", "test-doc"], input="y\n")
+        result = runner.invoke(cli, ["a-plus", "suspend", "test-doc"], input="y\n")
 
         assert result.exit_code == 0
-        mock_client.delete_a_plus_content.assert_called_once_with("test-doc")
+        mock_client.suspend_a_plus_content.assert_called_once_with("test-doc")
 
     @patch("amazon_sp_cli.cli.SPAPIAuth")
     @patch("amazon_sp_cli.cli.SPAPIClient")
@@ -348,24 +350,34 @@ class TestAPlusCLI:
         assert "B123" in result.output
         mock_client.get_a_plus_content_asin_relations.assert_called_once_with("test-doc")
 
-    @patch("amazon_sp_cli.commands.a_plus.requests.put")
+    @patch("amazon_sp_cli.commands.a_plus.requests.post")
     @patch("amazon_sp_cli.cli.SPAPIAuth")
     @patch("amazon_sp_cli.cli.SPAPIClient")
-    def test_upload_image(self, mock_client_class, mock_auth_class, mock_put, runner):
+    def test_upload_image(self, mock_client_class, mock_auth_class, mock_post, runner):
         mock_client = Mock()
         mock_client.marketplace_id = "ATVPDKIKX0DER"
         mock_client.create_upload_destination.return_value = {
-            "uploadDestinationId": "upload-123",
-            "url": "https://s3.amazonaws.com/presigned-url",
-            "headers": [{"name": "Content-Type", "value": "image/jpeg"}],
+            "payload": {
+                "uploadDestinationId": "upload-123",
+                "url": (
+                    "https://aplus-media.s3.amazonaws.com/"
+                    "?x-amz-date=20251003T113949Z"
+                    "&x-amz-signature=sig"
+                    "&acl=private"
+                    "&key=sc/image.jpg"
+                    "&x-amz-algorithm=AWS4-HMAC-SHA256"
+                    "&policy=pol"
+                    "&x-amz-credential=cred"
+                ),
+            }
         }
         mock_client_class.return_value = mock_client
 
         mock_auth = Mock()
         mock_auth_class.return_value = mock_auth
 
-        mock_put.return_value = Mock()
-        mock_put.return_value.raise_for_status = Mock()
+        mock_post.return_value = Mock()
+        mock_post.return_value.raise_for_status = Mock()
 
         with runner.isolated_filesystem():
             with open("test-image.jpg", "wb") as f:
@@ -376,4 +388,9 @@ class TestAPlusCLI:
         assert result.exit_code == 0
         assert "upload-123" in result.output
         mock_client.create_upload_destination.assert_called_once()
-        mock_put.assert_called_once()
+        mock_post.assert_called_once()
+        call_args = mock_post.call_args
+        assert call_args[0][0] == "https://aplus-media.s3.amazonaws.com/"
+        assert call_args[1]["data"]["key"] == "sc/image.jpg"
+        assert call_args[1]["data"]["acl"] == "private"
+        assert "File" in call_args[1]["files"]