Merge branch 'hotfix/1.0.3'

ckiplab · Apr 9, 2023 · 65f47ad · 65f47ad
2 parents 9ca9f04 + 4d30e5a
commit 65f47ad
Show file tree

Hide file tree

Showing 48 changed files with 208 additions and 48 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,133 @@
+.venv
+activate
+
+# Docs
+docs/_api/
+docs/_build/
+
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+pip-wheel-metadata/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.nox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+*.py,cover
+.hypothesis/
+.pytest_cache/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+db.sqlite3-journal
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# PyBuilder
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# IPython
+profile_default/
+ipython_config.py
+
+# pyenv
+.python-version
+
+# pipenv
+#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
+#   However, in case of collaboration, if having platform-specific dependencies or dependencies
+#   having no cross-platform support, pipenv may install dependencies that don't work, or not
+#   install all needed dependencies.
+#Pipfile.lock
+
+# PEP 582; used by e.g. github.com/David-OConnor/pyflow
+__pypackages__/
+
+# Celery stuff
+celerybeat-schedule
+celerybeat.pid
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+.dmypy.json
+dmypy.json
+
+# Pyre type checker
+.pyre/
diff --git a/README.rst b/README.rst
@@ -124,7 +124,7 @@ Installation via Pip
 .. attention::
    To use CkipClassic Parser Client backend, please
 
-   #. Register an account at http://parser.iis.sinica.edu.tw/v1/reg.exe
+   #. Register an account at http://parser.iis.sinica.edu.tw/v1/reg.php
    #. Set the username and password in the pipeline's options:
 
    .. code-block:: python
@@ -143,7 +143,7 @@ License
 
 |GPL-3.0|
 
-Copyright (c) 2018-2020 `CKIP Lab <https://ckip.iis.sinica.edu.tw>`__ under the `GPL-3.0 License <https://www.gnu.org/licenses/gpl-3.0.html>`__.
+Copyright (c) 2018-2023 `CKIP Lab <https://ckip.iis.sinica.edu.tw>`__ under the `GPL-3.0 License <https://www.gnu.org/licenses/gpl-3.0.html>`__.
 
 .. |GPL-3.0| image:: https://www.gnu.org/graphics/gplv3-with-text-136x68.png
    :target: https://www.gnu.org/licenses/gpl-3.0.html
diff --git a/ckipnlp/__init__.py b/ckipnlp/__init__.py
@@ -7,10 +7,10 @@
 
 __author_name__ = 'Mu Yang'
 __author_email__ = '[email protected]'
-__copyright__ = '2018-2020 CKIP Lab'
+__copyright__ = '2018-2023 CKIP Lab'
 
 __title__ = 'CKIPNLP'
-__version__ = '1.0.2'
+__version__ = '1.0.3'
 __description__ = 'CKIP CoreNLP'
 __license__ = 'GPL-3.0'
 

diff --git a/ckipnlp/container/__init__.py b/ckipnlp/container/__init__.py
@@ -6,7 +6,7 @@
 """
 
 __author__ = 'Mu Yang <http://muyang.pro>'
-__copyright__ = '2018-2020 CKIP Lab'
+__copyright__ = '2018-2023 CKIP Lab'
 __license__ = 'GPL-3.0'
 
 from .text import *

diff --git a/ckipnlp/container/base.py b/ckipnlp/container/base.py
@@ -6,7 +6,7 @@
 """
 
 __author__ = 'Mu Yang <http://muyang.pro>'
-__copyright__ = '2018-2020 CKIP Lab'
+__copyright__ = '2018-2023 CKIP Lab'
 __license__ = 'GPL-3.0'
 
 import json as _json

diff --git a/ckipnlp/container/coref.py b/ckipnlp/container/coref.py
@@ -6,7 +6,7 @@
 """
 
 __author__ = 'Mu Yang <http://muyang.pro>'
-__copyright__ = '2018-2020 CKIP Lab'
+__copyright__ = '2018-2023 CKIP Lab'
 __license__ = 'GPL-3.0'
 
 from typing import (

diff --git a/ckipnlp/container/ner.py b/ckipnlp/container/ner.py
@@ -6,7 +6,7 @@
 """
 
 __author__ = 'Mu Yang <http://muyang.pro>'
