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

{clams_python-1.2.5/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.5
+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.17
+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.5 → clams_python-1.2.6}/clams/app/__init__.py

@@ -260,7 +260,7 @@ class ClamsApp(ABC):
                 break
         if error_view is None:
             error_view = mmif.new_view()
-            self.sign_view(error_view, self._refine_params(**runtime_conf))
+            self.sign_view(error_view, runtime_conf)
         exc_info = sys.exc_info()
         error_view.set_error(f'{exc_info[0]}: {exc_info[1]}',
                              '\t\n'.join(traceback.format_tb(exc_info[2])))

{clams_python-1.2.5 → 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.5 → 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.5 → 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.5
+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.17
+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.5 → clams_python-1.2.6}/clams_python.egg-info/requires.txt

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

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

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

clams_python-1.2.5/VERSION

@@ -1 +0,0 @@
-1.2.5

clams_python-1.2.5/clams/ver/__init__.py

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