ibm-appconfiguration-python-sdk 0.3.6__tar.gz → 0.3.8__tar.gz

{ibm_appconfiguration_python_sdk-0.3.6/ibm_appconfiguration_python_sdk.egg-info → ibm_appconfiguration_python_sdk-0.3.8}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: ibm-appconfiguration-python-sdk
-Version: 0.3.6
+Version: 0.3.8
 Summary: IBM Cloud App Configuration Python SDK
 Home-page: https://github.com/IBM/appconfiguration-python-sdk
 Author: IBM
@@ -21,6 +21,18 @@ Requires-Dist: ibm-cloud-sdk-core<4.0.0,>=3.20.3
 Requires-Dist: pyyaml>=5.4.1
 Requires-Dist: schema>=0.7.5
 Requires-Dist: mmh3==5.0.1
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 # IBM Cloud App Configuration Python server SDK
 
@@ -74,12 +86,7 @@ The **`init()`** and **`set_context()`** are the initialisation methods and shou
 appconfig_client. The appconfig_client, once initialised, can be obtained across modules
 using **`AppConfiguration.get_instance()`**.  [See this example below](#fetching-the-appconfig_client-across-other-modules).
 
-- region : Region name where the App Configuration service instance is created. Use
-  - `AppConfiguration.REGION_US_SOUTH` for Dallas
-  - `AppConfiguration.REGION_EU_GB` for London
-  - `AppConfiguration.REGION_AU_SYD` for Sydney
-  - `AppConfiguration.REGION_US_EAST` for Washington DC
-  - `AppConfiguration.REGION_EU_DE` for Frankfurt
+- region : Region name where the App Configuration service instance is created. See list of supported locations [here](https://cloud.ibm.com/catalog/services/app-configuration). Eg:- `us-south`, `au-syd` etc.
 - guid : GUID of the App Configuration service. Obtain it from the service credentials section of the dashboard
 - apikey : ApiKey of the App Configuration service. Obtain it from the service credentials section of the dashboard
 - collection_id : Id of the collection created in App Configuration service instance under the **Collections** section.

{ibm_appconfiguration_python_sdk-0.3.6 → ibm_appconfiguration_python_sdk-0.3.8}/README.md

@@ -50,12 +50,7 @@ The **`init()`** and **`set_context()`** are the initialisation methods and shou
 appconfig_client. The appconfig_client, once initialised, can be obtained across modules
 using **`AppConfiguration.get_instance()`**.  [See this example below](#fetching-the-appconfig_client-across-other-modules).
 
-- region : Region name where the App Configuration service instance is created. Use
-  - `AppConfiguration.REGION_US_SOUTH` for Dallas
-  - `AppConfiguration.REGION_EU_GB` for London
-  - `AppConfiguration.REGION_AU_SYD` for Sydney
-  - `AppConfiguration.REGION_US_EAST` for Washington DC
-  - `AppConfiguration.REGION_EU_DE` for Frankfurt
+- region : Region name where the App Configuration service instance is created. See list of supported locations [here](https://cloud.ibm.com/catalog/services/app-configuration). Eg:- `us-south`, `au-syd` etc.
 - guid : GUID of the App Configuration service. Obtain it from the service credentials section of the dashboard
 - apikey : ApiKey of the App Configuration service. Obtain it from the service credentials section of the dashboard
 - collection_id : Id of the collection created in App Configuration service instance under the **Collections** section.

{ibm_appconfiguration_python_sdk-0.3.6 → ibm_appconfiguration_python_sdk-0.3.8}/ibm_appconfiguration/appconfiguration.py

@@ -39,6 +39,9 @@ class AppConfiguration:
     REGION_AU_SYD = "au-syd"
     REGION_US_EAST = "us-east"
     REGION_EU_DE = "eu-de"
+    REGION_CA_TOR = "ca-tor"
+    REGION_JP_TOK = "jp-tok"
+    REGION_JP_OSA = "jp-osa"
     __override_service_url = None
     __use_private_endpoint = False
 
@@ -295,3 +298,12 @@ class AppConfiguration:
             return self.__configuration_handler_instance.get_property(property_id)
         Logger.error(config_messages.COLLECTION_INIT_ERROR)
         return None
+
+    def is_connected(self) -> bool:
+        """ Get the status of server-client connection
+
+        Returns: boolean indicating connection status
+        """
+        if self.__configuration_handler_instance is None:
+            return False
+        return self.__configuration_handler_instance.is_connected()

{ibm_appconfiguration_python_sdk-0.3.6 → ibm_appconfiguration_python_sdk-0.3.8}/ibm_appconfiguration/configurations/configuration_handler.py

@@ -46,6 +46,9 @@ class ConfigurationHandler:
     """Internal class to handle the configuration"""
     __instance = None
 
+    # variable to keep track of server-client connection status
+    __is_alive = False
+
     @staticmethod
     def get_instance():
         """ Static access method. """
@@ -538,24 +541,35 @@ class ConfigurationHandler:
     def __on_web_socket_callback(self, message=None, error_state=None,
                                  closed_state=None, open_state=None):
         if message:
+            self.__is_alive = True
             self.__fetch_from_api()
             Logger.debug(f'Received message from socket. {message}')
         elif error_state:
+            self.__is_alive = False
             Logger.error(f'Received error from socket. {error_state}')
             Logger.info('Reconnecting to server....')
             self.__on_socket_retry = True
             sleep(delay)
             self.__start_web_socket()
         elif closed_state:
+            self.__is_alive = False
             Logger.error('Received close connection from socket.')
             Logger.info('Reconnecting to server....')
             self.__on_socket_retry = True
             sleep(delay)
             self.__start_web_socket()
         elif open_state:
+            self.__is_alive = True
             if self.__on_socket_retry:
                 self.__on_socket_retry = False
                 self.__fetch_from_api()
             Logger.debug('Received opened connection from socket.')
         else:
             Logger.error('Unknown Error inside the socket connection.')
+
+    def is_connected(self) -> bool:
+        """ Get the status of server-client connection
+
+        Returns: boolean indicating connection status
+        """
+        return self.__is_alive

{ibm_appconfiguration_python_sdk-0.3.6 → ibm_appconfiguration_python_sdk-0.3.8}/ibm_appconfiguration/configurations/models/rule.py

@@ -45,18 +45,30 @@ class Rule:
     def __ends_with(self, key, value) -> bool:
         return key.endswith(value)
 
+    def __not_ends_with(self, key, value) -> bool:
+        return not key.endswith(value)
+
     def __starts_with(self, key, value) -> bool:
         return key.startswith(value)
 
+    def __not_starts_with(self, key, value) -> bool:
+        return not key.startswith(value)
+
     def __contains(self, key, value) -> bool:
         return value in key
 
+    def __not_contains(self, key, value) -> bool:
+        return not value in key
+
     def __is(self, key, value) -> bool:
         if type(key) is type(value):
             return key == value
-        if str(key) == str(value):
-            return True
-        return False
+        return str(key) == str(value)
+
+    def __is_not(self, key, value) -> bool:
+        if type(key) is type(value):
+            return key != value
+        return str(key) != str(value)
 
     def __greater_than(self, key, value) -> bool:
 
@@ -102,9 +114,13 @@ class Rule:
 
         case_checker = {
             "endsWith": self.__ends_with,
+            "notEndsWith": self.__not_ends_with,
             "startsWith": self.__starts_with,
+            "notStartsWith": self.__not_starts_with,
             "contains": self.__contains,
+            "notContains": self.__not_contains,
             "is": self.__is,
+            "isNot": self.__is_not,
             "greaterThan": self.__greater_than,
             "lesserThan": self.__lesser_than,
             "greaterThanEquals": self.__greater_than_equals,
@@ -130,9 +146,17 @@ class Rule:
             key = entity_attributes.get(self.__attribute_name)
         else:
             return result
-        for i in range(0, len(self.__values)):
-            value = self.__values[i]
-            if self.__operator_check(key, value):
-                result = True
+
+        if self.__operator in ["isNot", "notContains", "notStartsWith", "notEndsWith"]:
+            result = True
+            for i in range(0, len(self.__values)):
+                value = self.__values[i]
+                if not self.__operator_check(key, value):
+                    result = False
+        else:
+            for i in range(0, len(self.__values)):
+                value = self.__values[i]
+                if self.__operator_check(key, value):
+                    result = True
 
         return result

{ibm_appconfiguration_python_sdk-0.3.6 → ibm_appconfiguration_python_sdk-0.3.8}/ibm_appconfiguration/version.py

@@ -15,4 +15,4 @@
 """
 Version of ibm-appconfiguration-python-sdk
 """
-__version__ = '0.3.6'
+__version__ = '0.3.8'

{ibm_appconfiguration_python_sdk-0.3.6 → ibm_appconfiguration_python_sdk-0.3.8/ibm_appconfiguration_python_sdk.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: ibm-appconfiguration-python-sdk
-Version: 0.3.6
+Version: 0.3.8
 Summary: IBM Cloud App Configuration Python SDK
 Home-page: https://github.com/IBM/appconfiguration-python-sdk
 Author: IBM
@@ -21,6 +21,18 @@ Requires-Dist: ibm-cloud-sdk-core<4.0.0,>=3.20.3
 Requires-Dist: pyyaml>=5.4.1
 Requires-Dist: schema>=0.7.5
 Requires-Dist: mmh3==5.0.1
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 # IBM Cloud App Configuration Python server SDK
 
@@ -74,12 +86,7 @@ The **`init()`** and **`set_context()`** are the initialisation methods and shou
 appconfig_client. The appconfig_client, once initialised, can be obtained across modules
 using **`AppConfiguration.get_instance()`**.  [See this example below](#fetching-the-appconfig_client-across-other-modules).
 
-- region : Region name where the App Configuration service instance is created. Use
-  - `AppConfiguration.REGION_US_SOUTH` for Dallas
-  - `AppConfiguration.REGION_EU_GB` for London
-  - `AppConfiguration.REGION_AU_SYD` for Sydney
-  - `AppConfiguration.REGION_US_EAST` for Washington DC
-  - `AppConfiguration.REGION_EU_DE` for Frankfurt
+- region : Region name where the App Configuration service instance is created. See list of supported locations [here](https://cloud.ibm.com/catalog/services/app-configuration). Eg:- `us-south`, `au-syd` etc.
 - guid : GUID of the App Configuration service. Obtain it from the service credentials section of the dashboard
 - apikey : ApiKey of the App Configuration service. Obtain it from the service credentials section of the dashboard
 - collection_id : Id of the collection created in App Configuration service instance under the **Collections** section.

{ibm_appconfiguration_python_sdk-0.3.6 → ibm_appconfiguration_python_sdk-0.3.8}/setup.py

@@ -12,7 +12,7 @@
 from setuptools import setup, find_packages
 
 NAME = "ibm-appconfiguration-python-sdk"
-VERSION = "0.3.6"
+VERSION = "0.3.8"
 # To install the library, run the following
 #
 # python setup.py install

{ibm_appconfiguration_python_sdk-0.3.6 → ibm_appconfiguration_python_sdk-0.3.8}/unit_tests/configurations/models/test_rule.py

@@ -56,6 +56,17 @@ class MyTestCase(unittest.TestCase):
         }
         self.assertFalse(self.sut.evaluate_rule(client_attributes))
 
+    def test_evaluation_not_ends_with_string(self):
+        self.set_up_email('google.com', 'email', 'notEndsWith')
+        client_attributes = {
+            'email': 'tester@in.ibm.com'
+        }
+        self.assertTrue(self.sut.evaluate_rule(client_attributes))
+        client_attributes = {
+            'email': 'tester@google.com'
+        }
+        self.assertFalse(self.sut.evaluate_rule(client_attributes))
+
     def test_evaluation_is(self):
         self.set_up_email("123", "creditValues", "is")
         client_attributes = {
@@ -99,6 +110,31 @@ class MyTestCase(unittest.TestCase):
         self.set_up_email(False, "creditValues", "is")
         self.assertTrue(self.sut.evaluate_rule(client_attributes))
 
+    def test_evaluation_is_not(self):
+        self.set_up_email("123", "creditValues", "isNot")
+        client_attributes = {
+            'creditValues': '1234'
+        }
+        self.assertTrue(self.sut.evaluate_rule(client_attributes))
+
+        self.set_up_email("1234", "creditValues", "isNot")
+        client_attributes = {
+            'creditValues': 123
+        }
+        self.assertTrue(self.sut.evaluate_rule(client_attributes))
+
+        client_attributes = {
+            'creditValues': 123
+        }
+        self.set_up_email(5123, "creditValues", "isNot")
+        self.assertTrue(self.sut.evaluate_rule(client_attributes))
+
+        client_attributes = {
+            'creditValues': False
+        }
+        self.set_up_email(True, "creditValues", "isNot")
+        self.assertTrue(self.sut.evaluate_rule(client_attributes))
+
     def test_evaluation_startswith(self):
         self.set_up_email('user1', 'email', 'startsWith')
         client_attributes = {
@@ -106,6 +142,13 @@ class MyTestCase(unittest.TestCase):
         }
         self.assertTrue(self.sut.evaluate_rule(client_attributes))
 
+    def test_evaluation_not_startswith(self):
+        self.set_up_email('user2', 'email', 'notStartsWith')
+        client_attributes = {
+            'email': 'user1@gm.com'
+        }
+        self.assertTrue(self.sut.evaluate_rule(client_attributes))
+
     def test_evaluation_contains(self):
         self.set_up_email('+91', 'mobile', 'contains')
         client_attributes = {
@@ -118,6 +161,18 @@ class MyTestCase(unittest.TestCase):
         }
         self.assertFalse(self.sut.evaluate_rule(client_attributes))
 
+    def test_evaluation_not_contains(self):
+        self.set_up_email('+91', 'mobile', 'notContains')
+        client_attributes = {
+            'mobile': '+81xxxxxxxxxx'
+        }
+        self.assertTrue(self.sut.evaluate_rule(client_attributes))
+
+        client_attributes = {
+            'mobile': '+91xxxxxxxxxx'
+        }
+        self.assertFalse(self.sut.evaluate_rule(client_attributes))
+
     def evaluation_common(self, type, val1, val2):
         self.set_up_email(val1, 'balance', type)
         client_attributes = {