Upload app.py

app.py

@@ -14,14 +14,14 @@ from pyngrok import conf, ngrok
 import requests
 
 # Manually set ngrok path
-#ngrok_path = "/Users/ninadmandavkar/Desktop/ngrok/ngrok 3"
+ngrok_path = "/Users/ninadmandavkar/Desktop/ngrok/ngrok 3"
 
 # Set the ngrok path in the configuration
-# config = conf.get_default()
-# config.ngrok_path = ngrok_path
+config = conf.get_default()
+config.ngrok_path = ngrok_path
 
 # Set your ngrok auth token
-# ngrok.set_auth_token('2jQ6LRMBFqe25TP7o2ugti9EH6Y_3mBzBYbsjZmhh69eGq2Q1')
+ngrok.set_auth_token('2jQ6LRMBFqe25TP7o2ugti9EH6Y_3mBzBYbsjZmhh69eGq2Q1')
 
 # logging.basicConfig(level=logging.INFO)
 
@@ -65,42 +65,40 @@ def save_slab_data(new_row):
 # Function to generate PM_id
 def generate_rule_id(user_data):
     company_id = user_data.get('Company ID', '')
-    ordering_channels = user_data.get('Ordering Channels', '')
+    ordering_channels = user_data.get('Product lines', '')
     fulfilling_location = user_data.get('Fulfilling Location', '')
     application_id = user_data.get('Application ID', '')
-    selected_fee_type = str(user_data.get('Fee type', ''))
-    selected_variable_type = user_data.get('Variable', '')
+    selected_fee_type = user_data.get('Fee Type', '')
+    selected_variable_type = user_data.get('Variable Type', '')
     selected_chargeable_on = user_data.get('Chargeable on', '')
     selected_fee_nature = user_data.get('Fee Nature', '')
     threshold = user_data.get('Threshold option', '')
 
-  # Ensure all fields are strings
-    company_id = str(company_id) if company_id is not None else ''
-    ordering_channels = str(ordering_channels) if ordering_channels is not None else ''
-    fulfilling_location = str(fulfilling_location) if fulfilling_location is not None else ''
-    application_id = str(application_id) if application_id is not None else ''
-    selected_variable_type = str(selected_variable_type) if selected_variable_type is not None else ''
-    selected_chargeable_on = str(selected_chargeable_on) if selected_chargeable_on is not None else ''
-    selected_fee_nature = str(selected_fee_nature) if selected_fee_nature is not None else ''
-    threshold = str(threshold) if threshold is not None else ''
-
-
-    company_id = company_id.zfill(5)[:5]
-
-    # Extract first 2 characters from each field
+    # Ensure all fields are strings and handle None or empty values
+    company_id = str(company_id).zfill(5)[:5] if company_id else '00000'
+    ordering_channels = str(ordering_channels)[:2] if ordering_channels else '00'
+    fulfilling_location = str(fulfilling_location)[:2] if fulfilling_location else '00'
+    application_id = str(application_id)[:2] if application_id else '00'
+    selected_fee_type = str(selected_fee_type)[:2] if selected_fee_type else '00'
+    selected_variable_type = str(selected_variable_type)[:2] if selected_variable_type else '00'
+    selected_chargeable_on = str(selected_chargeable_on)[:2] if selected_chargeable_on else '00'
+    selected_fee_nature = str(selected_fee_nature)[:2] if selected_fee_nature else '00'
+    threshold = str(threshold)[:2] if threshold else '00'
+
+    # Extract first 2 characters from each field and ensure proper length
     rule_id_parts = [
-        company_id[:5] if company_id else "00",
-        ordering_channels[:2] if ordering_channels else "00",
-        fulfilling_location[:2] if fulfilling_location else "00",
-        application_id[:2] if application_id else "00",
-        selected_fee_type[:2] if selected_fee_type else "00",
-        selected_variable_type[:2] if selected_variable_type else "00",
-        selected_chargeable_on[:2] if selected_chargeable_on else "00",
-        selected_fee_nature[:2] if selected_fee_nature else "00",
-        threshold[:2] if threshold else "00",
+        company_id,                 # Ensure 5 characters
+        ordering_channels,          # Ensure 2 characters
+        fulfilling_location,        # Ensure 2 characters
+        application_id,             # Ensure 2 characters
+        selected_fee_type,          # Ensure 2 characters
+        selected_variable_type,     # Ensure 2 characters
+        selected_chargeable_on,     # Ensure 2 characters
+        selected_fee_nature,        # Ensure 2 characters
+        threshold                   # Ensure 2 characters
     ]
 
-    rule_id = '_'.join(rule_id_parts)  # Join parts with underscore
+    rule_id = '_'.join(rule_id_parts)  # Join parts with an underscore
     return rule_id
 
 
