ibm-appconfiguration-python-sdk 0.3.7__tar.gz → 0.3.9__tar.gz

{ibm_appconfiguration_python_sdk-0.3.7/ibm_appconfiguration_python_sdk.egg-info → ibm_appconfiguration_python_sdk-0.3.9}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: ibm-appconfiguration-python-sdk
-Version: 0.3.7
+Version: 0.3.9
 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,15 +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
-  - `AppConfiguration.REGION_CA_TOR` for Toronto
-  - `AppConfiguration.REGION_JP_TOK` for Tokyo
-  - `AppConfiguration.REGION_JP_OSA` for Osaka
+- 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.7 → ibm_appconfiguration_python_sdk-0.3.9}/README.md

@@ -50,15 +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
-  - `AppConfiguration.REGION_CA_TOR` for Toronto
-  - `AppConfiguration.REGION_JP_TOK` for Tokyo
-  - `AppConfiguration.REGION_JP_OSA` for Osaka
+- 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.7 → ibm_appconfiguration_python_sdk-0.3.9}/ibm_appconfiguration/appconfiguration.py

@@ -298,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.7 → ibm_appconfiguration_python_sdk-0.3.9}/ibm_appconfiguration/configurations/configuration_handler.py

@@ -15,11 +15,14 @@
 """
 Internal class to handle the configuration.
 """
+import json
 import os
 from typing import Dict, List, Any
 from threading import Timer, Thread
 from ibm_appconfiguration.configurations.internal.common import config_messages, config_constants
+from ibm_appconfiguration.version import __version__
 from .internal.utils.logger import Logger
+from .internal.utils.parser import extract_configurations, format_config
 from .internal.utils.validators import Validators
 from .models import Feature
 from .models import SegmentRules
@@ -46,6 +49,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. """
@@ -144,7 +150,9 @@ class ConfigurationHandler:
             self.__persistent_data = FileManager.read_files(
                 file_path=os.path.join(self.__persistent_cache_dir, 'appconfiguration.json'))
             if self.__persistent_data is not None:
-                self.__load_configurations(self.__persistent_data)
+                self.__load_configurations(
+                    extract_configurations(self.__persistent_data, self.__environment_id, self.__collection_id)
+                )
             if not os.access(self.__persistent_cache_dir, os.W_OK):
                 Logger.error(config_messages.ERROR_NO_WRITE_PERMISSION)
                 return
@@ -153,11 +161,13 @@ class ConfigurationHandler:
                 if self.__persistent_data is None or len(self.__persistent_data) == 0:
                     bootstrap_file_data = FileManager.read_files(file_path=self.__bootstrap_file)
                     if bootstrap_file_data is not None:
-                        self.__load_configurations(bootstrap_file_data)
+                        configurations = extract_configurations(bootstrap_file_data, self.__environment_id, self.__collection_id)
+                        self.__load_configurations(configurations)
+                        self.__write_to_persistent_storage(format_config(configurations, self.__environment_id, self.__collection_id),
+                            self.__persistent_cache_dir)
                     else:
                         Logger.error("Error reading bootstrap file data")
                         return
-                    self.__write_to_persistent_storage(bootstrap_file_data, self.__persistent_cache_dir)
                     if self.__configuration_update_listener and callable(self.__configuration_update_listener):
                         self.__configuration_update_listener()
                 else:
@@ -166,7 +176,9 @@ class ConfigurationHandler:
             else:
                 bootstrap_file_data = FileManager.read_files(file_path=self.__bootstrap_file)
                 if bootstrap_file_data is not None:
-                    self.__load_configurations(bootstrap_file_data)
+                    self.__load_configurations(
+                        extract_configurations(bootstrap_file_data, self.__environment_id, self.__collection_id)
+                    )
                 else:
                     Logger.error("Error reading bootstrap file data")
                     return
@@ -268,7 +280,8 @@ class ConfigurationHandler:
     def __start_web_socket(self):
         bearer_token = URLBuilder.get_iam_authenticator().token_manager.get_token()
         headers = {
-            'Authorization': 'Bearer ' + bearer_token
+            'Authorization': 'Bearer ' + bearer_token,
+            'User-Agent': '{0}/{1}'.format(config_constants.SDK_NAME, __version__)
         }
         if self.__socket:
             self.__socket.cancel()
@@ -475,8 +488,8 @@ class ConfigurationHandler:
                 Logger.debug(err)
         return rule_map
 
-    def __write_to_persistent_storage(self, json: dict, file_path: str):
-        FileManager.store_files(json, os.path.join(file_path, 'appconfiguration.json'))
+    def __write_to_persistent_storage(self, data: str, file_path: str):
+        FileManager.store_files(json.dumps(json.loads(data), indent=2), os.path.join(file_path, 'appconfiguration.json'))
 
     def __fetch_from_api(self):
         if self.__is_initialized:
@@ -503,8 +516,8 @@ class ConfigurationHandler:
                 Logger.info(config_messages.CONFIGURATIONS_FETCH_SUCCESS)
                 response_data = response.get_result()
                 try:
-                    response_data = dict(response_data)
-                    self.__load_configurations(response_data)  # load response to cache maps
+                    configurations = extract_configurations(json.dumps(response_data), self.__environment_id, self.__collection_id)
+                    self.__load_configurations(configurations)  # load response to cache maps
                     if self.__configuration_update_listener and callable(self.__configuration_update_listener):
                         self.__configuration_update_listener()
                     # we have already loaded the configurations to feature & property dicts.
@@ -512,7 +525,7 @@ class ConfigurationHandler:
                     # But the thread shouldn't be a daemon thread, because the writing should complete even if the main thread has terminated.
                     if self.__persistent_cache_dir:
                         file_write_thread = Thread(target=self.__write_to_persistent_storage,
-                                                   args=(response_data, self.__persistent_cache_dir,))
+                            args=(format_config(configurations, self.__environment_id, self.__collection_id), self.__persistent_cache_dir))
                         file_write_thread.start()
                 except Exception as exception:
                     Logger.error(f'error while while fetching {exception}')
@@ -538,24 +551,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.7 → ibm_appconfiguration_python_sdk-0.3.9}/ibm_appconfiguration/configurations/internal/utils/file_manager.py

@@ -18,8 +18,7 @@ file based cache of the SDK.
 """
 
 import fcntl
