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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: itkdb_gtk
-Version: 0.10.10.dev2
+Version: 0.10.10.dev4
 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.10.dev2 → itkdb_gtk-0.10.10.dev4}/itkdb_gtk/ITkDButils.py

@@ -83,7 +83,7 @@ def get_db_date(timestamp=None):
         try:
             this_date = dateutil.parser.parse(timestamp)
             out = date2string(this_date)
-            
+
         except (OverflowError, dateutil.parser.ParserError):
             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+1)
+                    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))
 
@@ -672,12 +677,12 @@ def get_db_user(client):
 
     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

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

@@ -511,7 +511,7 @@ class PanelVisualInspection(dbGtkUtils.ITkDBWindow):
                 ipos = rc.find("The following details may help:")
                 msg = rc[ipos:]
                 dbGtkUtils.complain("Failed uploading test {}-{}".format(payload["component"], payload["testType"]), msg)
-                self.write_message(msg)
+                self.write_message(msg+"\n")
 
             else:
                 self.write_message("Upload {}-{} successfull\n".format(payload["component"], payload["testType"]))
@@ -525,15 +525,16 @@ class PanelVisualInspection(dbGtkUtils.ITkDBWindow):
                     rc = ITkDButils.set_test_run_parameter(self.session,
                                                            ITkDButils.uploaded_test_runs[0],
                                                            "COMMENT", "Picture of PW carrier")
-                    
+
                     rc = ITkDButils.set_test_run_parameter(self.session,
                                                            ITkDButils.uploaded_test_runs[0],
                                                            "LINK_TO_PICTURE", global_link)
                     if rc:
                         ipos = rc.find("The following details may help:")
                         msg = rc[ipos:]
-                        dbGtkUtils.complain("Failed updating LINK_TO_PICTURE {}-{}".format(payload["component"], payload["testType"]), msg)
-                        self.write_message(msg)
+                        dbGtkUtils.complain("Failed updating LINK_TO_PICTURE {}-{}".format(payload["component"],
+                                                                                           payload["testType"]), msg)
+                        self.write_message(msg+'\n')
 
                 elif payload["testType"] == "VISUAL_INSPECTION_RECEPTION":
                     rc = ITkDButils.create_test_run_comment(self.session,
@@ -542,8 +543,11 @@ class PanelVisualInspection(dbGtkUtils.ITkDBWindow):
                     if rc:
                         ipos = rc.find("The following details may help:")
                         msg = rc[ipos:]
-                        dbGtkUtils.complain("Failed adding global link as comment: {}-{}".format(payload["component"], payload["testType"]), msg)
-                        self.write_message(msg)
+                        dbGtkUtils.complain("Failed adding global link as comment: {}-{}".format(payload["component"],
+                                                                                                 payload["testType"]), msg)
+                        self.write_message(msg+"\n")
+                    else:
+                        self.write_message("Image: {}\n".format(global_link))
 
 
             n_items += 1

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

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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: itkdb_gtk
-Version: 0.10.10.dev2
+Version: 0.10.10.dev4
 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.10.dev2 → itkdb_gtk-0.10.10.dev4}/pyproject.toml

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