itkdb-gtk 0.10.7__py3-none-any.whl → 0.10.8__py3-none-any.whl

itkdb_gtk/CreateShipments.py

@@ -28,7 +28,7 @@ gtk_runs, gtk_args = Gtk.init_check()
 class CreateShipments(dbGtkUtils.ITkDBWindow):
     """Create a shipment from input."""
 
-    def __init__(self, session):
+    def __init__(self, session, help=None):
         """Initialization.
 
         Args:
@@ -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", gtk_runs=gtk_runs)
+            super().__init__(session=session, title="Upload AVS Data", help=help, gtk_runs=gtk_runs)
             self.init_window()
 
     def init_window(self):
@@ -193,10 +193,14 @@ class CreateShipments(dbGtkUtils.ITkDBWindow):
                     dbGtkUtils.complain("Item {} is already in transit".format(SN),
                                         "This item is already in transit to {}".format(rc['shipmentDestination']['code']))
                     return
+                
                 nick = rc['alternativeIdentifier']
                 id = rc['id']
                 obj = rc['componentType']['name']
                 loc = rc['currentLocation']['code']
+                serialN = rc['serialNumber']
+                if serialN is None:
+                    serialN = id
 
                 # Check tha tthe input is not already there
                 model = self.tree.get_model()
@@ -210,7 +214,7 @@ class CreateShipments(dbGtkUtils.ITkDBWindow):
                     iter = model.iter_next(iter)
 
                 # Add the item in the liststore.
-                model.append([SN, nick, obj, loc, id])
+                model.append([serialN, nick, obj, loc, id])
 
             except Exception:
                 dbGtkUtils.complain("Error querying DB",

itkdb_gtk/ITkDBlogin.py

@@ -306,12 +306,12 @@ class ITkDBlogin(Gtk.Dialog):
             #     token_file.write(json.dumps(self.token))
             self.hide()
 
-    def get_client(self):
+    def get_client(self, use_eos=False):
         """Return the client."""
         if not self.is_connected():
             return None
 
-        return itkdb.Client(user=self.user)
+        return itkdb.Client(user=self.user, use_eos=use_eos)
 
     def __del__(self):
         """Delete."""

itkdb_gtk/ITkDButils.py

@@ -3,8 +3,10 @@ import mimetypes
 from collections.abc import Iterable
 from datetime import datetime
 from pathlib import Path
+import getpass
 
 import dateutil.parser
+import itkdb
 
 # The response of the DB
 db_response = ""
@@ -281,6 +283,7 @@ def upload_test(client, data, attachments=None):
                 db_response = client.post('createTestRunAttachment',
                                           data=data,
                                           files=attachment)
+                
 
         return None
 
@@ -453,7 +456,7 @@ def get_testrun(session, test_id, out_type="object"):
         return None
 
 
-def get_test_skeleton(session, component, test_code, userdef={}, uservalues={}):
+def get_test_skeleton(session, component, test_code, userdef=None, uservalues=None):
     """Get the skeleton of the given test.
 
     Args:
