itkdb-gtk 0.17.0__tar.gz → 0.18.0.dev2__tar.gz

{itkdb_gtk-0.17.0 → itkdb_gtk-0.18.0.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: itkdb_gtk
-Version: 0.17.0
+Version: 0.18.0.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.17.0 → itkdb_gtk-0.18.0.dev2}/itkdb_gtk/ITkDButils.py

@@ -1,5 +1,6 @@
 """Utilities for the inteaction with the ITkDB."""
 import mimetypes
+import traceback
 from collections.abc import Iterable
 from datetime import datetime
 from pathlib import Path
@@ -7,6 +8,8 @@ import getpass
 
 import dateutil.parser
 import itkdb
+import magic
+import locale
 
 # The response of the DB
 db_response = ""
@@ -377,13 +380,18 @@ def upload_test(client, data, attachments=None, check_runNumber=False):
                     if newRn not in runN:
                         data["runNumber"] = newRn
                         break
-
+                        
     # Try to upload the test
     try:
         db_response = client.post("uploadTestRunResults", json=data)
         testRun = db_response["testRun"]["id"]
         uploaded_test_runs.append(testRun)
 
+    except Exception as e:
+        msg = "Could not upload the test:\n{}".format(str(e))
+        return msg
+    
+    try:
         # Handle attachments.
         attachment_urls = {}
         if attachments is not None:
@@ -402,12 +410,12 @@ def upload_test(client, data, attachments=None, check_runNumber=False):
                         print("File {} does not exist".format(path))
                         continue
 
-                    data["url"] = path.as_uri()
-                    filetype = mimetypes.guess_type(path.name)
-                    attachment = {'data': (path.as_posix(), open(path.as_posix(), 'rb'), filetype[0])}
+                    data["url"] = str(path.as_uri())
+                    filetype = itkdb.utils.get_mimetype(path.as_posix(), None)
+                    attachment = {'data': (path.as_posix(), open(path.as_posix(), 'rb'), filetype)}
                 else:
                     data["url"] = att.url
