Add bool to controller get project - to control if getting segmented

Author: dingusdk

ihcsdk/ihcclient.py

@@ -1,6 +1,7 @@
 """
 Implements the connection to the ihc controller
 """
+
 # pylint: disable=bare-except
 import base64
 import datetime
@@ -112,7 +113,7 @@ def get_project_in_segments(self, info=None) -> str:
         """Get the ihc project per segments.
         Param: info .. reuse existing project info. If not provided, the get_project_info() is called internally.
         """
-        if info == None:
+        if info is None:
             info = self.get_project_info()
         if info:
             projectMajor = info.get("projectMajorRevision", 0)
@@ -355,8 +356,8 @@ def __get_value(resource_value):
             "WSIntegerValue": lambda v: int(
                 v.find("./ns2:integer", IHCSoapClient.ihcns).text
             ),
-            "WSFloatingPointValue": lambda v: round( 
-                float( v.find("./ns2:floatingPointValue", IHCSoapClient.ihcns).text),2
+            "WSFloatingPointValue": lambda v: round(
+                float(v.find("./ns2:floatingPointValue", IHCSoapClient.ihcns).text), 2
             ),
             "WSEnumValue": lambda v: v.find("./ns2:enumName", IHCSoapClient.ihcns).text,
             "WSTimerValue": lambda v: int(
@@ -476,7 +477,7 @@ def wait_for_resource_value_changes(self, wait: int = 10):
         if change_list is False:
             return False
         last_changes = {}
-        for (id, value) in change_list:
+        for id, value in change_list:
             last_changes[id] = value
         return last_changes
 

ihcsdk/ihccontroller.py

@@ -2,17 +2,18 @@
 Wraps the ihcclient in a more user friendly interface to handle lost connection
 Notify thread to handle change notifications
 """
+
 # pylint: disable=invalid-name, bare-except, too-many-instance-attributes
 from datetime import datetime, timedelta
 import logging
 import requests
-import sys
 import threading
 import time
 from ihcsdk.ihcclient import IHCSoapClient, IHCSTATE_READY
 
 _LOGGER = logging.getLogger(__name__)
 
+
 class IHCController:
     """
     Implements the notification thread and
@@ -49,17 +50,17 @@ def is_ihc_controller(url: str) -> bool:
                 return False
             return True
         except requests.exceptions.RequestException as exp:
-            _LOGGER.warning( "is_ihc_controller %s",exp)
+            _LOGGER.warning("is_ihc_controller %s", exp)
             return False
 
     def authenticate(self) -> bool:
         """Authenticate and enable the registered notifications"""
         with IHCController._mutex:
-            _LOGGER.debug( "Authenticating login on ihc controller")
+            _LOGGER.debug("Authenticating login on ihc controller")
             if not self.client.authenticate(self._username, self._password):
-                _LOGGER.debug( "Authentication failed")
+                _LOGGER.debug("Authentication failed")
                 return False
-            _LOGGER.debug( "Authentication was successful")
+            _LOGGER.debug("Authentication was successful")
             if self._ihcevents:
                 self.client.enable_runtime_notifications(self._ihcevents.keys())
             return True
@@ -131,15 +132,18 @@ def set_runtime_value_time(
         self.re_authenticate()
         return self.client.set_runtime_value_time(ihcid, hours, minutes, seconds)
 
-    def get_project(self) -> str:
+    def get_project(self, insegments: bool = True) -> str:
         """Get the ihc project and make sure controller is ready before"""
         with IHCController._mutex:
             if self._project is None:
                 if self.client.get_state() != IHCSTATE_READY:
                     ready = self.client.wait_for_state_change(IHCSTATE_READY, 10)
                     if ready != IHCSTATE_READY:
                         return None
-                self._project = self.client.get_project_in_segments()
+                if insegments:
+                    self._project = self.client.get_project_in_segments()
+                else:
+                    self._project = self.client.get_project()
         return self._project
 
     def add_notify_event(self, resourceid: int, callback, delayed=False):
@@ -165,7 +169,7 @@ def add_notify_event(self, resourceid: int, callback, delayed=False):
 
     def _notify_fn(self):
         """The notify thread function."""
-        _LOGGER.debug( "Starting notify thread")
+        _LOGGER.debug("Starting notify thread")
         while self._notifyrunning:
             try:
                 with IHCController._mutex:
@@ -178,7 +182,7 @@ def _notify_fn(self):
                 if changes is False:
                     self.re_authenticate(True)
                     continue
-                for (ihcid, value) in changes:
+                for ihcid, value in changes:
                     if ihcid in self._ihcevents:
                         for callback in self._ihcevents[ihcid]:
                             if (
@@ -188,7 +192,7 @@ def _notify_fn(self):
                                 callback(ihcid, value)
                             self._ihcvalues[ihcid] = value
             except Exception as exp:
-                _LOGGER.error( "Exception in notify thread %s",exp)
+                _LOGGER.error("Exception in notify thread %s", exp)
                 self.re_authenticate(True)
 
     def re_authenticate(self, notify: bool = False) -> bool:
@@ -200,10 +204,12 @@ def re_authenticate(self, notify: bool = False) -> bool:
         """
         timeout = datetime.now() + timedelta(seconds=self.reauthenticatetimeout)
         while True:
-            _LOGGER.debug( "Reauthenticating login on ihc controller")
+            _LOGGER.debug("Reauthenticating login on ihc controller")
             if self.authenticate():
                 return True
-            _LOGGER.debug( "Authenticate failed - Reauthenticating login on ihc controller in 10 sec")
+            _LOGGER.debug(
+                "Authenticate failed - Reauthenticating login on ihc controller in 10 sec"
+            )
 
             # if called from the notify and notify a cancled we do not want to retry
             if notify: