python-openhab-rest-client 0.2.2__py3-none-any.whl → 0.2.4__py3-none-any.whl

openhab/Client.py

@@ -134,18 +134,23 @@ class OpenHABClient:
             response = self.session.delete(url, data=data, params=params, headers=header, timeout=5)
         else:
             raise ValueError("Invalid HTTP method provided!")
+        
+        location = response.headers.get("Location")
 
-        # Pass on mistakes directly instead of catching them here!
+        if location:
+            return response
+        
+        # Pass on mistakes directly instead of catching them here!        
         response.raise_for_status()
 
         # If the response is empty, but there was still no error, we return the status code
         if not response.text.strip():
             return {"status": response.status_code}
-
+                
         # Return JSON response, if available
         if "application/json" in response.headers.get("Content-Type", ""):
             return response.json()
-        
+                
         return response.text  # Fallback: Return text response
 
     def __executeSSE(self, url: str):

openhab/Rules.py

@@ -56,13 +56,11 @@ class Rules:
         try:
             response = self.client.post(
                 "/rules", data=json.dumps(ruleData), header={"Content-Type": "application/json"})
-
-            if isinstance(response, dict) and "status" in response:
-                status_code = response["status"]
-            else:
-                return response
+            
+            status_code = response.status_code
 
         except requests.exceptions.HTTPError as err:
+            # Fehlerbehandlung
             status_code = err.response.status_code
             if status_code == 400:
                 return {"error": "Creation refused: Missing required parameter."}
@@ -73,18 +71,19 @@ class Rules:
 
         except requests.exceptions.RequestException as err:
             return {"error": f"Request error: {str(err)}"}
-
+        
         if status_code == 201:
             location = response.headers.get("Location")
             return {
                 "message": "Rule successfully created.",
                 "location": location if location else "No Location header provided."
-            }
+            }    
         elif status_code == 400:
             return {"error": "Creation refused: Missing required parameter."}
         elif status_code == 409:
             return {"error": "Creation refused: Rule with the same UID already exists."}
 
+        # Falls der Statuscode nicht erkannt wird, gib eine generische Fehlermeldung zurück
         return {"error": f"Unexpected response: {status_code}"}
 
     def getRule(self, ruleUID: str):
@@ -504,10 +503,10 @@ class Rules:
 
         return {"error": f"Unexpected response: {status_code}"}
 
-    def enableRule(self, ruleUID: str):
+    def enable(self, ruleUID: str):
         return self.setRuleState(ruleUID, True)
 
-    def disableRule(self, ruleUID: str):
+    def disable(self, ruleUID: str):
         return self.setRuleState(ruleUID, False)
 
     def runNow(self, ruleUID: str, contextData: dict = None):

openhab/tests/Rules.py

@@ -36,8 +36,8 @@ class RulesTest:
         print("\n~~~~ Test #3 createRule(ruleData) ~~~~\n")
 
         try:
-            self.rulesAPI.createRule(ruleData)
-            print("New Rule created successfully.")
+            rule = self.rulesAPI.createRule(ruleData)
+            print(json.dumps(rule, indent=4))
         except Exception as e:
             print(f"Error creating rule: {e}")
 
@@ -46,8 +46,8 @@ class RulesTest:
         print("\n~~~~ Test #4 updateRule(ruleID, ruleData) ~~~~\n")
 
         try:
-            self.rulesAPI.updateRule(ruleID, ruleData)
-            print("Rule updated successfully.")
+            rule = self.rulesAPI.updateRule(ruleID, ruleData)
+            print(json.dumps(rule, indent=4))
         except Exception as e:
             print(f"Error updating rule {ruleID}: {e}")
 
@@ -57,8 +57,8 @@ class RulesTest:
         print("\n~~~~ Test #5 setRuleState(ruleID, state) ~~~~\n")
 
         try:
-            self.rulesAPI.setRuleState(ruleID, state)
-            print(f"Rule {ruleID} {action}.")
+            rule = self.rulesAPI.setRuleState(ruleID, state)
+            print(json.dumps(rule, indent=4))
         except Exception as e:
             print(f"Error setting rule state for {ruleID}: {e}")
 
@@ -67,8 +67,8 @@ class RulesTest:
         print("\n~~~~ Test #6 deleteRule(ruleID) ~~~~\n")
 
         try:
-            self.rulesAPI.deleteRule(ruleID)
-            print("Rule deleted successfully.")
+            rule = self.rulesAPI.deleteRule(ruleID)
+            print(json.dumps(rule, indent=4))
         except Exception as e:
             print(f"Error deleting rule {ruleID}: {e}")
 
@@ -77,7 +77,7 @@ class RulesTest:
         print("\n~~~~ Test #7 runNow(ruleID) ~~~~\n")
 
         try:
