Skip to content

Commit 9cc81e0

Browse files
committed
resolve conflicts
2 parents c5080d2 + 8755a15 commit 9cc81e0

File tree

4 files changed

+11
-6
lines changed

4 files changed

+11
-6
lines changed

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
55

66
[project]
77
name = "OpenGeodeWeb-Viewer"
8-
version = "1.9.1"
8+
version = "1.9.2-rc.1"
99
dynamic = ["dependencies"]
1010
authors = [
1111
{ name="Geode-solutions", email="[email protected]" },

requirements.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
jsonschema
21
wslink<2
2+
fastjsonschema
33
websocket-client

requirements.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
#
2+
<<<<<<< HEAD
23
# This file is autogenerated by pip-compile with Python 3.10
4+
=======
5+
# This file is autogenerated by pip-compile with Python 3.12
6+
>>>>>>> 8755a152c8314c852dedd532e2b68823d28ce9cc
37
# by the following command:
48
#
59
# pip-compile requirements.in

src/opengeodeweb_viewer/utils_functions.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
import json
44

55
# Third party imports
6-
from jsonschema import validate
7-
from jsonschema.exceptions import ValidationError
6+
import fastjsonschema
7+
from fastjsonschema import JsonSchemaException
88

99
# Local application imports
1010

@@ -24,8 +24,9 @@ def get_schemas_dict(path):
2424
def validate_schema(params, schema, prefix=""):
2525
print(f"{prefix}{schema['rpc']}", f"{params=}", flush=True)
2626
try:
27-
validate(instance=params, schema=schema)
28-
except ValidationError as e:
27+
validate = fastjsonschema.compile(schema)
28+
validate(params)
29+
except fastjsonschema.JsonSchemaException as e:
2930
print(f"Validation error: {e.message}", flush=True)
3031
raise Exception(
3132
{

0 commit comments

Comments
 (0)