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

easy_utils_dev/ept.py

@@ -254,6 +254,83 @@ class EPTManager :
         data = lget(db.execute_dict(query) , 0 , {})
         return data
 
+    def _create_crossconnections_table(self) : 
+        query = f"""
+        CREATE TABLE c_crossconnections AS
+        SELECT DISTINCT 
+            p.owner as wdmdemand, 
+            sh.number || '-' || sm.physicalslot || '-L' || p.portnumber as physicalslot ,
+            sh.type as shelftype ,
+            sh.number as shelfid , 
+            sm.physicalslot ,
+            ch.deployedname,
+            ch.name as eptname,
+            s.name as sitename , 
+            b.ot as boardtype ,
+            rch.name as channelnumber
+        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 OTtype b on b.OTtype = cp.type
+        JOIN wdmdemand ch ON p.owner = ch.id AND ch.category = 'Trail'
+        JOIN slot_mapping sm ON sh.type = sm.shelfType AND cp.slotid = sm.logicalSlot
+        JOIN channel rch ON rch.num = CAST(REPLACE(REPLACE(ch.assignedChannels_primary, '[', ''), ']', '') AS INTEGER)
+        WHERE ch.assignedChannels_primary IS NOT NULL
+        AND rch.name IS NOT NULL
+        AND cp.type IN (SELECT OTtype FROM OTtype WHERE otkind != 'alien' );
+        """
+        db = self.Database()
+        db.execute_dict(query)
+
+    def _create_card_inventory(self) : 
+        query = f"""
+        CREATE TABLE c_card_inventory AS
+        SELECT DISTINCT 
+            sh.number || '-' || pack.physicalslot AS slot,
+            sh.number AS shelfid, 
+            pack.physicalslot,
+            s.name AS sitename,
+            pack.apn,
+            COALESCE(ott.ot, pack.type) AS boardname,
+            pack.source_table
+        FROM (
+            -- Circuitpack → logicalSlot → physicalslot via slot_mapping
+            SELECT cp.id,
+                cp.parentId,
+                sm.physicalslot,
+                cp.type,
+                cp.apn,
+                'circuitpack' AS source_table
+            FROM circuitpack cp
+            JOIN shelf sh ON cp.parentId = sh.id
+            JOIN slot_mapping sm 
+                ON sh.type = sm.shelfType 
+                AND cp.slotid = sm.logicalSlot
+
+            UNION ALL
+
+            -- Commonpack → already has physicalslot
+            SELECT id,
+                parentId,
+                physicalslot,
+                type,
+                apn,
+                'commonpack' AS source_table
+            FROM commonpack
+        ) pack
+        JOIN shelf sh 
+            ON pack.parentId = sh.id
+        JOIN site s 
+            ON sh.grandparentId = s.id
+        LEFT JOIN OAtype ota 
+            ON ota.OAtype = pack.type
+        LEFT JOIN OTtype ott 
+            ON ott.OTtype = pack.type;
+        """
+        db = self.Database()
+        db.execute_dict(query)
+
     def convert_design(self , drop_cols=[] ) :
         start = getTimestamp()
         db = self.Database()
@@ -262,6 +339,8 @@ class EPTManager :
         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()
         end = getTimestamp()
         if os.path.exists(self.tmp_design_path) :
             os.remove(self.tmp_design_path)

easy_utils_dev/ept_sql/create_dirs.sql

