lark-billing 0.0.6__py3-none-any.whl → 0.0.7__py3-none-any.whl

lark/checkout/client.py

@@ -4,7 +4,6 @@ import typing
 
 from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
 from ..core.request_options import RequestOptions
-from ..types.complete_subscription_checkout_response import CompleteSubscriptionCheckoutResponse
 from ..types.create_subscription_checkout_session_response import CreateSubscriptionCheckoutSessionResponse
 from .raw_client import AsyncRawCheckoutClient, RawCheckoutClient
 
@@ -32,7 +31,7 @@ class CheckoutClient:
         *,
         subject_id: str,
         rate_card_id: str,
-        rate_card_overrides: typing.Optional[typing.Dict[str, str]] = OMIT,
+        callback_url: str,
         request_options: typing.Optional[RequestOptions] = None,
     ) -> CreateSubscriptionCheckoutSessionResponse:
         """
@@ -42,7 +41,7 @@ class CheckoutClient:
 
         rate_card_id : str
 
-        rate_card_overrides : typing.Optional[typing.Dict[str, str]]
+        callback_url : str
 
         request_options : typing.Optional[RequestOptions]
             Request-specific configuration.
@@ -58,52 +57,18 @@ class CheckoutClient:
 
         client = Lark(
             api_key="YOUR_API_KEY",
-            base_url="https://yourhost.com/path/to/api",
         )
         client.checkout.create_subscription_checkout_session(
             subject_id="subject_id",
             rate_card_id="rate_card_id",
+            callback_url="callback_url",
         )
         """
         _response = self._raw_client.create_subscription_checkout_session(
-            subject_id=subject_id,
-            rate_card_id=rate_card_id,
-            rate_card_overrides=rate_card_overrides,
-            request_options=request_options,
+            subject_id=subject_id, rate_card_id=rate_card_id, callback_url=callback_url, request_options=request_options
         )
         return _response.data
 
-    def complete_subscription_checkout(
-        self, checkout_id: str, *, request_options: typing.Optional[RequestOptions] = None
-    ) -> CompleteSubscriptionCheckoutResponse:
-        """
-        Parameters
-        ----------
-        checkout_id : str
-
-        request_options : typing.Optional[RequestOptions]
-            Request-specific configuration.
-
-        Returns
-        -------
-        CompleteSubscriptionCheckoutResponse
-            Successful Response
-
-        Examples
-        --------
-        from lark import Lark
-
-        client = Lark(
-            api_key="YOUR_API_KEY",
-            base_url="https://yourhost.com/path/to/api",
-        )
-        client.checkout.complete_subscription_checkout(
-            checkout_id="checkout_id",
-        )
-        """
-        _response = self._raw_client.complete_subscription_checkout(checkout_id, request_options=request_options)
-        return _response.data
-
 
 class AsyncCheckoutClient:
     def __init__(self, *, client_wrapper: AsyncClientWrapper):
@@ -125,7 +90,7 @@ class AsyncCheckoutClient:
         *,
         subject_id: str,
         rate_card_id: str,
-        rate_card_overrides: typing.Optional[typing.Dict[str, str]] = OMIT,
+        callback_url: str,
         request_options: typing.Optional[RequestOptions] = None,
     ) -> CreateSubscriptionCheckoutSessionResponse:
         """
@@ -135,7 +100,7 @@ class AsyncCheckoutClient:
 
         rate_card_id : str
 
-        rate_card_overrides : typing.Optional[typing.Dict[str, str]]
+        callback_url : str
 
         request_options : typing.Optional[RequestOptions]
             Request-specific configuration.
@@ -153,7 +118,6 @@ class AsyncCheckoutClient:
 
         client = AsyncLark(
             api_key="YOUR_API_KEY",
-            base_url="https://yourhost.com/path/to/api",
         )
 
 
@@ -161,54 +125,13 @@ class AsyncCheckoutClient:
             await client.checkout.create_subscription_checkout_session(
                 subject_id="subject_id",
                 rate_card_id="rate_card_id",
+                callback_url="callback_url",
             )
 
 
         asyncio.run(main())
         """
         _response = await self._raw_client.create_subscription_checkout_session(
-            subject_id=subject_id,
-            rate_card_id=rate_card_id,
-            rate_card_overrides=rate_card_overrides,
-            request_options=request_options,
-        )
-        return _response.data
-
-    async def complete_subscription_checkout(
-        self, checkout_id: str, *, request_options: typing.Optional[RequestOptions] = None
-    ) -> CompleteSubscriptionCheckoutResponse:
-        """
-        Parameters
-        ----------
-        checkout_id : str
-
-        request_options : typing.Optional[RequestOptions]
-            Request-specific configuration.
-
-        Returns
-        -------
-        CompleteSubscriptionCheckoutResponse
-            Successful Response
-
-        Examples
-        --------
-        import asyncio
-
-        from lark import AsyncLark
-
-        client = AsyncLark(
-            api_key="YOUR_API_KEY",
-            base_url="https://yourhost.com/path/to/api",
+            subject_id=subject_id, rate_card_id=rate_card_id, callback_url=callback_url, request_options=request_options
         )
-
-
-        async def main() -> None:
-            await client.checkout.complete_subscription_checkout(
-                checkout_id="checkout_id",
-            )
-
-
-        asyncio.run(main())
-        """
-        _response = await self._raw_client.complete_subscription_checkout(checkout_id, request_options=request_options)
         return _response.data

