Added the ability to use campaign keywords in campaign/stage fields -…

… which are formatted when creating a snapshot
fermitools · LTrestka · May 30, 2023 · May 31, 2023 · Jun 9, 2023 · Jun 9, 2023
commit bd9171c18301cdab80bfeb6784f054f2cbef6b2e
diff --git a/.gitignore b/.gitignore
@@ -32,4 +32,6 @@ tmp
 __pycache__
 fife_wrap.py
 fife_wrap
-submission_broker/submission_broker_uwsgi.ini
+submission_broker/submission_broker_uwsgi.ini
+bin/db_equalizer.py
+bin/db_equalizing_script.sql
diff --git a/webservice/MiscPOMS.py b/webservice/MiscPOMS.py
@@ -21,7 +21,7 @@
 
 import cherrypy
 from crontab import CronTab
-from sqlalchemy import and_, distinct, func, or_, text, Integer
+from sqlalchemy import and_, distinct, func, or_, text, Integer, String
 from sqlalchemy.exc import IntegrityError, SQLAlchemyError
 from sqlalchemy.orm import joinedload, attributes, aliased
 
@@ -651,7 +651,7 @@ def get_recovery_list_for_campaign_def(self, ctx, campaign_def):
         return rlist
 
     # h3. snapshot_parts
-    def snapshot_parts(self, ctx, s, campaign_stage_id):
+    def snapshot_parts(self, ctx, s, campaign_stage_id, keywords=None):
 
         cs = ctx.db.query(CampaignStage).filter(CampaignStage.campaign_stage_id == campaign_stage_id).one()
         for table, snaptable, field, sfield, sid, tfield in [
@@ -678,9 +678,34 @@ def snapshot_parts(self, ctx, s, campaign_stage_id):
             if i[0] is None or j is None or j.updated is None or i[0] < j.updated:
                 newsnap = snaptable()
                 columns = j._sa_instance_state.class_.__table__.columns
+                if keywords:
+                    logit.log(f"keywords: {keywords}")
                 for fieldname in list(columns.keys()):
-
-                    setattr(newsnap, fieldname, getattr(j, fieldname))
+                    if keywords:
+                        try:
+                            def navigate(item):
+                                if isinstance(item, str):
+                                    for keyword in keywords.keys():
+                                        if f"%({keyword})s" in item:
+                                            item = item.replace(f"%({keyword})s", keywords[keyword])
+                                elif isinstance(item, dict):
+                                    item = item % keywords
+                                elif isinstance(item, list):
+                                    for i in range(0, len(item)):
+                                        item[i] = navigate(item[i])
+                                return item
+                            value = navigate(getattr(j, fieldname))
+                            setattr(newsnap, fieldname, value)
+                        except KeyError as e:
+                            logit.log(f"Key error: {e}")
+                            pass
+                        except ValueError as e:
+                            logit.log(f"Value error: {e}")
+                            pass
+                        except Exception:
+                            setattr(newsnap, fieldname, getattr(j, fieldname))
+                    else:
+                        setattr(newsnap, fieldname, getattr(j, fieldname))
                 ctx.db.add(newsnap)
             else:
                 newsnap = ctx.db.query(snaptable).filter(snaptable.updated == i[0]).first()

diff --git a/webservice/SubmissionsPOMS.py b/webservice/SubmissionsPOMS.py
@@ -442,8 +442,10 @@ def get_task_id_for(
 
         if parent_submission_id is not None and parent_submission_id != "None":
             s.recovery_tasks_parent = int(parent_submission_id)
-
-        self.poms_service.miscPOMS.snapshot_parts(ctx, s, s.campaign_stage_id)
+        keywords = None
+        if cs.campaign_obj and cs.campaign_obj.campaign_keywords:
+            keywords = cs.campaign_obj.campaign_keywords
+        self.poms_service.miscPOMS.snapshot_parts(ctx, s, s.campaign_stage_id, keywords)
 
         ctx.db.add(s)
         ctx.db.flush()