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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: itkdb_gtk
-Version: 0.10.9.dev4
+Version: 0.10.10
 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}/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()
@@ -41,7 +41,7 @@ class CreateShipments(dbGtkUtils.ITkDBWindow):
         self.attachment = None
         global gtk_runs
         if gtk_runs:
-            super().__init__(session=session, title="Upload AVS Data",
+            super().__init__(session=session, title="Create Shipment",
                              help_link=help_link, gtk_runs=gtk_runs)
             self.init_window()
 
@@ -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.")
@@ -355,6 +358,8 @@ class CreateShipments(dbGtkUtils.ITkDBWindow):
 def main():
     """Main entry."""
     # main entry of the program
+    HELP_LINK="https://itkdb-gtk.docs.cern.ch"
+
     dlg = ITkDBlogin.ITkDBlogin()
     client = dlg.get_client()
     if client is None:
@@ -363,7 +368,7 @@ def main():
         sys.exit()
 
     client.user_gui = dlg
-    IS = CreateShipments(client)
+    IS = CreateShipments(client, help_link="{}/createShipment.html".format(HELP_LINK))
     IS.set_accept_focus(True)
     IS.present()
     IS.connect("destroy", Gtk.main_quit)

{itkdb_gtk-0.10.9.dev4 → itkdb_gtk-0.10.10}/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)
@@ -133,6 +136,12 @@ class ReceiveShipments(dbGtkUtils.ITkDBWindow):
         btn.connect("clicked", self.receive_items)
         grid.attach(btn, 2, 3, 1, 1)
 
+        self.check_all = Gtk.ToggleButton(label="Check A_ll", use_underline=True)
+        self.check_all.set_active(1)
+        self.check_all.set_tooltip_text("If toggled, items will need to be `received`\none by one by unchecking the  check box.")
+        grid.attach(self.check_all, 3, 3, 1, 1)
+
+
         # Add a Separator
         self.mainBox.pack_start(Gtk.Separator(orientation=Gtk.Orientation.VERTICAL), False, True, 0)
 
@@ -183,14 +192,14 @@ class ReceiveShipments(dbGtkUtils.ITkDBWindow):
             try:
                 txt = find_vtrx(self.session, txt)
             except ValueError as e:
-                self.write_message("Error: {}".format(e))
+                self.write_message("Error: {}\n".format(e))
                 return
 
         # search code in the list
         if self.store:
             lv_iter = self.store.get_iter_first()
             while lv_iter:
-                if (self.store.get_value(lv_iter, 0) == txt):
+                if self.store.get_value(lv_iter, 0) == txt:
                     self.write_message("...found\n")
                     self.store[lv_iter][3] = False
 
@@ -198,21 +207,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 +243,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 +262,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 +278,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,33 +300,52 @@ 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 mark_all_as_delivered(self):
+        """Mark all items in current shipment as delivered."""
+        if self.store is None:
+            return
+
+        lv_iter = self.store.get_iter_first()
+        while lv_iter:
+            val = self.store[lv_iter][3]
+            self.store[lv_iter][3] = not val
+            lv_iter = self.store.iter_next(lv_iter)
 
     def receive_items(self, *args):
         """Receive shipment items."""
         data = {}
         names = {}
+        if not self.store:
+            self.write_message("Empty list of items.\n")
+            return
+
+        if not self.check_all.get_active():
+            self.mark_all_as_delivered()
 
         # self.store is the model of the tree view
-        if self.store:
-            lv_iter = self.store.get_iter_first()
-            while lv_iter:
-                shpmnt = self.store.get_value(lv_iter, 2)
-                if shpmnt not in data:
-                    data[shpmnt] = create_shipment_status(shpmnt)
-                    names[shpmnt] = self.store.get_value(lv_iter, 4)
+        lv_iter = self.store.get_iter_first()
+        while lv_iter:
+            shpmnt = self.store.get_value(lv_iter, 2)
+            if shpmnt not in data:
+                data[shpmnt] = create_shipment_status(shpmnt)
+                names[shpmnt] = self.store.get_value(lv_iter, 4)
 
-                item = {
-                    "code": self.store[lv_iter][5],
-                    "delivered": not self.store[lv_iter][3]
-                }
-                data[shpmnt]["shipmentItems"].append(item)
+            item = {
+                "code": self.store[lv_iter][5],
+                "delivered": not self.store[lv_iter][3]
+            }
+            data[shpmnt]["shipmentItems"].append(item)
 
-                lv_iter = self.store.iter_next(lv_iter)
+            lv_iter = self.store.iter_next(lv_iter)
 
-        else:
-            self.write_message("Empty list of items.\n")
 
         for oid, S in data.items():
             # Check that all items are there
@@ -524,6 +525,8 @@ def create_shipment_status(shpmnt):
 
 def main():
     """Main entry."""