@@ -314,6 +312,7 @@ company_id_int = None
 if company_id.strip():
     try:
         company_id_int = int(company_id.strip())
+        st.session_state['company_id'] = company_id.strip() #ALways store the company id in session state
     except ValueError:
         st.error("Invalid Company ID. Please enter a valid integer.")
         company_id_int = None
@@ -1092,31 +1091,32 @@ if bundle_by == "Feature specific":
 
     rule_id = None
     plan_id = None 
-    business_head = st.session_state['business_head']
+    # business_head = st.session_state['business_head']
     company_name = st.session_state['company_name']
     company_id = st.session_state['company_id']
-    currency = st.session_state['currency']
-    # bundle_by = st.session_state['bundle_by']
-    plan_name = st.session_state['plan_name']
-    plan_description = st.session_state['plan_description']
-    selected_ordering_channel = st.session_state['selected_ordering_channel']
-    fulfilling_location = st.session_state['fulfilling_location']
-    application_id = st.session_state['application_id']
-    selected_fee_type = st.session_state['selected_fee_type']
-    selected_variable_type = st.session_state['selected_variable_type']
-    selected_chargeable_on = st.session_state['selected_chargeable_on']
-    user_input_3 = st.session_state['user_input_3']
-    usage_3 = st.session_state['usage_3']
-    Capping_or_Minimum_Guarantee_3 = st.session_state['Capping_or_Minimum_Guarantee_3']
-    fee_reversal = st.session_state['fee_reversal']
-    reversal_per = st.session_state['reversal_per']
-    threshold = st.session_state['threshold']
-    expected_billing = st.session_state['expected_billing']
-    selected_payment_method = st.session_state['selected_payment_method']
-    selected_plan_validity = st.session_state['selected_plan_validity']
-    final_billing = int(st.session_state['final_billing']) if st.session_state['final_billing'] is not None else 0
+    # currency = st.session_state['currency']
+    # # bundle_by = st.session_state['bundle_by']
+    # plan_name = st.session_state['plan_name']
+    # plan_description = st.session_state['plan_description']
+    # selected_ordering_channel = st.session_state['selected_ordering_channel']
+    # fulfilling_location = st.session_state['fulfilling_location']
+    # application_id = st.session_state['application_id']
+    # selected_fee_type = st.session_state['selected_fee_type']
+    # selected_variable_type = st.session_state['selected_variable_type']
+    # selected_chargeable_on = st.session_state['selected_chargeable_on']
+    # user_input_3 = st.session_state['user_input_3']
+    # usage_3 = st.session_state['usage_3']
+    # Capping_or_Minimum_Guarantee_3 = st.session_state['Capping_or_Minimum_Guarantee_3']
+    # fee_reversal = st.session_state['fee_reversal']
+    # reversal_per = st.session_state['reversal_per']
+    # threshold = st.session_state['threshold']
+    # expected_billing = st.session_state['expected_billing']
+    # selected_payment_method = st.session_state['selected_payment_method']
+    # selected_plan_validity = st.session_state['selected_plan_validity']
+    # final_billing = int(st.session_state['final_billing']) if st.session_state['final_billing'] is not None else 0
 
     if st.button("Submit", key ='submit_button'):
+
     # Save user data
         user_data = {
         "Business_Head": business_head,
@@ -1145,21 +1145,27 @@ if bundle_by == "Feature specific":
         "Net_total_billing":int(final_billing)
         }
 
-        global_user_data.append((user_name, user_data))
-
-    # Generate PM_id and add it to user_data
+        # Generate rule_id and plan_id
         rule_id = generate_rule_id(user_data)
-        user_data['rule_id'] = rule_id
-
-    # Generate Plan ID and add it to user_data
         plan_id = generate_plan_id(user_data)
+
+        # Update user_data with generated IDs
+        user_data['rule_id'] = rule_id
         user_data['plan_id'] = plan_id
 
-        save_user_data(user_data)  # Save user data after submission
+        # Save the user data locally and to session state
+        global_user_data.append((user_name, user_data))
+        save_user_data(user_data)
 
-    # Display saved records
+        # Display saved records
         display_saved_records()
 
+
+        # Store created_at, rule_id, and plan_id in session state
+        st.session_state['created_at'] = datetime.now().isoformat()
+        st.session_state['rule_id'] = rule_id
+        st.session_state['plan_id'] = plan_id
+
     
     if st.button("Export data to BQ"):
         def insert_into_bq(user_data, project_id, dataset_id, table_id, service_account_info):
@@ -1197,7 +1203,11 @@ if bundle_by == "Feature specific":
         application_id = st.session_state['application_id']
         # bundle_by = st.session_state['bundle_by']
 
-        created_at = datetime.now().isoformat()
+        # Retrieve created_at, rule_id, and plan_id from session state
+        created_at = st.session_state.get('created_at')
+        rule_id = st.session_state.get('rule_id')
+        plan_id = st.session_state.get('plan_id')
+
 
         user_data = {
             "Business_Head": business_head,
@@ -1229,15 +1239,6 @@ if bundle_by == "Feature specific":
             "Net_total_billing":int(final_billing)
         }
         
-        global_user_data.append((user_name, user_data))
-
-    # Generate PM_id and add it to user_data
-        rule_id = generate_rule_id(user_data)
-        user_data['rule_id'] = rule_id
-
-    # Generate Plan ID and add it to user_data
-        plan_id = generate_plan_id(user_data)
-        user_data['plan_id'] = plan_id
 
         save_user_data(user_data)  # Save user data after submission
 
@@ -1263,7 +1264,7 @@ if bundle_by == "Feature specific":
 elif bundle_by == "Single value":
     user_input_1 = st.sidebar.number_input("Enter Commercial value:")
     user_input_2 = float(user_input_1)
-    user_input_3 = "{:.2f}".format(user_input_2)
+    st.session_state['user_input_3'] = "{:.2f}".format(user_input_2)
 
     plan_name = st.sidebar.text_input("Plan Name", help="Enter the name of the plan")
     plan_description = st.sidebar.text_area("Plan Description", max_chars=250, help="Describe the plan")
@@ -1838,16 +1839,18 @@ elif bundle_by == "Single value":
     selected_payment_method = st.selectbox("Payment Method", [""] + payment_method_options, help="Payment method defines the mode of payment of the plan", key="py_vd_2")
 
     initial_net_billing = 0
-    expected_billing = user_input_1 
+    user_input_3 = st.session_state['user_input_3']
 
-    if selected_plan_validity == 'One time' and selected_plan_validity == 'Monthly':
-        final_billing = 1*expected_billing
+    if selected_plan_validity == 'One time':
+        final_billing = 1 * expected_billing
+    elif selected_plan_validity == 'Monthly':
+        final_billing = 1 * expected_billing
     elif selected_plan_validity == 'Quarterly':
-        final_billing = 3*expected_billing
+        final_billing = 3 * expected_billing
     elif selected_plan_validity == 'Bi-Annually':
-        final_billing = 6*expected_billing
+        final_billing = 6 * expected_billing
     elif selected_plan_validity == 'Annually':
-        final_billing = 12*expected_billing
+        final_billing = 12 * expected_billing
     else:
         final_billing = initial_net_billing
 
@@ -1892,31 +1895,30 @@ elif bundle_by == "Single value":
 
     rule_id = None
     plan_id = None 
-    business_head = st.session_state['business_head']
+    # business_head = st.session_state['business_head']
     company_name = st.session_state['company_name']
     company_id = st.session_state['company_id']
-    currency = st.session_state['currency']
-    # bundle_by = st.session_state['bundle_by']
-    plan_name = st.session_state['plan_name']
-    plan_description = st.session_state['plan_description']
-    selected_ordering_channel = st.session_state['selected_ordering_channel']
-    fulfilling_location = st.session_state['fulfilling_location']
-    application_id = st.session_state['application_id']
-    selected_fee_type = st.session_state['selected_fee_type']
-    selected_variable_type = st.session_state['selected_variable_type']
-    selected_chargeable_on = st.session_state['selected_chargeable_on']
-    user_input_3 = st.session_state['user_input_3']
-    usage_3 = st.session_state['usage_3']
-    Capping_or_Minimum_Guarantee_3 = st.session_state['Capping_or_Minimum_Guarantee_3']
-    fee_reversal = st.session_state['fee_reversal']
-    reversal_per = st.session_state['reversal_per']
-    threshold = st.session_state['threshold']
-    expected_billing = st.session_state['expected_billing']
-    selected_payment_method = st.session_state['selected_payment_method']
-    selected_plan_validity = st.session_state['selected_plan_validity']
-    final_billing = int(st.session_state['final_billing']) if st.session_state['final_billing'] is not None else 0
-    
-    
+    # currency = st.session_state['currency']
+    # # bundle_by = st.session_state['bundle_by']
+    # plan_name = st.session_state['plan_name']
+    # plan_description = st.session_state['plan_description']
+    # selected_ordering_channel = st.session_state['selected_ordering_channel']
+    # fulfilling_location = st.session_state['fulfilling_location']
+    # application_id = st.session_state['application_id']
+    # selected_fee_type = st.session_state['selected_fee_type']
+    # selected_variable_type = st.session_state['selected_variable_type']
+    # selected_chargeable_on = st.session_state['selected_chargeable_on']
+    # user_input_3 = st.session_state['user_input_3']
+    # usage_3 = st.session_state['usage_3']
+    # Capping_or_Minimum_Guarantee_3 = st.session_state['Capping_or_Minimum_Guarantee_3']
+    # fee_reversal = st.session_state['fee_reversal']
+    # reversal_per = st.session_state['reversal_per']
+    # threshold = st.session_state['threshold']
+    # expected_billing = st.session_state['expected_billing']
+    # selected_payment_method = st.session_state['selected_payment_method']
+    # selected_plan_validity = st.session_state['selected_plan_validity']
+    # final_billing = int(st.session_state['final_billing']) if st.session_state['final_billing'] is not None else 0
+       
 
 # Submit button
     if st.button("Submit"):