-import json
-from typing import Optional, Any
+from typing import Optional
 
 from .logger import Logger
 
@@ -28,17 +27,17 @@ class FileManager:
     """FileManager to handle the cache"""
 
     @classmethod
-    def store_files(cls, json_data: {}, file_path: str) -> bool:
+    def store_files(cls, data: str, file_path: str) -> bool:
         """Store the file
 
         Args:
-            json_data: Data to be stored.
+            data: Data to be stored.
             file_path: File path for the cache.
         """
         try:
             with open(file_path, 'w') as cache:
                 fcntl.flock(cache, fcntl.LOCK_EX | fcntl.LOCK_NB)
-                json.dump(json_data, cache)
+                cache.write(data)
                 fcntl.flock(cache, fcntl.LOCK_UN)
                 return True
         except Exception as err:
@@ -46,7 +45,7 @@ class FileManager:
             return False
 
     @classmethod
-    def read_files(cls, file_path: str) -> Optional[Any]:
+    def read_files(cls, file_path: str) -> Optional[str]:
         """
         Read the data from the given path.
 
@@ -59,9 +58,9 @@ class FileManager:
         try:
             with open(file_path, 'r') as file:
                 fcntl.flock(file, fcntl.LOCK_EX | fcntl.LOCK_NB)
-                data = json.load(file)
+                data = file.read()
                 fcntl.flock(file, fcntl.LOCK_UN)
-                return data
+                return data if len(data) > 0 else None
         except Exception as err:
             Logger.error(err)
             return None

ibm_appconfiguration_python_sdk-0.3.9/ibm_appconfiguration/configurations/internal/utils/parser.py

@@ -0,0 +1,149 @@
+import json
+from typing import Any, Dict, List, Set
+
+
+def extract_environment_data(data: Dict[str, Any], environment_id: str) -> Dict[str, Any]:
+    """
+    Prepares config data for extraction with validation.
+
+    :param data: The full JSON configuration as a dictionary.
+    :param environment_id: The environment ID to extract.
+    :return: A dictionary containing 'features', 'properties', and 'segments'.
+    :raises: Exception if the format is invalid or environment not found.
+    """
+    if not isinstance(data.get("segments"), list) or not isinstance(data.get("environments"), list):
+        raise Exception("Improper Data format present in configuration")
+
+    for environment in data["environments"]:
+        if environment.get("environment_id") == environment_id:
+            return {
+                "features": environment.get("features", []),
+                "properties": environment.get("properties", []),
+                "segments": data["segments"]
+            }
+
+    raise Exception("Matching environment not found in configuration")
+
+
+def validate_resource(resource: Dict[str, Any], collection: str) -> bool:
+    """
+    Validates if the feature/property belongs to the given collection.
+
+    :param resource: The feature or property dictionary.
+    :param collection: The collection ID to match.
+    :return: True if valid, False otherwise.
+    :raises: Exception if collection format is invalid.
+    """
+    if "collections" not in resource:
+        return True
+
+    collections = resource["collections"]
+    if not isinstance(collections, list):
+        raise Exception("Improper collection format in resource data")
+
+    for col in collections:
+        if col.get("collection_id") == collection:
+            return True
+
+    return False
+
+
+def append_segment_ids(resource: Dict[str, Any], segment_ids: Set[str]):
+    """
+    Appends segment IDs from the resource's segment rules into the given set.
+
+    :param resource: The feature or property dictionary.
+    :param segment_ids: A set to accumulate segment IDs.
+    """
+    for segment_rule in resource.get("segment_rules", []):
+        for rule in segment_rule.get("rules", []):
+            for segment_id in rule.get("segments", []):
+                segment_ids.add(segment_id)
+
+
+def extract_resources(resource_data: Dict[str, Any], collection: str) -> Dict[str, List[Any]]:
+    """
+    Extracts features, properties, and segments after validation.
+
+    :param resource_data: The environment-specific data.
+    :param collection: The collection ID to validate against.
+    :return: A dictionary with keys 'features', 'properties', and 'segments'.
+    :raises: Exception if any required segment is missing.
+    """
+    features = []
+    properties = []
+    segments = []
+    required_segment_ids = set()
+
+    for feature in resource_data.get("features", []):
+        if validate_resource(feature, collection):
+            append_segment_ids(feature, required_segment_ids)
+            features.append(feature)
+
+    for property_ in resource_data.get("properties", []):
+        if validate_resource(property_, collection):
+            append_segment_ids(property_, required_segment_ids)
+            properties.append(property_)
+
+    available_segments = resource_data.get("segments", [])
+    for segment in available_segments:
+        if segment.get("segment_id") in required_segment_ids:
+            segments.append(segment)
+            required_segment_ids.remove(segment.get("segment_id"))
+
+    if len(required_segment_ids) > 0:
+        raise Exception(f"Required segment doesn't exist in provided segments")
+
+    return {
+        "features": features,
+        "properties": properties,
+        "segments": segments
+    }
+
+
+def extract_configurations(data: str, environment: str, collection: str) -> Dict[str, List[Any]]:
+    """
+    Unified parser for app-config data for new SDK/export/promote format.
+
+    :param data: Raw JSON string of the config.
+    :param environment: The environment ID.
+    :param collection: The collection ID.
+    :return: A dictionary with 'features', 'properties', and 'segments'.
+    :raises: Exception on any validation or format error.
+    """
+    try:
+        configurations = json.loads(data)
+
+        if "collections" not in configurations or not isinstance(configurations["collections"], list):
+            raise Exception("Improper/Missing collections in configuration")
+
+        if not any(col.get("collection_id") == collection for col in configurations["collections"]):
+            raise Exception("Required collection not found in collections")
+
+        config_data = extract_environment_data(configurations, environment)
+        return extract_resources(config_data, collection)
+
+    except Exception as e:
+        raise Exception(f"Extraction of configurations failed with error:\n {str(e)}")
+
+
+def format_config(res: Dict[str, List[Any]], environment_id: str, collection_id: str) -> str:
+    """
+    Formats the extracted resources into unified config format.
+
+    :param res: The extracted config (from `extract_configurations`).
+    :param environment_id: The environment ID to include.
+    :param collection_id: The collection ID to include.
+    :return: A formatted configuration dictionary.
+    """
+    return json.dumps({
+        "environments": [
+            {
+                "environment_id": environment_id,
+                "features": res.get("features", []),
+                "properties": res.get("properties", [])
+            }
+        ],
+        "collections": [{"collection_id": collection_id}],
+        "segments": res.get("segments", [])
+    })

{ibm_appconfiguration_python_sdk-0.3.7 → ibm_appconfiguration_python_sdk-0.3.9}/ibm_appconfiguration/configurations/internal/utils/url_builder.py

@@ -84,12 +84,12 @@ class URLBuilder:
                     cls.__iam_url = "https://iam.cloud.ibm.com"
                     cls.__web_socket_base = cls.__wss + region + cls.__base_url
 
-            cls.__config_path = '{0}{1}{2}/collections/{3}/{4}?environment_id={5}'.format(
+            cls.__config_path = '{0}{1}{2}/{3}?action=sdkConfig&collection_id={4}&environment_id={5}'.format(
                 cls.__service,
                 cls.__feature_path,
                 guid,
-                collection_id,
                 cls.__config,
+                collection_id,
                 environment_id)
             cls.__metering_path = '{0}{1}{2}/usage'.format(cls.__service,
                                                            cls.__events_path,

{ibm_appconfiguration_python_sdk-0.3.7 → ibm_appconfiguration_python_sdk-0.3.9}/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.7 → ibm_appconfiguration_python_sdk-0.3.9}/ibm_appconfiguration/version.py

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

{ibm_appconfiguration_python_sdk-0.3.7 → ibm_appconfiguration_python_sdk-0.3.9/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.7
+Version: 0.3.9
 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,15 +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
-  - `AppConfiguration.REGION_CA_TOR` for Toronto
-  - `AppConfiguration.REGION_JP_TOK` for Tokyo
-  - `AppConfiguration.REGION_JP_OSA` for Osaka
+- 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.7 → ibm_appconfiguration_python_sdk-0.3.9}/ibm_appconfiguration_python_sdk.egg-info/SOURCES.txt

@@ -20,6 +20,7 @@ ibm_appconfiguration/configurations/internal/utils/connectivity.py
 ibm_appconfiguration/configurations/internal/utils/file_manager.py
 ibm_appconfiguration/configurations/internal/utils/logger.py
 ibm_appconfiguration/configurations/internal/utils/metering.py
+ibm_appconfiguration/configurations/internal/utils/parser.py
 ibm_appconfiguration/configurations/internal/utils/socket.py
 ibm_appconfiguration/configurations/internal/utils/url_builder.py
 ibm_appconfiguration/configurations/internal/utils/validators.py

{ibm_appconfiguration_python_sdk-0.3.7 → ibm_appconfiguration_python_sdk-0.3.9}/setup.py

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

{ibm_appconfiguration_python_sdk-0.3.7 → ibm_appconfiguration_python_sdk-0.3.9}/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 = {

{ibm_appconfiguration_python_sdk-0.3.7 → ibm_appconfiguration_python_sdk-0.3.9}/unit_tests/configurations/test_configuration_handler.py

@@ -38,7 +38,7 @@ class MyTestCase(unittest.TestCase):
             'bootstrap_file': FILE,
             'live_config_update_enabled': False
         }
-        self.sut.set_context("collectionId", "environmentId", options)
+        self.sut.set_context("collection", "dev", options)
         self.sut.load_data()
         time.sleep(2.5)
 
@@ -48,34 +48,44 @@ class MyTestCase(unittest.TestCase):
     def test_load_from_web(self):
         Metering.get_instance().set_repeat_calls(False)
         mock_response = '''
-            {
-                "features": [
-                    {
-                        "name": "featurestring",
-                        "feature_id": "featurestring",
-                        "type": "STRING",
-                        "enabled_value": "Hello",
-                        "disabled_value": "Hi",
-                        "segment_rules": [],
-                        "enabled": true
-                    }
-                ],
-                "properties": [
-                    {
-                        "name": "numericproperty",
-                        "property_id": "numericproperty",
-                        "tags": "",
-                        "type": "NUMERIC",
-                        "value": 30,
-                        "segment_rules": [],
-                        "created_time": "2021-05-23T08:00:56Z",
-                        "updated_time": "2021-05-23T08:00:56Z"
-                    }
-                ],
-                "segments": []
-            }
+        {
+            "environments": [
+                {
+                    "name": "Dev",
+                    "environment_id": "dev",
+                    "features": [
+                        {
+                            "name": "featurestring",
+                            "feature_id": "featurestring",
+                            "type": "STRING",
+                            "enabled_value": "Hello",
+                            "disabled_value": "Hi",
+                            "segment_rules": [],
+                            "enabled": true
+                        }
+                    ],
+                    "properties": [
+                        {
+                            "name": "numericproperty",
+                            "property_id": "numericproperty",
+                            "tags": "",
+                            "type": "NUMERIC",
+                            "value": 30,
+                            "segment_rules": []
+                        }
+                    ]
+                }
+            ],
+            "collections": [
+                {
+                    "name": "Collection",
+                    "collection_id": "collection"
+                }
+            ],
+            "segments": []
+        }
         '''
-        url = 'https://region.apprapp.cloud.ibm.com/apprapp/feature/v1/instances/guid/collections/collection_id/config?environment_id=environment_id'
+        url = 'https://region.apprapp.cloud.ibm.com/apprapp/feature/v1/instances/guid/config?action=sdkConfig&collection_id=collection&environment_id=dev'
         self.responses.add(responses.GET,
                            url,
                            body=mock_response,
@@ -87,7 +97,7 @@ class MyTestCase(unittest.TestCase):
             'bootstrap_file': None,
             'live_config_update_enabled': True
         }
-        self.sut.set_context("collection_id", "environment_id", options)
+        self.sut.set_context("collection", "dev", options)
         self.sut.load_data()
         features = self.sut.get_features()
         self.assertEqual(len(features), 1)
@@ -178,54 +188,63 @@ class MyTestCase(unittest.TestCase):
         Metering.get_instance().set_repeat_calls(False)
         mock_response = '''
             {
-                "features": [
+                "environments": [
                     {
-                        "name": "yamlFeature",
-                        "feature_id": "yamlFeature",
-                        "type": "STRING",
-                        "format": "YAML",
-                        "enabled_value": "value: enabled",
-                        "disabled_value": "value: disabled",
-                        "segment_rules": [
+                        "name": "Dev",
+                        "environment_id": "dev",
+                        "features": [
                             {
-                                "rules": [
+                                "name": "yamlFeature",
+                                "feature_id": "yamlFeature",
+                                "type": "STRING",
+                                "format": "YAML",
+                                "enabled_value": "value: enabled",
+                                "disabled_value": "value: disabled",
+                                "segment_rules": [
                                     {
-                                        "segments": [
-                                            "reqbody"
-                                        ]
+                                        "rules": [
+                                            {
+                                                "segments": [
+                                                    "reqbody"
+                                                ]
+                                            }
+                                        ],
+                                        "value": "value: targeted",
+                                        "order": 1
                                     }
                                 ],
-                                "value": "value: targeted",
-                                "order": 1
+                                "enabled": true
                             }
                         ],
-                        "enabled": true
-                    }
-                ],
-                "properties": [
-                    {
-                        "name": "yamlProperty",
-                        "property_id": "yamlProperty",
-                        "tags": "",
-                        "type": "STRING",
-                        "format": "YAML",
-                        "value": "value: enabled",
-                        "segment_rules": [
+                        "properties": [
                             {
-                                "rules": [
+                                "name": "yamlProperty",
+                                "property_id": "yamlProperty",
+                                "tags": "",
+                                "type": "STRING",
+                                "format": "YAML",
+                                "value": "value: enabled",
+                                "segment_rules": [
                                     {
-                                        "segments": [
-                                            "reqbody"
-                                        ]
+                                        "rules": [
+                                            {
+                                                "segments": [
+                                                    "reqbody"
+                                                ]
+                                            }
+                                        ],
+                                        "value": "value: targeted",
+                                        "order": 1
                                     }
-                                ],
-                                "value": "value: targeted",
-                                "order": 1
+                                ]                                
                             }
-                        
-                        ],
-                        "created_time": "2021-05-23T08:00:56Z",
-                        "updated_time": "2021-05-23T08:00:56Z"
+                        ]
+                    }
+                ],
+                "collections": [
+                    {
+                        "name": "Collection",
+                        "collection_id": "collection"
                     }
                 ],
                 "segments": [
@@ -245,7 +264,7 @@ class MyTestCase(unittest.TestCase):
                 ]
             }
         '''
-        url = 'https://region.apprapp.cloud.ibm.com/apprapp/feature/v1/instances/guid/collections/collection_id/config?environment_id=environment_id'
+        url = 'https://region.apprapp.cloud.ibm.com/apprapp/feature/v1/instances/guid/config?action=sdkConfig&collection_id=collection&environment_id=dev'
         self.responses.add(responses.GET,
                            url,
                            body=mock_response,
@@ -257,7 +276,7 @@ class MyTestCase(unittest.TestCase):
             'bootstrap_file': None,
             'live_config_update_enabled': True
         }
-        self.sut.set_context("collection_id", "environment_id", options)
+        self.sut.set_context("collection", "dev", options)
         self.sut.load_data()
         features = self.sut.get_features()
         properties = self.sut.get_properties()

{ibm_appconfiguration_python_sdk-0.3.7 → ibm_appconfiguration_python_sdk-0.3.9}/unit_tests/configurations/utils/test_api_manager.py

@@ -41,8 +41,19 @@ class MyTestCase(unittest.TestCase):
         self.api_manager = APIManager.get_instance()
 
     def test_get_call(self):
-        mock_response = '{ "features": [], "properties": [], "segments": []}'
-        url = 'https://region.apprapp.cloud.ibm.com/apprapp/feature/v1/instances/guid/collections/collection_id/config?environment_id=environment_id'
+        mock_response = '''
+        {
+            "environments": [
+                {
+                    "features": [], 
+                    "properties": []
+                }
+            ],
+            "collections": [],
+            "segments": []
+        }
+        '''
+        url = 'https://region.apprapp.cloud.ibm.com/apprapp/feature/v1/instances/guid/config?action=sdkConfig&collection_id=collection_id&environment_id=environment_id'
         self.responses.add(responses.GET,
                            url,
                            body=mock_response,
@@ -50,7 +61,7 @@ class MyTestCase(unittest.TestCase):
                            status=200)
 
         resp = self.api_manager.prepare_api_request(method="GET", url=URLBuilder.get_config_path())
-        self.assertEqual(resp.get_status_code(), 200)
+        self.assertEqual(200, resp.get_status_code())
 
         try:
             response_data = dict(resp.get_result())

{ibm_appconfiguration_python_sdk-0.3.7 → ibm_appconfiguration_python_sdk-0.3.9}/unit_tests/configurations/utils/test_file_manager.py

@@ -11,7 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
+import json
 import unittest
 import os
 from ibm_appconfiguration.configurations.internal.utils.file_manager import FileManager
@@ -69,7 +69,7 @@ class MyTestCase(unittest.TestCase):
                 }
             ]
         }
-        self.assertTrue(FileManager.store_files(data, self.file_path))
+        self.assertTrue(FileManager.store_files(json.dumps(data), self.file_path))
 
         expected_data = FileManager.read_files(self.file_path)
 

{ibm_appconfiguration_python_sdk-0.3.7 → ibm_appconfiguration_python_sdk-0.3.9}/unit_tests/configurations/utils/test_url_builder.py

@@ -31,7 +31,7 @@ class MyTestCase(unittest.TestCase):
         self.assertEqual(URLBuilder.get_base_url(), 'https://region.apprapp.cloud.ibm.com')
         self.assertEqual(URLBuilder.get_iam_url(), 'https://iam.cloud.ibm.com')
         self.assertEqual(URLBuilder.get_config_path(),
-                         '/apprapp/feature/v1/instances/guid/collections/collection_id/config?environment_id=environment_id')
+                         '/apprapp/feature/v1/instances/guid/config?action=sdkConfig&collection_id=collection_id&environment_id=environment_id')
         self.assertEqual(URLBuilder.get_metering_path(), '/apprapp/events/v1/instances/guid/usage')
         self.assertEqual(URLBuilder.get_web_socket_url(),
                          'wss://region.apprapp.cloud.ibm.com/apprapp/wsfeature?instance_id=guid&collection_id=collection_id&environment_id=environment_id')
@@ -48,7 +48,7 @@ class MyTestCase(unittest.TestCase):
         self.assertEqual(URLBuilder.get_base_url(), 'https://private.region.apprapp.cloud.ibm.com')
         self.assertEqual(URLBuilder.get_iam_url(), 'https://private.iam.cloud.ibm.com')
         self.assertEqual(URLBuilder.get_config_path(),
-                         '/apprapp/feature/v1/instances/guid/collections/collection_id/config?environment_id=environment_id')
+                         '/apprapp/feature/v1/instances/guid/config?action=sdkConfig&collection_id=collection_id&environment_id=environment_id')
         self.assertEqual(URLBuilder.get_metering_path(), '/apprapp/events/v1/instances/guid/usage')
         self.assertEqual(URLBuilder.get_web_socket_url(),
                          'wss://private.region.apprapp.cloud.ibm.com/apprapp/wsfeature?instance_id=guid&collection_id=collection_id&environment_id=environment_id')
@@ -65,7 +65,7 @@ class MyTestCase(unittest.TestCase):
         self.assertEqual(URLBuilder.get_base_url(), 'https://region.apprapp.test.cloud.ibm.com')
         self.assertEqual(URLBuilder.get_iam_url(), 'https://iam.test.cloud.ibm.com')
         self.assertEqual(URLBuilder.get_config_path(),
-                         '/apprapp/feature/v1/instances/guid/collections/collection_id/config?environment_id=environment_id')
+                         '/apprapp/feature/v1/instances/guid/config?action=sdkConfig&collection_id=collection_id&environment_id=environment_id')
         self.assertEqual(URLBuilder.get_metering_path(), '/apprapp/events/v1/instances/guid/usage')
         self.assertEqual(URLBuilder.get_web_socket_url(),
                          'wss://region.apprapp.test.cloud.ibm.com/apprapp/wsfeature?instance_id=guid&collection_id=collection_id&environment_id=environment_id')
@@ -82,7 +82,7 @@ class MyTestCase(unittest.TestCase):
         self.assertEqual(URLBuilder.get_base_url(), 'https://private.region.apprapp.test.cloud.ibm.com')
         self.assertEqual(URLBuilder.get_iam_url(), 'https://private.iam.test.cloud.ibm.com')
         self.assertEqual(URLBuilder.get_config_path(),
-                         '/apprapp/feature/v1/instances/guid/collections/collection_id/config?environment_id=environment_id')
+                         '/apprapp/feature/v1/instances/guid/config?action=sdkConfig&collection_id=collection_id&environment_id=environment_id')
         self.assertEqual(URLBuilder.get_metering_path(), '/apprapp/events/v1/instances/guid/usage')
         self.assertEqual(URLBuilder.get_web_socket_url(),
                          'wss://private.region.apprapp.test.cloud.ibm.com/apprapp/wsfeature?instance_id=guid&collection_id=collection_id&environment_id=environment_id')

{ibm_appconfiguration_python_sdk-0.3.7 → ibm_appconfiguration_python_sdk-0.3.9}/unit_tests/test_appconfiguration.py

@@ -72,7 +72,7 @@ class MyTestCase(unittest.TestCase):
         sut1.enable_debug(True)
 
         FILE = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'user.json')
-        sut1.set_context("collectionId", "environmentId", configuration_file=FILE, live_config_update_enabled=False)
+        sut1.set_context("collection", "dev", configuration_file=FILE, live_config_update_enabled=False)
         time.sleep(2.5)
 
         self.assertEqual(len(sut1.get_features()), 3)