emdbva 0.0.1.dev143__tar.gz → 0.0.1.dev144__tar.gz

{emdbva-0.0.1.dev143 → emdbva-0.0.1.dev144}/MANIFEST.in

@@ -1,5 +1,6 @@
 include va/qscores.csv
 include va/utils/cl_weights.pth
+recursive-include va/schemas *.json
 exclude va/symmetry.py
 exclude va/onedepva.py
 exclude va/PATHS.py

{emdbva-0.0.1.dev143/emdbva.egg-info → emdbva-0.0.1.dev144}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: emdbva
-Version: 0.0.1.dev143
+Version: 0.0.1.dev144
 Summary: CryoEM validation toolkit
 Home-page: https://test.pypi.org/project/va/
 Author: Zhe Wang

{emdbva-0.0.1.dev143 → emdbva-0.0.1.dev144/emdbva.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: emdbva
-Version: 0.0.1.dev143
+Version: 0.0.1.dev144
 Summary: CryoEM validation toolkit
 Home-page: https://test.pypi.org/project/va/
 Author: Zhe Wang

{emdbva-0.0.1.dev143 → emdbva-0.0.1.dev144}/emdbva.egg-info/SOURCES.txt

@@ -36,6 +36,9 @@ va/metrics/smoc.py
 va/metrics/strudel.py
 va/metrics/surfaces.py
 va/metrics/threedfsc.py
+va/schemas/__init__.py
+va/schemas/emdb_entry_full.schema.json
+va/schemas/loader.py
 va/utils/Checker.py
 va/utils/ChimeraxViews.py
 va/utils/MapProcessor.py

{emdbva-0.0.1.dev143 → emdbva-0.0.1.dev144}/setup.py

@@ -19,6 +19,9 @@ setup(
     name="emdbva",
     version=__version__,
     packages=find_packages(),
+    package_data={
+        'va.schemas': ['*.json'],
+    },
     exclude_package_data={
         'va': ['test/*', 'core/*', 'proc/*', 'validation/*', 'test_data/*'],
     },

{emdbva-0.0.1.dev143 → emdbva-0.0.1.dev144}/va/preparation.py

@@ -53,6 +53,7 @@ from va.version import __version__
 from va.utils.misc import out_json, create_symbolic_link, keep_three_significant_digits
 from va.utils.MapProcessor import MapProcessor
 from memory_profiler import profile
+from va.schemas.loader import SchemaLoadError, load_json_schema, schema_candidate_paths, schema_file_path
 
 # JSON Schema (optional dependency; code will still run if missing)
 try:
@@ -314,22 +315,22 @@ class PreParation:
         copyfile(source, outpath)
         print(f'Wrote input example to {outpath}')
 
+    def _schema_file_paths(self):
+        """Return schema paths in package-first, source-tree-fallback order."""
+        return schema_candidate_paths()
+
     def _schema_file_path(self):
-        """Return the on-disk path to docs/emdb_entry_full.schema.json."""
-        # preparation.py lives under va/; the schema is stored in sibling docs/.
-        return os.path.join(os.path.dirname(os.path.dirname(__file__)), 'docs', 'emdb_entry_full.schema.json')
+        """Return the first available output-schema path."""
+        return schema_file_path()
 
     def _load_json_schema(self):
-        """Load a JSON Schema from docs/emdb_entry_full.schema.json. Returns dict or None."""
-        path = self._schema_file_path()
-        if not os.path.isfile(path):
-            sys.stderr.write(f'[validation] Schema file not found: {path}\n')
-            return None
+        """Load the packaged output schema, falling back to the source-tree copy."""
+        self._schema_load_error = None
         try:
-            with open(path, 'r', encoding='utf-8') as f:
-                return json.load(f)
-        except Exception as e:
-            sys.stderr.write(f'[validation] Could not load schema "{path}": {e}\n')
+            return load_json_schema()
+        except SchemaLoadError as exc:
+            self._schema_load_error = str(exc)
+            sys.stderr.write(self._schema_load_error + '\n')
             return None
 
     @staticmethod
@@ -373,7 +374,7 @@ class PreParation:
         """
         schema = self._load_json_schema()
         if schema is None:
-            return False, ['Schema file not found or unreadable.']
+            return False, [getattr(self, '_schema_load_error', 'Schema file not found or unreadable.')]
 
         Validator = self._choose_validator(schema)
         if Validator is None:

emdbva-0.0.1.dev144/va/schemas/__init__.py

@@ -0,0 +1 @@
+"""Packaged JSON schemas used by VA at runtime."""