easy-utils-dev 2.130__py3-none-any.whl → 2.132__py3-none-any.whl

easy_utils_dev/ept.py

@@ -1,7 +1,7 @@
 import xml.etree.ElementTree as ET
 from bs4 import BeautifulSoup    
 from easy_utils_dev.simple_sqlite import initDB
-from easy_utils_dev.utils import getRandomKey , getTimestamp , lget , mkdirs
+from easy_utils_dev.utils import getRandomKey , getTimestamp , lget , mkdirs , start_thread
 import json , os , glob
 from easy_utils_dev.FastQueue import FastQueue
 from easy_utils_dev.debugger import DEBUGGER 
@@ -174,7 +174,6 @@ class EPTManager :
     def _create_v_dirs(self) :
         db = self.Database()
         dirs = self.get_all_dirs()
-
         db.createTable(
             'c_dirs' ,
             data=[
@@ -256,7 +255,7 @@ class EPTManager :
 
     def _create_crossconnections_table(self) : 
         query = f"""
-        CREATE TABLE c_crossconnections AS
+        CREATE VIEW c_crossconnections AS
         SELECT DISTINCT 
             p.owner as wdmdemand, 
             sh.number || '-' || sm.physicalslot || '-L' || p.portnumber as physicalslot ,
@@ -283,9 +282,96 @@ class EPTManager :
         db = self.Database()
         db.execute_dict(query)
 
+    def _create_ports_inventory(self) : 
+        query = f"""
+        CREATE VIEW c_port_inventory AS
+        select 
+            p.pluggable as moduletype, 
+            p.pluggableapn as partnumber,
+            p.portnumber,
+            p.connectortype,
+            cp.slotid,
+            cp.id as eptpackid , 
+            p.id as eptpid , 
+            sh.id as eptshid , 
+            s.id as eptsid , 
+            sh.number as shelfid,
+            sm.physicalslot,
+            s.name as sitename,
+            CASE 
+                WHEN p.connectortype LIKE 'Line%' 
+                    THEN sh.number || '-' || sm.physicalslot || '-L' || p.portnumber
+                WHEN p.connectortype LIKE 'Client%' 
+                    THEN sh.number || '-' || sm.physicalslot || '-C' || p.portnumber
+                WHEN p.connectortype LIKE '%VOA%' 
+                    THEN sh.number || '-' || sm.physicalslot || '-VA' || p.portnumber
+                ELSE NULL
+            END as custom_portname ,
+            CASE 
+                WHEN p.pluggable IS NULL AND physicalslot IS NOT NULL  AND p.pluggableapn is NULL
+                    THEN 'free'
+                ELSE 'busy'
+            END as portstatus
+        from port p
+        JOIN circuitpack cp ON p.parentId = cp.id 
+        JOIN shelf sh ON cp.parentId = sh.id
+        JOIN site s ON sh.grandparentId = s.id
+        JOIN slot_mapping sm ON sh.type = sm.shelfType AND cp.slotid = sm.logicalSlot
+        JOIN OTtype ot ON ot.OTtype = cp.type 
+        WHERE ( p.connectortype IS NOT NULL ) ;
+        """
+        db = self.Database()
+        db.execute_dict(query)
+
+    def _create_enhanced_dirs(self) : 
+        query = f"""
+        CREATE VIEW c_enhanced_dirs AS
+        select DISTINCT
+        line.id as eptlineid , 
+        line.span as spanid , 
+        site.id as eptsitenameid ,
+        spn.name as eptsegementname , 
+        line.wdmlink as wdmlinkid ,
+        cp.type as boardtype ,
+        sh.type as shelftype,
+        sp.physicalslot as slot ,
+        sh.number as shelfid ,
+        site.name as sitename ,
+        segt.id as segementid , 
+
+        CASE
+            WHEN segt2.asite = site.id THEN site_b.name
+            WHEN segt2.bsite = site.id THEN site_a.name
+        END AS farsitename,
+
+        CASE 
+            WHEN segtinfo.orient = 'AB' AND segt2.asite = site.id THEN segtinfo.dist
+            WHEN segtinfo.orient = 'AB' AND segt2.bsite = site.id THEN segtinfo.dist
+            WHEN segtinfo.orient = 'BA' AND segt2.asite = site.id THEN segtinfo.dist
+            WHEN segtinfo.orient = 'BA' AND segt2.bsite = site.id THEN segtinfo.dist
+        END AS distance ,
+        sh.number || "-" || sp.physicalSlot as fullslot 
+        from line 
+        JOIN circuitpack cp ON cp.wdmline = line.id AND ( cp.packIDRef IS NOT NULL OR cp.type = oa.OAtype )
+        JOIN site on site.id = sh.grandparentId
+        JOIN OAtype as oa
+        JOIN shelf sh ON sh.id = cp.parentId
+        JOIN slot_mapping sp on sp.logicalSlot = cp.slotid  AND sh.type = sp.shelftype
+        JOIN span spn ON spn.id = line.span AND spn.ashelfset IS NOT NULL
+        JOIN segt ON segt.grandparentId = spn.id 
+        JOIN segt segt2 ON segt.id = segt2.id AND segt2.asite IS NOT NULL
+        JOIN segtinfo ON segtinfo.parentId = segt.id 
+        JOIN site AS site_a ON site_a.id = segt2.asite
+        JOIN site AS site_b ON site_b.id = segt2.bsite
+        GROUP BY line.id ;
+
+        """
+        db = self.Database()
+        db.execute_dict(query)
+
     def _create_card_inventory(self) : 
         query = f"""
-        CREATE TABLE c_card_inventory AS
+        CREATE VIEW c_card_inventory AS
         SELECT DISTINCT 
             sh.number || '-' || pack.physicalslot AS slot,
             sh.number AS shelfid, 
@@ -331,16 +417,55 @@ class EPTManager :
         db = self.Database()
         db.execute_dict(query)
 
+    def _create_shelf_inventory(self) : 
+        query = f"""
+        CREATE VIEW c_shelf_info AS
+        SELECT 
+            sh.type AS  shelftype ,
+            sh.number AS shelfnumber,
+            sh.apn AS partnumber ,
+            st.name AS sitename
+        FROM shelf sh
+        JOIN site st ON st.id = sh.grandparentId
+        WHERE sh.number != 0
+        UNION ALL
+        SELECT 
+            cp.type AS  shelftype ,
+            cp.dcmpseudoshelf AS shelfnumber,
+            cp.apn AS partnumber ,
+            st.name as sitename 
+        FROM circuitpack cp
+        JOIN shelf sh ON sh.id = cp.parentId
+        JOIN site st ON sh.grandparentId = st.id 
+        WHERE cp.dcmpseudoshelf IS NOT NUll ;
+        """
+        db = self.Database()
+        db.execute_dict(query)
+
+    def _create_site_tmp_table(self) : 
+        query = f"""
+        CREATE TABLE c_tmp_site_view AS
+        SELECT * FROM site;
+        """
+        db = self.Database()
+        db.execute_dict(query)
+
     def convert_design(self , drop_cols=[] ) :
         start = getTimestamp()
         db = self.Database()
         self.parse()
         self.create_ept_columns(drop_cols=drop_cols)
         self.create_ept_rows()
-        db.execute_script(f"{os.path.join(__LIBPATH__ , 'ept_sql' , 'create_dirs.sql')}")
-        self._create_v_dirs()
-        self._create_crossconnections_table()
-        self._create_card_inventory()
+        # db.execute_script(f"{os.path.join(__LIBPATH__ , 'ept_sql' , 'create_dirs.sql')}")
+        a = start_thread(self._create_v_dirs , daemon=True)
+        b = start_thread(self._create_crossconnections_table , daemon=True)
+        c = start_thread(self._create_card_inventory , daemon=True)
+        d = start_thread(self._create_shelf_inventory , daemon=True)
+        s = start_thread(self._create_site_tmp_table , daemon=True)
+        s = start_thread(self._create_ports_inventory , daemon=True)
+        s = start_thread(self._create_enhanced_dirs , daemon=True)
+        a.join() ; b.join() ; c.join() ; d.join() ; s.join()
+        
         end = getTimestamp()
         if os.path.exists(self.tmp_design_path) :
             os.remove(self.tmp_design_path)
@@ -350,7 +475,7 @@ class EPTManager :
         db = self.Database()
         packs = self.get_all_amplifiers()
         _packs = []
-        def __g_p(pack) : 
+        for pack in packs : 
             parentId = pack['parentId']
             wdmline = pack['wdmline']
             shelf = self.get_shelf_data_by_id(parentId)
@@ -385,9 +510,6 @@ class EPTManager :
                 'SHELFTYPE' : shelfType ,
             })
             self.logger.debug(f"Source:{sourceNE}/{fullSlot}/{pack.get('type')} -> {spanId} -> {DestinationNE}")
-        for pack in packs : 
-            self.queue.addToQueue(action=__g_p , actionArgs={'pack' : pack})
-        self.queue.runQueue(maxRequests=10)
         return _packs