@@ -0,0 +1,82 @@
+BEGIN;
+
+-- 1) Mapping table: (shelfType, logicalSlot) -> physicalSlot
+CREATE TABLE IF NOT EXISTS slot_mapping (
+  shelfType    TEXT    NOT NULL,
+  logicalSlot  INTEGER NOT NULL,
+  physicalSlot INTEGER NOT NULL,
+  PRIMARY KEY (shelfType, logicalSlot)
+);
+
+-- Clean existing rows so script is idempotent without dialect-specific UPSERT
+DELETE FROM slot_mapping;
+
+-- PSS32 (32 slots)
+INSERT INTO slot_mapping (shelfType, logicalSlot, physicalSlot) VALUES
+('PSS32',1,2),('PSS32',2,20),('PSS32',3,3),('PSS32',4,21),
+('PSS32',5,4),('PSS32',6,22),('PSS32',7,5),('PSS32',8,23),
+('PSS32',9,6),('PSS32',10,24),('PSS32',11,7),('PSS32',12,25),
+('PSS32',13,8),('PSS32',14,26),('PSS32',15,9),('PSS32',16,27),
+('PSS32',17,10),('PSS32',18,28),('PSS32',19,11),('PSS32',20,29),
+('PSS32',21,12),('PSS32',22,30),('PSS32',23,13),('PSS32',24,31),
+('PSS32',25,14),('PSS32',26,32),('PSS32',27,15),('PSS32',28,33),
+('PSS32',29,16),('PSS32',30,34),('PSS32',31,17),('PSS32',32,35);
+
+-- PSS16II (16 slots)
+INSERT INTO slot_mapping (shelfType, logicalSlot, physicalSlot) VALUES
+('PSS16II',1,3),('PSS16II',2,13),('PSS16II',3,4),('PSS16II',4,14),
+('PSS16II',5,5),('PSS16II',6,15),('PSS16II',7,6),('PSS16II',8,16),
+('PSS16II',9,7),('PSS16II',10,17),('PSS16II',11,8),('PSS16II',12,18),
+('PSS16II',13,9),('PSS16II',14,19),('PSS16II',15,10),('PSS16II',16,20);
+
+-- PSS16 (same mapping as PSS16II)
+INSERT INTO slot_mapping (shelfType, logicalSlot, physicalSlot) VALUES
+('PSS16',1,3),('PSS16',2,13),('PSS16',3,4),('PSS16',4,14),
+('PSS16',5,5),('PSS16',6,15),('PSS16',7,6),('PSS16',8,16),
+('PSS16',9,7),('PSS16',10,17),('PSS16',11,8),('PSS16',12,18),
+('PSS16',13,9),('PSS16',14,19),('PSS16',15,10),('PSS16',16,20);
+
+-- PSS8 (8 slots)
+INSERT INTO slot_mapping (shelfType, logicalSlot, physicalSlot) VALUES
+('PSS8',1,2),('PSS8',2,8),('PSS8',3,3),('PSS8',4,9),
+('PSS8',5,4),('PSS8',6,10),('PSS8',7,5),('PSS8',8,11);
+
+-- 2) Helpful indexes
+CREATE INDEX IF NOT EXISTS idx_circuitpack_parent     ON circuitpack(parentId);
+CREATE INDEX IF NOT EXISTS idx_circuitpack_wdmline    ON circuitpack(wdmline);
+CREATE INDEX IF NOT EXISTS idx_circuitpack_slotid     ON circuitpack(slotid);
+CREATE INDEX IF NOT EXISTS idx_shelf_id               ON shelf(id);
+CREATE INDEX IF NOT EXISTS idx_shelf_grandparent      ON shelf(grandparentId);
+CREATE INDEX IF NOT EXISTS idx_shelf_type             ON shelf(type);
+CREATE INDEX IF NOT EXISTS idx_line_id                ON "line"(id);
+CREATE INDEX IF NOT EXISTS idx_line_span              ON "line"(span);
+CREATE INDEX IF NOT EXISTS idx_site_id                ON site(id);
+
+-- 3) View that reproduces get_all_dirs()
+DROP VIEW IF EXISTS v_dirs;
+CREATE VIEW v_dirs AS
+SELECT
+  src.name AS sourceNe,
+  dst.name AS destinationNe,
+  cp.type  AS board,
+  sm.physicalSlot AS physicalslot,
+  (sh.number || '/' || sm.physicalSlot) AS slot,
+  sh.type AS shelfType,
+  cp.id   AS circuitpack_id,
+  sh.id   AS shelf_id,
+  l1.span AS span_id,
+  src.id  AS source_site_id,
+  dst.id  AS destination_site_id
+FROM circuitpack cp
+JOIN shelf sh            ON sh.id = cp.parentId
+JOIN site src            ON src.id = sh.grandparentId
+JOIN "line" l1           ON l1.id = cp.wdmline
+JOIN "line" l2           ON l2.span = l1.span AND l2.grandparentId <> sh.grandparentId
+JOIN site dst            ON dst.id = l2.grandparentId
+WHERE cp.packIDRef IS NOT NULL
+  AND cp.type IN (
+    SELECT packName FROM OAtype
+    WHERE packName IS NOT NULL OR packName != ''
+  );
+
+COMMIT;

