clams-python 1.2.0__tar.gz → 1.2.1__tar.gz

{clams-python-1.2.0/clams_python.egg-info → clams_python-1.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: clams-python
-Version: 1.2.0
+Version: 1.2.1
 Summary: A collection of APIs to develop CLAMS app for python
 Home-page: https://clams.ai
 Author: Brandeis Lab for Linguistics and Computation

clams_python-1.2.1/VERSION

@@ -0,0 +1 @@
+1.2.1

{clams-python-1.2.0 → clams_python-1.2.1}/clams/app/__init__.py

@@ -122,7 +122,9 @@ class ClamsApp(ABC):
             if key not in self.annotate_param_spec:
                 issued_warnings.append(UserWarning(f'An undefined parameter "{key}" (value: "{runtime_params[key]}") is passed'))
         # this will do casting + refinement altogether
+        self.logger.debug(f"User parameters: {runtime_params}")
         refined = self._refine_params(**runtime_params)
+        self.logger.debug(f"Refined parameters: {refined}")
         pretty = refined.get('pretty', False)
         with warnings.catch_warnings(record=True) as ws:
             annotated = self._annotate(mmif, **refined)
@@ -202,11 +204,12 @@ class ClamsApp(ABC):
         :param runtime_conf: runtime configuration of the app as k-v pairs
         """
         view.metadata.app = self.metadata.identifier
+        params_map = {p.name: p for p in self.metadata.parameters}
         if self._RAW_PARAMS_KEY in runtime_conf:
             for k, v in runtime_conf.items():
                 if k == self._RAW_PARAMS_KEY:
                     for orik, oriv in v.items():
-                        if orik in self.metadata.parameters and self.metadata.parameters[orik].multivalued:
+                        if orik in params_map and params_map[orik].multivalued:
                             view.metadata.add_parameter(orik, str(oriv))
                         else:
                             view.metadata.add_parameter(orik, oriv[0])
@@ -215,7 +218,7 @@ class ClamsApp(ABC):
         else:
             # meaning the parameters directly from flask or argparser and values are in lists
             for k, v in runtime_conf.items():
-                if k in self.metadata.parameters and self.metadata.parameters[k].multivalued:
+                if k in params_map and params_map[k].multivalued:
                     view.metadata.add_parameter(k, str(v))
                 else:
                     view.metadata.add_parameter(k, v[0])

{clams-python-1.2.0 → clams_python-1.2.1}/clams/develop/templates/app/app.py.template

@@ -13,7 +13,6 @@ The app.py script does several things:
 
 import argparse
 import logging
-from typing import Union
 
 # Imports needed for Clams and MMIF.
 # Non-NLP Clams applications will require AnnotationTypes
@@ -36,7 +35,7 @@ class $APP_CLASS_NAME(ClamsApp):
         # When using the ``metadata.py`` leave this do-nothing "pass" method here. 
         pass
 
-    def _annotate(self, mmif: Union[str, dict, Mmif], **parameters) -> Mmif:
+    def _annotate(self, mmif: Mmif, **parameters) -> Mmif:
         # see https://sdk.clams.ai/autodoc/clams.app.html#clams.app.ClamsApp._annotate
         raise NotImplementedError
 

clams_python-1.2.1/clams/ver/__init__.py

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

{clams-python-1.2.0 → clams_python-1.2.1/clams_python.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: clams-python
-Version: 1.2.0
+Version: 1.2.1
 Summary: A collection of APIs to develop CLAMS app for python
 Home-page: https://clams.ai
 Author: Brandeis Lab for Linguistics and Computation

clams-python-1.2.0/VERSION

@@ -1 +0,0 @@
-1.2.0

clams-python-1.2.0/clams/ver/__init__.py

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