annet 0.16.22__py3-none-any.whl → 0.16.24__py3-none-any.whl

annet/annlib/tabparser.py

@@ -354,15 +354,12 @@ class ArubaFormatter(BlockExitFormatter):
         return self.split_remove_spaces(text)
 
 
-class AristaFormatter(CiscoFormatter):
-
-    def block_exit(self, context: Optional[FormatterContext]) -> str:
-        current = context and context.row or ""
+class AristaFormatter(BlockExitFormatter):
+    def __init__(self, indent="  "):
+        super().__init__("exit", indent)
 
-        if current.startswith(("address-family")):
-            yield from block_wrapper("exit")
-        else:
-            yield from super().block_exit(context)
+    def split(self, text):
+        return self.split_remove_spaces(text)
 
 
 class AsrFormatter(BlockExitFormatter):

annet/api/__init__.py

@@ -799,12 +799,20 @@ def guess_hw(config_text: str):
         hw = hw_provider.vendor_to_hw(vendor)
         fmtr = tabparser.make_formatter(hw)
         rb = rulebook.get_rulebook(hw)
-        config = tabparser.parse_to_tree(config_text, fmtr.split)
+        try:
+            config = tabparser.parse_to_tree(config_text, fmtr.split)
+        except Exception:
+            continue
         pre = patching.make_pre(patching.make_diff({}, config, rb, []))
         metric = _count_pre_score(pre)
         scores[metric] = hw
+
+    if not scores:
+        raise RuntimeError("No formatter was guessed")
+
     max_score = max(scores.keys())
     hw = scores[max_score]
+
     return hw, max_score
 
 

{annet-0.16.22.dist-info → annet-0.16.24.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: annet
-Version: 0.16.22
+Version: 0.16.24
 Summary: annet
 Home-page: https://github.com/annetutil/annet
 License: MIT

{annet-0.16.22.dist-info → annet-0.16.24.dist-info}/RECORD

@@ -50,7 +50,7 @@ annet/annlib/jsontools.py,sha256=DVmA6kmKGSCsKrFnag4EMR1WKe39Owlvzpfdo726ufk,547
 annet/annlib/lib.py,sha256=eJ4hcVuQ6pdYBzLs4YKCHFtq45idOfZCYp92XfF7_QI,15317
 annet/annlib/output.py,sha256=_SjJ6G6bejvnTKqNHw6xeio0FT9oO3OIkLaOC3cEga4,7569
 annet/annlib/patching.py,sha256=2CpAT3T43IUFJR57qTYSwjQ0smg0uHWN43df4n1WArs,19937
-annet/annlib/tabparser.py,sha256=tyTGtad90EfiQq9oNdCx8mEJ5edGcmKMXgoGwPLKrw4,29086
+annet/annlib/tabparser.py,sha256=Xsje7t2bEZqZ8hhgnEYgjQGaDZ5mBWgNxwE2wpCkwXQ,28961
 annet/annlib/types.py,sha256=VHU0CBADfYmO0xzB_c5f-mcuU3dUumuJczQnqGlib9M,852
 annet/annlib/netdev/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annet/annlib/netdev/db.py,sha256=fI_u5aya4l61mbYSjj4JwlVfi3s7obt2jqERSuXGRUI,1634
@@ -67,7 +67,7 @@ annet/annlib/rbparser/platform.py,sha256=hnxznTfV9txXi1PkR1hZrprTrQJvlwgqXVL8vXk
 annet/annlib/rbparser/syntax.py,sha256=iZ7Y-4QQBw4L3UtjEh54qisiRDhobl7HZxFNdP8mi54,3577
 annet/annlib/rulebook/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annet/annlib/rulebook/common.py,sha256=bx_Iwui-JJeyctUPF1OsEll0Aa-IQZadBPQjaeuoWgw,16638
-annet/api/__init__.py,sha256=7EB3d89kGXKf4Huw7cqyOULTGC9ydL4sHiVw8K0Aeqg,33722
+annet/api/__init__.py,sha256=dgdyBDeFhBVBwKB8QVOOTZ2LZvi0fEcVGfOQEUQyDHo,33863
 annet/configs/context.yml,sha256=RVLrKLIHpCty7AGwOnmqf7Uu0iZQCn-AjYhophDJer8,259
 annet/configs/logging.yaml,sha256=EUagfir99QqA73Scc3k7sfQccbU3E1SvEQdyhLFtCl4,997
 annet/generators/__init__.py,sha256=rVHHDTPKHPZsml1eNEAj3o-8RweFTN8J7LX3tKMXdIY,16402
@@ -164,10 +164,10 @@ annet_generators/rpl_example/__init__.py,sha256=z4-gsDv06BBpgTwRohc50VBQYFD26QVu
 annet_generators/rpl_example/items.py,sha256=6x7b0wZ7Vjn6yCaJ-aGbpTHm7fyqO77b-LRqzzhEbh4,615
 annet_generators/rpl_example/policy_generator.py,sha256=KFCqn347CIPcnllOHfINYeKgNSr6Wl-bdM5Xj_YKhYM,11183
 annet_generators/rpl_example/route_policy.py,sha256=QjxFjkePHfTo2CpMeRVaDqZXNXLM-gGlE8EocHuOR4Y,1189
-annet-0.16.22.dist-info/AUTHORS,sha256=rh3w5P6gEgqmuC-bw-HB68vBCr-yIBFhVL0PG4hguLs,878
-annet-0.16.22.dist-info/LICENSE,sha256=yPxl7dno02Pw7gAcFPIFONzx_gapwDoPXsIsh6Y7lC0,1079
-annet-0.16.22.dist-info/METADATA,sha256=frHIxkxuAjOtU1YOrES7-G9ENwzZeGgD2MNLc3TrW6g,728
-annet-0.16.22.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-annet-0.16.22.dist-info/entry_points.txt,sha256=5lIaDGlGi3l6QQ2ry2jZaqViP5Lvt8AmsegdD0Uznck,192
-annet-0.16.22.dist-info/top_level.txt,sha256=QsoTZBsUtwp_FEcmRwuN8QITBmLOZFqjssRfKilGbP8,23
-annet-0.16.22.dist-info/RECORD,,
+annet-0.16.24.dist-info/AUTHORS,sha256=rh3w5P6gEgqmuC-bw-HB68vBCr-yIBFhVL0PG4hguLs,878
+annet-0.16.24.dist-info/LICENSE,sha256=yPxl7dno02Pw7gAcFPIFONzx_gapwDoPXsIsh6Y7lC0,1079
+annet-0.16.24.dist-info/METADATA,sha256=130Nbd58J6hQQ0ceLhvJwc6qNBRjfTcMVbd0WXEPy8w,728
+annet-0.16.24.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+annet-0.16.24.dist-info/entry_points.txt,sha256=5lIaDGlGi3l6QQ2ry2jZaqViP5Lvt8AmsegdD0Uznck,192
+annet-0.16.24.dist-info/top_level.txt,sha256=QsoTZBsUtwp_FEcmRwuN8QITBmLOZFqjssRfKilGbP8,23
+annet-0.16.24.dist-info/RECORD,,