+    HELP_LINK="https://itkdb-gtk.docs.cern.ch/receiveShipments.html"
+
     dlg = ITkDBlogin.ITkDBlogin()
     client = dlg.get_client()
     if client is None:
@@ -532,7 +535,7 @@ def main():
         sys.exit()
 
     client.user_gui = dlg
-    IS = ReceiveShipments(client)
+    IS = ReceiveShipments(client, help_link=HELP_LINK)
     IS.set_accept_focus(True)
     IS.present()
     IS.connect("destroy", Gtk.main_quit)

{itkdb_gtk-0.10.9.dev4 → itkdb_gtk-0.10.10}/itkdb_gtk/GlueWeight.py

@@ -8,13 +8,14 @@ from pathlib import Path
 
 try:
     import itkdb_gtk
-    
+
 except ImportError:
-    from pathlib import Path
     cwd = Path(__file__).parent.parent
     sys.path.append(cwd.as_posix())
 
-from itkdb_gtk import dbGtkUtils, ITkDBlogin, ITkDButils
+from itkdb_gtk import dbGtkUtils, ITkDBlogin, ITkDButils, UploadMultipleTests
+HELP_LINK="https://itkdb-gtk.docs.cern.ch"
+
 
 import gi
 gi.require_version("Gtk", "3.0")
@@ -83,18 +84,17 @@ def remove_defaul_keys(data, default_value=-9999):
     return data
 
 
-class GlueWeight(Gtk.Window):
+class GlueWeight(dbGtkUtils.ITkDBWindow):
     """Upluead Glue Weight test."""
 
     def __init__(self, session, ifile=None, help_link=None):
         """Initialization.
-    
+
         Args:
             session: ITkDB session_
             ifile (optional): Input file. Defaults to None.
 
         """
-        global gtk_runs
         self.ifile = ifile
         self.session = session
         self.modules = []
@@ -112,34 +112,24 @@ class GlueWeight(Gtk.Window):
         self.skeleton = ITkDButils.get_test_skeleton(
             session, "MODULE", "GLUE_WEIGHT", defaults)
 
+        global gtk_runs
         if gtk_runs:
-            super().__init__(title="Upload Glue Weight", help_link=help_link)
+            super().__init__(session=session,
+                             title="Upload Glue Weight",
+                             help_link=help_link)
             self.init_window()
+        else:
+            self.pdb_user = ITkDButils.get_db_user(session)
 
     def init_window(self):
         """Initialize window."""
         #
         # Prepare HeaderBar
-        hb = Gtk.HeaderBar()
-        hb.set_show_close_button(True)
-        hb.props.title = "DB Upload Module Glue Weight"
-        self.set_titlebar(hb)
-
-        button = Gtk.Button()
-        icon = Gio.ThemedIcon(name="document-send-symbolic")
-        image = Gtk.Image.new_from_gicon(icon, Gtk.IconSize.BUTTON)
-        button.add(image)
-        button.set_tooltip_text("Click to upload test shown in notebook.")
-        button.connect("clicked", self.upload_current_test)
-        hb.pack_end(button)
-
-        self.userLabel = Gtk.Label()
-        self.userLabel.set_text(self.session.user.name)
-        hb.pack_start(self.userLabel)
-
-        # Create main content box
-        self.mainBox = Gtk.Box(orientation=Gtk.Orientation.VERTICAL)
-        self.add(self.mainBox)
+        self.set_border_width(10)
+
+        # Prepare HeaderBar
+        self.hb.props.title = "Glue height"
+
         # file entry and search button
         self.file_name = Gtk.FileChooserButton()
         self.file_name.connect("file-set", self.on_file_set)
@@ -167,6 +157,11 @@ class GlueWeight(Gtk.Window):
             self.modules = self.parse_file(self.ifile)
             self.populate_notebook()
 
+
+
+        # The text view
+        self.mainBox.pack_end(self.message_panel.frame, True, True, 5)
+
         # The button box
         btnBox = Gtk.ButtonBox(orientation=Gtk.Orientation.HORIZONTAL)
         self.buttons = []
@@ -183,19 +178,10 @@ class GlueWeight(Gtk.Window):
         self.buttons.append(btn)
         btnBox.add(btn)
 
-        btn = Gtk.Button(label="Quit")
-        btn.connect("clicked", self.quit)
-        btnBox.add(btn)
-
         self.mainBox.pack_start(btnBox, False, True, 0)
 
         self.show_all()
 