{easy_utils_dev-2.128.dist-info → easy_utils_dev-2.130.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: easy-utils-dev
-Version: 2.128
+Version: 2.130
 Keywords: python3
 Classifier: Programming Language :: Python :: 3
 Requires-Dist: psutil

{easy_utils_dev-2.128.dist-info → easy_utils_dev-2.130.dist-info}/RECORD

@@ -11,7 +11,7 @@ easy_utils_dev/custom_env.py,sha256=vxrjikpSNJlKfoBE-ef88UExlpXucUe-HcwHMn3gfB0,
 easy_utils_dev/debugger.py,sha256=08lYSg9Mx0l440aCk4Z1ofNUlN9pTL9um2CL_cCyUKs,18305
 easy_utils_dev/easy_oracle.py,sha256=Jyc3HSl6eyLayjS8NoE4GOaf8otQlonR5_qOg2h1DjE,2157
 easy_utils_dev/encryptor.py,sha256=f5Zjn0DGtXCyhldpVnBtfcTb4h4Wp0eQPHusEYwIags,1512
-easy_utils_dev/ept.py,sha256=SQfp77FwXbWohfS2JzMghoIhWRjo-oqbOZacWiVm49k,12918
+easy_utils_dev/ept.py,sha256=Xt5jck4PpBlump7oaF76qwCVWIKMBiKVb91MtUQ5AEY,15817
 easy_utils_dev/exceptions.py,sha256=6eTYBa8AIXC0wI6zgkqsLreSXyPf459G-ToO7ziQuK4,1669
 easy_utils_dev/filescompressor.py,sha256=iKAtLfkEXOuvvqF56jH0D9KAAeZ7iaa_sRaJnyYkxiE,2875
 easy_utils_dev/generate_license.py,sha256=fr_eoSjKCmDmAEBc6FWFXZxGQOHx9XO6hEK8dcyVUlA,3319
@@ -29,7 +29,8 @@ easy_utils_dev/utils.py,sha256=BmVnbxc336c6WTeDFcEHN6Mavt7fJrIEyK4GXODV3gI,13345
 easy_utils_dev/winserviceapi.py,sha256=2ZP6jaSt1-5vEJYXqwBhwX-1-eQ3V3YzntsoOoko2cw,18804
 easy_utils_dev/wsnoclib.py,sha256=tC-RmjddaLpihPCRBLGC2RnRpFJqexhvExUr1KncoQM,29063
 easy_utils_dev/wsselib.py,sha256=YweScnoAAH_t29EeIjBpkQ6HtX0Rp9mQudRsRce2SE8,7920
-easy_utils_dev-2.128.dist-info/METADATA,sha256=Sj8wdN5Dz9Wk0OFol4zVd6a7vATyfrb3KYUUiCjNjDA,510
-easy_utils_dev-2.128.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-easy_utils_dev-2.128.dist-info/top_level.txt,sha256=7vBsrpq7NmilkdU3YUvfd5iVDNBaT07u_-ut4F7zc7A,15
-easy_utils_dev-2.128.dist-info/RECORD,,
+easy_utils_dev/ept_sql/create_dirs.sql,sha256=Tdd7eaZ1BmIe9DY4gnt2VQ0y_TSYWe9DxObfW2UbL-c,3510
+easy_utils_dev-2.130.dist-info/METADATA,sha256=mgX9tbXKj4qsu2O4nWqTK6InvEKnyVrjoSLzdTMJMsA,510
+easy_utils_dev-2.130.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+easy_utils_dev-2.130.dist-info/top_level.txt,sha256=7vBsrpq7NmilkdU3YUvfd5iVDNBaT07u_-ut4F7zc7A,15
+easy_utils_dev-2.130.dist-info/RECORD,,