ihcsdk 2.8.7__tar.gz → 2.8.9__tar.gz

{ihcsdk-2.8.7 → ihcsdk-2.8.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ihcsdk
-Version: 2.8.7
+Version: 2.8.9
 Summary: IHC Python SDK
 Home-page: https://github.com/dingusdk/PythonIhcSdk
 Author: Jens Nielsen

{ihcsdk-2.8.7 → ihcsdk-2.8.9}/ihcsdk/ihcclient.py

@@ -120,7 +120,10 @@ class IHCSoapClient:
             projectMinor = info.get("projectMinorRevision", 0)
             buffer = io.BytesIO()
             for s in range(self.get_project_number_of_segments()):
-                buffer.write(self.get_project_segment(s, projectMajor, projectMinor))
+                segment = self.get_project_segment(s, projectMajor, projectMinor)
+                if segment is False:
+                    return False
+                buffer.write(segment)
             return zlib.decompress(buffer.getvalue(), 16 + zlib.MAX_WBITS).decode(
                 "ISO-8859-1"
             )
@@ -343,32 +346,31 @@ class IHCSoapClient:
 
     def __get_value(resource_value):
         """Get a runtime value from the xml base on the type in the xml"""
-        if resource_value == None:
+        if resource_value is None:
             return None
         valuetype = resource_value.attrib[
             "{http://www.w3.org/2001/XMLSchema-instance}type"
         ].split(":")[1]
-        default_fn = lambda v: v.text
-        result = {
-            "WSBooleanValue": lambda v: (
-                v.find("./ns2:value", IHCSoapClient.ihcns).text == "true"
-            ),
-            "WSIntegerValue": lambda v: int(
-                v.find("./ns2:integer", IHCSoapClient.ihcns).text
-            ),
-            "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(
-                v.find("./ns2:milliseconds", IHCSoapClient.ihcns).text
-            ),
-            "WSTimeValue": lambda v: IHCSoapClient.get_time(v),
-            "WSDate": lambda v: IHCSoapClient.get_datetime(v),
-            "WSDateValue": lambda v: IHCSoapClient.get_date(v),
-            "int": lambda v: int(v.text),
-        }.get(valuetype, default_fn)(resource_value)
-
+        result = resource_value.text
+        match valuetype:
+            case "WSBooleanValue":
+                result = resource_value.find("./ns2:value", IHCSoapClient.ihcns).text == "true"
+            case "WSIntegerValue":
+                result = int( resource_value.find("./ns2:integer", IHCSoapClient.ihcns).text)
+            case "WSFloatingPointValue":
+                result = round(float(resource_value.find("./ns2:floatingPointValue", IHCSoapClient.ihcns).text), 2)
+            case "WSEnumValue":
+                result = resource_value.find("./ns2:enumName", IHCSoapClient.ihcns).text
+            case "WSTimerValue":
+                return int(resource_value.find("./ns2:milliseconds", IHCSoapClient.ihcns).text)
+            case "WSTimeValue":
+                result = IHCSoapClient.get_time(resource_value)
+            case "WSDate":
+                result = IHCSoapClient.get_datetime(resource_value)
+            case "WSDateValue":
+                result = IHCSoapClient.get_date(resource_value)
+            case "int":
+                result = int(resource_value.text)
         return result
 
     def get_runtime_value(self, resourceid: int):
@@ -534,9 +536,7 @@ class IHCSoapClient:
 
     def clear_user_log(self):
         """Clear the user log in the controller"""
-        xdoc = self.connection.soap_action(
-            "/ws/ConfigurationService", "clearUserLog", ""
-        )
+        self.connection.soap_action("/ws/ConfigurationService", "clearUserLog", "")
         return
 
     def get_system_info(self):

{ihcsdk-2.8.7 → ihcsdk-2.8.9}/ihcsdk/ihcconnection.py

@@ -1,13 +1,17 @@
 """Implements soap reqeust using the "requests" module"""
+
 # pylint: disable=too-few-public-methods
 import logging
 import requests
 import xml.etree.ElementTree
 
 from urllib.parse import urlparse
