added fulfillment_inbound endpoints

fixes #71

Author: saleweaver

setup.py

@@ -2,7 +2,7 @@
 
 setup(
     name='python-amazon-sp-api',
-    version='0.2.5',
+    version='0.3.0',
     install_requires=[
         "requests",
         "six~=1.15.0",

sp_api/api/catalog/catalog.py

@@ -1,3 +1,4 @@
+import urllib.parse
 
 from sp_api.base import Client, sp_endpoint, fill_query_params, ApiResponse
 
@@ -64,5 +65,6 @@ def list_items(self, **kwargs) -> ApiResponse:
         Returns:
             ListCatalogItemsResponse:
         """
+        if 'Query' in kwargs:
+            kwargs.update({'Query': urllib.parse.quote_plus(kwargs.pop('Query'))})
         return self._request(kwargs.pop('path'), params=kwargs)
-

sp_api/api/fulfillment_inbound/fulfillment_inbound.py

@@ -3,7 +3,71 @@
 
 
 class FulfillmentInbound(Client):
-    @sp_endpoint('/fba/inbound/v0/shipments')
-    def get_shipments(self, **kwargs) -> ApiResponse:
-        return self._request(kwargs.get('path'), params=kwargs)
+    @sp_endpoint("/fba/inbound/v0/itemsGuidance")
+    def item_guidance(self, **kwargs):
+        return self._request(kwargs.pop('path'), params=kwargs)
+
+    @sp_endpoint("/fba/inbound/v0/plans", method='POST')
+    def plans(self, **kwargs):
+        return self._request(kwargs.pop('path'), data=kwargs)
+
+    @sp_endpoint("/fba/inbound/v0/shipments/{}", method='POST')
+    def create_shipment(self, shipment_id, **kwargs):
+        return self._request(fill_query_params(kwargs.pop('path'), shipment_id), data=kwargs)
+
+    @sp_endpoint("/fba/inbound/v0/shipments/{}", method='PUT')
+    def update_shipment(self, shipment_id, **kwargs):
+        return self._request(fill_query_params(kwargs.pop('path'), shipment_id), data=kwargs)
+
+    @sp_endpoint("/fba/inbound/v0/shipments/{}/preorder")
+    def preorder(self, shipment_id, **kwargs):
+        return self._request(fill_query_params(kwargs.pop('path'), shipment_id), params=kwargs)
+
+    @sp_endpoint("/fba/inbound/v0/shipments/{}/preorder/confirm", method='PUT')
+    def confirm_preorder(self, shipment_id, **kwargs):
+        return self._request(fill_query_params(kwargs.pop('path'), shipment_id), params=kwargs)
+
+    @sp_endpoint("/fba/inbound/v0/prepInstructions")
+    def prep_instruction(self, **kwargs):
+        return self._request(kwargs.pop('path'), params=kwargs)
+
+    @sp_endpoint("/fba/inbound/v0/shipments/{}/transport")
+    def get_transport_information(self, shipment_id, **kwargs):
+        return self._request(fill_query_params(kwargs.pop('path'), shipment_id), params=kwargs)
+
+    @sp_endpoint("/fba/inbound/v0/shipments/{}/transport", method='PUT')
+    def update_transport_information(self, shipment_id, **kwargs):
+        return self._request(fill_query_params(kwargs.pop('path'), shipment_id), data=kwargs)
+
+    @sp_endpoint("/fba/inbound/v0/shipments/{}/transport/void", method='POST')
+    def void_transport(self, shipment_id, **kwargs):
+        return self._request(fill_query_params(kwargs.pop('path'), shipment_id), data=kwargs, add_marketplace=False)
+
+    @sp_endpoint("/fba/inbound/v0/shipments/{}/transport/estimate", method='POST')
+    def estimate_transport(self, shipment_id, **kwargs):
+        return self._request(fill_query_params(kwargs.pop('path'), shipment_id), data=kwargs, add_marketplace=False)
+
+    @sp_endpoint("/fba/inbound/v0/shipments/{}/transport/confirm", method='POST')
+    def confirm_transport(self, shipment_id, **kwargs):
+        return self._request(fill_query_params(kwargs.pop('path'), shipment_id), data=kwargs, add_marketplace=False)
+
+    @sp_endpoint("/fba/inbound/v0/shipments/{}/labels")
+    def get_labels(self, shipment_id, **kwargs):
+        return self._request(fill_query_params(kwargs.pop('path'), shipment_id), params=kwargs, add_marketplace=False)
+
+    @sp_endpoint("/fba/inbound/v0/shipments/{}/billOfLading")
+    def bill_of_lading(self, shipment_id, **kwargs):
+        return self._request(fill_query_params(kwargs.pop('path'), shipment_id), params=kwargs)
+
+    @sp_endpoint("/fba/inbound/v0/shipments")
+    def get_shipments(self, **kwargs):
+        return self._request(kwargs.pop('path'), params=kwargs)
+
+    @sp_endpoint("/fba/inbound/v0/shipments/{}/items")
+    def shipment_items_by_shipment(self, shipment_id, **kwargs):
+        return self._request(fill_query_params(kwargs.pop('path'), shipment_id), params=kwargs)
+
+    @sp_endpoint("/fba/inbound/v0/shipmentItems")
+    def shipment_items(self, **kwargs):
+        return self._request(kwargs.pop('path'), params=kwargs)
 

sp_api/base/client.py

@@ -96,7 +96,7 @@ def _request(self, path: str, *, data: dict = None, params: dict = None, headers
             self._add_marketplaces(data if self.method == 'POST' else params)
 
         res = request(self.method, self.endpoint + path, params=params,
-                      data=json.dumps(data) if self.method == 'POST' else None, headers=headers or self.headers,
+                      data=json.dumps(data) if data and self.method in ('POST', 'PUT') else None, headers=headers or self.headers,
                       auth=self._sign_request())
 
         return self._check_response(res)

tests/api/fulfillment_inbound/test_fulfillment_inbound.py

@@ -1,9 +1,165 @@
-# from datetime import datetime, timedelta
-#
-# from sp_api.api import FulfillmentInbound
-#
-# def test_get_shipments():
-#     r = FulfillmentInbound().get_shipments(QueryType='DATE_RANGE', LastUpdatedAfter=(datetime.now() - timedelta(days=30)).isoformat(), LastUpdatedBefore=datetime.now().isoformat(), ShipmentStatusList=','.join([
-#         'WORKING','SHIPPED','RECEIVING','CANCELLED','DELETED','CLOSED','ERROR','IN_TRANSIT','DELIVERED','CHECKED_IN'
-#     ]))
-#     print(r)
+from datetime import datetime, timedelta
+
+from sp_api.api import FulfillmentInbound
+
+
+def test_item_guidance():
+    res = FulfillmentInbound().item_guidance(SellerSKUList=','.join(["sku1", "sku2"]), MarketplaceId='MarketplaceId')
+    assert res.errors is None
+
+
+def test_plans():
+    res = FulfillmentInbound().plans(**{
+        "ShipFromAddress": {
+            "Name": "Name",
+            "AddressLine1": "123 any st",
+            "AddressLine2": "AddressLine2",
+            "DistrictOrCounty": "Washtenaw",
+            "City": "Ann Arbor",
+            "StateOrProvinceCode": "MI",
+            "CountryCode": "US",
+            "PostalCode": "48188"
+        },
+        "LabelPrepPreference": "SELLER_LABEL",
+        "ShipToCountryCode": "ShipToCountryCode",
+        "ShipToCountrySubdivisionCode": "ShipToCountrySubdivisionCode",
+        "InboundShipmentPlanRequestItems": [
+            {
+                "SellerSKU": "SellerSKU",
+                "ASIN": "ASIN",
+                "Condition": "NewItem",
+                "Quantity": 1,
+                "QuantityInCase": 1,
+                "PrepDetailsList": [
+                    {
+                        "PrepInstruction": "Polybagging",
+                        "PrepOwner": "AMAZON"
+                    }
+                ]
+            }
+        ]
+    })
+    assert res.errors is None
+
+
+def test_create_inbound_shipment():
+    res = FulfillmentInbound().create_shipment('123', **{
+        "InboundShipmentHeader": {
+            "ShipmentName": "43545345",
+            "ShipFromAddress": {
+                "Name": "35435345",
+                "AddressLine1": "123 any st",
+                "DistrictOrCounty": "Washtenaw",
+                "City": "Ann Arbor",
+                "StateOrProvinceCode": "Test",
+                "CountryCode": "US",
+                "PostalCode": "48103"
+            },
+            "DestinationFulfillmentCenterId": "AEB2",
+            "AreCasesRequired": True,
+            "ShipmentStatus": "WORKING",
+            "LabelPrepPreference": "SELLER_LABEL",
+            "IntendedBoxContentsSource": "NONE"
+        },
+        "InboundShipmentItems": [
+            {
+                "ShipmentId": "345453",
+                "SellerSKU": "34534545",
+                "FulfillmentNetworkSKU": "435435435",
+                "QuantityShipped": 0,
+                "QuantityReceived": 0,
+                "QuantityInCase": 0,
+                "ReleaseDate": "2020-04-23",
+                "PrepDetailsList": [
+                    {
+                        "PrepInstruction": "Polybagging",
+                        "PrepOwner": "AMAZON"
+                    }
+                ]
+            }
+        ],
+        "MarketplaceId": "MarketplaceId"
+    })
+    assert res.errors is None
+
+
+def test_update_shipment():
+    res = FulfillmentInbound().update_shipment('123', **{
+        "MarketplaceId": "ATVPDKIKX0DER",
+        "InboundShipmentHeader": {
+            "ShipmentName": "Shipment for FBA15DJCQ1ZF",
+            "ShipFromAddress": {
+                "Name": "Uma Test",
+                "AddressLine1": "123 any st",
+                "AddressLine2": "",
+                "DistrictOrCounty": "Washtenaw",
+                "City": "Ann Arbor",
+                "StateOrProvinceCode": "CO",
+                "CountryCode": "US",
+                "PostalCode": "48104"
+            },
+            "DestinationFulfillmentCenterId": "ABE2",
+            "ShipmentStatus": "WORKING",
+            "LabelPrepPreference": "SELLER_LABEL"
+        },
+        "InboundShipmentItems": [
+            {
+                "SellerSKU": "PSMM-TEST-SKU-Apr-03_21_17_20-0379",
+                "QuantityShipped": 1
+            }
+        ]
+    })
+    assert res.errors is None
+
+
+def test_preorder():
+    res = FulfillmentInbound().preorder('shipmentId1', MarketplaceId='MarketplaceId1')
+    assert res.errors is None
+
+
+def test_confirm_preorder():
+    res = FulfillmentInbound().confirm_preorder('shipmentId1', **{
+        "NeedByDate": "2020-10-10",
+        "MarketplaceId": "MarketplaceId1"
+    })
+    assert res.errors is None
+
+
+def test_get_prep_orders():
+    res = FulfillmentInbound().prep_instruction(**{"ShipToCountryCode": "US", "ASINList": ["ASIN1"]})
+    assert res.errors is None
+
+
+def test_get_transport():
+    res = FulfillmentInbound().get_transport_information('shipmentId1')
+    assert res.errors is None
+
+
+def test_void_transport():
+    res = FulfillmentInbound().void_transport('shipmentId1')
+    assert res.errors is None
+
+
+def test_estimate_transport():
+    res = FulfillmentInbound().estimate_transport('shipmentId1')
+    assert res.errors is None
+
+
+def test_get_bill_of_lading():
+    res = FulfillmentInbound().bill_of_lading('shipmentId')
+    assert res.errors is None
+
+
+def test_get_shipments():
+    res = FulfillmentInbound().get_shipments(QueryType='SHIPMENT')
+    assert res.errors is None
+
+
+def test_get_shipment_items():
+    res = FulfillmentInbound().shipment_items_by_shipment('FBA15DJ9SVVD')
+    assert res.errors is None
+
+
+def test_get_items():
+    res = FulfillmentInbound().shipment_items(QueryType='SHIPMENT', NextToken='NextToken')
+    assert res.errors is None