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

#168 - Experimental JSON CAS support #169

Merged
merged 53 commits into from
Dec 12, 2021

Commits on Aug 13, 2021

  1. #168 - Experimental JSON CAS support

    - Added very basic JSON CAS support
    - No support for type systems yet
    - No support for lenient loading
    - Remove Cas:NULL via type name instead of puring simply the FS with ID 0 (which may not be a Cas:NULL fs)
    - Added various constants for type names and feature names in the Cas class (analouge to the Apache UIMA Java SDK impl)
    - WIP
    reckart committed Aug 13, 2021
    Configuration menu
    Copy the full SHA
    4aed3f2 View commit details
    Browse the repository at this point in the history
  2. #168 - Experimental JSON CAS support

    - Fixed bad PyDoc comment
    reckart committed Aug 13, 2021
    Configuration menu
    Copy the full SHA
    79db38b View commit details
    Browse the repository at this point in the history
  3. Merge branch 'master' into feature/168-Experimental-JSON-CAS-support

    * master:
      No issue: make black
    reckart committed Aug 13, 2021
    Configuration menu
    Copy the full SHA
    7073053 View commit details
    Browse the repository at this point in the history
  4. #168 - Experimental JSON CAS support

    - Fixed linter error because type hint was referring to a dynamically created type
    reckart committed Aug 13, 2021
    Configuration menu
    Copy the full SHA
    c47b2ba View commit details
    Browse the repository at this point in the history
  5. #168 - Experimental JSON CAS support

    - Roll back change of Sofa.sofaArray range type from uima.cas.ByteArray back to uima.cas.TOP which is indeed the range type also used in the Apache UIMA Java SDK - despite only uima.cas.ByteArray being acceptable...
    reckart committed Aug 13, 2021
    Configuration menu
    Copy the full SHA
    8239fe5 View commit details
    Browse the repository at this point in the history
  6. #168 - Experimental JSON CAS support

    - Added generator for random CASes
    - Added JSON tests using random CAS generator
    - Added support for (de)serializing type system information in the JSON format
    - Move the type/feature name constants from Cas to typesystem.py
    reckart committed Aug 13, 2021
    Configuration menu
    Copy the full SHA
    d117758 View commit details
    Browse the repository at this point in the history
  7. #168 - Experimental JSON CAS support

    - Added another generator for random CASes
    - Added more tests
    - Commented out all testing of arrays in the new generator since array handling in cassis seems to have a few conceptual problems when need to be looked at first
    reckart committed Aug 13, 2021
    Configuration menu
    Copy the full SHA
    4f462be View commit details
    Browse the repository at this point in the history
  8. #168 - Experimental JSON CAS support

    - Revert change to stripping the null FS
    - Changed reference data so that IDs start at 1 and not at 0 leaving 0 reserved for the null FS
    reckart committed Aug 13, 2021
    Configuration menu
    Copy the full SHA
    cbf086e View commit details
    Browse the repository at this point in the history

Commits on Aug 14, 2021

  1. Merge branch 'master' into feature/168-Experimental-JSON-CAS-support

    * master:
      #167 - Cant serialize byte arrays (#176)
    reckart committed Aug 14, 2021
    Configuration menu
    Copy the full SHA
    20f4f66 View commit details
    Browse the repository at this point in the history

