recharge-api 2.0.0__tar.gz → 2.0.2__tar.gz

{recharge_api-2.0.0/recharge_api.egg-info → recharge_api-2.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: recharge-api
-Version: 2.0.0
+Version: 2.0.2
 Summary: Python API Client for Recharge
 Author-email: ChemicalLuck <j.tebbett@outlook.com>
 Project-URL: Homepage, http://github.com/ChemicalLuck/recharge-api

{recharge_api-2.0.0 → recharge_api-2.0.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "recharge-api"
-version = "2.0.0"
+version = "2.0.2"
 authors = [
 	{ name="ChemicalLuck", email="j.tebbett@outlook.com" }
 ]

{recharge_api-2.0.0 → recharge_api-2.0.2}/recharge/__init__.py

@@ -66,7 +66,7 @@ class RechargeAPI:
         from recharge.api.v1 import TokenResource
 
         token = TokenResource(self.client)
-        self.scopes: list[RechargeScope] = token.get()["scopes"]
+        self.scopes: list[RechargeScope] = token.get().scopes
 
         self.v1 = RechargeAPIv1(self.client, self.scopes)
         self.v2 = RechargeAPIv2(self.client, self.scopes)

{recharge_api-2.0.0 → recharge_api-2.0.2}/recharge/api/v1/addresses.py

@@ -222,7 +222,7 @@ class AddressResource(RechargeResource):
         data = self._http_post(url, body)
         if not isinstance(data, dict):
             raise RechargeAPIError(f"Expected dict, got {type(data).__name__}")
-        return AddressValidateResponse.model_validate(data)
+        return data
 
     def apply_discount(
         self,

{recharge_api-2.0.0 → recharge_api-2.0.2}/recharge/api/v1/customers.py

@@ -136,7 +136,6 @@ class CustomerResource(RechargeResource):
         https://developer.rechargepayments.com/2021-01/customers/customers_list
         """
         required_scopes: list[RechargeScope] = ["read_customers"]
-        print(query)
         self._check_scopes(f"GET /{self.object_list_key}", required_scopes)
 
         data = self._http_get(self._url, query, expected=list)

{recharge_api-2.0.0 → recharge_api-2.0.2}/recharge/api/v2/addresses.py

@@ -153,7 +153,7 @@ class AddressResource(RechargeResource):
         required_scopes: list[RechargeScope] = ["read_customers"]
         self._check_scopes(f"GET /{self.object_list_key}", required_scopes)
 
-        data = self._http_get(self._url, query, list)
+        data = self._http_get(self._url, query, expected=list)
         if not isinstance(data, list):
             raise RechargeAPIError(f"Expected list, got {type(data).__name__}")
         return [Address.model_validate(address) for address in data]
@@ -188,7 +188,7 @@ class AddressResource(RechargeResource):
         https://developer.rechargepayments.com/2021-11/addresses/skip_future_charge
         """
         required_scopes: list[RechargeScope] = ["write_customers"]
-        self._check_scopes(f"POST /{self.object_list_key}/skip", required_scopes)
+        self._check_scopes(f"POST /{self.object_list_key}/:address_id/charges/skip", required_scopes)
 
         url = f"{self._url}/{address_id}/charges/skip"
         data = self._http_post(url, body)

{recharge_api-2.0.0 → recharge_api-2.0.2}/recharge/api/v2/bundle_selections.py

@@ -56,7 +56,7 @@ class BundleSelectionResource(RechargeResource):
         required_scopes: list[RechargeScope] = ["read_subscriptions"]
         self._check_scopes(f"GET /{self.object_list_key}", required_scopes)
 
-        data = self._http_get(self._url, query, list)
+        data = self._http_get(self._url, query, expected=list)
         if not isinstance(data, list):
             raise RechargeAPIError(f"Expected list, got {type(data).__name__}")
         return [BundleSelection.model_validate(item) for item in data]

{recharge_api-2.0.0 → recharge_api-2.0.2}/recharge/api/v2/charges.py

@@ -112,7 +112,7 @@ class ChargeResource(RechargeResource):
         required_scopes: list[RechargeScope] = ["read_orders"]
         self._check_scopes(f"GET /{self.object_list_key}", required_scopes)
 
-        data = self._http_get(self._url, query, list)
+        data = self._http_get(self._url, query, expected=list)
         if not isinstance(data, list):
             raise RechargeAPIError(f"Expected list, got {type(data).__name__}")
         return [Charge.model_validate(item) for item in data]
@@ -230,7 +230,7 @@ class ChargeResource(RechargeResource):
             "write_customers",
         ]
         self._check_scopes(
-            f"POST /{self.object_list_key}/:charge_id/capture", required_scopes
+            f"POST /{self.object_list_key}/:charge_id/capture_payment", required_scopes
         )
 
         url = f"{self._url}/{charge_id}/capture_payment"

{recharge_api-2.0.0 → recharge_api-2.0.2}/recharge/api/v2/collections.py

@@ -117,7 +117,7 @@ class CollectionResource(RechargeResource):
         required_scopes: list[RechargeScope] = ["read_products"]
         self._check_scopes(f"GET /{self.object_list_key}", required_scopes)
 
-        data = self._http_get(self._url, query, list)
+        data = self._http_get(self._url, query, expected=list)
         if not isinstance(data, list):
             raise RechargeAPIError(f"Expected list, got {type(data).__name__}")
         return [Collection.model_validate(item) for item in data]

{recharge_api-2.0.0 → recharge_api-2.0.2}/recharge/api/v2/customers.py

@@ -131,7 +131,7 @@ class CustomerResource(RechargeResource):
         required_scopes: list[RechargeScope] = ["read_customers"]
         self._check_scopes(f"GET /{self.object_list_key}", required_scopes)
 
-        data = self._http_get(self._url, query, list)
+        data = self._http_get(self._url, query, expected=list)
         if not isinstance(data, list):
             raise RechargeAPIError(f"Expected list, got {type(data).__name__}")
         return [Customer.model_validate(item) for item in data]

{recharge_api-2.0.0 → recharge_api-2.0.2}/recharge/api/v2/discounts.py

@@ -127,7 +127,7 @@ class DiscountResource(RechargeResource):
         required_scopes: list[RechargeScope] = ["read_discounts"]
         self._check_scopes(f"GET /{self.object_list_key}", required_scopes)
 
-        data = self._http_get(self._url, query, list)
+        data = self._http_get(self._url, query, expected=list)
         if not isinstance(data, list):
             raise RechargeAPIError(f"Expected list, got {type(data).__name__}")
         return [Discount.model_validate(item) for item in data]

{recharge_api-2.0.0 → recharge_api-2.0.2}/recharge/api/v2/events.py

@@ -31,7 +31,7 @@ class EventResource(RechargeResource):
         required_scopes: list[RechargeScope] = ["read_events"]
         self._check_scopes(f"GET /{self.object_list_key}", required_scopes)
 
-        data = self._http_get(self._url, query, list)
+        data = self._http_get(self._url, query, expected=list)
         if not isinstance(data, list):
             raise RechargeAPIError(f"Expected list, got {type(data).__name__}")
         return [Event.model_validate(event) for event in data]

{recharge_api-2.0.0 → recharge_api-2.0.2}/recharge/api/v2/metafields.py

@@ -156,7 +156,7 @@ class MetafieldResource(RechargeResource):
         required_scopes: list[RechargeScope] = [resource_scope(resource, "read")]
         self._check_scopes(f"GET /{self.object_list_key}", required_scopes)
 
-        data = self._http_get(self._url, query, list)
+        data = self._http_get(self._url, query, expected=list)
         if not isinstance(data, list):
             raise RechargeAPIError(f"Expected list, got {type(data).__name__}")
         return [Metafield.model_validate(metafield) for metafield in data]

{recharge_api-2.0.0 → recharge_api-2.0.2}/recharge/api/v2/onetimes.py

@@ -126,7 +126,7 @@ class OnetimeResource(RechargeResource):
         required_scopes: list[RechargeScope] = ["read_subscriptions"]
         self._check_scopes(f"GET /{self.object_list_key}", required_scopes)
 
-        data = self._http_get(self._url, query, list)
+        data = self._http_get(self._url, query, expected=list)
         if not isinstance(data, list):
             raise RechargeAPIError(f"Expected list, got {type(data).__name__}")
         return [Onetime.model_validate(item) for item in data]

{recharge_api-2.0.0 → recharge_api-2.0.2}/recharge/api/v2/orders.py

@@ -134,7 +134,7 @@ class OrderResource(RechargeResource):
         required_scopes: list[RechargeScope] = ["read_orders"]
         self._check_scopes(f"GET /{self.object_list_key}", required_scopes)
 
-        data = self._http_get(self._url, query, list)
+        data = self._http_get(self._url, query, expected=list)
         if not isinstance(data, list):
             raise RechargeAPIError(f"Expected list, got {type(data).__name__}")
         return [Order.model_validate(order) for order in data]

{recharge_api-2.0.0 → recharge_api-2.0.2}/recharge/api/v2/payment_methods.py

@@ -111,7 +111,7 @@ class PaymentMethodResource(RechargeResource):
         required_scopes: list[RechargeScope] = ["read_payment_methods"]
         self._check_scopes(f"GET /{self.object_list_key}", required_scopes)
 
-        data = self._http_get(self._url, query, list)
+        data = self._http_get(self._url, query, expected=list)
         if not isinstance(data, list):
             raise RechargeAPIError(f"Expected list, got {type(data).__name__}")
         return [PaymentMethod.model_validate(item) for item in data]

{recharge_api-2.0.0 → recharge_api-2.0.2}/recharge/api/v2/plans.py

@@ -116,7 +116,7 @@ class PlanResource(RechargeResource):
         required_scopes: list[RechargeScope] = ["read_products"]
         self._check_scopes(f"GET /{self.object_list_key}", required_scopes)
 
-        data = self._http_get(self._url, query, list)
+        data = self._http_get(self._url, query, expected=list)
         if not isinstance(data, list):
             raise RechargeAPIError(f"Expected list, got {type(data).__name__}")
         return [Plan.model_validate(item) for item in data]

{recharge_api-2.0.0 → recharge_api-2.0.2}/recharge/api/v2/products.py

@@ -115,7 +115,7 @@ class ProductResource(RechargeResource):
         required_scopes: list[RechargeScope] = ["read_products"]
         self._check_scopes(f"GET /{self.object_list_key}", required_scopes)
 
-        data = self._http_get(self._url, query, list)
+        data = self._http_get(self._url, query, expected=list)
         if not isinstance(data, list):
             raise RechargeAPIError(f"Expected list, got {type(data).__name__}")
         return [Product.model_validate(item) for item in data]

{recharge_api-2.0.0 → recharge_api-2.0.2}/recharge/api/v2/subscriptions.py

@@ -194,7 +194,7 @@ class SubscriptionResource(RechargeResource):
         required_scopes: list[RechargeScope] = ["read_subscriptions"]
         self._check_scopes(f"GET /{self.object_list_key}", required_scopes)
 
-        data = self._http_get(self._url, query, list)
+        data = self._http_get(self._url, query, expected=list)
         if not isinstance(data, list):
             raise RechargeAPIError(f"Expected list, got {type(data).__name__}")
         return [Subscription.model_validate(item) for item in data]

{recharge_api-2.0.0 → recharge_api-2.0.2}/recharge/model/v2/charge.py

@@ -1,6 +1,6 @@
-from typing import Literal, Optional
+from typing import Any, Literal, Optional, Union
 
-from pydantic import BaseModel, ConfigDict
+from pydantic import BaseModel, ConfigDict, field_validator
 
 ChargeStatus = Literal[
     "SUCCESS", "QUEUED", "ERROR", "REFUNDED", "PARTIALLY_REFUNDED", "SKIPPED"
@@ -26,6 +26,13 @@ class ChargeAnalyticsData(BaseModel):
 
     utm_params: Optional[ChargeAnalyticsDataUtmParams] = None
 
+    @field_validator("utm_params", mode="before")
+    @classmethod
+    def coerce_utm_params(cls, v: Any) -> Any:
+        if isinstance(v, list):
+            return None
+        return v
+
 
 class ChargeBillingAddress(BaseModel):
     model_config = ConfigDict(extra="allow", populate_by_name=True)
@@ -153,7 +160,7 @@ class ChargeOrderAttribute(BaseModel):
     model_config = ConfigDict(extra="allow", populate_by_name=True)
 
     name: str
-    value: str
+    value: Optional[str] = None
 
 
 class ChargeShippingAddress(BaseModel):
@@ -178,13 +185,27 @@ class ChargeShippingLine(BaseModel):
     price: Optional[str] = None
     source: Optional[str] = None
     title: Optional[str] = None
-    taxable: Optional[str] = None
+    taxable: Optional[Union[str, bool]] = None
     tax_lines: list[ChargeTaxLine] = []
 
 
 class Charge(BaseModel):
     model_config = ConfigDict(extra="allow", populate_by_name=True)
 
+    @field_validator("status", "type", mode="before")
+    @classmethod
+    def uppercase_literals(cls, v: Any) -> Any:
+        if isinstance(v, str):
+            return v.upper()
+        return v
+
+    @field_validator("tags", mode="before")
+    @classmethod
+    def coerce_tags(cls, v: Any) -> Any:
+        if isinstance(v, str):
+            return [t.strip() for t in v.split(",") if t.strip()]
+        return v
+
     id: int
     address_id: Optional[int] = None
     analytics_data: Optional[ChargeAnalyticsData] = None

{recharge_api-2.0.0 → recharge_api-2.0.2/recharge_api.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: recharge-api
-Version: 2.0.0
+Version: 2.0.2
 Summary: Python API Client for Recharge
 Author-email: ChemicalLuck <j.tebbett@outlook.com>
 Project-URL: Homepage, http://github.com/ChemicalLuck/recharge-api