lanscape 1.3.9__tar.gz → 1.4.0b1__tar.gz

{lanscape-1.3.9/lanscape.egg-info → lanscape-1.4.0b1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lanscape
-Version: 1.3.9
+Version: 1.4.0b1
 Summary: A python based local network scanner
 Author-email: Michael Dennis <michael@dipduo.com>
 License-Expression: MIT

{lanscape-1.3.9 → lanscape-1.4.0b1}/lanscape/libraries/decorators.py

@@ -1,7 +1,5 @@
 
-"""
-Decorators and job tracking utilities for Lanscape.
-"""
+"""Decorators and job tracking utilities for Lanscape."""
 
 from time import time
 from dataclasses import dataclass, field
@@ -10,9 +8,37 @@ from collections import defaultdict
 import inspect
 import functools
 import concurrent.futures
+import logging
 from tabulate import tabulate
 
 
+log = logging.getLogger(__name__)
+
+
+def run_once(func):
+    """Ensure a function executes only once and cache the result."""
+
+    cache_attr = "_run_once_cache"
+    ran_attr = "_run_once_ran"
+
+    @functools.wraps(func)
+    def wrapper(*args, **kwargs):
+        if getattr(wrapper, ran_attr, False):
+            return getattr(wrapper, cache_attr)
+
+        start = time()
+        result = func(*args, **kwargs)
+        elapsed = time() - start
+
+        setattr(wrapper, cache_attr, result)
+        setattr(wrapper, ran_attr, True)
+
+        log.debug("run_once executed %s in %.4fs", func.__qualname__, elapsed)
+        return result
+
+    return wrapper
+
+
 @dataclass
 class JobStats:
     """

{lanscape-1.3.9 → lanscape-1.4.0b1}/lanscape/libraries/net_tools.py

@@ -18,7 +18,7 @@ from lanscape.libraries.service_scan import scan_service
 from lanscape.libraries.mac_lookup import MacLookup, get_macs
 from lanscape.libraries.ip_parser import get_address_count, MAX_IPS_ALLOWED
 from lanscape.libraries.errors import DeviceError
-from lanscape.libraries.decorators import job_tracker
+from lanscape.libraries.decorators import job_tracker, run_once
 
 log = logging.getLogger('NetTools')
 mac_lookup = MacLookup()
@@ -459,32 +459,17 @@ def smart_select_primary_subnet(subnets: List[dict] = None) -> str:
     return selected.get("subnet", "")
 
 
-class ArpSupportChecker:
-    """
-    Singleton class to check if ARP requests are supported on the current system.
-    The check is only performed once.
-    """
-    _supported = None
-
-    @classmethod
-    def is_supported(cls):
-        """one time check if ARP requests are supported on this system"""
-        if cls._supported is not None:
-            return cls._supported
-        try:
-            arp_request = ARP(pdst='0.0.0.0')
-            broadcast = Ether(dst="ff:ff:ff:ff:ff:ff")
-            packet = broadcast / arp_request
-            srp(packet, timeout=0, verbose=False)
-            cls._supported = True
-        except (Scapy_Exception, PermissionError, RuntimeError):
-            cls._supported = False
-        return cls._supported
-
-
+@run_once
 def is_arp_supported():
     """
     Check if ARP requests are supported on the current system.
     Only runs the check once.
     """
-    return ArpSupportChecker.is_supported()
+    try:
+        arp_request = ARP(pdst='0.0.0.0')
+        broadcast = Ether(dst="ff:ff:ff:ff:ff:ff")
+        packet = broadcast / arp_request
+        srp(packet, timeout=0, verbose=False)
+        return True
+    except (Scapy_Exception, PermissionError, RuntimeError):
+        return False

{lanscape-1.3.9 → lanscape-1.4.0b1}/lanscape/libraries/version_manager.py

@@ -11,17 +11,14 @@ from random import randint
 
 import requests
 
-from .app_scope import is_local_run
+from lanscape.libraries.app_scope import is_local_run
+from lanscape.libraries.decorators import run_once
 
 log = logging.getLogger('VersionManager')
 
 PACKAGE = 'lanscape'
 LOCAL_VERSION = '0.0.0'
 
-# Used to cache PyPI version during runtime
-LATEST_VERSION = None
-
-
 def is_update_available(package=PACKAGE) -> bool:
     """
     Check if an update is available for the package.
@@ -49,6 +46,7 @@ def is_update_available(package=PACKAGE) -> bool:
     return installed != available
 
 
+@run_once
 def lookup_latest_version(package=PACKAGE):
     """
     Retrieve the latest version of the package from PyPI.
@@ -62,19 +60,18 @@ def lookup_latest_version(package=PACKAGE):
         The latest version string from PyPI or None if retrieval fails
     """
     # Fetch the latest version from PyPI
-    global LATEST_VERSION  # pylint: disable=global-statement
-    if not LATEST_VERSION:
-        no_cache = f'?cachebust={randint(0, 6969)}'
-        url = f"https://pypi.org/pypi/{package}/json{no_cache}"
-        try:
-            response = requests.get(url, timeout=5)
-            response.raise_for_status()  # Raise an exception for HTTP errors
-            LATEST_VERSION = response.json()['info']['version']
-            log.debug(f'Latest pypi version: {LATEST_VERSION}')
-        except BaseException:
-            log.debug(traceback.format_exc())
-            log.warning('Unable to fetch package version from PyPi')
-    return LATEST_VERSION
+    no_cache = f'?cachebust={randint(0, 6969)}'
+    url = f"https://pypi.org/pypi/{package}/json{no_cache}"
+    try:
+        response = requests.get(url, timeout=3)
+        response.raise_for_status()  # Raise an exception for HTTP errors
+        latest_version = response.json()['info']['version']
+        log.debug(f'Latest pypi version: {latest_version}')
+        return latest_version
+    except BaseException:
+        log.debug(traceback.format_exc())
+        log.warning('Unable to fetch package version from PyPi')
+        return None
 
 
 def get_installed_version(package=PACKAGE):

{lanscape-1.3.9 → lanscape-1.4.0b1/lanscape.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lanscape
-Version: 1.3.9
+Version: 1.4.0b1
 Summary: A python based local network scanner
 Author-email: Michael Dennis <michael@dipduo.com>
 License-Expression: MIT

{lanscape-1.3.9 → lanscape-1.4.0b1}/lanscape.egg-info/SOURCES.txt

@@ -77,6 +77,7 @@ lanscape/ui/templates/scan/ip-table.html
 lanscape/ui/templates/scan/overview.html
 lanscape/ui/templates/scan/scan-error.html
 tests/test_api.py
+tests/test_decorators.py
 tests/test_env.py
 tests/test_library.py
 tests/test_logging.py

{lanscape-1.3.9 → lanscape-1.4.0b1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "lanscape"
-version = "1.3.9"
+version = "1.4.0b1"
 authors = [
   { name="Michael Dennis", email="michael@dipduo.com" },
 ]

lanscape-1.4.0b1/tests/test_decorators.py

@@ -0,0 +1,29 @@
+"""Tests for helper decorators used throughout the project."""
+
+import logging
+
+from lanscape.libraries.decorators import run_once
+
+
+def test_run_once_caches_result_and_logs_once(caplog):
+    """run_once should execute only one time and cache the return value."""
+
+    caplog.set_level(logging.DEBUG)
+
+    call_count = {"count": 0}
+
+    @run_once
+    def sample_function(value):
+        call_count["count"] += 1
+        return value * 2
+
+    first = sample_function(3)
+    second = sample_function(5)
+
+    assert first == 6
+    assert second == 6
+    assert call_count["count"] == 1
+
+    messages = [record.message for record in caplog.records]
+    assert any("run_once executed" in record and "sample_function" in record for record in messages)
+    assert sum("run_once executed" in record for record in messages) == 1