lark/checkout/raw_client.py

@@ -6,11 +6,9 @@ from json.decoder import JSONDecodeError
 from ..core.api_error import ApiError
 from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
 from ..core.http_response import AsyncHttpResponse, HttpResponse
-from ..core.jsonable_encoder import jsonable_encoder
 from ..core.pydantic_utilities import parse_obj_as
 from ..core.request_options import RequestOptions
 from ..errors.unprocessable_entity_error import UnprocessableEntityError
-from ..types.complete_subscription_checkout_response import CompleteSubscriptionCheckoutResponse
 from ..types.create_subscription_checkout_session_response import CreateSubscriptionCheckoutSessionResponse
 from ..types.http_validation_error import HttpValidationError
 
@@ -27,7 +25,7 @@ class RawCheckoutClient:
         *,
         subject_id: str,
         rate_card_id: str,
-        rate_card_overrides: typing.Optional[typing.Dict[str, str]] = OMIT,
+        callback_url: str,
         request_options: typing.Optional[RequestOptions] = None,
     ) -> HttpResponse[CreateSubscriptionCheckoutSessionResponse]:
         """
@@ -37,7 +35,7 @@ class RawCheckoutClient:
 
         rate_card_id : str
 
-        rate_card_overrides : typing.Optional[typing.Dict[str, str]]
+        callback_url : str
 
         request_options : typing.Optional[RequestOptions]
             Request-specific configuration.
@@ -53,7 +51,7 @@ class RawCheckoutClient:
             json={
                 "subject_id": subject_id,
                 "rate_card_id": rate_card_id,
-                "rate_card_overrides": rate_card_overrides,
+                "callback_url": callback_url,
             },
             headers={
                 "content-type": "application/json",
@@ -87,53 +85,6 @@ class RawCheckoutClient:
             raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
         raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
-    def complete_subscription_checkout(
-        self, checkout_id: str, *, request_options: typing.Optional[RequestOptions] = None
-    ) -> HttpResponse[CompleteSubscriptionCheckoutResponse]:
-        """
-        Parameters
-        ----------
-        checkout_id : str
-
-        request_options : typing.Optional[RequestOptions]
-            Request-specific configuration.
-
-        Returns
-        -------
-        HttpResponse[CompleteSubscriptionCheckoutResponse]
-            Successful Response
-        """
-        _response = self._client_wrapper.httpx_client.request(
-            f"checkout/{jsonable_encoder(checkout_id)}/complete",
-            method="POST",
-            request_options=request_options,
-        )
-        try:
-            if 200 <= _response.status_code < 300:
-                _data = typing.cast(
-                    CompleteSubscriptionCheckoutResponse,
-                    parse_obj_as(
-                        type_=CompleteSubscriptionCheckoutResponse,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-                return HttpResponse(response=_response, data=_data)
-            if _response.status_code == 422:
-                raise UnprocessableEntityError(
-                    headers=dict(_response.headers),
-                    body=typing.cast(
-                        HttpValidationError,
-                        parse_obj_as(
-                            type_=HttpValidationError,  # type: ignore
-                            object_=_response.json(),
-                        ),
-                    ),
-                )
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
-        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
-
 
 class AsyncRawCheckoutClient:
     def __init__(self, *, client_wrapper: AsyncClientWrapper):
@@ -144,7 +95,7 @@ class AsyncRawCheckoutClient:
         *,
         subject_id: str,
         rate_card_id: str,
-        rate_card_overrides: typing.Optional[typing.Dict[str, str]] = OMIT,
+        callback_url: str,
         request_options: typing.Optional[RequestOptions] = None,
     ) -> AsyncHttpResponse[CreateSubscriptionCheckoutSessionResponse]:
         """
