re-enable schema caching

Author: lukaspie

.github/workflows/publish.yml

@@ -82,7 +82,7 @@ jobs:
       - name: Build package
         run: |
           git reset --hard HEAD
-          rm -f src/pynxtools/nomad/nxs_metainfo_package_*.json
+          rm -f src/pynxtools/nomad/schema_packages/nxs_metainfo_package_*.json
           export PYNXTOOLS_BUILD_PACKAGE=1
           uv run --extra nomad scripts/generate_package.py
           uv build
@@ -117,7 +117,7 @@ jobs:
           EXPECTED=$(python -c "from pynxtools import get_nexus_version; print(f'nxs_metainfo_package_{get_nexus_version()}.json')")
 
           # find the JSON file
-          FOUND_FILE=$(find "$SITE_PACKAGES/pynxtools/nomad" -name 'nxs_metainfo_package_*.json' -print -quit)
+          FOUND_FILE=$(find "$SITE_PACKAGES/pynxtools/nomad/schema_packages" -name 'nxs_metainfo_package_*.json' -print -quit)
 
           if [ -z "$FOUND_FILE" ]; then
               echo "ERROR: nxs_metainfo_package_*.json not found in installed package."

.gitignore

@@ -206,6 +206,6 @@ cython_debug/
 !src/pynxtools/units/constants_en.txt
 !src/pynxtools/units/default_en.txt
 build/
-src/pynxtools/nomad/nxs_metainfo_*.json
+src/pynxtools/nomad/schema_packages/nxs_metainfo_*.json
 nexusparser.egg-info/PKG-INFO
 .python-version

MANIFEST.in

@@ -13,4 +13,4 @@ include src/pynxtools/remote_definitions_url.txt
 include src/pynxtools/definitions/NXDL_VERSION
 include src/pynxtools/units/*.txt
 graft src/pynxtools/nomad/example_uploads/iv_temp_example
-include src/pynxtools/nomad/nxs_metainfo_package_*.json
+include src/pynxtools/nomad/schema_packages/nxs_metainfo_package_*.json

scripts/clean_old_packages.sh

@@ -5,10 +5,10 @@ project_dir=$(dirname "$(dirname "$(realpath "$0")")")
 cd "$project_dir" || exit 1
 
 # Get the full path of the file to keep
-nxs_file=$(python3 -c "from pynxtools.nomad.utils import get_package_filepath; print(get_package_filepath())")
+nxs_file=$(python3 -c "from pynxtools.nomad import get_package_filepath; print(get_package_filepath())")
 
 # Define the target directory
-target_dir="src/pynxtools/nomad"
+target_dir="src/pynxtools/nomad/schema_packages"
 
 # Delete all matching files except nxs_file
 for file in "$target_dir"/nxs_metainfo_package_*.json; do

scripts/generate_package.py

@@ -2,7 +2,7 @@
 import os
 
 try:
-    from pynxtools.nomad.utils import get_package_filepath
+    from pynxtools.nomad import get_package_filepath
 except ImportError as e:
     raise ImportError(
         "The 'pynxtools' package is required but not installed. "
@@ -14,6 +14,6 @@
 
 if not os.path.exists(nxs_filepath):
     logger.info(f"Generating NeXus package at {nxs_filepath}.")
-    import pynxtools.nomad.schema  # noqa: F401
+    import pynxtools.nomad.schema_packages.schema  # noqa: F401
 else:
     logger.info(f"NeXus package already existed at {nxs_filepath}.")

src/pynxtools/nomad/__init__.py

@@ -134,7 +134,7 @@ def get_quantity_base_name(quantity_name):
     )
 
 
-PACKAGE_DIR = Path(__file__).resolve().parent
+PACKAGE_DIR = Path(__file__).resolve().parent / "schema_packages"
 CACHE_DIR = Path(config.fs.tmp) / "pynxtools"
 
 

src/pynxtools/nomad/schema_packages/schema.py

@@ -1158,7 +1158,7 @@ def init_nexus_metainfo():
     if nexus_metainfo_package is not None:
         return
     try:
-        # load_nexus_schema()
+        load_nexus_schema()
         raise Exception("test")
 
     except Exception: