update adei-metadata extract config file

adeireplay.py

@@ -51,7 +51,7 @@ def each_group_one_pv(user, password):
     records = []
     groups = get_groups(user, password)
     for group in groups:
-        value = group.attrib['value']
+        value = group.attrib.get('value', None)
         db_server = group.attrib['db_server']
         db_name = group.attrib['db_name']
         db_group = group.attrib['db_group']
@@ -215,19 +215,10 @@ if __name__ == '__main__':
         print('Bad ADEI authentication properties. Aborting...')
         exit(255)
 
-    adei_db_host = os.environ.get('ADEI_DB_HOST')
-    adei_db_user = os.environ.get('ADEI_DB_USER')
-    adei_db_password = os.environ.get('ADEI_DB_PASSWORD')
-
-    if adei_db_host is None or adei_db_user is None or adei_db_password is None:
-        print('Bad ADEI DB properties. Aborting...')
-        exit(255)
-
     parser = argp.ArgumentParser()
-
     parser.add_argument('generate', default=False, nargs='?')
     parser.add_argument('run', default=True, nargs='?')
-    parser.add_argument('--item', action='store_true')
+    parser.add_argument('--item', action='store_true', default=True)
     parser.add_argument('--group', action='store_true')
     parser.add_argument('--non-cached', action='store_true', default=False)
 
@@ -265,6 +256,14 @@ if __name__ == '__main__':
         write_records(records)
         exit(0)
 
+    adei_db_host = os.environ.get('ADEI_DB_HOST')
+    adei_db_user = os.environ.get('ADEI_DB_USER')
+    adei_db_password = os.environ.get('ADEI_DB_PASSWORD')
+
+    if adei_db_host is None or adei_db_user is None or adei_db_password is None:
+        print('Bad ADEI DB properties. Aborting...')
+        exit(255)
+
     pvdb = {}
     if args.item or not args.non_cached:
         for record in records:
@@ -277,6 +276,7 @@ if __name__ == '__main__':
     elif args.group:
         for record in records:
             pvName = record['pvName']
+            desc = record['desc']
             pvdb[pvName] = {
                 'type': 'float',
                 'desc': desc,

requirements.txt

@@ -1,5 +1,13 @@
-pcaspy
+certifi==2021.10.8
+chardet==3.0.4
+idna==2.10
+numpy==1.21.2
+pandas==1.3.3
+pcaspy==0.7.3
+PyMySQL==0.10.0
+python-dateutil==2.8.2
+pytz==2021.3
 requests==2.24.0
+six==1.16.0
 SQLAlchemy==1.3.19
-PyMySQL==0.10.0
-pandas==1.1.0
+urllib3==1.25.11