Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
Empty file modified dva-api/.idea/vcs.xml
100755 → 100644
Empty file.
Empty file modified dva-api/Dockerfile
100755 → 100644
Empty file.
Empty file modified dva-api/docker/docker-entrypoint
100755 → 100644
Empty file.
Empty file modified dva-api/gradlew
100755 → 100644
Empty file.
1 change: 1 addition & 0 deletions dva-processing/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ dependencies = [
"uvicorn>=0.34.3",
"validators>=0.35.0",
"pydantic-yaml>=1.6.0",
"rfc3987>=1.3.8",
]
classifiers = ["Private :: Do Not Upload"]

Expand Down
12 changes: 8 additions & 4 deletions dva-processing/src/dva_processing/engines/json_schema.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,23 @@
import json
from typing import Any

from jsonschema import ValidationError, validate as jsvalidate
from jsonschema import ValidationError, FormatChecker, validate as jsvalidate

from ..model import JSONSchemaValidationResult

#initializing the global format checker
global_format_checker = FormatChecker()

def validate(data: Any, schema: str) -> JSONSchemaValidationResult:
# TODO: Do we want to allow loading from arbitrary URL?
# TODO: Can we eliminate this unescape?
schema = json.loads(html.unescape(schema))

try:
jsvalidate(instance=data, schema=schema)
jsvalidate(instance=data, schema=schema, format_checker=global_format_checker)
except ValidationError as e:
return JSONSchemaValidationResult(success=False, errors=e)
# FIX 1: Wrap 'e' in str() so Pydantic receives a string, not an object
return JSONSchemaValidationResult(success=False, errors=str(e))

return JSONSchemaValidationResult(success=True, errors=None)
# FIX 2: Pass an empty string "" instead of None
return JSONSchemaValidationResult(success=True, errors="")
121 changes: 66 additions & 55 deletions dva-processing/uv.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Empty file modified test-env/common-services.yml
100755 → 100644
Empty file.
Empty file modified test-env/compose.yml
100755 → 100644
Empty file.
Empty file modified test-env/scripts/demo-init
100755 → 100644
Empty file.
Loading