updated latest semver code

Author: Bilal Al

setup.py

@@ -8,7 +8,7 @@
     'flake8',
     'pytest==7.0.1',
     'pytest-mock==3.11.1',
-    'coverage==7.2,7',
+    'coverage',
     'pytest-cov==4.1.0',
     'importlib-metadata==6.7',
     'tomli==1.2.3',
@@ -45,7 +45,7 @@
         'test': TESTS_REQUIRES,
         'redis': ['redis>=2.10.5'],
         'uwsgi': ['uwsgi>=2.0.0'],
-        'cpphash': ['mmh3cffi==0.2.1'],
+        'cpphash': ['mmh3cffi==0.2.1']
     },
     setup_requires=['pytest-runner', 'pluggy==1.0.0;python_version<"3.8"'],
     classifiers=[

splitio/api/auth.py

@@ -44,7 +44,7 @@ def authenticate(self):
         try:
             response = self._client.get(
                 'auth',
-                '/v2/auth?s=' + SPEC_VERSION,
+                'v2/auth?s=' + SPEC_VERSION,
                 self._sdk_key,
                 extra_headers=self._metadata,
             )
@@ -55,7 +55,7 @@ def authenticate(self):
             else:
                 if (response.status_code >= 400 and response.status_code < 500):
                     self._telemetry_runtime_producer.record_auth_rejections()
-                raise APIException(response.body, response.status_code, response.headers)
+                raise APIException(response.body, response.status_code)
         except HttpClientException as exc:
             _LOGGER.error('Exception raised while authenticating')
             _LOGGER.debug('Exception information: ', exc_info=True)
@@ -91,7 +91,7 @@ async def authenticate(self):
         try:
             response = await self._client.get(
                 'auth',
-                'v2/auth',
+                'v2/auth?s=' + SPEC_VERSION,
                 self._sdk_key,
                 extra_headers=self._metadata,
             )
@@ -102,7 +102,7 @@ async def authenticate(self):
             else:
                 if (response.status_code >= 400 and response.status_code < 500):
                     await self._telemetry_runtime_producer.record_auth_rejections()
-                raise APIException(response.body, response.status_code, response.headers)
+                raise APIException(response.body, response.status_code)
         except HttpClientException as exc:
             _LOGGER.error('Exception raised while authenticating')
             _LOGGER.debug('Exception information: ', exc_info=True)

splitio/sync/segment.py

@@ -331,14 +331,14 @@ async def synchronize_segment(self, segment_name, till=None):
         :return: True if no error occurs. False otherwise.
         :rtype: bool
         """
-        fetch_options = FetchOptions(True)  # Set Cache-Control to no-cache
+        fetch_options = FetchOptions(True, spec=None)  # Set Cache-Control to no-cache
         successful_sync, remaining_attempts, change_number = await self._attempt_segment_sync(segment_name, fetch_options, till)
         attempts = _ON_DEMAND_FETCH_BACKOFF_MAX_RETRIES - remaining_attempts
         if successful_sync:  # succedeed sync
             _LOGGER.debug('Refresh completed in %d attempts.', attempts)
             return True
 
-        with_cdn_bypass = FetchOptions(True, change_number)  # Set flag for bypassing CDN
+        with_cdn_bypass = FetchOptions(True, change_number, spec=None)  # Set flag for bypassing CDN
         without_cdn_successful_sync, remaining_attempts, change_number = await self._attempt_segment_sync(segment_name, with_cdn_bypass, till)
         without_cdn_attempts = _ON_DEMAND_FETCH_BACKOFF_MAX_RETRIES - remaining_attempts
         if without_cdn_successful_sync:

tests/api/test_auth.py

@@ -34,7 +34,7 @@ def test_auth(self, mocker):
         call_made = httpclient.get.mock_calls[0]
 
         # validate positional arguments
-        assert call_made[1] == ('auth', '/v2/auth?s=1.1', 'some_api_key')
+        assert call_made[1] == ('auth', 'v2/auth?s=1.1', 'some_api_key')
 
         # validate key-value args (headers)
         assert call_made[2]['extra_headers'] == {
@@ -89,7 +89,7 @@ async def get(verb, url, key, extra_headers):
 
         # validate positional arguments
         assert self.verb == 'auth'
-        assert self.url == 'v2/auth'
+        assert self.url == 'v2/auth?s=1.1'
         assert self.key == 'some_api_key'
         assert self.headers == {
             'SplitSDKVersion': 'python-%s' % __version__,

tests/api/test_segments_api.py

@@ -83,7 +83,7 @@ async def get(verb, url, key, query, extra_headers):
             return client.HttpResponse(200, '{"prop1": "value1"}', {})
         httpclient.get = get
 
-        response = await segment_api.fetch_segment('some_segment', 123, FetchOptions())
+        response = await segment_api.fetch_segment('some_segment', 123, FetchOptions(None, None, None, None))
         assert response['prop1'] == 'value1'
         assert self.verb == 'sdk'
         assert self.url == 'segmentChanges/some_segment'
@@ -96,7 +96,7 @@ async def get(verb, url, key, query, extra_headers):
         assert self.query == {'since': 123}
 
         httpclient.reset_mock()
-        response = await segment_api.fetch_segment('some_segment', 123, FetchOptions(True))
+        response = await segment_api.fetch_segment('some_segment', 123, FetchOptions(True, None, None, None))
         assert response['prop1'] == 'value1'
         assert self.verb == 'sdk'
         assert self.url == 'segmentChanges/some_segment'
@@ -110,7 +110,7 @@ async def get(verb, url, key, query, extra_headers):
         assert self.query == {'since': 123}
 
         httpclient.reset_mock()
-        response = await segment_api.fetch_segment('some_segment', 123, FetchOptions(True, 123))
+        response = await segment_api.fetch_segment('some_segment', 123, FetchOptions(True, 123, None, None))
         assert response['prop1'] == 'value1'
         assert self.verb == 'sdk'
         assert self.url == 'segmentChanges/some_segment'
@@ -128,6 +128,6 @@ def raise_exception(*args, **kwargs):
             raise client.HttpClientException('some_message')
         httpclient.get = raise_exception
         with pytest.raises(APIException) as exc_info:
-            response = await segment_api.fetch_segment('some_segment', 123, FetchOptions())
+            response = await segment_api.fetch_segment('some_segment', 123, FetchOptions(None, None, None, None))
             assert exc_info.type == APIException
             assert exc_info.value.message == 'some_message'

tests/api/test_splits_api.py

@@ -36,7 +36,7 @@ def test_fetch_split_changes(self, mocker):
                                                              'SplitSDKMachineName': 'some',
                                                              'Cache-Control': 'no-cache'
                                                          },
-                                                         query={'since': 123, 'till': 123, 'sets': 'set3'})]
+                                                         query={'s': '1.1', 'since': 123, 'till': 123, 'sets': 'set3'})]
 
         httpclient.reset_mock()
         response = split_api.fetch_splits(123, FetchOptions(True, 123, 'set3'))
@@ -92,7 +92,7 @@ async def get(verb, url, key, query, extra_headers):
             'SplitSDKMachineIP': '1.2.3.4',
             'SplitSDKMachineName': 'some'
         }
-        assert self.query == {'since': 123, 'sets': 'set1,set2'}
+        assert self.query == {'s': '1.1', 'since': 123, 'sets': 'set1,set2'}
 
         httpclient.reset_mock()
         response = await split_api.fetch_splits(123, FetchOptions(True, 123, 'set3'))
@@ -106,7 +106,7 @@ async def get(verb, url, key, query, extra_headers):
             'SplitSDKMachineName': 'some',
             'Cache-Control': 'no-cache'
         }
-        assert self.query == {'since': 123, 'till': 123, 'sets': 'set3'}
+        assert self.query == {'s': '1.1', 'since': 123, 'till': 123, 'sets': 'set3'}
 
         httpclient.reset_mock()
         response = await split_api.fetch_splits(123, FetchOptions(True, 123))
@@ -120,7 +120,7 @@ async def get(verb, url, key, query, extra_headers):
             'SplitSDKMachineName': 'some',
             'Cache-Control': 'no-cache'
         }
-        assert self.query == {'since': 123, 'till': 123}
+        assert self.query == {'s': '1.1', 'since': 123, 'till': 123}
 
         httpclient.reset_mock()
         def raise_exception(*args, **kwargs):

tests/client/test_manager.py

@@ -1,4 +1,6 @@
 """SDK main manager test module."""
+import pytest
+
 from splitio.client.factory import SplitFactory
 from splitio.client.manager import SplitManager, SplitManagerAsync, _LOGGER as _logger
 from splitio.models import splits