@@ -154,7 +105,7 @@ class AsyncRawCheckoutClient:
 
         rate_card_id : str
 
-        rate_card_overrides : typing.Optional[typing.Dict[str, str]]
+        callback_url : str
 
         request_options : typing.Optional[RequestOptions]
             Request-specific configuration.
@@ -170,7 +121,7 @@ class AsyncRawCheckoutClient:
             json={
                 "subject_id": subject_id,
                 "rate_card_id": rate_card_id,
-                "rate_card_overrides": rate_card_overrides,
+                "callback_url": callback_url,
             },
             headers={
                 "content-type": "application/json",
@@ -203,50 +154,3 @@ class AsyncRawCheckoutClient:
         except JSONDecodeError:
             raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
         raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
-
-    async def complete_subscription_checkout(
-        self, checkout_id: str, *, request_options: typing.Optional[RequestOptions] = None
-    ) -> AsyncHttpResponse[CompleteSubscriptionCheckoutResponse]:
-        """
-        Parameters
-        ----------
-        checkout_id : str
-
-        request_options : typing.Optional[RequestOptions]
-            Request-specific configuration.
-
-        Returns
-        -------
-        AsyncHttpResponse[CompleteSubscriptionCheckoutResponse]
-            Successful Response
-        """
-        _response = await self._client_wrapper.httpx_client.request(
-            f"checkout/{jsonable_encoder(checkout_id)}/complete",
-            method="POST",
-            request_options=request_options,
-        )
-        try:
-            if 200 <= _response.status_code < 300:
-                _data = typing.cast(
-                    CompleteSubscriptionCheckoutResponse,
-                    parse_obj_as(
-                        type_=CompleteSubscriptionCheckoutResponse,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-                return AsyncHttpResponse(response=_response, data=_data)
-            if _response.status_code == 422:
-                raise UnprocessableEntityError(
-                    headers=dict(_response.headers),
-                    body=typing.cast(
-                        HttpValidationError,
-                        parse_obj_as(
-                            type_=HttpValidationError,  # type: ignore
-                            object_=_response.json(),
-                        ),
-                    ),
-                )
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
-        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)

lark/client.py

@@ -6,10 +6,13 @@ import typing
 
 import httpx
 from .core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from .environment import LarkEnvironment
 
 if typing.TYPE_CHECKING:
     from .checkout.client import AsyncCheckoutClient, CheckoutClient
-    from .feature_access.client import AsyncFeatureAccessClient, FeatureAccessClient
+    from .customer_access.client import AsyncCustomerAccessClient, CustomerAccessClient
+    from .customer_portal.client import AsyncCustomerPortalClient, CustomerPortalClient
+    from .pricing_metrics.client import AsyncPricingMetricsClient, PricingMetricsClient
     from .rate_cards.client import AsyncRateCardsClient, RateCardsClient
     from .subjects.client import AsyncSubjectsClient, SubjectsClient
     from .subscriptions.client import AsyncSubscriptionsClient, SubscriptionsClient
@@ -22,9 +25,18 @@ class Lark:
 
     Parameters
     ----------
-    base_url : str
+    base_url : typing.Optional[str]
         The base url to use for requests from the client.
 
+    environment : LarkEnvironment
+        The environment to use for requests from the client. from .environment import LarkEnvironment
+
+
+
+        Defaults to LarkEnvironment.DEFAULT
+
+
+
     api_key : str
     headers : typing.Optional[typing.Dict[str, str]]
         Additional headers to send with every request.
@@ -44,14 +56,14 @@ class Lark:
 
     client = Lark(
         api_key="YOUR_API_KEY",
-        base_url="https://yourhost.com/path/to/api",
     )
     """
 
     def __init__(
         self,
         *,
-        base_url: str,
+        base_url: typing.Optional[str] = None,
+        environment: LarkEnvironment = LarkEnvironment.DEFAULT,
         api_key: str,
         headers: typing.Optional[typing.Dict[str, str]] = None,
         timeout: typing.Optional[float] = None,
@@ -62,7 +74,7 @@ class Lark:
             timeout if timeout is not None else 60 if httpx_client is None else httpx_client.timeout.read
         )
         self._client_wrapper = SyncClientWrapper(
-            base_url=base_url,
+            base_url=_get_base_url(base_url=base_url, environment=environment),
             api_key=api_key,
             headers=headers,
             httpx_client=httpx_client
@@ -73,11 +85,13 @@ class Lark:
             timeout=_defaulted_timeout,
         )
         self._checkout: typing.Optional[CheckoutClient] = None
+        self._customer_portal: typing.Optional[CustomerPortalClient] = None
         self._rate_cards: typing.Optional[RateCardsClient] = None
         self._usage_events: typing.Optional[UsageEventsClient] = None
         self._subscriptions: typing.Optional[SubscriptionsClient] = None
-        self._feature_access: typing.Optional[FeatureAccessClient] = None
         self._subjects: typing.Optional[SubjectsClient] = None
+        self._pricing_metrics: typing.Optional[PricingMetricsClient] = None
+        self._customer_access: typing.Optional[CustomerAccessClient] = None
 
     @property
     def checkout(self):
@@ -87,6 +101,14 @@ class Lark:
             self._checkout = CheckoutClient(client_wrapper=self._client_wrapper)
         return self._checkout
 
+    @property
+    def customer_portal(self):
+        if self._customer_portal is None:
+            from .customer_portal.client import CustomerPortalClient  # noqa: E402
+
+            self._customer_portal = CustomerPortalClient(client_wrapper=self._client_wrapper)
+        return self._customer_portal
+
     @property
     def rate_cards(self):
         if self._rate_cards is None:
@@ -111,14 +133,6 @@ class Lark:
             self._subscriptions = SubscriptionsClient(client_wrapper=self._client_wrapper)
         return self._subscriptions
 
-    @property
-    def feature_access(self):
-        if self._feature_access is None:
-            from .feature_access.client import FeatureAccessClient  # noqa: E402
-
-            self._feature_access = FeatureAccessClient(client_wrapper=self._client_wrapper)
-        return self._feature_access
-
     @property
     def subjects(self):
         if self._subjects is None:
@@ -127,6 +141,22 @@ class Lark:
             self._subjects = SubjectsClient(client_wrapper=self._client_wrapper)
         return self._subjects
 
+    @property
+    def pricing_metrics(self):
+        if self._pricing_metrics is None:
+            from .pricing_metrics.client import PricingMetricsClient  # noqa: E402
+
+            self._pricing_metrics = PricingMetricsClient(client_wrapper=self._client_wrapper)
+        return self._pricing_metrics
+
+    @property
+    def customer_access(self):
+        if self._customer_access is None:
+            from .customer_access.client import CustomerAccessClient  # noqa: E402
+
+            self._customer_access = CustomerAccessClient(client_wrapper=self._client_wrapper)
+        return self._customer_access
+
 
 class AsyncLark:
     """
@@ -134,9 +164,18 @@ class AsyncLark:
 
     Parameters
     ----------
-    base_url : str
+    base_url : typing.Optional[str]
         The base url to use for requests from the client.
 
+    environment : LarkEnvironment
+        The environment to use for requests from the client. from .environment import LarkEnvironment
+
+
+
+        Defaults to LarkEnvironment.DEFAULT
+
+
+
     api_key : str
     headers : typing.Optional[typing.Dict[str, str]]
         Additional headers to send with every request.
@@ -156,14 +195,14 @@ class AsyncLark:
 
     client = AsyncLark(
         api_key="YOUR_API_KEY",
-        base_url="https://yourhost.com/path/to/api",
     )
     """
 
     def __init__(
         self,
         *,
-        base_url: str,
+        base_url: typing.Optional[str] = None,
+        environment: LarkEnvironment = LarkEnvironment.DEFAULT,
         api_key: str,
         headers: typing.Optional[typing.Dict[str, str]] = None,
         timeout: typing.Optional[float] = None,
@@ -174,7 +213,7 @@ class AsyncLark:
             timeout if timeout is not None else 60 if httpx_client is None else httpx_client.timeout.read
         )
         self._client_wrapper = AsyncClientWrapper(
-            base_url=base_url,
+            base_url=_get_base_url(base_url=base_url, environment=environment),
             api_key=api_key,
             headers=headers,
             httpx_client=httpx_client
@@ -185,11 +224,13 @@ class AsyncLark:
             timeout=_defaulted_timeout,
         )
         self._checkout: typing.Optional[AsyncCheckoutClient] = None
+        self._customer_portal: typing.Optional[AsyncCustomerPortalClient] = None
         self._rate_cards: typing.Optional[AsyncRateCardsClient] = None
         self._usage_events: typing.Optional[AsyncUsageEventsClient] = None
         self._subscriptions: typing.Optional[AsyncSubscriptionsClient] = None
-        self._feature_access: typing.Optional[AsyncFeatureAccessClient] = None
         self._subjects: typing.Optional[AsyncSubjectsClient] = None
+        self._pricing_metrics: typing.Optional[AsyncPricingMetricsClient] = None
+        self._customer_access: typing.Optional[AsyncCustomerAccessClient] = None
 
     @property
     def checkout(self):
@@ -199,6 +240,14 @@ class AsyncLark:
             self._checkout = AsyncCheckoutClient(client_wrapper=self._client_wrapper)
         return self._checkout
 
+    @property
+    def customer_portal(self):
+        if self._customer_portal is None:
+            from .customer_portal.client import AsyncCustomerPortalClient  # noqa: E402
+
+            self._customer_portal = AsyncCustomerPortalClient(client_wrapper=self._client_wrapper)
+        return self._customer_portal
+
     @property
     def rate_cards(self):
         if self._rate_cards is None:
@@ -223,14 +272,6 @@ class AsyncLark:
             self._subscriptions = AsyncSubscriptionsClient(client_wrapper=self._client_wrapper)
         return self._subscriptions
 
-    @property
-    def feature_access(self):
-        if self._feature_access is None:
-            from .feature_access.client import AsyncFeatureAccessClient  # noqa: E402
-
-            self._feature_access = AsyncFeatureAccessClient(client_wrapper=self._client_wrapper)
-        return self._feature_access
-
     @property
     def subjects(self):
         if self._subjects is None:
@@ -238,3 +279,28 @@ class AsyncLark:
 
             self._subjects = AsyncSubjectsClient(client_wrapper=self._client_wrapper)
         return self._subjects
+
+    @property
+    def pricing_metrics(self):
+        if self._pricing_metrics is None:
+            from .pricing_metrics.client import AsyncPricingMetricsClient  # noqa: E402
+
+            self._pricing_metrics = AsyncPricingMetricsClient(client_wrapper=self._client_wrapper)
+        return self._pricing_metrics
+
+    @property
+    def customer_access(self):
+        if self._customer_access is None:
+            from .customer_access.client import AsyncCustomerAccessClient  # noqa: E402
+
+            self._customer_access = AsyncCustomerAccessClient(client_wrapper=self._client_wrapper)
+        return self._customer_access
+
+
+def _get_base_url(*, base_url: typing.Optional[str] = None, environment: LarkEnvironment) -> str:
+    if base_url is not None:
+        return base_url
+    elif environment is not None:
+        return environment.value
+    else:
+        raise Exception("Please pass in either base_url or environment to construct the client")

lark/core/client_wrapper.py

@@ -22,10 +22,10 @@ class BaseClientWrapper:
 
     def get_headers(self) -> typing.Dict[str, str]:
         headers: typing.Dict[str, str] = {
-            "User-Agent": "lark-billing/0.0.6",
+            "User-Agent": "lark-billing/0.0.7",
             "X-Fern-Language": "Python",
             "X-Fern-SDK-Name": "lark-billing",
-            "X-Fern-SDK-Version": "0.0.6",
+            "X-Fern-SDK-Version": "0.0.7",
             **(self.get_custom_headers() or {}),
         }
         headers["X-API-Key"] = self.api_key