itkdb-gtk 0.10.9.dev4__tar.gz → 0.10.10.dev2__tar.gz

{itkdb_gtk-0.10.9.dev4 → itkdb_gtk-0.10.10.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: itkdb_gtk
-Version: 0.10.9.dev4
+Version: 0.10.10.dev2
 Summary: A collection of Gtk based GUI to access ITkDB.
 Author-email: Carlos Lacasta <carlos.lacasta@cern.ch>
 Project-URL: Homepage, https://gitlab.cern.ch/atlas-itk/sw/db/itk-pdb-gtk-gui-utils

{itkdb_gtk-0.10.9.dev4 → itkdb_gtk-0.10.10.dev2}/itkdb_gtk/CreateShipments.py

@@ -19,7 +19,7 @@ from itkdb_gtk import dbGtkUtils, ITkDBlogin, ITkDButils
 
 import gi
 gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk, Gio, GLib
+from gi.repository import Gtk, Gio
 
 # Check if Gtk can be open
 gtk_runs, gtk_args = Gtk.init_check()
@@ -181,6 +181,9 @@ class CreateShipments(dbGtkUtils.ITkDBWindow):
         # For the later we get the SN in the argument list.
         if isinstance(args[0], Gtk.Button):
             txt = dbGtkUtils.get_a_value("Enter item SN", is_tv=True)
+            if txt is None:
+                return
+
             tmp = re.split(';|,| |\n|\t', txt)
             SNlist = [s.strip() for s in tmp if len(s.strip())>0]
         else:
@@ -346,7 +349,7 @@ class CreateShipments(dbGtkUtils.ITkDBWindow):
                 self.tree.set_model(model)
                 self.comments.set_text("")
                 self.name.set_text("")
-                self.attachments = None
+                self.attachment = None
 
         else:
             self.write_message("Empty list of items when creating shipment.")

{itkdb_gtk-0.10.9.dev4 → itkdb_gtk-0.10.10.dev2}/itkdb_gtk/GetShipments.py

@@ -44,7 +44,7 @@ def find_vtrx(client, SN):
 class ReceiveShipments(dbGtkUtils.ITkDBWindow):
     """Find shipments related to given recipient."""
 
-    def __init__(self, session, recipient="IFIC", help_link=None):
+    def __init__(self, session, recipient=None, help_link=None):
         """Initialization.
 
         Args:
@@ -52,7 +52,6 @@ class ReceiveShipments(dbGtkUtils.ITkDBWindow):
             recipient: default recipient
 
         """
-        self.recipient = recipient
         self.state = "inTransit"
         self.institute = None
         self.model = None
@@ -62,11 +61,15 @@ class ReceiveShipments(dbGtkUtils.ITkDBWindow):
 
         global gtk_runs
         if gtk_runs:
-            super().__init__(session=session, title="Upload AVS Data",
+            super().__init__(session=session, title="Receive Shipments",
                              show_search="Click to search shipments",
                              gtk_runs=gtk_runs, help_link=help_link)
 
+            self.recipient = self.pdb_user["institutions"][0]["code"]
             self.init_window()
+        else:
+            pdb_user = ITkDButils.get_db_user(session)
+            self.recipient = pdb_user["institutions"][0]["code"]
 
     def init_window(self):
         """Initialize window."""
@@ -93,7 +96,7 @@ class ReceiveShipments(dbGtkUtils.ITkDBWindow):
         self.mainBox.pack_start(grid, False, True, 0)
 
         # The shipment receiver
-        receiver = self.create_institute_combo()
+        receiver = self.create_institute_combo(only_user=True)
         receiver.connect("changed", self.on_receiver)
         receiver.set_tooltip_text("Select the Institute receiving the items.")
         dbGtkUtils.set_combo_iter(receiver, self.recipient)
@@ -198,21 +201,6 @@ class ReceiveShipments(dbGtkUtils.ITkDBWindow):
 
         return True
 
-    def get_institute_list(self):
-        """Get the institute list."""
-        sites = self.session.get("listInstitutions", json={})
-        liststore = Gtk.ListStore(str, str)
-        for site in sites:
-            self.code2inst[site['code']] = site['name']
-            self.inst2code[site['name']] = site['code']
-            liststore.append([site["code"], site["code"]])
-            liststore.append([site["name"], site["code"]])
-
-        completion = Gtk.EntryCompletion()
-        completion.set_model(liststore)
-        completion.set_text_column(0)
-        return completion
-
     def on_cell_toggled(self, widget, path):
         """A cell has been toggled."""
         model = self.tree.get_model()
@@ -249,30 +237,12 @@ class ReceiveShipments(dbGtkUtils.ITkDBWindow):
 
         self.state = name
 
-    def get_institute_from_combo(self, combo):
-        """Get Institute from combo."""
-        tree_iter = combo.get_active_iter()
-        if tree_iter is not None:
-            model = combo.get_model()
-            name = model[tree_iter][1]
-
-        else:
-            name = combo.get_child().get_text()
-            if name in self.inst2code:
-                name = self.inst2code[name]
-
-            elif name not in self.code2inst:
-                name = None
-
-        return name
-
     def on_receiver(self, combo):
         """Sets the recipient."""
         name = self.get_institute_from_combo(combo)
         if name:
             self.recipient = name
-            hb = self.get_titlebar()
-            hb.props.title = "{} shipments".format(self.recipient)
+            self.set_window_title("{} shipments".format(self.recipient))
 
     def on_institute(self, combo):
         """New institute chosen."""
@@ -286,12 +256,14 @@ class ReceiveShipments(dbGtkUtils.ITkDBWindow):
 
     def query_db(self, *args):
         """Query for shipments in DB."""
-        if self.institute is None or self.state == "":
+        if self.state == "":
             return
 
         payload = {
-            "code": self.recipient,
-            "status": self.state
+            "filterMap": {
+                "code": self.recipient,
+                "status": self.state
+            }
         }
         shpmts = self.session.get("listShipmentsByInstitution", json=payload)
 
@@ -300,7 +272,11 @@ class ReceiveShipments(dbGtkUtils.ITkDBWindow):
         # the tree view.
         cmb_store = Gtk.ListStore(str, str)
         for s in shpmts:
-            if s["recipient"]["code"] == self.recipient and s['sender']['code'] == self.institute:
+            valid_sender = True
+            if self.institute is not None:
+                valid_sender = s['sender']['code'] == self.institute
+                
+            if s["recipient"]["code"] == self.recipient and valid_sender:
                 store = self.get_tree_view_model()
                 cmb_store.append([s['name'], s['id']])
                 items = self.session.get("listShipmentItems", json={"shipment": s["id"]})
@@ -318,8 +294,15 @@ class ReceiveShipments(dbGtkUtils.ITkDBWindow):
             self.write_message("Could not find any shipment in DB.\n")
 
         self.cmb_shipment.set_model(cmb_store)
-        self.cmb_shipment.set_entry_text_column(0)
-        self.cmb_shipment.set_active(0)
+        if len(cmb_store)>0:
+            self.cmb_shipment.set_entry_text_column(0)
+            self.cmb_shipment.set_active(0)
+        else:
+            self.cmb_shipment.set_active(-1)
+            self.cmb_shipment.get_child().set_text("")
+            
+            
+        self.tree.set_model(Gtk.ListStore(str, str, str, bool))
 
     def receive_items(self, *args):
         """Receive shipment items."""

{itkdb_gtk-0.10.9.dev4 → itkdb_gtk-0.10.10.dev2}/itkdb_gtk/ITkDBlogin.py

@@ -239,10 +239,10 @@ class ITkDBlogin(Gtk.Dialog):
         self.ac1.set_visibility(False)
         self.ac2.set_visibility(False)
 
-        grid.attach(Gtk.Label(label="Acces Code 1"), 0, irow, 1, 1)
+        grid.attach(Gtk.Label(label="Access Code 1"), 0, irow, 1, 1)
         grid.attach(self.ac1, 1, irow, 1, 1)
         irow = irow + 1
-        grid.attach(Gtk.Label(label="Acces Code 1"), 0, irow, 1, 1)
+        grid.attach(Gtk.Label(label="Access Code 2"), 0, irow, 1, 1)
         grid.attach(self.ac2, 1, irow, 1, 1)
 
         btn = self.get_widget_for_response(Gtk.ResponseType.OK)
@@ -336,6 +336,10 @@ if __name__ == "__main__":
     #     print(l)
 
     print("Hello {}".format(dlg.name))
+
+    rc = client.get("getUser", json={"userIdentity": dlg.user.identity})
+    print(rc)
+
     if gtk_runs:
         try:
             while True:

{itkdb_gtk-0.10.9.dev4 → itkdb_gtk-0.10.10.dev2}/itkdb_gtk/ITkDButils.py

@@ -56,7 +56,6 @@ def get_db_response():
     It is stores in a global variable. Trust the function if call
     right after your interaction with the DB.
     """
-    global db_response
     return db_response
 
 
@@ -84,7 +83,8 @@ def get_db_date(timestamp=None):
         try:
             this_date = dateutil.parser.parse(timestamp)
             out = date2string(this_date)
-        except Exception:
+            
+        except (OverflowError, dateutil.parser.ParserError):
             out = ""
 
     return out
@@ -666,3 +666,20 @@ def create_client():
     client.user.authenticate()
     print("Hello {} !".format(client.user.name))
     return client
+
+def get_db_user(client):
+    """REturn PDB information of current user.
+
+    Args:
+        client (itkdb.Client): The DB client.
+        
+    """
+    global db_response
+    if client is None:
+        return None
+    
+    try:
+        db_response = client.get("getUser", json={"userIdentity": client.user.identity})
+        return db_response
+    except Exception:
+        return None

{itkdb_gtk-0.10.9.dev4 → itkdb_gtk-0.10.10.dev2}/itkdb_gtk/PanelVisualInspection.py

@@ -47,7 +47,7 @@ class PanelVisualInspection(dbGtkUtils.ITkDBWindow):
                          show_search="Find object with given SN.",
                          help_link=help_link)
 
-        self.institute = "IFIC"
+        self.institute = self.pdb_user["institutions"][0]["code"]
         self.global_image = None
         self.global_link = None
 
@@ -64,7 +64,7 @@ class PanelVisualInspection(dbGtkUtils.ITkDBWindow):
         self.mainBox.pack_start(grid, False, False, 5)
 
         irow = 0
-        receiver = self.create_institute_combo()
+        receiver = self.create_institute_combo(only_user=True)
         receiver.connect("changed", self.on_institute)
         receiver.set_tooltip_text("Select the Institute making the test.")
         dbGtkUtils.set_combo_iter(receiver, self.institute)

{itkdb_gtk-0.10.9.dev4 → itkdb_gtk-0.10.10.dev2}/itkdb_gtk/PetalReceptionTests.py

@@ -40,7 +40,7 @@ class PetalReceptionTests(dbGtkUtils.ITkDBWindow):
 
     def __init__(self, session, help_link=None):
         """Initialization."""
-        super().__init__(title="ITkDB Dashboard",
+        super().__init__(title="Petal Reception Tests",
                          session=session,
                          show_search="Find object with given SN.",
                          help_link=help_link)
@@ -83,8 +83,8 @@ class PetalReceptionTests(dbGtkUtils.ITkDBWindow):
         lbl.set_xalign(0)
         grid.attach(lbl, 0, 1, 1, 1)
 
-        self.institute = "IFIC"
-        inst = self.create_institute_combo()
+        self.institute = self.pdb_user["institutions"][0]["code"]
+        inst = self.create_institute_combo(only_user=True)
         inst.connect("changed", self.new_institute)
         inst.set_tooltip_text("Select the Institute.")
         grid.attach(inst, 1, 1, 1, 1)
@@ -114,6 +114,10 @@ class PetalReceptionTests(dbGtkUtils.ITkDBWindow):
         # The text view
         self.mainBox.pack_end(self.message_panel.frame, True, True, 5)
 
+        # Set the default institute
+        dbGtkUtils.set_combo_iter(inst, self.institute)
+
+
         self.show_all()
 
     def on_SN_changed(self, entry, value):
@@ -139,7 +143,7 @@ class PetalReceptionTests(dbGtkUtils.ITkDBWindow):
             page.dict_dialog.factory_reset()
 
 
-    def create_test_box(self, label, test_name, institute="IFIC"):
+    def create_test_box(self, label, test_name, institute=None):
         """Create and add to notebook a test dialog.
 
         Args:
@@ -148,6 +152,9 @@ class PetalReceptionTests(dbGtkUtils.ITkDBWindow):
             institute: The institute.
 
         """
+        if institute is None:
+            institute = self.institute
+            
         defaults = {
             "institution": institute,
             "runNumber": "1",

{itkdb_gtk-0.10.9.dev4 → itkdb_gtk-0.10.10.dev2}/itkdb_gtk/UploadPetalInformation.py

@@ -5,7 +5,6 @@ import sys
 from argparse import ArgumentParser
 from datetime import datetime, timezone
 from pathlib import Path
-
 import dateutil.parser
 import gi
 
@@ -119,6 +118,8 @@ class AVSPanel(dbGtkUtils.ITkDBWindow):
 
         self.btn_state = Gtk.Button(label="Undef")
         self.btn_state.set_name("btnState")
+        self.btn_state.connect("clicked", self.show_state)
+        self.btn_state.set_tooltip_text("If green all good. Click to see commnets and defects.")
 
         grid.attach(Gtk.Label(label="Serial No."), 0, 0, 1, 1)
         grid.attach(self.SN, 1, 0, 1, 1)
@@ -221,6 +222,44 @@ class AVSPanel(dbGtkUtils.ITkDBWindow):
 
         self.show_all()
 
+
+    def show_state(self, *arg):
+        """Shows the status"""
+        msg = ""
+        for test in self.test_list:
+            values = test.values
+            ndef = len(values["defects"])
+            ncomm = len(values["comments"])
+            if ndef==0 and ncomm==0:
+                continue
+
+            msg += "{}\n".format(values["testType"])
+            if ndef:
+                msg += "Defects\n"
+
+            for D in values["defects"]:
+                msg += "{}: {}\n".format(D["name"], D["description"])
+
+            if ncomm:
+                msg += "Comments\n"
+
+            for C in values["comments"]:
+                msg += "{}\n".format(C)
+
+            msg += "\n"
+
+        dialog = Gtk.MessageDialog(
+                transient_for=self,
+                flags=0,
+                message_type=Gtk.MessageType.INFO,
+                buttons=Gtk.ButtonsType.OK,
+                text="Problems found",
+                )
+
+        dialog.format_secondary_text(msg)
+        dialog.run()
+        dialog.destroy()
+
     def on_reset(self, *args):
         """Reset SN"""
         self.petal_core = None
@@ -669,7 +708,7 @@ class AVSPanel(dbGtkUtils.ITkDBWindow):
         for test in self.test_list:
             values = test.values
             self.write_message("{}\n".format(values["testType"]))
-            res = ITkDButils.upload_test(self.session, values)
+            res = ITkDButils.upload_test(self.session, values, check_runNumber=True)
             if res is not None:
                 dbGtkUtils.complain("Could not upload test {}".format(values["testType"]), res)
 

{itkdb_gtk-0.10.9.dev4 → itkdb_gtk-0.10.10.dev2}/itkdb_gtk/UploadTest.py

@@ -218,7 +218,7 @@ class UploadTest(dbGtkUtils.ITkDBWindow):
 
             except TypeError:
                 self.load_payload(self.payload)
-                self.write_message("Loaded memory payload.")
+                self.write_message("Loaded memory payload.\n")
 
         if len(self.attachments) > 0:
             self.btn_attch.set_label("Attachments ({})".format(len(self.attachments)))

{itkdb_gtk-0.10.9.dev4 → itkdb_gtk-0.10.10.dev2}/itkdb_gtk/WireBondGui.py

@@ -2,7 +2,10 @@
 """Wirebonding GUI for PSB."""
 
 import sys
+import re
 import json
+import copy
+from pathlib import Path
 import gi
 
 gi.require_version("Gtk", "3.0")
@@ -12,7 +15,6 @@ try:
     import itkdb_gtk
 
 except ImportError:
-    from pathlib import Path
     cwd = Path(__file__).parent.parent
     sys.path.append(cwd.as_posix())
     import itkdb_gtk
@@ -22,6 +24,23 @@ __HELP_LINK__="https://itkdb-gtk.docs.cern.ch/wirebondTest.html"
 from itkdb_gtk import dbGtkUtils
 from itkdb_gtk import ITkDBlogin, ITkDButils, UploadTest
 
+
+#valid_channel = re.compile("(^[0-9]+)-([0-9]+)")
+valid_channel = re.compile("^[0-9]+[\\s*\\,\\s,-[0-9]+]*")
+
+def range_to_list(V):
+    """Convert a range (ch1-ch2) to a list."""
+    if '-' not in V:
+        return [V]
+
+    out = []
+    endpoints = list(map(int, V.split('-')))
+    endpoints.sort()
+    for i in range(endpoints[0], endpoints[1]+1):
+        out.append(str(i))
+
+    return out
+
 test_parameters = {
         "Repaired Row 1": "REPAIRED_FRONTEND_ROW1",
         "Failed Row 1": "FAILED_FRONTEND_ROW1",
@@ -422,12 +441,14 @@ class WireBond(dbGtkUtils.ITkDBWindow):
         self.pdb = None
         self.models = {}
         self.holes = {}
-        self.institute = "IFIC"
+        self.institute = self.pdb_user["institutions"][0]["code"]
         self.inst_combo = None
         self.module_SN = None
         self.alternativeID = None
         self.combo = None
         self.tree = None
+        self.lut = {}
+        self.module_type = None
         self.init_window()
 
     def init_window(self):
@@ -464,15 +485,31 @@ class WireBond(dbGtkUtils.ITkDBWindow):
         grid = Gtk.Grid(column_spacing=5, row_spacing=1)
 
         # The shipment receiver
-        institute = self.create_institute_combo()
+        institute = self.create_institute_combo(True)
         institute.connect("changed", self.on_institute)
         institute.set_tooltip_text("Select the Institute.")
         dbGtkUtils.set_combo_iter(institute, self.institute)
-        grid.attach(Gtk.Label(label="Institute"), 0, 0, 1, 1)
+
+        lbl = Gtk.Label(label="Institute")
+        lbl.set_xalign(0)
+        grid.attach(lbl, 0, 0, 1, 1)
         grid.attach(institute, 1, 0, 1, 1)
         self.inst_combo = institute
 
 
+
+        # The lookup table
+        lbl = Gtk.Label(label="Lookup Table")
+        lbl.set_xalign(0)
+        grid.attach(lbl, 2, 0, 1, 1)
+
+        self.testF = Gtk.FileChooserButton()
+        self.testF.set_tooltip_text("Click to select Lookup table.")
+
+        grid.attach(self.testF, 3, 0, 1, 1)
+        self.testF.connect("file-set", self.on_lut)
+
+
         for i, tit in enumerate(["Operator", "Bond Machine", "Wire Batch", "SN", "Date"]):
             lbl = Gtk.Label(label=tit)
             lbl.set_xalign(0)
@@ -514,7 +551,7 @@ class WireBond(dbGtkUtils.ITkDBWindow):
         box = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL)
         self.mainBox.pack_start(box, False, False, 0)
         dbGtkUtils.add_button_to_container(box, "Add Bond",
-                                           "Click to add a new bond.",
+                                           "Click to add a new bond or bond range.",
                                            self.add_item)
 
         dbGtkUtils.add_button_to_container(box, "Remove Bond",
@@ -527,6 +564,75 @@ class WireBond(dbGtkUtils.ITkDBWindow):
         self.mainBox.pack_start(self.message_panel.frame, True, True, 0)
         self.write_message("wirebond GUI\n")
 
+    def on_lut(self, fdlg):
+        """Get look-up table."""
+        fnam = Path(fdlg.get_filename())
+        if not fnam.exists():
+            dbGtkUtils.complain("Cannot open Luukup Table.",
+                                "File {} does not exist.".format(fnam))
+            return
+
+        lut = {}
+        module_map = {}
+        section = None
+        with open(fnam, 'r', encoding="UTF-8") as fin:
+            for line in fin:
+                line = line.strip()
+
+                # Remove comments.
+                ipos = line.find('#')
+                if ipos >= 0:
+                    line = line[:ipos].strip()
+
+                if len(line) == 0:
+                    continue
+
+                # Check for new section
+                ipos = line.find(':')
+                if ipos >= 0:
+                    section = line[:ipos].strip().upper()
+                    if section in module_map:
+                        dbGtkUtils.complain("Section {} already in map.".format(section), "Stop parsing bond Lookup table.")
+                        return
+
+                    lut = {}
+                    module_map[section] = lut
+                    continue
+
+                if section is None:
+                    continue
+
+                values = list(map(str.strip, line.split(',')))
+                if len(values)!=2:
+                    dbGtkUtils.complain("Cannot read Lookup table.", "Wrong line format: {}".format(line))
+                    return
+
+                v_local = range_to_list(values[0])
+                v_std = range_to_list(values[1])
+
+                if len(v_local) != len(v_std):
+                    dbGtkUtils.complain("Wrong Lookup table.",
+                                        "Ranges have different length: {}".format(line))
+                    return
+
+                for L, S in zip(v_local, v_std):
+                    lut[L] = S
+
+        self.lut = module_map
+
+    def convert_channel(self, C):
+        """Convert channel according to LUT
+
+        Args:
+            C (str): channel number
+
+        """
+        try:
+            return self.lut[self.module_type][C]
+
+        except KeyError:
+            return C
+
     def on_institute(self, combo):
         """Institute changed."""
         name = self.get_institute_from_combo(combo)
@@ -536,13 +642,20 @@ class WireBond(dbGtkUtils.ITkDBWindow):
     def on_SN_changed(self, entry, value):
         """New SN given. Ask in PDB,"""
         if len(value) <= 0:
-            return None
-
+            return
 
         obj = itkdb_gtk.ITkDButils.get_DB_component(self.session, value)
-        if obj is not None:
+        if obj is not None and obj["serialNumber"] is not None:
             entry.set_text(obj["serialNumber"])
-            self.alternativeID = obj["alternativeIdentifier"]
+            alternativeID = obj["alternativeIdentifier"]
+            module_SN = obj["serialNumber"]
+            if len(module_SN) == 14 and module_SN.startswith("20USEM"):
+                self.module_SN = module_SN
+                self.alternativeID = alternativeID
+                self.module_type = module_SN[5:7]
+
+            else:
+                itkdb_gtk.dbGtkUtils.complain("Invalid SN: {}".format(module_SN), "Not a Ring module")
 
         else:
             itkdb_gtk.dbGtkUtils.complain("Invalid SN", value)
@@ -620,8 +733,9 @@ class WireBond(dbGtkUtils.ITkDBWindow):
     def channel_edited(self, widget, path, text):
         """Handles edition in channel number cell."""
         if not text.isnumeric():
-            dbGtkUtils.complain("Wrong channel number", "Invalid channel number: {}".format(text))
-            return
+            if valid_channel.match(text) is None:
+                dbGtkUtils.complain("Wrong channel number", "Invalid channel number: {}".format(text))
+                return
 
         self.text_edited(0, path, text)
 
@@ -705,6 +819,7 @@ class WireBond(dbGtkUtils.ITkDBWindow):
             param = get_module_param(self.SN.get_text())
         except ValueError as E:
             dbGtkUtils.complain("Wrong SN number", str(E))
+            return None
 
         M = ModuleHoles(param=param)
 
@@ -766,6 +881,9 @@ class WireBond(dbGtkUtils.ITkDBWindow):
     def get_unconnected(self, skeleton):
         """Fill the test DTO with unconnected information."""
         out = self.compute_unconnected()
+        if out is None:
+            raise ValueError("Wrong SN")
+
         for key, val in out.items():
             skeleton["results"][key] = val
 
@@ -832,6 +950,47 @@ class WireBond(dbGtkUtils.ITkDBWindow):
 
             data["results"][key] = out
 
+    def fix_list_of_channels(self, data):
+        """Expand ranges and, eventually, apply LUT.
+
+        Args:
+            data: The test payload.
+        """
+        for tit, section in data["results"].items():
+            if not isinstance(section, dict):
+                continue
+
+            range_items = []
+            added_items = []
+            for key, comment in section.items():
+                values = list(map(str.strip, key.split(',')))
+                if ',' in key or '-' in key:
+                    range_items.append(key)
+
+                else:
+                    continue
+
+                for V in values:
+                    if '-' in V:
+                        for i in range_to_list(V):
+                            added_items.append((str(i), comment))
+
+                    elif len(V)>0:
+                        added_items.append((V, comment))
+
+            for key in range_items:
+                section.pop(key)
+
+            for key, comm in added_items:
+                section[key] = comm
+
+            if len(self.lut)>0 and len(section)>0:
+                tmp = copy.deepcopy(section)
+                section.clear()
+                for key, val in tmp.items():
+                    section[self.convert_channel(key)] = val
+
+
     def save_test(self, *args):
         """Save Test file."""
         dialog = Gtk.FileChooserDialog(
@@ -863,6 +1022,7 @@ class WireBond(dbGtkUtils.ITkDBWindow):
         data = {
             "institution": self.institute,
             "date": ITkDButils.get_db_date(),
+            "runNumber": "1",
             "properties": {},
             "results": {},
             "comments": [],
@@ -927,7 +1087,12 @@ class WireBond(dbGtkUtils.ITkDBWindow):
 
         self.get_test_header(skeleton)
         self.get_list_of_channels(skeleton)
-        self.get_unconnected(skeleton)
+        self.fix_list_of_channels(skeleton)
+        try:
+            self.get_unconnected(skeleton)
+
+        except ValueError:
+            return
 
         uploadW = UploadTest.UploadTest(self.session, payload=skeleton)
         # uploadW.run()

{itkdb_gtk-0.10.9.dev4 → itkdb_gtk-0.10.10.dev2}/itkdb_gtk/__init__.py

@@ -1,6 +1,6 @@
 """ itkdb-gtk python module
 """
-__version__ = "0.10.9.dev4"
+__version__ = "0.10.10.dev2"
 
 
 def dash_board():

{itkdb_gtk-0.10.9.dev4 → itkdb_gtk-0.10.10.dev2}/itkdb_gtk/dbGtkUtils.py

@@ -1,4 +1,5 @@
 """A set of GTK utilities for DB scripts."""
+import sys
 import json
 import time
 import pathlib
@@ -18,6 +19,16 @@ gi.require_version("Gtk", "3.0")
 from gi.repository import Gtk, GObject, Gio, GLib
 
 
+try:
+    import itkdb_gtk
+
+except ImportError:
+    cwd = pathlib.Path(__file__).parent.parent
+    sys.path.append(cwd.as_posix())
+
+from itkdb_gtk import ITkDButils
+
+
 def setup_scanner(callback):
     """Setup scanner and callback function."""
     for fnam in ["/dev/ttyACM0", "/dev/cu.usbmodemS_N_G19F204881"]:
@@ -51,9 +62,10 @@ def parse_date(txt):
     try:
         return dateutil.parser.parse(txt, fuzzy=False)
 
-    except Exception:
+    except dateutil.parser.ParserError:
         return None
 
+
 def parse_date_as_string(txt):
     """Parse data and return DB compatible string."""
     D = parse_date(txt)
@@ -76,7 +88,7 @@ def is_a_date(txt):
         dateutil.parser.parse(txt, fuzzy=False)
         return True
 
-    except Exception:
+    except (dateutil.parser.ParserError, OverflowError):
         return False
 
 def new_small_text_entry():
@@ -223,7 +235,6 @@ def ask_for_confirmation(main_title, second_text, parent=None):
     dialog.destroy()
     return (out == Gtk.ResponseType.OK)
 
-
 class TextEntry(GObject.GObject):
     """Create a Gtk text entry/view object."""
     __gsignals__ = {
@@ -235,6 +246,7 @@ class TextEntry(GObject.GObject):
         GObject.GObject.__init__(self)
         self.tmp_txt = ""
         self.nlines = n_lines
+        self.do_emit = True
         if self.nlines > 1:
             self.widget = Gtk.Frame()
             scrolled = Gtk.ScrolledWindow()
@@ -254,12 +266,11 @@ class TextEntry(GObject.GObject):
 
             self.widget.connect("focus-in-event", self.on_enter)
             self.widget.connect("focus-out-event", self.on_leave)
-
             self.entry = self.widget
 
     def do_my_signal(self, *args):
         """Signal handler."""
-        pass
+        return
 
     def on_enter(self, *args):
         """On enter."""
@@ -270,7 +281,9 @@ class TextEntry(GObject.GObject):
         """On leave."""
         val = self.widget.get_text().strip()
         if val != self.tmp_txt:
+            self.do_emit = False
             self.emit("text_changed", val)
+            self.do_emit = True
 
     def get_text(self):
         """Return the text."""
@@ -285,11 +298,17 @@ class TextEntry(GObject.GObject):
 
     def set_text(self, text):
         """Sets text."""
+        if text is None:
+            return
+
         if self.nlines > 1:
             self.entry.get_buffer().set_text(text)
         else:
             self.entry.set_text(text)
-
+            if self.do_emit:
+                self.do_emit = False
+                self.emit("text_changed", text)
+                self.do_emit = True
 
 def get_a_value(main_title, second_text=None, is_tv=False, parent=None):
     """Open a dialog to get a value.
@@ -304,7 +323,7 @@ def get_a_value(main_title, second_text=None, is_tv=False, parent=None):
         value: The value in the entry
 
     """
-    dlg = Gtk.Dialog(title="Add Attachment",
+    dlg = Gtk.Dialog(title="Get a Value",
                      transient_for=parent,
                      flags=0)
     dlg.add_buttons(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL,
@@ -385,7 +404,8 @@ def get_a_list_of_values(main_title, labels, defaults=None, second_text=None, pa
         entry = TextEntry(3 if use_tv else -1)
         try:
             entry.set_text(defaults[i])
-        except Exception:
+
+        except (TypeError, IndexError):
             pass
 
         vbox.pack_start(entry.widget, False, False, 0)
@@ -510,6 +530,7 @@ class ITkDBWindow(Gtk.Window):
         self.code2inst = {}
         self.message_panel = None
         self.help = help_link
+        self.pdb_user = ITkDButils.get_db_user(self.session)
 
         if gtk_runs:
             super().__init__(title=title)
@@ -552,12 +573,13 @@ class ITkDBWindow(Gtk.Window):
         self.mainBox.set_property("margin-left", 6)
         self.mainBox.set_property("margin-right", 6)
 
+        self.title_label = None
         if len(title)>0:
             lbl = Gtk.Label()
             lbl.set_markup("<big><b>{}\n</b></big>".format(title))
             lbl.set_xalign(0.5)
-            self.mainBox.pack_start(lbl, True, True, 2)
-
+            self.mainBox.pack_start(lbl, False, False, 2)
+            self.title_label = lbl
 
         self.add(self.mainBox)
 
@@ -573,6 +595,13 @@ class ITkDBWindow(Gtk.Window):
 
         self.mainBox.pack_end(btnBox, False, True, 0)
 
+    def set_window_title(self, title):
+        """Set window title."""
+        hb = self.get_titlebar()
+        hb.props.title = title
+        if self.title_label:
+            self.title_label.set_markup("<big><b>{}\n</b></big>".format(title))
+
     def quit(self, *args):
         """Quits the application."""
         self.hide()
@@ -584,7 +613,7 @@ class ITkDBWindow(Gtk.Window):
 
     def query_db(self, *args):
         """Search button clicked."""
-        pass
+        return
 
     def new_login(self, obj, msg):
         """A new user logged in."""
@@ -603,18 +632,32 @@ class ITkDBWindow(Gtk.Window):
         if hasattr(self.session, "user_gui"):
             self.session.user_gui.reconnect(force=True)
 
-    def create_institute_combo(self):
-        """Create a combe with all institutes."""
-        compltn = self.get_institute_list()
+    def create_institute_combo(self, only_user=False):
+        """Create a combe with all institutes.
+        
+        Args:
+            only_user: if True, add only institutes the user belongs to.
+            
+        """
+        compltn = self.get_institute_list(only_user)
         combo = Gtk.ComboBox.new_with_model_and_entry(compltn.get_model())
         combo.set_entry_text_column(0)
         combo.get_child().set_completion(compltn)
 
         return combo
 
-    def get_institute_list(self):
-        """Get the institute list."""
-        sites = self.session.get("listInstitutions", json={})
+    def get_institute_list(self, only_user=False):
+        """Get the institute list.
+        
+        Args:
+            only_user: if True, add only institutes the user belongs to.
+        
+        """
+        if only_user and self.pdb_user:
+            sites = self.pdb_user["institutions"]
+        else:
+            sites = self.session.get("listInstitutions", json={})
+            
         liststore = Gtk.ListStore(str, str)
         for site in sites:
             self.code2inst[site['code']] = site['name']

{itkdb_gtk-0.10.9.dev4 → itkdb_gtk-0.10.10.dev2}/itkdb_gtk/readAVSdata.py

@@ -367,7 +367,7 @@ def check_for_problems(sheet, the_test, row_range):
             reason = cell_value(sheet, "i{}".format(row))
 
             if reason:
-                if len(reason) < 20:
+                if len(reason) < 1:
                     msg = "{}: {}".format(hdr, reason)
                     the_test["defects"].append({"name": msg})
                 else:
@@ -395,7 +395,7 @@ def readFATfile(session, file_path, SN=None):
     """
     # Open spreadsheet
     try:
-        wb = XL.load_workbook(file_path)
+        wb = XL.load_workbook(file_path, data_only=True)
     except InvalidFileException as ee:
         print("Could not open input file: ", file_path)
         print(ee)
@@ -566,7 +566,7 @@ def readProductionSheet(session, file_path, SN):
 
     """
     try:
-        wb = XL.load_workbook(file_path)
+        wb = XL.load_workbook(file_path, data_only=True)
     except InvalidFileException as ee:
         print("Could not open input file: ", file_path)
         print(ee.message)
@@ -688,6 +688,6 @@ if __name__ == "__main__":
         sys.exit()
 
     fnam = Path(options.files[0]).expanduser().resolve()
-#    readProductionSheet(fnam, options.SN)
-    readFATfile(client, fnam, options.SN)
+    readProductionSheet(client, fnam, options.SN)
+#    readFATfile(client, fnam, options.SN)
     dlg.die()

{itkdb_gtk-0.10.9.dev4 → itkdb_gtk-0.10.10.dev2}/itkdb_gtk.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: itkdb_gtk
-Version: 0.10.9.dev4
+Version: 0.10.10.dev2
 Summary: A collection of Gtk based GUI to access ITkDB.
 Author-email: Carlos Lacasta <carlos.lacasta@cern.ch>
 Project-URL: Homepage, https://gitlab.cern.ch/atlas-itk/sw/db/itk-pdb-gtk-gui-utils

{itkdb_gtk-0.10.9.dev4 → itkdb_gtk-0.10.10.dev2}/itkdb_gtk.egg-info/SOURCES.txt

@@ -31,6 +31,7 @@ itkdb_gtk.egg-info/entry_points.txt
 itkdb_gtk.egg-info/requires.txt
 itkdb_gtk.egg-info/top_level.txt
 test/testAnimated.py
+test/testBatch.py
 test/testComponent.py
 test/test_attachment.py
 test/test_holes.py

{itkdb_gtk-0.10.9.dev4 → itkdb_gtk-0.10.10.dev2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "itkdb_gtk"
-version = "0.10.9.dev4"
+version = "0.10.10.dev2"
 authors = [
   { name="Carlos Lacasta", email="carlos.lacasta@cern.ch" },
 ]

itkdb_gtk-0.10.10.dev2/test/testBatch.py

@@ -0,0 +1,87 @@
+#!/usr/bin/env python3
+"""Test Batches."""
+
+try:
+    import itkdb_gtk
+    
+except ImportError:
+    import sys
+    from pathlib import Path
+    cwd = Path(__file__).parent.parent
+    sys.path.append(cwd.as_posix())
+
+from itkdb_gtk import ITkDBlogin, ITkDButils
+
+
+def get_all_Petals(session):
+    """Find all petal cores"""
+    # find all cores
+    # Now all the objects
+    payload = {
+        "filterMap": {
+            #"componentType": ["BT"],
+            "componentType": ["CORE_PETAL"],
+            "type": ["CORE_AVS"],
+            #"currentLocation": ["IFIC"],
+        },
+        "sorterList": [
+            {"key": "alternativeIdentifier", "descending": False }
+        ],
+    }
+    core_list = session.get("listComponents", json=payload)
+    return core_list
+
+def list_petal_core_batches(session):
+    """Get list of Petal core batches"""
+    payload = {
+            "project": "S",
+            "batchType": ["PETAL_CORE_PROTO", "PETAL_CORE_PREPROD", "PETAL_CORE_PROD"],
+    }
+    batch_list = session.get("listBatches", json=payload)
+    rc = {}
+    for B in batch_list:
+        rc[B["code"] ]= B["id"]
+        
+    return rc
+
+
+
+def main(session):
+    batch_list = list_petal_core_batches(session)
+    
+#    # create the batches
+#    for bc, bid in batch_list.items():
+#        payload = {
+#            "project": "S",
+#            "batchType": bc,
+#            "number": "1",
+#            "ownerInstituteList": ["AVS", "IFIC", "DESYHH"]
+#        }
+#        rc = session.post("createBatch", json=payload)
+        
+    
+    for petal_core in get_all_Petals(session):
+        aliasID = petal_core["alternativeIdentifier"]
+        if "PPB" in aliasID:
+            batch_code = "PETAL_CORE_PREPROD"
+        elif "PPC" in aliasID:
+            batch_code = "PETAL_CORE_PROD"
+        elif "test" in aliasID.lower():
+            continue
+        else:
+            batch_code = "PETAL_CORE_PROTO"
+        
+        print("{} - {}".format(aliasID, batch_code))
+        rc = session.post("addBatchComponent", json={"id":batch_list[batch_code], "component": petal_core["id"]})
+
+
+if __name__ == "__main__":
+    # ITk_PB authentication
+    dlg = ITkDBlogin.ITkDBlogin()
+    session = dlg.get_client()
+
+    try:
+        main(session)
+
+    except Exception as E:
+        print(E)