+from urllib3.util import Retry
+from requests.adapters import HTTPAdapter
 
 _LOGGER = logging.getLogger(__name__)
 
+
 class IHCConnection(object):
     """Implements a http connection to the controller"""
 
@@ -24,6 +28,13 @@ class IHCConnection(object):
         self.last_exception = None
         self.last_response = None
         self.session = requests.Session()
+        self.retries = Retry(
+            total=3,
+            backoff_factor=0.2,
+            status_forcelist=[502, 503, 504],
+            allowed_methods={"POST"},
+        )
+        self.session.mount("http://", HTTPAdapter(max_retries=self.retries))
 
     def cert_verify(self):
         return None
@@ -39,7 +50,7 @@ class IHCConnection(object):
             "SOAPAction": action,
         }
         try:
-            _LOGGER.debug( "soap payload %s",payload)
+            _LOGGER.debug("soap payload %s", payload)
             self.last_exception = None
             response = self.session.post(
                 url=self.url + service,
@@ -47,22 +58,20 @@ class IHCConnection(object):
                 data=payload,
                 verify=self.cert_verify(),
             )
-            _LOGGER.debug( "soap request response status %d",response.status_code)
-        except requests.exceptions.RequestException as exp:
-            _LOGGER.error( "soap request exception %s",exp)
-            self.last_exception = exp
-            return False
-        if response.status_code != 200:
-            self.last_response = response
-            return False
-        try:
-            _LOGGER.debug( "soap request response %s",response.text)
+            _LOGGER.debug("soap request response status %d", response.status_code)
+            if response.status_code != 200:
+                self.last_response = response
+                return False
+            _LOGGER.debug("soap request response %s", response.text)
             xdoc = xml.etree.ElementTree.fromstring(response.text)
             if xdoc is None:
                 return False
+            return xdoc
+        except requests.exceptions.RequestException as exp:
+            _LOGGER.error("soap request exception %s", exp)
+            self.last_exception = exp
         except xml.etree.ElementTree.ParseError as exp:
-            _LOGGER.error( "soap request xml parse error %s",exp)
+            _LOGGER.error("soap request xml parse error %s", exp)
             self.last_exception = exp
             self.last_response = response
-            return False
-        return xdoc
+        return False

{ihcsdk-2.8.7 → ihcsdk-2.8.9}/ihcsdk/ihcsslconnection.py

@@ -1,4 +1,5 @@
 """Implements soap reqeust using the "requests" module"""
+
 # pylint: disable=too-few-public-methods
 import os
 import requests
@@ -6,7 +7,6 @@ import requests
 from cryptography.x509 import load_pem_x509_certificate
 from cryptography.hazmat.backends import default_backend
 from cryptography.hazmat.primitives import hashes
-from requests.adapters import HTTPAdapter
 from requests.packages.urllib3.util.ssl_ import create_urllib3_context
 
 from ihcsdk.ihcconnection import IHCConnection
@@ -19,7 +19,10 @@ class IHCSSLConnection(IHCConnection):
         """Initialize the IHCSSLConnection with a url for the controller"""
         super(IHCSSLConnection, self).__init__(url)
         self.cert_file = os.path.dirname(__file__) + "/certs/ihc3.crt"
-        self.session.mount("https://", CertAdapter(self.get_fingerprint_from_cert()))
+        self.session.mount(
+            "https://",
+            CertAdapter(self.get_fingerprint_from_cert(), max_retries=self.retries),
+        )
 
     def get_fingerprint_from_cert(self):
         """Get the fingerprint from the certificate"""

{ihcsdk-2.8.7 → ihcsdk-2.8.9}/ihcsdk.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ihcsdk
-Version: 2.8.7
+Version: 2.8.9
 Summary: IHC Python SDK
 Home-page: https://github.com/dingusdk/PythonIhcSdk
 Author: Jens Nielsen

{ihcsdk-2.8.7 → ihcsdk-2.8.9}/setup.py

@@ -6,7 +6,7 @@ from setuptools import setup
 
 setup(
     name="ihcsdk",
-    version="2.8.7",
+    version="2.8.9",
     description="IHC Python SDK",
     long_description=(
         "SDK for connection to the LK IHC Controller. "