MORE

src/local_mode.py

@@ -30,9 +30,31 @@ def start():
 
     print(f"Found {len(results)} PIS Codes in documents")
     missing_pis = pis_find.run(results)
+    get_detail = []
     for code in missing_pis:
+        print(code)
         services = owlboard_connector.get_services(code['headcode'], code['date'])
-        print(services)
+        get_detail.append({
+            'pis': code['pis'],
+            'services': services,
+            'date': code['date']
+        })
+    
+    details = []
+    for item in get_detail:
+        detail = {
+            'pis': item['pis'],
+            'services': [],
+        }
+        for service in item['services']:
+            service_detail = owlboard_connector.get_service_detail(service['trainUid'], item['date'])
+            detail['services'].append(service_detail)
+
+        details.append(detail)
+
+    print(details)
+
+
 
 
 

src/owlboard_connector.py

@@ -32,24 +32,10 @@ def check_connection():
         return False
     return True
 
-def find_pis_code(code):
-    print("Searching for PIS Code: ", code)
-    url = OB_PIS_BASE_URL + code
-    res = requests.get(url, headers=HEADERS)
-    if res.status_code == 200:
-        json_response = res.json()
-        if json_response and isinstance(json_response, list):
-            return json_response
-        else:
-            return False
-    else:
-        print("Unable to reach OwlBoard.  STATUS: ", res.status_code)
-        return True
-
 def get_services(headcode, date):
     print("Finding GWR service: ", headcode, ", ", date)
     results = []
-    url = OB_TRN_BASE_URL + f"now/headcode/{headcode.lower()}"
+    url = OB_TRN_BASE_URL + f"{date.strftime('%Y-%m-%d')}/headcode/{headcode.lower()}"
     print(url)
     res = requests.get(url, headers=HEADERS)
     if res.status_code == 200:
@@ -67,11 +53,11 @@ def get_service_detail(trainUid, date):
     res = requests.get(url, headers=HEADERS)
     if res.status_code == 200:
         json_res = res.json()
-        if json_res and isinstance(dict, json_res):
+        if json_res:
             svc_detail = {
                 'stops': json_res['stops'],
-                'existing_pis': json_res['pis'],
-                'vstp': json_res['vstp']
+                'existing_pis': json_res.get('pis', None),
+                'vstp': json_res.get('vstp', False)
             }
 
     return organise_svc(svc_detail)
@@ -84,7 +70,8 @@ def organise_svc(input):
         if stop['isPublic']:
             stop_tiplocs.append(stop['tiploc'])
 
-    if input['pis']['skipCount'] == 0:
+    existingPis = False
+    if 'pis' in input and input['pis'].get('skipCount', 0) == 0:
         existingPis = True
 
-    return {'stops': stop_tiplocs, 'vstp': vstp, 'existingPis': existingPis}
+    return {'stops': stop_tiplocs, 'existingPis': existingPis, 'vstp': vstp}

src/parse_docx.py

@@ -3,19 +3,6 @@ from docx import Document
 from datetime import datetime
 import re
 
-### This can parse each table.  What needs to happen next
-### is to parse all tables, then check for a PIS code.
-### If PIS code exists, then find the associated headcode,
-### Then an API request can be made to OwlBoard to try
-### and find a service with valid stopping pattern,
-### then the PIS codes can be generated for review.
-
-### I think that I need to match each page.  I need to search each page for the
-### days of week the diagram is valid for, eg FSX, FO.  Then I need to find the
-### dates the diagram is valid for.  Then use that to search for trains.
-
-### Alternatively, I could ensure that only daily diagrams are sent and the date
-### is contained within the body/subject of the email.
 
 PIS_PATTERN = re.compile(r'PIS code\s*:\s*(\d{4})')
 HEADCODE_PATTERN = re.compile(r'(\d{1}[A-Z]\d{2})')

src/pis_fetch.py

@@ -0,0 +1,57 @@
+import os, requests, yaml
+
+API_KEY = os.environ.get('DGP_GITEA_KEY')
+
+## TESTING
+GIT_URL = 'https://git.fjla.uk'
+
+GIT_API = GIT_URL + '/api/v1'
+
+def load_existing_pis():
+    all_pis_data = []
+    branches = get_branch_list()
+    for branch in branches:
+        branch_pis_data = get_branch_pis(branch)
+        if branch_pis_data is not None:
+            all_pis_data.append(branch_pis_data)
+            print(f"Branch: {branch}, PIS Codes: {len(branch_pis_data['pis'])}")
+
+    # Merging data and removing duplicates based on 'code' key
+    merged_pis_data = {}  ### THIS BIT DOESN'T COMPARE PROPERLY... PRINT EACH TYPE TO SEE STRUCTURE
+    for branch_data in all_pis_data:
+        for item in branch_data['pis']:
+            code = item['code']
+            # Only keep the first occurrence of each 'code'
+            if code not in merged_pis_data:
+                merged_pis_data[code] = item
+
+    # Convert the dictionary back to a list of dictionaries
+    merged_pis_list = [{'code': code, 'stops': value['stops']} for code, value in merged_pis_data.items()]
+
+    print(f"Total unique codes: {len(merged_pis_list)}")
+    return merged_pis_list
+
+
+
+def get_branch_list():
+    get_branches_endpoint = GIT_API + '/repos/owlboard/data/branches'
+    res = requests.get(get_branches_endpoint)
+    branches_json = res.json()
+
+    branches = []
+    for repo in branches_json:
+        branches.append(repo['name'])
+
+    print(branches)
+    return branches
+
+def get_branch_pis(branch_name):
+    get_file_url = GIT_API + f'/repos/owlboard/data/raw/%2Fpis%2Fgw.yaml?ref={branch_name}'
+    res = requests.get(get_file_url)
+    print(res.status_code)
+    pis_yaml = res.text
+    dic = yaml.safe_load(pis_yaml)
+    return dic
+
+if __name__ == "__main__":
+    print(load_existing_pis())

src/pis_find.py

@@ -1,4 +1,4 @@
-import owlboard_connector
+import pis_fetch
 import requests, sys
 
 def run(data_list):
@@ -15,17 +15,20 @@ def dedup(data_list):
     return unique_list_of_dicts
 
 
-## AUTH REQUIRED!!!  Move to owlboard_connector.py
 def find_missing(data_list):
-    BASEURL = 'http://localhost:8460/api/v2/pis/byCode/'
-    #BASEURL = 'https://owlboard.info/api/v2/pis/byCode/'
+    existing_pis_list = pis_fetch.load_existing_pis()
     missing_data = []
 
     for item in data_list:
         pis_code = item.get('pis')
         if pis_code:
-            pis_code_res = owlboard_connector.find_pis_code(pis_code)
-            if not pis_code_res:
-                print("PIS Code ", pis_code, " not found in existing data")
+            code_exists = False
+            for existing_pis in existing_pis_list:
+                if existing_pis['code'] == pis_code:
+                    code_exists = True
+                    break
+            if not code_exists:
+                print("PIS Code", pis_code, "not found in existing data")
                 missing_data.append(item)
+
     return missing_data