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

pybgpkitstream/bgpstreamconfig.py

@@ -1,7 +1,7 @@
 import datetime
 import importlib
 import shutil
-from pydantic import BaseModel, Field, DirectoryPath, field_validator
+from pydantic import BaseModel, Field, DirectoryPath, field_validator, model_validator
 from typing import Literal
 from ipaddress import IPv4Address, IPv6Address
 
@@ -131,7 +131,7 @@ class PyBGPKITStreamConfig(BaseModel):
                 )
 
         elif parser == "bgpkit":
-            if shutil.which("bgpkit") is None:
+            if shutil.which("bgpkit-parser") is None:
                 raise ValueError(
                     "bgpkit binary not found in PATH. "
                     "Install from: https://github.com/bgpkit/bgpkit-parser "
@@ -140,3 +140,21 @@ class PyBGPKITStreamConfig(BaseModel):
 
         # Return the parser value if validation passes
         return parser
+    
+    @model_validator(mode='before')
+    @classmethod
+    def nest_bgpstream_params(cls, data: dict) -> dict:
+        """Allow to define a flat config"""
+        # If the user already provided 'bgpstream_config', do nothing
+        if "bgpstream_config" in data:
+            return data
+        
+        # Define which fields belong to the inner BGPStreamConfig
+        stream_fields = {"start_time", "end_time", "collectors", "data_types", "filters"}
+        
+        # Extract those fields from the flat input
+        inner_data = {k: data.pop(k) for k in stream_fields if k in data}
+        
+        # Nest them back into the dictionary
+        data["bgpstream_config"] = inner_data
+        return data

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pybgpkitstream
-Version: 0.1.9
+Version: 0.2.0
 Summary: Drop-in replacement for PyBGPStream using BGPKIT
 Author: JustinLoye
 Author-email: JustinLoye <jloye@iij.ad.jp>

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

@@ -2,11 +2,11 @@ pybgpkitstream/__init__.py,sha256=OGWVhZdSvialNkIkQ1VBrmiyOcwkCA1D5IaLo7WQnPI,20
 pybgpkitstream/bgpelement.py,sha256=7mXSUmWThhIbKy2JVsLchoteve0BshT3uH8cdbAe0Go,1176
 pybgpkitstream/bgpkitstream.py,sha256=CKQv7dU-ooznuD1AjHKnZ6qRdPH1ZiOIEGtVNtU8PCY,15062
 pybgpkitstream/bgpparser.py,sha256=aJcVCv_ydy3xQcH_BBxQE4hc7G1rLYqqNJAXCdnrasA,14689
-pybgpkitstream/bgpstreamconfig.py,sha256=DWnQkvmmpzuvU0RT6Ko4AokA795_HIi5xwpUhANsUN4,5465
+pybgpkitstream/bgpstreamconfig.py,sha256=vIfEN475WDIZ7kGmi3dnj_1GIQE_r6qkDFETZmMvH5E,6199
 pybgpkitstream/cli.py,sha256=E0E1hO0fzGhy1skBopRufdewsiSy_mA-J8Gf2WxBRxo,4214
 pybgpkitstream/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pybgpkitstream/utils.py,sha256=6FwEEpBtY_20BDlJPOPFmTYQGqw7fCBLjXmnd7gjBdQ,404
-pybgpkitstream-0.1.9.dist-info/WHEEL,sha256=eh7sammvW2TypMMMGKgsM83HyA_3qQ5Lgg3ynoecH3M,79
-pybgpkitstream-0.1.9.dist-info/entry_points.txt,sha256=aWhImGlXLtRKkfyJHudcbSp5K5As4ZGL8wXZC0y6q4o,60
-pybgpkitstream-0.1.9.dist-info/METADATA,sha256=CEiHubGgTr9Ef_L4e2fqh0pPo1F9UtIHBosKcXUoWe4,2953
-pybgpkitstream-0.1.9.dist-info/RECORD,,
+pybgpkitstream-0.2.0.dist-info/WHEEL,sha256=eh7sammvW2TypMMMGKgsM83HyA_3qQ5Lgg3ynoecH3M,79
+pybgpkitstream-0.2.0.dist-info/entry_points.txt,sha256=aWhImGlXLtRKkfyJHudcbSp5K5As4ZGL8wXZC0y6q4o,60
+pybgpkitstream-0.2.0.dist-info/METADATA,sha256=EBkydfiRKhgjAz4NotQqix2wX9uSHLK3iDQ_1oUSEqU,2953
+pybgpkitstream-0.2.0.dist-info/RECORD,,