itkdb-gtk 0.10.10.dev2__py3-none-any.whl → 0.10.10.dev4__py3-none-any.whl

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/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/__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.dist-info → itkdb_gtk-0.10.10.dev4.dist-info}/METADATA

@@ -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.dist-info → itkdb_gtk-0.10.10.dev4.dist-info}/RECORD

@@ -4,8 +4,8 @@ itkdb_gtk/GlueWeight.py,sha256=tyF5-EAc6QkOLo9ZRp807Xx6zK6yYBGElvfmpUYeuUA,12284
 itkdb_gtk/ITkDB.desktop,sha256=v_K4mHsDxb912J1XGo6mOlbW2TkHvYNGrKmiOnsBQqM,172
 itkdb_gtk/ITkDB.svg,sha256=Ry702zrUkxvG61SqThbUNfXySyiLMqalwYpcM-b_KWo,24242
 itkdb_gtk/ITkDBlogin.py,sha256=40tipm_j5eUS4dnZnBT8VyL6Bu_8csuqS9TPWKxvKSY,10038
-itkdb_gtk/ITkDButils.py,sha256=SCp9NFAFcNM_9m2PCEYdnn3SJDU7JhDAXFcBWkgR6es,19201
-itkdb_gtk/PanelVisualInspection.py,sha256=UdY40fre5EEIr4XHRmvbP0JkDP00HvNApX2CbImA_vw,20223
+itkdb_gtk/ITkDButils.py,sha256=WYjE_DOnFJdxhhQ5ylVTupIOjrp2r83jQALa0Gc2xZg,19587
+itkdb_gtk/PanelVisualInspection.py,sha256=EO0bsPnzD7aT2iBs2SShOAfbixvYcDrByLpjVOEk4MM,20510
 itkdb_gtk/PetalReceptionTests.py,sha256=Ta3gGa_pFcOSroF2xpPyAT5nfhXAouBHcfDgPXCvwJI,9903
 itkdb_gtk/SensorUtils.py,sha256=fYWF9TeutAbore53dLWNlZnVn9P3OsKYcFLNGOs8cnI,15426
 itkdb_gtk/ShowAttachments.py,sha256=KExxPCdbcb04XS8JSUkg5xF1McvlB8e9btwctDCKNXU,8498
@@ -16,14 +16,14 @@ itkdb_gtk/UploadMultipleTests.py,sha256=U94u9WJLeHPgBKT2lPOCxTaXf1Rv19mb5VzLq6bY
 itkdb_gtk/UploadPetalInformation.py,sha256=N0OgGcbjB6uagUUJVwSNhuNPnGHh8PtqjOm2BncrYxI,25874
 itkdb_gtk/UploadTest.py,sha256=g2NohkkRNJXsaODncyR6hnYpawURA6VBSqFe1Zg-h2A,16641
 itkdb_gtk/WireBondGui.py,sha256=lG4eH8CNEf15yiEZ7l7bDayw3zOaKGKx2JGB-IcEBa0,33601
-itkdb_gtk/__init__.py,sha256=i12_VChfdfkF1EGhwYDYxWBggWEvdC_RaQ0zKFRdm0o,1292
+itkdb_gtk/__init__.py,sha256=Hbo4BBh0ejzMgHCQMXiGWDTJxvOS_S3Atfwoh8Xhbgc,1292
 itkdb_gtk/dashBoard.py,sha256=FOmp0hwToN5Lo3cHf1a5RZv6fP9EsIs462PJErtz7Pw,9010
 itkdb_gtk/dbGtkUtils.py,sha256=THW-IT5UJB1YluvUVIfpy6oIY2faSHChNKGTpY5qzag,30480
 itkdb_gtk/readAVSdata.py,sha256=NFJ7XYUeKbTxPKfu0kEjq8wBErS88bCFmNpjQyA2jcM,23478
 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.10.dev2.dist-info/METADATA,sha256=WyyCA5_haMqUfVR-8Fnm3RY277UepK90rrGWOyENJFA,3156
-itkdb_gtk-0.10.10.dev2.dist-info/WHEEL,sha256=UvcQYKBHoFqaQd6LKyqHw9fxEolWLQnlzP0h_LgJAfI,91
-itkdb_gtk-0.10.10.dev2.dist-info/entry_points.txt,sha256=Xf_DDU3QlT2zogRFMOJdO4BdVuAKyAwmb2jHZ5KbBxE,501
-itkdb_gtk-0.10.10.dev2.dist-info/top_level.txt,sha256=KVRrH4OS8ovzNR9bvADE0ABn5bNpSk987tuH0jCfkbU,10
-itkdb_gtk-0.10.10.dev2.dist-info/RECORD,,
+itkdb_gtk-0.10.10.dev4.dist-info/METADATA,sha256=ubHgTwSfYPsRws4PJNFQDlIIZ_vMygovaPpxSVuC0w4,3156
+itkdb_gtk-0.10.10.dev4.dist-info/WHEEL,sha256=uCRv0ZEik_232NlR4YDw4Pv3Ajt5bKvMH13NUU7hFuI,91
+itkdb_gtk-0.10.10.dev4.dist-info/entry_points.txt,sha256=Xf_DDU3QlT2zogRFMOJdO4BdVuAKyAwmb2jHZ5KbBxE,501
+itkdb_gtk-0.10.10.dev4.dist-info/top_level.txt,sha256=KVRrH4OS8ovzNR9bvADE0ABn5bNpSk987tuH0jCfkbU,10
+itkdb_gtk-0.10.10.dev4.dist-info/RECORD,,

{itkdb_gtk-0.10.10.dev2.dist-info → itkdb_gtk-0.10.10.dev4.dist-info}/WHEEL

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