pihole6api 0.1.9__py3-none-any.whl → 0.2.0__py3-none-any.whl

pihole6api/client.py

@@ -10,6 +10,7 @@ from .config import PiHole6Configuration
 from .network_info import PiHole6NetworkInfo
 from .actions import PiHole6Actions
 from .dhcp import PiHole6Dhcp
+import importlib.metadata
 
 class PiHole6Client:
     def __init__(self, base_url, password):
@@ -45,4 +46,18 @@ class PiHole6Client:
     
     def close_session(self):
         """Close the Pi-hole session by calling the exit method in the connection."""
-        return self.connection.exit()
+        return self.connection.exit()
+
+    def version(self):
+        """
+        Get the project information from package metadata.
+        
+        :return: Dictionary containing version, description, and project URL
+        """
+        metadata = importlib.metadata.metadata("pihole6api")
+        
+        return {
+            "version": metadata["Version"],
+            "description": metadata["Summary"],
+            "project_url": metadata["Project-URL"]
+        }

pihole6api/conn.py

@@ -82,18 +82,20 @@ class PiHole6Connection:
                 
                 if response.status_code == 200:
                     data = response.json()
-                    if "session" in data and data["session"]["valid"]:
+                    if "session" in data and data["session"]["valid"] and data["session"]["validity"] > 0:
                         self.session_id = data["session"]["sid"]
                         self.csrf_token = data["session"]["csrf"]
                         self.validity = data["session"]["validity"]
                         logger.debug("Authentication successful")
                         return  # Successful authentication
                     else:
+                        if data.get("session"):
+                            logger.error(data["session"].get("message", "API failed without message"))
                         last_exception = Exception("Authentication failed: Invalid session response")
                 else:
                     # Try to extract an error message from the response
                     try:
-                        error_msg = response.json().get("error", {}).get("message", "Unknown error")
+                        error_msg = response.json().get("session", {}).get("message", "Unknown error")
                     except (json.decoder.JSONDecodeError, ValueError):
                         error_msg = f"HTTP {response.status_code}: {response.reason}"
                     last_exception = Exception(f"Authentication failed: {error_msg}")

pihole6api/domain_management.py