@@ -465,6 +468,13 @@ def get_test_skeleton(session, component, test_code, userdef={}, uservalues={}):
 
     """
     global db_response
+
+    if userdef is None:
+        userdef = {}
+
+    if uservalues is None:
+        uservalues = {}
+
     defvalues = {
         "string": "",
         "integer": -9999,
@@ -550,3 +560,12 @@ def get_test_skeleton(session, component, test_code, userdef={}, uservalues={}):
             skltn['results'][key] = get_default(par)
 
     return skltn
+
+def create_client():
+    """Create a Client."""
+    client = itkdb.Client()
+    client.user._access_code1 = getpass.getpass("Access 1: ")
+    client.user._access_code2 = getpass.getpass("Access 2: ")
+    client.user.authenticate()
+    print("Hello {} !".format(client.user.name))
+    return client

itkdb_gtk/PanelVisualInspection.py

@@ -2,12 +2,12 @@
 """PB/Hybrid panel Visual inspection GUI.."""
 import json
 import sys
+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())
 
@@ -21,7 +21,7 @@ HELP_LINK="https://itkdb-gtk.docs.cern.ch"
 
 class PanelVisualInspection(dbGtkUtils.ITkDBWindow):
     """PB/Hybryd panel visual inspection GUI."""
-    SN, PASSED, ALL = range(3)
+    SN, PASSED, F_NAME, F_PATH, ALL = range(5)
 
     def __init__(self, session, help=HELP_LINK):
         super().__init__(title="ITkDB Dashboard",
@@ -72,8 +72,9 @@ class PanelVisualInspection(dbGtkUtils.ITkDBWindow):
 
     def create_tree_view(self, size=150):
         """Create the TreeView with the children."""
-        model = Gtk.ListStore(str, bool)
+        model = Gtk.ListStore(str, bool, str, str)
         self.tree = Gtk.TreeView(model=model)
+        self.tree.connect("button-press-event", self.button_pressed)
 
         scrolled = Gtk.ScrolledWindow()
         scrolled.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC)
@@ -97,6 +98,12 @@ class PanelVisualInspection(dbGtkUtils.ITkDBWindow):
         column = Gtk.TreeViewColumn("Passed", renderer, active=PanelVisualInspection.PASSED)
         self.tree.append_column(column)
 
+
+        renderer = Gtk.CellRendererText()
+        column = Gtk.TreeViewColumn("Image", renderer, text=PanelVisualInspection.F_NAME)
+        self.tree.append_column(column)
+
+
         return scrolled
 
     def btn_toggled(self, renderer, path, *args):
@@ -110,13 +117,7 @@ class PanelVisualInspection(dbGtkUtils.ITkDBWindow):
         """Button pressed on tree view."""
         # double click shows attachments
         if event.button == 1 and event.type == Gdk.EventType.DOUBLE_BUTTON_PRESS:
-            select = self.tree.get_selection()
-            model, iter = select.get_selected()
-            if not iter:
-                return
-
-            self.on_show_json(None, (model, iter, model[iter]))
-            # self.on_show_attachments(None, (model, iter, model[iter]))
+            self.write_message("This is a double click.\n")
             return
 
         if event.button != 3:
@@ -138,16 +139,48 @@ class PanelVisualInspection(dbGtkUtils.ITkDBWindow):
 
         if not values:
             return
+        
+        menu = Gtk.Menu()
+        item_show = Gtk.MenuItem(label="Upload Image")
+        item_show.connect("activate", self.on_upload_image, (model, iter, values))
+        menu.append(item_show)
+        
+        menu.show_all()
+        menu.popup_at_pointer(event)
+
+    def on_upload_image(self, item, data):
+        """Choose file."""
+        fdlg = Gtk.FileChooserNative(action=Gtk.FileChooserAction.OPEN, accept_label="Select")
+        response = fdlg.run()
+        if response == Gtk.ResponseType.ACCEPT:
+            ifiles = [ipath for ipath in fdlg.get_filenames()]
+            if len(ifiles)<1:
+                return
+             
+            if len(ifiles) > 1:
+                dbGtkUtils.complain("More than one file selected","Choosing first.")
+            
+            fnam = ifiles[0]
+            model, iter, val = data
+            model.set_value(iter, PanelVisualInspection.F_PATH, fnam)
+            model.set_value(iter, PanelVisualInspection.F_NAME, Path(fnam).name)
+            
+                
+        self.write_message("Upload image\n")
 
 
     def SN_ready(self, *args):
         """SN is ready in the TextEnttry."""
         SN = self.SN.get_text()
-        if not SN.startswith("20U") or len(SN)!=14:
-            dbGtkUtils.complain("Invalid Serial Number",
-                                    "{}: wrong SN".format(SN))
+        # GEt children.
+        panel = ITkDButils.get_DB_component(self.session, SN)
+        if panel is None:
+            self.write_message(ITkDButils.get_db_response())
             return
 
+        SN = panel["serialNumber"]
+        args[0].set_text(SN)
+
         if "USED" in SN:
             # Powerboard Carrier
             if not SN[6].isdigit():
@@ -173,20 +206,15 @@ class PanelVisualInspection(dbGtkUtils.ITkDBWindow):
             return
 
         # GEt children.
-        panel = ITkDButils.get_DB_component(self.session, SN)
-        if panel is None:
-            self.write_message(ITkDButils.get_db_response())
-            return
-
         children = []
         for child in panel["children"]:
             if child["component"] is not None:
                 if child["componentType"]["name"] == "Powerboard":
                     children.append(child["component"]["serialNumber"])
 
-        model = Gtk.ListStore(str, bool)
+        model = Gtk.ListStore(str, bool, str, str)
         for child in children:
-            model.append([SN, True])
+            model.append([child, True, "", ""])
             
         self.tree.set_model(model)
 
@@ -199,6 +227,7 @@ class PanelVisualInspection(dbGtkUtils.ITkDBWindow):
         """Read SN from scanner."""
         txt = dbGtkUtils.scanner_get_line(reader)
         self.write_message("SN: {}\n".format(txt))
+        self.SN_ready(txt, self.SN.widget)
 
 
 def main():
@@ -224,7 +253,3 @@ def main():
         print("Arrrgggg!!!")
 
     dlg.die()
-
-
-if __name__ == "__main__":
-    main()

itkdb_gtk/__init__.py

@@ -1,6 +1,6 @@
 """ itkdb-gtk python module
 """
-__version__ = "0.10.7"
+__version__ = "0.10.8"
 
 
 def dash_board():

{itkdb_gtk-0.10.7.dist-info → itkdb_gtk-0.10.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: itkdb_gtk
-Version: 0.10.7
+Version: 0.10.8
 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
@@ -16,7 +16,6 @@ Requires-Dist: openpyxl
 Requires-Dist: pyserial
 Requires-Dist: python-dateutil
 Requires-Dist: requests
-Requires-Dist: PyGObject
 
 # Interaction with the ITk PDB.
 

{itkdb_gtk-0.10.7.dist-info → itkdb_gtk-0.10.8.dist-info}/RECORD

@@ -1,11 +1,11 @@
-itkdb_gtk/CreateShipments.py,sha256=yk5FKAU2Tpaf3IxsbOEFfRzNZ-pgCn-A_jS_LG4JWbI,12848
+itkdb_gtk/CreateShipments.py,sha256=c9TZVidWULQeZgVymGELcqrBrjtWGhj2DU59cagZOIc,13006
 itkdb_gtk/GetShipments.py,sha256=Bj46Y-Q1O9yxLd5ZvQF6uoLRIU4hAhPmBfjQGmqqF0I,18123
 itkdb_gtk/GlueWeight.py,sha256=4oZOinyHPqG0Pk6AmEVKd_dFDZWPoLrx7ywCmhodveE,12258
 itkdb_gtk/ITkDB.desktop,sha256=v_K4mHsDxb912J1XGo6mOlbW2TkHvYNGrKmiOnsBQqM,172
 itkdb_gtk/ITkDB.svg,sha256=Ry702zrUkxvG61SqThbUNfXySyiLMqalwYpcM-b_KWo,24242
-itkdb_gtk/ITkDBlogin.py,sha256=ciBGBweCKHv31wcEP5DVfdioq_6BcdIs4FPUC0JNF5k,9916
-itkdb_gtk/ITkDButils.py,sha256=gPmGd37QvIfndl_l7ArjMt6IIT0q5eOfn3t34nIr2aQ,15188
-itkdb_gtk/PanelVisualInspection.py,sha256=WMTYeVUEnSwwkSsQA5afwAYYSwtiJAdbD6LLx0Jx4eA,7087
+itkdb_gtk/ITkDBlogin.py,sha256=dyUgQVWxZ8aa6_PzhIyLXshdDBYiQxH524uEwwL6kUc,9948
+itkdb_gtk/ITkDButils.py,sha256=mvlo5F01_B0CZX-GZMkUHRzZSNR1A8IWrGtMRRwGFq4,15635
+itkdb_gtk/PanelVisualInspection.py,sha256=u9BrcF4w9qv4sqsrd3tGpZ1lVQ6du7MYO7tnGym0hAQ,8124
 itkdb_gtk/PetalReceptionTests.py,sha256=qLD1RaFVheopmXf2TfBjoz94SCFybiX4Dnb8qSAWNBw,9334
 itkdb_gtk/SensorUtils.py,sha256=S2Mc-Z1webACisj6waJcMqiqzoGSE7TYScVfxHSD700,15458
 itkdb_gtk/ShowAttachments.py,sha256=1pZo3P_yZwD0IyhbNyeqOE71mXkwuFYAK5bsBy2P-cI,8404
@@ -16,14 +16,14 @@ itkdb_gtk/UploadMultipleTests.py,sha256=o2jmrxNCk65-pj8W0otKVkV-hqzsLuAdAjaVtaeW
 itkdb_gtk/UploadPetalInformation.py,sha256=No7gQEUoO5HJP3Ch3t_j99_xCD9BWrb-PWsDUo7sU6M,24746
 itkdb_gtk/UploadTest.py,sha256=NyNX2itqbMvp4g7XZp5QvXKYZ-ILJrwzcLckLmSDuPw,16570
 itkdb_gtk/WireBondGui.py,sha256=t5Oc89VwvtA562u9bPtFMGTMEXcWFd-K-slrsf61DNY,27120
-itkdb_gtk/__init__.py,sha256=jK08rITh8lQtdBSMOBBKKJO06ASrt8MiuZZxpNPFOAk,1151
+itkdb_gtk/__init__.py,sha256=R8jnrJt9Cok-4BP3A9hon27p9RqlNBiQu8uDKBarSU4,1151
 itkdb_gtk/dashBoard.py,sha256=GM5WKEted7zvNyckCiyEpbDotTDQo9T55_mhwMsuWi0,8329
 itkdb_gtk/dbGtkUtils.py,sha256=_DgoE0TmZWxKv2gHXpDa7bgQppVBIcHS0FbByuZy6AE,27936
 itkdb_gtk/readAVSdata.py,sha256=Sc_pXrzYkGDIF5-0pHYLATQQoRb8gbHmi9jz64v267Y,23439
 itkdb_gtk/readGoogleSheet.py,sha256=Lzm_oPWwDqZZzKoBUgsp277F9-wCfr_BA0X4VD2Eolo,2673
 itkdb_gtk/untrash_component.py,sha256=VrN46-f-kF7voOxtoh7OL-bZSWAaIFb7-Xbx6_WT7K8,757
-itkdb_gtk-0.10.7.dist-info/METADATA,sha256=MFMq6EbF2r7D4LHRt4OaGMrR38Wo52AJSZRP0txkfgA,3150
-itkdb_gtk-0.10.7.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-itkdb_gtk-0.10.7.dist-info/entry_points.txt,sha256=p7hiZPp4EPyRNzRdu6NqYlDmfflZGGDiDjIJGOcwfig,445
-itkdb_gtk-0.10.7.dist-info/top_level.txt,sha256=KVRrH4OS8ovzNR9bvADE0ABn5bNpSk987tuH0jCfkbU,10
-itkdb_gtk-0.10.7.dist-info/RECORD,,
+itkdb_gtk-0.10.8.dist-info/METADATA,sha256=Lsegbvx8tfoniCboqqwLSEfMjOqA0A5jB47gP-fA9M8,3125
+itkdb_gtk-0.10.8.dist-info/WHEEL,sha256=cpQTJ5IWu9CdaPViMhC9YzF8gZuS5-vlfoFihTBC86A,91
+itkdb_gtk-0.10.8.dist-info/entry_points.txt,sha256=p7hiZPp4EPyRNzRdu6NqYlDmfflZGGDiDjIJGOcwfig,445
+itkdb_gtk-0.10.8.dist-info/top_level.txt,sha256=KVRrH4OS8ovzNR9bvADE0ABn5bNpSk987tuH0jCfkbU,10
+itkdb_gtk-0.10.8.dist-info/RECORD,,

{itkdb_gtk-0.10.7.dist-info → itkdb_gtk-0.10.8.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.43.0)
+Generator: setuptools (70.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any