@@ -1935,7 +1937,7 @@ elif bundle_by == "Single value":
         "Fee Type": selected_fee_type,
         "Variable Type": selected_variable_type,
         "Chargeable on": selected_chargeable_on,
-        "Fee Nature": " ",
+        "Fee Nature": 0,
         "Commercial value": user_input_3,
         "Fee reversal": 0,
         "Reversal %": 0,
@@ -1948,23 +1950,28 @@ elif bundle_by == "Single value":
         "Net_total_billing":int(final_billing)
         }
 
-        global_user_data.append((user_name, user_data))
-
-    # Generate PM_id and add it to user_data
+        
+        # Generate rule_id and plan_id
         rule_id = generate_rule_id(user_data)
-        user_data['rule_id'] = rule_id
-
-    # Generate Plan ID and add it to user_data
         plan_id = generate_plan_id(user_data)
-        user_data['plan_id'] = plan_id
 
+        # Update user_data with generated IDs
+        user_data['rule_id'] = rule_id
+        user_data['plan_id'] = plan_id
 
-        save_user_data(user_data)  # Save user data after submission
+        # Save the user data locally and to session state
+        global_user_data.append((user_name, user_data))
+        save_user_data(user_data)
 
-    # Display saved records
+        # Display saved records
         display_saved_records()
 
 
+         # Store created_at, rule_id, and plan_id in session state
+        st.session_state['created_at'] = datetime.now().isoformat()
+        st.session_state['rule_id'] = rule_id
+        st.session_state['plan_id'] = plan_id
+
 
     if st.button("Export data to BQ"):
 
@@ -2000,8 +2007,7 @@ elif bundle_by == "Single value":
                 logging.exception("An error occurred during the BigQuery insert operation.")
                 st.error(f"An error occurred: {e}")
 
-
-            
+  
 
         project_id = "fynd-db"
         dataset_id = "finance_dwh"
@@ -2010,10 +2016,13 @@ elif bundle_by == "Single value":
         application_id = st.session_state['application_id']
         # bundle_by = st.session_state['bundle_by']
         
+        
+        # Retrieve created_at, rule_id, and plan_id from session state
+        created_at = st.session_state.get('created_at')
+        rule_id = st.session_state.get('rule_id')
+        plan_id = st.session_state.get('plan_id')
 
-        created_at = datetime.now().isoformat()
-
-
+        # Prepare user_data for BigQuery with correct rule_id and plan_id
         user_data = {
             "Business_Head": business_head,
             "Company_ID": company_id if company_id and company_id.strip() else None,
@@ -2028,7 +2037,7 @@ elif bundle_by == "Single value":
             "Fee_Type": selected_fee_type,
             "Variable_Type": selected_variable_type,
             "Chargeable_on": selected_chargeable_on,
-            "Fee_Nature": " ",
+            "Fee_Nature": 0,
             "Commercial_value": user_input_3,
             "Fee_reversal": 0,
             "Reversal_%": 0,
@@ -2041,19 +2050,9 @@ elif bundle_by == "Single value":
             "rule_id": rule_id,
             "plan_id": plan_id,
             "created_at": created_at,
-            "Net_total_billing":int(final_billing)
+            "Net_total_billing": int(final_billing)
         }
-
-        global_user_data.append((user_name, user_data))
-
-    # Generate PM_id and add it to user_data
-        rule_id = generate_rule_id(user_data)
-        user_data['rule_id'] = rule_id
-
-    # Generate Plan ID and add it to user_data
-        plan_id = generate_plan_id(user_data)
-        user_data['plan_id'] = plan_id
-
+        
 
         save_user_data(user_data)
 
@@ -2107,8 +2106,8 @@ st.write(" ")
 # Start a tunnel to the correct port
 
 # Connect to a port (e.g., 8501) without a custom subdomain
-# try:
-#     ngrok_tunnel = ngrok.connect(8501)  # Replace 8501 with your port number
-#     print(f"ngrok tunnel URL: {ngrok_tunnel.public_url}")
-# except Exception as e:
-#     print(f"Failed to start ngrok tunnel: {e}")
+try:
+    ngrok_tunnel = ngrok.connect(8501)  # Replace 8501 with your port number
+    print(f"ngrok tunnel URL: {ngrok_tunnel.public_url}")
+except Exception as e:
+    print(f"Failed to start ngrok tunnel: {e}")