Upload 3 files

main.py

@@ -102,19 +102,21 @@ def load_data():
             'brands': [],
             'formulations': [],
             'indications': [],
-            'treatment_phases': []
+            'treatment_phases': [],
+            'hospital_types': []
         }
 
     # Fetch all data
     cursor.execute('''SELECT c.pbs_code, d.name as drug, b.name as brand, f.name as formulation,
                       i.name as indication, tp.name as treatment_phase, c.streamlined_code,
-                      c.online_application, c.authority_method
+                      c.online_application, c.authority_method, ht.name as hospital_type
                       FROM combinations c
                       JOIN drugs d ON c.drug_id = d.id
                       JOIN brands b ON c.brand_id = b.id
                       JOIN formulations f ON c.formulation_id = f.id
                       JOIN indications i ON c.indication_id = i.id
-                      JOIN treatment_phases tp ON c.treatment_phase_id = tp.id''')
+                      JOIN treatment_phases tp ON c.treatment_phase_id = tp.id
+                      JOIN hospital_types ht ON c.hospital_type_id = ht.id''')
     
     data = cursor.fetchall()
     
@@ -133,6 +135,9 @@ def load_data():
     
     cursor.execute('SELECT name FROM treatment_phases')
     treatment_phases = [row[0] for row in cursor.fetchall()]
+    
+    cursor.execute('SELECT name FROM hospital_types')
+    hospital_types = [row[0] for row in cursor.fetchall()]
 
     conn.close()
 
@@ -142,25 +147,27 @@ def load_data():
         'brands': brands,
         'formulations': formulations,
         'indications': indications,
-        'treatment_phases': treatment_phases
+        'treatment_phases': treatment_phases,
+        'hospital_types': hospital_types
     }
 
 biologics_data = load_data()
 
 app, rt = fast_app()
 
-def search_biologics(drug, brand, formulation, indication, treatment_phase):
+def search_biologics(drug, brand, formulation, indication, treatment_phase, hospital_type):
     field_indices = {
         'drug': 1,
         'brand': 2,
         'formulation': 3,
         'indication': 4,
-        'treatment_phase': 5
+        'treatment_phase': 5,
+        'hospital_type': 9
     }
     
     results = [combo for combo in biologics_data['combinations'] if all(
         not value or combo[field_indices[key]] == value
-        for key, value in {'drug': drug, 'brand': brand, 'formulation': formulation, 'indication': indication, 'treatment_phase': treatment_phase}.items()
+        for key, value in {'drug': drug, 'brand': brand, 'formulation': formulation, 'indication': indication, 'treatment_phase': treatment_phase, 'hospital_type': hospital_type}.items()
     )]
     
     if not results:
@@ -178,19 +185,21 @@ def search_biologics(drug, brand, formulation, indication, treatment_phase):
             <p><strong>Streamlined Code:</strong> {item[6] or 'N/A'}</p>
             <p><strong>Authority Method:</strong> {item[8]}</p>
             <p><strong>Online Application:</strong> {'Yes' if item[7] else 'No'}</p>
+            <p><strong>Hospital Type:</strong> {item[9]}</p>
         </div>
         <hr>
         """
     
     return output
 
-def update_options(drug, brand, formulation, indication, treatment_phase):
+def update_options(drug, brand, formulation, indication, treatment_phase, hospital_type):
     selected = {
         'drug': drug,
         'brand': brand,
         'formulation': formulation,
         'indication': indication,
-        'treatment_phase': treatment_phase
+        'treatment_phase': treatment_phase,
+        'hospital_type': hospital_type
     }
     
     field_indices = {
@@ -198,7 +207,8 @@ def update_options(drug, brand, formulation, indication, treatment_phase):
         'brand': 2,
         'formulation': 3,
         'indication': 4,
-        'treatment_phase': 5
+        'treatment_phase': 5,
+        'hospital_type': 9
     }
     
     filtered = [combo for combo in biologics_data['combinations'] if all(
@@ -211,7 +221,8 @@ def update_options(drug, brand, formulation, indication, treatment_phase):
         'brands': sorted(set(combo[2] for combo in filtered)),
         'formulations': sorted(set(combo[3] for combo in filtered)),
         'indications': sorted(set(combo[4] for combo in filtered)),
-        'treatment_phases': sorted(set(combo[5] for combo in filtered))
+        'treatment_phases': sorted(set(combo[5] for combo in filtered)),
+        'hospital_types': sorted(set(combo[9] for combo in filtered))
     }
     
     return options
@@ -224,23 +235,27 @@ def get():
         Form(
             Div(
                 Label("Drug:"),
-                Select(Option("All", value=""), *[Option(drug, value=drug) for drug in biologics_data['drugs']], name="drug", hx_get="/update_options", hx_target="#options", hx_trigger="change", hx_include="[name='drug'],[name='brand'],[name='formulation'],[name='indication'],[name='treatment_phase']")
+                Select(Option("All", value=""), *[Option(drug, value=drug) for drug in biologics_data['drugs']], name="drug", hx_get="/update_options", hx_target="#options", hx_trigger="change", hx_include="[name='drug'],[name='brand'],[name='formulation'],[name='indication'],[name='treatment_phase'],[name='hospital_type']")
             ),
             Div(
                 Label("Brand:"),
-                Select(Option("All", value=""), *[Option(brand, value=brand) for brand in biologics_data['brands']], name="brand", hx_get="/update_options", hx_target="#options", hx_trigger="change", hx_include="[name='drug'],[name='brand'],[name='formulation'],[name='indication'],[name='treatment_phase']")
+                Select(Option("All", value=""), *[Option(brand, value=brand) for brand in biologics_data['brands']], name="brand", hx_get="/update_options", hx_target="#options", hx_trigger="change", hx_include="[name='drug'],[name='brand'],[name='formulation'],[name='indication'],[name='treatment_phase'],[name='hospital_type']")
             ),
             Div(
                 Label("Formulation:"),
-                Select(Option("All", value=""), *[Option(formulation, value=formulation) for formulation in biologics_data['formulations']], name="formulation", hx_get="/update_options", hx_target="#options", hx_trigger="change", hx_include="[name='drug'],[name='brand'],[name='formulation'],[name='indication'],[name='treatment_phase']")
+                Select(Option("All", value=""), *[Option(formulation, value=formulation) for formulation in biologics_data['formulations']], name="formulation", hx_get="/update_options", hx_target="#options", hx_trigger="change", hx_include="[name='drug'],[name='brand'],[name='formulation'],[name='indication'],[name='treatment_phase'],[name='hospital_type']")
             ),
             Div(
                 Label("Indication:"),
-                Select(Option("All", value=""), *[Option(indication, value=indication) for indication in biologics_data['indications']], name="indication", hx_get="/update_options", hx_target="#options", hx_trigger="change", hx_include="[name='drug'],[name='brand'],[name='formulation'],[name='indication'],[name='treatment_phase']")
+                Select(Option("All", value=""), *[Option(indication, value=indication) for indication in biologics_data['indications']], name="indication", hx_get="/update_options", hx_target="#options", hx_trigger="change", hx_include="[name='drug'],[name='brand'],[name='formulation'],[name='indication'],[name='treatment_phase'],[name='hospital_type']")
             ),
             Div(
                 Label("Treatment Phase:"),
-                Select(Option("All", value=""), *[Option(phase, value=phase) for phase in biologics_data['treatment_phases']], name="treatment_phase", hx_get="/update_options", hx_target="#options", hx_trigger="change", hx_include="[name='drug'],[name='brand'],[name='formulation'],[name='indication'],[name='treatment_phase']")
+                Select(Option("All", value=""), *[Option(phase, value=phase) for phase in biologics_data['treatment_phases']], name="treatment_phase", hx_get="/update_options", hx_target="#options", hx_trigger="change", hx_include="[name='drug'],[name='brand'],[name='formulation'],[name='indication'],[name='treatment_phase'],[name='hospital_type']")
+            ),
+            Div(
+                Label("Hospital Type:"),
+                Select(Option("All", value=""), *[Option(ht, value=ht) for ht in biologics_data['hospital_types']], name="hospital_type", hx_get="/update_options", hx_target="#options", hx_trigger="change", hx_include="[name='drug'],[name='brand'],[name='formulation'],[name='indication'],[name='treatment_phase'],[name='hospital_type']")
             ),
             Div(
                 Button("Search", type="submit"),
@@ -260,23 +275,27 @@ def get():
         Form(
             Div(
                 Label("Drug:"),
-                Select(Option("All", value=""), *[Option(drug, value=drug) for drug in biologics_data['drugs']], name="drug", hx_get="/update_options", hx_target="#options", hx_trigger="change", hx_include="[name='drug'],[name='brand'],[name='formulation'],[name='indication'],[name='treatment_phase']")
+                Select(Option("All", value=""), *[Option(drug, value=drug) for drug in biologics_data['drugs']], name="drug", hx_get="/update_options", hx_target="#options", hx_trigger="change", hx_include="[name='drug'],[name='brand'],[name='formulation'],[name='indication'],[name='treatment_phase'],[name='hospital_type']")
             ),
             Div(
                 Label("Brand:"),
-                Select(Option("All", value=""), *[Option(brand, value=brand) for brand in biologics_data['brands']], name="brand", hx_get="/update_options", hx_target="#options", hx_trigger="change", hx_include="[name='drug'],[name='brand'],[name='formulation'],[name='indication'],[name='treatment_phase']")
+                Select(Option("All", value=""), *[Option(brand, value=brand) for brand in biologics_data['brands']], name="brand", hx_get="/update_options", hx_target="#options", hx_trigger="change", hx_include="[name='drug'],[name='brand'],[name='formulation'],[name='indication'],[name='treatment_phase'],[name='hospital_type']")
             ),
             Div(
                 Label("Formulation:"),
-                Select(Option("All", value=""), *[Option(formulation, value=formulation) for formulation in biologics_data['formulations']], name="formulation", hx_get="/update_options", hx_target="#options", hx_trigger="change", hx_include="[name='drug'],[name='brand'],[name='formulation'],[name='indication'],[name='treatment_phase']")
+                Select(Option("All", value=""), *[Option(formulation, value=formulation) for formulation in biologics_data['formulations']], name="formulation", hx_get="/update_options", hx_target="#options", hx_trigger="change", hx_include="[name='drug'],[name='brand'],[name='formulation'],[name='indication'],[name='treatment_phase'],[name='hospital_type']")
             ),
             Div(
                 Label("Indication:"),
-                Select(Option("All", value=""), *[Option(indication, value=indication) for indication in biologics_data['indications']], name="indication", hx_get="/update_options", hx_target="#options", hx_trigger="change", hx_include="[name='drug'],[name='brand'],[name='formulation'],[name='indication'],[name='treatment_phase']")
+                Select(Option("All", value=""), *[Option(indication, value=indication) for indication in biologics_data['indications']], name="indication", hx_get="/update_options", hx_target="#options", hx_trigger="change", hx_include="[name='drug'],[name='brand'],[name='formulation'],[name='indication'],[name='treatment_phase'],[name='hospital_type']")
             ),
             Div(
                 Label("Treatment Phase:"),
-                Select(Option("All", value=""), *[Option(phase, value=phase) for phase in biologics_data['treatment_phases']], name="treatment_phase", hx_get="/update_options", hx_target="#options", hx_trigger="change", hx_include="[name='drug'],[name='brand'],[name='formulation'],[name='indication'],[name='treatment_phase']")
+                Select(Option("All", value=""), *[Option(phase, value=phase) for phase in biologics_data['treatment_phases']], name="treatment_phase", hx_get="/update_options", hx_target="#options", hx_trigger="change", hx_include="[name='drug'],[name='brand'],[name='formulation'],[name='indication'],[name='treatment_phase'],[name='hospital_type']")
+            ),
+            Div(
+                Label("Hospital Type:"),
+                Select(Option("All", value=""), *[Option(ht, value=ht) for ht in biologics_data['hospital_types']], name="hospital_type", hx_get="/update_options", hx_target="#options", hx_trigger="change", hx_include="[name='drug'],[name='brand'],[name='formulation'],[name='indication'],[name='treatment_phase'],[name='hospital_type']")
             ),
             Div(
                 Button("Search", type="submit"),
@@ -289,30 +308,34 @@ def get():
     )
 
 @rt('/update_options')
-def get(drug: str = '', brand: str = '', formulation: str = '', indication: str = '', treatment_phase: str = ''):
-    options = update_options(drug, brand, formulation, indication, treatment_phase)
+def get(drug: str = '', brand: str = '', formulation: str = '', indication: str = '', treatment_phase: str = '', hospital_type: str = ''):
+    options = update_options(drug, brand, formulation, indication, treatment_phase, hospital_type)
     return Div(
         custom_css,
         Form(
             Div(
                 Label("Drug:"),
-                Select(Option("All", value=""), *[Option(d, value=d, selected=(d == drug)) for d in options['drugs']], name="drug", hx_get="/update_options", hx_target="#options", hx_trigger="change", hx_include="[name='drug'],[name='brand'],[name='formulation'],[name='indication'],[name='treatment_phase']")
+                Select(Option("All", value=""), *[Option(d, value=d, selected=(d == drug)) for d in options['drugs']], name="drug", hx_get="/update_options", hx_target="#options", hx_trigger="change", hx_include="[name='drug'],[name='brand'],[name='formulation'],[name='indication'],[name='treatment_phase'],[name='hospital_type']")
             ),
             Div(
                 Label("Brand:"),
-                Select(Option("All", value=""), *[Option(b, value=b, selected=(b == brand)) for b in options['brands']], name="brand", hx_get="/update_options", hx_target="#options", hx_trigger="change", hx_include="[name='drug'],[name='brand'],[name='formulation'],[name='indication'],[name='treatment_phase']")
+                Select(Option("All", value=""), *[Option(b, value=b, selected=(b == brand)) for b in options['brands']], name="brand", hx_get="/update_options", hx_target="#options", hx_trigger="change", hx_include="[name='drug'],[name='brand'],[name='formulation'],[name='indication'],[name='treatment_phase'],[name='hospital_type']")
             ),
             Div(
                 Label("Formulation:"),
-                Select(Option("All", value=""), *[Option(f, value=f, selected=(f == formulation)) for f in options['formulations']], name="formulation", hx_get="/update_options", hx_target="#options", hx_trigger="change", hx_include="[name='drug'],[name='brand'],[name='formulation'],[name='indication'],[name='treatment_phase']")
+                Select(Option("All", value=""), *[Option(f, value=f, selected=(f == formulation)) for f in options['formulations']], name="formulation", hx_get="/update_options", hx_target="#options", hx_trigger="change", hx_include="[name='drug'],[name='brand'],[name='formulation'],[name='indication'],[name='treatment_phase'],[name='hospital_type']")
             ),
             Div(
                 Label("Indication:"),
-                Select(Option("All", value=""), *[Option(i, value=i, selected=(i == indication)) for i in options['indications']], name="indication", hx_get="/update_options", hx_target="#options", hx_trigger="change", hx_include="[name='drug'],[name='brand'],[name='formulation'],[name='indication'],[name='treatment_phase']")
+                Select(Option("All", value=""), *[Option(i, value=i, selected=(i == indication)) for i in options['indications']], name="indication", hx_get="/update_options", hx_target="#options", hx_trigger="change", hx_include="[name='drug'],[name='brand'],[name='formulation'],[name='indication'],[name='treatment_phase'],[name='hospital_type']")
             ),
             Div(
                 Label("Treatment Phase:"),
-                Select(Option("All", value=""), *[Option(p, value=p, selected=(p == treatment_phase)) for p in options['treatment_phases']], name="treatment_phase", hx_get="/update_options", hx_target="#options", hx_trigger="change", hx_include="[name='drug'],[name='brand'],[name='formulation'],[name='indication'],[name='treatment_phase']")
+                Select(Option("All", value=""), *[Option(p, value=p, selected=(p == treatment_phase)) for p in options['treatment_phases']], name="treatment_phase", hx_get="/update_options", hx_target="#options", hx_trigger="change", hx_include="[name='drug'],[name='brand'],[name='formulation'],[name='indication'],[name='treatment_phase'],[name='hospital_type']")
+            ),
+            Div(
+                Label("Hospital Type:"),
+                Select(Option("All", value=""), *[Option(ht, value=ht, selected=(ht == hospital_type)) for ht in options['hospital_types']], name="hospital_type", hx_get="/update_options", hx_target="#options", hx_trigger="change", hx_include="[name='drug'],[name='brand'],[name='formulation'],[name='indication'],[name='treatment_phase'],[name='hospital_type']")
             ),
             Div(
                 Button("Search", type="submit"),
@@ -325,8 +348,8 @@ def get(drug: str = '', brand: str = '', formulation: str = '', indication: str
     )
 
 @rt('/search')
-def post(drug: str = '', brand: str = '', formulation: str = '', indication: str = '', treatment_phase: str = ''):
-    results = search_biologics(drug, brand, formulation, indication, treatment_phase)
+def post(drug: str = '', brand: str = '', formulation: str = '', indication: str = '', treatment_phase: str = '', hospital_type: str = ''):
+    results = search_biologics(drug, brand, formulation, indication, treatment_phase, hospital_type)
     return results
 
 

pbs_data.py

@@ -197,7 +197,7 @@ class PBSPublicDataAPIClient:
         rheumatic_diseases = [
             "rheumatoid arthritis", "psoriatic arthritis", "ankylosing spondylitis",
             "non-radiographic axial spondyloarthritis", "giant cell arteritis", 
-            "juvenile idiopathic arthritis"
+            "juvenile idiopathic arthritis", "systemic lupus erythematosus"
         ]
 
         data = {}
@@ -325,6 +325,14 @@ class PBSPublicDataAPIClient:
             else:
                 return 'unknown'  # For cases that don't match any category
 
+        def classify_hospital_type(program_code):
+            if program_code == 'HS':
+                return 'Private'
+            elif program_code == 'HB':
+                return 'Public'
+            else:
+                return 'Any'
+
         for item in items:
             if any(biologic.lower() in item['drug_name'].lower() for biologic in biologics):
                 pbs_code = item['pbs_code']
@@ -338,6 +346,7 @@ class PBSPublicDataAPIClient:
                         "manner_of_administration": item['manner_of_administration'],
                         "maximum_quantity": item['maximum_quantity_units'],
                         "number_of_repeats": item['number_of_repeats'],
+                        "hospital_type": classify_hospital_type(item['program_code']),
                         "restrictions": []
                     }
                 # Append the brand name if it's not already in the list
@@ -380,6 +389,7 @@ class PBSPublicDataAPIClient:
             'formulations': set(),
             'indications': set(),
             'treatment_phases': set(),
+            'hospital_types': set(),
             'combinations': []
         }
         
@@ -387,6 +397,7 @@ class PBSPublicDataAPIClient:
             processed['drugs'].add(item['name'])
             processed['brands'].update(item['brands'])  # Update this line
             processed['formulations'].add(item['li_form'])
+            processed['hospital_types'].add(item['hospital_type'])
             
             for restriction in item['restrictions']:
                 processed['indications'].add(restriction['indications'])
@@ -402,7 +413,8 @@ class PBSPublicDataAPIClient:
                         'treatment_phase': restriction['treatment_phase'],
                         'streamlined_code': restriction['streamlined_code'],
                         'online_application': restriction['online_application'],
-                        'authority_method': restriction['authority_method']
+                        'authority_method': restriction['authority_method'],
+                        'hospital_type': item['hospital_type']
                     })
         
         return {k: sorted(v) if isinstance(v, set) else v for k, v in processed.items()}
@@ -428,18 +440,22 @@ class PBSPublicDataAPIClient:
                           (id INTEGER PRIMARY KEY, name TEXT UNIQUE)''')
         cursor.execute('''CREATE TABLE IF NOT EXISTS treatment_phases
                           (id INTEGER PRIMARY KEY, name TEXT UNIQUE)''')
