Removed Extra 'Model' folder. Various Cardinality Updates - #383
Merged
Conversation
Made updates to the diagrams based on the diagram-issues.md file attached to DATASTD-2596. Removed the extra Models folder in the tree structure
mragonech
approved these changes
May 7, 2026
stevenarnold-ed-fi
added a commit
that referenced
this pull request
May 7, 2026
* DATATSTD-2371 New values to Group 2 descriptors (#269) * DATATSTD-2371 New values to Group 2 descriptors DATATSTD-2371 New values to Group 2 descriptors per CEDS alignment * DATASTD-2371 Semi-Alphabetized descriptors DATASTD-2371 Semi-Alphabetized descriptors, added Shotgun. * DataSTD-2371 reduced value - added description DataSTD-2371 reduced value - added description - incorporate changes from review. * DATASTD-2371 fixed Weapon Descriptor DATASTD-2371 fixed Weapon Descriptor * [DATASTD-2379] Add TPDM Path domain descriptor (#270) * [DATASTD-2379] Add Path domain related descriptor values * [DATASTD-2379] Update PathMilestoneType --------- Co-authored-by: Mustafa Yilmaz <109824209+MrEdData@users.noreply.github.com> * Datastd 2378 (#271) * DATASTD-2378 https://edfi.atlassian.net/browse/DATASTD-2378 * DATASTD-2378 Additional validation edits to bring short descriptions into length compliance, edit Schema Location, and change model version namespace to 5.2.0 * DATASTD-2378 last pass to align the descriptors with the revised spreadsheet * DATASTD-2378 Correct code value --------- Co-authored-by: Muriel Marable <m.marable@wearedoubleline.com> * [ODS-6610] Update workflow action dependencies to latest (#273) * [DATASTD-2383] Update header to 6.0 (#272) * [DATASTD-2381] Add TPDM Descriptors - Update to 6.0.0 (#274) [DATASTD-2381] Add TPDM Descriptors, updated uri, added descriptions, alphabetized. In addition, headers for previous TPDM descriptors updated to 6.0.0 from 5.1.0 * [DATASTD-2382] TPDM Recruiting - Staffing Descriptor (#275) Transferred the TPDM Recruiting and Staffing Related Descriptors. Updated header to 6.0.0 and uri, alphabetized * [Datastd 2389] Remove word Extension from schema (#277) * [DATASTD-2389] Fix schema path 81-82 tickets [DATASTD-2389] Fix the schema path removing extension for all descriptor files in 2381-2382 tickets * [DATASTD-2389] Capitalize Bulk [DATASTD-2389] Capitalize Bulk in the schema path for files in ticket 2381 * [DATASTD-2388] Move additional TPDM descriptors (#276) * [DATASTD-2388] Move additional TPDM descriptors [DATASTD-2388] Move additional descriptors as indicated in the ticket, alphabetized, and kept "Other" as last option of a list. * DATASTD-2388] Edited Degree Type DATASTD-2388] Edited Degree Type for Master of Science in Education * DATASTD-2388] Fixed path for schema header DATASTD-2388] Fixed path for schema BULK header as requested in the review * [DATASTD-2388] Degree Update [DATASTD-2388] Degree Update - lines 46,47 changed to Mater of Education --------- Co-authored-by: Steven Arnold <48261255+stevenarnold-ed-fi@users.noreply.github.com> * Remove GenderDescriptor.xml in Ed-Fi Data Standard (#279) * Rename two IEP fields (#281) * Rename two IEP fields Add IEP due dates * Remove extra space after ed org id * [DATASTD-2409] Move TPDM-Community Sample Data into Data Standard (#282) * Merge Samples from TPDM Community * Merge Samples from TPDM Community Updated additional files replaced "PerformanceLevelMet" with "PerformanceLevelIndicatorName" for StudentAssessment-EdPrep * Merge Samples from TPDM Community Updated Schema Locaiton for StudentAssessment EdPrep RemovedCohort from Candidate Removed Certification from Staff Assocaiation Ed Prep Updated credential data for staff association, staff association ed prep, and candidate --------- Co-authored-by: Maria Ragone <Maria.Ragone@ed-fi.org> * DATASTD-2453] Add CODE_OF_CONDUCT to the repo (#283) Copy Code_of_Conduct from DMS repository into Data Standard Repo * Update XSD files (#296) * Bring first set of DS6 changes (#299) * EducatorPreparationProgramTypeDescriptor Removed (#300) * [ODS-6670] Mismatched tag removed in StaffClassificationDescriptor file (#301) * mismatched tag issue fix for StaffClassificationDescriptor * mismatched tag issue fix for StaffClassificationDescriptor * Mismatched tag issue fix for StaffClassificationDescriptor (#302) * DATASTD-2459 (#298) Co-authored-by: Maria Ragone <Maria.Ragone@ed-fi.org> * Update to fix ordering issues in PerformanceLevels (#305) * Updates for issues found by platform team (#307) * Update EducationOrganization-EdPrep.xml (#308) * DATASTD-2474] FIx EPPD Degree type remove Master's (#309) DATASTD-2474] FIx EPPD Degree type remove Master's from Sample Data, and replace with Master. In Master of Science, of Arts , of Education * DATASTD-2475 (#311) Fixed Data Related Issues * Update XSD files (#318) * Added missing descriptors (#316) * [DSOPS-319] Enhance XML and Python file standards, issue management templates, and workflows (#310) * XML file standards * GitHub Copilot instructions for XML and Python * Move CODEOWNERS into proper directory * Issue management templates and workflow * Fixing multiple sample data issues, mainly missing descriptor values from TPDM (#320) * DATASTD-2456 (#297) Co-authored-by: semalaiappan <34613894+semalaiappan@users.noreply.github.com> * Fixed copy paste error in descriptor values (#321) * [DATASTD-2479] - Fixes for general data issues (#323) * Fix for Aug 20 Issues 3, 6, 7, 8 * Fixes for issues 1, 2, 4 * Fixes for errors 1, 2, 3, 6, 7a, 7b, 8, 10, 11, 12 (#325) * DATASTD-2480 Add missing StudentDemographic References and Misc Descriptor Errors (#324) * DATASTD-2480 * DATASTD-2480 * DATASTD-2480 --------- Co-authored-by: Vinaya Mayya <vinaya.mayya@ed-fi.org> * DATASTD-2481Replace CommunityProvider Id Used on Student.xml to use SchoolId Instead (#326) * DATASTD-2481 * DATASTD-2481 * Country Descriptor Updated (#328) * [DSOPS-321] Implement XML Validation Script for Ed-Fi Data Standard with Poetry Package Management (#319) * Initial plan * Implement XML validation script with schema and descriptor validation Co-authored-by: stephenfuqua <9324390+stephenfuqua@users.noreply.github.com> * Add .gitignore for eng directory and fix path resolution Co-authored-by: stephenfuqua <9324390+stephenfuqua@users.noreply.github.com> * Convert to Poetry package manager and fix branch target Co-authored-by: stephenfuqua <9324390+stephenfuqua@users.noreply.github.com> * Rename language-specifc files * Actions instructions file * Sample files for manual testing * Readme formatting Testing instructions * Install and configure flake8 * Reformat with black * Always use quotation marks Remove periods * Refactor to use lxml exclusively * Style cleanup Extract line number from lxml error message * Remove begin and end date on one entry Add an entry with mismatched tags * Collect _all_ schema validation errors * Warning about running the tool until there are no errors left * Performance optimization * Comment out the typo * Reformat * Improve memory management * Refactor descriptor validation function to make better use of XML parsing * Move all descriptor files into the correct directory * Rename files with 'Descriptor' suffix * Refactor to lookup the schema file in the source XML * Fix case mismatches * Rename file * Combine files * Refactor to parse the XML file only once * Optimize the validation workflow * Remove xmlschema package * Standard VS Code configuration * Apply file headers * YAML fixes * Allow button-click execution * Try to resolve a NOT FOUND error by providing the token * Look for descriptor file in the sample directory if not found in descriptors directory * Revert "Move all descriptor files into the correct directory" These files contain extension descriptors and should not be placed in the main descriptors directory This reverts commit 8e696f4. * Restore DiagnosisDescriptor copy for extension * Refactor to search for descriptor files in both locations * Validate the descriptor directory * Explicitly grant permissions * Failure is due to running from workflow dispatch * The job needs to fail properly * This job needs to fail on step failure * Standardize the quotations Attempt to fix how the validation output result file is echoed * Remove this restriction * Trying to fix the validation output reporting * Stop trying to include the validation output in the PR comment * correction to the descriptor file validation --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: stephenfuqua <9324390+stephenfuqua@users.noreply.github.com> Co-authored-by: Stephen A. Fuqua <stephen@safnet.com> * Update XSD files (#327) Co-authored-by: Stephen Fuqua <stephenfuqua@users.noreply.github.com> * [Datastd-2473] Add "Economic Disadvantage" descriptor to StudentDemographic (#315) * DATASTD-2471 Delete Items From Seoa Previously Marked For Deprecation (#312) * DATASTD-2471 * DATASTD-2471 --------- Co-authored-by: Stephen Fuqua <stephenfuqua@users.noreply.github.com> * DATASTD-2472 (#334) * [DATASTD-2470] & [DATASTD-2477] Update Sample Data Identity Entities To Be Identification Code & Remove Elements Marked For Deprecation That Are Part Of New Identification/Demographic/Directory Entities (#331) * [DATASTD-2488] Replace EconomicDisadvantaged Bool with new EconomicDisadvantage Descriptor (#338) * DATASTD-2491, DATASTD-2492, DATASTD-2493 Sample Data Changes for New Assessment Updates (#337) * DATASTD-2491 * DATASTD-2491, 2492, 2493 * Update Ed-Fi-Core.xsd * DATASTD-2491 * DATASTD-2491 * DATASTD-2491 * DATASTD-2489 Reduce The Size For StudentAssessment Sample Data (#336) * DATASTD-2489 * DATASTD-2489 * DATASTD-2494 (#340) * DATASTD-2491-1 (#341) * DATASTD-2491-2 (#342) * DATASTD 2494-4 Data Fixes (#343) * DATASTD-2491-3 * DATASTD-2491-3 * DATASTD-2491-3 * DATASTD-2491-3 * [ODS-6714] Assessment CodeFix (#344) * [ODS-6714] ObjectiveAssessment Sample Added (#345) * ObjectiveAssessment Sample Added * ObjectiveAssessment Sample Added * Delete ContactTypeDescriptor.xml (#349) * Update XSD files (#346) Co-authored-by: Steven Arnold <48261255+stevenarnold-ed-fi@users.noreply.github.com> * DATASTD-2514 (#350) Fix the uri description for ed-fi * [DATASTD-2276] NuGet packaging for the Data Standard (#348) * Move XML validator to a sub-directory * Update GitHub Actions: - Newer github/* versions - New directory for the xml-validator * NuGet packaging script * Remove extra space at end of property value, which could be problematic in DMS * Rename csproj * Dotnet always creates a solution file even if you don't want it * Adjust the relative path * Revert "Dotnet always creates a solution file even if you don't want it" Instead, just gitignore the sln file This reverts commit 8265d67. * [DATASTD-2510] 6.0.0 JSON schema (#347) * Copilot's complete application for JSON file validation * Simple example * Move JSON validaton into eng/ directory * Script for converting swagger.json files to YML * Strip out the paths, parameters, and other nodes that are not relevant to JSON file validation * Enhance validator to accept YAML instead of JSON * Remove additional unwanted components * Rename file * Update the validation project * JSON schema files * Delete the validator code - moving to another repo * These files should not have been ignored * Update the JSON spec metadata * DATASTD-2508 UML for DS 6.0 (#351) New UML for DS 6.0, with new EPDM entities in core, split of the SEOA, new identity codes and new demographics, assessment changes Co-authored-by: Steven Arnold <48261255+stevenarnold-ed-fi@users.noreply.github.com> * Bump black in /eng/prepare-openapi in the pip group across 1 directory (#352) Bumps the pip group with 1 update in the /eng/prepare-openapi directory: [black](https://github.com/psf/black). Updates `black` from 23.12.1 to 24.3.0 - [Release notes](https://github.com/psf/black/releases) - [Changelog](https://github.com/psf/black/blob/main/CHANGES.md) - [Commits](psf/black@23.12.1...24.3.0) --- updated-dependencies: - dependency-name: black dependency-version: 24.3.0 dependency-type: direct:development dependency-group: pip ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * [ODS-6783] ParticipationStatusDescriptor Descriptor Added (#355) * DATASTD-2524 Update ParticipationStatus Desc (#357) DATASTD-2524 Update ParticipationStatus Descriptor header to 6.0.0 * Code owners now applies to all files in the repo (#358) * DATASTD-2537 (#359) * DATASTD-2537 Updated headers to be 6.1.0 * DATASTD-2537 Updated branch tag * DATASTD-2523 (#361) Replaced description value for US States and Territories with full name of the abbreviated/code value. * DATASTD-2544 Add SampleData For New AddressCharacteristic Descriptor (#363) * DATASTD-2544 Added Descriptor files * DATASTD-2544 * DATASTD-2544 Updated sample data to include AddressCharacteristic * DATASTD-2544 Updated contact to switch one Address Characteristic to Primary * DATASTD-2576 Add Sample Data For GraduationStatusOptIn Bool (#365) * DATASTD-2576 Added GraduationStatusOptIn Values to Selected Records Reordered Sample data so the new order matches with the update from DATASTD-2573 * DATASTD-2576 Re-ordered Candidate file to match StudentAcademicRecord ordering changes as part of DATASTD-2573 * DATASTD-2577 Update Sample Data To Include ResponsibleEdOrg On StudentEducationOrganizationResponsibilityAssociation (#366) * DATASTD-2577 Update XSD and Interchange Files * DATASTD-2577 Added References to all but one of the files using StudentEducationOrganizationResponsibilityAssociation * DATASTD-2579 (#367) Removed GraduationStatusOptIn Bool sample data * DATASTD-2568 Create SEDM sample data and Descriptor values (#369) * DATASTD-2568 Added Descriptor files and initial values supporting SEDM * DATASTD-2568 Created SpecialEducation sample data file * DATASTD-2568 Added IDEAEvent and StudentIEP Sample Data * DATASTD-2568 Created Sample Data 1st Draft for SEDM * DATASTD-2568 Removed optional fields from sample data records to test NULL values * DATASTD-2568 Fixing XML Validation issues * DATASTD-2568 Removed space on sample data value so it would match the descriptor file When I tried to add the space to the descriptor file I got a max length exception. * DATASTD-2568 Updating Sample Data to align IEP Dates Updating Sample Data to use missing descriptors Updating Sample Data to expand collection items * DATASTD-2568 Updating SpecialEducationSetting Record for one line that is failing validation. * DATASTD-2568 Less than notation keeps failing XML validation. Trying something else. * DATASTD-2568 Still the one problem record not accepting the description * DATASTD-2568 * DATATSD-2568 * DATASTD-2568 * DATASTD-2568 Updated Other early childhood location (< 10 hours) to use plain english to pass XML validation * Update sample data to account for change to DegreeSpecialization.BeginDate (#371) * Bump black in /eng/xml-validator in the pip group across 1 directory (#364) Bumps the pip group with 1 update in the /eng/xml-validator directory: [black](https://github.com/psf/black). Updates `black` from 25.1.0 to 26.3.1 - [Release notes](https://github.com/psf/black/releases) - [Changelog](https://github.com/psf/black/blob/main/CHANGES.md) - [Commits](psf/black@25.1.0...26.3.1) --- updated-dependencies: - dependency-name: black dependency-version: 26.3.1 dependency-type: direct:development dependency-group: pip ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * [ODS-6820] IDEAEventReference Updated (#373) * IDEAEventReference Updated * Trigger new build * DATASTD-2583 (#374) Fixing ID references to Student and IDEA Event references. Had to add new IDEA Event References in order to test elements and maintain unique id values. * DATASTD-2583 (#375) Matched IDEA Event Descriptor values Fixed One Student ID value Removed Duplicate Provider values * Datastd 2584 Change descriptor name IDEAEvent to IDEAEventType (#376) * DATASTD-2584 Staging XSD File Changes from related Model ticket. * DATASTD-2584 Updated Descriptor file for IDEAEvent to be IDEAEventDescriptor Updated Sample Data in SpecialEducation xml to match the name change on references and descriptor string. * Update XSD files (#378) * DATASTD-2595 Convert UML diagrams for DS 6.0 into Mermaid and upload in the DS repo (#380) * DATASTD-2595 Uploading sample Model files as Markdown * DATASTD-2595 Removed .md file versions. Replaced with .mmd versions only * DATASTD-2595 Added styling back to SEDM .mmd file * DATASTD-2595 Updated note on SEORA for new Responsible Ed Org reference. * Bump lxml in /eng/xml-validator in the pip group across 1 directory (#379) Bumps the pip group with 1 update in the /eng/xml-validator directory: [lxml](https://github.com/lxml/lxml). Updates `lxml` from 4.9.4 to 6.1.0 - [Release notes](https://github.com/lxml/lxml/releases) - [Changelog](https://github.com/lxml/lxml/blob/master/CHANGES.txt) - [Commits](lxml/lxml@lxml-4.9.4...lxml-6.1.0) --- updated-dependencies: - dependency-name: lxml dependency-version: 6.1.0 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * [DataStd-2597] Fix UMLs batch 2 (#382) * [Datastd-2596] Auditing Mermaid UML - batch 1 for DS v6.1 (#381) --------- Co-authored-by: mikeholm-simpat <michael.holm@simpat.tech> * Removed Extra 'Model' folder. Various Cardinality Updates (#383) Made updates to the diagrams based on the diagram-issues.md file attached to DATASTD-2596. Removed the extra Models folder in the tree structure --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Muriel Marable <m.marable@wearedoubleline.com> Co-authored-by: Mustafa Yilmaz <109824209+MrEdData@users.noreply.github.com> Co-authored-by: Christopher Watkins <100959728+cwatkins-DL@users.noreply.github.com> Co-authored-by: Vinaya Mayya <vinaya.mayya@ed-fi.org> Co-authored-by: Steven Arnold <48261255+stevenarnold-ed-fi@users.noreply.github.com> Co-authored-by: Stephen Fuqua <stephenfuqua@users.noreply.github.com> Co-authored-by: mikeholm-simpat <michael.holm@simpat.tech> Co-authored-by: EdFiBuildAgent <EdFiBuildAgent@users.noreply.github.com> Co-authored-by: semalaiappan <34613894+semalaiappan@users.noreply.github.com> Co-authored-by: Copilot <198982749+Copilot@users.noreply.github.com> Co-authored-by: stephenfuqua <9324390+stephenfuqua@users.noreply.github.com> Co-authored-by: Stephen A. Fuqua <stephen@safnet.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Made updates to the diagrams based on the diagram-issues.md file attached to DATASTD-2596. Removed the extra Models folder in the tree structure