itkdb-gtk 0.12.0__tar.gz → 0.14.1.dev1__tar.gz

{itkdb_gtk-0.12.0 → itkdb_gtk-0.14.1.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: itkdb_gtk
-Version: 0.12.0
+Version: 0.14.1.dev1
 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.12.0 → itkdb_gtk-0.14.1.dev1}/itkdb_gtk/ITkDButils.py

@@ -90,6 +90,39 @@ def get_db_date(timestamp=None):
     return out
 
 
+
+def get_petal_core_batches(session):
+    """Get list of Petal core batches"""
+    payload = {
+        "filterMap": {
+            "project": "S",
+            "batchType": ["PETAL_CORE_BATCH_TYPE"],
+        }
+    }
+    batch_list = session.get("listBatches", json=payload)
+    rc = {}
+    for B in batch_list:
+        rc[B["number"] ]= B["id"]
+
+    return rc
+
+def set_petal_core_batch(session, petal_core):
+    """Set the batch of the petal core."""
+    if petal_core["type"]["code"] != "CORE_AVS":
+        return
+
+    batch_list = get_petal_core_batches(session)
+    aliasID = petal_core["alternativeIdentifier"]
+    if "PPB" in aliasID:
+        batch_code = "PETAL_CORE_PREPROD"
+    elif "PPC" in aliasID:
+        batch_code = "PETAL_CORE_PROD"
+    else:
+        batch_code = "PETAL_CORE_PROTO"
+
+    rc = session.post("addBatchComponent", json={"id":batch_list[batch_code], "component": petal_core["id"]})
+    return rc
+
 def registerPetalCore(client, SN, alias, HC_id=None):
     """Register a Petal Core in the DB.
 
@@ -115,14 +148,14 @@ def registerPetalCore(client, SN, alias, HC_id=None):
     if HC_id is not None:
         dto["properties"]["HC_ID"] = HC_id
 
-    db_response = client.post('registerComponent', json=dto)
     try:
+        db_response = client.post('registerComponent', json=dto)
+        set_petal_core_batch(client, db_response["component"])
         return db_response['component']
 
     except KeyError:
         return None
 
-
 def create_component_attachment(client, SN, file_path, title=None, description="", item_type="component"):
     """Create an attachment to the given component.
 

{itkdb_gtk-0.12.0 → itkdb_gtk-0.14.1.dev1}/itkdb_gtk/UploadMultipleTests.py

@@ -331,7 +331,6 @@ class UploadMultipleTests(dbGtkUtils.ITkDBWindow):
             model.set_value(lv_iter, TestList.Date, handle_test_date(payload["date"]))
             model.set_value(lv_iter, TestList.Institute, handle_test_date(payload["institution"]))
 
-
         dlg.hide()
         dlg.destroy()
 
@@ -391,7 +390,7 @@ class UploadMultipleTests(dbGtkUtils.ITkDBWindow):
 
         box.pack_start(Gtk.Label(label="Select an Institute"), False, True, 0)
 
-        combo = self.create_institute_combo()
+        combo = self.create_institute_combo(only_user=True)
         box.pack_start(combo, False, True, 5)
 
         btn = Gtk.CheckButton(label="Use as default for other tests missing institute ?")
@@ -441,11 +440,9 @@ class UploadMultipleTests(dbGtkUtils.ITkDBWindow):
 
             model[lv_iter][TestList.Json] = data
 
-
         dlg.hide()
         dlg.destroy()
 
-
     def get_component_stages(self, SN):
         """Create a combo with the stages."""
         try:
@@ -468,11 +465,9 @@ class UploadMultipleTests(dbGtkUtils.ITkDBWindow):
             self.write_message("Something went wrong with the stages\n")
             return [None, None]
 
-    def add_test_data_to_view(self, data, ifile=None, folder=None):
+    def add_test_data_to_view(self, data, default_site=None, use_default=False, ifile=None, folder=None):
         """Add a test data to the  tree view."""
         has_errors = False
-        default_site = None
-    
         errors, missing = check_data(data)
         if len(missing) > 0:
             self.write_message("Some keys are missing in the JSon file.\n")
@@ -533,16 +528,25 @@ class UploadMultipleTests(dbGtkUtils.ITkDBWindow):
                             ifile, data, len(attachments), attachments,
                             len(comments), comments, len(defects), defects, color])
 