+        cursor.execute('''CREATE TABLE IF NOT EXISTS hospital_types
+                          (id INTEGER PRIMARY KEY, name TEXT UNIQUE)''')
         cursor.execute('''CREATE TABLE IF NOT EXISTS combinations
                           (id INTEGER PRIMARY KEY, pbs_code TEXT, drug_id INTEGER, brand_id INTEGER,
                            formulation_id INTEGER, indication_id INTEGER, treatment_phase_id INTEGER,
                            streamlined_code TEXT, online_application BOOLEAN, authority_method TEXT,
+                           hospital_type_id INTEGER,
                            FOREIGN KEY (drug_id) REFERENCES drugs(id),
                            FOREIGN KEY (brand_id) REFERENCES brands(id),
                            FOREIGN KEY (formulation_id) REFERENCES formulations(id),
                            FOREIGN KEY (indication_id) REFERENCES indications(id),
-                           FOREIGN KEY (treatment_phase_id) REFERENCES treatment_phases(id))''')
+                           FOREIGN KEY (treatment_phase_id) REFERENCES treatment_phases(id),
+                           FOREIGN KEY (hospital_type_id) REFERENCES hospital_types(id))''')
 
         # Insert data
-        for table in ['drugs', 'brands', 'formulations', 'indications', 'treatment_phases']:
+        for table in ['drugs', 'brands', 'formulations', 'indications', 'treatment_phases', 'hospital_types']:
             cursor.executemany(f"INSERT OR IGNORE INTO {table} (name) VALUES (?)",
                                [(item,) for item in processed_data[table]])
 
@@ -447,17 +463,19 @@ class PBSPublicDataAPIClient:
         for combo in processed_data['combinations']:
             cursor.execute('''INSERT INTO combinations
                               (pbs_code, drug_id, brand_id, formulation_id, indication_id,
-                               treatment_phase_id, streamlined_code, online_application, authority_method)
+                               treatment_phase_id, streamlined_code, online_application, authority_method,
+                               hospital_type_id)
                               VALUES (?, 
                                       (SELECT id FROM drugs WHERE name = ?),
                                       (SELECT id FROM brands WHERE name = ?),
                                       (SELECT id FROM formulations WHERE name = ?),
                                       (SELECT id FROM indications WHERE name = ?),
                                       (SELECT id FROM treatment_phases WHERE name = ?),
-                                      ?, ?, ?)''',
+                                      ?, ?, ?,
+                                      (SELECT id FROM hospital_types WHERE name = ?))''',
                            (combo['pbs_code'], combo['drug'], combo['brand'], combo['formulation'],
                             combo['indication'], combo['treatment_phase'], combo['streamlined_code'],
-                            combo['online_application'], combo['authority_method']))
+                            combo['online_application'], combo['authority_method'], combo['hospital_type']))
 
         # Add last_updated column and insert timestamp
         cursor.execute('''CREATE TABLE IF NOT EXISTS metadata