clams-python 1.2.4__tar.gz → 1.2.6__tar.gz

{clams_python-1.2.4/clams_python.egg-info → clams_python-1.2.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: clams-python
-Version: 1.2.4
+Version: 1.2.6
 Summary: A collection of APIs to develop CLAMS app for python
 Home-page: https://clams.ai
 Author: Brandeis Lab for Linguistics and Computation
@@ -14,7 +14,7 @@ Classifier: Programming Language :: Python :: 3 :: Only
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: mmif-python==1.0.16
+Requires-Dist: mmif-python==1.0.18
 Requires-Dist: Flask>=2
 Requires-Dist: Flask-RESTful>=0.3.9
 Requires-Dist: gunicorn>=20

clams_python-1.2.6/VERSION

@@ -0,0 +1 @@
+1.2.6

{clams_python-1.2.4 → clams_python-1.2.6}/clams/app/__init__.py

@@ -142,7 +142,7 @@ class ClamsApp(ABC):
                 issued_warnings.extend(ws)
         if issued_warnings:
             warnings_view = annotated.new_view()
-            self.sign_view(warnings_view, runtime_params)
+            self.sign_view(warnings_view, refined)
             warnings_view.metadata.warnings = issued_warnings
         return annotated.serialize(pretty=pretty, sanitize=True)
 

{clams_python-1.2.4 → clams_python-1.2.6}/clams/develop/templates/app/Containerfile.template

@@ -25,7 +25,7 @@ ENV HF_HOME="/cache/huggingface"
 # https://pytorch.org/docs/stable/hub.html#where-are-my-downloaded-models-saved
 ENV TORCH_HOME="/cache/torch"
 
-RUN mkdir /cache && rm -rf /root/.cache && ln -s /cache /root/.cache
+RUN mkdir /cache ; rm -rf /root/.cache ; ln -s /cache /root/.cache
 ################################################################################
 
 ################################################################################

{clams_python-1.2.4 → clams_python-1.2.6}/clams/mmif_utils/source.py

@@ -203,9 +203,10 @@ def generate_source_mmif_from_file(documents, prefix=None, scheme='file', **igno
                 raise ValueError(f'file location must be an absolute path, or --prefix must be used; given \"{location}\".')
             elif prefix and not location.is_absolute():
                 location = prefix / location
+        location = str(location)
         doc = Document()
         doc.at_type = at_types[mime.split('/', maxsplit=1)[0]]
-        doc.properties.location = f"{location_uri.scheme}://{location}"
+        doc.properties.location = f"{location_uri.scheme}://{location if not location.startswith(location_uri.scheme) else location[len(location_uri.scheme)+3:]}"
         doc.properties.id = f'd{doc_id}'
         doc.properties.mime = mime
         pl.add_document(doc)
@@ -225,7 +226,14 @@ def describe_argparser():
 
 
 def prep_argparser(**kwargs):
-    parser = argparse.ArgumentParser(description=describe_argparser()[1], formatter_class=argparse.RawDescriptionHelpFormatter, **kwargs)
+    import pkgutil
+    import re
+    import importlib
+    discovered_docloc_plugins = {
+        name[len('mmif_docloc_'):]: importlib.import_module(name) for _, name, _ in pkgutil.iter_modules() if
+        re.match(r'mmif[-_]docloc[-_]', name)
+    }
+    parser = argparse.ArgumentParser(description=describe_argparser()[1], formatter_class=argparse.RawTextHelpFormatter, **kwargs)
     parser.add_argument(
         'documents',
         default=None,
@@ -255,12 +263,17 @@ def prep_argparser(**kwargs):
         nargs='?',
         help='A name of a file to capture a generated MMIF json. When not given, MMIF is printed to stdout.'
     )
+    scheme_help = 'A scheme to associate with the document location URI. When not given, the default scheme is `file://`.'
+    if len(discovered_docloc_plugins) > 0:
+        plugin_help = [f'"{scheme_name}" ({scheme_plugin.help() if "help" in dir(scheme_plugin) else "help msg not provided by developer"})' 
+                       for scheme_name, scheme_plugin in discovered_docloc_plugins.items()]
+        scheme_help += ' (AVAILABLE ADDITIONAL SCHEMES)  ' + ', '.join(plugin_help)
     parser.add_argument(
         '-s', '--scheme',
         default='file',
         action='store',
         nargs='?',
-        help='A scheme to associate with the document location URI. When not given, the default scheme is `file://`.'
+        help=scheme_help
     )
     return parser
 

clams_python-1.2.6/clams/ver/__init__.py

@@ -0,0 +1 @@
+__version__ = "1.2.6"

{clams_python-1.2.4 → clams_python-1.2.6/clams_python.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: clams-python
-Version: 1.2.4
+Version: 1.2.6
 Summary: A collection of APIs to develop CLAMS app for python
 Home-page: https://clams.ai
 Author: Brandeis Lab for Linguistics and Computation
@@ -14,7 +14,7 @@ Classifier: Programming Language :: Python :: 3 :: Only
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: mmif-python==1.0.16
+Requires-Dist: mmif-python==1.0.18
 Requires-Dist: Flask>=2
 Requires-Dist: Flask-RESTful>=0.3.9
 Requires-Dist: gunicorn>=20

{clams_python-1.2.4 → clams_python-1.2.6}/clams_python.egg-info/requires.txt

@@ -1,4 +1,4 @@
-mmif-python==1.0.16
+mmif-python==1.0.18
 Flask>=2
 Flask-RESTful>=0.3.9
 gunicorn>=20

{clams_python-1.2.4 → clams_python-1.2.6}/requirements.txt

@@ -1,4 +1,4 @@
-mmif-python==1.0.16
+mmif-python==1.0.18
 
 Flask>=2
 Flask-RESTful>=0.3.9

{clams_python-1.2.4 → clams_python-1.2.6}/tests/test_clamsapp.py

@@ -10,6 +10,7 @@ from typing import Union
 import jsonschema
 import pytest
 from mmif import Mmif, Document, DocumentTypes, AnnotationTypes, View, __specver__
+from mmif.serialize.mmif import ViewsList
 
 import clams.app
 import clams.restify
@@ -352,14 +353,16 @@ class TestClamsApp(unittest.TestCase):
             self.app._refine_params(param1=['p1'], param4=['4'])
             
     def test_error_handling(self):
-        params = {'raise_error': 'true', 'pretty': 'true'}
+        params = {'raise_error': ['true'], 'pretty': ['true']}
         in_mmif = Mmif(self.in_mmif)
         try: 
             out_mmif = self.app.annotate(in_mmif, **params)
         except Exception as e:
             out_mmif_from_str = self.app.set_error_view(self.in_mmif, **params)
             out_mmif_from_mmif = self.app.set_error_view(in_mmif, **params)
-            self.assertEqual(out_mmif_from_mmif.views, out_mmif_from_str.views)
+            self.assertEqual(
+                out_mmif_from_mmif.views.get_last(),
+                out_mmif_from_str.views.get_last())
             out_mmif = out_mmif_from_str
         self.assertIsNotNone(out_mmif)
         last_view: View = next(reversed(out_mmif.views))

clams_python-1.2.4/VERSION

@@ -1 +0,0 @@
-1.2.4

clams_python-1.2.4/clams/ver/__init__.py

@@ -1 +0,0 @@
-__version__ = "1.2.4"