python-openhab-rest-client 0.2.2__tar.gz → 0.2.4__tar.gz

{python_openhab_rest_client-0.2.2/python_openhab_rest_client.egg-info → python_openhab_rest_client-0.2.4}/PKG-INFO

@@ -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 → python_openhab_rest_client-0.2.4}/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):

{python_openhab_rest_client-0.2.2 → python_openhab_rest_client-0.2.4}/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):

{python_openhab_rest_client-0.2.2 → python_openhab_rest_client-0.2.4}/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 → python_openhab_rest_client-0.2.4/python_openhab_rest_client.egg-info}/PKG-INFO

@@ -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 → python_openhab_rest_client-0.2.4}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="python-openhab-rest-client",
-    version="0.2.2",
+    version="0.2.4",
     packages=find_packages(),
     install_requires=[
         "requests"

{python_openhab_rest_client-0.2.2 → python_openhab_rest_client-0.2.4}/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": [],