-            self.rulesAPI.runNow(ruleID, contextData)
-            print("Rule executed successfully.")
+            rule = self.rulesAPI.runNow(ruleID, contextData)
+            print(json.dumps(rule, indent=4))
         except Exception as e:
             print(f"Error executing rule {ruleID}: {e}")

{python_openhab_rest_client-0.2.2.dist-info → python_openhab_rest_client-0.2.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-openhab-rest-client
-Version: 0.2.2
+Version: 0.2.4
 Summary: A Python client for the openHAB REST API. This library enables easy interaction with the openHAB REST API to control smart home devices, retrieve status information, and process events.
 Home-page: https://github.com/Michdo93/python-openhab-rest-client
 Author: Michael Christian Dörflinger

{python_openhab_rest_client-0.2.2.dist-info → python_openhab_rest_client-0.2.4.dist-info}/RECORD

@@ -3,7 +3,7 @@ openhab/Addons.py,sha256=9-VH7MFMDbmpt92iUfHsyYNob5sN_6e21sR8gS4v6JQ,14463
 openhab/Audio.py,sha256=UJbaOHFaZ_zOZ2-tz3aRxQ0RsyVS8_YouaoWrjsnkp0,5140
 openhab/Auth.py,sha256=BhlTVTX2RgLHv4CVzri_aDrYZYvapGVNzEMpAppTR3o,8660
 openhab/ChannelTypes.py,sha256=n5UmjnTfoJAYExD3mhtbLN34sWCepuw5982ODY-FWME,4745
-openhab/Client.py,sha256=vRZ6rFC5xpwBYDvweOTOPGmqfxc3fIXIM-zmQ9lP2I4,9665
+openhab/Client.py,sha256=AgTV_5jw0_njVPRDax95t7Sw_3-pofspvyNAGRO0xuY,9816
 openhab/ConfigDescriptions.py,sha256=YUUblEmwTWBMToHR2GBTh1Jut0Nc3LMnZQVY6z_2GRU,3278
 openhab/Discovery.py,sha256=nxMivvzKHcNwPvryNf_qvHFyf7UCEpf3uDtOugAk5EU,3959
 openhab/Events.py,sha256=CcJGtepJT810hkH3drTM1Cn1J3PhMJwy2-kRuuUzGM0,27756
@@ -15,7 +15,7 @@ openhab/Logging.py,sha256=iM3Cd8ygqrhO4JLC42kF2nhVVXDYcXf8NXSroL0ekBo,4490
 openhab/ModuleTypes.py,sha256=FoLti9DZiVfZE6aF4wVW_ANeiRWG1ldRy5btz2EK-r0,3218
 openhab/Persistence.py,sha256=n4JuP2mnNnZwBbngLvV-ItoTg-drBYcrB_povaJrBqU,12068
 openhab/ProfileTypes.py,sha256=JIExcNouoqDHQSJPXHyO4fcj2cN4tii8tUL0I-R50SY,1790
-openhab/Rules.py,sha256=Q3Nh8U6K8ZWMnSNd5BXoz-qrL3vMI4s_WO0hqZEfkNs,23704
+openhab/Rules.py,sha256=ucf5ySwNrESU33-hjJJnQbL3PDPRCCJgst5qRInQeOI,23724
 openhab/Services.py,sha256=Oh9eZRe-RRR7zNHW8xbAcSYvdMmIMR9V2mRIQXwOBVU,8230
 openhab/Sitemaps.py,sha256=uaqgY6l6lEq1WpxnovLB6jnPi0x_iLBaA9X_PJmAgFg,11323
 openhab/Systeminfo.py,sha256=4jh9-Lx3qVKl4wdauPb7KaJ8NDB5IPHLo2FyUweTXaw,2143
@@ -48,7 +48,7 @@ openhab/tests/Logging.py,sha256=zaiTbhgdg-_nFoBapcsGuNIJ4rlfGb1SaGrb2qKHJhc,1857
 openhab/tests/ModuleTypes.py,sha256=_8NXTBgl4DahlHN27GhqFujm2m64WG6ec9CwL4_bqOU,1240
 openhab/tests/Persistence.py,sha256=-xbOLuOJ15viwGP11duEHmNnFreCQZ63zvhY1QfJrHI,4263
 openhab/tests/ProfileTypes.py,sha256=APNR-uWUril3orD8dfWO72HacrRQASctlEt0zBxLei8,819
-openhab/tests/Rules.py,sha256=_wMplTkTZhvtw7s-d1F8IbM6RG6lGAvFdFeXHelYoZM,2903
+openhab/tests/Rules.py,sha256=BsRCklXbXTpvWigf-hx4Jfj3AHM12_Me-uISUQwAkvw,2925
 openhab/tests/Services.py,sha256=Mxu7xp08ozL7KtmDZRCjRasJMnPrhnwJhQ2qJULaeNM,2913
 openhab/tests/Sitemaps.py,sha256=sTy9gMKiGx7uIFsQf78KenScMNHW4vV3ZraelJARi68,3673
 openhab/tests/Systeminfo.py,sha256=uSHacWmTePMoVsbZq0kkPAlcopu_XH65otfBfyJofpI,1055
@@ -82,7 +82,7 @@ tests/Logging.py,sha256=MharW6exJO1Hr2oaBkzOlIJU9-YPPKr6rT0t6CRC_no,824
 tests/ModuleTypes.py,sha256=e8HADgeoFH8PIYoHDh8yVFSLUDC_QU3iobmx0-ExhN0,633
 tests/Persistence.py,sha256=3chXTs9DUETDZc7qFIRhcDI-7AR_986QIgRmZ-wKwQY,1526
 tests/ProfileTypes.py,sha256=4gqloYanEI3F-rx-QIH7IH3rCvUY0kBWPaZ_htd26UI,528
-tests/Rules.py,sha256=vILslSpA1msak-4xlKzsBb1IA_nB8u2EE16rcVyR60k,1232
+tests/Rules.py,sha256=3UyQ9YBXdvts2ZNVaEVFqdoWschpjyWtJq1Rs70PPJ4,1311
 tests/Services.py,sha256=fI21FFvLq_xqEyBbrBcRivhlKKtiYbIoG1VCO3kxjFQ,1096
 tests/Sitemaps.py,sha256=moRcnelOzU--i6Qh_pzstPbNvN4b5tEtE09HDXjHK9k,1101
 tests/Systeminfo.py,sha256=khe5t8ox1D-BsxntyikxzaH5NO06Xmu4uMLXUaRfUtY,580
@@ -96,8 +96,8 @@ tests/UI.py,sha256=0RWgqZXUrJN4bL-e_n4bQquBDh9CctnsQIVE0AsrFiI,1764
 tests/UUID.py,sha256=CetUDQ0rDSq6n1dmRAbh5VW10N8GLKoxW9imkdea8n4,520
 tests/Voice.py,sha256=zFA-R_22560uIWKHU2mV14B3OnbQx3d2qiwRKXJrTKY,2057
 tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-python_openhab_rest_client-0.2.2.dist-info/LICENSE,sha256=69QhqD8S8OPNY1BAzQIPayy_M-A5ltuK0v5kRvS75ZI,1086
-python_openhab_rest_client-0.2.2.dist-info/METADATA,sha256=mK2zUAYH1-POYVnM_Tp3WSHQbo-yXw4ci1M36Y4bLeo,68512
-python_openhab_rest_client-0.2.2.dist-info/WHEEL,sha256=iAkIy5fosb7FzIOwONchHf19Qu7_1wCWyFNR5gu9nU0,91
-python_openhab_rest_client-0.2.2.dist-info/top_level.txt,sha256=m5d0ZGvuMBPyd81BONJW6I-kWCeHagriOKWruLGt1u8,14
-python_openhab_rest_client-0.2.2.dist-info/RECORD,,
+python_openhab_rest_client-0.2.4.dist-info/LICENSE,sha256=69QhqD8S8OPNY1BAzQIPayy_M-A5ltuK0v5kRvS75ZI,1086
+python_openhab_rest_client-0.2.4.dist-info/METADATA,sha256=OkSt5krlZb51Em0J3J65f3bJ5FKTJnF-cMASm6heJ30,68512
+python_openhab_rest_client-0.2.4.dist-info/WHEEL,sha256=iAkIy5fosb7FzIOwONchHf19Qu7_1wCWyFNR5gu9nU0,91
+python_openhab_rest_client-0.2.4.dist-info/top_level.txt,sha256=m5d0ZGvuMBPyd81BONJW6I-kWCeHagriOKWruLGt1u8,14
+python_openhab_rest_client-0.2.4.dist-info/RECORD,,

tests/Rules.py

@@ -1,5 +1,6 @@
 import sys
 import os
+import random
 
 # Add the project root path (one level up) to the Python search path
 sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), "..")))
@@ -12,10 +13,12 @@ if __name__ == "__main__":
     client = OpenHABClient(url="http://127.0.0.1:8080", username="openhab", password="habopen")
     rulesTest = RulesTest(client)
 
+    random_number = random.randint(0, 100)
+
     # Example rule data
-    ruleID = "test_color-1"
+    ruleID = "test_color-4"
     newRuleData = {
-        "uid": "newRule",
+        "uid": "newRule" + str(random_number),
         "name": "New Rule",
         "description": "This is a new rule",
         "triggers": [],