.gitignore

@@ -2,7 +2,6 @@ env_conf
 include
 *.docx
 git
-run.sh
 
 # ---> Python
 # Byte-compiled / optimized / DLL files

src/config.py

@@ -1,10 +1,7 @@
 # Load configuration from file/env variables
 
-import os
-
 def load():
-    cfg = {}
+   toLoad = [
-    toLoad = [
         {
             "envname": "DG_IMAP_HOST",
             "filepath": "/owlboard/dgp/imap/host"
@@ -39,25 +36,3 @@ def load():
             "filepath": "/owlboard/dgp/gitea/sshport"
         }
     ]
-
-    for item in toLoad:
-        filepath = item["filepath"]
-        envname = item["envname"]
-        default = item.get("default")
-
-        # Try to load value from file
-        try:
-            with open(filepath, "r") as file:
-                value = file.read().strip()
-        except FileNotFoundError:
-            # If file doesn't exist, try to get value from environment variable
-            value = os.environ.get(envname)
-        
-        # If value is still not found, use the default if provided
-        if value is None and default is not None:
-            value = default
-        
-        # Add the value to the cfg dictionary
-        cfg[envname] = value
-
-    return cfg

src/formatter.py

@@ -12,18 +12,12 @@ def humanYaml(pis_list):
                     for stop in pis['services'][0]['stops']:
                       crs.append(owlboard_connector.convert_tiploc_to_crs(stop))
                     additional_pis += f'  - code: "{pis["pis"]}"\n'
-                    additional_pis += f'    #headcode: {pis["headcode"]}\n'
-                    additional_pis += f'    #date: {pis["date"]}\n'
-                    additional_pis += f'    #source_file: {pis["diagram_file"]}\n'
                     additional_pis += f'    stops: [{",".join(crs)}]\n'
             except Exception as err:
                 print(err)
         elif len(pis['services']) > 1:
             manual_review += f'## THIS CODE REQUIRES MANUAL VERIFICATION\n'
             manual_review += f'  - code: "{pis["pis"]}"\n'
-            manual_review += f'    #headcode: {pis["headcode"]}\n'
-            manual_review += f'    #date: {pis["date"]}\n'
-            manual_review += f'    #source_file: {pis["diagram_file"]}\n'
             for service in pis["services"]:
                 crs = []
                 if service and service['stops']:
@@ -31,4 +25,4 @@ def humanYaml(pis_list):
                         crs.append(owlboard_connector.convert_tiploc_to_crs(stop))
                     manual_review += f'    stops: [{",".join(crs)}]\n'
 
-    return "FOR REVIEW\n" + additional_pis + manual_review
+    return additional_pis + manual_review

src/local_mode.py

@@ -1,4 +1,5 @@
 import parse_docx, pis_find, owlboard_connector, formatter, gitea_connector
+
 import os, sys
 
 def start():
@@ -36,19 +37,14 @@ def start():
         get_detail.append({
             'pis': code['pis'],
             'services': services,
-            'diagram_file': code['file'],
+            'date': code['date']
-            'date': code['date'],
-            'headcode': code['headcode'],
         })
     
     details = []
     for item in get_detail:
         detail = {
             'pis': item['pis'],
-            'headcode': item['headcode'],
-            'date': item['date'],
             'services': [],
-            'diagram_file': item['diagram_file']
         }
         for service in item['services']:
             service_detail = owlboard_connector.get_service_detail(service['trainUid'], item['date'])
@@ -69,4 +65,4 @@ def start():
 
 
 if __name__ == "__main__":
-    print("To use local mode, please call `main.py local`")
+    start()