python-unifi-client 1.2.1__tar.gz → 1.2.3__tar.gz

{python_unifi_client-1.2.1 → python_unifi_client-1.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python_unifi_client
-Version: 1.2.1
+Version: 1.2.3
 Home-page: https://github.com/compdat-llc/unifi-client-python
 Author: Michael Lapinski
 Author-email: michaellapinski787@gmail.com

{python_unifi_client-1.2.1 → python_unifi_client-1.2.3}/python_unifi_client/client.py

@@ -58,8 +58,8 @@ class EmailInvalidException(Exception):
     def __init__(self):
         super().__init__("Invalid email address provided")
 class InvalidBaseUrlException(Exception): 
-    def __init__(self):
-        super().__init__("The base URL provided is invalid.")
+    def __init__(self, message="The base URL provided is invalid."):
+        super().__init__(message)
 class InvalidCurlMethodException(Exception): 
     def __init__(self):
         super().__init__("Invalid cURL method provided")
@@ -263,7 +263,7 @@ class Client:
         return self.fetch_results(f"/api/s/{self._site}/stat/sysinfo")
 
     def get_clients(self):
-        return self.fetch_results(f"/api/s/{self._site}/stat/sta")
+        return self.fetch_results(f"/api/s/{self._site}/stat/sta", prefix_path=True)
 
     def block_client(self, mac):
         return self._request(f"/api/s/{self._site}/cmd/stamgr", method='POST', payload={'cmd': 'block-sta', 'mac': mac})
@@ -924,7 +924,7 @@ class Client:
     def list_clients(self, mac: str = None):
         """Fetch online client devices, or single device if MAC provided."""
         path_mac = mac.lower().strip() if isinstance(mac, str) else ''
-        return self.fetch_results(f"/api/s/{self._site}/stat/sta/{path_mac}")
+        return self.fetch_results(f"/api/s/{self._site}/stat/sta/{path_mac}", prefix_path=True)
 
     def list_active_clients(self, include_traffic_usage: bool = True, include_unifi_devices: bool = True):
         """Fetch active client devices, with optional traffic and UniFi device inclusion."""
@@ -1549,7 +1549,6 @@ class Client:
         end: int = None,
         page_number: int = 0,
         page_size: int = 100,
-        custom_payload: dict = None
     ) -> list:
         """Fetch system logs filtered by class and time window with pagination"""
         # Determine time window
@@ -1569,8 +1568,8 @@ class Client:
         if class_ == 'next-ai-alert':
             payload['nextAiCategory'] = ['CLIENT', 'DEVICE', 'INTERNET', 'VPN']
         elif class_ == 'admin-activity':
-            payload['activity_keys'] = ['ACCESSED_NETWORK_WEB', 'ACCESSED_NETWORK_IOS', 'ACCESSED_NETWORK_ANDROID']
-            payload['change_keys'] = ['CLIENT', 'DEVICE', 'HOTSPOT', 'INTERNET', 'NETWORK', 'PROFILE', 'ROUTING', 'SECURITY', 'SYSTEM', 'VPN', 'WIFI']
+            payload['activityKeys'] = ['ACCESSED_NETWORK_WEB', 'ACCESSED_NETWORK_IOS', 'ACCESSED_NETWORK_ANDROID']
+            payload['changeKeys'] = ['CLIENT', 'DEVICE', 'HOTSPOT', 'INTERNET', 'NETWORK', 'PROFILE', 'ROUTING', 'SECURITY', 'SYSTEM', 'VPN', 'WIFI']
         elif class_ == 'update-alert':
             payload['systemLogDeviceTypes'] = ['GATEWAYS', 'SWITCHES', 'ACCESS_POINT', 'SMART_POWER', 'BUILDING_TO_BUILDING_BRIDGES', 'UNIFI_LTE']
         elif class_ == 'client-alert':
@@ -1581,11 +1580,12 @@ class Client:
         elif class_ == 'triggers':
             payload['triggerTypes'] = ['TRAFFIC_RULE', 'TRAFFIC_ROUTE', 'FIREWALL_RULE']
 
-        # Merge any custom payload overrides
-        if custom_payload:
-            payload.update(custom_payload)
+        self._curl_method = "POST"
+        self.debug = False
+
+        path = f"/v2/api/site/{self._site}/system-log/{class_}"
 
-        return self.fetch_results(f"/v2/api/site/{self._site}/system-log{class_}", payload=custom_payload)
+        return self.fetch_results(path, payload=payload, prefix_path=True)
 
     def delete_radius_account(self, account_id: str) -> bool:
         """Delete a Radius user account"""
@@ -1651,10 +1651,10 @@ class Client:
         Fetch UniFi devices, optionally filtered by MAC addresses.
         """
         payload = {'macs': [mac.lower() for mac in macs]}
-        return self.fetch_results(f"/api/s/{self._site}/stat/device", payload=payload)
+        return self.fetch_results(f"/api/s/{self._site}/stat/device", payload=payload, prefix_path=True)
 
     def list_devices_basic(self):
-        return self.fetch_results(f"/api/s/{self._site}/stat/device-basic")
+        return self.fetch_results(f"/api/s/{self._site}/stat/device-basic", prefix_path=True)
 
     def check_controller_update(self):
         """
@@ -2444,9 +2444,11 @@ class Client:
             opts['data'] = json_payload
 
             # force POST if GET or DELETE
-            if self._curl_method in ('GET', 'DELETE'):
-                self._curl_method = 'POST'
-                opts['method'] = 'POST'
+            
+            #if self._curl_method in ('GET', 'DELETE'):
+               # self._curl_method = 'POST'
+              #  opts['method'] = 'POST'
+            
 
         # 5) set custom method flags
         if self._curl_method == 'POST':

{python_unifi_client-1.2.1 → python_unifi_client-1.2.3}/python_unifi_client.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python_unifi_client
-Version: 1.2.1
+Version: 1.2.3
 Home-page: https://github.com/compdat-llc/unifi-client-python
 Author: Michael Lapinski
 Author-email: michaellapinski787@gmail.com

{python_unifi_client-1.2.1 → python_unifi_client-1.2.3}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
 
 setuptools.setup(
 		name="python_unifi_client",
-		version="1.2.1",
+		version="1.2.3",
 		author="Michael Lapinski",
 		author_email="michaellapinski787@gmail.com",
 		descripton="A python version of a github Art-of-Wifi/Unifi-API-Client",