mat3ra-esse 2024.3.25.post5__tar.gz → 2024.4.8.post0__tar.gz

mat3ra-esse-2024.4.8.post0/.husky/pre-commit

@@ -0,0 +1,31 @@
+#!/bin/sh
+. "$(dirname "$0")/_/husky.sh"
+
+SRC_PATTERN="\.json$"
+if git diff --cached --name-only | grep --quiet -E "$SRC_PATTERN"
+then
+  echo "JSON assets changed. Running build scripts."
+  echo "Re-building JS and PY assets using JS script."
+  npm run transpile-and-build-assets
+fi
+pwd
+
+if test -f .venv/bin/activate
+then
+  echo "Python virtual environment found. Running build scripts"
+  echo "Re-building JS and PY assets using JS script."
+  source .venv/bin/activate
+  # Note: resolved (no include statements) schemas have to exist by this time
+  pre-commit run --all-files
+  #git add dist/py
+else
+  echo "ERROR: Python virtual environment found. Create one in '.venv' and install '.[all]'"
+  exit 1
+fi
+
+npx lint-staged --allow-empty
+
+npm run lint:fix
+npm run transpile
+#git add dist/js
+

mat3ra-esse-2024.4.8.post0/.pre-commit-config.yaml

@@ -0,0 +1,33 @@
+repos:
+  - repo: https://github.com/Exabyte-io/pre-commit-hooks
+    rev: 2023.6.13
+    hooks:
+      - id: ruff
+        exclude: ^src/py/mat3ra/esse/data|^dist*
+      - id: black
+        exclude: ^src/py/mat3ra/esse/data|^dist*
+  - repo: local
+    hooks:
+      # Note: only python 3.8.12 is tested for the model generation
+      - id: generate-python-modules
+        name: Regenerate data modules classes from static assets
+        # yamllint disable rule:line-length
+        entry: |
+          bash -c 'if ! [ "$(git diff --cached --name-only | grep "schema/")" ]; then echo "Skipping model generation because schemas were not changed."; exit 0; fi && \
+            datamodel-codegen \
+                --input ./dist/js/schema/ \
+                --input-file-type jsonschema \
+                --output ./dist/py \
+                --output-model-type pydantic_v2.BaseModel \
+                --use-field-description \
+                --use-double-quotes \
+                --enable-version-header \
+                --use-title-as-name \
+                --class-name ESSE \
+                --disable-timestamp && \
+            # Move 3rd party modules to a separate directory with a PEP8 compliant name
+            rm -rf ./dist/py/third_party && \
+            mv ./dist/py/3pse ./dist/py/third_party'
+        language: system
+        pass_filenames: false
+        verbose: true

{mat3ra-esse-2024.3.25.post5 → mat3ra-esse-2024.4.8.post0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mat3ra-esse
-Version: 2024.3.25.post5
+Version: 2024.4.8.post0
 Summary: Excellent Source of Schemas and Examples.
 Author-email: "Exabyte Inc." <info@mat3ra.com>
 License: # LICENSE
@@ -28,6 +28,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE.md
 Requires-Dist: exabyte-json-include>=2023.12.23.post0
 Requires-Dist: jsonschema>=2.6.0
+Requires-Dist: datamodel-code-generator>=0.25.5
 Provides-Extra: tests
 Requires-Dist: coverage[toml]>=5.3; extra == "tests"
 Requires-Dist: parameterized>=0.9.0; extra == "tests"

{mat3ra-esse-2024.3.25.post5 → mat3ra-esse-2024.4.8.post0}/build_schemas.py

@@ -58,4 +58,3 @@ for example in EXAMPLES:
     Path(full_path).parent.mkdir(parents=True, exist_ok=True)
     with open(full_path, "w") as f:
         f.write(json.dumps(example, sort_keys=True, indent=4, separators=(",", ": ")))
-

{mat3ra-esse-2024.3.25.post5 → mat3ra-esse-2024.4.8.post0}/package.json

@@ -102,6 +102,14 @@
         "./dist/json_include/*": "./dist/js/json_include/*.js",
         "./dist/scripts/*": "./dist/js/scripts/*.js",
         "./dist/types": "./dist/js/types.ts",
-        "./dist/schemas.json": "./dist/js/schemas.json"
+        "./dist/schemas.json": "./dist/js/schemas.json",
+        "./dist/js/schema/*.json": "./dist/js/schema/*.json",
+        "./dist/js/example/*": "./dist/js/example/*.js",
+        "./dist/js/utils/*": "./dist/js/utils/*.js",
+        "./dist/js/esse/*": "./dist/js/esse/*.js",
+        "./dist/js/json_include/*": "./dist/js/json_include/*.js",
+        "./dist/js/scripts/*": "./dist/js/scripts/*.js",
+        "./dist/js/types": "./dist/js/types.ts",
+        "./dist/js/schemas.json": "./dist/js/schemas.json"
     }
 }

{mat3ra-esse-2024.3.25.post5 → mat3ra-esse-2024.4.8.post0}/pyproject.toml

@@ -17,6 +17,7 @@ classifiers = [
 dependencies = [
     "exabyte-json-include>=2023.12.23.post0",
     "jsonschema>=2.6.0",
+    "datamodel-code-generator>=0.25.5",
     # "python-slugify==2.0.1",
     # PyYAML install could be problematic, see https://github.com/yaml/pyyaml/issues/601
     # To avoid "AttributeError: cython_sources", consider "cython<3.0.0", the below might be needed:
@@ -58,7 +59,22 @@ git_describe_command = "git describe --tags --long"
 # local_scheme = "no-local-version"
 
 [tool.setuptools.packages.find]
-where = ["src/py"]
+where = [
+    "src/py",
+]
+
+[tool.setuptools.package-data]
+"*" = [
+    # NOTE: may be needed to allow for the `models` link in the `src/py` directory
+    #  "dist/py/**"
+]
+
+[tool.setuptools.exclude-package-data]
+"*" = [
+    # Since models inside `src/py` is a link, exclusion is needed
+    # to avoid `doesn't exist or not a regular file` error
+    "models"
+]
 
 [tool.black]
 line-length = 120

{mat3ra-esse-2024.3.25.post5 → mat3ra-esse-2024.4.8.post0}/schema/3pse/db/nist_jarvis/2024.3.13/atoms.json

@@ -1,7 +1,8 @@
 {
     "$id": "3pse/db/nist-jarvis/2024.3.13/atoms",
     "$schema": "http://json-schema.org/draft-07/schema#",
-    "title": "NIST J.A.R.V.I.S. db entry `atoms` key schema. Based on https://figshare.com/articles/dataset/Monolayer_data_for_heterostructure/22344571",
+    "title": "NIST JARVIS Atoms schema",
+    "description": "NIST J.A.R.V.I.S. db entry `atoms` key schema. Based on https://figshare.com/articles/dataset/Monolayer_data_for_heterostructure/22344571",
     "additionalProperties": false,
     "type": "object",
     "properties": {

{mat3ra-esse-2024.3.25.post5 → mat3ra-esse-2024.4.8.post0}/schema/3pse/db/nist_jarvis/2024.3.13/db_entry.json

@@ -1,7 +1,8 @@
 {
     "$id": "3pse/db/nist-jarvis/2024.3.13/db-entry",
     "$schema": "http://json-schema.org/draft-07/schema#",
-    "title": "NIST J.A.R.V.I.S. db entry schema. Based on https://figshare.com/articles/dataset/Monolayer_data_for_heterostructure/22344571",
+    "title": "NIST JARVIS Atoms schema",
+    "description": "NIST J.A.R.V.I.S. db entry `atoms` key schema. Based on https://figshare.com/articles/dataset/Monolayer_data_for_heterostructure/22344571",
     "additionalProperties": true,
     "type": "object",
     "properties": {