Skip to content

Changed wisvalid json parsing #45

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

Open
PalomoIFCA wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Changed wisvalid json parsing #45

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
549624b
Changed wisvalid json parsing
PalomoIFCA Jul 3, 2024
aeb0b11
Use ast.literal_eval() to load single and double-quoted JSON strings
orviz Jul 5, 2024
3c95121
Merge pull request #1 from orviz/feature/single_and_double_quotes
PalomoIFCA Jul 5, 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
14 changes: 7 additions & 7 deletions PyOphidia/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
from __future__ import division
from __future__ import print_function
from __future__ import absolute_import
import ast
import sys
import os
import json
Expand Down Expand Up @@ -901,16 +902,15 @@ def wisvalid(self, workflow):
return False
w = None

# Remove comment blocks
checked_workflow = re.sub(re.compile(r"/\*.*?\*/|//.*?\n", re.DOTALL), "\n", workflow)

if isinstance(checked_workflow, str):
if isinstance(workflow, str):
try:
w = json.loads(checked_workflow)
# Remove comment blocks in strings
checked_workflow = re.sub(r"(?m)^ *#.*\n?", "", workflow)
w = ast.literal_eval(checked_workflow)
except ValueError:
return False, "Workflow is not a valid JSON"
elif isinstance(checked_workflow, dict):
w = checked_workflow
elif isinstance(workflow, dict):
w = workflow
else:
return False, "Workflow is not a valid dictionary"
if "name" not in w or not w["name"]:
Expand Down