umnetdb-utils 0.1.2__py3-none-any.whl → 0.1.4__py3-none-any.whl

umnetdb_utils/base.py

@@ -1,4 +1,5 @@
 
+from typing import Union
 from os import getenv
 import re
 import logging
@@ -78,7 +79,7 @@ class UMnetdbBase:
 
         raise AttributeError(self)
 
-    def _build_select(self, select, table, joins=None, where=None, order_by=None, limit=None, group_by=None, distinct=False):
+    def _build_select(self, select, table, joins=None, where=None, order_by=None, limit=None, group_by=None, distinct=False) -> str:
         '''
         Generic 'select' query string builder built from standard query components as input.
         The user is required to generate substrings for the more complex inputs
@@ -137,7 +138,7 @@ class UMnetdbBase:
 
         return sql
 
-    def _execute(self, sql, rows_as_dict=True):
+    def _execute(self, sql:str, rows_as_dict:bool=True, fetch_one:bool=False):
         '''
         Generic sqlalchemy "open a session, execute this sql command and give me all the results"
 
@@ -146,21 +147,23 @@ class UMnetdbBase:
         scripts that import the child class to use the context manager and execute multiple
         mehtods within the same session.
         '''
-        with self as session:
-            r = session.execute(text(sql))
-            rows = r.fetchall()
+        with self.engine.begin() as c:
+            r = c.execute(text(sql))
 
+        rows = r.fetchall()
         if rows and rows_as_dict:
             return [r._mapping for r in rows]
         elif rows:
             return rows
         else:
             return []
+
         
-    def execute(self, sql:str, rows_as_dict:bool=True, fetch_one:bool=False):
+    def execute(self, sql:str, rows_as_dict:bool=True, fetch_one:bool=False) -> Union[list[dict],dict]:
         """
-        Executes a sqlalchemy command and gives all the results. Does not open a session - you must
-        open one yourself
+        Executes a sqlalchemy command and gives all the results as a list of dicts, or as a dict
+        if 'fetch_one' is set to true.
+        Does not open a session - you must open one yourself.
         """
         result = self.session.execute(text(sql))
 
@@ -168,6 +171,6 @@ class UMnetdbBase:
             result = result.mappings()
 
         if fetch_one:
-            return result.fetchone()
+            return dict(result.fetchone())
         
-        return result.fetchall()
+        return [dict(r) for r in result.fetchall()]

umnetdb_utils/umnetdb.py

@@ -1,6 +1,7 @@
 
 from typing import List
 import logging
+import re
 
 
 from sqlalchemy import text
@@ -22,7 +23,8 @@ class UMnetdb(UMnetdbBase):
         up in lldp neighbor.
 
         Setting 'known_devices_only' to true only returns neighbors that are found
-        in umnet_db's device table. Setting it to false will return all lldp neighbors.
+        in umnet_db's device table. Setting it to false will return all lldp neighbors
+        and will include things like phones and APs
 
         Returns results as a list of dictionary entries keyed on column names.
         """
@@ -56,14 +58,12 @@ class UMnetdb(UMnetdbBase):
 
         table = "neighbor n"
 
-
-
         where = [f"n.device='{device}'"]
 
         query = self._build_select(select, table, joins, where)
-        result = self.session.execute(text(query))
 
-        return [dict(zip(result.keys(), r)) for r in result]
+        return self.execute(query)
+
     
 
     def get_dlzone(self, zone_name:str) -> List[dict]:
@@ -95,18 +95,24 @@ class UMnetdb(UMnetdbBase):
 
             # note that by default this method only returns neighbors in the 'device' table,
             # any others are ignored
-            neighs = self.get_device_neighbors(device)
-
+            neighs = self.get_neighbors(device)
+            devices_by_name[device]["neighbors"] = {}
             for neigh in neighs:
-                if neigh["remote_device"].startswith("s-"):
 
-                    query = self._build_select(select=device_cols, table="device", where=f"name = '{neigh['remote_device']}'")
-                    neigh_device = self.execute(query, fetch_one=True)
+                # only want 'd- or 'dl-' or 's-' devices
+                if re.match(r"(dl?|s)-", neigh["remote_device"]):
 
-                    if neigh_device["name"] not in devices_by_name:
-                        todo.append(neigh_device["name"])
+                    # adding neighbor to local device's neighbor list
+                    devices_by_name[device]["neighbors"][neigh["port"]] = {k:v for k,v in neigh.items() if k != "port"}
 
-                    devices_by_name[neigh_device["name"]] = neigh_device
+                    # if we haven't seen this neighbor yet, pull data from our device table for it, and
+                    # add it to our 'to do' list to pull its neighbors.
+                    if neigh["remote_device"] not in devices_by_name:
 
+                        query = self._build_select(select=device_cols, table="device", where=f"name = '{neigh['remote_device']}'")
+                        neigh_device = self.execute(query, fetch_one=True)
+                        devices_by_name[neigh_device["name"]] = neigh_device
+                
+                        todo.append(neigh_device["name"])
 
         return list(devices_by_name.values())

{umnetdb_utils-0.1.2.dist-info → umnetdb_utils-0.1.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: umnetdb-utils
-Version: 0.1.2
+Version: 0.1.4
 Summary: Helper classes for querying UMnet databases
 License: MIT
 Author: Amy Liebowitz

{umnetdb_utils-0.1.2.dist-info → umnetdb_utils-0.1.4.dist-info}/RECORD

@@ -1,10 +1,10 @@
 umnetdb_utils/__init__.py,sha256=QJaytbr4ccKESiwaKjpf1b4b8s2cHNfCDdnCOs1tmoI,131
-umnetdb_utils/base.py,sha256=aIcCdeQ2FTrWV4Az_gdPc-aXuEwRjhef1Xj9SVak438,5878
-umnetdb_utils/umnetdb.py,sha256=O-JLqyECPC5sGcUf2ICEKWVR1oAaOaH8H6GY2eYd3BQ,4065
+umnetdb_utils/base.py,sha256=aC5oKSB5Ox9QtylmHV2uvEUVUx4CRLZTgH6HpQJ6DZo,6064
+umnetdb_utils/umnetdb.py,sha256=IxqpAcPZn71HVV_oL3ryvbKS7cupUsyM6rJSGk6NLaU,4554
 umnetdb_utils/umnetdisco.py,sha256=Z2XwT79jKO_avd3w_z99DDEdAikrfKxYm1JYHRWqvG4,7841
 umnetdb_utils/umnetequip.py,sha256=jOW5kvk0FXtdHv8PA4rYT_PWfLdMiq83Mjwmy-c1DN8,5701
 umnetdb_utils/umnetinfo.py,sha256=MH1YDW4OWtHD46qfYb5Pv40vPSbL0GrMNW5gAhdlihE,18445
 umnetdb_utils/utils.py,sha256=wU6QMYfofj7trX3QeqXty0btbGdhP_RUaSqA7QTflFM,991
-umnetdb_utils-0.1.2.dist-info/METADATA,sha256=hHifN_wH6Qe-222YqMLtXmC3l2Iq5f83zsNxgzbdjtY,1555
-umnetdb_utils-0.1.2.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-umnetdb_utils-0.1.2.dist-info/RECORD,,
+umnetdb_utils-0.1.4.dist-info/METADATA,sha256=JI2hwHkX3B8y-GLwS0yywAiFszcqUlkiWUyga0A2KaY,1555
+umnetdb_utils-0.1.4.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+umnetdb_utils-0.1.4.dist-info/RECORD,,