+        return default_site, use_default
+
     def add_tests_to_view(self, files):
         """Add the input fiels to the treeview."""
+        default_site = None
+        use_default = False
         for ifile in files:
             try:
                 self.write_message("{}\n".format(Path(ifile).name))
                 folder = Path(ifile).parent
 
-                data = json.loads(open(ifile, 'r', encoding="UTF-8").read())
-                self.add_test_data_to_view(data, ifile=ifile, folder=folder)
-
+                data = json.loads(open(ifile, "r", encoding="UTF-8").read())
+                default_site, use_default = self.add_test_data_to_view(
+                    data,
+                    default_site=default_site,
+                    use_defaule=use_default,
+                    ifile=ifile,
+                    folder=folder,
+                )
 
             except Exception as E:
                 self.write_message("Cannot load file {}\n".format(ifile))

{itkdb_gtk-0.12.0 → itkdb_gtk-0.14.1.dev1}/itkdb_gtk/__init__.py

@@ -1,6 +1,6 @@
 """ itkdb-gtk python module
 """
-__version__ = "0.12.0"
+__version__ = "0.14.1.dev1"
 
 
 def dash_board():

{itkdb_gtk-0.12.0 → itkdb_gtk-0.14.1.dev1}/itkdb_gtk.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: itkdb_gtk
-Version: 0.12.0
+Version: 0.14.1.dev1
 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.12.0 → itkdb_gtk-0.14.1.dev1}/pyproject.toml

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

{itkdb_gtk-0.12.0 → itkdb_gtk-0.14.1.dev1}/test/testBatch.py

@@ -34,13 +34,15 @@ def get_all_Petals(session):
 def list_petal_core_batches(session):
     """Get list of Petal core batches"""
     payload = {
+        "filterMap": {
             "project": "S",
-            "batchType": ["PETAL_CORE_PROTO", "PETAL_CORE_PREPROD", "PETAL_CORE_PROD"],
+            "batchType": ["PETAL_CORE_BATCH_TYPE"],
+        }
     }
     batch_list = session.get("listBatches", json=payload)
     rc = {}
     for B in batch_list:
-        rc[B["code"] ]= B["id"]
+        rc[B["number"] ]= B["id"]
 
     return rc
 
@@ -50,7 +52,7 @@ def create_petal_core_batchType(session):
     out = session.post(
         "createBatchType",
         json={
-            "code": "PETAL_CORE",
+            "code": "PETAL_CORE_BATCH_TYPE",
             "name": "Petal Core",
             "state": "active",
             "project": "S",
@@ -60,7 +62,7 @@ def create_petal_core_batchType(session):
         "createBatch",
         json={
             "project": "S",
-            "batchType": "PETAL_CORE",
+            "batchType": "PETAL_CORE_BATCH_TYPE",
             "number": "PETAL_CORE_PROTO",
             "ownerInstituteList": ["IFIC", "AVS", "DESYHH"],
         },
@@ -69,7 +71,7 @@ def create_petal_core_batchType(session):
         "createBatch",
         json={
             "project": "S",
-            "batchType": "PETAL_CORE",
+            "batchType": "PETAL_CORE_BATCH_TYPE",
             "number": "PETAL_CORE_PREPROD",
             "ownerInstituteList": ["IFIC", "AVS", "DESYHH"],
         },
@@ -78,7 +80,7 @@ def create_petal_core_batchType(session):
         "createBatch",
         json={
             "project": "S",
-            "batchType": "PETAL_CORE",
+            "batchType": "PETAL_CORE_BATCH_TYPE",
             "number": "PETAL_CORE_PROD",
             "ownerInstituteList": ["IFIC", "AVS", "DESYHH"],
         },
@@ -86,6 +88,9 @@ def create_petal_core_batchType(session):
 
 
 def main(session):
+    """Create batchers."""
+    #create_petal_core_batchType(session)
+    
     batch_list = list_petal_core_batches(session)
     
 #    # create the batches
@@ -112,6 +117,10 @@ def main(session):
         
         print("{} - {}".format(aliasID, batch_code))
         rc = session.post("addBatchComponent", json={"id":batch_list[batch_code], "component": petal_core["id"]})
+        if rc is None:
+            pass
+        else:
+            pass
 
 
 if __name__ == "__main__":
@@ -124,3 +133,5 @@ if __name__ == "__main__":
 
     except Exception as E:
         print(E)
+        
+    dlg.die()