-__copyright__ = '2018-2020 CKIP Lab'
+__copyright__ = '2018-2023 CKIP Lab'
 __license__ = 'GPL-3.0'
 
 from typing import (

diff --git a/ckipnlp/container/parse.py b/ckipnlp/container/parse.py
@@ -6,7 +6,7 @@
 """
 
 __author__ = 'Mu Yang <http://muyang.pro>'
-__copyright__ = '2018-2020 CKIP Lab'
+__copyright__ = '2018-2023 CKIP Lab'
 __license__ = 'GPL-3.0'
 
 from typing import (

diff --git a/ckipnlp/container/seg.py b/ckipnlp/container/seg.py
@@ -6,7 +6,7 @@
 """
 
 __author__ = 'Mu Yang <http://muyang.pro>'
-__copyright__ = '2018-2020 CKIP Lab'
+__copyright__ = '2018-2023 CKIP Lab'
 __license__ = 'GPL-3.0'
 
 from .base import (

diff --git a/ckipnlp/container/text.py b/ckipnlp/container/text.py
@@ -6,7 +6,7 @@
 """
 
 __author__ = 'Mu Yang <http://muyang.pro>'
-__copyright__ = '2018-2020 CKIP Lab'
+__copyright__ = '2018-2023 CKIP Lab'
 __license__ = 'GPL-3.0'
 
 from .base import (

diff --git a/ckipnlp/container/util/__init__.py b/ckipnlp/container/util/__init__.py
@@ -6,5 +6,5 @@
 """
 
 __author__ = 'Mu Yang <http://muyang.pro>'
-__copyright__ = '2018-2020 CKIP Lab'
+__copyright__ = '2018-2023 CKIP Lab'
 __license__ = 'GPL-3.0'
diff --git a/ckipnlp/container/util/parse_tree.py b/ckipnlp/container/util/parse_tree.py
@@ -6,7 +6,7 @@
 """
 
 __author__ = 'Mu Yang <http://muyang.pro>'
-__copyright__ = '2018-2020 CKIP Lab'
+__copyright__ = '2018-2023 CKIP Lab'
 __license__ = 'GPL-3.0'
 
 

diff --git a/ckipnlp/container/util/wspos.py b/ckipnlp/container/util/wspos.py
@@ -6,7 +6,7 @@
 """
 
 __author__ = 'Mu Yang <http://muyang.pro>'
-__copyright__ = '2018-2020 CKIP Lab'
+__copyright__ = '2018-2023 CKIP Lab'
 __license__ = 'GPL-3.0'
 
 from abc import (

diff --git a/ckipnlp/data/conparse.py b/ckipnlp/data/conparse.py
@@ -4,7 +4,7 @@
 # pylint: disable=missing-docstring
 
 __author__ = 'Mu Yang <http://muyang.pro>'
-__copyright__ = '2018-2020 CKIP Lab'
+__copyright__ = '2018-2023 CKIP Lab'
 __license__ = 'GPL-3.0'
 
 ################################################################################################################################

diff --git a/ckipnlp/driver/__init__.py b/ckipnlp/driver/__init__.py
@@ -6,7 +6,7 @@
 """
 
 __author__ = 'Mu Yang <http://muyang.pro>'
-__copyright__ = '2018-2020 CKIP Lab'
+__copyright__ = '2018-2023 CKIP Lab'
 __license__ = 'GPL-3.0'
 
 from .tagger import (

diff --git a/ckipnlp/driver/base.py b/ckipnlp/driver/base.py
@@ -6,7 +6,7 @@
 """
 
 __author__ = 'Mu Yang <http://muyang.pro>'
-__copyright__ = '2018-2020 CKIP Lab'
+__copyright__ = '2018-2023 CKIP Lab'
 __license__ = 'GPL-3.0'
 
 from abc import (

diff --git a/ckipnlp/driver/classic.py b/ckipnlp/driver/classic.py
@@ -6,7 +6,7 @@
 """
 
 __author__ = 'Mu Yang <http://muyang.pro>'
-__copyright__ = '2018-2020 CKIP Lab'
+__copyright__ = '2018-2023 CKIP Lab'
 __license__ = 'GPL-3.0'
 
 from abc import (
@@ -252,7 +252,7 @@ class CkipClassicConParserClient(_CkipClassicConParser):
     Notes
     -----
 
-        Please register an account at http://parser.iis.sinica.edu.tw/v1/reg.exe and
+        Please register an account at http://parser.iis.sinica.edu.tw/v1/reg.php and
         set the environment variables ``$CKIPPARSER_USERNAME`` and ``$CKIPPARSER_PASSWORD``.
 
     .. method:: __call__(*, ws, pos)

diff --git a/ckipnlp/driver/coref.py b/ckipnlp/driver/coref.py
@@ -6,7 +6,7 @@
 """
 
 __author__ = 'Mu Yang <http://muyang.pro>'
-__copyright__ = '2018-2020 CKIP Lab'
+__copyright__ = '2018-2023 CKIP Lab'
 __license__ = 'GPL-3.0'
 
 import numpy as _np

diff --git a/ckipnlp/driver/ss.py b/ckipnlp/driver/ss.py
@@ -6,7 +6,7 @@
 """
 
 __author__ = 'Mu Yang <http://muyang.pro>'
-__copyright__ = '2018-2020 CKIP Lab'
+__copyright__ = '2018-2023 CKIP Lab'
 __license__ = 'GPL-3.0'
 
 import re as _re

diff --git a/ckipnlp/driver/tagger.py b/ckipnlp/driver/tagger.py
@@ -6,7 +6,7 @@
 """
 
 __author__ = 'Mu Yang <http://muyang.pro>'
-__copyright__ = '2018-2020 CKIP Lab'
+__copyright__ = '2018-2023 CKIP Lab'
 __license__ = 'GPL-3.0'
 
 from ckipnlp.container import (

diff --git a/ckipnlp/pipeline/__init__.py b/ckipnlp/pipeline/__init__.py
@@ -6,7 +6,7 @@
 """
 
 __author__ = 'Mu Yang <http://muyang.pro>'
-__copyright__ = '2018-2020 CKIP Lab'
+__copyright__ = '2018-2023 CKIP Lab'
 __license__ = 'GPL-3.0'
 
 from .kernel import (

diff --git a/ckipnlp/pipeline/coref.py b/ckipnlp/pipeline/coref.py
@@ -6,7 +6,7 @@
 """
 
 __author__ = 'Mu Yang <http://muyang.pro>'
-__copyright__ = '2018-2020 CKIP Lab'
+__copyright__ = '2018-2023 CKIP Lab'
 __license__ = 'GPL-3.0'
 
 from collections.abc import (

diff --git a/ckipnlp/pipeline/kernel.py b/ckipnlp/pipeline/kernel.py
@@ -6,7 +6,7 @@
 """
 
 __author__ = 'Mu Yang <http://muyang.pro>'
-__copyright__ = '2018-2020 CKIP Lab'
+__copyright__ = '2018-2023 CKIP Lab'
 __license__ = 'GPL-3.0'
 
 from collections.abc import (

diff --git a/ckipnlp/util/__init__.py b/ckipnlp/util/__init__.py
@@ -6,5 +6,5 @@
 """
 
 __author__ = 'Mu Yang <http://muyang.pro>'
-__copyright__ = '2018-2020 CKIP Lab'
+__copyright__ = '2018-2023 CKIP Lab'
 __license__ = 'GPL-3.0'
diff --git a/ckipnlp/util/data.py b/ckipnlp/util/data.py
@@ -8,7 +8,7 @@
 # pylint: disable=missing-docstring
 
 __author__ = 'Mu Yang <http://muyang.pro>'
-__copyright__ = '2018-2020 CKIP Lab'
+__copyright__ = '2018-2023 CKIP Lab'
 __license__ = 'GPL-3.0'
 
 import os as _os

diff --git a/ckipnlp/util/logger.py b/ckipnlp/util/logger.py
@@ -6,7 +6,7 @@
 """
 
 __author__ = 'Mu Yang <http://muyang.pro>'
-__copyright__ = '2018-2020 CKIP Lab'
+__copyright__ = '2018-2023 CKIP Lab'
 __license__ = 'GPL-3.0'
 
 import logging as _logging

diff --git a/docs/main/tag.rst b/docs/main/tag.rst
@@ -9,6 +9,14 @@ Part-of-Speech Tags
    :widths: 50 50
    :header-rows: 1
 
+Named Entity Recognition Tags
+-----------------------------
+
+.. csv-table::
+   :file: ./tag/ner.csv
+   :widths: 50 50
+   :header-rows: 1
+
 Constituency Parsing Tags
 -------------------------