Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add fileGrp cardinality to ocrd-tool.json schema, deprecate fileGrp names #255

Merged
merged 6 commits into from
Aug 15, 2024

Conversation

bertsky
Copy link
Collaborator

@bertsky bertsky commented Aug 13, 2024

No description provided.

@bertsky bertsky requested a review from kba August 13, 2024 22:04
@bertsky
Copy link
Collaborator Author

bertsky commented Aug 14, 2024

@kba I believe I made a mistake in JSON Schema's oneOf usage.

For our simple test JSON …

       {                                                                                               
            "git_url": "https://github.com/ocr-d/foo",                                                  
            "version": "0.0.1",                                                                         
            "tools": {                                                                                  
                "ocrd-xyz": {                                                                           
                    "executable": "ocrd-xyz",                                                           
                    "description": "bars all the foos",                                                 
                    "input_file_grp_cardinality": 1,                                                    
                    "output_file_grp_cardinality": 1,                                                   
                    "categories": ["Layout analysis"],                                                  
                    "steps": ["layout/analysis"]                                                        
                }                                                                                       
            }                                                                                           
        }                                  

…the CI in core now yields this invalidity:

"[tools.ocrd-xyz.input_file_grp_cardinality] 1 is valid under each of {
  'items': {
    'type': 'array', 
    'items': {
      'type': 'number', 
      'multipleOf': 1
    },
    'minItems': 2, 
    'maxItems': 2
  }
}, 
{
  'items': {
    'type': 'number', 'multipleOf': 1
  }
}"

So it seems that the list/array syntax got lost...

Copy link
Collaborator Author

@bertsky bertsky left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pls help

ocrd_tool.schema.yml Outdated Show resolved Hide resolved
@kba kba self-assigned this Aug 14, 2024
Copy link
Member

@kba kba left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

ocrd_tool.schema.yml Outdated Show resolved Hide resolved
ocrd_tool.schema.yml Outdated Show resolved Hide resolved
ocrd_tool.schema.yml Outdated Show resolved Hide resolved
Copy link
Collaborator Author

@bertsky bertsky left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah got it – many thanks!

bertsky and others added 4 commits August 15, 2024 12:08
Co-authored-by: Konstantin Baierer <kba@users.noreply.github.com>
Co-authored-by: Konstantin Baierer <kba@users.noreply.github.com>
@bertsky
Copy link
Collaborator Author

bertsky commented Aug 15, 2024

I updated this in OCR-D/core#1240 – let's hope CI works now

@kba
Copy link
Member

kba commented Aug 15, 2024

GHA Actions tests, pass, I've manually started CircleCI again https://app.circleci.com/pipelines/github/OCR-D/core/2692/workflows/ac341a28-e2e0-45aa-ab00-9d56aa58eb0a Once that passes, I'll merge and release new spec version.

@kba kba merged commit 2948bca into master Aug 15, 2024
@kba kba deleted the ocrd-tool-schema-filegrp-cardinality branch August 15, 2024 11:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants