Merge pull request #11 from klaviyo/1.2.1

added fix to event paging, updated changelog

Author: jon-batscha

CHANGELOG.md

@@ -2,19 +2,19 @@
 
 NOTE: For more granular API-specific changes, please see our [API Changelog](https://developers.klaviyo.com/en/docs/changelog_)
 
-## 1.0.0
+## 1.2.1
 
-  * Initial release
+### Bug Fixes
+- Fixed bug that caused paging through events to periodically fail
 
-  Differences between 1.0.0 and BETA:
+## 1.2.0
 
-  - Namespace changes
-    - Pypi package name: `klaviyo–sdk-beta` → `klaviyo-api`
-    - Module name: `klaviyo_sdk_beta` → `klaviyo_api`
-    - client name: `Client` → `KlaviyoAPI`
-    - Client variable name in readme examples: `client` → `klaviyo`
-    - Some functions have changed name
-  - New resources and endpoints: see [API Changelog](https://developers.klaviyo.com/en/docs/changelog_) for full details
+### Added
+- Campaigns (which were previously in our Beta API/SDKs)
+
+### Changes
+- Flows
+    - Pagination changed from page offset to cursor
 
 ## 1.1.0
 
@@ -25,11 +25,17 @@ NOTE: For more granular API-specific changes, please see our [API Changelog](htt
       - Get List Tags
       - Get Segment Tags
 
-## 1.2.0
+## 1.0.0
 
-### Added
-- Campaigns (which were previously in our Beta API/SDKs)
+  * Initial release
+
+  Differences between 1.0.0 and BETA:
+
+  - Namespace changes
+    - Pypi package name: `klaviyo–sdk-beta` → `klaviyo-api`
+    - Module name: `klaviyo_sdk_beta` → `klaviyo_api`
+    - client name: `Client` → `KlaviyoAPI`
+    - Client variable name in readme examples: `client` → `klaviyo`
+    - Some functions have changed name
+  - New resources and endpoints: see [API Changelog](https://developers.klaviyo.com/en/docs/changelog_) for full details
 
-### Changes
-- Flows
-    - Pagination changed from page offset to cursor

README.md

@@ -1,6 +1,6 @@
 # Klaviyo Python SDK
 
-- SDK version: 1.2.0
+- SDK version: 1.2.1
 - API revision: 2023-02-22
 
 ## Helpful Resources

klaviyo_api/wrapper.py

@@ -2,6 +2,8 @@
 
 from __future__ import print_function
 import tenacity
+from urllib.parse import quote, unquote
+
 import openapi_client
 import klaviyo_api.custom_retry as custom_retry
 from dataclasses import dataclass
@@ -294,7 +296,7 @@ def __post_init__(self):
     def _page_cursor_update(cls, func: Callable, *args, **kwargs) -> Callable: 
         def _wrapped_func(*args, **kwargs):
             if 'page_cursor' in kwargs:
-                page_cursor = kwargs['page_cursor']+'&'
+                page_cursor = kwargs['page_cursor']
                 if page_cursor:
                     if isinstance(page_cursor,str):
                         if 'https://' in page_cursor:
@@ -305,8 +307,9 @@ def _wrapped_func(*args, **kwargs):
                                     found_token = token
                                     break
                             if found_token:
-                                start = page_cursor.find(found_token)+len(found_token)+1
-                                end = page_cursor[start:].find('&')
-                                kwargs['page_cursor'] = page_cursor[start:start+end]                                
+                                page_cursor=page_cursor.split(found_token)[-1]
+                                page_cursor = page_cursor.split('&')[0]                                
+                        page_cursor = unquote(page_cursor)
+                        kwargs['page_cursor'] = page_cursor   
             return func(*args,**kwargs)
         return _wrapped_func

openapi_client/__init__.py

@@ -11,7 +11,7 @@
 """
 
 
-__version__ = "1.2.0"
+__version__ = "1.2.1"
 
 # import ApiClient
 from openapi_client.api_client import ApiClient

openapi_client/api_client.py

@@ -77,7 +77,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'klaviyo-api-python/1.2.0'
+        self.user_agent = 'klaviyo-api-python/1.2.1'
 
     def __enter__(self):
         return self

openapi_client/configuration.py

@@ -410,7 +410,7 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: 2023-02-22\n"\
-               "SDK Package Version: 1.2.0".\
+               "SDK Package Version: 1.2.1".\
                format(env=sys.platform, pyversion=sys.version)
 
     def get_host_settings(self):