-                    filetype = mimetypes.guess_type(att.url)
+                    filetype = itkdb.utils.get_mimetype(att.url, None)
                     attachment = {'data':(att.url, None, "text/x-uri") }
 
                 db_response = client.post('createTestRunAttachment',
@@ -424,7 +432,9 @@ def upload_test(client, data, attachments=None, check_runNumber=False):
         return None
 
     except Exception as e:
-        return (str(e))
+        print(traceback.format_exc())
+        return "Could not upload attachment:\n{}".format(str(e))
+    
 
 def set_test_run_parameter(session, test_run, parameter, value):
     """Modify testRun Parameter

{itkdb_gtk-0.17.0 → itkdb_gtk-0.18.0.dev2}/itkdb_gtk/UploadMultipleTests.py

@@ -687,8 +687,11 @@ class UploadMultipleTests(dbGtkUtils.ITkDBWindow):
             rc = ITkDButils.upload_test(self.session, payload, values[TestList.Attachments], check_runNumber=True)
             if rc:
                 ipos = rc.find("The following details may help:")
-                msg = rc[ipos:]
-                dbGtkUtils.complain("Failed uploading test {}-{}".format(payload["component"], payload["testType"]))
+                if ipos>=0:
+                    msg = rc[ipos:]
+                else:
+                    msg = rc
+                dbGtkUtils.complain("Failed uploading test {}-{}\n".format(payload["component"], payload["testType"]), msg)
                 self.write_message("Failed uploading test {}-{}\n{}\n".format(payload["component"], payload["testType"], msg))
                 nbad += 1
 
@@ -702,7 +705,7 @@ class UploadMultipleTests(dbGtkUtils.ITkDBWindow):
                 model.remove(past_iter)
 
         if nbad>0:
-            dbGtkUtils.complain("Failed to upload all tests", "{} test had errors.\nThey are left in the ListView.")
+            dbGtkUtils.complain("Failed to upload some tests", "{}/{} tests had errors.\nThey are left in the ListView.".format(nbad, ngood))
         else:
             dbGtkUtils.complain("All {} tests uploaded succesfully".format(ngood))
 

{itkdb_gtk-0.17.0 → itkdb_gtk-0.18.0.dev2}/itkdb_gtk/__init__.py

@@ -1,6 +1,6 @@
 """ itkdb-gtk python module
 """
-__version__ = "0.17.0"
+__version__ = "0.18.0.dev2"
 
 
 def dash_board():
@@ -55,3 +55,8 @@ def visualInspection():
     """Visual inspection of Modules/Sensors."""
     from .VisualInspection import main
     main()
+
+def findDBComponent():
+    """Find object from QR or bar code"""
+    from .findComponent import main
+    main()

{itkdb_gtk-0.17.0 → itkdb_gtk-0.18.0.dev2}/itkdb_gtk/dashBoard.py

@@ -22,6 +22,7 @@ from itkdb_gtk import UploadModuleIV
 from itkdb_gtk import WireBondGui
 from itkdb_gtk import PanelVisualInspection
 from itkdb_gtk import VisualInspection
+from itkdb_gtk import findComponent
 
 
 HAS_PETALQC=False
@@ -59,6 +60,7 @@ class DashWindow(dbGtkUtils.ITkDBWindow):
     PETAL_CORE_METRO = 11
     PETAL_CORE_THERMAL = 12
     PETAL_INFORMATION = 13
+    FIND_COMPONENT = 14
 
     def __init__(self, session):
         """Initialization."""
@@ -162,6 +164,19 @@ class DashWindow(dbGtkUtils.ITkDBWindow):
         recS.connect("clicked", self.receive_shipment)
         grid.attach(recS, 1, irow, 1, 1,)
 
+        irow += 1
+        lbl = Gtk.Label()
+        lbl.set_markup("<b>Utils</b>")
+        lbl.set_xalign(0)
+        grid.attach(lbl, 0, irow, 1, 1)
+
+        irow += 1
+        findC = Gtk.Button(label="Find Component")
+        findC.connect("clicked", self.find_component)
+        findC.set_tooltip_text("Scan your QR or bar code and get info from DB.")
+        grid.attach(findC, 0, irow, 1, 1,)
+
+
         self.mainBox.pack_start(Gtk.Separator(orientation=Gtk.Orientation.HORIZONTAL), False, True, 5)
 
         self.show_all()
@@ -296,6 +311,21 @@ class DashWindow(dbGtkUtils.ITkDBWindow):
         W.connect("destroy", self.app_closed, bitn)
         W.show_all()
         
+        
+    def find_component(self, *args):
+        """Find Component."""
+        bitn = DashWindow.FIND_COMPONENT
+        bt = 1 << bitn
+        if self.mask & bt:
+            return
+
+        W = findComponent.FindComponent(
+            self.session,
+            help_link="{}/findComponent.html".format(HELP_LINK)
+            )
+        
+        W.connect("destroy", self.app_closed, bitn)
+        
     def petal_reception(self, *args):
         """Petal GND/VI test."""
         bitn = DashWindow.PETAL_RECEPTION

itkdb_gtk-0.18.0.dev2/itkdb_gtk/findComponent.py

@@ -0,0 +1,141 @@
+#!/usr/bin/env python3
+"""GUI to upload tests."""
+import argparse
+import json
+import sys
+from pathlib import Path
+
+try:
+    import itkdb_gtk
+
+except ImportError:
+    cwd = Path(__file__).parent.parent
+    sys.path.append(cwd.as_posix())
+
+from itkdb_gtk import dbGtkUtils, ITkDBlogin, ITkDButils
+from itkdb_gtk.GetShipments import find_vtrx
+
+
+import gi
+gi.require_version("Gtk", "3.0")
+from gi.repository import Gtk, Gio
+
+class FindComponent(dbGtkUtils.ITkDBWindow):
+    """Read QR of bar code and retrieve information about component."""
+
+    def __init__(self, session, help_link=None):
+        """Initialization.
+
+        Args:
+            session: ITkDB session
+            help_link: link to help page.
+
+        """
+        super().__init__(session=session, title="Find Component", help_link=help_link)
+        self.init_window()
+
+    def init_window(self):
+        """Create the Gtk window."""
+        # Initial tweaks
+        self.set_border_width(10)
+
+        # Prepare HeaderBar
+        self.hb.props.title = "Find Component"
+
+        # Object Data
+        lbl = Gtk.Label(label="Scan your QR or bar code. Information will appear below.")
+        self.mainBox.pack_start(lbl, True, True, 0)
+
+        #btn = Gtk.Button(label="Test Button")
+        #btn.connect("clicked", self.test_qrcode)
+        #self.mainBox.pack_start(btn, True, True, 0)
+
+        # The text view
+        self.mainBox.pack_start(self.message_panel.frame, True, True, 0)
+        
+        self.show_all()
+        
+    def get_qrcode(self, fd, state, reader):
+        """Gets data from QR scanner."""
+        txt = dbGtkUtils.scanner_get_line(reader)
+        self.write_message("{}\n".format(txt))
+
+        if txt.find("J-SD") == 0:
+            try:
+                SN = find_vtrx(self.session, txt)
+            except ValueError as e:
+                self.write_message("Error: {}\n".format(e))
+                return
+        else:
+            SN = txt
+            
+        obj = ITkDButils.get_DB_component(self.session, SN)
+        if obj is None:
+            self.write_message("Object not found in DB\n")
+            return
+        
+        msg = "\nObject SN: {}\nObject Alt. ID: {}\nObject Type: {}\nObject Loc. {}\nObject stage: {} - {}".format(
+            obj["serialNumber"], 
+            obj["alternativeIdentifier"],
+            obj["componentType"]["name"],
+            obj["currentLocation"]["name"],
+            obj["currentStage"]["code"],
+            obj["currentStage"]["name"])
+        
+        self.write_message(msg)
+
+    def test_qrcode(self, *args):
+        """Gets data from QR scanner."""
+        txt = "a3c671bf38d3957dc053c6e5471aa27e"
+        self.write_message("{}\n".format(txt))
+
+        if txt.find("J-SD") == 0:
+            try:
+                SN = find_vtrx(self.session, txt)
+            except ValueError as e:
+                self.write_message("Error: {}\n".format(e))
+                return
+        else:
+            SN = txt
+            
+        obj = ITkDButils.get_DB_component(self.session, SN)
+        if obj is None:
+            self.write_message("Object not found in DB\n")
+            return
+        
+        
+        msg = "\n\nObject SN: {}\nObject Alt. ID: {}\nObject Type: {}\nObject Loc.: {}\nObject stage: {} - {}\n".format(
+            obj["serialNumber"], 
+            obj["alternativeIdentifier"],
+            obj["componentType"]["name"],
+            obj["currentLocation"]["name"],
+            obj["currentStage"]["code"],
+            obj["currentStage"]["name"])
+        
+        self.write_message(msg)
+
+def main():
+    """Main entry."""
+    HELP_LINK="https://itkdb-gtk.docs.cern.ch/uploadSingleTest.html"
+
+    # DB login
+    dlg = ITkDBlogin.ITkDBlogin()
+    client = dlg.get_client()
+    if client is None:
+        print("Could not connect to DB with provided credentials.")
+        dlg.die()
+        sys.exit()
+
+    client.user_gui = dlg
+
+    window = FindComponent(client, help_link=HELP_LINK)
+    try:
+        Gtk.main()
+
+    except KeyboardInterrupt:
+        print("Arrrgggg!!!")
+
+    dlg.die()
+
+if __name__ == "__main__":
+    main()

{itkdb_gtk-0.17.0 → itkdb_gtk-0.18.0.dev2}/itkdb_gtk.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: itkdb_gtk
-Version: 0.17.0
+Version: 0.18.0.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.17.0 → itkdb_gtk-0.18.0.dev2}/itkdb_gtk.egg-info/SOURCES.txt

@@ -20,6 +20,7 @@ itkdb_gtk/WireBondGui.py
 itkdb_gtk/__init__.py
 itkdb_gtk/dashBoard.py
 itkdb_gtk/dbGtkUtils.py
+itkdb_gtk/findComponent.py
 itkdb_gtk/readGoogleSheet.py
 itkdb_gtk/untrash_component.py
 itkdb_gtk.egg-info/PKG-INFO

{itkdb_gtk-0.17.0 → itkdb_gtk-0.18.0.dev2}/itkdb_gtk.egg-info/entry_points.txt

@@ -1,5 +1,6 @@
 [gui_scripts]
 createShipments = itkdb_gtk:createShipments
+findDBComponent = itkdb_gtk:findDBComponent
 getShipments = itkdb_gtk:getShipments
 glueWeight = itkdb_gtk:glueWeight
 itkdb_dashBoard = itkdb_gtk:dash_board

{itkdb_gtk-0.17.0 → itkdb_gtk-0.18.0.dev2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "itkdb_gtk"
-version = "0.17.0"
+version = "0.18.0.dev2"
 authors = [
   { name="Carlos Lacasta", email="carlos.lacasta@cern.ch" },
 ]
@@ -37,6 +37,7 @@ uploadModuleIV = "itkdb_gtk:uploadModuleIV"
 wirebondTest = "itkdb_gtk:wirebondTest"
 panelVisualInspection = "itkdb_gtk:panelVisualInspection"
 visualInspection = "itkdb_gtk:visualInspection"
+findDBComponent = "itkdb_gtk:findDBComponent"
 
 [tool.setuptools]
 include-package-data = true