@@ -85,3 +85,18 @@ class PiHole6DomainManagement:
         :param kind: Kind of domain ("exact" or "regex")
         """
         return self.connection.delete(f"domains/{domain_type}/{kind}/{domain}")
+
+    def get_all_domains(self):
+        """
+        Get all white and blacklisted domains
+        """
+        try:
+            # Get whiteliste domains
+            whitelist = self.connection.get("domains/allow/exact")
+            # Get blackliste domains
+            blacklist = self.connection.get("domains/deny/exact")
+
+            return {"whitelist": whitelist, "blacklist": blacklist}
+        except Exception as e:
+            print(f"Error fetching domains: {e}")
+            return None

{pihole6api-0.1.9.dist-info → pihole6api-0.2.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pihole6api
-Version: 0.1.9
+Version: 0.2.0
 Summary: Python API Client for Pi-hole 6
 Author-email: Shane Barbetta <shane@barbetta.me>
 License: MIT
@@ -132,6 +132,14 @@ client.actions.restart_dns()
 | `network_info`      | View network devices, interfaces, routes |
 | `actions`           | Flush logs, restart services |
 
+## Contributing
+
+Please check [CONTRIBUTING.md](CONTRIBUTING.md) for contribution guidelines.
+
+## Changelog
+
+See [CHANGELOG.md](CHANGELOG.md) for a list of changes.
+
 ## License
 
 This project is license under the [MIT license](LICENSE).

{pihole6api-0.1.9.dist-info → pihole6api-0.2.0.dist-info}/RECORD

@@ -1,19 +1,19 @@
 pihole6api/__init__.py,sha256=OKDAH2I6UjXcBmcj6rn5aNg5J60GCUBVFJ-_t83GiVQ,898
 pihole6api/actions.py,sha256=8CBkr8nYfT8yfdCO6F9M9nompaYcFdsaYGiEa1eVDCw,693
-pihole6api/client.py,sha256=HYdRh3CSZJ0srbkpjIVnLo-iy1avqKDUne5ji2Aq394,2013
+pihole6api/client.py,sha256=8sco9wFCAmF1WTRG72W5Af4fZIoTjvCXXmj-O51MY88,2472
 pihole6api/client_management.py,sha256=n8Ra_6pRL3Q9jlIK3kIK9bmh74MTfxgYnOHYaUwYGNs,2590
 pihole6api/config.py,sha256=NdBHOudz147oIs5YVR3U4WLvqk3hU3HlZHnshy1NK4g,4680
-pihole6api/conn.py,sha256=vR7nTlJKIu0r_hL4ccCQl1zvjdivtwYNYXexRqYPMog,9334
+pihole6api/conn.py,sha256=2JYPgHUmhPSuNdrMaWkEtf2lnqDJ8--g05CYntOBJvQ,9523
 pihole6api/dhcp.py,sha256=1A3z-3q9x51-6MOC3JMl7yR_5pHmRxZtMWtPqzWxYm0,629
 pihole6api/dns_control.py,sha256=mxV3AIuGCsx0-1ibpMXor9QUGd_fDFfeaUENPhIK_TY,853
-pihole6api/domain_management.py,sha256=vxhQSG5F8EFDGqtiNkF0H_KOWFMerXaAuJZT0nMa8ec,3492
+pihole6api/domain_management.py,sha256=5oJebojAAEEvZtJgxeuK4FazcMxmiB1NpAgStqdUv-E,3988
 pihole6api/ftl_info.py,sha256=FINHFotI1sQgkL0OPaNqW-rk4h1ua6QHnRh5gFXXRIE,3210
 pihole6api/group_management.py,sha256=Iip2Na4pUYgC5K9cwOWv_OPD6qdXRzWCmlS-fJlBMjU,2372
 pihole6api/list_management.py,sha256=CooTeF4EmNPFwnzGoLbHFMhCePJ-ojvRGx7Sxzayy-U,4170
 pihole6api/metrics.py,sha256=QWqV_7SytMPGEBEZOxsIfxTa6lM9Ksrvlf2BXjDKZmA,7991
 pihole6api/network_info.py,sha256=E1qQ7DsCb7qplt0oQIyKhUY12ExNF6bv6thm9rbNqwY,1953
-pihole6api-0.1.9.dist-info/licenses/LICENSE,sha256=hpO6J6J9O1VZxZeHQTxKMTmuobaHbApiZxp279I4xNU,1062
-pihole6api-0.1.9.dist-info/METADATA,sha256=KKHIb02db_On_j5n_Mj_gBZqcmju--Hn21ESdjqnEYI,3790
-pihole6api-0.1.9.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-pihole6api-0.1.9.dist-info/top_level.txt,sha256=Qrh46lxEC54rBR8T53em-tuZLWbmi1SDwL1rOhsgrME,11
-pihole6api-0.1.9.dist-info/RECORD,,
+pihole6api-0.2.0.dist-info/licenses/LICENSE,sha256=hpO6J6J9O1VZxZeHQTxKMTmuobaHbApiZxp279I4xNU,1062
+pihole6api-0.2.0.dist-info/METADATA,sha256=oL9701CfySKOOVdWglV7rEmpVBAMMRAr_KSckcTFyGw,3956
+pihole6api-0.2.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pihole6api-0.2.0.dist-info/top_level.txt,sha256=Qrh46lxEC54rBR8T53em-tuZLWbmi1SDwL1rOhsgrME,11
+pihole6api-0.2.0.dist-info/RECORD,,

{pihole6api-0.1.9.dist-info → pihole6api-0.2.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (78.1.0)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py3-none-any