text integrity in ner and assertion display

JohnSnowLabs · Aug 11, 2022 · 47b6d36 · 47b6d36
1 parent 9bf94c2
commit 47b6d36
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 13 deletions.
diff --git a/build/lib/sparknlp_display/VERSION b/build/lib/sparknlp_display/VERSION
@@ -1 +1 @@
-4.0
+4.1
diff --git a/build/lib/sparknlp_display/assertion.py b/build/lib/sparknlp_display/assertion.py
@@ -134,20 +134,20 @@ def __display_ner(self, result, label_col, resolution_col, document_col, origina
 
                     html_output += '<span class="spark-nlp-display-entity-wrapper" style="background-color: {}"><span class="spark-nlp-display-entity-name">{} </span><span class="spark-nlp-display-entity-type">{}</span><span class="spark-nlp-display-entity-resolution" style="background-color: {}">{} </span></span>'.format(
                         label_color[entity_type] + 'B3', #color
-                        entity.result, #entity - chunk
+                        original_text[begin:end+1],#entity.result,
                         entity.metadata['entity'], #entity - label
                         label_color[entity_type] + 'FF', #color '#D2C8C6' 
                         assertion_temp_dict[begin] # res_assertion
                     )
                 else:
                     html_output += '<span class="spark-nlp-display-entity-wrapper" style="background-color: {}"><span class="spark-nlp-display-entity-name">{} </span><span class="spark-nlp-display-entity-type">{}</span></span>'.format(
                         label_color[entity_type] + 'B3', #color
-                        entity.result, #entity - chunk
+                        original_text[begin:end+1],#entity.result,
                         entity.metadata['entity'] #entity - label
                     )
 
             else:
-                html_output += '<span class="spark-nlp-display-others" style="background-color: white">{}</span>'.format(entity.result)
+                html_output += '<span class="spark-nlp-display-others" style="background-color: white">{}</span>'.format(original_text[begin:end+1])
 
         if pos < len(original_text):
             html_output += '<span class="spark-nlp-display-others" style="background-color: white">{}</span>'.format(original_text[pos:])

diff --git a/build/lib/sparknlp_display/ner.py b/build/lib/sparknlp_display/ner.py
@@ -124,10 +124,10 @@ def __display_ner(self, result, label_col, document_col, original_text, labels_l
             if entity_type in label_color:
                 html_output += '<span class="spark-nlp-display-entity-wrapper" style="background-color: {}"><span class="spark-nlp-display-entity-name">{} </span><span class="spark-nlp-display-entity-type">{}</span></span>'.format(
                     label_color[entity_type],
-                    entity.result,
+                    original_text[begin:end+1],#entity.result,
                     entity.metadata['entity'])
             else:
-                html_output += '<span class="spark-nlp-display-others" style="background-color: white">{}</span>'.format(entity.result)
+                html_output += '<span class="spark-nlp-display-others" style="background-color: white">{}</span>'.format(original_text[begin:end+1])
 
         if pos < len(original_text):
             html_output += '<span class="spark-nlp-display-others" style="background-color: white">{}</span>'.format(original_text[pos:])

diff --git a/dist/spark-nlp-display-4.0.tar.gz b/dist/spark-nlp-display-4.0.tar.gz
diff --git a/dist/spark-nlp-display-4.1.tar.gz b/dist/spark-nlp-display-4.1.tar.gz
diff --git a/dist/spark_nlp_display-4.0-py3-none-any.whl → dist/spark_nlp_display-4.1-py3-none-any.whl b/dist/spark_nlp_display-4.0-py3-none-any.whl → dist/spark_nlp_display-4.1-py3-none-any.whl
diff --git a/spark_nlp_display.egg-info/PKG-INFO b/spark_nlp_display.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: spark-nlp-display
-Version: 4.0
+Version: 4.1
 Summary: Visualization package for Spark NLP
 Home-page: http://nlp.johnsnowlabs.com
 Author: John Snow Labs

diff --git a/sparknlp_display/VERSION b/sparknlp_display/VERSION
@@ -1 +1 @@
-4.0
+4.1
diff --git a/sparknlp_display/assertion.py b/sparknlp_display/assertion.py
@@ -134,20 +134,20 @@ def __display_ner(self, result, label_col, resolution_col, document_col, origina
 
                     html_output += '<span class="spark-nlp-display-entity-wrapper" style="background-color: {}"><span class="spark-nlp-display-entity-name">{} </span><span class="spark-nlp-display-entity-type">{}</span><span class="spark-nlp-display-entity-resolution" style="background-color: {}">{} </span></span>'.format(
                         label_color[entity_type] + 'B3', #color
-                        entity.result, #entity - chunk
+                        original_text[begin:end+1],#entity.result,
                         entity.metadata['entity'], #entity - label
                         label_color[entity_type] + 'FF', #color '#D2C8C6' 
                         assertion_temp_dict[begin] # res_assertion
                     )
                 else:
                     html_output += '<span class="spark-nlp-display-entity-wrapper" style="background-color: {}"><span class="spark-nlp-display-entity-name">{} </span><span class="spark-nlp-display-entity-type">{}</span></span>'.format(
                         label_color[entity_type] + 'B3', #color
-                        entity.result, #entity - chunk
+                        original_text[begin:end+1],#entity.result,
                         entity.metadata['entity'] #entity - label
                     )
 
             else:
-                html_output += '<span class="spark-nlp-display-others" style="background-color: white">{}</span>'.format(entity.result)
+                html_output += '<span class="spark-nlp-display-others" style="background-color: white">{}</span>'.format(original_text[begin:end+1])
 
         if pos < len(original_text):
             html_output += '<span class="spark-nlp-display-others" style="background-color: white">{}</span>'.format(original_text[pos:])

diff --git a/sparknlp_display/ner.py b/sparknlp_display/ner.py
@@ -124,10 +124,10 @@ def __display_ner(self, result, label_col, document_col, original_text, labels_l
             if entity_type in label_color:
                 html_output += '<span class="spark-nlp-display-entity-wrapper" style="background-color: {}"><span class="spark-nlp-display-entity-name">{} </span><span class="spark-nlp-display-entity-type">{}</span></span>'.format(
                     label_color[entity_type],
-                    entity.result,
+                    original_text[begin:end+1],#entity.result,
                     entity.metadata['entity'])
             else:
-                html_output += '<span class="spark-nlp-display-others" style="background-color: white">{}</span>'.format(entity.result)
+                html_output += '<span class="spark-nlp-display-others" style="background-color: white">{}</span>'.format(original_text[begin:end+1])
 
         if pos < len(original_text):
             html_output += '<span class="spark-nlp-display-others" style="background-color: white">{}</span>'.format(original_text[pos:])