ipfabric 7.2.1__tar.gz → 7.2.2__tar.gz

{ipfabric-7.2.1 → ipfabric-7.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: ipfabric
-Version: 7.2.1
+Version: 7.2.2
 Summary: Python package for interacting with IP Fabric
 License: MIT
 Keywords: ipfabric,ip-fabric,community-fabric

{ipfabric-7.2.1 → ipfabric-7.2.2}/ipfabric/auth.py

@@ -9,22 +9,18 @@ from time import sleep
 from typing import Optional, Union, Generator, Any, Type, Literal, Mapping
 
 import jwt
-from httpx import Client, BaseTransport, URL, Request, Response, Auth, Timeout, post, Proxy
+from httpx import Client, BaseTransport, URL, Request, Response, Auth, Timeout, post
 from httpx._client import EventHook
-from httpx._types import CertTypes, URLTypes
+from httpx._types import CertTypes
 from packaging.version import Version
-from pydantic import field_validator, Field, AliasChoices, PrivateAttr, InstanceOf
+from pydantic import field_validator, Field, AliasChoices, PrivateAttr
 from pydantic_settings import BaseSettings, SettingsConfigDict, PydanticBaseSettingsSource, InitSettingsSource
 
-from ipfabric.tools.shared import raise_for_status, valid_snapshot
+from ipfabric.tools.shared import raise_for_status, valid_snapshot, ProxyTypes, TimeoutTypes
 
 logger = logging.getLogger("ipfabric")
 
 RE_VERSION = re.compile(r"v?(\d(\.\d*)?)")
-ProxyTypes = Union[None, URLTypes, InstanceOf[Proxy]]
-TimeoutTypes = Union[
-    Optional[float], tuple[Optional[float], Optional[float], Optional[float], Optional[float]], Timeout, None
-]
 
 
 def log_request(request: Request):

{ipfabric-7.2.1 → ipfabric-7.2.2}/ipfabric/tools/nist.py

@@ -2,9 +2,10 @@ from time import sleep
 from typing import Optional, Union
 
 from httpx import Client, ReadTimeout, HTTPStatusError
-from httpx._types import ProxyTypes, TimeoutTypes
 from pydantic import BaseModel, ConfigDict, field_validator
 
+from ipfabric.tools.shared import ProxyTypes, TimeoutTypes
+
 UNSUPPORTED_VENDORS = [
     "azure",
     "aws",
@@ -299,9 +300,9 @@ class NIST(Client):
             return cves
         except ReadTimeout:
             return CVEs(total_results=0, cves=[], error="Timeout", cpe=cpe)
-        except HTTPStatusError:
+        except HTTPStatusError as e:
             if attempt > self.retries:
-                return CVEs(total_results=0, cves=[], error="HTTP Error", cpe=cpe)
+                return CVEs(total_results=0, cves=[], error=f"HTTP Error {e.response.status_code}", cpe=cpe)
             else:
                 return self._query_cve(cpe, attempt + 1)
 
@@ -314,10 +315,17 @@ class NIST(Client):
             return [CPE(**_["cpe"]) for _ in data["products"] if "cpe" in _]
         except ReadTimeout:
             return [CPE(cpeName="", cpeNameId="", deprecated=False, created="", lastModified="", error="Timeout")]
-        except HTTPStatusError:
+        except HTTPStatusError as e:
             if attempt > self.retries:
                 return [
-                    CPE(cpeName="", cpeNameId="", deprecated=False, created="", lastModified="", error="HTTP Error")
+                    CPE(
+                        cpeName="",
+                        cpeNameId="",
+                        deprecated=False,
+                        created="",
+                        lastModified="",
+                        error=f"HTTP Error {e.response.status_code}",
+                    )
                 ]
             else:
                 return self._query_cpe(params, attempt + 1)

{ipfabric-7.2.1 → ipfabric-7.2.2}/ipfabric/tools/shared.py

@@ -18,7 +18,9 @@ from uuid import UUID
 
 import macaddress
 from dateutil import parser
-from httpx import HTTPStatusError, Response
+from httpx import Response, Timeout, Proxy, HTTPStatusError
+from httpx._types import URLTypes
+from pydantic import InstanceOf
 from pytz import BaseTzInfo, utc
 
 logger = logging.getLogger("ipfabric")
@@ -34,6 +36,11 @@ VALID_IP = Union[IPv4Address, IPv4Network, IPv4Interface]
 VALID_IPv6 = Union[IPv6Address, IPv6Network, IPv6Interface]
 SLUG = re.compile(r"^[a-zA-Z0-9_\-.#:]*$")
 
+ProxyTypes = Union[None, URLTypes, InstanceOf[Proxy]]
+TimeoutTypes = Union[
+    Optional[float], tuple[Optional[float], Optional[float], Optional[float], Optional[float]], Timeout, None
+]
+
 
 def valid_snapshot(snapshot: Union[None, str], init: bool = False) -> str:
     if snapshot is None:

{ipfabric-7.2.1 → ipfabric-7.2.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "ipfabric"
-version = "7.2.1"
+version = "7.2.2"
 description = "Python package for interacting with IP Fabric"
 authors = [
     "Solution Architecture <solution.architecture@ipfabric.io>"