mdmodels-core 0.2.5__tar.gz → 0.2.7__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/Cargo.lock +93 -71
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/Cargo.toml +8 -7
- mdmodels_core-0.2.7/PKG-INFO +9 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/pyproject.toml +1 -1
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/src/attribute.rs +1 -1
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/src/bin/cli.rs +39 -6
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/src/bindings/python.rs +34 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/src/bindings/wasm.rs +8 -8
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/src/datamodel.rs +1 -1
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/src/exporters.rs +29 -14
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/src/json/export.rs +7 -6
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/src/json/import.rs +23 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/src/json/schema.rs +133 -8
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/src/lib.rs +1 -1
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/src/llm/extraction.rs +1 -1
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/src/markdown/frontmatter.rs +1 -11
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/src/markdown/parser.rs +3 -4
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/src/pipeline.rs +4 -4
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/src/validation.rs +18 -23
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/templates/typescript-zod.jinja +11 -5
- mdmodels_core-0.2.7/tests/data/expected_typescript_zod.ts +70 -0
- mdmodels_core-0.2.5/tests/data/expected_typescript_zod.ts → mdmodels_core-0.2.7/tests/data/expected_typescript_zod_json_ld.ts +10 -6
- mdmodels_core-0.2.5/PKG-INFO +0 -220
- mdmodels_core-0.2.5/src/json/datatype.rs +0 -88
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/.github/scripts/generate_types.sh +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/.github/workflows/assets.yml +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/.github/workflows/docs.yml +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/.github/workflows/format.yml +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/.github/workflows/lint.yml +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/.github/workflows/npm_bundler.yml +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/.github/workflows/npm_web.yml +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/.github/workflows/publish.yml +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/.github/workflows/publish_pypi.yml +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/.github/workflows/publish_test_pypi.yml +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/.github/workflows/test.yml +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/.gitignore +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/.pre-commit-config.yaml +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/LICENSE.md +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/README.md +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/build.rs +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/docs/.gitignore +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/docs/book.toml +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/docs/src/SUMMARY.md +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/docs/src/cli/cli.md +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/docs/src/cli/code_generation.md +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/docs/src/cli/llm.md +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/docs/src/cli/pipelines.md +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/docs/src/cli/schema_validation.md +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/docs/src/examples/database_models.md +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/docs/src/examples/examples.md +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/docs/src/examples/hello_md_models.md +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/docs/src/examples/union_types.md +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/docs/src/exporters/apis.md +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/docs/src/exporters/documentation.md +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/docs/src/exporters/exporters.md +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/docs/src/exporters/languages.md +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/docs/src/exporters/schemas.md +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/docs/src/faq/faq.md +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/docs/src/introduction.md +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/docs/src/quickstart.md +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/docs/src/syntax/best_practices.md +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/docs/src/syntax/descriptions.md +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/docs/src/syntax/enums.md +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/docs/src/syntax/full_example.md +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/docs/src/syntax/objects.md +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/docs/src/syntax/preambles.md +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/docs/src/syntax/property_options.md +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/docs/src/syntax/semantics.md +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/docs/src/syntax/syntax.md +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/src/error.rs +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/src/json/validation.rs +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/src/linkml/export.rs +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/src/linkml/import.rs +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/src/linkml/schema.rs +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/src/llm/input.rs +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/src/markdown/position.rs +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/src/object.rs +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/src/option.rs +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/src/tree.rs +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/src/xmltype.rs +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/templates/golang.jinja +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/templates/graphql.jinja +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/templates/julia.jinja +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/templates/markdown-compact.jinja +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/templates/markdown.jinja +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/templates/mermaid.jinja +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/templates/mkdocs.jinja +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/templates/protobuf.jinja +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/templates/python-dataclass.jinja +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/templates/python-macros.jinja +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/templates/python-pydantic-xml.jinja +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/templates/python-pydantic.jinja +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/templates/rust.jinja +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/templates/shacl.jinja +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/templates/shex.jinja +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/templates/typescript.jinja +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/templates/xml-schema.jinja +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/tests/data/expected_golang.go +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/tests/data/expected_golang_gorm.go +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/tests/data/expected_graphql.graphql +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/tests/data/expected_internal_full_schema.json +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/tests/data/expected_internal_schema.json +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/tests/data/expected_internal_schema_inheritance.json +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/tests/data/expected_invalid_complete.json +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/tests/data/expected_json_schema.json +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/tests/data/expected_json_schema_openai.json +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/tests/data/expected_julia.jl +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/tests/data/expected_linkml.yml +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/tests/data/expected_mermaid.md +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/tests/data/expected_meta_json_schema.json +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/tests/data/expected_mkdocs.md +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/tests/data/expected_proto.proto +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/tests/data/expected_protobuf.proto +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/tests/data/expected_pydantic.py +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/tests/data/expected_pydantic_unitdef.py +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/tests/data/expected_python_dc.py +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/tests/data/expected_python_pydantic_xml.py +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/tests/data/expected_rust.rs +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/tests/data/expected_rust_forbidden.rs +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/tests/data/expected_shacl.ttl +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/tests/data/expected_shex.shex +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/tests/data/expected_typescript.ts +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/tests/data/expected_xml_schema.xsd +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/tests/data/invalid_dataset.json +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/tests/data/model.md +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/tests/data/model_compact.md +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/tests/data/model_duplicates.md +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/tests/data/model_forbidden_names.md +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/tests/data/model_full_documentation.md +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/tests/data/model_golang_gorm.md +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/tests/data/model_inheritance.md +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/tests/data/model_inheritance_invalid.md +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/tests/data/model_invalid_complete.md +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/tests/data/model_invalid_names.md +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/tests/data/model_invalid_xml_option.md +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/tests/data/model_invalid_xml_wrapped.md +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/tests/data/model_json_schema.md +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/tests/data/model_json_schema_openai.md +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/tests/data/model_json_validation.md +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/tests/data/model_merge.md +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/tests/data/model_merge_invalid.md +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/tests/data/model_meta.md +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/tests/data/model_missing_types.md +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/tests/data/model_multiple_keyword.md +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/tests/data/model_multiple_types.md +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/tests/data/model_multiple_types_invalid.md +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/tests/data/model_no_frontmatter.md +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/tests/data/model_no_objects.md +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/tests/data/model_options.md +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/tests/data/model_unitdef.md +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/tests/data/model_w_html.md +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/tests/data/old_schema.json +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/tests/data/valid_dataset.json +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/tests/envs/go/Dockerfile +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/tests/envs/go/generated.go +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/tests/envs/go/generated_test.go +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/tests/envs/go/go.mod +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/tests/envs/julia/test.jl +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/tests/envs/python/.gitignore +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/tests/envs/python/Dockerfile +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/tests/envs/python/requirements.txt +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/tests/envs/python/test_dataclasses.py +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/tests/envs/python/test_pydantic.py +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/tests/envs/python/test_pydantic_xml.py +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/tests/envs/typescript/.gitignore +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/tests/envs/typescript/Dockerfile +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/tests/envs/typescript/package-lock.json +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/tests/envs/typescript/package.json +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/tests/envs/typescript/test.ts +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/tests/envs/typescript/tsconfig.json +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/tests/integration_tests.rs +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/tests/test_pipeline.toml +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/tests/test_pipeline_per_spec.toml +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/tests/test_pipeline_per_spec_invalid.toml +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/types/README.md +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/types/equation/equation-internal.json +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/types/equation/equation.json +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/types/equation/equation.md +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/types/equation/equation.xsd +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/types/equation/gen.toml +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/types/unit-definition/gen.toml +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/types/unit-definition/unit-definition-internal.json +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/types/unit-definition/unit-definition.json +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/types/unit-definition/unit-definition.md +0 -0
- {mdmodels_core-0.2.5 → mdmodels_core-0.2.7}/types/unit-definition/unit-definition.xsd +0 -0
|
@@ -50,6 +50,12 @@ dependencies = [
|
|
|
50
50
|
"memchr",
|
|
51
51
|
]
|
|
52
52
|
|
|
53
|
+
[[package]]
|
|
54
|
+
name = "allocator-api2"
|
|
55
|
+
version = "0.2.21"
|
|
56
|
+
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
57
|
+
checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
|
|
58
|
+
|
|
53
59
|
[[package]]
|
|
54
60
|
name = "android-tzdata"
|
|
55
61
|
version = "0.1.1"
|
|
@@ -114,6 +120,12 @@ dependencies = [
|
|
|
114
120
|
"windows-sys 0.52.0",
|
|
115
121
|
]
|
|
116
122
|
|
|
123
|
+
[[package]]
|
|
124
|
+
name = "arraydeque"
|
|
125
|
+
version = "0.5.1"
|
|
126
|
+
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
127
|
+
checksum = "7d902e3d592a523def97af8f317b08ce16b7ab854c1985a0c671e6f15cebc236"
|
|
128
|
+
|
|
117
129
|
[[package]]
|
|
118
130
|
name = "assert_cmd"
|
|
119
131
|
version = "2.0.14"
|
|
@@ -549,9 +561,9 @@ dependencies = [
|
|
|
549
561
|
|
|
550
562
|
[[package]]
|
|
551
563
|
name = "fancy-regex"
|
|
552
|
-
version = "0.
|
|
564
|
+
version = "0.16.1"
|
|
553
565
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
554
|
-
checksum = "
|
|
566
|
+
checksum = "bf04c5ec15464ace8355a7b440a33aece288993475556d461154d7a62ad9947c"
|
|
555
567
|
dependencies = [
|
|
556
568
|
"bit-set",
|
|
557
569
|
"regex-automata",
|
|
@@ -587,6 +599,12 @@ version = "1.0.7"
|
|
|
587
599
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
588
600
|
checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
|
|
589
601
|
|
|
602
|
+
[[package]]
|
|
603
|
+
name = "foldhash"
|
|
604
|
+
version = "0.1.5"
|
|
605
|
+
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
606
|
+
checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2"
|
|
607
|
+
|
|
590
608
|
[[package]]
|
|
591
609
|
name = "foreign-types"
|
|
592
610
|
version = "0.3.2"
|
|
@@ -736,14 +754,13 @@ dependencies = [
|
|
|
736
754
|
|
|
737
755
|
[[package]]
|
|
738
756
|
name = "gray_matter"
|
|
739
|
-
version = "0.2
|
|
757
|
+
version = "0.3.2"
|
|
740
758
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
741
|
-
checksum = "
|
|
759
|
+
checksum = "3563a3eb8bacf11a0a6d93de7885f2cca224dddff0114e4eb8053ca0f1918acd"
|
|
742
760
|
dependencies = [
|
|
743
761
|
"serde",
|
|
744
|
-
"
|
|
745
|
-
"
|
|
746
|
-
"yaml-rust",
|
|
762
|
+
"thiserror 2.0.12",
|
|
763
|
+
"yaml-rust2",
|
|
747
764
|
]
|
|
748
765
|
|
|
749
766
|
[[package]]
|
|
@@ -776,6 +793,20 @@ name = "hashbrown"
|
|
|
776
793
|
version = "0.15.2"
|
|
777
794
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
778
795
|
checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
|
|
796
|
+
dependencies = [
|
|
797
|
+
"allocator-api2",
|
|
798
|
+
"equivalent",
|
|
799
|
+
"foldhash",
|
|
800
|
+
]
|
|
801
|
+
|
|
802
|
+
[[package]]
|
|
803
|
+
name = "hashlink"
|
|
804
|
+
version = "0.10.0"
|
|
805
|
+
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
806
|
+
checksum = "7382cf6263419f2d8df38c55d7da83da5c18aef87fc7a7fc1fb1e344edfe14c1"
|
|
807
|
+
dependencies = [
|
|
808
|
+
"hashbrown 0.15.2",
|
|
809
|
+
]
|
|
779
810
|
|
|
780
811
|
[[package]]
|
|
781
812
|
name = "heck"
|
|
@@ -1156,9 +1187,9 @@ dependencies = [
|
|
|
1156
1187
|
|
|
1157
1188
|
[[package]]
|
|
1158
1189
|
name = "jsonschema"
|
|
1159
|
-
version = "0.
|
|
1190
|
+
version = "0.33.0"
|
|
1160
1191
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
1161
|
-
checksum = "
|
|
1192
|
+
checksum = "d46662859bc5f60a145b75f4632fbadc84e829e45df6c5de74cfc8e05acb96b5"
|
|
1162
1193
|
dependencies = [
|
|
1163
1194
|
"ahash",
|
|
1164
1195
|
"base64",
|
|
@@ -1169,9 +1200,11 @@ dependencies = [
|
|
|
1169
1200
|
"idna",
|
|
1170
1201
|
"itoa",
|
|
1171
1202
|
"num-cmp",
|
|
1203
|
+
"num-traits",
|
|
1172
1204
|
"once_cell",
|
|
1173
1205
|
"percent-encoding",
|
|
1174
1206
|
"referencing",
|
|
1207
|
+
"regex",
|
|
1175
1208
|
"regex-syntax",
|
|
1176
1209
|
"serde",
|
|
1177
1210
|
"serde_json",
|
|
@@ -1190,12 +1223,6 @@ version = "0.2.168"
|
|
|
1190
1223
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
1191
1224
|
checksum = "5aaeb2981e0606ca11d79718f8bb01164f1d6ed75080182d3abf017e6d244b6d"
|
|
1192
1225
|
|
|
1193
|
-
[[package]]
|
|
1194
|
-
name = "linked-hash-map"
|
|
1195
|
-
version = "0.5.6"
|
|
1196
|
-
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
1197
|
-
checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
|
|
1198
|
-
|
|
1199
1226
|
[[package]]
|
|
1200
1227
|
name = "linux-raw-sys"
|
|
1201
1228
|
version = "0.4.14"
|
|
@@ -1226,7 +1253,7 @@ checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
|
|
|
1226
1253
|
|
|
1227
1254
|
[[package]]
|
|
1228
1255
|
name = "mdmodels"
|
|
1229
|
-
version = "0.2.
|
|
1256
|
+
version = "0.2.7"
|
|
1230
1257
|
dependencies = [
|
|
1231
1258
|
"assert_cmd",
|
|
1232
1259
|
"clap",
|
|
@@ -1260,7 +1287,7 @@ dependencies = [
|
|
|
1260
1287
|
"textwrap",
|
|
1261
1288
|
"thiserror 2.0.12",
|
|
1262
1289
|
"tokio",
|
|
1263
|
-
"toml
|
|
1290
|
+
"toml",
|
|
1264
1291
|
"tsify-next",
|
|
1265
1292
|
"variantly",
|
|
1266
1293
|
"wasm-bindgen",
|
|
@@ -1446,9 +1473,9 @@ dependencies = [
|
|
|
1446
1473
|
|
|
1447
1474
|
[[package]]
|
|
1448
1475
|
name = "once_cell"
|
|
1449
|
-
version = "1.
|
|
1476
|
+
version = "1.21.3"
|
|
1450
1477
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
1451
|
-
checksum = "
|
|
1478
|
+
checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
|
|
1452
1479
|
|
|
1453
1480
|
[[package]]
|
|
1454
1481
|
name = "openai-api-rs"
|
|
@@ -1557,11 +1584,12 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
|
|
|
1557
1584
|
|
|
1558
1585
|
[[package]]
|
|
1559
1586
|
name = "petgraph"
|
|
1560
|
-
version = "0.
|
|
1587
|
+
version = "0.8.2"
|
|
1561
1588
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
1562
|
-
checksum = "
|
|
1589
|
+
checksum = "54acf3a685220b533e437e264e4d932cfbdc4cc7ec0cd232ed73c08d03b8a7ca"
|
|
1563
1590
|
dependencies = [
|
|
1564
1591
|
"fixedbitset",
|
|
1592
|
+
"hashbrown 0.15.2",
|
|
1565
1593
|
"indexmap 2.7.1",
|
|
1566
1594
|
"serde",
|
|
1567
1595
|
]
|
|
@@ -1702,11 +1730,10 @@ checksum = "007d8adb5ddab6f8e3f491ac63566a7d5002cc7ed73901f72057943fa71ae1ae"
|
|
|
1702
1730
|
|
|
1703
1731
|
[[package]]
|
|
1704
1732
|
name = "pyo3"
|
|
1705
|
-
version = "0.
|
|
1733
|
+
version = "0.26.0"
|
|
1706
1734
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
1707
|
-
checksum = "
|
|
1735
|
+
checksum = "7ba0117f4212101ee6544044dae45abe1083d30ce7b29c4b5cbdfa2354e07383"
|
|
1708
1736
|
dependencies = [
|
|
1709
|
-
"cfg-if",
|
|
1710
1737
|
"indoc",
|
|
1711
1738
|
"libc",
|
|
1712
1739
|
"memoffset",
|
|
@@ -1720,19 +1747,18 @@ dependencies = [
|
|
|
1720
1747
|
|
|
1721
1748
|
[[package]]
|
|
1722
1749
|
name = "pyo3-build-config"
|
|
1723
|
-
version = "0.
|
|
1750
|
+
version = "0.26.0"
|
|
1724
1751
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
1725
|
-
checksum = "
|
|
1752
|
+
checksum = "4fc6ddaf24947d12a9aa31ac65431fb1b851b8f4365426e182901eabfb87df5f"
|
|
1726
1753
|
dependencies = [
|
|
1727
|
-
"once_cell",
|
|
1728
1754
|
"target-lexicon",
|
|
1729
1755
|
]
|
|
1730
1756
|
|
|
1731
1757
|
[[package]]
|
|
1732
1758
|
name = "pyo3-ffi"
|
|
1733
|
-
version = "0.
|
|
1759
|
+
version = "0.26.0"
|
|
1734
1760
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
1735
|
-
checksum = "
|
|
1761
|
+
checksum = "025474d3928738efb38ac36d4744a74a400c901c7596199e20e45d98eb194105"
|
|
1736
1762
|
dependencies = [
|
|
1737
1763
|
"libc",
|
|
1738
1764
|
"pyo3-build-config",
|
|
@@ -1740,9 +1766,9 @@ dependencies = [
|
|
|
1740
1766
|
|
|
1741
1767
|
[[package]]
|
|
1742
1768
|
name = "pyo3-macros"
|
|
1743
|
-
version = "0.
|
|
1769
|
+
version = "0.26.0"
|
|
1744
1770
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
1745
|
-
checksum = "
|
|
1771
|
+
checksum = "2e64eb489f22fe1c95911b77c44cc41e7c19f3082fc81cce90f657cdc42ffded"
|
|
1746
1772
|
dependencies = [
|
|
1747
1773
|
"proc-macro2",
|
|
1748
1774
|
"pyo3-macros-backend",
|
|
@@ -1752,9 +1778,9 @@ dependencies = [
|
|
|
1752
1778
|
|
|
1753
1779
|
[[package]]
|
|
1754
1780
|
name = "pyo3-macros-backend"
|
|
1755
|
-
version = "0.
|
|
1781
|
+
version = "0.26.0"
|
|
1756
1782
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
1757
|
-
checksum = "
|
|
1783
|
+
checksum = "100246c0ecf400b475341b8455a9213344569af29a3c841d29270e53102e0fcf"
|
|
1758
1784
|
dependencies = [
|
|
1759
1785
|
"heck",
|
|
1760
1786
|
"proc-macro2",
|
|
@@ -1833,9 +1859,9 @@ dependencies = [
|
|
|
1833
1859
|
|
|
1834
1860
|
[[package]]
|
|
1835
1861
|
name = "referencing"
|
|
1836
|
-
version = "0.
|
|
1862
|
+
version = "0.33.0"
|
|
1837
1863
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
1838
|
-
checksum = "
|
|
1864
|
+
checksum = "9e9c261f7ce75418b3beadfb3f0eb1299fe8eb9640deba45ffa2cb783098697d"
|
|
1839
1865
|
dependencies = [
|
|
1840
1866
|
"ahash",
|
|
1841
1867
|
"fluent-uri",
|
|
@@ -1977,11 +2003,12 @@ dependencies = [
|
|
|
1977
2003
|
|
|
1978
2004
|
[[package]]
|
|
1979
2005
|
name = "schemars"
|
|
1980
|
-
version = "0.
|
|
2006
|
+
version = "1.0.4"
|
|
1981
2007
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
1982
|
-
checksum = "
|
|
2008
|
+
checksum = "82d20c4491bc164fa2f6c5d44565947a52ad80b9505d8e36f8d54c27c739fcd0"
|
|
1983
2009
|
dependencies = [
|
|
1984
2010
|
"dyn-clone",
|
|
2011
|
+
"ref-cast",
|
|
1985
2012
|
"schemars_derive",
|
|
1986
2013
|
"serde",
|
|
1987
2014
|
"serde_json",
|
|
@@ -1989,9 +2016,9 @@ dependencies = [
|
|
|
1989
2016
|
|
|
1990
2017
|
[[package]]
|
|
1991
2018
|
name = "schemars_derive"
|
|
1992
|
-
version = "0.
|
|
2019
|
+
version = "1.0.4"
|
|
1993
2020
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
1994
|
-
checksum = "
|
|
2021
|
+
checksum = "33d020396d1d138dc19f1165df7545479dcd58d93810dc5d646a16e55abefa80"
|
|
1995
2022
|
dependencies = [
|
|
1996
2023
|
"proc-macro2",
|
|
1997
2024
|
"quote",
|
|
@@ -2085,9 +2112,9 @@ dependencies = [
|
|
|
2085
2112
|
|
|
2086
2113
|
[[package]]
|
|
2087
2114
|
name = "serde_spanned"
|
|
2088
|
-
version = "0.
|
|
2115
|
+
version = "1.0.0"
|
|
2089
2116
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
2090
|
-
checksum = "
|
|
2117
|
+
checksum = "40734c41988f7306bb04f0ecf60ec0f3f1caa34290e4e8ea471dcd3346483b83"
|
|
2091
2118
|
dependencies = [
|
|
2092
2119
|
"serde",
|
|
2093
2120
|
]
|
|
@@ -2500,47 +2527,43 @@ dependencies = [
|
|
|
2500
2527
|
|
|
2501
2528
|
[[package]]
|
|
2502
2529
|
name = "toml"
|
|
2503
|
-
version = "0.5
|
|
2530
|
+
version = "0.9.5"
|
|
2504
2531
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
2505
|
-
checksum = "
|
|
2506
|
-
dependencies = [
|
|
2507
|
-
"serde",
|
|
2508
|
-
]
|
|
2509
|
-
|
|
2510
|
-
[[package]]
|
|
2511
|
-
name = "toml"
|
|
2512
|
-
version = "0.8.14"
|
|
2513
|
-
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
2514
|
-
checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335"
|
|
2532
|
+
checksum = "75129e1dc5000bfbaa9fee9d1b21f974f9fbad9daec557a521ee6e080825f6e8"
|
|
2515
2533
|
dependencies = [
|
|
2534
|
+
"indexmap 2.7.1",
|
|
2516
2535
|
"serde",
|
|
2517
2536
|
"serde_spanned",
|
|
2518
2537
|
"toml_datetime",
|
|
2519
|
-
"
|
|
2538
|
+
"toml_parser",
|
|
2539
|
+
"toml_writer",
|
|
2540
|
+
"winnow",
|
|
2520
2541
|
]
|
|
2521
2542
|
|
|
2522
2543
|
[[package]]
|
|
2523
2544
|
name = "toml_datetime"
|
|
2524
|
-
version = "0.
|
|
2545
|
+
version = "0.7.0"
|
|
2525
2546
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
2526
|
-
checksum = "
|
|
2547
|
+
checksum = "bade1c3e902f58d73d3f294cd7f20391c1cb2fbcb643b73566bc773971df91e3"
|
|
2527
2548
|
dependencies = [
|
|
2528
2549
|
"serde",
|
|
2529
2550
|
]
|
|
2530
2551
|
|
|
2531
2552
|
[[package]]
|
|
2532
|
-
name = "
|
|
2533
|
-
version = "0.
|
|
2553
|
+
name = "toml_parser"
|
|
2554
|
+
version = "1.0.2"
|
|
2534
2555
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
2535
|
-
checksum = "
|
|
2556
|
+
checksum = "b551886f449aa90d4fe2bdaa9f4a2577ad2dde302c61ecf262d80b116db95c10"
|
|
2536
2557
|
dependencies = [
|
|
2537
|
-
"indexmap 2.7.1",
|
|
2538
|
-
"serde",
|
|
2539
|
-
"serde_spanned",
|
|
2540
|
-
"toml_datetime",
|
|
2541
2558
|
"winnow",
|
|
2542
2559
|
]
|
|
2543
2560
|
|
|
2561
|
+
[[package]]
|
|
2562
|
+
name = "toml_writer"
|
|
2563
|
+
version = "1.0.2"
|
|
2564
|
+
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
2565
|
+
checksum = "fcc842091f2def52017664b53082ecbbeb5c7731092bad69d2c63050401dfd64"
|
|
2566
|
+
|
|
2544
2567
|
[[package]]
|
|
2545
2568
|
name = "tower"
|
|
2546
2569
|
version = "0.4.13"
|
|
@@ -3042,12 +3065,9 @@ checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0"
|
|
|
3042
3065
|
|
|
3043
3066
|
[[package]]
|
|
3044
3067
|
name = "winnow"
|
|
3045
|
-
version = "0.
|
|
3068
|
+
version = "0.7.13"
|
|
3046
3069
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
3047
|
-
checksum = "
|
|
3048
|
-
dependencies = [
|
|
3049
|
-
"memchr",
|
|
3050
|
-
]
|
|
3070
|
+
checksum = "21a0236b59786fed61e2a80582dd500fe61f18b5dca67a4a067d0bc9039339cf"
|
|
3051
3071
|
|
|
3052
3072
|
[[package]]
|
|
3053
3073
|
name = "winreg"
|
|
@@ -3072,12 +3092,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
|
3072
3092
|
checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"
|
|
3073
3093
|
|
|
3074
3094
|
[[package]]
|
|
3075
|
-
name = "yaml-
|
|
3076
|
-
version = "0.
|
|
3095
|
+
name = "yaml-rust2"
|
|
3096
|
+
version = "0.10.3"
|
|
3077
3097
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
3078
|
-
checksum = "
|
|
3098
|
+
checksum = "4ce2a4ff45552406d02501cea6c18d8a7e50228e7736a872951fe2fe75c91be7"
|
|
3079
3099
|
dependencies = [
|
|
3080
|
-
"
|
|
3100
|
+
"arraydeque",
|
|
3101
|
+
"encoding_rs",
|
|
3102
|
+
"hashlink",
|
|
3081
3103
|
]
|
|
3082
3104
|
|
|
3083
3105
|
[[package]]
|
|
@@ -2,10 +2,11 @@
|
|
|
2
2
|
name = "mdmodels"
|
|
3
3
|
authors = ["Jan Range <jan.range@simtech.uni-stuttgart.de>"]
|
|
4
4
|
description = "A tool to generate models, code and schemas from markdown files"
|
|
5
|
-
version = "0.2.
|
|
5
|
+
version = "0.2.7"
|
|
6
6
|
edition = "2021"
|
|
7
7
|
license = "MIT"
|
|
8
8
|
repository = "https://github.com/FAIRChemistry/md-models"
|
|
9
|
+
readme = "README.md"
|
|
9
10
|
|
|
10
11
|
[lib]
|
|
11
12
|
crate-type = ["cdylib", "rlib"]
|
|
@@ -21,27 +22,27 @@ minijinja = "2.0.1"
|
|
|
21
22
|
minijinja-embed = "2.0.1"
|
|
22
23
|
clap = { version = "4.5.4", features = ["derive"] }
|
|
23
24
|
lazy_static = "1.4.0"
|
|
24
|
-
gray_matter = "0.2
|
|
25
|
+
gray_matter = "0.3.2"
|
|
25
26
|
reqwest = { version = "0.12.4", features = ["blocking", "native-tls-vendored"] }
|
|
26
27
|
log = "0.4.21"
|
|
27
28
|
pretty_env_logger = "0.5.0"
|
|
28
29
|
colored = "3.0.0"
|
|
29
30
|
convert_case = "0.8.0"
|
|
30
|
-
toml = "0.
|
|
31
|
+
toml = "0.9.5"
|
|
31
32
|
textwrap = "0.16.1"
|
|
32
|
-
pyo3 = { version = "0.
|
|
33
|
+
pyo3 = { version = "0.26.0", features = ["extension-module"], optional = true }
|
|
33
34
|
openai-api-rs = { version = "6.0.6", optional = true }
|
|
34
35
|
wasm-bindgen = { version = "0.2.95", optional = true }
|
|
35
36
|
serde-wasm-bindgen = { version = "0.6.5", optional = true }
|
|
36
37
|
tokio = { version = "1.42.0", features = ["rt"] }
|
|
37
|
-
jsonschema = { version = "0.
|
|
38
|
+
jsonschema = { version = "0.33.0", default-features = false }
|
|
38
39
|
getrandom = { version = "0.2.15", features = ["js"] }
|
|
39
40
|
tsify-next = { version = "0.5.4", features = ["js"], optional = true }
|
|
40
41
|
strum = "0.27.1"
|
|
41
42
|
strum_macros = "0.27.1"
|
|
42
43
|
indexmap = { version = "2.7.1", features = ["serde"] }
|
|
43
|
-
petgraph = { version = "0.
|
|
44
|
-
schemars = { version = "0.
|
|
44
|
+
petgraph = { version = "0.8.1", features = ["serde"] }
|
|
45
|
+
schemars = { version = "1.0.4" }
|
|
45
46
|
json-patch = "4.0.0"
|
|
46
47
|
thiserror = "2.0.12"
|
|
47
48
|
variantly = "0.4.0"
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
Metadata-Version: 2.4
|
|
2
|
+
Name: mdmodels_core
|
|
3
|
+
Version: 0.2.7
|
|
4
|
+
Classifier: Programming Language :: Rust
|
|
5
|
+
Classifier: Programming Language :: Python :: Implementation :: CPython
|
|
6
|
+
Classifier: Programming Language :: Python :: Implementation :: PyPy
|
|
7
|
+
License-File: LICENSE.md
|
|
8
|
+
Summary: A tool to generate models, code and schemas from markdown files
|
|
9
|
+
Requires-Python: >=3.8
|
|
@@ -355,7 +355,7 @@ impl FromStr for DataType {
|
|
|
355
355
|
} else if let Ok(f) = lower_s.parse::<f64>() {
|
|
356
356
|
Ok(DataType::Float(f))
|
|
357
357
|
} else if !lower_s.is_empty() {
|
|
358
|
-
Ok(DataType::String(format!("\"{}\""
|
|
358
|
+
Ok(DataType::String(format!("\"{s}\"")))
|
|
359
359
|
} else {
|
|
360
360
|
Err("Invalid data type".to_string())
|
|
361
361
|
}
|
|
@@ -26,6 +26,7 @@ use colored::Colorize;
|
|
|
26
26
|
use log::error;
|
|
27
27
|
use mdmodels::{
|
|
28
28
|
datamodel::DataModel,
|
|
29
|
+
error::DataModelError,
|
|
29
30
|
exporters::{render_jinja_template, Templates},
|
|
30
31
|
json::validation::validate_json,
|
|
31
32
|
linkml::export::serialize_linkml,
|
|
@@ -34,7 +35,13 @@ use mdmodels::{
|
|
|
34
35
|
};
|
|
35
36
|
use serde::{Deserialize, Serialize};
|
|
36
37
|
use std::{
|
|
37
|
-
collections::HashMap,
|
|
38
|
+
collections::HashMap,
|
|
39
|
+
error::Error,
|
|
40
|
+
fmt::Display,
|
|
41
|
+
fs,
|
|
42
|
+
io::Write,
|
|
43
|
+
path::{Path, PathBuf},
|
|
44
|
+
str::FromStr,
|
|
38
45
|
};
|
|
39
46
|
|
|
40
47
|
/// Command-line interface for MD-Models CLI.
|
|
@@ -211,8 +218,8 @@ impl Display for InputType {
|
|
|
211
218
|
/// Display the input type.
|
|
212
219
|
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
|
213
220
|
match self {
|
|
214
|
-
InputType::Remote(url) => write!(f, "{}"
|
|
215
|
-
InputType::Local(path) => write!(f, "{}"
|
|
221
|
+
InputType::Remote(url) => write!(f, "{url}"),
|
|
222
|
+
InputType::Local(path) => write!(f, "{path}"),
|
|
216
223
|
}
|
|
217
224
|
}
|
|
218
225
|
}
|
|
@@ -246,7 +253,13 @@ fn validate(args: ValidateArgs) -> Result<(), Box<dyn Error>> {
|
|
|
246
253
|
|
|
247
254
|
let path = resolve_input_path(&args.input);
|
|
248
255
|
|
|
249
|
-
|
|
256
|
+
if is_json_schema(&path)? {
|
|
257
|
+
return validate_from_json_schema(&path);
|
|
258
|
+
}
|
|
259
|
+
|
|
260
|
+
let model = DataModel::from_markdown(&path);
|
|
261
|
+
|
|
262
|
+
match model {
|
|
250
263
|
Ok(_) => {
|
|
251
264
|
print_validation_result(true);
|
|
252
265
|
Ok(())
|
|
@@ -259,6 +272,26 @@ fn validate(args: ValidateArgs) -> Result<(), Box<dyn Error>> {
|
|
|
259
272
|
}
|
|
260
273
|
}
|
|
261
274
|
|
|
275
|
+
/// Validates a JSON schema file.
|
|
276
|
+
///
|
|
277
|
+
/// # Arguments
|
|
278
|
+
///
|
|
279
|
+
/// * `path` - Path to the JSON schema file.
|
|
280
|
+
fn validate_from_json_schema(path: &Path) -> Result<(), Box<dyn Error>> {
|
|
281
|
+
if let Err(err) = DataModel::from_json_schema(path) {
|
|
282
|
+
match err {
|
|
283
|
+
DataModelError::ValidationError(validator) => {
|
|
284
|
+
validator.log_result();
|
|
285
|
+
Err("Model is invalid".into())
|
|
286
|
+
}
|
|
287
|
+
_ => Err(err.into()),
|
|
288
|
+
}
|
|
289
|
+
} else {
|
|
290
|
+
print_validation_result(true);
|
|
291
|
+
Ok(())
|
|
292
|
+
}
|
|
293
|
+
}
|
|
294
|
+
|
|
262
295
|
/// Prints the result of the validation.
|
|
263
296
|
///
|
|
264
297
|
/// # Arguments
|
|
@@ -270,7 +303,7 @@ fn print_validation_result(result: bool) {
|
|
|
270
303
|
"Model is invalid".red().bold().to_string()
|
|
271
304
|
};
|
|
272
305
|
|
|
273
|
-
println!(" └── {}\n"
|
|
306
|
+
println!(" └── {message}\n");
|
|
274
307
|
}
|
|
275
308
|
|
|
276
309
|
fn query_llm(args: ExtractArgs) -> Result<(), Box<dyn Error>> {
|
|
@@ -306,7 +339,7 @@ fn query_llm(args: ExtractArgs) -> Result<(), Box<dyn Error>> {
|
|
|
306
339
|
}
|
|
307
340
|
None => {
|
|
308
341
|
let json_string = serde_json::to_string_pretty(&response)?;
|
|
309
|
-
println!("{}"
|
|
342
|
+
println!("{json_string}");
|
|
310
343
|
}
|
|
311
344
|
}
|
|
312
345
|
|
|
@@ -60,6 +60,40 @@ impl DataModel {
|
|
|
60
60
|
}
|
|
61
61
|
}
|
|
62
62
|
|
|
63
|
+
/// Creates a new `DataModel` instance from a json schema file.
|
|
64
|
+
///
|
|
65
|
+
/// # Arguments
|
|
66
|
+
///
|
|
67
|
+
/// * `path` - A string slice that holds the path to the json schema file.
|
|
68
|
+
///
|
|
69
|
+
/// # Returns
|
|
70
|
+
///
|
|
71
|
+
/// A new instance of `DataModel`.
|
|
72
|
+
#[classmethod]
|
|
73
|
+
#[pyo3(signature = (path))]
|
|
74
|
+
fn from_json_schema(_cls: &Bound<'_, PyType>, path: String) -> Self {
|
|
75
|
+
Self {
|
|
76
|
+
model: datamodel::DataModel::from_json_schema(Path::new(&path)).unwrap(),
|
|
77
|
+
}
|
|
78
|
+
}
|
|
79
|
+
|
|
80
|
+
/// Creates a new `DataModel` instance from a json schema string.
|
|
81
|
+
///
|
|
82
|
+
/// # Arguments
|
|
83
|
+
///
|
|
84
|
+
/// * `content` - A string slice that holds the json schema content.
|
|
85
|
+
///
|
|
86
|
+
/// # Returns
|
|
87
|
+
///
|
|
88
|
+
/// A new instance of `DataModel`.
|
|
89
|
+
#[classmethod]
|
|
90
|
+
#[pyo3(signature = (content))]
|
|
91
|
+
fn from_json_schema_string(_cls: &Bound<'_, PyType>, content: String) -> Self {
|
|
92
|
+
Self {
|
|
93
|
+
model: datamodel::DataModel::from_json_schema_string(&content).unwrap(),
|
|
94
|
+
}
|
|
95
|
+
}
|
|
96
|
+
|
|
63
97
|
/// Creates a new `DataModel` instance from a markdown string.
|
|
64
98
|
///
|
|
65
99
|
/// # Arguments
|
|
@@ -47,7 +47,7 @@ extern "C" {
|
|
|
47
47
|
#[wasm_bindgen]
|
|
48
48
|
pub fn parse_model(markdown_content: &str) -> Result<DataModel, JsError> {
|
|
49
49
|
DataModel::from_markdown_string(markdown_content)
|
|
50
|
-
.map_err(|e| JsError::new(&format!("Error parsing markdown content: {}"
|
|
50
|
+
.map_err(|e| JsError::new(&format!("Error parsing markdown content: {e}")))
|
|
51
51
|
}
|
|
52
52
|
|
|
53
53
|
/// Converts the given markdown content into a specified template format.
|
|
@@ -65,11 +65,11 @@ pub fn parse_model(markdown_content: &str) -> Result<DataModel, JsError> {
|
|
|
65
65
|
#[wasm_bindgen]
|
|
66
66
|
pub fn convert_to(markdown_content: &str, template: Templates) -> Result<String, JsValue> {
|
|
67
67
|
let mut model = DataModel::from_markdown_string(markdown_content)
|
|
68
|
-
.map_err(|e| JsValue::from_str(&format!("Error parsing markdown content: {}"
|
|
68
|
+
.map_err(|e| JsValue::from_str(&format!("Error parsing markdown content: {e}")))?;
|
|
69
69
|
|
|
70
70
|
model
|
|
71
71
|
.convert_to(&template, None)
|
|
72
|
-
.map_err(|e| JsValue::from_str(&format!("Error converting markdown content: {}"
|
|
72
|
+
.map_err(|e| JsValue::from_str(&format!("Error converting markdown content: {e}")))
|
|
73
73
|
}
|
|
74
74
|
|
|
75
75
|
/// Parses the given JSON schema string into a `DataModel`.
|
|
@@ -84,14 +84,14 @@ pub fn convert_to(markdown_content: &str, template: Templates) -> Result<String,
|
|
|
84
84
|
#[wasm_bindgen]
|
|
85
85
|
pub fn from_json_schema(json_schema: JsValue) -> Result<String, JsError> {
|
|
86
86
|
let schema: SchemaObject = serde_wasm_bindgen::from_value(json_schema)
|
|
87
|
-
.map_err(|e| JsError::new(&format!("Error deserializing JSON schema: {}"
|
|
87
|
+
.map_err(|e| JsError::new(&format!("Error deserializing JSON schema: {e}")))?;
|
|
88
88
|
|
|
89
89
|
let mut model = DataModel::from_json_schema_object(schema)
|
|
90
|
-
.map_err(|e| JsError::new(&format!("Error parsing JSON schema: {}"
|
|
90
|
+
.map_err(|e| JsError::new(&format!("Error parsing JSON schema: {e}")))?;
|
|
91
91
|
|
|
92
92
|
model
|
|
93
93
|
.convert_to(&Templates::Markdown, None)
|
|
94
|
-
.map_err(|e| JsError::new(&format!("Error converting markdown content: {}"
|
|
94
|
+
.map_err(|e| JsError::new(&format!("Error converting markdown content: {e}")))
|
|
95
95
|
}
|
|
96
96
|
|
|
97
97
|
/// Returns the JSON schema for the given markdown content.
|
|
@@ -114,7 +114,7 @@ pub fn json_schema(
|
|
|
114
114
|
openai: bool,
|
|
115
115
|
) -> Result<String, JsValue> {
|
|
116
116
|
let model = DataModel::from_markdown_string(markdown_content)
|
|
117
|
-
.map_err(|e| JsValue::from_str(&format!("Error parsing markdown content: {}"
|
|
117
|
+
.map_err(|e| JsValue::from_str(&format!("Error parsing markdown content: {e}")))?;
|
|
118
118
|
|
|
119
119
|
let root = match root {
|
|
120
120
|
Some(root) => root,
|
|
@@ -127,7 +127,7 @@ pub fn json_schema(
|
|
|
127
127
|
};
|
|
128
128
|
|
|
129
129
|
let json_schema = to_json_schema(&model, &root, openai)
|
|
130
|
-
.map_err(|e| JsValue::from_str(&format!("Error serializing schema: {}"
|
|
130
|
+
.map_err(|e| JsValue::from_str(&format!("Error serializing schema: {e}")))?;
|
|
131
131
|
|
|
132
132
|
// Directly return the JSON schema object instead of converting it to a JsValue
|
|
133
133
|
Ok(serde_json::to_string(&json_schema).unwrap())
|
|
@@ -145,7 +145,7 @@ impl DataModel {
|
|
|
145
145
|
match obj_name {
|
|
146
146
|
Some(name) => {
|
|
147
147
|
if self.objects.iter().all(|o| o.name != name) {
|
|
148
|
-
panic!("Object '{}' not found in the markdown file"
|
|
148
|
+
panic!("Object '{name}' not found in the markdown file");
|
|
149
149
|
}
|
|
150
150
|
Ok(serde_json::to_string_pretty(&to_json_schema(
|
|
151
151
|
self, &name, openai,
|