Commits on Aug 18, 2021

  1. Merge branch 'main' into feature/168-Experimental-JSON-CAS-support

    * main:
      #172 - Naming: cas.add_annotation(s) (#181)
      #175 - Set a feature if the feature name is in a variable (#180)
      #175 - Set a feature if the feature name is in a variable
      #174 - FSes that are only transitively referenced cannot be serialized (#179)
      #170 - Handling of the "uima.noNamespace" prefix (#178)
      No issue
      #173 - Rename add_feature to create_feature (#177)
    
    # Conflicts:
    #	cassis/typesystem.py
    reckart committed Aug 18, 2021
    Configuration menu
    Copy the full SHA
    13e9816 View commit details
    Browse the repository at this point in the history
  2. Merge branch 'bugfix/174-FSes-that-are-only-transitively-referenced-c…

    …annot-be-serialized' into feature/168-Experimental-JSON-CAS-support
    
    * bugfix/174-FSes-that-are-only-transitively-referenced-cannot-be-serialized:
      #174 - FSes that are only transitively referenced cannot be serialized (#179)
    reckart committed Aug 18, 2021
    Configuration menu
    Copy the full SHA
    61de56e View commit details
    Browse the repository at this point in the history
  3. Merge branch 'bugfix/174-FSes-that-are-only-transitively-referenced-c…

    …annot-be-serialized' into feature/168-Experimental-JSON-CAS-support
    
    * bugfix/174-FSes-that-are-only-transitively-referenced-cannot-be-serialized:
      #174 - FSes that are only transitively referenced cannot be serialized (#179)
    reckart committed Aug 18, 2021
    Configuration menu
    Copy the full SHA
    0a6be49 View commit details
    Browse the repository at this point in the history
  4. Merge branch 'main' into feature/168-Experimental-JSON-CAS-support

    * main:
      #174 - FSes that are only transitively referenced cannot be serialized (#179)
      #174 - FSes that are only transitively referenced cannot be serialized (#179)
    reckart committed Aug 18, 2021
    Configuration menu
    Copy the full SHA
    95bf09a View commit details
    Browse the repository at this point in the history
  5. Merge branch 'feature/185-186-187-Handling-of-multipleReferencesAllow…

    …ed-and-arrays' into feature/168-Experimental-JSON-CAS-support
    
    * feature/185-186-187-Handling-of-multipleReferencesAllowed-and-arrays:
      #187 - The multipleReferencesAllowed flag on array features is not handled
      #187 - The multipleReferencesAllowed flag on array features is not handled
      #187 - The multipleReferencesAllowed flag on array features is not handled
      #187 - The multipleReferencesAllowed flag on array features is not handled
      #187 - The multipleReferencesAllowed flag on array features is not handled
      #187 - The multipleReferencesAllowed flag on array features is not handled
      #186 - Creating subtypes of inheritance-final types (arrays) is not prevented
      #185 - Transitively referenced primitive arrays not returned by _find_all_fs #186 - Creating subtypes of inheritance-final types (arrays) is not prevented #187 - The multipleReferencesAllowed flag on array features is not handled
    reckart committed Aug 18, 2021
    Configuration menu
    Copy the full SHA
    f1a1cd3 View commit details
    Browse the repository at this point in the history

Commits on Aug 19, 2021

  1. #168 - Experimental JSON CAS support

    - Fix array support
    - Enable array tests
    reckart committed Aug 19, 2021
    Configuration menu
    Copy the full SHA
    3b50a8e View commit details
    Browse the repository at this point in the history
  2. Merge branch 'feature/185-186-187-Handling-of-multipleReferencesAllow…

    …ed-and-arrays' into feature/168-Experimental-JSON-CAS-support
    
    * feature/185-186-187-Handling-of-multipleReferencesAllowed-and-arrays:
      #187 - The multipleReferencesAllowed flag on array features is not handled
    reckart committed Aug 19, 2021
    Configuration menu
    Copy the full SHA
    df3baf7 View commit details
    Browse the repository at this point in the history
  3. Merge branch 'main' into feature/168-Experimental-JSON-CAS-support

    * main:
      #183 - Better error message when failing to resolve feature path
      #183 - Better error message when failing to resolve feature path
    reckart committed Aug 19, 2021
    Configuration menu
    Copy the full SHA
    90d7622 View commit details
    Browse the repository at this point in the history

Commits on Aug 20, 2021

  1. #168 - Experimental JSON CAS support

    - Change view members field name
    reckart committed Aug 20, 2021
    Configuration menu
    Copy the full SHA
    59ceea4 View commit details
    Browse the repository at this point in the history