-    def quit(self, *args):
-        """Quits the application."""
-        self.hide()
-        self.destroy()
-
     def create_test_window(self, test_json, test_name, label):
         """Create the dialog for a DB test and add it to the notebook.
 
@@ -257,7 +243,7 @@ class GlueWeight(Gtk.Window):
 
     def read_file(self, path):
         """Parse file."""
-        with open(path, "r") as ifile:
+        with open(path, "r", encoding="UTF-8") as ifile:
             self.modules = self.parse_file(ifile)
 
     def parse_file(self, ifile, module_sep="MODULE_SN"):
@@ -346,22 +332,20 @@ class GlueWeight(Gtk.Window):
 
     def upload_tests(self):
         """Upload tests to DB."""
-        if len(self.test_list):
+        W = UploadMultipleTests.UploadMultipleTests(
+            self.session,
+            help_link="{}/uploadMultipleTests.html".format(HELP_LINK)
+        )
+        
+        if len(self.test_list)>0:
             for G in self.test_list:
                 m = G.values
-                print("### Uploading {} for module {}".format(m["testType"], m["component"]))
-                resp = ITkDButils.upload_test(self.session, m)
-
-                if resp is not None:
-                    print(resp)
+                W.add_test_data_to_view(m)
+                
 
         else:
             for m in self.modules:
-                print("### Uploading {} for module {}".format(m["testType"], m["component"]))
-                resp = ITkDButils.upload_test(self.session, m)
-
-                if resp is not None:
-                    print(resp)
+                W.add_test_data_to_view(m)
 
 
 def main():
@@ -386,7 +370,7 @@ def main():
 
     else:
         try:
-            ifile = open(options.files[0], 'r')
+            ifile = open(options.files[0], 'r') if len(options.files)>0 else None
 
         except Exception as e:
             print(e)
@@ -399,7 +383,7 @@ def main():
         print("Could not connect to DB with provided credentials.")
         sys.exit()
 
-    GW = GlueWeight(session, ifile)
+    GW = GlueWeight(session, ifile, help_link=HELP_LINK)
     if gtk_runs:
         GW.show_all()
         GW.set_accept_focus(True)

{itkdb_gtk-0.10.9.dev4 → itkdb_gtk-0.10.10}/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}/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
@@ -282,10 +282,7 @@ def upload_test(client, data, attachments=None, check_runNumber=False):
     # Check the given run_number. If already existing, give another one which
     # will try to be consecutive.
     if check_runNumber:
-        def get_new_value(values):
-            run_no = max([x for x in values.keys()])+1
-            return run_no
-
+        # Get all the runNumbers in this test
         test_list = client.get("listTestRunsByComponent",
                                json={
                                     "filterMap":{
@@ -295,20 +292,27 @@ def upload_test(client, data, attachments=None, check_runNumber=False):
                                     }
                                 }
                                )
-        values = {}
+        runN= {}
         for T in test_list:
-            try:
-                run_no = int(T["runNumber"])
-            except ValueError:
-                run_no = get_new_value(values)
+            runN[T["runNumber"]] = 1
 
-            values[run_no] = 1
+        if data["runNumber"] in runN:
+            # if the given runNumber is there, try to create a new one.
+            #print("runNumber {} already in {} of {}".format(data["runNumber"], data["testType"], data["component"]))
+            try:
+                irun = int(data["runNumber"])
+                for i in range(irun+1, 100):
+                    newRn = "{}".format(i)
+                    if newRn not in runN:
+                        data["runNumber"] = newRn
+                        break
 
-        try:
-            if int(data["runNumber"]) in values.keys():
-                data["runNumber"] = "{}".format(get_new_value(values))
-        except ValueError:
-            data["runNumber"] = "{}".format(get_new_value(values))
+            except ValueError:
+                for i in range(100):
+                    newRn = "{}_{}".format(data["runNumber"], i+1)
+                    if newRn not in runN:
+                        data["runNumber"] = newRn
+                        break
 
     # Try to upload the test
     try:
@@ -346,7 +350,8 @@ def upload_test(client, data, attachments=None, check_runNumber=False):
                                           data=data,
                                           files=attachment)
                 try:
-                    attachment_urls[path.name] = db_response['url']
+                    url = db_response['url'].replace("https://eosatlas.cern.ch","https://cernbox.cern.ch/files/spaces")
+                    attachment_urls[path.name] = url
 
                 except KeyError:
                     pass
@@ -368,10 +373,10 @@ def set_test_run_parameter(session, test_run, parameter, value):
     """
     global db_response
     try:
-        db_response = session.post("setTestRunParameter", 
+        db_response = session.post("setTestRunParameter",
                                    json={"testRun": test_run, "code": parameter, "value": value})
         return None
-    
+
     except Exception as E:
         return (str(E))
 
@@ -380,11 +385,11 @@ def create_test_run_comment(session, test_run, comments):
     global db_response
     if not isinstance(comments, Iterable):
         comments = (comments)
-    
+
     try:
         db_response = session.post("createTestRunComment", json={"testRun": test_run, "comments": comments})
         return None
-    
+
     except Exception as E:
         return (str(E))
 
@@ -666,3 +671,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