json schema refactoring

Author: bozokopic

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "hat-json"
-version = "0.5.29"
+version = "0.6.0"
 description = "Hat JSON library"
 readme = "README.rst"
 requires-python = ">=3.10"
@@ -28,6 +28,9 @@ Repository = "https://github.com/hat-open/hat-json.git"
 Documentation = "http://hat-json.hat-open.com"
 
 [project.optional-dependencies]
+rs = [
+    "jsonschema_rs ~=0.28.1",
+]
 dev = [
     "hat-doit ~=0.15.18",
     "sphinxcontrib-programoutput >=0.17",

requirements.pip.txt

@@ -2,6 +2,7 @@ hat-doit ~=0.15.18
 hat-util ~=0.6.17
 jsonpatch ~=1.33
 jsonschema ~=4.23.0
+jsonschema_rs ~=0.28.1
 pyyaml ~=6.0.2
 referencing ~=0.35.1
 sphinxcontrib-programoutput >=0.17

src_py/hat/json/__init__.py

@@ -22,11 +22,16 @@
                               read_conf)
 from hat.json.patch import (diff,
                             patch)
-from hat.json.repository import (SchemaRepository,
-                                 json_schema_repo)
-from hat.json.validator import (Validator,
-                                DefaultValidator,
-                                JsonSchemaValidator)
+from hat.json.schema import (SchemaId,
+                             Schema,
+                             SchemaRepository,
+                             create_schema_repository,
+                             merge_schema_repositories,
+                             SchemaValidator,
+                             PySchemaValidator,
+                             RsSchemaValidator,
+                             DefaultSchemaValidator,
+                             json_schema_repo)
 from hat.json import vt
 
 
@@ -52,9 +57,14 @@
            'read_conf',
            'diff',
            'patch',
+           'SchemaId',
+           'Schema',
            'SchemaRepository',
+           'create_schema_repository',
+           'merge_schema_repositories',
+           'SchemaValidator',
+           'PySchemaValidator',
+           'RsSchemaValidator',
+           'DefaultSchemaValidator',
            'json_schema_repo',
-           'Validator',
-           'DefaultValidator',
-           'JsonSchemaValidator',
            'vt']