-
Notifications
You must be signed in to change notification settings - Fork 781
Fix: Fix app workflows list-runs request & presentation #458
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.
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
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,4 @@ | ||
| import ast | ||
| import asyncio | ||
| import json | ||
| from contextlib import asynccontextmanager | ||
|
|
@@ -62,10 +63,13 @@ class WorkflowRunState(BaseModel): | |
| class WorkflowRunResult(BaseModel): | ||
| """The result of a workflow run.""" | ||
|
|
||
| kind: str | ||
| """The kind/type of result returned by the workflow run.""" | ||
|
|
||
| value: str | ||
| """The value returned by the workflow run, if any.""" | ||
|
|
||
| metadata: dict | ||
| metadata: Optional[dict[str, Any]] = None | ||
| """Metadata associated with the workflow run result.""" | ||
|
|
||
| start_time: Optional[float] = None | ||
|
|
@@ -99,6 +103,9 @@ class WorkflowRunTemporal(BaseModel): | |
| close_time: Optional[float] = None | ||
| """The time when the workflow run completed.""" | ||
|
|
||
| execution_time: Optional[float] = None | ||
| """The total time taken for the workflow run.""" | ||
|
|
||
|
|
||
| class WorkflowRun(BaseModel): | ||
| """An execution instance of a workflow definition.""" | ||
|
|
@@ -187,9 +194,20 @@ async def list_workflow_runs(self) -> ListWorkflowRunsResult: | |
| # Assuming the content is a JSON string representing a WorkflowRun item dict | ||
| try: | ||
| run_data = json.loads(item.text) | ||
| if "result" in run_data and isinstance(run_data["result"], str): | ||
| try: | ||
| # Could be stringified python dict instead of valid JSON | ||
| run_data["result"] = ast.literal_eval(run_data["result"]) | ||
| except (ValueError, SyntaxError) as e: | ||
| try: | ||
| run_data["result"] = json.loads(run_data["result"]) | ||
| except json.JSONDecodeError: | ||
| raise ValueError( | ||
| f"Invalid workflow run result data: {e}" | ||
| ) from e | ||
|
Comment on lines
+197
to
+207
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 🛠️ Refactor suggestion Fix deserialization + normalize result shape for Pydantic. run_data = json.loads(item.text)
if "result" in run_data and isinstance(run_data["result"], str):
try:
# Could be stringified python dict instead of valid JSON
run_data["result"] = ast.literal_eval(run_data["result"])
except (ValueError, SyntaxError) as e:
try:
run_data["result"] = json.loads(run_data["result"])
except json.JSONDecodeError:
raise ValueError(
f"Invalid workflow run result data: {e}"
) from e
+ # Normalize result for model compatibility
+ if "result" in run_data:
+ res = run_data["result"]
+ if isinstance(res, str):
+ run_data["result"] = {"kind": "text", "value": res}
+ elif isinstance(res, dict):
+ run_data["result"].setdefault("kind", "text")
@@
- except json.JSONDecodeError as e:
- raise ValueError(f"Invalid workflow run data: {e}") from e
+ except json.JSONDecodeError as e:
+ raise ValueError(f"Invalid workflow run data: {e}") from eAlso applies to: 210-210 |
||
| runs.append(WorkflowRun(**run_data)) | ||
| except json.JSONDecodeError as e: | ||
| raise ValueError(f"Invalid workflow run data: {e}") | ||
| raise ValueError(f"Invalid workflow run data: {e}") from e | ||
|
|
||
| return ListWorkflowRunsResult(workflow_runs=runs) | ||
|
|
||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What is this used for?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
For the ast.literal_eval deserialization (stringified python case) below