udtools 0.2.4__tar.gz → 0.2.5__tar.gz

udtools-0.2.5/MANIFEST.in

@@ -0,0 +1 @@
+recursive-include  tests  *.*

{udtools-0.2.4 → udtools-0.2.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: udtools
-Version: 0.2.4
+Version: 0.2.5
 Summary: Python tools for Universal Dependencies
 Author: Filip Ginter, Sampo Pyysalo, Daniel Zeman, Milan Straka, Martin Popel, Gosse Bouma, John Bauer, Arianna Masciolini, Ludovica Pannitto
 Maintainer-email: Daniel Zeman <zeman@ufal.mff.cuni.cz>

{udtools-0.2.4 → udtools-0.2.5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "udtools"
-version = "0.2.4"
+version = "0.2.5"
 authors = [
   { name="Filip Ginter" },
   { name="Sampo Pyysalo" },
@@ -37,7 +37,8 @@ Homepage = "https://universaldependencies.org/"
 Issues = "https://github.com/UniversalDependencies/tools/issues"
 
 [project.scripts]
-udvalidate = "udtools.validate:main"
+udvalidate = "udtools.cli:main"
+udeval = "udtools.cli:main_eval"
 
 [tool.setuptools.packages.find]
 where = ["src"]

{udtools-0.2.4 → udtools-0.2.5}/src/udtools/__init__.py

@@ -4,7 +4,7 @@ udtools.
 Python tools for Universal Dependencies.
 """
 
-__version__ = "0.2.4"
+__version__ = "0.2.5"
 __author__ = 'Daniel Zeman'
 __credits__ = 'Universal Dependencies community'
 

{udtools-0.2.4 → udtools-0.2.5}/src/udtools/cli.py

@@ -5,8 +5,9 @@
 # 2025-08-31: Refactoring by @AngledLuffa
 # 2025-09: Refactoring by @harisont and @ellepannitto
 import sys
-from udtools.argparser import parse_args_validator
+from udtools.argparser import parse_args_validator, parse_args_scorer
 from udtools.validator import Validator
+from udtools.udeval import evaluate_wrapper, build_evaluation_table
 
 
 
@@ -29,6 +30,20 @@ def main():
     else:
         return 1
 
+
+
+def main_eval():
+    # Parse arguments
+    args = parse_args_scorer()
+
+    # Evaluate
+    evaluation = evaluate_wrapper(args)
+    results = build_evaluation_table(evaluation, args.verbose, args.counts, args.enhanced)
+    print(results)
+    return 0
+
+
+
 if __name__=="__main__":
     errcode = main()
     sys.exit(errcode)

{udtools-0.2.4 → udtools-0.2.5}/src/udtools/data/feats.json

@@ -3692,7 +3692,7 @@
 "Person": {"type": "universal", "doc": "global", "permitted": 1, "errors": [], "uvalues": ["1", "3"], "lvalues": [], "unused_uvalues": ["0", "2", "4"], "unused_lvalues": [], "evalues": [], "byupos": {"AUX": {"1": 1, "3": 1}, "NOUN": {"1": 1, "3": 1}, "PRON": {"1": 1, "3": 1}, "PROPN": {"1": 1, "3": 1}, "VERB": {"1": 1, "3": 1}}, "lastchanged": "2022-11-07-07-40-50", "lastchanger": "sarves"},
 "Polarity": {"type": "universal", "doc": "global", "permitted": 1, "errors": [], "uvalues": ["Neg", "Pos"], "lvalues": [], "unused_uvalues": [], "unused_lvalues": [], "evalues": [], "byupos": {"AUX": {"Neg": 1, "Pos": 1}, "PART": {"Neg": 1, "Pos": 1}}, "lastchanged": "2022-10-27-10-46-29", "lastchanger": "sarves"},
 "Poss": {"type": "universal", "doc": "global", "permitted": 1, "errors": [], "uvalues": ["Yes"], "lvalues": [], "unused_uvalues": [], "unused_lvalues": [], "evalues": [], "byupos": {"NOUN": {"Yes": 1}, "PRON": {"Yes": 1}, "PROPN": {"Yes": 1}}, "lastchanged": "2022-10-26-11-51-54", "lastchanger": "sarves"},
-"PronType": {"type": "universal", "doc": "global", "permitted": 1, "errors": [], "uvalues": ["Dem", "Ind", "Prs", "Rcp"], "lvalues": [], "unused_uvalues": ["Art", "Emp", "Exc", "Int", "Neg", "Rel", "Tot"], "unused_lvalues": [], "evalues": [], "byupos": {"PRON": {"Dem": 1, "Ind": 1, "Prs": 1, "Rcp": 1}}, "lastchanged": "2022-11-07-08-31-14", "lastchanger": "sarves"},
+"PronType": {"type": "universal", "doc": "global", "permitted": 1, "errors": [], "uvalues": ["Art", "Dem", "Ind", "Int", "Prs", "Rcp", "Rel"], "lvalues": [], "unused_uvalues": ["Emp", "Exc", "Neg", "Tot"], "unused_lvalues": [], "evalues": [], "byupos": {"DET": {"Art": 1, "Dem": 1, "Ind": 1}, "PRON": {"Dem": 1, "Ind": 1, "Int": 1, "Prs": 1, "Rcp": 1, "Rel": 1}}, "lastchanged": "2025-12-11-15-04-10", "lastchanger": "rahonalab"},
 "Tense": {"type": "universal", "doc": "global", "permitted": 1, "errors": [], "uvalues": ["Fut", "Past", "Pres"], "lvalues": [], "unused_uvalues": ["Imp", "Pqp"], "unused_lvalues": [], "evalues": [], "byupos": {"AUX": {"Fut": 1, "Past": 1, "Pres": 1}, "VERB": {"Fut": 1, "Past": 1, "Pres": 1}}, "lastchanged": "2022-10-25-19-30-06", "lastchanger": "sarves"},
 "Typo": {"type": "universal", "doc": "global", "permitted": 1, "errors": [], "uvalues": ["Yes"], "lvalues": [], "unused_uvalues": [], "unused_lvalues": [], "evalues": [], "byupos": {"ADJ": {"Yes": 1}, "ADP": {"Yes": 1}, "ADV": {"Yes": 1}, "AUX": {"Yes": 1}, "CCONJ": {"Yes": 1}, "DET": {"Yes": 1}, "INTJ": {"Yes": 1}, "NOUN": {"Yes": 1}, "NUM": {"Yes": 1}, "PART": {"Yes": 1}, "PRON": {"Yes": 1}, "PUNCT": {"Yes": 1}, "SCONJ": {"Yes": 1}, "SYM": {"Yes": 1}, "VERB": {"Yes": 1}}, "lastchanged": "2022-11-07-07-46-09", "lastchanger": "sarves"},
 "VerbForm": {"type": "universal", "doc": "global", "permitted": 1, "errors": [], "uvalues": ["Conv", "Fin", "Ger", "Inf", "Part", "Vnoun"], "lvalues": [], "unused_uvalues": ["Gdv", "Sup"], "unused_lvalues": [], "evalues": [], "byupos": {"AUX": {"Conv": 1, "Fin": 1, "Part": 1}, "NOUN": {"Ger": 1, "Vnoun": 1}, "VERB": {"Conv": 1, "Fin": 1, "Ger": 1, "Inf": 1, "Part": 1}}, "lastchanged": "2022-11-07-08-01-30", "lastchanger": "sarves"},

{udtools-0.2.4 → udtools-0.2.5}/src/udtools/incident.py

@@ -1,4 +1,3 @@
-import os
 from dataclasses import dataclass
 from enum import Enum
 from json import JSONEncoder
@@ -103,7 +102,7 @@ class Incident:
         self.explanation = explanation
         # File name. The default is the file from which we are reading right
         # now ('-' if reading from STDIN).
-        self.filename = 'STDIN' if state.current_file_name == '-' else os.path.basename(state.current_file_name) if state.current_file_name else 'NONE'
+        self.filename = state.get_current_file_name()
         # Line number. The default is the most recently read line as recorded
         # in the state; but in most cases we need to get the number
         # during instantiation, as the most recently read line is the last line

{udtools-0.2.4 → udtools-0.2.5}/src/udtools/state.py

@@ -1,3 +1,4 @@
+import os
 from collections import defaultdict
 # Allow using this module from the root folder of tools even if it is not
 # installed as a package: use the relative path validator/src/validator for
@@ -121,6 +122,27 @@ class State:
         # Key: [eid][sentid][str(mention_span)]; value: set of node ids.
         self.entity_mention_spans = {}
 
+
+    def get_current_file_name(self):
+        """
+        Returns the current file name in the form suitable for Incident objects
+        and their string reports (i.e., 'STDIN' instead of '-', basename for
+        paths, 'NONE' otherwise).
+
+        Returns
+        -------
+        str
+            The modified name of the current input file.
+        """
+        if self.current_file_name:
+            if self.current_file_name == '-':
+                return 'STDIN'
+            else:
+                return os.path.basename(self.current_file_name)
+        else:
+            return 'NONE'
+
+
     def __str__(self):
         # Summarize the warnings and errors.
         result = ''
@@ -142,11 +164,13 @@ class State:
             result += f'*** FAILED *** with {nerror} errors'
         return result
 
+
     def passed(self):
         for k, v in self.error_counter[IncidentType.ERROR].items():
             if v > 0:
                 return False
         return True
 
+
     def __bool__(self):
         return self.passed()

{udtools-0.2.4 → udtools-0.2.5}/src/udtools/utils.py

@@ -1,4 +1,3 @@
-import os
 import regex as re
 # Allow using this module from the root folder of tools even if it is not
 # installed as a package: use the relative path validator/src/validator for
@@ -394,5 +393,4 @@ def create_references(nodes, state, comment=''):
     -------
     references : list(udtools.incident.Reference)
     """
-    filename = 'STDIN' if state.current_file_name == '-' else os.path.basename(state.current_file_name) if state.current_file_name else 'NONE'
-    return [Reference(nodeid=str(x.ord), sentid=state.sentence_id, filename=filename, lineno=state.current_node_linenos[str(x.ord)], comment=comment) for x in nodes]
+    return [Reference(nodeid=str(x.ord), sentid=state.sentence_id, filename=state.get_current_file_name(), lineno=state.current_node_linenos[str(x.ord)], comment=comment) for x in nodes]

{udtools-0.2.4 → udtools-0.2.5}/src/udtools/validator.py

@@ -199,7 +199,7 @@ class Validator(Level6):
             The resulting state of the validation. May contain the overview
             of all encountered incidents (errors or warnings) if requested.
         """
-        if not state:
+        if state == None:
             state = State()
         for lines in utils.next_sentence(state, inp):
             self.validate_sentence(lines, state)

{udtools-0.2.4 → udtools-0.2.5}/src/udtools.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: udtools
-Version: 0.2.4
+Version: 0.2.5
 Summary: Python tools for Universal Dependencies
 Author: Filip Ginter, Sampo Pyysalo, Daniel Zeman, Milan Straka, Martin Popel, Gosse Bouma, John Bauer, Arianna Masciolini, Ludovica Pannitto
 Maintainer-email: Daniel Zeman <zeman@ufal.mff.cuni.cz>

udtools-0.2.5/src/udtools.egg-info/SOURCES.txt

@@ -0,0 +1,144 @@
+LICENSE.txt
+MANIFEST.in
+README.md
+pyproject.toml
+src/udtools/__init__.py
+src/udtools/argparser.py
+src/udtools/cli.py
+src/udtools/data.py
+src/udtools/incident.py
+src/udtools/level1.py
+src/udtools/level2.py
+src/udtools/level3.py
+src/udtools/level4.py
+src/udtools/level5.py
+src/udtools/level6.py
+src/udtools/state.py
+src/udtools/udeval.py
+src/udtools/utils.py
+src/udtools/validator.py
+src/udtools.egg-info/PKG-INFO
+src/udtools.egg-info/SOURCES.txt
+src/udtools.egg-info/dependency_links.txt
+src/udtools.egg-info/entry_points.txt
+src/udtools.egg-info/requires.txt
+src/udtools.egg-info/top_level.txt
+src/udtools/data/data.json
+src/udtools/data/deprels.json
+src/udtools/data/docdeps.json
+src/udtools/data/docfeats.json
+src/udtools/data/edeprels.json
+src/udtools/data/feats.json
+src/udtools/data/tospace.json
+src/udtools/data/udeprels.json
+src/udtools/data/upos.json
+tests/test_cases.py
+tests/test_checks.py
+tests/test_regex.py
+tests/test_utils.py
+tests/test_validate.py
+tests/test-cases/README.md
+tests/test-cases/test.bat
+tests/test-cases/test.log
+tests/test-cases/eval/cs_pud-gold.conllu
+tests/test-cases/eval/cs_pud-plain.txt
+tests/test-cases/eval/cs_pud-udpipe-pdtc-ud-2.17-251125.conllu
+tests/test-cases/eval/eval.txt
+tests/test-cases/invalid-functions/columns-format-minimal.conllu
+tests/test-cases/invalid-functions/columns-format.conllu
+tests/test-cases/invalid-functions/extra-empty-line.conllu
+tests/test-cases/invalid-functions/invalid-line.conllu
+tests/test-cases/invalid-functions/invalid-word-id.conllu
+tests/test-cases/invalid-functions/invalid-word-interval.conllu
+tests/test-cases/invalid-functions/misplaced-comment.conllu
+tests/test-cases/invalid-functions/misplaced-empty-node-2.conllu
+tests/test-cases/invalid-functions/misplaced-empty-node.conllu
+tests/test-cases/invalid-functions/misplaced-word-interval.conllu
+tests/test-cases/invalid-functions/multiple-sent-id.conllu
+tests/test-cases/invalid-functions/mwt-nonempty-2.conllu
+tests/test-cases/invalid-functions/mwt-nonempty-field.conllu
+tests/test-cases/invalid-functions/non-unix-newline.conllu
+tests/test-cases/invalid-functions/overlapping-word-interval.conllu
+tests/test-cases/invalid-functions/pseudo-empty-line.conllu
+tests/test-cases/invalid-functions/reversed-word-interval.conllu
+tests/test-cases/invalid-functions/unicode-normalization.conllu
+tests/test-cases/invalid-functions/word-id-sequence-2.conllu
+tests/test-cases/invalid-functions/word-id-sequence.conllu
+tests/test-cases/invalid-level1-2/ambiguous-feature.conllu
+tests/test-cases/invalid-level1-2/cyclic-deps.conllu
+tests/test-cases/invalid-level1-2/deprel-not-empty-in-empty.conllu
+tests/test-cases/invalid-level1-2/dos-newlines.conllu
+tests/test-cases/invalid-level1-2/duplicate-feature.conllu
+tests/test-cases/invalid-level1-2/duplicate-id.conllu
+tests/test-cases/invalid-level1-2/duplicate-layered-feature.conllu
+tests/test-cases/invalid-level1-2/duplicate-value.conllu
+tests/test-cases/invalid-level1-2/empty-field.conllu
+tests/test-cases/invalid-level1-2/empty-head.conllu
+tests/test-cases/invalid-level1-2/empty-sentence.conllu
+tests/test-cases/invalid-level1-2/extra-empty-line.conllu
+tests/test-cases/invalid-level1-2/extra-field.conllu
+tests/test-cases/invalid-level1-2/head-0-deprel-not-root.conllu
+tests/test-cases/invalid-level1-2/head-not-0-deprel-root.conllu
+tests/test-cases/invalid-level1-2/head-not-empty-in-empty.conllu
+tests/test-cases/invalid-level1-2/id-starting-from-2.conllu
+tests/test-cases/invalid-level1-2/id-with-extra-0.conllu
+tests/test-cases/invalid-level1-2/invalid-deps-id.conllu
+tests/test-cases/invalid-level1-2/invalid-deps-order.conllu
+tests/test-cases/invalid-level1-2/invalid-deps-syntax.conllu
+tests/test-cases/invalid-level1-2/invalid-head.conllu
+tests/test-cases/invalid-level1-2/invalid-range-format.conllu
+tests/test-cases/invalid-level1-2/invalid-range.conllu
+tests/test-cases/invalid-level1-2/lowercase-feature-in-empty.conllu
+tests/test-cases/invalid-level1-2/lowercase-feature-value-in-empty.conllu
+tests/test-cases/invalid-level1-2/lowercase-feature.conllu
+tests/test-cases/invalid-level1-2/lowercase-postag-in-empty.conllu
+tests/test-cases/invalid-level1-2/lowercase-postag.conllu
+tests/test-cases/invalid-level1-2/lowercase-value.conllu
+tests/test-cases/invalid-level1-2/malformed_deps.conllu
+tests/test-cases/invalid-level1-2/misindexed-empty-node.conllu
+tests/test-cases/invalid-level1-2/misordered-feature.conllu
+tests/test-cases/invalid-level1-2/misordered-layered-feature.conllu
+tests/test-cases/invalid-level1-2/misordered-multiword.conllu
+tests/test-cases/invalid-level1-2/misplaced-comment-end.conllu
+tests/test-cases/invalid-level1-2/misplaced-comment-mid.conllu
+tests/test-cases/invalid-level1-2/misplaced-range.conllu
+tests/test-cases/invalid-level1-2/missing-final-line.conllu
+tests/test-cases/invalid-level1-2/missing-space-after.conllu
+tests/test-cases/invalid-level1-2/multiple-sent_id.conllu
+tests/test-cases/invalid-level1-2/multiple_roots.conllu
+tests/test-cases/invalid-level1-2/multiword-with-pos.conllu
+tests/test-cases/invalid-level1-2/nan-id.conllu
+tests/test-cases/invalid-level1-2/no-sent_id.conllu
+tests/test-cases/invalid-level1-2/nonsequential-empty-node-id.conllu
+tests/test-cases/invalid-level1-2/nonsequential-id.conllu
+tests/test-cases/invalid-level1-2/out-of-bounds-range.conllu
+tests/test-cases/invalid-level1-2/overlapping-multiword.conllu
+tests/test-cases/invalid-level1-2/overlapping-range.conllu
+tests/test-cases/invalid-level1-2/parallel-id.conllu
+tests/test-cases/invalid-level1-2/seemingly-empty-line.conllu
+tests/test-cases/invalid-level1-2/self-cycle-deps.conllu
+tests/test-cases/invalid-level1-2/self-cycle-head.conllu
+tests/test-cases/invalid-level1-2/space-in-field.conllu
+tests/test-cases/invalid-level1-2/tanl-broken.conllu
+tests/test-cases/invalid-level1-2/token_with_cols_filled.conllu
+tests/test-cases/invalid-level1-2/trailing-tab.conllu
+tests/test-cases/invalid-level1-2/unnormalized-unicode.conllu
+tests/test-cases/invalid-level1-2/uppercase-deprel.conllu
+tests/test-cases/invalid-level1-2/uppercase-deps-deprel.conllu
+tests/test-cases/invalid-level3/nmod-obl.conllu
+tests/test-cases/invalid-level3/non-proj.conllu
+tests/test-cases/invalid-level3/rel-upos.conllu
+tests/test-cases/invalid-level3/right-to-left.conllu
+tests/test-cases/invalid-level3/too-many-objects.conllu
+tests/test-cases/invalid-level3/too-many-subjects.conllu
+tests/test-cases/invalid-level4-5/cs_pud-ud-test.conllu
+tests/test-cases/invalid-level4-5/yrl_complin-mwt-typo-yes.conllu
+tests/test-cases/valid/empty-file.conllu
+tests/test-cases/valid/empty-nodes.conllu
+tests/test-cases/valid/layered-features.conllu
+tests/test-cases/valid/maximal-empty-node.conllu
+tests/test-cases/valid/minimal-empty-node.conllu
+tests/test-cases/valid/multiple-features.conllu
+tests/test-cases/valid/nmod-obl.conllu
+tests/test-cases/valid/tanl.conllu
+tests/test-cases/valid/whitespace.conllu

udtools-0.2.5/src/udtools.egg-info/entry_points.txt

@@ -0,0 +1,3 @@
+[console_scripts]
+udeval = udtools.cli:main_eval
+udvalidate = udtools.cli:main

udtools-0.2.5/tests/test-cases/README.md

@@ -0,0 +1,5 @@
+# Test the validator in Windows command line (cmd)
+
+```batch
+tools\test-cases\test.bat 2> tools\test-cases\test.log
+```