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

Jump to bottom

Python: Fixes Plan using an empty function in describe and incorrectly setting context variables for next steps. #4673

Merged
merged 4 commits into from
Jan 19, 2024
+12 −12
Merged

Python: Fixes Plan using an empty function in describe and incorrectly setting context variables for next steps. #4673

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
67d8574
Prevents accessing empty self._function in describe.
juliomenendez Jan 19, 2024
8017462
Fixes parsing and setting step variables.
juliomenendez Jan 19, 2024
89a0c6f
Fixes return type of Plan.describe.
juliomenendez Jan 19, 2024
8d82935
Merge branch 'main' into juliome/issue-2933-4658-fix-plan-describe-an…
moonbox3 Jan 19, 2024
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
24 changes: 12 additions & 12 deletions python/semantic_kernel/planning/plan.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,8 +240,10 @@ def set_default_skill_collection(
if self._function is not None:
self._function.set_default_skill_collection(skills)

def describe(self) -> FunctionView:
return self._function.describe()
def describe(self) -> Optional[FunctionView]:
if self._function is not None:
return self._function.describe()
return None

def set_available_functions(self, plan: "Plan", context: SKContext) -> "Plan":
if len(plan.steps) == 0:
Expand Down Expand Up @@ -400,19 +402,17 @@ def get_next_step_variables(self, variables: ContextVariables, step: "Plan") ->
elif param.name in self._state and (self._state[param.name] is not None and self._state[param.name] != ""):
step_variables.set(param.name, self._state[param.name])

for param_var in step.parameters.variables:
if param_var in step_variables:
for param_name, param_val in step.parameters.variables.items():
if param_name in step_variables:
continue

expanded_value = self.expand_from_variables(variables, param_var)
if expanded_value.lower() == param_var.lower():
step_variables.set(param_var, step.parameters.variables[param_var])
elif param_var in variables:
step_variables.set(param_var, variables[param_var])
elif param_var in self._state:
step_variables.set(param_var, self._state[param_var])
if param_name in variables:
step_variables.set(param_name, param_val)
elif param_name in self._state:
step_variables.set(param_name, self._state[param_name])
else:
step_variables.set(param_var, expanded_value)
expanded_value = self.expand_from_variables(variables, param_val)
step_variables.set(param_name, expanded_value)

for item in variables.variables:
if item not in step_variables:
Expand Down
Loading