Commits on Aug 25, 2021

  1. Merge branch 'main' into feature/168-Experimental-JSON-CAS-support

    * main:
      #194 - Allow visual comparison between two CASes
      #194 - Allow visual comparison between two CASes
      #194 - Allow visual comparison between two CASes
      #187 - The multipleReferencesAllowed flag on array features is not handled
    
    # Conflicts:
    #	cassis/__init__.py
    reckart committed Aug 25, 2021
    Configuration menu
    Copy the full SHA
    c317e96 View commit details
    Browse the repository at this point in the history
  2. #168 - Experimental JSON CAS support

    - Formatting
    - Removed unused import
    reckart committed Aug 25, 2021
    Configuration menu
    Copy the full SHA
    f42992f View commit details
    Browse the repository at this point in the history
  3. Merge branch 'feature/190-real-type-in-type-fs' into feature/168-Expe…

    …rimental-JSON-CAS-support
    
    * feature/190-real-type-in-type-fs:
      #190 - Allow getting the type system from a type
      #190 - Allow getting the type system from a type
      #190 - Allow getting the type system from a type
      #190 - Allow getting the type system from a type
    reckart committed Aug 25, 2021
    Configuration menu
    Copy the full SHA
    1958185 View commit details
    Browse the repository at this point in the history
  4. Merge branch 'feature/190-real-type-in-type-fs' into feature/168-Expe…

    …rimental-JSON-CAS-support
    
    * feature/190-real-type-in-type-fs:
      #190 - Allow getting the type system from a type
    reckart committed Aug 25, 2021
    Configuration menu
    Copy the full SHA
    7835360 View commit details
    Browse the repository at this point in the history
  5. Merge branch 'feature/190-real-type-in-type-fs' into feature/168-Expe…

    …rimental-JSON-CAS-support
    
    * feature/190-real-type-in-type-fs:
      #190 - Allow getting the type system from a type
    reckart committed Aug 25, 2021
    Configuration menu
    Copy the full SHA
    39135e3 View commit details
    Browse the repository at this point in the history
  6. #168 - Experimental JSON CAS support

    - Adjust to changes from #190
    reckart committed Aug 25, 2021
    Configuration menu
    Copy the full SHA
    dafd693 View commit details
    Browse the repository at this point in the history
  7. Merge branch 'feature/190-real-type-in-type-fs' into feature/168-Expe…

    …rimental-JSON-CAS-support
    
    * feature/190-real-type-in-type-fs:
      #190 - Allow getting the type system from a type
    
    # Conflicts:
    #	cassis/cas.py
    reckart committed Aug 25, 2021
    Configuration menu
    Copy the full SHA
    ab47a72 View commit details
    Browse the repository at this point in the history
  8. Merge branch 'feature/190-real-type-in-type-fs' into feature/168-Expe…

    …rimental-JSON-CAS-support
    
    * feature/190-real-type-in-type-fs:
      #190 - Allow getting the type system from a type
      #190 - Allow getting the type system from a type
    reckart committed Aug 25, 2021
    Configuration menu
    Copy the full SHA
    7da1995 View commit details
    Browse the repository at this point in the history
  9. #168 - Experimental JSON CAS support

    - Adjust to changes from #190
    reckart committed Aug 25, 2021
    Configuration menu
    Copy the full SHA
    026fb9d View commit details
    Browse the repository at this point in the history
  10. Merge branch 'main' into feature/168-Experimental-JSON-CAS-support

    * main:
      #198 - Cas.get_types() does not return all types
      #197 - Update dependencies (#199)
      #198 - Cas.get_types() does not return all types
      #190 - Allow getting the type system from a type
      #193 - Gracefully handle empty CAS xmi files (#196)
    reckart committed Aug 25, 2021
    Configuration menu
    Copy the full SHA
    f18785f View commit details
    Browse the repository at this point in the history
  11. #168 - Experimental JSON CAS support

    - Tune performance when serializing JSON to string instead of writing to disk
    - Added rudimentary performance "test"
    reckart committed Aug 25, 2021
    Configuration menu
    Copy the full SHA
    88ec59b View commit details
    Browse the repository at this point in the history
  12. Merge branch 'feature/202-Improve-profile-for-unique_everseen' into f…

    …eature/168-Experimental-JSON-CAS-support
    
    * feature/202-Improve-profile-for-unique_everseen:
      #202 - Improve profile for unique_everseen
      #202 - Improve profile for unique_everseen
    reckart committed Aug 25, 2021
    Configuration menu
    Copy the full SHA
    363900c View commit details
    Browse the repository at this point in the history

Commits on Aug 26, 2021

  1. Merge branch 'main' into feature/168-Experimental-JSON-CAS-support

    * main:
      #202 - Improve profile for unique_everseen
      #202 - Improve profile for unique_everseen
    reckart committed Aug 26, 2021
    Configuration menu
    Copy the full SHA
    88cfe21 View commit details
    Browse the repository at this point in the history
  2. Merge commit '708b78aa5008ec09497999e5655662e5b572d972' into feature/…

    …168-Experimental-JSON-CAS-support
    
    * commit '708b78aa5008ec09497999e5655662e5b572d972':
      #204 - Provide domain on feature
    reckart committed Aug 26, 2021
    Configuration menu
    Copy the full SHA
    0e30177 View commit details
    Browse the repository at this point in the history

