Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/search util update #105

Draft
wants to merge 24 commits into
base: main
Choose a base branch
from
Draft

Feature/search util update #105

Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
2ef7886
Add search_param_presets function to search_util class
skyyeat Dec 12, 2022
5b3b888
Fix indentation
SeanScripts Dec 12, 2022
d00fc0b
Debug and rename search_param_presets to get_param_presets_df
SeanScripts Dec 12, 2022
af1e9aa
Minor lint fixes
SeanScripts Dec 13, 2022
4ea9e75
Add function get_param_presets_helper
SeanScripts Dec 13, 2022
6ac9a59
Correct type aliases
SeanScripts Dec 13, 2022
a60ce88
Intermediate state in refactoring to use helper function
SeanScripts Dec 13, 2022
c9166bd
Add missing self references
SeanScripts Dec 13, 2022
6705c2d
Switch to using getattr
SeanScripts Dec 13, 2022
c854712
Fix typos
SeanScripts Dec 13, 2022
b10346d
Finish debugging
SeanScripts Dec 13, 2022
14a806a
Remove old code
SeanScripts Dec 13, 2022
66f8c1a
Lint fixes
SeanScripts Dec 13, 2022
46423a7
Refactor getting CX object data in init
SeanScripts Dec 13, 2022
d0146ad
Refactor get_param_presets_df and subroutines
SeanScripts Dec 13, 2022
854727d
Add handling for empty param results
SeanScripts Dec 13, 2022
2ae0276
Rename flow to flow_name for clarity and fix some typos
SeanScripts Dec 13, 2022
01f5489
Lint fixes
SeanScripts Dec 13, 2022
9cc3363
Add protobuf to dict conversion function
SeanScripts Dec 13, 2022
362fc71
Add docstrings to new functions in search_util.py
skyyeat Dec 13, 2022
a4bf53c
Fix trailing whitespace
skyyeat Dec 13, 2022
afa2297
linting
skyyeat Dec 13, 2022
676d724
Linting
SeanScripts Dec 13, 2022
b2d0d14
Fix bug and finish linting
SeanScripts Dec 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Intermediate state in refactoring to use helper function
  • Loading branch information
@SeanScripts
SeanScripts committed Dec 13, 2022
commit a60ce889d272d7366994c391d01c76baa114910b
52 changes: 48 additions & 4 deletions src/dfcx_scrapi/tools/search_util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -549,12 +549,17 @@ def get_param_presets_df(self, flow_name_list=None):
parameter_preset_names = []
parameter_preset_values = []

param_dfs = []

for flow_id in flow_id_list:
#Start Page
start_page = self.flow_data[flow_id]
flow_name = start_page.display_name
#Event Handlers
for event_handler in start_page.event_handlers:
df = get_param_presets_helper(flow_name, 'Start', event_handler, "", "")
param_dfs.append(df)
"""
if hasattr(event_handler, "trigger_fulfillent") and event_handler.trigger_fulfillment:
event_ful_data = event_handler.trigger_fulfillment
if hasattr(event_ful_data, "set_parameter_actions") and event_ful_data.set_parameter_actions:
Expand All @@ -575,9 +580,13 @@ def get_param_presets_df(self, flow_name_list=None):
location_names.append("Event Handler")
parameter_preset_names.append(param_name)
parameter_preset_values.append(param_value)
"""

#Transition Routes
for route in start_page.transition_routes:
df = get_param_presets_helper(flow_name, 'Start', route, "", "")
param_dfs.append(df)
"""
if hasattr(route, "trigger_fulfillment") and route.trigger_fulfillment:
route_ful_data = route.trigger_fulfillment
if hasattr(route_ful_data, "set_parameter_actions") and route_ful_data.set_parameter_actions:
Expand All @@ -601,12 +610,17 @@ def get_param_presets_df(self, flow_name_list=None):
location_names.append("Transition Route")
parameter_preset_names.append(param_name)
parameter_preset_values.append(param_value)
"""

#Route Group Routes
for route_group_id in start_page.transition_route_groups:
if flow_id in self.route_group_data and route_group_id in self.route_group_data[flow_id]:
route_group = self.route_group_data[flow_id][route_group_id]
route_group_name = route_group.display_name
for route in route_group.transition_routes:
df = get_param_presets_helper(flow_name, 'Start', route, "", route_group_name)
param_dfs.append(df)
"""
if hasattr(route, "trigger_fulfillment") and route.trigger_fulfillment:
route_ful_data = route.trigger_fulfillment
if hasattr(route_ful_data, "set_parameter_actions") and route_ful_data.set_parameter_actions:
Expand All @@ -630,12 +644,16 @@ def get_param_presets_df(self, flow_name_list=None):
location_names.append("Route Group")
parameter_preset_names.append(param_name)
parameter_preset_values.append(param_value)
"""

#All Other Pages
for page in self.page_data[flow_id].values():
page_name = page.display_name

#Entry Fulfillment
df = get_param_presets_helper(flow_name, page_name, page, "", "")
param_dfs.append(df)
"""
if hasattr(page, "entry_fulfillment") and page.entry_fulfillment:
page_ful = page.entry_fulfillment
if hasattr(page_ful, "set_parameter_actions") and page_ful.set_parameter_actions:
Expand All @@ -653,17 +671,22 @@ def get_param_presets_df(self, flow_name_list=None):
location_names.append("Entry Fulfillment")
parameter_preset_names.append(param_name)
parameter_preset_values.append(param_value)
"""

#Page Parameters
if hasattr(page, "form") and page.form:
page_forms = page.form
if hasattr(page_forms, "parameters") and page_forms.parameters:
for page_param in page_forms.parameters:
page_param_name = page_param.display_name
#Form Filling Parameter Presets
if hasattr(page_param, "fill_behavior") and page_param.fill_behavior:
page_ful_behavior = page_param.fill_behavior
if hasattr(page_ful_behavior, "initial_prompt_fulfillment") and page_ful_behavior.initial_prompt_fulfillment:
initial_page_ful = page_ful_behavior.initial_prompt_fulfillment
fill_behavior = page_param.fill_behavior
df = get_param_presets_helper(flow_name, page_name, fill_behavior, page_param_name, "")
param_dfs.append(df)
"""
if hasattr(fill_behavior, "initial_prompt_fulfillment") and fill_behavior.initial_prompt_fulfillment:
initial_page_ful = fill_behavior.initial_prompt_fulfillment
if hasattr(initial_page_ful, "set_parameter_actions") and initial_page_ful.set_parameter_actions:
for param_data in initial_page_ful.set_parameter_actions:
param_name = param_data.parameter
Expand All @@ -679,10 +702,14 @@ def get_param_presets_df(self, flow_name_list=None):
location_names.append("Form Filling")
parameter_preset_names.append(param_name)
parameter_preset_values.append(param_value)
"""

#Form Filling Event Handlers
if hasattr(page_ful_behavior, "reprompt_event_handlers") and page_ful_behavior.reprompt_event_handlers:
if hasattr(fill_behavior, "reprompt_event_handlers") and fill_behavior.reprompt_event_handlers:
for event_handler in page_ful_behavior.reprompt_event_handlers:
df = get_param_presets_helper(flow_name, page_name, event_handler, page_param_name, "")
param_dfs.append(df)
"""
if hasattr(event_handler, "trigger_fulfillment") and event_handler.trigger_fulfillment:
event_ful_data = event_handler.trigger_fulfillment
if hasattr(event_ful_data, "set_parameter_actions") and event_ful_data.set_parameter_actions:
Expand All @@ -703,9 +730,13 @@ def get_param_presets_df(self, flow_name_list=None):
location_names.append("Form Filling Event Handler")
parameter_preset_names.append(param_name)
parameter_preset_values.append(param_value)
"""

#Event Handlers
for event_handler in page.event_handlers:
df = get_param_presets_helper(flow_name, page_name, event_handler, "", "")
param_dfs.append(df)
"""
if hasattr(event_handler, "trigger_fulfillent") and event_handler.trigger_fulfillment:
event_ful_data = event_handler.trigger_fulfillment
if hasattr(event_ful_data, "set_parameter_actions") and event_ful_data.set_parameter_actions:
Expand All @@ -726,9 +757,13 @@ def get_param_presets_df(self, flow_name_list=None):
location_names.append("Event Handler")
parameter_preset_names.append(param_name)
parameter_preset_values.append(param_value)
"""

#Transition Routes
for route in page.transition_routes:
df = get_param_presets_helper(flow_name, page_name, route, "", "")
param_dfs.append(df)
"""
if hasattr(route, "trigger_fulfillment") and route.trigger_fulfillment:
route_ful_data = route.trigger_fulfillment
if hasattr(route_ful_data, "set_parameter_actions") and route_ful_data.set_parameter_actions:
Expand All @@ -752,12 +787,17 @@ def get_param_presets_df(self, flow_name_list=None):
location_names.append("Transition Route")
parameter_preset_names.append(param_name)
parameter_preset_values.append(param_value)
"""

#Route Group Routes
for route_group_id in page.transition_route_groups:
if flow_id in self.route_group_data and route_group_id in self.route_group_data[flow_id]:
route_group = self.route_group_data[flow_id][route_group_id]
route_group_name = route_group.display_name
for route in route_group.transition_routes:
df = get_param_presets_helper(flow_name, page_name, route, "", route_group_name)
param_dfs.append(df)
"""
if hasattr(route, "trigger_fulfillment") and route.trigger_fulfillment:
route_ful_data = route.trigger_fulfillment
if hasattr(route_ful_data, "set_parameter_actions") and route_ful_data.set_parameter_actions:
Expand All @@ -781,8 +821,11 @@ def get_param_presets_df(self, flow_name_list=None):
location_names.append("Route Group")
parameter_preset_names.append(param_name)
parameter_preset_values.append(param_value)
"""

#Combine Lists to DataFrame
return pd.concat(param_dfs)
"""
return pd.DataFrame({"flow":flow_names,
"page":page_names,
"intent":route_intents,
Expand All @@ -794,6 +837,7 @@ def get_param_presets_df(self, flow_name_list=None):
"param_name":parameter_preset_names,
"param_value":parameter_preset_values
})
"""

def get_param_presets_helper(flow, page, cx_obj, page_param, route_group):
flow_names = []
Expand Down