Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions converters/sigma/src/ossie_sigma/sigma_to_ossie.py
Original file line number Diff line number Diff line change
Expand Up @@ -458,9 +458,5 @@ def convert(self, spec: dict[str, Any]) -> ConverterResult[OssieDocument]:
custom_extensions=[_vendor_ext(model_ext)] if model_ext else None,
)

document = OssieDocument(
dialects=[OssieDialect.ANSI_SQL, OssieDialect.SIGMA],
vendors=[OssieVendor.SIGMA],
semantic_model=[semantic_model],
)
document = OssieDocument(semantic_model=[semantic_model])
return ConverterResult(output=document, issues=issues)
14 changes: 0 additions & 14 deletions core-spec/ossie-schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,20 +16,6 @@
"items": {
"$ref": "#/$defs/SemanticModel"
}
},
"dialects": {
"type": "array",
"description": "Dialects used anywhere in this document",
"items": {
"$ref": "#/$defs/Dialect"
}
},
"vendors": {
"type": "array",
"description": "Vendors with custom_extensions present anywhere in this document",
"items": {
"$ref": "#/$defs/Vendor"
}
}
},
"required": ["version", "semantic_model"],
Expand Down
17 changes: 17 additions & 0 deletions validation/test_validate.py
Original file line number Diff line number Diff line change
Expand Up @@ -333,6 +333,23 @@ def test_valid_model_still_passes(self):
self.assertEqual(result.returncode, 0)
self.assertIn("Validation PASSED", result.stdout)

def test_root_dialects_and_vendors_are_rejected(self):
# The document root is version and semantic_model only; the dialect and
# vendor enumerations belong under expression.dialects and custom_extensions.
result = self.run_validator(
"version: 0.2.0.dev0\n"
"dialects: [ANSI_SQL]\n"
"vendors: [DBT]\n"
"semantic_model:\n"
" - name: sales\n"
" datasets:\n"
" - name: orders\n"
" source: analytics.orders\n"
)

self.assertEqual(result.returncode, 1)
self.assertIn("'dialects', 'vendors' were unexpected", result.stdout)


if __name__ == "__main__":
unittest.main()