Commits on Aug 27, 2021

  1. Merge branch 'main' into feature/168-Experimental-JSON-CAS-support

    * main:
      No issue: Dont compute coverage for __version__.py
      No issue: Dont compute coverage for tests
      #206 - Type unmarshalling from string to the actual type specified in the type system
      #206 - Type unmarshalling from string to the actual type specified in the type system
      #206 - Type unmarshalling from string to the actual type specified in the type system
      #206 - Type unmarshalling from string to the actual type specified in the type system
      #204 - Provide domain on feature
    reckart committed Aug 27, 2021
    Configuration menu
    Copy the full SHA
    6555be8 View commit details
    Browse the repository at this point in the history

Commits on Aug 30, 2021

  1. [UIMA-6266] Clean JSON Wire Format for CAS

    - Do not execute performance "tests" when running make test
    - Update JSON reference data with new data from UIMA Java SDK - including CAS examples using emojis and other Unicode characters
    - Enabled character offset conversion on import/export in JSON (de)serializer
    reckart committed Aug 30, 2021
    Configuration menu
    Copy the full SHA
    053bbf7 View commit details
    Browse the repository at this point in the history

Commits on Sep 20, 2021

  1. - Do not execute performance "tests" when running make test

    - Update JSON reference data with new data from UIMA Java SDK - including CAS examples using emojis and other Unicode characters
    - Enabled character offset conversion on import/export in JSON (de)serializer
    reckart committed Sep 20, 2021
    Configuration menu
    Copy the full SHA
    36709b1 View commit details
    Browse the repository at this point in the history
  2. #209 - Parsing an array that was serialized using multipleReferencesA…

    …llowed=true fails
    
    - Fixed problem by checking the multipleReferencesAllowed feature during deserialization
    - Added test
    reckart committed Sep 20, 2021
    Configuration menu
    Copy the full SHA
    381a7ec View commit details
    Browse the repository at this point in the history
  3. #168 - Experimental JSON CAS support

    - Better check whether adding a TextIOWrapper is necessary during serialization
    - Fixed bad access to element type name
    - Formatting
    reckart committed Sep 20, 2021
    Configuration menu
    Copy the full SHA
    fbcda8e View commit details
    Browse the repository at this point in the history
  4. #168 - Experimental JSON CAS support

    - Better test if using a TextIOWrapper is really necessary
    reckart committed Sep 20, 2021
    Configuration menu
    Copy the full SHA
    1e97c37 View commit details
    Browse the repository at this point in the history
  5. Merge branch 'main' into feature/168-Experimental-JSON-CAS-support

    * main:
      #209 - Parsing an array that was serialized using multipleReferencesAllowed=true fails
    reckart committed Sep 20, 2021
    Configuration menu
    Copy the full SHA
    08efad0 View commit details
    Browse the repository at this point in the history
  6. #168 - Experimental JSON CAS support

    - Work around issues with cas_to_compareble_text and FSArrays
    reckart committed Sep 20, 2021
    Configuration menu
    Copy the full SHA
    555ed6f View commit details
    Browse the repository at this point in the history

Commits on Sep 27, 2021

  1. Merge branch 'main' into feature/168-Experimental-JSON-CAS-support

    * main:
      No issue. Formatting.
      #215 - Ability to exclude types from cas_to_comparable_text
      #212 - Allow loading/saving XMI/typesystems from/to Path
      #211 - Serializing an FSArray without any elements breaks
      #212 - Allow loading/saving XMI/typesystems from/to Path
    
    # Conflicts:
    #	cassis/util.py
    reckart committed Sep 27, 2021
    Configuration menu
    Copy the full SHA
    a77935d View commit details
    Browse the repository at this point in the history
  2. Merge branch 'feature/168-Experimental-JSON-CAS-support' of https://g…

    …ithub.com/dkpro/dkpro-cassis into feature/168-Experimental-JSON-CAS-support
    
    * 'feature/168-Experimental-JSON-CAS-support' of https://github.com/dkpro/dkpro-cassis:
      No issue. Formatting.
      #215 - Ability to exclude types from cas_to_comparable_text
      #212 - Allow loading/saving XMI/typesystems from/to Path
      #211 - Serializing an FSArray without any elements breaks
      #212 - Allow loading/saving XMI/typesystems from/to Path
      #168 - Experimental JSON CAS support
      #168 - Experimental JSON CAS support
      #168 - Experimental JSON CAS support
      #209 - Parsing an array that was serialized using multipleReferencesAllowed=true fails
      - Do not execute performance "tests" when running make test - Update JSON reference data with new data from UIMA Java SDK - including CAS examples using emojis and other Unicode characters - Enabled character offset conversion on import/export in JSON (de)serializer
      #209 - Parsing an array that was serialized using multipleReferencesAllowed=true fails
    reckart committed Sep 27, 2021
    Configuration menu
    Copy the full SHA
    e607dd5 View commit details
    Browse the repository at this point in the history
  3. Merge branch 'main' into feature/168-Experimental-JSON-CAS-support

    * main:
      #221 - Unable to parse empty arrays
      #219 - Floating point special values not serialized as expected
    reckart committed Sep 27, 2021
    Configuration menu
    Copy the full SHA
    2c14fcd View commit details
    Browse the repository at this point in the history
  4. #168 - Experimental JSON CAS support

    - Support for floating point special values in JSON
    - Support for not serializing the full type system in JSON but only the minimal or none at all
    reckart committed Sep 27, 2021
    Configuration menu
    Copy the full SHA
    ceeabb7 View commit details
    Browse the repository at this point in the history
  5. Merge branch 'main' into feature/168-Experimental-JSON-CAS-support

    * main:
      No issue. Fix issues with arrays in cas_to_comparable_text.
      #219 - Floating point special values not serialized as expected
    reckart committed Sep 27, 2021
    Configuration menu
    Copy the full SHA
    dd7e1d2 View commit details
    Browse the repository at this point in the history

Commits on Sep 29, 2021

  1. Merge branch 'feature/192-cleanup' into feature/168-Experimental-JSON…

    …-CAS-support
    
    * feature/192-cleanup:
      #192 - Cleanup stuff
      #192 - Cleanup stuff
      #192 - Cleanup stuff
      #192 - Cleanup stuff
      #192 - Cleanup stuff
      #192 - Cleanup stuff
      No issue. Fix issues with arrays in cas_to_comparable_text - added missing import.
    
    # Conflicts:
    #	cassis/util.py
    reckart committed Sep 29, 2021
    Configuration menu
    Copy the full SHA
    1c6c334 View commit details
    Browse the repository at this point in the history
  2. #192 - Cleanup stuff

    - Run pyupgrade
    reckart committed Sep 29, 2021
    Configuration menu
    Copy the full SHA
    03b14af View commit details
    Browse the repository at this point in the history
  3. Merge branch 'main' into feature/168-Experimental-JSON-CAS-support

    * main:
      #225 - Add check for properly formatted README.rst (#226)
      No issue: Bum version after release
      Update release.md
      No isse: Fix README rst
      No issue: DKPro Cassis 0.6.0 release
      Create release.md
      No issue. Add release guide
    reckart committed Sep 29, 2021
    Configuration menu
    Copy the full SHA
    aff1bda View commit details
    Browse the repository at this point in the history
  4. Merge branch 'main' into feature/168-Experimental-JSON-CAS-support

    * main:
      #231 - cas_to_comparable_text breaks saying that FSes do not have an ID
      #229 - Get transitive closure of types
      #227 - If a CAS contains no text the offset mapping initialization fails
    reckart committed Sep 29, 2021
    Configuration menu
    Copy the full SHA
    ebe2be2 View commit details
    Browse the repository at this point in the history
  5. Merge branch 'main' into feature/168-Experimental-JSON-CAS-support

    * main:
      No issue: Bump version after release
      No issue: DKPro Cassis 0.6.1 release
      No issue. Fix PyDoc.
    reckart committed Sep 29, 2021
    Configuration menu
    Copy the full SHA
    7d63d9f View commit details
    Browse the repository at this point in the history

Commits on Oct 4, 2021

  1. Merge branch 'main' into feature/168-Experimental-JSON-CAS-support

    * main:
      #234 - cas_to_comparable_text fails with null arrays
    reckart committed Oct 4, 2021
    Configuration menu
    Copy the full SHA
    9a0d17c View commit details
    Browse the repository at this point in the history

Commits on Dec 12, 2021

  1. Merge branch 'main' into feature/168-Experimental-JSON-CAS-support

    * main:
      #238 - Error parsing FSList in CTAKES XMi
      #238 - Error parsing FSList in CTAKES XMi
      #238 - Error parsing FSList in CTAKES XMi
      Create CITATION.cff
      #236 - Long output when printing type (#237)
    
    % Conflicts:
    %	cassis/cas.py
    reckart committed Dec 12, 2021
    Configuration menu
    Copy the full SHA
    0566e37 View commit details
    Browse the repository at this point in the history
  2. #168 - Experimental JSON CAS support

    - Added mention about non-final status in README file
    reckart committed Dec 12, 2021
    Configuration menu
    Copy the full SHA
    e89ada4 View commit details
    Browse the repository at this point in the history